Compile fixes & cleanup

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"

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; }

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,

Runtime/Graphics/GX.hpp

@@ -615,7 +615,7 @@ enum ColorSrc {
   SRC_VTX,
 };
 
-enum LightID {
+enum LightID : u32 {
   LIGHT0 = 0x001,
   LIGHT1 = 0x002,
   LIGHT2 = 0x004,