Removing includes that were polluting the global namespace
Merging upstream
Merge branch 'v3.0' into fix_includes
Fixing a few more bad includes