Fixing header files