Consolidated header files