fix #include directives
Merge pull request #1205 from fwyzard/fix_include_directive

Misc cleanups -- Fix #include directives