diff --git a/src/xenia/apu/xma_context.cc b/src/xenia/apu/xma_context.cc
index f5ab94ac3..f948a46db 100644
--- a/src/xenia/apu/xma_context.cc
+++ b/src/xenia/apu/xma_context.cc
@@ -18,7 +18,7 @@
 extern "C" {
 #include "libavcodec/avcodec.h"
 #include "libavutil/channel_layout.h"
-}
+}  // extern "C"
 
 // Credits for most of this code goes to:
 // https://github.com/koolkdev/libertyv/blob/master/libav_wrapper/xma2dec.c
diff --git a/src/xenia/emulator.h b/src/xenia/emulator.h
index 44d6e19f1..563fdee84 100644
--- a/src/xenia/emulator.h
+++ b/src/xenia/emulator.h
@@ -15,7 +15,6 @@
 #include "xenia/debug/debugger.h"
 #include "xenia/kernel/kernel_state.h"
 #include "xenia/memory.h"
-#include "xenia/ui/window.h"
 #include "xenia/vfs/virtual_file_system.h"
 #include "xenia/xbox.h"
 
@@ -35,6 +34,9 @@ class GraphicsSystem;
 namespace hid {
 class InputSystem;
 }  // namespace hid
+namespace ui {
+class Window;
+}  // namespace ui
 }  // namespace xe
 
 namespace xe {
diff --git a/src/xenia/gpu/gl4/gl4_graphics_system.cc b/src/xenia/gpu/gl4/gl4_graphics_system.cc
index 287c31685..9061eed09 100644
--- a/src/xenia/gpu/gl4/gl4_graphics_system.cc
+++ b/src/xenia/gpu/gl4/gl4_graphics_system.cc
@@ -43,7 +43,7 @@ void InitializeIfNeeded() {
 
 void CleanupOnShutdown() {}
 
-std::unique_ptr<GraphicsSystem> GL4GraphicsSystem::Create(Emulator* emulator) {
+std::unique_ptr<GraphicsSystem> Create(Emulator* emulator) {
   InitializeIfNeeded();
   return std::make_unique<GL4GraphicsSystem>(emulator);
 }
diff --git a/src/xenia/gpu/gl4/gl4_graphics_system.h b/src/xenia/gpu/gl4/gl4_graphics_system.h
index 206651cd2..ebcf6d285 100644
--- a/src/xenia/gpu/gl4/gl4_graphics_system.h
+++ b/src/xenia/gpu/gl4/gl4_graphics_system.h
@@ -27,7 +27,6 @@ class GL4GraphicsSystem : public GraphicsSystem {
   GL4GraphicsSystem(Emulator* emulator);
   ~GL4GraphicsSystem() override;
 
-  static std::unique_ptr<GraphicsSystem> Create(Emulator* emulator);
   std::unique_ptr<ui::GraphicsContext> CreateContext(
       ui::Window* target_window) override;
 
diff --git a/src/xenia/gpu/graphics_system.cc b/src/xenia/gpu/graphics_system.cc
index 167d109e8..55bc3d8e1 100644
--- a/src/xenia/gpu/graphics_system.cc
+++ b/src/xenia/gpu/graphics_system.cc
@@ -15,20 +15,21 @@
 #include "xenia/gpu/gpu_flags.h"
 #include "xenia/kernel/objects/xthread.h"
 
-// TODO(benvanik): based on platform/build support.
-#include "xenia/gpu/gl4/gl4_graphics_system.h"
-
 namespace xe {
 namespace gpu {
 
+namespace gl4 {
+std::unique_ptr<GraphicsSystem> Create(Emulator* emulator);
+}  // namespace gl4
+
 std::unique_ptr<GraphicsSystem> GraphicsSystem::Create(Emulator* emulator) {
   if (FLAGS_gpu.compare("gl4") == 0) {
-    return xe::gpu::gl4::GL4GraphicsSystem::Create(emulator);
+    return xe::gpu::gl4::Create(emulator);
   } else {
     // Create best available.
     std::unique_ptr<GraphicsSystem> best;
 
-    best = xe::gpu::gl4::GL4GraphicsSystem::Create(emulator);
+    best = xe::gpu::gl4::Create(emulator);
     if (best) {
       return best;
     }
diff --git a/src/xenia/gpu/xe-gpu-trace-viewer.cc b/src/xenia/gpu/trace_viewer_main.cc
similarity index 100%
rename from src/xenia/gpu/xe-gpu-trace-viewer.cc
rename to src/xenia/gpu/trace_viewer_main.cc
diff --git a/src/xenia/gpu/xe-gpu-trace-viewer.vcxproj b/src/xenia/gpu/xe-gpu-trace-viewer.vcxproj
index 9eb61fcca..6ae53c80a 100644
--- a/src/xenia/gpu/xe-gpu-trace-viewer.vcxproj
+++ b/src/xenia/gpu/xe-gpu-trace-viewer.vcxproj
@@ -83,7 +83,7 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\base\main_win.cc" />
-    <ClCompile Include="xe-gpu-trace-viewer.cc" />
+    <ClCompile Include="trace_viewer_main.cc" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\base\main.h" />
diff --git a/src/xenia/gpu/xe-gpu-trace-viewer.vcxproj.filters b/src/xenia/gpu/xe-gpu-trace-viewer.vcxproj.filters
index de0e061d5..f925bf708 100644
--- a/src/xenia/gpu/xe-gpu-trace-viewer.vcxproj.filters
+++ b/src/xenia/gpu/xe-gpu-trace-viewer.vcxproj.filters
@@ -15,12 +15,12 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="xe-gpu-trace-viewer.cc">
-      <Filter>src\xenia\gpu</Filter>
-    </ClCompile>
     <ClCompile Include="..\base\main_win.cc">
       <Filter>src\xenia\base</Filter>
     </ClCompile>
+    <ClCompile Include="trace_viewer_main.cc">
+      <Filter>src\xenia\gpu</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\base\main.h">
diff --git a/src/xenia/kernel/xam_ui.cc b/src/xenia/kernel/xam_ui.cc
index bd40355b4..adc645b8e 100644
--- a/src/xenia/kernel/xam_ui.cc
+++ b/src/xenia/kernel/xam_ui.cc
@@ -13,6 +13,7 @@
 #include "xenia/kernel/kernel_state.h"
 #include "xenia/kernel/util/shim_utils.h"
 #include "xenia/kernel/xam_private.h"
+#include "xenia/ui/window.h"
 #include "xenia/xbox.h"
 
 #include <commctrl.h>