diff --git a/include/sf64audio_provisional.h b/include/sf64audio_provisional.h
index bb1214a9..fb8fc548 100644
--- a/include/sf64audio_provisional.h
+++ b/include/sf64audio_provisional.h
@@ -73,6 +73,10 @@ typedef void (*AudioCustomUpdateFunction)(void);
 #define AUDIOLOAD_SYNC 0
 #define AUDIOLOAD_ASYNC 1
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 typedef enum {
     /* 0 */ ADSR_STATE_DISABLED,
     /* 1 */ ADSR_STATE_INITIAL,
@@ -1230,4 +1234,8 @@ extern f32 gHeadsetPanVolume[128];
 extern f32 gStereoPanVolume[128];
 extern f32 gDefaultPanVolume[128];
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif
diff --git a/src/audio/audio_load.c b/src/audio/audio_load.c
index 4a4b7ef3..3b3d7d60 100644
--- a/src/audio/audio_load.c
+++ b/src/audio/audio_load.c
@@ -821,9 +821,9 @@ void AudioLoad_Init(void) {
 
     gAudioResetTimer = 0;
 
-    for (i = 0; i < gAudioHeapSize / 8; i++) {
-        *((u64*) gAudioHeap + i) = 0;
-    }
+    // for (i = 0; i < gAudioHeapSize / 8; i++) {
+    //     *((u64*) gAudioHeap + i) = 0;
+    // }
 
     clearContext = gAudioContextStart;
     dwordsLeft = ((uintptr_t) gAudioContextEnd - (uintptr_t) gAudioContextStart) / 8;