Clean up namespacing and header file includes.