From 96bd3e1cfe457e9272aa5cdda3a444121071a663 Mon Sep 17 00:00:00 2001
From: fig02 <fig02srl@gmail.com>
Date: Wed, 23 Apr 2025 03:48:32 -0400
Subject: [PATCH] cleanup z64h

---
 include/global.h           |  1 -
 include/z64.h              | 26 +++++++++-----------------
 src/code/z_fbdemo_circle.c |  1 +
 3 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/include/global.h b/include/global.h
index 7dac123348..0b9114f96d 100644
--- a/include/global.h
+++ b/include/global.h
@@ -2,6 +2,5 @@
 #define GLOBAL_H
 
 #include "macros.h"
-#include "versions.h"
 
 #endif
diff --git a/include/z64.h b/include/z64.h
index a0ba2873d7..2560c745d5 100644
--- a/include/z64.h
+++ b/include/z64.h
@@ -1,26 +1,18 @@
 #ifndef Z64_H
 #define Z64_H
 
+// TODO: This file still exists ONLY to provide neccesary headers to extracted assets.
+//       After assets are modified to include the headers they need directly, delete this file.
+
+#include "sequence.h"
+#include "sys_matrix.h"
 #include "ultra64.h"
-#include "ultra64/gs2dex.h"
-#include "attributes.h"
-#include "versions.h"
-#include "z64player.h"
-#include "z64audio.h"
-#include "z64ocarina.h"
-#include "z64curve.h"
-#include "z64effect.h"
+#include "z64play.h"
 #include "z64animation.h"
 #include "z64animation_legacy.h"
-#include "z64play.h"
+#include "z64curve.h"
 #include "z64skin.h"
-#include "z64skin_matrix.h"
-#include "alignment.h"
-#include "audiothread_cmd.h"
-#include "sfx.h"
-#include "color.h"
-#include "sys_matrix.h" // in room assets, gIdentityMtx
-
-// TODO: include all files listed above into the right place, and then delete this file.
+#include "z64player.h"
+#include "z64ocarina.h"
 
 #endif
diff --git a/src/code/z_fbdemo_circle.c b/src/code/z_fbdemo_circle.c
index eb1b22febc..2ba1864fe8 100644
--- a/src/code/z_fbdemo_circle.c
+++ b/src/code/z_fbdemo_circle.c
@@ -1,6 +1,7 @@
 #include "transition_circle.h"
 
 #include "gfx.h"
+#include "sfx.h"
 
 #include "global.h"