Refactoring new include header files