From 3be470b7b866a0d46e2755c6f62cf5da85cfb446 Mon Sep 17 00:00:00 2001
From: Luke Street <luke@street.dev>
Date: Sat, 12 Mar 2022 13:59:30 -0500
Subject: [PATCH] Compile fixes & cleanup

---
 Runtime/Graphics/CCubeMaterial.hpp | 4 ----
 Runtime/Graphics/CCubeModel.hpp    | 2 +-
 Runtime/Graphics/CTevCombiners.hpp | 2 ++
 Runtime/Graphics/GX.hpp            | 2 +-
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/Runtime/Graphics/CCubeMaterial.hpp b/Runtime/Graphics/CCubeMaterial.hpp
index 3b25a0ef0..bc4492ea9 100644
--- a/Runtime/Graphics/CCubeMaterial.hpp
+++ b/Runtime/Graphics/CCubeMaterial.hpp
@@ -1,9 +1,5 @@
 #pragma once
 
-#include <compare>
-#include <memory>
-#include <vector>
-
 #include "CToken.hpp"
 #include "GCNTypes.hpp"
 #include "Graphics/CTexture.hpp"
diff --git a/Runtime/Graphics/CCubeModel.hpp b/Runtime/Graphics/CCubeModel.hpp
index 8ecfebb0e..164f93f30 100644
--- a/Runtime/Graphics/CCubeModel.hpp
+++ b/Runtime/Graphics/CCubeModel.hpp
@@ -100,7 +100,7 @@ public:
   bool AreTexturesLoaded() const { return x40_24_texturesLoaded; }
   void SetVisible(bool v) { x40_25_modelVisible = v; }
   bool IsVisible() const { return x40_25_modelVisible; }
-  [[nodiscard]] GetIndex() const { return x44_idx; }
+  [[nodiscard]] u32 GetIndex() const { return x44_idx; }
   [[nodiscard]] CCubeSurface* GetFirstUnsortedSurface() { return x38_firstUnsortedSurf; }
   [[nodiscard]] const CCubeSurface* GetFirstUnsortedSurface() const { return x38_firstUnsortedSurf; }
   [[nodiscard]] CCubeSurface* GetFirstSortedSurface() { return x3c_firstSortedSurf; }
diff --git a/Runtime/Graphics/CTevCombiners.hpp b/Runtime/Graphics/CTevCombiners.hpp
index c2922b419..b8182d8d7 100644
--- a/Runtime/Graphics/CTevCombiners.hpp
+++ b/Runtime/Graphics/CTevCombiners.hpp
@@ -3,6 +3,8 @@
 #include "Graphics/GX.hpp"
 #include "RetroTypes.hpp"
 
+#include <compare>
+
 namespace metaforce {
 enum class ERglTevStage : std::underlying_type_t<GX::TevStageID> {
   Stage0 = GX::TEVSTAGE0,
diff --git a/Runtime/Graphics/GX.hpp b/Runtime/Graphics/GX.hpp
index 4d52853b7..4872cb6f2 100644
--- a/Runtime/Graphics/GX.hpp
+++ b/Runtime/Graphics/GX.hpp
@@ -615,7 +615,7 @@ enum ColorSrc {
   SRC_VTX,
 };
 
-enum LightID {
+enum LightID : u32 {
   LIGHT0 = 0x001,
   LIGHT1 = 0x002,
   LIGHT2 = 0x004,