Cleaned up namespaces in various header files