Finish header files reworking