changes due to pcc restructuring for common header files.