naming and moving stuff

src/npc/bigGoron.c

@@ -4,6 +4,7 @@
 #include "structures.h"
 #include "script.h"
 #include "random.h"
+#include "audio.h"
 #include "functions.h"
 
 extern void (*gUnk_081140D4[])(Entity*);

src/npc/bladeBrothers.c

@@ -7,6 +7,7 @@
 #include "save.h"
 #include "script.h"
 #include "npc.h"
+#include "audio.h"
 #include "functions.h"
 
 extern void (*gUnk_081115C0[])(Entity*);

src/npc/ezloCap.c

@@ -1,9 +1,10 @@
 #include "global.h"
 #include "entity.h"
-#include "functions.h"
 #include "flags.h"
 #include "save.h"
 #include "script.h"
+#include "audio.h"
+#include "functions.h"
 
 extern Hitbox gUnk_080FD170;
 extern void script_08016030; // Cutscene data type?

src/npc/melari.c

@@ -4,6 +4,7 @@
 #include "textbox.h"
 #include "script.h"
 #include "random.h"
+#include "audio.h"
 #include "functions.h"
 
 extern void sub_08068780(Entity*);

src/npc/rem.c

@@ -1,7 +1,8 @@
 #include "global.h"
-#include "functions.h"
 #include "entity.h"
 #include "script.h"
+#include "audio.h"
+#include "functions.h"
 
 extern void sub_0806A8C8(Entity*);
 

src/npc/smith.c

@@ -5,6 +5,7 @@
 #include "script.h"
 #include "random.h"
 #include "npc.h"
+#include "audio.h"
 #include "functions.h"
 
 extern void sub_08078850(Entity*, u32, u32, u32*);