[nostalgia/gfx] Cleanup

src/nostalgia/modules/gfx/include/nostalgia/gfx/core.hpp

@@ -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"

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 {

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"
 

src/nostalgia/modules/gfx/test/tests.cpp

@@ -6,8 +6,8 @@
 
 #include <map>
 #include <ox/std/error.hpp>
-#include <ox/mc/mc.hpp>
+#include <ox/mc/write.hpp>
-#include <nostalgia/gfx/core.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");

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;