Remove unneeded namespace includes
Merge pull request #1060 from hallabro/remove-unused-namespace-includes

Remove unneeded namespace includes