diff --git a/src/libultra/audio/drvrnew.c b/src/libultra/audio/drvrnew.c
index 6b10e66b72..e549347e0f 100644
--- a/src/libultra/audio/drvrnew.c
+++ b/src/libultra/audio/drvrnew.c
@@ -1,5 +1,7 @@
 #include "libaudio.h"
 #include "synthInternals.h"
+#include "stdbool.h"
+#include "stddef.h"
 
 // WARNING: THE FOLLOWING CONSTANT MUST BE KEPT IN SYNC WITH SCALING IN MICROCODE!!!
 #define SCALE 16384
diff --git a/src/libultra/audio/env.c b/src/libultra/audio/env.c
index 2050937415..654c682ab3 100644
--- a/src/libultra/audio/env.c
+++ b/src/libultra/audio/env.c
@@ -1,7 +1,7 @@
 #include "libaudio.h"
+#include "synthInternals.h"
 #include "stdbool.h"
 #include "stddef.h"
-#include "synthInternals.h"
 #include "ultra64/convert.h"
 
 #define EQPOWER_LENGTH 128
diff --git a/src/libultra/audio/filter.c b/src/libultra/audio/filter.c
index 937ffd04c5..20e5d7e606 100644
--- a/src/libultra/audio/filter.c
+++ b/src/libultra/audio/filter.c
@@ -1,5 +1,6 @@
 #include "libaudio.h"
 #include "synthInternals.h"
+#include "stddef.h"
 
 void alFilterNew(ALFilter* f, ALCmdHandler h, ALSetParam s, s32 type) {
     f->source = NULL;
diff --git a/src/libultra/audio/heapalloc.c b/src/libultra/audio/heapalloc.c
index 52c3605c51..708134ec2b 100644
--- a/src/libultra/audio/heapalloc.c
+++ b/src/libultra/audio/heapalloc.c
@@ -1,5 +1,6 @@
 #include "libaudio.h"
 #include "synthInternals.h"
+#include "stddef.h"
 
 void* alHeapDBAlloc(u8* file, s32 line, ALHeap* hp, s32 num, s32 size) {
     s32 bytes;
diff --git a/src/libultra/audio/load.c b/src/libultra/audio/load.c
index e57e472f82..02be1f47cd 100644
--- a/src/libultra/audio/load.c
+++ b/src/libultra/audio/load.c
@@ -1,8 +1,8 @@
 #include "libaudio.h"
+#include "synthInternals.h"
 #include "stdbool.h"
 #include "stddef.h"
 #include "stdint.h"
-#include "synthInternals.h"
 #include "ultra64/R4300.h"
 
 #ifndef MIN
diff --git a/src/libultra/audio/resample.c b/src/libultra/audio/resample.c
index 2c25cb55d0..8001eb151b 100644
--- a/src/libultra/audio/resample.c
+++ b/src/libultra/audio/resample.c
@@ -1,7 +1,7 @@
 #include "libaudio.h"
+#include "synthInternals.h"
 #include "stdbool.h"
 #include "stddef.h"
-#include "synthInternals.h"
 #include "ultra64/convert.h"
 
 Acmd* alResamplePull(void* filter, s16* outp, s32 outCnt, s32 sampleOffset, Acmd* p) {
diff --git a/src/libultra/audio/reverb.c b/src/libultra/audio/reverb.c
index ce7d9c4744..9edf3ab9a6 100644
--- a/src/libultra/audio/reverb.c
+++ b/src/libultra/audio/reverb.c
@@ -1,8 +1,8 @@
 #include "libaudio.h"
+#include "synthInternals.h"
 #include "stdbool.h"
 #include "stddef.h"
 #include "stdint.h"
-#include "synthInternals.h"
 #include "ultra64/convert.h"
 
 #define RANGE 2.0
diff --git a/src/libultra/audio/sl.c b/src/libultra/audio/sl.c
index 7f2ebe28b8..ad9949d114 100644
--- a/src/libultra/audio/sl.c
+++ b/src/libultra/audio/sl.c
@@ -1,4 +1,5 @@
 #include "libaudio.h"
+#include "stddef.h"
 
 ALGlobals* alGlobals = NULL;
 
diff --git a/src/libultra/audio/synallocfx.c b/src/libultra/audio/synallocfx.c
index 8c530fc19d..55c8267e14 100644
--- a/src/libultra/audio/synallocfx.c
+++ b/src/libultra/audio/synallocfx.c
@@ -1,3 +1,4 @@
+#include "libaudio.h"
 #include "synthInternals.h"
 
 ALFxRef* alSynAllocFX(ALSynth* s, s16 bus, ALSynConfig* c, ALHeap* hp) {
diff --git a/src/libultra/audio/syndelete.c b/src/libultra/audio/syndelete.c
index 7af0d50090..96299af32f 100644
--- a/src/libultra/audio/syndelete.c
+++ b/src/libultra/audio/syndelete.c
@@ -1,4 +1,5 @@
-#include "synthInternals.h"
+#include "libaudio.h"
+#include "stddef.h"
 
 void alSynDelete(ALSynth* drvr) {
     drvr->head = NULL;
diff --git a/src/libultra/audio/synthesizer.c b/src/libultra/audio/synthesizer.c
index 62d5677ecd..62c07582ed 100644
--- a/src/libultra/audio/synthesizer.c
+++ b/src/libultra/audio/synthesizer.c
@@ -1,4 +1,6 @@
+#include "libaudio.h"
 #include "synthInternals.h"
+#include "stddef.h"
 
 #ifndef MIN
 #define MIN(a, b) (((a) < (b)) ? (a) : (b))