diff --git a/Makefile b/Makefile
index 05361310b..469ff5782 100644
--- a/Makefile
+++ b/Makefile
@@ -108,14 +108,11 @@ MIPS3_C_FILES := \
 G_C_FILES := \
 	$(shell find src/lib/ultra/audio -name '*.c') \
 	$(shell find src/lib/naudio -name '*.c') \
-	src/lib/lib_2fba0.c \
 	src/lib/lib_2fc60.c \
 	src/lib/lib_317f0.c \
 	src/lib/lib_39c80.c \
-	src/lib/lib_3a100.c \
 	src/lib/lib_3e3e0.c \
 	src/lib/lib_43dd0.c \
-	src/lib/lib_446d0.c \
 	src/lib/lib_45ed0.c \
 	src/lib/lib_47d20.c \
 	src/lib/lib_47ef0.c \
@@ -183,8 +180,7 @@ IDO71_C_FILES := \
 	$(shell find src/lib/ultra/audio -name '*.c') \
 	$(shell find src/lib/naudio -name '*.c') \
 	src/lib/lib_2fc60.c \
-	src/lib/lib_39c80.c \
-	src/lib/lib_3a100.c
+	src/lib/lib_39c80.c
 
 LOOPUNROLL_O_FILES = $(patsubst src/%.c, $(B_DIR)/%.o, $(LOOPUNROLL_C_FILES))
 MIPS3_O_FILES = $(patsubst src/%.c, $(B_DIR)/%.o, $(MIPS3_C_FILES))
diff --git a/include/PR/n_libaudio.h b/include/PR/n_libaudio.h
index 24904882d..330134680 100644
--- a/include/PR/n_libaudio.h
+++ b/include/PR/n_libaudio.h
@@ -406,6 +406,8 @@ void     n_alSndpSetSound(ALSndId id);
 extern long long int    n_aspMainTextStart[], n_aspMainTextEnd[];
 extern long long int    n_aspMainDataStart[], n_aspMainDataEnd[];
 
+f32 func0003b9d4(s32 arg0);
+void func0003ba64(struct fx *fx, f32 outputrate);
 
 #ifdef _LANGUAGE_C_PLUS_PLUS
 }
diff --git a/ld/libfiles.ntsc-beta.inc b/ld/libfiles.ntsc-beta.inc
index b511e72ce..9f5e483eb 100644
--- a/ld/libfiles.ntsc-beta.inc
+++ b/ld/libfiles.ntsc-beta.inc
@@ -67,7 +67,7 @@
 	build/ROMID/lib/rdp.o (section); \
 	build/ROMID/lib/rmon.o (section); \
 	build/ROMID/lib/ultra/audio/heap.o (section); \
-	build/ROMID/lib/lib_2fba0.o (section); \
+	build/ROMID/lib/naudio/n_sl.o (section); \
 	build/ROMID/lib/lib_2fc60.o (section); \
 	build/ROMID/lib/naudio/n_synthesizer.o (section); \
 	build/ROMID/lib/ultra/audio/sl.o (section); \
@@ -87,7 +87,7 @@
 	build/ROMID/lib/naudio/n_syndelete.o (section); \
 	build/ROMID/lib/ultra/audio/cents2ratio.o (section); \
 	build/ROMID/lib/naudio/n_synallocfx.o (section); \
-	build/ROMID/lib/lib_3a100.o (section); \
+	build/ROMID/lib/naudio/n_reverb.o (section); \
 	build/ROMID/lib/naudio/n_drvrNew.o (section); \
 	build/ROMID/lib/naudio/n_save.o (section); \
 	build/ROMID/lib/naudio/n_event.o (section); \
@@ -111,7 +111,7 @@
 	build/ROMID/lib/lib_3f8a0.o (section); \
 	build/ROMID/lib/lib_43dd0.o (section); \
 	build/ROMID/lib/naudio/n_cspsendmidi.o (section); \
-	build/ROMID/lib/lib_446d0.o (section); \
+	build/ROMID/lib/naudio/n_auxbus.o (section); \
 	build/ROMID/lib/naudio/n_mainbus.o (section); \
 	build/ROMID/lib/naudio/n_synsetpriority.o (section); \
 	build/ROMID/lib/naudio/n_load.o (section); \
diff --git a/ld/libfiles.ntsc-final.inc b/ld/libfiles.ntsc-final.inc
index 0c9a445c4..44cbb2dc0 100644
--- a/ld/libfiles.ntsc-final.inc
+++ b/ld/libfiles.ntsc-final.inc
@@ -64,7 +64,7 @@
 	build/ROMID/lib/rdp.o (section); \
 	build/ROMID/lib/rmon.o (section); \
 	build/ROMID/lib/ultra/audio/heap.o (section); \
-	build/ROMID/lib/lib_2fba0.o (section); \
+	build/ROMID/lib/naudio/n_sl.o (section); \
 	build/ROMID/lib/lib_2fc60.o (section); \
 	build/ROMID/lib/naudio/n_synthesizer.o (section); \
 	build/ROMID/lib/ultra/audio/sl.o (section); \
