making include directives consistent