Clean up include directives