diff --git a/src/xenia/cpu/cpu-private.h b/src/xenia/cpu/cpu-private.h
index d28472d71..64f9bec99 100644
--- a/src/xenia/cpu/cpu-private.h
+++ b/src/xenia/cpu/cpu-private.h
@@ -7,8 +7,8 @@
  ******************************************************************************
  */
 
-#ifndef XENIA_CPU_PRIVATE_H_
-#define XENIA_CPU_PRIVATE_H_
+#ifndef XENIA_CPU_CPU_PRIVATE_H_
+#define XENIA_CPU_CPU_PRIVATE_H_
 
 #include <gflags/gflags.h>
 
@@ -33,4 +33,4 @@ DECLARE_bool(break_condition_truncate);
 
 DECLARE_bool(break_on_debugbreak);
 
-#endif  // XENIA_CPU_PRIVATE_H_
+#endif  // XENIA_CPU_CPU_PRIVATE_H_
diff --git a/src/xenia/cpu/cpu.h b/src/xenia/cpu/cpu.h
deleted file mode 100644
index 5977de34f..000000000
--- a/src/xenia/cpu/cpu.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- ******************************************************************************
- * Xenia : Xbox 360 Emulator Research Project                                 *
- ******************************************************************************
- * Copyright 2013 Ben Vanik. All rights reserved.                             *
- * Released under the BSD license - see LICENSE in the root for more details. *
- ******************************************************************************
- */
-
-#ifndef XENIA_CPU_CPU_H_
-#define XENIA_CPU_CPU_H_
-
-#include "xenia/cpu/processor.h"
-#include "xenia/cpu/function.h"
-#include "xenia/cpu/module.h"
-#include "xenia/cpu/processor.h"
-#include "xenia/cpu/thread_state.h"
-#include "xenia/cpu/xex_module.h"
-
-#endif  // XENIA_CPU_CPU_H_
diff --git a/src/xenia/cpu/frontend/test/xe-cpu-ppc-test.cc b/src/xenia/cpu/frontend/test/xe-cpu-ppc-test.cc
index e541c840f..ef44a46c7 100644
--- a/src/xenia/cpu/frontend/test/xe-cpu-ppc-test.cc
+++ b/src/xenia/cpu/frontend/test/xe-cpu-ppc-test.cc
@@ -10,10 +10,10 @@
 #include "xenia/base/logging.h"
 #include "xenia/base/main.h"
 #include "xenia/base/math.h"
-#include "xenia/cpu/cpu.h"
 #include "xenia/cpu/backend/x64/x64_backend.h"
 #include "xenia/cpu/frontend/ppc_context.h"
 #include "xenia/cpu/frontend/ppc_frontend.h"
+#include "xenia/cpu/processor.h"
 #include "xenia/cpu/raw_module.h"
 
 #if !XE_PLATFORM_WIN32
