diff --git a/mesosphere/include/mesosphere/kresources/KAutoObject.hpp b/mesosphere/include/mesosphere/core/KAutoObject.hpp
similarity index 100%
rename from mesosphere/include/mesosphere/kresources/KAutoObject.hpp
rename to mesosphere/include/mesosphere/core/KAutoObject.hpp
diff --git a/mesosphere/include/mesosphere/interfaces/ILimitedResource.hpp b/mesosphere/include/mesosphere/interfaces/ILimitedResource.hpp
index 34c4ed65c..3d172454a 100644
--- a/mesosphere/include/mesosphere/interfaces/ILimitedResource.hpp
+++ b/mesosphere/include/mesosphere/interfaces/ILimitedResource.hpp
@@ -1,7 +1,7 @@
 #pragma once
 // circular dep: #include "resource_limit.h"
 
-#include <mesosphere/kresources/KAutoObject.hpp>
+#include <mesosphere/core/KAutoObject.hpp>
 #include <tuple>
 
 namespace mesosphere
diff --git a/mesosphere/include/mesosphere/interrupts/KWorkQueue.hpp b/mesosphere/include/mesosphere/interrupts/KWorkQueue.hpp
index 08b8848b0..72f7e959c 100644
--- a/mesosphere/include/mesosphere/interrupts/KWorkQueue.hpp
+++ b/mesosphere/include/mesosphere/interrupts/KWorkQueue.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <mesosphere/interfaces/IWork.hpp>
-#include <mesosphere/kresources/KAutoObject.hpp>
+#include <mesosphere/core/KAutoObject.hpp>
 
 namespace mesosphere
 {
diff --git a/mesosphere/include/mesosphere/processes/KHandleTable.hpp b/mesosphere/include/mesosphere/processes/KHandleTable.hpp
index ddc52cc01..01974e179 100644
--- a/mesosphere/include/mesosphere/processes/KHandleTable.hpp
+++ b/mesosphere/include/mesosphere/processes/KHandleTable.hpp
@@ -2,7 +2,7 @@
 
 #include <mesosphere/core/util.hpp>
 #include <mesosphere/core/Handle.hpp>
-#include <mesosphere/kresources/KAutoObject.hpp>
+#include <mesosphere/core/KAutoObject.hpp>
 #include <mesosphere/arch/KSpinLock.hpp>
 #include <array>
 
diff --git a/mesosphere/include/mesosphere/processes/KProcess.hpp b/mesosphere/include/mesosphere/processes/KProcess.hpp
index 70949bb0e..4817e0f0d 100644
--- a/mesosphere/include/mesosphere/processes/KProcess.hpp
+++ b/mesosphere/include/mesosphere/processes/KProcess.hpp
@@ -4,7 +4,7 @@ class KThread;
 class KResourceLimit;
 
 #include <mesosphere/core/util.hpp>
-#include <mesosphere/kresources/KAutoObject.hpp>
+#include <mesosphere/core/KAutoObject.hpp>
 #include <mesosphere/interfaces/ISetAllocated.hpp>
 
 namespace mesosphere
diff --git a/mesosphere/source/kresources/KAutoObject.cpp b/mesosphere/source/core/KAutoObject.cpp
similarity index 55%
rename from mesosphere/source/kresources/KAutoObject.cpp
rename to mesosphere/source/core/KAutoObject.cpp
index f31f0ea45..0d4961bbe 100644
--- a/mesosphere/source/kresources/KAutoObject.cpp
+++ b/mesosphere/source/core/KAutoObject.cpp
@@ -1,4 +1,4 @@
-#include <mesosphere/kresources/KAutoObject.hpp>
+#include <mesosphere/core/KAutoObject.hpp>
 
 namespace mesosphere
 {