@@ -84,7 +84,7 @@
 	build/ROMID/lib/naudio/n_syndelete.o (section); \
 	build/ROMID/lib/ultra/audio/cents2ratio.o (section); \
 	build/ROMID/lib/naudio/n_synallocfx.o (section); \
-	build/ROMID/lib/lib_3a100.o (section); \
+	build/ROMID/lib/naudio/n_reverb.o (section); \
 	build/ROMID/lib/naudio/n_drvrNew.o (section); \
 	build/ROMID/lib/naudio/n_save.o (section); \
 	build/ROMID/lib/naudio/n_event.o (section); \
@@ -108,7 +108,7 @@
 	build/ROMID/lib/lib_3f8a0.o (section); \
 	build/ROMID/lib/lib_43dd0.o (section); \
 	build/ROMID/lib/naudio/n_cspsendmidi.o (section); \
-	build/ROMID/lib/lib_446d0.o (section); \
+	build/ROMID/lib/naudio/n_auxbus.o (section); \
 	build/ROMID/lib/naudio/n_mainbus.o (section); \
 	build/ROMID/lib/naudio/n_synsetpriority.o (section); \
 	build/ROMID/lib/naudio/n_load.o (section); \
diff --git a/ld/libfiles.pal-final.inc b/ld/libfiles.pal-final.inc
index 8e126e5d1..a342d094d 100644
--- a/ld/libfiles.pal-final.inc
+++ b/ld/libfiles.pal-final.inc
@@ -64,7 +64,7 @@
 	build/ROMID/lib/rdp.o (section); \
 	build/ROMID/lib/rmon.o (section); \
 	build/ROMID/lib/ultra/audio/heap.o (section); \
-	build/ROMID/lib/lib_2fba0.o (section); \
+	build/ROMID/lib/naudio/n_sl.o (section); \
 	build/ROMID/lib/lib_2fc60.o (section); \
 	build/ROMID/lib/naudio/n_synthesizer.o (section); \
 	build/ROMID/lib/ultra/audio/sl.o (section); \
@@ -84,7 +84,7 @@
 	build/ROMID/lib/naudio/n_syndelete.o (section); \
 	build/ROMID/lib/ultra/audio/cents2ratio.o (section); \
 	build/ROMID/lib/naudio/n_synallocfx.o (section); \
-	build/ROMID/lib/lib_3a100.o (section); \
+	build/ROMID/lib/naudio/n_reverb.o (section); \
 	build/ROMID/lib/naudio/n_drvrNew.o (section); \
 	build/ROMID/lib/naudio/n_save.o (section); \
 	build/ROMID/lib/naudio/n_event.o (section); \
@@ -108,7 +108,7 @@
 	build/ROMID/lib/lib_3f8a0.o (section); \
 	build/ROMID/lib/lib_43dd0.o (section); \
 	build/ROMID/lib/naudio/n_cspsendmidi.o (section); \
-	build/ROMID/lib/lib_446d0.o (section); \
+	build/ROMID/lib/naudio/n_auxbus.o (section); \
 	build/ROMID/lib/naudio/n_mainbus.o (section); \
 	build/ROMID/lib/naudio/n_synsetpriority.o (section); \
 	build/ROMID/lib/naudio/n_load.o (section); \
diff --git a/src/include/lib/lib_2fba0.h b/src/include/lib/lib_2fba0.h
deleted file mode 100644
index 798bed360..000000000
--- a/src/include/lib/lib_2fba0.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef _IN_LIB_LIB_2FBA0_H
-#define _IN_LIB_LIB_2FBA0_H
-#include <ultra64.h>
-#include "data.h"
-#include "types.h"
-
-#endif
diff --git a/src/include/lib/lib_3a100.h b/src/include/lib/lib_3a100.h
deleted file mode 100644
index 3346605bc..000000000
--- a/src/include/lib/lib_3a100.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#ifndef _IN_LIB_LIB_3A100_H
-#define _IN_LIB_LIB_3A100_H
-#include <ultra64.h>
-#include "data.h"
-#include "types.h"
-
-void func0003b710(f32 outputrate, f32 arg1, f32 arg2, f32 *arg3, f32 *arg4);
-f32 func0003b9d4(s32 arg0);
-void func0003ba64(struct fx *fx, f32 outputrate);
-
-#endif
diff --git a/src/lib/audiomgr.c b/src/lib/audiomgr.c
index 66637f604..e24f29835 100644
--- a/src/lib/audiomgr.c
+++ b/src/lib/audiomgr.c
@@ -4,7 +4,6 @@
 #include "constants.h"
 #include "bss.h"
 #include "lib/audiodma.h"
-#include "lib/lib_2fba0.h"
 #include "lib/lib_2fc60.h"
 #include "lib/libc/ll.h"
 #include "data.h"
