Consolidating header files