add array_count.h (#2514)

8 files changed, 12 insertions, 7 deletions

diff --git a/src/audio/data.c b/src/audio/data.c
index bd072257b..6c5528f34 100644
--- a/src/audio/data.c
+++ b/src/audio/data.c
@@ -1,7 +1,7 @@
+#include "array_count.h"
+#include "sfx.h"
 #include "ultra64.h"
 #include "z64audio.h"
-#include "macros.h"
-#include "sfx.h"
 
 // sSfxRequests ring buffer endpoints. read index <= write index, wrapping around mod 256.
 u8 gSfxRequestWriteIndex = 0;
diff --git a/src/audio/general.c b/src/audio/general.c
index c3286554e..abdbcade0 100644
--- a/src/audio/general.c
+++ b/src/audio/general.c
@@ -1,5 +1,5 @@
 #include "libu64/gfxprint.h"
-#include "ultra64.h"
+#include "array_count.h"
 #include "attributes.h"
 #include "audiothread_cmd.h"
 #include "controller.h"
@@ -8,6 +8,7 @@
 #include "seqcmd.h"
 #include "sequence.h"
 #include "sfx.h"
+#include "ultra64.h"
 #include "versions.h"
 #include "z64audio.h"
 #include "z64ocarina.h"
diff --git a/src/audio/lib/load.c b/src/audio/lib/load.c
index 4a447ddc0..f05850c69 100644
--- a/src/audio/lib/load.c
+++ b/src/audio/lib/load.c
@@ -1,3 +1,4 @@
+#include "array_count.h"
 #include "attributes.h"
 #include "buffers.h"
 #include "segment_symbols.h"
diff --git a/src/audio/lib/seqplayer.c b/src/audio/lib/seqplayer.c
index e238418a6..c906e6728 100644
--- a/src/audio/lib/seqplayer.c
+++ b/src/audio/lib/seqplayer.c
@@ -14,6 +14,7 @@
  *     Otherwise, each set of instructions has its own command interpreter
  */
 #include "audio/aseq.h"
+#include "array_count.h"
 #include "assert.h"
 #include "attributes.h"
 #include "macros.h"
diff --git a/src/audio/lib/thread.c b/src/audio/lib/thread.c
index b79c1d97d..43cb6d498 100644
--- a/src/audio/lib/thread.c
+++ b/src/audio/lib/thread.c
@@ -1,3 +1,4 @@
+#include "array_count.h"
 #include "audiothread_cmd.h"
 #include "macros.h"
 #include "ultra64.h"
diff --git a/src/audio/sequence.c b/src/audio/sequence.c
index f3b815a28..a311e4e73 100644
--- a/src/audio/sequence.c
+++ b/src/audio/sequence.c
@@ -17,15 +17,14 @@
  * Nor are these commands to be confused with the internal audio commands used to transfer requests from
  * the graph thread to the audio thread.
  */
+#include "array_count.h"
 #include "audiothread_cmd.h"
-#include "ultra64.h"
-#include "ultra64/abi.h"
 #include "seqcmd.h"
 #include "sfx.h"
+#include "ultra64.h"
+#include "ultra64/abi.h"
 #include "z64audio.h"
 
-#include "macros.h"
-
 // Direct audio command (skips the queueing system)
 #define SEQCMD_SET_SEQPLAYER_VOLUME_NOW(seqPlayerIndex, duration, volume)                       \
     Audio_ProcessSeqCmd((SEQCMD_OP_SET_SEQPLAYER_VOLUME << 28) | ((u8)(seqPlayerIndex) << 24) | \
diff --git a/src/audio/session_init.c b/src/audio/session_init.c
index d04a955bc..e7248907e 100644
--- a/src/audio/session_init.c
+++ b/src/audio/session_init.c
@@ -1,3 +1,4 @@
+#include "array_count.h"
 #include "buffers.h"
 #include "z64audio.h"
 
diff --git a/src/audio/sfx.c b/src/audio/sfx.c
index 3d837676d..9c6d7c6eb 100644
--- a/src/audio/sfx.c
+++ b/src/audio/sfx.c
@@ -1,3 +1,4 @@
+#include "array_count.h"
 #include "audiothread_cmd.h"
 #include "macros.h"
 #include "printf.h"