diff --git a/src/nostalgia/modules/core/include/nostalgia/core/color.hpp b/src/nostalgia/modules/core/include/nostalgia/core/color.hpp
index e843b654..05974261 100644
--- a/src/nostalgia/modules/core/include/nostalgia/core/color.hpp
+++ b/src/nostalgia/modules/core/include/nostalgia/core/color.hpp
@@ -5,7 +5,6 @@
 #pragma once
 
 #include <ox/std/types.hpp>
-#include <ox/std/point.hpp>
 
 namespace nostalgia::core {
 
diff --git a/src/nostalgia/modules/core/include/nostalgia/core/palette.hpp b/src/nostalgia/modules/core/include/nostalgia/core/palette.hpp
index a2bdba01..fd7a8bc1 100644
--- a/src/nostalgia/modules/core/include/nostalgia/core/palette.hpp
+++ b/src/nostalgia/modules/core/include/nostalgia/core/palette.hpp
@@ -12,8 +12,6 @@
 
 
 #include "color.hpp"
-#include "context.hpp"
-#include "ptidxconv.hpp"
 
 namespace nostalgia::core {
 
diff --git a/src/nostalgia/modules/core/include/nostalgia/core/tilesheet.hpp b/src/nostalgia/modules/core/include/nostalgia/core/tilesheet.hpp
index fc193b40..55c6d302 100644
--- a/src/nostalgia/modules/core/include/nostalgia/core/tilesheet.hpp
+++ b/src/nostalgia/modules/core/include/nostalgia/core/tilesheet.hpp
@@ -4,6 +4,7 @@
 
 #pragma once
 
+#include <ox/fs/fs.hpp>
 #include <ox/std/array.hpp>
 #include <ox/std/point.hpp>
 #include <ox/std/size.hpp>
@@ -11,6 +12,7 @@
 #include <ox/std/types.hpp>
 #include <ox/model/def.hpp>
 
+#include <nostalgia/core/ptidxconv.hpp>
 
 #include "palette.hpp"
 
diff --git a/src/nostalgia/modules/core/src/studio/tilesheeteditormodel.cpp b/src/nostalgia/modules/core/src/studio/tilesheeteditormodel.cpp
index 6ea64fad..fec61fbd 100644
--- a/src/nostalgia/modules/core/src/studio/tilesheeteditormodel.cpp
+++ b/src/nostalgia/modules/core/src/studio/tilesheeteditormodel.cpp
@@ -11,6 +11,8 @@
 #include <turbine/clipboard.hpp>
 #include <keel/media.hpp>
 
+#include <nostalgia/core/ptidxconv.hpp>
+
 #include "tilesheeteditormodel.hpp"
 
 namespace nostalgia::core {
diff --git a/src/nostalgia/modules/scene/include/nostalgia/scene/scene.hpp b/src/nostalgia/modules/scene/include/nostalgia/scene/scene.hpp
index 1d2bddf0..e6ce3b71 100644
--- a/src/nostalgia/modules/scene/include/nostalgia/scene/scene.hpp
+++ b/src/nostalgia/modules/scene/include/nostalgia/scene/scene.hpp
@@ -4,6 +4,8 @@
 
 #pragma once
 
+#include <nostalgia/core/context.hpp>
+
 #include "scenestatic.hpp"
 
 namespace nostalgia::scene {