Modified header files