Removing old run loop/ref/core/etc.

src/xenia/kernel/app.h

@@ -14,7 +14,7 @@
 #include <vector>
 
 #include <xenia/common.h>
-#include <xenia/core.h>
+#include <xenia/memory.h>
 #include <xenia/xbox.h>
 
 namespace xe {

src/xenia/kernel/apps/apps.h

@@ -11,8 +11,6 @@
 #define XENIA_KERNEL_XBOXKRNL_APPS_APPS_H_
 
 #include <xenia/common.h>
-#include <xenia/core.h>
-
 #include <xenia/kernel/app.h>
 #include <xenia/kernel/kernel_state.h>
 

src/xenia/kernel/apps/xmp_app.h

@@ -11,8 +11,6 @@
 #define XENIA_KERNEL_XBOXKRNL_APPS_XMP_APP_H_
 
 #include <xenia/common.h>
-#include <xenia/core.h>
-
 #include <xenia/kernel/app.h>
 #include <xenia/kernel/kernel_state.h>
 

src/xenia/kernel/async_request.h

@@ -13,7 +13,6 @@
 #include <vector>
 
 #include <xenia/common.h>
-#include <xenia/core.h>
 #include <xenia/xbox.h>
 
 namespace xe {

src/xenia/kernel/dispatcher.h

@@ -13,8 +13,6 @@
 #include <mutex>
 
 #include <xenia/common.h>
-#include <xenia/core.h>
-
 #include <xenia/xbox.h>
 
 namespace xe {

src/xenia/kernel/fs/device.h

@@ -13,7 +13,7 @@
 #include <memory>
 #include <string>
 
-#include <xenia/core.h>
+#include <xenia/common.h>
 #include <xenia/kernel/fs/entry.h>
 
 namespace xe {

src/xenia/kernel/fs/devices/disc_image_device.h

@@ -15,7 +15,6 @@
 
 #include <poly/mapped_memory.h>
 #include <xenia/common.h>
-#include <xenia/core.h>
 #include <xenia/kernel/fs/device.h>
 
 namespace xe {

src/xenia/kernel/fs/devices/disc_image_entry.h

@@ -14,7 +14,6 @@
 
 #include <poly/mapped_memory.h>
 #include <xenia/common.h>
-#include <xenia/core.h>
 #include <xenia/kernel/fs/entry.h>
 
 namespace xe {

src/xenia/kernel/fs/devices/disc_image_file.h

@@ -11,7 +11,6 @@
 #define XENIA_KERNEL_FS_DEVICES_DISC_IMAGE_FILE_H_
 
 #include <xenia/common.h>
-#include <xenia/core.h>
 #include <xenia/kernel/objects/xfile.h>
 
 namespace xe {

src/xenia/kernel/fs/devices/host_path_device.h

@@ -13,7 +13,6 @@
 #include <string>
 
 #include <xenia/common.h>
-#include <xenia/core.h>
 #include <xenia/kernel/fs/device.h>
 
 namespace xe {

src/xenia/kernel/fs/devices/host_path_entry.h

@@ -11,7 +11,6 @@
 #define XENIA_KERNEL_FS_DEVICES_HOST_PATH_ENTRY_H_
 
 #include <xenia/common.h>
-#include <xenia/core.h>
 #include <xenia/kernel/fs/entry.h>
 
 namespace xe {

src/xenia/kernel/fs/devices/host_path_file.h

@@ -13,7 +13,6 @@
 #include <string>
 
 #include <xenia/common.h>
-#include <xenia/core.h>
 #include <xenia/kernel/objects/xfile.h>
 
 namespace xe {

src/xenia/kernel/fs/devices/stfs_container_device.h

@@ -15,7 +15,6 @@
 
 #include <poly/mapped_memory.h>
 #include <xenia/common.h>
-#include <xenia/core.h>
 #include <xenia/kernel/fs/device.h>
 
 namespace xe {

src/xenia/kernel/fs/devices/stfs_container_entry.h

@@ -14,7 +14,6 @@
 
 #include <poly/mapped_memory.h>
 #include <xenia/common.h>
-#include <xenia/core.h>
 #include <xenia/kernel/fs/entry.h>
 
 namespace xe {

src/xenia/kernel/fs/devices/stfs_container_file.h

@@ -11,8 +11,6 @@
 #define XENIA_KERNEL_FS_DEVICES_STFS_CONTAINER_FILE_H_
 
 #include <xenia/common.h>
-#include <xenia/core.h>
-
 #include <xenia/kernel/objects/xfile.h>
 
 namespace xe {

src/xenia/kernel/fs/entry.h

@@ -13,7 +13,7 @@
 #include <memory>
 #include <string>
 
-#include <xenia/core.h>
+#include <xenia/common.h>
 #include <xenia/xbox.h>
 
 namespace xe {

src/xenia/kernel/fs/filesystem.h

@@ -16,8 +16,6 @@
 #include <vector>
 
 #include <xenia/common.h>
-#include <xenia/core.h>
-
 #include <xenia/kernel/fs/entry.h>
 
 namespace xe {

src/xenia/kernel/fs/gdfx.h

@@ -13,7 +13,7 @@
 #include <vector>
 
 #include <poly/mapped_memory.h>
-#include <xenia/core.h>
+#include <xenia/common.h>
 #include <xenia/xbox.h>
 #include <xenia/kernel/fs/entry.h>
 

src/xenia/kernel/fs/stfs.h

@@ -14,7 +14,7 @@
 #include <vector>
 
 #include <poly/mapped_memory.h>
-#include <xenia/core.h>
+#include <xenia/common.h>
 #include <xenia/xbox.h>
 #include <xenia/kernel/fs/entry.h>
 

src/xenia/kernel/kernel_state.h

@@ -14,14 +14,13 @@
 #include <mutex>
 
 #include <xenia/common.h>
-#include <xenia/core.h>
-
 #include <xenia/export_resolver.h>
-#include <xenia/xbox.h>
 #include <xenia/kernel/app.h>
+#include <xenia/kernel/fs/filesystem.h>
 #include <xenia/kernel/object_table.h>
 #include <xenia/kernel/user_profile.h>
-#include <xenia/kernel/fs/filesystem.h>
+#include <xenia/memory.h>
+#include <xenia/xbox.h>
 
 namespace xe {
 class Emulator;

src/xenia/kernel/native_list.h

@@ -11,8 +11,7 @@
 #define XENIA_KERNEL_XBOXKRNL_NATIVE_LIST_H_
 
 #include <xenia/common.h>
-#include <xenia/core.h>
-
+#include <xenia/memory.h>
 #include <xenia/xbox.h>
 
 namespace xe {

src/xenia/kernel/object_table.h

@@ -13,8 +13,6 @@
 #include <mutex>
 
 #include <xenia/common.h>
-#include <xenia/core.h>
-
 #include <xenia/xbox.h>
 
 namespace xe {

src/xenia/kernel/objects/xuser_module.cc

@@ -20,11 +20,11 @@ namespace kernel {
 using namespace xe::cpu;
 
 XUserModule::XUserModule(KernelState* kernel_state, const char* path)
-    : XModule(kernel_state, path), xex_(NULL) {}
+    : XModule(kernel_state, path), xex_(nullptr) {}
 
-XUserModule::~XUserModule() { xe_xex2_release(xex_); }
+XUserModule::~XUserModule() { xe_xex2_dealloc(xex_); }
 
-xe_xex2_ref XUserModule::xex() { return xe_xex2_retain(xex_); }
+xe_xex2_ref XUserModule::xex() { return xex_; }
 
 const xe_xex2_header_t* XUserModule::xex_header() {
   return xe_xex2_get_header(xex_);
@@ -50,33 +50,52 @@ X_STATUS XUserModule::LoadFromFile(const char* path) {
   if (fs_entry->can_map()) {
     // Map.
     auto mmap = fs_entry->CreateMemoryMapping(fs::Mode::READ, 0, 0);
-    XEEXPECTNOTNULL(mmap);
+    if (!mmap) {
+      if (file) {
+        file->Release();
+      }
+      return result;
+    }
 
     // Load the module.
     result = LoadFromMemory(mmap->address(), mmap->length());
   } else {
     XFileInfo file_info;
     result = fs_entry->QueryInfo(&file_info);
-    XEEXPECTZERO(result);
+    if (result) {
+      if (file) {
+        file->Release();
+      }
+      return result;
+    }
 
     std::vector<uint8_t> buffer(file_info.file_length);
 
     // Open file for reading.
     result = kernel_state()->file_system()->Open(
         std::move(fs_entry), kernel_state(), fs::Mode::READ, false, &file);
-    XEEXPECTZERO(result);
+    if (result) {
+      if (file) {
+        file->Release();
+      }
+      return result;
+    }
 
     // Read entire file into memory.
     // Ugh.
     size_t bytes_read = 0;
     result = file->Read(buffer.data(), buffer.size(), 0, &bytes_read);
-    XEEXPECTZERO(result);
+    if (result) {
+      if (file) {
+        file->Release();
+      }
+      return result;
+    }
 
     // Load the module.
     result = LoadFromMemory(buffer.data(), bytes_read);
   }
 
-XECLEANUP:
   if (file) {
     file->Release();
   }

src/xenia/kernel/user_profile.h

@@ -16,8 +16,6 @@
 #include <vector>
 
 #include <xenia/common.h>
-#include <xenia/core.h>
-
 #include <xenia/xbox.h>
 
 namespace xe {

src/xenia/kernel/util/shim_utils.h

@@ -10,10 +10,8 @@
 #ifndef XENIA_KERNEL_UTIL_SHIM_UTILS_H_
 #define XENIA_KERNEL_UTIL_SHIM_UTILS_H_
 
-#include <xenia/common.h>
-#include <xenia/core.h>
-
 #include <alloy/frontend/ppc/ppc_context.h>
+#include <xenia/common.h>
 #include <xenia/export_resolver.h>
 
 

src/xenia/kernel/util/xex2.cc

@@ -23,11 +23,19 @@
 
 // using namespace alloy;
 
+// TODO(benvanik): remove.
+#define XEEXPECTZERO(expr) \
+  if ((expr) != 0) {       \
+    goto XECLEANUP;        \
+  }
+#define XEEXPECTNOTNULL(expr) \
+  if ((expr) == NULL) {       \
+    goto XECLEANUP;           \
+  }
+
 DEFINE_bool(xex_dev_key, false, "Use the devkit key.");
 
 typedef struct xe_xex2 {
-  xe_ref_t ref;
-
   xe::Memory *memory;
 
   xe_xex2_header_t header;
@@ -52,7 +60,6 @@ int xe_xex2_find_import_infos(xe_xex2_ref xex,
 xe_xex2_ref xe_xex2_load(xe::Memory *memory, const void *addr,
                          const size_t length, xe_xex2_options_t options) {
   xe_xex2_ref xex = (xe_xex2_ref)calloc(1, sizeof(xe_xex2));
-  xe_ref_init((xe_ref)xex);
 
   xex->memory = memory;
   xex->sections = new std::vector<PESection *>();
@@ -74,11 +81,15 @@ xe_xex2_ref xe_xex2_load(xe::Memory *memory, const void *addr,
   return xex;
 
 XECLEANUP:
-  xe_xex2_release(xex);
-  return NULL;
+  xe_xex2_dealloc(xex);
+  return nullptr;
 }
 
 void xe_xex2_dealloc(xe_xex2_ref xex) {
+  if (!xex) {
+    return;
+  }
+
   for (std::vector<PESection *>::iterator it = xex->sections->begin();
        it != xex->sections->end(); ++it) {
     delete *it;
@@ -98,15 +109,6 @@ void xe_xex2_dealloc(xe_xex2_ref xex) {
   xex->memory = NULL;
 }
 
-xe_xex2_ref xe_xex2_retain(xe_xex2_ref xex) {
-  xe_ref_retain((xe_ref)xex);
-  return xex;
-}
-
-void xe_xex2_release(xe_xex2_ref xex) {
-  xe_ref_release((xe_ref)xex, (xe_ref_dealloc_t)xe_xex2_dealloc);
-}
-
 const xe_xex2_header_t *xe_xex2_get_header(xe_xex2_ref xex) {
   return &xex->header;
 }
@@ -720,7 +722,7 @@ int xe_xex2_read_image_compressed(const xe_xex2_header_t *header,
     XELOGE("Unable to allocate XEX memory at %.8X-%.8X.", header->exe_address,
            uncompressed_size);
     result_code = 2;
-    XEFAIL();
+    goto XECLEANUP;
   }
   uint8_t *buffer = memory->Translate(header->exe_address);
 

src/xenia/kernel/util/xex2.h

@@ -10,8 +10,9 @@
 #ifndef XENIA_KERNEL_UTIL_XEX2_H_
 #define XENIA_KERNEL_UTIL_XEX2_H_
 
-#include <xenia/core.h>
+#include <xenia/common.h>
 #include <xenia/kernel/util/xex2_info.h>
+#include <xenia/memory.h>
 
 typedef struct { int reserved; } xe_xex2_options_t;
 
@@ -45,8 +46,7 @@ class PESection {
 
 xe_xex2_ref xe_xex2_load(xe::Memory* memory, const void* addr,
                          const size_t length, xe_xex2_options_t options);
-xe_xex2_ref xe_xex2_retain(xe_xex2_ref xex);
-void xe_xex2_release(xe_xex2_ref xex);
+void xe_xex2_dealloc(xe_xex2_ref xex);
 
 const xe_xex2_header_t* xe_xex2_get_header(xe_xex2_ref xex);
 const PESection* xe_xex2_get_pe_section(xe_xex2_ref xex, const char* name);

src/xenia/kernel/xam_content.cc

@@ -8,11 +8,10 @@
  */
 
 #include <xenia/common.h>
-#include <xenia/core.h>
-#include <xenia/xbox.h>
 #include <xenia/kernel/kernel_state.h>
-#include <xenia/kernel/xam_private.h>
 #include <xenia/kernel/util/shim_utils.h>
+#include <xenia/kernel/xam_private.h>
+#include <xenia/xbox.h>
 
 namespace xe {
 namespace kernel {

src/xenia/kernel/xam_info.cc

@@ -8,13 +8,12 @@
  */
 
 #include <xenia/common.h>
-#include <xenia/core.h>
-#include <xenia/xbox.h>
 #include <xenia/kernel/kernel_state.h>
-#include <xenia/kernel/xam_private.h>
 #include <xenia/kernel/objects/xenumerator.h>
 #include <xenia/kernel/util/shim_utils.h>
 #include <xenia/kernel/util/xex2.h>
+#include <xenia/kernel/xam_private.h>
+#include <xenia/xbox.h>
 
 namespace xe {
 namespace kernel {

src/xenia/kernel/xam_input.cc

@@ -8,13 +8,12 @@
  */
 
 #include <xenia/common.h>
-#include <xenia/core.h>
-#include <xenia/xbox.h>
 #include <xenia/emulator.h>
 #include <xenia/hid/hid.h>
 #include <xenia/kernel/kernel_state.h>
-#include <xenia/kernel/xam_private.h>
 #include <xenia/kernel/util/shim_utils.h>
+#include <xenia/kernel/xam_private.h>
+#include <xenia/xbox.h>
 
 namespace xe {
 namespace kernel {

src/xenia/kernel/xam_module.h

@@ -11,10 +11,9 @@
 #define XENIA_KERNEL_XAM_H_
 
 #include <xenia/common.h>
-#include <xenia/core.h>
 #include <xenia/export_resolver.h>
-#include <xenia/kernel/xam_ordinals.h>
 #include <xenia/kernel/objects/xkernel_module.h>
+#include <xenia/kernel/xam_ordinals.h>
 
 namespace xe {
 namespace kernel {

src/xenia/kernel/xam_msg.cc

@@ -8,12 +8,11 @@
  */
 
 #include <xenia/common.h>
-#include <xenia/core.h>
-#include <xenia/xbox.h>
 #include <xenia/kernel/kernel_state.h>
-#include <xenia/kernel/xam_private.h>
 #include <xenia/kernel/objects/xevent.h>
 #include <xenia/kernel/util/shim_utils.h>
+#include <xenia/kernel/xam_private.h>
+#include <xenia/xbox.h>
 
 namespace xe {
 namespace kernel {

src/xenia/kernel/xam_net.cc

@@ -10,11 +10,10 @@
 #include <winsock2.h>
 
 #include <xenia/common.h>
-#include <xenia/core.h>
-#include <xenia/xbox.h>
 #include <xenia/kernel/kernel_state.h>
-#include <xenia/kernel/xam_private.h>
 #include <xenia/kernel/util/shim_utils.h>
+#include <xenia/kernel/xam_private.h>
+#include <xenia/xbox.h>
 
 namespace xe {
 namespace kernel {

src/xenia/kernel/xam_notify.cc

@@ -8,12 +8,11 @@
  */
 
 #include <xenia/common.h>
-#include <xenia/core.h>
-#include <xenia/xbox.h>
 #include <xenia/kernel/kernel_state.h>
-#include <xenia/kernel/xam_private.h>
 #include <xenia/kernel/objects/xnotify_listener.h>
 #include <xenia/kernel/util/shim_utils.h>
+#include <xenia/kernel/xam_private.h>
+#include <xenia/xbox.h>
 
 namespace xe {
 namespace kernel {

src/xenia/kernel/xam_ordinals.h

@@ -11,7 +11,6 @@
 #define XENIA_KERNEL_XAM_ORDINALS_H_
 
 #include <xenia/common.h>
-#include <xenia/core.h>
 #include <xenia/export_resolver.h>
 
 // Build an ordinal enum to make it easy to lookup ordinals.

src/xenia/kernel/xam_private.h

@@ -11,7 +11,6 @@
 #define XENIA_KERNEL_XAM_PRIVATE_H_
 
 #include <xenia/common.h>
-#include <xenia/core.h>
 #include <xenia/kernel/xam_ordinals.h>
 
 namespace xe {

src/xenia/kernel/xam_ui.cc

@@ -8,11 +8,10 @@
  */
 
 #include <xenia/common.h>
-#include <xenia/core.h>
-#include <xenia/xbox.h>
 #include <xenia/kernel/kernel_state.h>
-#include <xenia/kernel/xam_private.h>
 #include <xenia/kernel/util/shim_utils.h>
+#include <xenia/kernel/xam_private.h>
+#include <xenia/xbox.h>
 
 namespace xe {
 namespace kernel {

src/xenia/kernel/xam_user.cc

@@ -8,13 +8,12 @@
  */
 
 #include <xenia/common.h>
-#include <xenia/core.h>
-#include <xenia/xbox.h>
 #include <xenia/kernel/kernel_state.h>
-#include <xenia/kernel/xam_private.h>
 #include <xenia/kernel/objects/xenumerator.h>
 #include <xenia/kernel/objects/xthread.h>
 #include <xenia/kernel/util/shim_utils.h>
+#include <xenia/kernel/xam_private.h>
+#include <xenia/xbox.h>
 
 namespace xe {
 namespace kernel {

src/xenia/kernel/xam_video.cc

@@ -8,11 +8,10 @@
  */
 
 #include <xenia/common.h>
-#include <xenia/core.h>
-#include <xenia/xbox.h>
 #include <xenia/kernel/kernel_state.h>
-#include <xenia/kernel/xam_private.h>
 #include <xenia/kernel/util/shim_utils.h>
+#include <xenia/kernel/xam_private.h>
+#include <xenia/xbox.h>
 
 namespace xe {
 namespace kernel {

src/xenia/kernel/xam_voice.cc

@@ -8,12 +8,11 @@
  */
 
 #include <xenia/common.h>
-#include <xenia/core.h>
-#include <xenia/xbox.h>
 #include <xenia/emulator.h>
 #include <xenia/kernel/kernel_state.h>
-#include <xenia/kernel/xam_private.h>
 #include <xenia/kernel/util/shim_utils.h>
+#include <xenia/kernel/xam_private.h>
+#include <xenia/xbox.h>
 
 namespace xe {
 namespace kernel {

src/xenia/kernel/xboxkrnl_audio.cc

@@ -7,14 +7,13 @@
  ******************************************************************************
  */
 
-#include <xenia/common.h>
-#include <xenia/core.h>
-#include <xenia/xbox.h>
-#include <xenia/emulator.h>
 #include <xenia/apu/apu.h>
+#include <xenia/common.h>
+#include <xenia/emulator.h>
 #include <xenia/kernel/kernel_state.h>
-#include <xenia/kernel/xboxkrnl_private.h>
 #include <xenia/kernel/util/shim_utils.h>
+#include <xenia/kernel/xboxkrnl_private.h>
+#include <xenia/xbox.h>
 
 namespace xe {
 namespace kernel {

src/xenia/kernel/xboxkrnl_debug.cc

@@ -8,12 +8,11 @@
  */
 
 #include <xenia/common.h>
-#include <xenia/core.h>
-#include <xenia/xbox.h>
 #include <xenia/kernel/kernel_state.h>
-#include <xenia/kernel/xboxkrnl_private.h>
 #include <xenia/kernel/objects/xthread.h>
 #include <xenia/kernel/util/shim_utils.h>
+#include <xenia/kernel/xboxkrnl_private.h>
+#include <xenia/xbox.h>
 
 namespace xe {
 namespace kernel {

src/xenia/kernel/xboxkrnl_hal.cc

@@ -8,11 +8,10 @@
  */
 
 #include <xenia/common.h>
-#include <xenia/core.h>
-#include <xenia/xbox.h>
 #include <xenia/kernel/kernel_state.h>
-#include <xenia/kernel/xboxkrnl_private.h>
 #include <xenia/kernel/util/shim_utils.h>
+#include <xenia/kernel/xboxkrnl_private.h>
+#include <xenia/xbox.h>
 
 namespace xe {
 namespace kernel {

src/xenia/kernel/xboxkrnl_io.cc

@@ -7,15 +7,14 @@
  ******************************************************************************
  */
 
+#include <poly/memory.h>
 #include <xenia/common.h>
-#include <xenia/core.h>
-#include <xenia/core/hash.h>
 #include <xenia/kernel/async_request.h>
 #include <xenia/kernel/kernel_state.h>
-#include <xenia/kernel/xboxkrnl_private.h>
 #include <xenia/kernel/objects/xevent.h>
 #include <xenia/kernel/objects/xfile.h>
 #include <xenia/kernel/util/shim_utils.h>
+#include <xenia/kernel/xboxkrnl_private.h>
 #include <xenia/xbox.h>
 
 namespace xe {
@@ -384,7 +383,8 @@ SHIM_CALL NtQueryInformationFile_shim(PPCContext* ppc_state,
         assert_true(length == 8);
         info = 8;
         // TODO(benvanik): use pointer to fs:: entry?
-        SHIM_SET_MEM_64(file_info_ptr, hash_combine(0, file->absolute_path()));
+        SHIM_SET_MEM_64(file_info_ptr,
+                        poly::hash_combine(0, file->absolute_path()));
         break;
       case XFilePositionInformation:
         // struct FILE_POSITION_INFORMATION {

src/xenia/kernel/xboxkrnl_memory.cc

@@ -9,11 +9,10 @@
 
 #include <poly/math.h>
 #include <xenia/common.h>
-#include <xenia/core.h>
-#include <xenia/xbox.h>
 #include <xenia/kernel/kernel_state.h>
-#include <xenia/kernel/xboxkrnl_private.h>
 #include <xenia/kernel/util/shim_utils.h>
+#include <xenia/kernel/xboxkrnl_private.h>
+#include <xenia/xbox.h>
 
 namespace xe {
 namespace kernel {

src/xenia/kernel/xboxkrnl_misc.cc

@@ -8,12 +8,11 @@
  */
 
 #include <xenia/common.h>
-#include <xenia/core.h>
-#include <xenia/xbox.h>
 #include <xenia/kernel/kernel_state.h>
-#include <xenia/kernel/xboxkrnl_private.h>
 #include <xenia/kernel/objects/xthread.h>
 #include <xenia/kernel/util/shim_utils.h>
+#include <xenia/kernel/xboxkrnl_private.h>
+#include <xenia/xbox.h>
 
 namespace xe {
 namespace kernel {

src/xenia/kernel/xboxkrnl_module.h

@@ -11,10 +11,9 @@
 #define XENIA_KERNEL_XBOXKRNL_MODULE_H_
 
 #include <xenia/common.h>
-#include <xenia/core.h>
 #include <xenia/export_resolver.h>
-#include <xenia/kernel/xboxkrnl_ordinals.h>
 #include <xenia/kernel/objects/xkernel_module.h>
+#include <xenia/kernel/xboxkrnl_ordinals.h>
 
 // All of the exported functions:
 #include <xenia/kernel/xboxkrnl_rtl.h>

src/xenia/kernel/xboxkrnl_modules.cc

@@ -8,13 +8,12 @@
  */
 
 #include <xenia/common.h>
-#include <xenia/core.h>
-#include <xenia/xbox.h>
 #include <xenia/kernel/kernel_state.h>
-#include <xenia/kernel/xboxkrnl_private.h>
 #include <xenia/kernel/objects/xuser_module.h>
 #include <xenia/kernel/util/shim_utils.h>
 #include <xenia/kernel/util/xex2.h>
+#include <xenia/kernel/xboxkrnl_private.h>
+#include <xenia/xbox.h>
 
 namespace xe {
 namespace kernel {
@@ -145,7 +144,6 @@ SHIM_CALL XexCheckExecutablePrivilege_shim(PPCContext* ppc_state,
   const xe_xex2_header_t* header = xe_xex2_get_header(xex);
   uint32_t result = (header->system_flags & mask) > 0;
 
-  xe_xex2_release(xex);
   module->Release();
 
   SHIM_SET_RETURN_32(result);

src/xenia/kernel/xboxkrnl_ob.cc

@@ -8,13 +8,12 @@
  */
 
 #include <xenia/common.h>
-#include <xenia/core.h>
-#include <xenia/xbox.h>
 #include <xenia/kernel/kernel_state.h>
-#include <xenia/kernel/xboxkrnl_private.h>
-#include <xenia/kernel/xobject.h>
 #include <xenia/kernel/objects/xthread.h>
 #include <xenia/kernel/util/shim_utils.h>
+#include <xenia/kernel/xboxkrnl_private.h>
+#include <xenia/kernel/xobject.h>
+#include <xenia/xbox.h>
 
 namespace xe {
 namespace kernel {

src/xenia/kernel/xboxkrnl_ordinals.h

@@ -11,7 +11,6 @@
 #define XENIA_KERNEL_XBOXKRNL_ORDINALS_H_
 
 #include <xenia/common.h>
-#include <xenia/core.h>
 #include <xenia/export_resolver.h>
 
 // Build an ordinal enum to make it easy to lookup ordinals.

src/xenia/kernel/xboxkrnl_private.h

@@ -11,7 +11,6 @@
 #define XENIA_KERNEL_XBOXKRNL_PRIVATE_H_
 
 #include <xenia/common.h>
-#include <xenia/core.h>
 #include <xenia/kernel/xboxkrnl_ordinals.h>
 
 namespace xe {

src/xenia/kernel/xboxkrnl_rtl.h

@@ -11,7 +11,6 @@
 #define XENIA_KERNEL_XBOXKRNL_RTL_H_
 
 #include <xenia/common.h>
-#include <xenia/core.h>
 #include <xenia/xbox.h>
 
 namespace xe {

src/xenia/kernel/xboxkrnl_strings.cc

@@ -8,14 +8,13 @@
  */
 
 #include <xenia/common.h>
-#include <xenia/core.h>
-#include <xenia/xbox.h>
 #include <xenia/kernel/kernel_state.h>
-#include <xenia/kernel/xboxkrnl_private.h>
 #include <xenia/kernel/objects/xthread.h>
 #include <xenia/kernel/objects/xuser_module.h>
 #include <xenia/kernel/util/shim_utils.h>
 #include <xenia/kernel/util/xex2.h>
+#include <xenia/kernel/xboxkrnl_private.h>
+#include <xenia/xbox.h>
 
 namespace xe {
 namespace kernel {

src/xenia/kernel/xboxkrnl_threading.cc

@@ -8,19 +8,18 @@
  */
 
 #include <xenia/common.h>
-#include <xenia/core.h>
-#include <xenia/xbox.h>
 #include <xenia/cpu/processor.h>
 #include <xenia/kernel/dispatcher.h>
 #include <xenia/kernel/kernel_state.h>
 #include <xenia/kernel/native_list.h>
-#include <xenia/kernel/xboxkrnl_private.h>
 #include <xenia/kernel/objects/xevent.h>
 #include <xenia/kernel/objects/xmutant.h>
 #include <xenia/kernel/objects/xsemaphore.h>
 #include <xenia/kernel/objects/xthread.h>
 #include <xenia/kernel/objects/xtimer.h>
 #include <xenia/kernel/util/shim_utils.h>
+#include <xenia/kernel/xboxkrnl_private.h>
+#include <xenia/xbox.h>
 
 namespace xe {
 namespace kernel {

src/xenia/kernel/xboxkrnl_usbcam.cc

@@ -8,11 +8,10 @@
  */
 
 #include <xenia/common.h>
-#include <xenia/core.h>
-#include <xenia/xbox.h>
 #include <xenia/kernel/kernel_state.h>
-#include <xenia/kernel/xboxkrnl_private.h>
 #include <xenia/kernel/util/shim_utils.h>
+#include <xenia/kernel/xboxkrnl_private.h>
+#include <xenia/xbox.h>
 
 namespace xe {
 namespace kernel {

src/xenia/kernel/xboxkrnl_video.cc

@@ -8,16 +8,15 @@
  */
 
 #include <xenia/common.h>
-#include <xenia/core.h>
-#include <xenia/xbox.h>
-#include <xenia/emulator.h>
 #include <xenia/cpu/cpu.h>
+#include <xenia/emulator.h>
 #include <xenia/gpu/gpu.h>
 #include <xenia/gpu/xenos/packets.h>
 #include <xenia/kernel/kernel_state.h>
+#include <xenia/kernel/util/shim_utils.h>
 #include <xenia/kernel/xboxkrnl_private.h>
 #include <xenia/kernel/xboxkrnl_rtl.h>
-#include <xenia/kernel/util/shim_utils.h>
+#include <xenia/xbox.h>
 
 namespace xe {
 namespace kernel {