new proc structure, fix includes