@@ -31,7 +31,6 @@ namespace cpu {
 namespace test {
 
 using xe::cpu::frontend::PPCContext;
-using xe::cpu::Runtime;
 
 typedef std::vector<std::pair<std::string, std::string>> AnnotationList;
 
diff --git a/src/xenia/cpu/test/util.h b/src/xenia/cpu/test/util.h
index 8eb81b793..beae944af 100644
--- a/src/xenia/cpu/test/util.h
+++ b/src/xenia/cpu/test/util.h
@@ -12,10 +12,10 @@
 
 #include "xenia/base/main.h"
 #include "xenia/cpu/backend/x64/x64_backend.h"
-#include "xenia/cpu/cpu.h"
 #include "xenia/cpu/frontend/ppc_context.h"
 #include "xenia/cpu/frontend/ppc_frontend.h"
 #include "xenia/cpu/hir/hir_builder.h"
+#include "xenia/cpu/processor.h"
 #include "xenia/cpu/test_module.h"
 
 #include "third_party/catch/single_include/catch.hpp"
@@ -27,7 +27,6 @@ namespace cpu {
 namespace test {
 
 using xe::cpu::frontend::PPCContext;
-using xe::cpu::Runtime;
 
 class TestFunction {
  public:
diff --git a/src/xenia/cpu/test/xe-cpu-hir-test.cc b/src/xenia/cpu/test/xe-cpu-hir-test.cc
index 6b20a7b44..12b630a2b 100644
--- a/src/xenia/cpu/test/xe-cpu-hir-test.cc
+++ b/src/xenia/cpu/test/xe-cpu-hir-test.cc
@@ -19,7 +19,6 @@ namespace cpu {
 namespace test {
 
 using xe::cpu::frontend::PPCContext;
-using xe::cpu::Runtime;
 
 int main(std::vector<std::wstring>& args) {
   std::vector<std::string> narrow_args;
diff --git a/src/xenia/emulator.cc b/src/xenia/emulator.cc
index 01b568e1f..a2d9a70ea 100644
--- a/src/xenia/emulator.cc
+++ b/src/xenia/emulator.cc
@@ -15,7 +15,6 @@
 #include "xenia/base/assert.h"
 #include "xenia/base/clock.h"
 #include "xenia/base/string.h"
-#include "xenia/cpu/cpu.h"
 #include "xenia/gpu/gpu.h"
 #include "xenia/hid/hid.h"
 #include "xenia/kernel/kernel.h"
diff --git a/src/xenia/kernel/objects/xkernel_module.cc b/src/xenia/kernel/objects/xkernel_module.cc
index 9f714ebf9..2f436841c 100644
--- a/src/xenia/kernel/objects/xkernel_module.cc
+++ b/src/xenia/kernel/objects/xkernel_module.cc
@@ -10,7 +10,6 @@
 #include "xenia/kernel/objects/xkernel_module.h"
 
 #include "xenia/base/logging.h"
-#include "xenia/cpu/cpu.h"
 #include "xenia/emulator.h"
 #include "xenia/kernel/objects/xthread.h"
 
diff --git a/src/xenia/kernel/objects/xthread.cc b/src/xenia/kernel/objects/xthread.cc
index 9a6b22623..5815ba212 100644
--- a/src/xenia/kernel/objects/xthread.cc
+++ b/src/xenia/kernel/objects/xthread.cc
@@ -9,16 +9,16 @@
 
 #include "xenia/kernel/objects/xthread.h"
 
-#include <cstring>
-
 #include <gflags/gflags.h>
 
+#include <cstring>
+
 #include "xenia/base/clock.h"
 #include "xenia/base/logging.h"
 #include "xenia/base/math.h"
 #include "xenia/base/mutex.h"
 #include "xenia/base/threading.h"
-#include "xenia/cpu/cpu.h"
+#include "xenia/cpu/processor.h"
 #include "xenia/kernel/kernel_state.h"
 #include "xenia/kernel/native_list.h"
 #include "xenia/kernel/objects/xevent.h"
diff --git a/src/xenia/kernel/objects/xuser_module.cc b/src/xenia/kernel/objects/xuser_module.cc
index 830729aaa..cbf65d549 100644
--- a/src/xenia/kernel/objects/xuser_module.cc
+++ b/src/xenia/kernel/objects/xuser_module.cc
@@ -10,7 +10,8 @@
 #include "xenia/kernel/objects/xuser_module.h"
 
 #include "xenia/base/logging.h"
-#include "xenia/cpu/cpu.h"
+#include "xenia/cpu/processor.h"
+#include "xenia/cpu/xex_module.h"
 #include "xenia/emulator.h"
 #include "xenia/kernel/objects/xfile.h"
 #include "xenia/kernel/objects/xthread.h"
diff --git a/src/xenia/kernel/xboxkrnl_video.cc b/src/xenia/kernel/xboxkrnl_video.cc
index 9e6a9e833..7dfab0387 100644
--- a/src/xenia/kernel/xboxkrnl_video.cc
+++ b/src/xenia/kernel/xboxkrnl_video.cc
@@ -8,7 +8,6 @@
  */
 
 #include "xenia/base/logging.h"
-#include "xenia/cpu/cpu.h"
 #include "xenia/emulator.h"
 #include "xenia/gpu/graphics_system.h"
 #include "xenia/gpu/xenos.h"