From da2f7f1ea5ad11a58804458691bc3340335acd9b Mon Sep 17 00:00:00 2001
From: Ben Vanik <ben.vanik@gmail.com>
Date: Tue, 15 Oct 2013 23:09:51 -0700
Subject: [PATCH] Shuffling filesystem to xboxkrnl. This doesn't really change
 anything yet, just moves things. Also fixed some bad over-including.

---
 src/xenia/kernel/kernel_module.cc             | 29 +++++++++++++++++++
 src/xenia/kernel/kernel_module.h              | 16 ++--------
 src/xenia/kernel/modules/xam/xam_info.cc      |  1 +
 .../kernel/modules/xboxkrnl/async_request.h   |  1 +
 .../{ => modules/xboxkrnl}/fs/device.cc       |  4 +--
 .../kernel/{ => modules/xboxkrnl}/fs/device.h | 10 ++++---
 .../xboxkrnl}/fs/devices/disc_image_device.cc |  6 ++--
 .../xboxkrnl}/fs/devices/disc_image_device.h  | 10 ++++---
 .../fs/devices/local_directory_device.cc      |  4 +--
 .../fs/devices/local_directory_device.h       | 10 ++++---
 .../xboxkrnl}/fs/devices/sources.gypi         |  0
 .../kernel/{ => modules/xboxkrnl}/fs/entry.cc |  4 +--
 .../kernel/{ => modules/xboxkrnl}/fs/entry.h  |  8 +++--
 .../{ => modules/xboxkrnl}/fs/filesystem.cc   |  8 ++---
 .../{ => modules/xboxkrnl}/fs/filesystem.h    | 10 ++++---
 .../kernel/{ => modules/xboxkrnl}/fs/gdfx.cc  |  4 +--
 .../kernel/{ => modules/xboxkrnl}/fs/gdfx.h   | 10 ++++---
 .../{ => modules/xboxkrnl}/fs/sources.gypi    |  0
 .../kernel/modules/xboxkrnl/kernel_state.cc   |  1 +
 .../kernel/modules/xboxkrnl/kernel_state.h    | 13 +++++++--
 .../kernel/modules/xboxkrnl/objects/xfile.cc  |  2 +-
 .../kernel/modules/xboxkrnl/objects/xfile.h   |  2 +-
 .../modules/xboxkrnl/objects/xmodule.cc       |  2 ++
 .../modules/xboxkrnl/objects/xthread.cc       |  1 +
 .../kernel/modules/xboxkrnl/objects/xthread.h |  7 +++++
 .../kernel/modules/xboxkrnl/sources.gypi      |  1 +
 .../kernel/modules/xboxkrnl/xboxkrnl_io.cc    |  2 +-
 .../kernel/modules/xboxkrnl/xboxkrnl_video.cc |  1 +
 src/xenia/kernel/runtime.cc                   |  3 +-
 src/xenia/kernel/runtime.h                    |  8 +++--
 src/xenia/kernel/sources.gypi                 |  2 +-
 31 files changed, 119 insertions(+), 61 deletions(-)
 create mode 100644 src/xenia/kernel/kernel_module.cc
 rename src/xenia/kernel/{ => modules/xboxkrnl}/fs/device.cc (87%)
 rename src/xenia/kernel/{ => modules/xboxkrnl}/fs/device.h (76%)
 rename src/xenia/kernel/{ => modules/xboxkrnl}/fs/devices/disc_image_device.cc (95%)
 rename src/xenia/kernel/{ => modules/xboxkrnl}/fs/devices/disc_image_device.h (75%)
 rename src/xenia/kernel/{ => modules/xboxkrnl}/fs/devices/local_directory_device.cc (96%)
 rename src/xenia/kernel/{ => modules/xboxkrnl}/fs/devices/local_directory_device.h (73%)
 rename src/xenia/kernel/{ => modules/xboxkrnl}/fs/devices/sources.gypi (100%)
 rename src/xenia/kernel/{ => modules/xboxkrnl}/fs/entry.cc (94%)
 rename src/xenia/kernel/{ => modules/xboxkrnl}/fs/entry.h (89%)
 rename src/xenia/kernel/{ => modules/xboxkrnl}/fs/filesystem.cc (93%)
 rename src/xenia/kernel/{ => modules/xboxkrnl}/fs/filesystem.h (82%)
 rename src/xenia/kernel/{ => modules/xboxkrnl}/fs/gdfx.cc (98%)
 rename src/xenia/kernel/{ => modules/xboxkrnl}/fs/gdfx.h (89%)
 rename src/xenia/kernel/{ => modules/xboxkrnl}/fs/sources.gypi (100%)

