fixed includes

nbproject/configurations.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<configurationDescriptor version="97">
+<configurationDescriptor version="100">
   <logicalFolder name="root" displayName="root" projectFiles="true" kind="ROOT">
     <df root="." name="0">
       <df name="data">

nbproject/private/configurations.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<configurationDescriptor version="97">
+<configurationDescriptor version="100">
   <logicalFolder name="root" displayName="root" projectFiles="true" kind="ROOT">
     <df root="." name="0">
       <df name="assets">
@@ -5884,8 +5884,6 @@
               </df>
               <df name="chords_normalized">
               </df>
-              <df name="guitar">
-              </df>
             </df>
             <df name="WAV">
             </df>

sots-private

@@ -1 +1 @@
-Subproject commit 08230e5250352bbd7c7303c68d307ce22606ecec
+Subproject commit 9cda479e9af1b39b15891190ab843fb2559ea29b

src/dns/dns_core.c

@@ -1,6 +1,6 @@
 #include <bpre.h>
 #include <dns_core.h>
-
+#include <memory.h>
 
 
 static struct pal_replace lightmap[] = {

src/music/music_override.c

@@ -1,4 +1,5 @@
-#include <bpre.h>
+#include <sound.h>
+#include <game_engine.h>
 #include <config.h>
 
 void music_override(u16 songid) {

src/overworld/overworld.c

@@ -1,4 +1,4 @@
-#include <bpre.h>
+#include <game_engine.h>
 
 #define OW_REPLACE_VAR  0x500A
 #define OW_REPLACE_TO_VAR   0x500B

src/specials/camera_move.c

@@ -1,5 +1,8 @@
-#include <bpre.h>
+#include <game_engine.h>
 #include "camera_move.h"
+#include <callback.h>
+#include <fade.h>
+#include <config.h>
 
 struct point** sav_data_map = (struct point**)(0x03005008);