FIXED remaining deprecations
CLEANED up include directives