Fix for header includes
Fix for header files (again)