Refactoring on all core header files.