From abcf2adc569d3e243ade77fa2e6a557eaba3b9d4 Mon Sep 17 00:00:00 2001
From: Gary Talent <gary@drinkingtea.net>
Date: Sat, 17 May 2025 03:02:59 -0500
Subject: [PATCH] [nostalgia/gfx] Cleanup

---
 .../modules/gfx/include/nostalgia/gfx/core.hpp     | 14 --------------
 .../modules/gfx/include/nostalgia/gfx/gfx.hpp      |  6 ++++++
 src/nostalgia/modules/gfx/src/gba/panic.cpp        |  2 +-
 src/nostalgia/modules/gfx/test/tests.cpp           |  6 +++---
 src/nostalgia/player/app.cpp                       |  2 +-
 5 files changed, 11 insertions(+), 19 deletions(-)
 delete mode 100644 src/nostalgia/modules/gfx/include/nostalgia/gfx/core.hpp

diff --git a/src/nostalgia/modules/gfx/include/nostalgia/gfx/core.hpp b/src/nostalgia/modules/gfx/include/nostalgia/gfx/core.hpp
deleted file mode 100644
index e34c58a3..00000000
--- a/src/nostalgia/modules/gfx/include/nostalgia/gfx/core.hpp
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved.
- */
-
-#pragma once
-
-#include "color.hpp"
-#include "context.hpp"
-#include "gfx.hpp"
-#include "initparams.hpp"
-#include "keelmodule.hpp"
-#include "palette.hpp"
-#include "ptidxconv.hpp"
-#include "tilesheet.hpp"
diff --git a/src/nostalgia/modules/gfx/include/nostalgia/gfx/gfx.hpp b/src/nostalgia/modules/gfx/include/nostalgia/gfx/gfx.hpp
index 3736d23d..69e00eae 100644
--- a/src/nostalgia/modules/gfx/include/nostalgia/gfx/gfx.hpp
+++ b/src/nostalgia/modules/gfx/include/nostalgia/gfx/gfx.hpp
@@ -9,8 +9,14 @@
 #include <ox/std/types.hpp>
 #include <ox/model/def.hpp>
 
+#include "color.hpp"
 #include "context.hpp"
+#include "context.hpp"
+#include "initparams.hpp"
+#include "keelmodule.hpp"
 #include "palette.hpp"
+#include "palette.hpp"
+#include "ptidxconv.hpp"
 #include "tilesheet.hpp"
 
 namespace nostalgia::gfx {
diff --git a/src/nostalgia/modules/gfx/src/gba/panic.cpp b/src/nostalgia/modules/gfx/src/gba/panic.cpp
index 1b886e27..29553d81 100644
--- a/src/nostalgia/modules/gfx/src/gba/panic.cpp
+++ b/src/nostalgia/modules/gfx/src/gba/panic.cpp
@@ -12,7 +12,7 @@
 #include <teagba/addresses.hpp>
 #include <teagba/bios.hpp>
 
-#include <nostalgia/gfx/core.hpp>
+#include <nostalgia/gfx/gfx.hpp>
 
 #include "gfx.hpp"
 
diff --git a/src/nostalgia/modules/gfx/test/tests.cpp b/src/nostalgia/modules/gfx/test/tests.cpp
index 21476b3c..8fd752d0 100644
--- a/src/nostalgia/modules/gfx/test/tests.cpp
+++ b/src/nostalgia/modules/gfx/test/tests.cpp
@@ -6,8 +6,8 @@
 
 #include <map>
 #include <ox/std/error.hpp>
-#include <ox/mc/mc.hpp>
-#include <nostalgia/gfx/core.hpp>
+#include <ox/mc/write.hpp>
+#include <nostalgia/gfx/gfx.hpp>
 
 using namespace nostalgia;
 
@@ -15,7 +15,7 @@ static std::map<ox::StringView, ox::Error(*)()> tests = {
 	{
 		"readWriteTileSheet",
 		[]() -> ox::Error {
-			gfx::TileSheet in;
+			gfx::TileSheet const in;
 			OX_REQUIRE(buff, ox::writeMC(in));
 			OX_REQUIRE(out, ox::readMC<gfx::TileSheet>(buff));
 			oxAssert(in.subsheet.name == out.subsheet.name, "subsheet.name serialization broken");
diff --git a/src/nostalgia/player/app.cpp b/src/nostalgia/player/app.cpp
index 7caef452..0efad3d3 100644
--- a/src/nostalgia/player/app.cpp
+++ b/src/nostalgia/player/app.cpp
@@ -5,7 +5,7 @@
 #include <keel/media.hpp>
 #include <turbine/turbine.hpp>
 
-#include <nostalgia/gfx/core.hpp>
+#include <nostalgia/gfx/gfx.hpp>
 
 using namespace nostalgia;