fixing up includes, namespaces on MSVC