headers inclusion refactoring