Fix header files order