Fixup some includes for macOS

src/decomp/game/mario.c

@@ -35,7 +35,7 @@
 // #include "object_list_processor.h"
 // #include "print.h"
 #include "save_file.h"
-// #include "sound_init.h"
+#include "sound_init.h"
 // #include "thread6.h"
 #include "../../load_anim_data.h"
 

src/decomp/game/sound_init.c

@@ -14,6 +14,7 @@
 #include <seq_ids.h>
 #include <sm64.h>
 #include "sound_init.h"
+#include "../../play_sound.h"
 //#include "rumble_init.h"
 
 #define MUSIC_NONE 0xFFFF

src/decomp/include/PR/os_libc.h

@@ -3,8 +3,13 @@
 
 #include "ultratypes.h"
 
+// These are defined in macOS (BSD?), so we want to def them out.
+#ifndef __APPLE__
+
 // Old deprecated functions from strings.h, replaced by memcpy/memset.
 extern void bcopy(const void *, void *, size_t);
 extern void bzero(void *, size_t);
 
+#endif
+
 #endif /* !_OS_LIBC_H_ */

src/decomp/tools/convUtils.c

@@ -5,6 +5,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <stdbool.h>
+#include <string.h>
 #include "convUtils.h"
 #include "convTypes.h"
 
@@ -371,4 +372,4 @@ struct CTL* parse_ctl_data(unsigned char* ctlData, uintptr_t* pos){
     // 
 
     return ctl;
-}
+}

src/load_audio_data.c

@@ -1,9 +1,12 @@
 #include "load_audio_data.h"
 
 #include "decomp/tools/convUtils.h"
+#include "decomp/audio/external.h"
 #include "decomp/audio/load.h"
 #include "decomp/audio/load_dat.h"
 
+#include <string.h>
+
 bool g_is_audio_initialized = false;
 
 extern void load_audio_banks( const uint8_t *rom ) {
@@ -25,4 +28,4 @@ extern void load_audio_banks( const uint8_t *rom ) {
     sound_reset( 0 );
 
     g_is_audio_initialized = true;
-}
+}