diff --git a/src/xenia/kernel/kernel_module.cc b/src/xenia/kernel/kernel_module.cc
new file mode 100644
index 000000000..2cc1c18d7
--- /dev/null
+++ b/src/xenia/kernel/kernel_module.cc
@@ -0,0 +1,29 @@
+/**
+ ******************************************************************************
+ * 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. *
+ ******************************************************************************
+ */
+
+#include <xenia/kernel/kernel_module.h>
+
+#include <xenia/kernel/export.h>
+#include <xenia/kernel/runtime.h>
+
+
+using namespace xe;
+using namespace xe::kernel;
+
+
+KernelModule::KernelModule(Runtime* runtime) {
+  runtime_  = runtime;
+  memory_   = runtime->memory();
+  export_resolver_ = runtime->export_resolver();
+}
+
+KernelModule::~KernelModule() {
+  export_resolver_.reset();
+  xe_memory_release(memory_);
+}
diff --git a/src/xenia/kernel/kernel_module.h b/src/xenia/kernel/kernel_module.h
index 9c5133135..1d1876f85 100644
--- a/src/xenia/kernel/kernel_module.h
+++ b/src/xenia/kernel/kernel_module.h
@@ -13,29 +13,19 @@
 #include <xenia/common.h>
 #include <xenia/core.h>
 
