From 67422f92a5708a3233a124007c3555ffbaa47c43 Mon Sep 17 00:00:00 2001
From: Narr the Reg <5944268+german77@users.noreply.github.com>
Date: Fri, 27 Feb 2026 10:03:53 -0600
Subject: [PATCH] all: Fix compiler errors

---
 include/nn/g3d/ResSceneAnim.h | 2 +-
 include/nn/g3d/ViewVolume.h   | 2 +-
 include/nn/nfp/nfp.h          | 2 +-
 include/nn/ui2d/Types.h       | 1 +
 include/nn/ui2d/Util.h        | 5 +----
 include/nn/vfx/Resource.h     | 4 ++--
 include/nn/vfx/System.h       | 2 +-
 7 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/include/nn/g3d/ResSceneAnim.h b/include/nn/g3d/ResSceneAnim.h
index d7bf1ca..2df7bff 100644
--- a/include/nn/g3d/ResSceneAnim.h
+++ b/include/nn/g3d/ResSceneAnim.h
@@ -11,7 +11,7 @@ namespace nn {
 namespace g3d {
 class ResLightAnim;
 class ResFogAnim;
-struct BindFuncTable;
+class BindFuncTable;
 
 class ResSceneAnim {
 public:
diff --git a/include/nn/g3d/ViewVolume.h b/include/nn/g3d/ViewVolume.h
index c4d380d..21c62df 100644
--- a/include/nn/g3d/ViewVolume.h
+++ b/include/nn/g3d/ViewVolume.h
@@ -3,7 +3,7 @@
 #include "nn/types.h"
 
 namespace nn::util::neon {
-class MatrixRowMajor4x3fType;
+struct MatrixRowMajor4x3fType;
 }
 
 namespace nn::g3d {
diff --git a/include/nn/nfp/nfp.h b/include/nn/nfp/nfp.h
index 379e21c..e02f754 100644
--- a/include/nn/nfp/nfp.h
+++ b/include/nn/nfp/nfp.h
@@ -3,7 +3,7 @@
 #include <nn/types.h>
 
 namespace nn::os {
-class SystemEventType;
+struct SystemEventType;
 }  // namespace nn::os
 
 namespace nn::nfp {
diff --git a/include/nn/ui2d/Types.h b/include/nn/ui2d/Types.h
index 8913e54..5ee686d 100644
--- a/include/nn/ui2d/Types.h
+++ b/include/nn/ui2d/Types.h
@@ -1,3 +1,4 @@
+#pragma once
 
 namespace nn::ui2d {
 
diff --git a/include/nn/ui2d/Util.h b/include/nn/ui2d/Util.h
index 33be30e..dbc3fac 100644
--- a/include/nn/ui2d/Util.h
+++ b/include/nn/ui2d/Util.h
@@ -1,12 +1,9 @@
 #pragma once
 
 #include <nn/gfx/gfx_Device.h>
+#include <nn/gfx/gfx_Types.h>
 #include <nn/util/MathTypes.h>
 
-namespace nn::gfx {
-class MemoryPool;
-}  // namespace nn::gfx
-
 namespace nn::ui2d {
 
 class AnimTransform;
diff --git a/include/nn/vfx/Resource.h b/include/nn/vfx/Resource.h
index c4656af..017a5fd 100644
--- a/include/nn/vfx/Resource.h
+++ b/include/nn/vfx/Resource.h
@@ -9,10 +9,10 @@
 namespace nn {
 namespace vfx {
 
-struct Heap;
+class Heap;
 struct EmitterResource;
 struct EmitterSetResource;
-struct System;
+class System;
 
 namespace detail {
 struct BinaryData;
diff --git a/include/nn/vfx/System.h b/include/nn/vfx/System.h
index 4cf8324..3b1c5e5 100644
--- a/include/nn/vfx/System.h
+++ b/include/nn/vfx/System.h
@@ -12,7 +12,7 @@
 namespace nn {
 namespace vfx {
 
-struct Heap;
+class Heap;
 
 class System {
 public: