diff --git a/include/attributes.h b/include/attributes.h
index 3276c84325..acfaf3edc0 100644
--- a/include/attributes.h
+++ b/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
diff --git a/include/face_change.h b/include/face_change.h
index 5a0c8d8566..b612641813 100644
--- a/include/face_change.h
+++ b/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;
diff --git a/include/libc64/sprintf.h b/include/libc64/sprintf.h
index 485f938f58..55e10045ea 100644
--- a/include/libc64/sprintf.h
+++ b/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);
diff --git a/include/padmgr.h b/include/padmgr.h
index 4b9e6890cd..9859b501a6 100644
--- a/include/padmgr.h
+++ b/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,
diff --git a/include/romfile.h b/include/romfile.h
index 49b5f202dc..31edd72f33 100644
--- a/include/romfile.h
+++ b/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;
diff --git a/include/tha.h b/include/tha.h
index 941321b820..6a40db54cd 100644
--- a/include/tha.h
+++ b/include/tha.h
@@ -2,7 +2,6 @@
 #define THA_H
 
 #include "ultra64.h"
-#include "alignment.h"
 
 typedef struct TwoHeadArena {
     /* 0x00 */ size_t size;
diff --git a/include/z64actor.h b/include/z64actor.h
index 1a8b503297..30869fde47 100644
--- a/include/z64actor.h
+++ b/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"
diff --git a/include/z64curve.h b/include/z64curve.h
index 8fb83242ba..3ca0eac132 100644
--- a/include/z64curve.h
+++ b/include/z64curve.h
@@ -1,8 +1,7 @@
 #ifndef Z64_CURVE_H
 #define Z64_CURVE_H
 
-#include "ultra64/ultratypes.h"
-#include "z64math.h"
+#include "ultra64.h"
 
 struct PlayState;
 struct Actor;
diff --git a/include/z64game.h b/include/z64game.h
index fe683777b7..aaf70be321 100644
--- a/include/z64game.h
+++ b/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;
diff --git a/include/z64light.h b/include/z64light.h
index cb666ff752..ff6f732e12 100644
--- a/include/z64light.h
+++ b/include/z64light.h
@@ -4,7 +4,6 @@
 #include "ultra64.h"
 #include "ultra64/gbi.h"
 #include "z64math.h"
-#include "color.h"
 
 struct GraphicsContext;
 struct PlayState;
diff --git a/include/z64skybox.h b/include/z64skybox.h
index e0ebcf0c03..60b3bbb7d3 100644
--- a/include/z64skybox.h
+++ b/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;
diff --git a/include/z64transition.h b/include/z64transition.h
index d46683d2b3..f867aed09a 100644
--- a/include/z64transition.h
+++ b/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"
diff --git a/include/z_locale.h b/include/z_locale.h
index 7afcb33db4..5be416e823 100644
--- a/include/z_locale.h
+++ b/include/z_locale.h
@@ -2,7 +2,6 @@
 #define Z_LOCALE_H
 
 #include "ultra64/ultratypes.h"
-#include "region.h"
 
 extern s32 gCurrentRegion;
 
diff --git a/src/audio/game/session_init.c b/src/audio/game/session_init.c
index 3c3d9c4aeb..b8bc1924c2 100644
--- a/src/audio/game/session_init.c
+++ b/src/audio/game/session_init.c
@@ -1,3 +1,4 @@
+#include "alignment.h"
 #include "array_count.h"
 #include "buffers.h"
 #include "z64audio.h"
diff --git a/src/audio/internal/load.c b/src/audio/internal/load.c
index f723e5b836..91c25fabf7 100644
--- a/src/audio/internal/load.c
+++ b/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"
diff --git a/src/code/TwoHeadArena.c b/src/code/TwoHeadArena.c
index 490304a472..23ef69a910 100644
--- a/src/code/TwoHeadArena.c
+++ b/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;
diff --git a/src/code/gfxalloc.c b/src/code/gfxalloc.c
index 9e2fe9bb99..3b4d72f057 100644
--- a/src/code/gfxalloc.c
+++ b/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;
diff --git a/src/libultra/audio/env.c b/src/libultra/audio/env.c
index 2d0027ba7d..cb6bbe1aa0 100644
--- a/src/libultra/audio/env.c
+++ b/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
diff --git a/src/libultra/audio/libaudio.h b/src/libultra/audio/libaudio.h
index 67f04567bf..4d30b0161e 100644
--- a/src/libultra/audio/libaudio.h
+++ b/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"