From 73a5b549a60500747c714d799114937ee3b1312b Mon Sep 17 00:00:00 2001
From: Christian Semmler <mail@csemmler.com>
Date: Fri, 3 Jan 2025 12:27:38 -0700
Subject: [PATCH] Refactor

---
 LEGO1/mxgeometry/mxgeometry3d.h | 2 --
 LEGO1/mxgeometry/mxgeometry4d.h | 2 --
 LEGO1/mxgeometry/mxmatrix.h     | 5 +++--
 LEGO1/realtime/vector3d.inl.h   | 1 -
 4 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/LEGO1/mxgeometry/mxgeometry3d.h b/LEGO1/mxgeometry/mxgeometry3d.h
index 209eb1d4..578d31b2 100644
--- a/LEGO1/mxgeometry/mxgeometry3d.h
+++ b/LEGO1/mxgeometry/mxgeometry3d.h
@@ -2,8 +2,6 @@
 #define MXGEOMETRY3D_H
 
 #include "decomp.h"
-#include "realtime/vector.h"
-#include "realtime/vector2d.inl.h"
 #include "realtime/vector3d.inl.h"
 
 // VTABLE: LEGO1 0x100d4488
diff --git a/LEGO1/mxgeometry/mxgeometry4d.h b/LEGO1/mxgeometry/mxgeometry4d.h
index 591b2bab..4ebeeb5a 100644
--- a/LEGO1/mxgeometry/mxgeometry4d.h
+++ b/LEGO1/mxgeometry/mxgeometry4d.h
@@ -2,8 +2,6 @@
 #define MXGEOMETRY4D_H
 
 #include "decomp.h"
-#include "realtime/matrix.h"
-#include "realtime/matrix4d.inl.h"
 #include "realtime/vector4d.inl.h"
 
 // VTABLE: LEGO1 0x100d41e8
diff --git a/LEGO1/mxgeometry/mxmatrix.h b/LEGO1/mxgeometry/mxmatrix.h
index 929dc3c6..a31a5d4e 100644
--- a/LEGO1/mxgeometry/mxmatrix.h
+++ b/LEGO1/mxgeometry/mxmatrix.h
@@ -1,7 +1,6 @@
 #ifndef MXMATRIX_H
 #define MXMATRIX_H
 
-#include "realtime/matrix.h"
 #include "realtime/matrix4d.inl.h"
 
 // VTABLE: LEGO1 0x100d4300
@@ -36,7 +35,9 @@ class MxMatrix : public Matrix4 {
 	float m_elements[4][4]; // 0x08
 };
 
-// Must be included here for correct ordering in binary
+// Must be included here (not before MxMatrix) for correct ordering in binary.
+// FromQuaternion and ToQuaternion in Matrix4 depend on Vector4.
+// There's a chance they included mxgeometry4d.h after including this somewhere.
 #include "realtime/vector4d.inl.h"
 
 #endif // MXMATRIX_H
diff --git a/LEGO1/realtime/vector3d.inl.h b/LEGO1/realtime/vector3d.inl.h
index bf3157b5..517b777f 100644
--- a/LEGO1/realtime/vector3d.inl.h
+++ b/LEGO1/realtime/vector3d.inl.h
@@ -1,7 +1,6 @@
 #ifndef VECTOR3D_H
 #define VECTOR3D_H
 
-#include "vector.h"
 #include "vector2d.inl.h"
 
 // FUNCTION: LEGO1 0x10002270