fix includes; new proc struct; rm *_NULL;