confirmed build with consolidated header files