diff --git a/src/lib/lib_446d0.c b/src/lib/naudio/n_auxbus.c
similarity index 91%
rename from src/lib/lib_446d0.c
rename to src/lib/naudio/n_auxbus.c
index 53d580502..0b190985f 100644
--- a/src/lib/lib_446d0.c
+++ b/src/lib/naudio/n_auxbus.c
@@ -1,9 +1,5 @@
 #include <ultra64.h>
-#include "naudio/n_synthInternals.h"
-#include "constants.h"
-#include "bss.h"
-#include "data.h"
-#include "types.h"
+#include "n_synthInternals.h"
 
 Acmd *n_alAuxBusPull(s32 sampleOffset, Acmd *cmdptr, s32 fxBus, s32 *numpulls)
 {
diff --git a/src/lib/naudio/n_drvrNew.c b/src/lib/naudio/n_drvrNew.c
index b25839897..2adab2ac9 100644
--- a/src/lib/naudio/n_drvrNew.c
+++ b/src/lib/naudio/n_drvrNew.c
@@ -105,8 +105,6 @@ f32 func0003b9d4(s32 arg0)
 	return value;
 }
 
-void func0003b710(f32 outputrate, f32 arg1, f32 arg4, f32 *arg5, f32 *arg6);
-
 void func0003ba64(struct fx *fx, f32 outputrate)
 {
 	s32 i;
diff --git a/src/lib/naudio/n_mainbus.c b/src/lib/naudio/n_mainbus.c
index a5e762b3b..ca655834d 100644
--- a/src/lib/naudio/n_mainbus.c
+++ b/src/lib/naudio/n_mainbus.c
@@ -14,14 +14,14 @@ Acmd *n_alMainBusPull(s32 sampleOffset, Acmd *p)
 	for (i = 0; i < n_syn->maxAuxBusses; i++) {
 		ptr = (n_syn->mainBus->filter.handler)(sampleOffset, ptr, i);
 
-		if (var8009c340.unk04[i]) {
-			if (var8009c340.unk06[i]) {
+		if (var8009c344[i]) {
+			if (var8009c346[i]) {
 				aMix(ptr++, 0, 0x8000, N_AL_AUX_L_OUT, N_AL_MAIN_L_OUT);
 			} else {
 				aMix(ptr++, 0, 0x7fff, N_AL_AUX_L_OUT, N_AL_MAIN_R_OUT);
 			}
 		} else {
-			if (var8009c340.unk06[i]) {
+			if (var8009c346[i]) {
 				aMix(ptr++, 0, 0x8000, N_AL_AUX_L_OUT, N_AL_MAIN_R_OUT);
 			} else {
 				aMix(ptr++, 0, 0x7fff, N_AL_AUX_L_OUT, N_AL_MAIN_R_OUT);
diff --git a/src/lib/lib_3a100.c b/src/lib/naudio/n_reverb.c
similarity index 97%
rename from src/lib/lib_3a100.c
rename to src/lib/naudio/n_reverb.c
index 6770bd411..c9d1bf1d2 100644
--- a/src/lib/lib_3a100.c
+++ b/src/lib/naudio/n_reverb.c
@@ -1,13 +1,6 @@
-#include <ultra64.h>
-#include <n_libaudio.h>
-#include "synthInternals.h"
-#include "naudio/n_synthInternals.h"
-#include "constants.h"
-#include "game/atan2f.h"
-#include "bss.h"
-#include "lib/lib_3a100.h"
-#include "data.h"
-#include "types.h"
+#include <os.h>
+#include <os_internal.h>
+#include "n_synthInternals.h"
 
 #define RANGE 2.0f
 
diff --git a/src/lib/lib_2fba0.c b/src/lib/naudio/n_sl.c
similarity index 77%
rename from src/lib/lib_2fba0.c
rename to src/lib/naudio/n_sl.c
index 211318921..1b42a0b1a 100644
--- a/src/lib/lib_2fba0.c
+++ b/src/lib/naudio/n_sl.c
@@ -1,9 +1,5 @@
 #include <ultra64.h>
-#include "constants.h"
-#include "bss.h"
-#include "lib/lib_39fc0.h"
-#include "data.h"
-#include "types.h"
+#include "n_synthInternals.h"
 
 N_ALGlobals *n_alGlobals = NULL;
 N_ALSynth *n_syn = NULL;
diff --git a/src/lib/speaker.c b/src/lib/speaker.c
index 4fdeb77ec..bbf3103ef 100644
--- a/src/lib/speaker.c
+++ b/src/lib/speaker.c
@@ -7,7 +7,6 @@
 #include "lib/lib_2fc60.h"
 #include "lib/lib_317f0.h"
 #include "lib/lib_39c80.h"
-#include "lib/lib_3a100.h"
 #include "lib/lib_3d280.h"
 #include "lib/lib_3e3e0.h"
 #include "data.h"