Move header inclusion to main header file