Cleanup includes in header files

include/attributes.h

@@ -1,8 +1,6 @@
 #ifndef ATTRIBUTES_H
 #define ATTRIBUTES_H
 
-#include "versions.h"
-
 #if !defined(__GNUC__) && !defined(__attribute__)
 #define __attribute__(x)
 #endif

include/face_change.h

@@ -1,6 +1,8 @@
 #ifndef FACE_CHANGE_H
 #define FACE_CHANGE_H
 
+#include "ultra64.h"
+
 typedef struct FaceChange {
     /* 0x00 */ s16 face;
     /* 0x02 */ s16 timer;

include/libc64/sprintf.h

@@ -1,8 +1,6 @@
 #ifndef LIBC64_SPRINTF_H
 #define LIBC64_SPRINTF_H
 
-#include "ultra64.h"
-
 #include "stdarg.h"
 
 int vsprintf(char* dst, const char* fmt, va_list args);

include/padmgr.h

@@ -4,7 +4,6 @@
 #include "ultra64.h"
 #include "libu64/pad.h"
 #include "irqmgr.h"
-#include "versions.h"
 
 typedef enum ControllerPakType {
     CONT_PAK_NONE,

include/romfile.h

@@ -1,7 +1,7 @@
 #ifndef ROMFILE_H
 #define ROMFILE_H
 
-#include "ultra64.h"
+#include "stdint.h"
 
 typedef struct RomFile {
     /* 0x00 */ uintptr_t vromStart;

include/tha.h

@@ -2,7 +2,6 @@
 #define THA_H
 
 #include "ultra64.h"
-#include "alignment.h"
 
 typedef struct TwoHeadArena {
     /* 0x00 */ size_t size;

include/z64actor.h

@@ -2,7 +2,6 @@
 #define Z64ACTOR_H
 
 #include "color.h"
-#include "romfile.h"
 #include "z64actor_profile.h"
 #include "z64animation.h"
 #include "z64math.h"

include/z64curve.h

@@ -1,8 +1,7 @@
 #ifndef Z64_CURVE_H
 #define Z64_CURVE_H
 
-#include "ultra64/ultratypes.h"
+#include "ultra64.h"
-#include "z64math.h"
 
 struct PlayState;
 struct Actor;

include/z64game.h

@@ -5,7 +5,6 @@
 #include "ultra64/ultratypes.h"
 #include "libu64/pad.h"
 #include "gamealloc.h"
-#include "romfile.h"
 #include "tha.h"
 
 struct GraphicsContext;

include/z64light.h

@@ -4,7 +4,6 @@
 #include "ultra64.h"
 #include "ultra64/gbi.h"
 #include "z64math.h"
-#include "color.h"
 
 struct GraphicsContext;
 struct PlayState;

include/z64skybox.h

@@ -4,8 +4,8 @@
 #include "ultra64/ultratypes.h"
 #include "ultra64/gbi.h"
 
+#include "romfile.h"
 #include "z64math.h"
-#include "z64dma.h" // for RomFile
 
 struct GameState;
 struct GraphicsContext;

include/z64transition.h

@@ -2,7 +2,7 @@
 #define Z64TRANSITION_H
 
 #include "ultra64/ultratypes.h"
-#include "ultra64/gbi.h" // for Gfx
+#include "ultra64/gbi.h"
 #include "transition_circle.h"
 #include "transition_fade.h"
 #include "transition_triforce.h"

include/z_locale.h

@@ -2,7 +2,6 @@
 #define Z_LOCALE_H
 
 #include "ultra64/ultratypes.h"
-#include "region.h"
 
 extern s32 gCurrentRegion;
 

src/audio/game/session_init.c

@@ -1,3 +1,4 @@
+#include "alignment.h"
 #include "array_count.h"
 #include "buffers.h"
 #include "z64audio.h"

src/audio/internal/load.c

@@ -2,6 +2,7 @@
  * Original Filename: system.c
  */
 
+#include "alignment.h"
 #include "array_count.h"
 #include "attributes.h"
 #include "buffers.h"

src/code/TwoHeadArena.c

@@ -10,6 +10,7 @@
  * with identical lifetime.
  */
 #include "tha.h"
+#include "alignment.h"
 
 void* THA_GetHead(TwoHeadArena* tha) {
     return tha->head;

src/code/gfxalloc.c

@@ -1,4 +1,5 @@
-#include "gfx.h"
+#include "gfxalloc.h"
+#include "alignment.h"
 
 Gfx* Gfx_Open(Gfx* gfx) {
     return gfx + 1;

src/libultra/audio/env.c

@@ -1,6 +1,5 @@
 #include "libaudio.h"
 #include "synthInternals.h"
-#include "libc/math.h"
 #include "ultra64/convert.h"
 
 #define EQPOWER_LENGTH 128

src/libultra/audio/libaudio.h

@@ -1,9 +1,6 @@
 #ifndef __LIB_AUDIO__
 #define __LIB_AUDIO__
 
-#include "libc/stdbool.h"
-#include "libc/stddef.h"
-#include "libc/stdint.h"
 #include "ultra64/ultratypes.h"
 
 #include "libaudio_abi.h"