Fix header file layout