-#include <xenia/kernel/export.h>
-#include <xenia/kernel/runtime.h>
-
 
 namespace xe {
 namespace kernel {
 
 
+class ExportResolver;
 class Runtime;
 
 
 class KernelModule {
 public:
-  KernelModule(Runtime* runtime) {
-    runtime_  = runtime;
-    memory_   = runtime->memory();
-    export_resolver_ = runtime->export_resolver();
-  }
-
-  virtual ~KernelModule() {
-    export_resolver_.reset();
-    xe_memory_release(memory_);
-  }
+  KernelModule(Runtime* runtime);
+  virtual ~KernelModule();
 
 protected:
   Runtime*        runtime_;
diff --git a/src/xenia/kernel/modules/xam/xam_info.cc b/src/xenia/kernel/modules/xam/xam_info.cc
index 70f9daa29..74b4da33f 100644
--- a/src/xenia/kernel/modules/xam/xam_info.cc
+++ b/src/xenia/kernel/modules/xam/xam_info.cc
@@ -10,6 +10,7 @@
 #include <xenia/kernel/modules/xam/xam_info.h>
 
 #include <xenia/kernel/shim_utils.h>
+#include <xenia/kernel/xex2.h>
 #include <xenia/kernel/modules/xam/xam_private.h>
 #include <xenia/kernel/modules/xam/xam_state.h>
 
diff --git a/src/xenia/kernel/modules/xboxkrnl/async_request.h b/src/xenia/kernel/modules/xboxkrnl/async_request.h
index c4d05291b..21558fce3 100644
--- a/src/xenia/kernel/modules/xboxkrnl/async_request.h
+++ b/src/xenia/kernel/modules/xboxkrnl/async_request.h
@@ -21,6 +21,7 @@ namespace kernel {
 namespace xboxkrnl {
 
 class XEvent;
+class XObject;
 
 
 class XAsyncRequest {
diff --git a/src/xenia/kernel/fs/device.cc b/src/xenia/kernel/modules/xboxkrnl/fs/device.cc
similarity index 87%
rename from src/xenia/kernel/fs/device.cc
rename to src/xenia/kernel/modules/xboxkrnl/fs/device.cc
index d49c56362..e436a442e 100644
--- a/src/xenia/kernel/fs/device.cc
+++ b/src/xenia/kernel/modules/xboxkrnl/fs/device.cc
@@ -7,12 +7,12 @@
  ******************************************************************************
  */
 
-#include <xenia/kernel/fs/device.h>
+#include <xenia/kernel/modules/xboxkrnl/fs/device.h>
 
 
 using namespace xe;
 using namespace xe::kernel;
-using namespace xe::kernel::fs;
+using namespace xe::kernel::xboxkrnl::fs;
 
 
 Device::Device(const char* path) {
diff --git a/src/xenia/kernel/fs/device.h b/src/xenia/kernel/modules/xboxkrnl/fs/device.h
similarity index 76%
rename from src/xenia/kernel/fs/device.h
rename to src/xenia/kernel/modules/xboxkrnl/fs/device.h
index 8ad650202..3b13e1c96 100644
--- a/src/xenia/kernel/fs/device.h
+++ b/src/xenia/kernel/modules/xboxkrnl/fs/device.h
@@ -7,17 +7,18 @@
  ******************************************************************************
  */
 
-#ifndef XENIA_KERNEL_FS_DEVICE_H_
-#define XENIA_KERNEL_FS_DEVICE_H_
+#ifndef XENIA_KERNEL_MODULES_XBOXKRNL_FS_DEVICE_H_
+#define XENIA_KERNEL_MODULES_XBOXKRNL_FS_DEVICE_H_
 
 #include <xenia/common.h>
 #include <xenia/core.h>
 
-#include <xenia/kernel/fs/entry.h>
+#include <xenia/kernel/modules/xboxkrnl/fs/entry.h>
 
 
 namespace xe {
 namespace kernel {
+namespace xboxkrnl {
 namespace fs {
 
 
@@ -36,8 +37,9 @@ protected:
 
 
 }  // namespace fs
+}  // namespace xboxkrnl
 }  // namespace kernel
 }  // namespace xe
 
 
-#endif  // XENIA_KERNEL_FS_DEVICE_H_
+#endif  // XENIA_KERNEL_MODULES_XBOXKRNL_FS_DEVICE_H_
diff --git a/src/xenia/kernel/fs/devices/disc_image_device.cc b/src/xenia/kernel/modules/xboxkrnl/fs/devices/disc_image_device.cc
similarity index 95%
rename from src/xenia/kernel/fs/devices/disc_image_device.cc
rename to src/xenia/kernel/modules/xboxkrnl/fs/devices/disc_image_device.cc
index 7a0abc6ab..0b3736fe3 100644
--- a/src/xenia/kernel/fs/devices/disc_image_device.cc
+++ b/src/xenia/kernel/modules/xboxkrnl/fs/devices/disc_image_device.cc
@@ -7,14 +7,14 @@
  ******************************************************************************
  */
 
-#include <xenia/kernel/fs/devices/disc_image_device.h>
+#include <xenia/kernel/modules/xboxkrnl/fs/devices/disc_image_device.h>
 
-#include <xenia/kernel/fs/gdfx.h>
+#include <xenia/kernel/modules/xboxkrnl/fs/gdfx.h>
 
 
 using namespace xe;
 using namespace xe::kernel;
-using namespace xe::kernel::fs;
+using namespace xe::kernel::xboxkrnl::fs;
 
 
 namespace {
diff --git a/src/xenia/kernel/fs/devices/disc_image_device.h b/src/xenia/kernel/modules/xboxkrnl/fs/devices/disc_image_device.h
similarity index 75%
rename from src/xenia/kernel/fs/devices/disc_image_device.h
rename to src/xenia/kernel/modules/xboxkrnl/fs/devices/disc_image_device.h
index 361affda0..93e505ecd 100644
--- a/src/xenia/kernel/fs/devices/disc_image_device.h
+++ b/src/xenia/kernel/modules/xboxkrnl/fs/devices/disc_image_device.h
@@ -7,17 +7,18 @@
  ******************************************************************************
  */
 
-#ifndef XENIA_KERNEL_FS_DEVICES_DISC_IMAGE_DEVICE_H_
-#define XENIA_KERNEL_FS_DEVICES_DISC_IMAGE_DEVICE_H_
+#ifndef XENIA_KERNEL_MODULES_XBOXKRNL_FS_DEVICES_DISC_IMAGE_DEVICE_H_
+#define XENIA_KERNEL_MODULES_XBOXKRNL_FS_DEVICES_DISC_IMAGE_DEVICE_H_
 
 #include <xenia/common.h>
 #include <xenia/core.h>
 
-#include <xenia/kernel/fs/device.h>
+#include <xenia/kernel/modules/xboxkrnl/fs/device.h>
 
 
 namespace xe {
 namespace kernel {
+namespace xboxkrnl {
 namespace fs {
 
 
@@ -41,8 +42,9 @@ private:
 
 
 }  // namespace fs
+}  // namespace xboxkrnl
 }  // namespace kernel
 }  // namespace xe
 
 
-#endif  // XENIA_KERNEL_FS_DEVICES_DISC_IMAGE_DEVICE_H_
+#endif  // XENIA_KERNEL_MODULES_XBOXKRNL_FS_DEVICES_DISC_IMAGE_DEVICE_H_
diff --git a/src/xenia/kernel/fs/devices/local_directory_device.cc b/src/xenia/kernel/modules/xboxkrnl/fs/devices/local_directory_device.cc
similarity index 96%
rename from src/xenia/kernel/fs/devices/local_directory_device.cc
rename to src/xenia/kernel/modules/xboxkrnl/fs/devices/local_directory_device.cc
index 694d804d4..eeae6ccea 100644
--- a/src/xenia/kernel/fs/devices/local_directory_device.cc
+++ b/src/xenia/kernel/modules/xboxkrnl/fs/devices/local_directory_device.cc
@@ -7,12 +7,12 @@
  ******************************************************************************
  */
 
-#include <xenia/kernel/fs/devices/local_directory_device.h>
+#include <xenia/kernel/modules/xboxkrnl/fs/devices/local_directory_device.h>
 
 
 using namespace xe;
 using namespace xe::kernel;
-using namespace xe::kernel::fs;
+using namespace xe::kernel::xboxkrnl::fs;
 
 
 namespace {
diff --git a/src/xenia/kernel/fs/devices/local_directory_device.h b/src/xenia/kernel/modules/xboxkrnl/fs/devices/local_directory_device.h
similarity index 73%
rename from src/xenia/kernel/fs/devices/local_directory_device.h
rename to src/xenia/kernel/modules/xboxkrnl/fs/devices/local_directory_device.h
index 4a0fbd1ee..be881781b 100644
--- a/src/xenia/kernel/fs/devices/local_directory_device.h
+++ b/src/xenia/kernel/modules/xboxkrnl/fs/devices/local_directory_device.h
@@ -7,17 +7,18 @@
  ******************************************************************************
  */
 
-#ifndef XENIA_KERNEL_FS_DEVICES_LOCAL_DIRECTORY_DEVICE_H_
-#define XENIA_KERNEL_FS_DEVICES_LOCAL_DIRECTORY_DEVICE_H_
+#ifndef XENIA_KERNEL_MODULES_XBOXKRNL_FS_DEVICES_LOCAL_DIRECTORY_DEVICE_H_
+#define XENIA_KERNEL_MODULES_XBOXKRNL_FS_DEVICES_LOCAL_DIRECTORY_DEVICE_H_
 
 #include <xenia/common.h>
 #include <xenia/core.h>
 
-#include <xenia/kernel/fs/device.h>
+#include <xenia/kernel/modules/xboxkrnl/fs/device.h>
 
 
 namespace xe {
 namespace kernel {
+namespace xboxkrnl {
 namespace fs {
 
 
@@ -34,8 +35,9 @@ private:
 
 
 }  // namespace fs
+}  // namespace xboxkrnl
 }  // namespace kernel
 }  // namespace xe
 
 
-#endif  // XENIA_KERNEL_FS_DEVICES_LOCAL_DIRECTORY_DEVICE_H_
+#endif  // XENIA_KERNEL_MODULES_XBOXKRNL_FS_DEVICES_LOCAL_DIRECTORY_DEVICE_H_
diff --git a/src/xenia/kernel/fs/devices/sources.gypi b/src/xenia/kernel/modules/xboxkrnl/fs/devices/sources.gypi
similarity index 100%
rename from src/xenia/kernel/fs/devices/sources.gypi
rename to src/xenia/kernel/modules/xboxkrnl/fs/devices/sources.gypi
diff --git a/src/xenia/kernel/fs/entry.cc b/src/xenia/kernel/modules/xboxkrnl/fs/entry.cc
similarity index 94%
rename from src/xenia/kernel/fs/entry.cc
rename to src/xenia/kernel/modules/xboxkrnl/fs/entry.cc
index da8e5ed29..4d5b8b909 100644
--- a/src/xenia/kernel/fs/entry.cc
+++ b/src/xenia/kernel/modules/xboxkrnl/fs/entry.cc
@@ -7,12 +7,12 @@
  ******************************************************************************
  */
 
-#include <xenia/kernel/fs/entry.h>
+#include <xenia/kernel/modules/xboxkrnl/fs/entry.h>
 
 
 using namespace xe;
 using namespace xe::kernel;
-using namespace xe::kernel::fs;
+using namespace xe::kernel::xboxkrnl::fs;
 
 
 Entry::Entry(Type type, Device* device, const char* path) :
diff --git a/src/xenia/kernel/fs/entry.h b/src/xenia/kernel/modules/xboxkrnl/fs/entry.h
similarity index 89%
rename from src/xenia/kernel/fs/entry.h
rename to src/xenia/kernel/modules/xboxkrnl/fs/entry.h
index a9e0e49a5..d56d8f437 100644
--- a/src/xenia/kernel/fs/entry.h
+++ b/src/xenia/kernel/modules/xboxkrnl/fs/entry.h
@@ -7,8 +7,8 @@
  ******************************************************************************
  */
 
-#ifndef XENIA_KERNEL_FS_ENTRY_H_
-#define XENIA_KERNEL_FS_ENTRY_H_
+#ifndef XENIA_KERNEL_MODULES_XBOXKRNL_FS_ENTRY_H_
+#define XENIA_KERNEL_MODULES_XBOXKRNL_FS_ENTRY_H_
 
 #include <xenia/common.h>
 #include <xenia/core.h>
@@ -16,6 +16,7 @@
 
 namespace xe {
 namespace kernel {
+namespace xboxkrnl {
 namespace fs {
 
 
@@ -81,8 +82,9 @@ public:
 
 
 }  // namespace fs
+}  // namespace xboxkrnl
 }  // namespace kernel
 }  // namespace xe
 
 
-#endif  // XENIA_KERNEL_FS_ENTRY_H_
+#endif  // XENIA_KERNEL_MODULES_XBOXKRNL_FS_ENTRY_H_
diff --git a/src/xenia/kernel/fs/filesystem.cc b/src/xenia/kernel/modules/xboxkrnl/fs/filesystem.cc
similarity index 93%
rename from src/xenia/kernel/fs/filesystem.cc
rename to src/xenia/kernel/modules/xboxkrnl/fs/filesystem.cc
index 4c1f867e7..3ef4e04ba 100644
--- a/src/xenia/kernel/fs/filesystem.cc
+++ b/src/xenia/kernel/modules/xboxkrnl/fs/filesystem.cc
@@ -7,15 +7,15 @@
  ******************************************************************************
  */
 
-#include <xenia/kernel/fs/filesystem.h>
+#include <xenia/kernel/modules/xboxkrnl/fs/filesystem.h>
 
-#include <xenia/kernel/fs/devices/disc_image_device.h>
-#include <xenia/kernel/fs/devices/local_directory_device.h>
+#include <xenia/kernel/modules/xboxkrnl/fs/devices/disc_image_device.h>
+#include <xenia/kernel/modules/xboxkrnl/fs/devices/local_directory_device.h>
 
 
 using namespace xe;
 using namespace xe::kernel;
-using namespace xe::kernel::fs;
+using namespace xe::kernel::xboxkrnl::fs;
 
 
 FileSystem::FileSystem() {
diff --git a/src/xenia/kernel/fs/filesystem.h b/src/xenia/kernel/modules/xboxkrnl/fs/filesystem.h
similarity index 82%
rename from src/xenia/kernel/fs/filesystem.h
rename to src/xenia/kernel/modules/xboxkrnl/fs/filesystem.h
index cc99a8bd3..802238dee 100644
--- a/src/xenia/kernel/fs/filesystem.h
+++ b/src/xenia/kernel/modules/xboxkrnl/fs/filesystem.h
@@ -7,19 +7,20 @@
  ******************************************************************************
  */
 
-#ifndef XENIA_KERNEL_FS_FILESYSTEM_H_
-#define XENIA_KERNEL_FS_FILESYSTEM_H_
+#ifndef XENIA_KERNEL_MODULES_XBOXKRNL_FS_FILESYSTEM_H_
+#define XENIA_KERNEL_MODULES_XBOXKRNL_FS_FILESYSTEM_H_
 
 #include <xenia/common.h>
 #include <xenia/core.h>
 
 #include <vector>
 
-#include <xenia/kernel/fs/entry.h>
+#include <xenia/kernel/modules/xboxkrnl/fs/entry.h>
 
 
 namespace xe {
 namespace kernel {
+namespace xboxkrnl {
 namespace fs {
 
 
@@ -48,8 +49,9 @@ private:
 
 
 }  // namespace fs
+}  // namespace xboxkrnl
 }  // namespace kernel
 }  // namespace xe
 
 
-#endif  // XENIA_KERNEL_FS_FILESYSTEM_H_
+#endif  // XENIA_KERNEL_MODULES_XBOXKRNL_FS_FILESYSTEM_H_
diff --git a/src/xenia/kernel/fs/gdfx.cc b/src/xenia/kernel/modules/xboxkrnl/fs/gdfx.cc
similarity index 98%
rename from src/xenia/kernel/fs/gdfx.cc
rename to src/xenia/kernel/modules/xboxkrnl/fs/gdfx.cc
index 87a23988f..9ff9af68c 100644
--- a/src/xenia/kernel/fs/gdfx.cc
+++ b/src/xenia/kernel/modules/xboxkrnl/fs/gdfx.cc
@@ -9,12 +9,12 @@
  * - abgx360
  */
 
-#include <xenia/kernel/fs/gdfx.h>
+#include <xenia/kernel/modules/xboxkrnl/fs/gdfx.h>
 
 
 using namespace xe;
 using namespace xe::kernel;
-using namespace xe::kernel::fs;
+using namespace xe::kernel::xboxkrnl::fs;
 
 
 namespace {
diff --git a/src/xenia/kernel/fs/gdfx.h b/src/xenia/kernel/modules/xboxkrnl/fs/gdfx.h
similarity index 89%
rename from src/xenia/kernel/fs/gdfx.h
rename to src/xenia/kernel/modules/xboxkrnl/fs/gdfx.h
index 584d1f273..a77de5b34 100644
--- a/src/xenia/kernel/fs/gdfx.h
+++ b/src/xenia/kernel/modules/xboxkrnl/fs/gdfx.h
@@ -7,19 +7,20 @@
  ******************************************************************************
  */
 
-#ifndef XENIA_KERNEL_FS_GDFX_H_
-#define XENIA_KERNEL_FS_GDFX_H_
+#ifndef XENIA_KERNEL_MODULES_XBOXKRNL_FS_GDFX_H_
+#define XENIA_KERNEL_MODULES_XBOXKRNL_FS_GDFX_H_
 
 #include <xenia/common.h>
 #include <xenia/core.h>
 
 #include <vector>
 
-#include <xenia/kernel/fs/entry.h>
+#include <xenia/kernel/modules/xboxkrnl/fs/entry.h>
 
 
 namespace xe {
 namespace kernel {
+namespace xboxkrnl {
 namespace fs {
 
 
@@ -98,8 +99,9 @@ private:
 
 
 }  // namespace fs
+}  // namespace xboxkrnl
 }  // namespace kernel
 }  // namespace xe
 
 
-#endif  // XENIA_KERNEL_FS_GDFX_H_
+#endif  // XENIA_KERNEL_MODULES_XBOXKRNL_FS_GDFX_H_
diff --git a/src/xenia/kernel/fs/sources.gypi b/src/xenia/kernel/modules/xboxkrnl/fs/sources.gypi
similarity index 100%
rename from src/xenia/kernel/fs/sources.gypi
rename to src/xenia/kernel/modules/xboxkrnl/fs/sources.gypi
diff --git a/src/xenia/kernel/modules/xboxkrnl/kernel_state.cc b/src/xenia/kernel/modules/xboxkrnl/kernel_state.cc
index 467906ef7..7f0c3bff2 100644
--- a/src/xenia/kernel/modules/xboxkrnl/kernel_state.cc
+++ b/src/xenia/kernel/modules/xboxkrnl/kernel_state.cc
@@ -9,6 +9,7 @@
 
 #include <xenia/kernel/modules/xboxkrnl/kernel_state.h>
 
+#include <xenia/kernel/runtime.h>
 #include <xenia/kernel/modules/xboxkrnl/xobject.h>
 #include <xenia/kernel/modules/xboxkrnl/objects/xmodule.h>
 #include <xenia/kernel/modules/xboxkrnl/objects/xthread.h>
diff --git a/src/xenia/kernel/modules/xboxkrnl/kernel_state.h b/src/xenia/kernel/modules/xboxkrnl/kernel_state.h
index 3ba1bf629..0393bec7d 100644
--- a/src/xenia/kernel/modules/xboxkrnl/kernel_state.h
+++ b/src/xenia/kernel/modules/xboxkrnl/kernel_state.h
@@ -16,16 +16,25 @@
 #include <xenia/kernel/export.h>
 #include <xenia/kernel/kernel_module.h>
 #include <xenia/kernel/xbox.h>
-#include <xenia/kernel/fs/filesystem.h>
 #include <xenia/kernel/modules/xboxkrnl/object_table.h>
+#include <xenia/kernel/modules/xboxkrnl/fs/filesystem.h>
+
+
+namespace xe {
+namespace cpu {
+class Processor;
+}
+}
 
 
 namespace xe {
 namespace kernel {
 namespace xboxkrnl {
 
-
 class XModule;
+namespace fs {
+class FileSystem;
+}
 
 
 class KernelState {
diff --git a/src/xenia/kernel/modules/xboxkrnl/objects/xfile.cc b/src/xenia/kernel/modules/xboxkrnl/objects/xfile.cc
index d82c50910..95924a062 100644
--- a/src/xenia/kernel/modules/xboxkrnl/objects/xfile.cc
+++ b/src/xenia/kernel/modules/xboxkrnl/objects/xfile.cc
@@ -14,8 +14,8 @@
 
 using namespace xe;
 using namespace xe::kernel;
-using namespace xe::kernel::fs;
 using namespace xe::kernel::xboxkrnl;
+using namespace xe::kernel::xboxkrnl::fs;
 
 
 XFile::XFile(KernelState* kernel_state, FileEntry* entry) :
diff --git a/src/xenia/kernel/modules/xboxkrnl/objects/xfile.h b/src/xenia/kernel/modules/xboxkrnl/objects/xfile.h
index b30ae4702..1218ab9ff 100644
--- a/src/xenia/kernel/modules/xboxkrnl/objects/xfile.h
+++ b/src/xenia/kernel/modules/xboxkrnl/objects/xfile.h
@@ -13,8 +13,8 @@
 #include <xenia/kernel/modules/xboxkrnl/xobject.h>
 
 #include <xenia/kernel/xbox.h>
-#include <xenia/kernel/fs/entry.h>
 #include <xenia/kernel/modules/xboxkrnl/async_request.h>
+#include <xenia/kernel/modules/xboxkrnl/fs/entry.h>
 
 
 namespace xe {
diff --git a/src/xenia/kernel/modules/xboxkrnl/objects/xmodule.cc b/src/xenia/kernel/modules/xboxkrnl/objects/xmodule.cc
index 8becd31c1..2578f330c 100644
--- a/src/xenia/kernel/modules/xboxkrnl/objects/xmodule.cc
+++ b/src/xenia/kernel/modules/xboxkrnl/objects/xmodule.cc
@@ -9,6 +9,8 @@
 
 #include <xenia/kernel/modules/xboxkrnl/objects/xmodule.h>
 
+#include <xenia/cpu/cpu.h>
+#include <xenia/kernel/runtime.h>
 #include <xenia/kernel/modules/xboxkrnl/objects/xthread.h>
 
 
diff --git a/src/xenia/kernel/modules/xboxkrnl/objects/xthread.cc b/src/xenia/kernel/modules/xboxkrnl/objects/xthread.cc
index e2d04f5e1..2162732cb 100644
--- a/src/xenia/kernel/modules/xboxkrnl/objects/xthread.cc
+++ b/src/xenia/kernel/modules/xboxkrnl/objects/xthread.cc
@@ -9,6 +9,7 @@
 
 #include <xenia/kernel/modules/xboxkrnl/objects/xthread.h>
 
+#include <xenia/cpu/cpu.h>
 #include <xenia/kernel/modules/xboxkrnl/objects/xevent.h>
 #include <xenia/kernel/modules/xboxkrnl/objects/xmodule.h>
 
diff --git a/src/xenia/kernel/modules/xboxkrnl/objects/xthread.h b/src/xenia/kernel/modules/xboxkrnl/objects/xthread.h
index 46a481c29..baff6c077 100644
--- a/src/xenia/kernel/modules/xboxkrnl/objects/xthread.h
+++ b/src/xenia/kernel/modules/xboxkrnl/objects/xthread.h
@@ -15,6 +15,13 @@
 #include <xenia/kernel/xbox.h>
 
 
+namespace xe {
+namespace cpu {
+class ThreadState;
+}
+}
+
+
 namespace xe {
 namespace kernel {
 namespace xboxkrnl {
diff --git a/src/xenia/kernel/modules/xboxkrnl/sources.gypi b/src/xenia/kernel/modules/xboxkrnl/sources.gypi
index 4cdca38cd..c712d6163 100644
--- a/src/xenia/kernel/modules/xboxkrnl/sources.gypi
+++ b/src/xenia/kernel/modules/xboxkrnl/sources.gypi
@@ -37,6 +37,7 @@
   ],
 
   'includes': [
+    'fs/sources.gypi',
     'objects/sources.gypi',
   ],
 }
diff --git a/src/xenia/kernel/modules/xboxkrnl/xboxkrnl_io.cc b/src/xenia/kernel/modules/xboxkrnl/xboxkrnl_io.cc
index f8b5eecdb..d842d0a66 100644
--- a/src/xenia/kernel/modules/xboxkrnl/xboxkrnl_io.cc
+++ b/src/xenia/kernel/modules/xboxkrnl/xboxkrnl_io.cc
@@ -17,8 +17,8 @@
 
 using namespace xe;
 using namespace xe::kernel;
-using namespace xe::kernel::fs;
 using namespace xe::kernel::xboxkrnl;
+using namespace xe::kernel::xboxkrnl::fs;
 
 
 namespace xe {
diff --git a/src/xenia/kernel/modules/xboxkrnl/xboxkrnl_video.cc b/src/xenia/kernel/modules/xboxkrnl/xboxkrnl_video.cc
index fc62b85f5..720258272 100644
--- a/src/xenia/kernel/modules/xboxkrnl/xboxkrnl_video.cc
+++ b/src/xenia/kernel/modules/xboxkrnl/xboxkrnl_video.cc
@@ -9,6 +9,7 @@
 
 #include <xenia/kernel/modules/xboxkrnl/xboxkrnl_video.h>
 
+#include <xenia/cpu/cpu.h>
 #include <xenia/gpu/gpu.h>
 #include <xenia/kernel/shim_utils.h>
 #include <xenia/kernel/modules/xboxkrnl/kernel_state.h>
diff --git a/src/xenia/kernel/runtime.cc b/src/xenia/kernel/runtime.cc
index 201458ad2..ab00b55f1 100644
--- a/src/xenia/kernel/runtime.cc
+++ b/src/xenia/kernel/runtime.cc
@@ -10,12 +10,13 @@
 #include <xenia/kernel/runtime.h>
 
 #include <xenia/kernel/modules/modules.h>
+#include <xenia/kernel/modules/xboxkrnl/fs/filesystem.h>
 
 
 using namespace xe;
 using namespace xe::cpu;
 using namespace xe::kernel;
-using namespace xe::kernel::fs;
+using namespace xe::kernel::xboxkrnl::fs;
 
 
 Runtime::Runtime(shared_ptr<cpu::Processor> processor,
diff --git a/src/xenia/kernel/runtime.h b/src/xenia/kernel/runtime.h
index d530493d6..7553e548b 100644
--- a/src/xenia/kernel/runtime.h
+++ b/src/xenia/kernel/runtime.h
@@ -16,7 +16,6 @@
 
 #include <xenia/kernel/export.h>
 #include <xenia/kernel/xex2.h>
-#include <xenia/kernel/fs/filesystem.h>
 
 
 namespace xe {
@@ -26,6 +25,9 @@ namespace cpu {
 namespace kernel {
 namespace xboxkrnl {
   class XboxkrnlModule;
+namespace fs {
+  class FileSystem;
+}
 }
 namespace xam {
   class XamModule;
@@ -50,7 +52,7 @@ public:
   xe_memory_ref memory();
   shared_ptr<cpu::Processor> processor();
   shared_ptr<ExportResolver> export_resolver();
-  shared_ptr<fs::FileSystem> filesystem();
+  shared_ptr<xboxkrnl::fs::FileSystem> filesystem();
 
   int LaunchXexFile(const xechar_t* path);
   int LaunchDiscImage(const xechar_t* path);
@@ -61,7 +63,7 @@ private:
   xe_memory_ref   memory_;
   shared_ptr<cpu::Processor> processor_;
   shared_ptr<ExportResolver> export_resolver_;
-  shared_ptr<fs::FileSystem> filesystem_;
+  shared_ptr<xboxkrnl::fs::FileSystem> filesystem_;
 
   auto_ptr<xboxkrnl::XboxkrnlModule> xboxkrnl_;
   auto_ptr<xam::XamModule> xam_;
diff --git a/src/xenia/kernel/sources.gypi b/src/xenia/kernel/sources.gypi
index 8e66c629f..1d205ae61 100644
--- a/src/xenia/kernel/sources.gypi
+++ b/src/xenia/kernel/sources.gypi
@@ -4,6 +4,7 @@
     'export.cc',
     'export.h',
     'kernel.h',
+    'kernel_module.cc',
     'kernel_module.h',
     'runtime.cc',
     'runtime.h',
@@ -15,7 +16,6 @@
   ],
 
   'includes': [
-    'fs/sources.gypi',
     'modules/sources.gypi',
     'util/sources.gypi',
   ],