cleaned up include directives