diff --git a/src/xenia/kernel/modules/xam/xam_info.cc b/src/xenia/kernel/modules/xam/xam_info.cc
index c847d7bbe..256cbc3a6 100644
--- a/src/xenia/kernel/modules/xam/xam_info.cc
+++ b/src/xenia/kernel/modules/xam/xam_info.cc
@@ -19,7 +19,9 @@ using namespace xe::kernel;
 using namespace xe::kernel::xam;
 
 
-namespace {
+namespace xe {
+namespace kernel {
+namespace xam {
 
 
 SHIM_CALL XGetAVPack_shim(
@@ -60,7 +62,10 @@ SHIM_CALL XGetLanguage_shim(
   SHIM_SET_RETURN(desired_language);
 }
 
-}
+
+}  // namespace xam
+}  // namespace kernel
+}  // namespace xe
 
 
 void xe::kernel::xam::RegisterInfoExports(
diff --git a/src/xenia/kernel/modules/xboxkrnl/module.cc b/src/xenia/kernel/modules/xboxkrnl/module.cc
index 7902ad715..e996121ea 100644
--- a/src/xenia/kernel/modules/xboxkrnl/module.cc
+++ b/src/xenia/kernel/modules/xboxkrnl/module.cc
@@ -31,11 +31,6 @@ DEFINE_bool(abort_before_entry, false,
     "Abort execution right before launching the module.");
 
 
-namespace {
-
-}
-
-
 XboxkrnlModule::XboxkrnlModule(Runtime* runtime) :
     KernelModule(runtime) {
   ExportResolver* resolver = export_resolver_.get();
diff --git a/src/xenia/kernel/modules/xboxkrnl/xboxkrnl_hal.cc b/src/xenia/kernel/modules/xboxkrnl/xboxkrnl_hal.cc
index 37849c695..d1d0edcd9 100644
--- a/src/xenia/kernel/modules/xboxkrnl/xboxkrnl_hal.cc
+++ b/src/xenia/kernel/modules/xboxkrnl/xboxkrnl_hal.cc
@@ -18,7 +18,9 @@ using namespace xe::kernel;
 using namespace xe::kernel::xboxkrnl;
 
 
-namespace {
+namespace xe {
+namespace kernel {
+namespace xboxkrnl {
 
 
 SHIM_CALL HalReturnToFirmware_shim(
@@ -40,7 +42,9 @@ SHIM_CALL HalReturnToFirmware_shim(
 }
 
 
-}
+}  // namespace xboxkrnl
+}  // namespace kernel
+}  // namespace xe
 
 
 void xe::kernel::xboxkrnl::RegisterHalExports(
diff --git a/src/xenia/kernel/modules/xboxkrnl/xboxkrnl_memory.cc b/src/xenia/kernel/modules/xboxkrnl/xboxkrnl_memory.cc
index f26250cab..373de0a5e 100644
--- a/src/xenia/kernel/modules/xboxkrnl/xboxkrnl_memory.cc
+++ b/src/xenia/kernel/modules/xboxkrnl/xboxkrnl_memory.cc
@@ -18,7 +18,9 @@ using namespace xe::kernel;
 using namespace xe::kernel::xboxkrnl;
 
 
-namespace {
+namespace xe {
+namespace kernel {
+namespace xboxkrnl {
 
 
 SHIM_CALL NtAllocateVirtualMemory_shim(
@@ -142,7 +144,9 @@ SHIM_CALL NtFreeVirtualMemory_shim(
 }
 
 
-}
+}  // namespace xboxkrnl
+}  // namespace kernel
+}  // namespace xe
 
 
 void xe::kernel::xboxkrnl::RegisterMemoryExports(
diff --git a/src/xenia/kernel/modules/xboxkrnl/xboxkrnl_module.cc b/src/xenia/kernel/modules/xboxkrnl/xboxkrnl_module.cc
index b43da3100..8604ba17f 100644
--- a/src/xenia/kernel/modules/xboxkrnl/xboxkrnl_module.cc
+++ b/src/xenia/kernel/modules/xboxkrnl/xboxkrnl_module.cc
@@ -20,7 +20,9 @@ using namespace xe::kernel;
 using namespace xe::kernel::xboxkrnl;
 
 
-namespace {
+namespace xe {
+namespace kernel {
+namespace xboxkrnl {
 
 
 // SHIM_CALL ExGetXConfigSetting_shim(
@@ -100,7 +102,9 @@ SHIM_CALL XexGetModuleHandle_shim(
 // }
 
 
-}
+}  // namespace xboxkrnl
+}  // namespace kernel
+}  // namespace xe
 
 
 void xe::kernel::xboxkrnl::RegisterModuleExports(
diff --git a/src/xenia/kernel/modules/xboxkrnl/xboxkrnl_rtl.cc b/src/xenia/kernel/modules/xboxkrnl/xboxkrnl_rtl.cc
index 7a63761d6..5a53931b6 100644
--- a/src/xenia/kernel/modules/xboxkrnl/xboxkrnl_rtl.cc
+++ b/src/xenia/kernel/modules/xboxkrnl/xboxkrnl_rtl.cc
@@ -21,7 +21,9 @@ using namespace xe::kernel;
 using namespace xe::kernel::xboxkrnl;
 
 
-namespace {
+namespace xe {
+namespace kernel {
+namespace xboxkrnl {
 
 
 // http://msdn.microsoft.com/en-us/library/ff561778
@@ -480,7 +482,9 @@ SHIM_CALL RtlLeaveCriticalSection_shim(
 }
 
 
-}
+}  // namespace xboxkrnl
+}  // namespace kernel
+}  // namespace xe
 
 
 void xe::kernel::xboxkrnl::RegisterRtlExports(
diff --git a/src/xenia/kernel/modules/xboxkrnl/xboxkrnl_threading.cc b/src/xenia/kernel/modules/xboxkrnl/xboxkrnl_threading.cc
index 20690dddd..0e913a9f9 100644
--- a/src/xenia/kernel/modules/xboxkrnl/xboxkrnl_threading.cc
+++ b/src/xenia/kernel/modules/xboxkrnl/xboxkrnl_threading.cc
@@ -19,7 +19,9 @@ using namespace xe::kernel;
 using namespace xe::kernel::xboxkrnl;
 
 
-namespace {
+namespace xe {
+namespace kernel {
+namespace xboxkrnl {
 
 
 // r13 + 0x100: pointer to thread local state
@@ -233,7 +235,9 @@ SHIM_CALL KeTlsSetValue_shim(
 }
 
 
-}
+}  // namespace xboxkrnl
+}  // namespace kernel
+}  // namespace xe
 
 
 void xe::kernel::xboxkrnl::RegisterThreadingExports(