Further consolidated header files