Fix for header includes