Fix header includes