diff --git a/Frameworks/vio2sf/vio2sf/src/vio2sf/desmume/state.c b/Frameworks/vio2sf/vio2sf/src/vio2sf/desmume/state.c
index 6d1149d7a..d2be6b754 100644
--- a/Frameworks/vio2sf/vio2sf/src/vio2sf/desmume/state.c
+++ b/Frameworks/vio2sf/vio2sf/src/vio2sf/desmume/state.c
@@ -7,6 +7,8 @@
 //
 
 #include <assert.h>
+#include <stdlib.h>
+#include <string.h>
 
 #include "NDSSystem.h"
 #include "MMU.h"
@@ -123,7 +125,7 @@ int state_init(struct NDS_state *state)
     
     for (; i < 0x70; ++i)
     {
-        state->MMU_ARM9_MEM_MAP[i] = state->ARM9Mem->ARM9_OAM;
+        state->MMU_ARM9_MEM_MAP[i] = state->ARM9Mem->ARM9_LCD;
         state->MMU_ARM9_MEM_MASK[i] = 0x000FFFFF;
     }
     
@@ -279,7 +281,7 @@ void state_deinit(struct NDS_state *state)
     state->SubScreen = NULL;
 }
 
-void state_setrom(struct NDS_state *state, const u8 * rom, u32 rom_size)
+void state_setrom(struct NDS_state *state, u8 * rom, u32 rom_size)
 {
     assert(!(rom_size & (rom_size - 1)));
     NDS_SetROM(state, rom, rom_size - 1);
diff --git a/Frameworks/vio2sf/vio2sf/src/vio2sf/desmume/state.h b/Frameworks/vio2sf/vio2sf/src/vio2sf/desmume/state.h
index 756227e82..cb0079731 100644
--- a/Frameworks/vio2sf/vio2sf/src/vio2sf/desmume/state.h
+++ b/Frameworks/vio2sf/vio2sf/src/vio2sf/desmume/state.h
@@ -83,7 +83,7 @@ int state_init(NDS_state *state);
 
 void state_deinit(NDS_state *state);
 
-void state_setrom(NDS_state *state, const u8 * rom, u32 rom_size);
+void state_setrom(NDS_state *state, u8 * rom, u32 rom_size);
 
 void state_loadstate(NDS_state *state, const u8 * ss, u32 ss_size);
     
diff --git a/Frameworks/vio2sf/vio2sf/src/vio2sf/desmume/types.h b/Frameworks/vio2sf/vio2sf/src/vio2sf/desmume/types.h
index 318c38022..f274e50de 100755
--- a/Frameworks/vio2sf/vio2sf/src/vio2sf/desmume/types.h
+++ b/Frameworks/vio2sf/vio2sf/src/vio2sf/desmume/types.h
@@ -97,7 +97,11 @@ typedef s16 v10;
 /*----------------------*/
 
 #ifndef OBJ_C
+#ifdef WIN32
+typedef int BOOL;
+#else
 typedef signed char BOOL;
+#endif
 #else
 //apple also defines BOOL
 typedef int desmume_BOOL;