diff --git a/desmume/src/addons/slot1_retail_auto.cpp b/desmume/src/addons/slot1_retail_auto.cpp
index 4efb94b7e..2120543fd 100644
--- a/desmume/src/addons/slot1_retail_auto.cpp
+++ b/desmume/src/addons/slot1_retail_auto.cpp
@@ -43,7 +43,8 @@ public:
 		NDS_SLOT1_TYPE selection = NDS_SLOT1_RETAIL_MCROM;
 		
 		//check game ID in core emulator and select right implementation
-		if(!memcmp(gameInfo.header.gameCode,"UORE",4))
+		if(!memcmp(gameInfo.header.gameCode,"UORE",4) ||
+			!memcmp(gameInfo.header.gameCode,"UORJ",4))
 			selection = NDS_SLOT1_RETAIL_NAND;
 
 		mSelectedImplementation = slot1_List[selection];
diff --git a/desmume/src/utils/fsnitro.cpp b/desmume/src/utils/fsnitro.cpp
index a4e6c1c0b..5e6bc9b73 100644
--- a/desmume/src/utils/fsnitro.cpp
+++ b/desmume/src/utils/fsnitro.cpp
@@ -16,9 +16,11 @@
 */
 
 #include <stdio.h>
-#include <stdint.h>
-#include <string.h>
 #include <string>
+#ifndef _MSC_VER
+#include <string.h>
+#include <stdint.h>
+#endif
 #include "fsnitro.h"
 
 using namespace std;
diff --git a/desmume/src/utils/fsnitro.h b/desmume/src/utils/fsnitro.h
index 2ccf561cb..95527ffe7 100644
--- a/desmume/src/utils/fsnitro.h
+++ b/desmume/src/utils/fsnitro.h
@@ -18,6 +18,10 @@
 #ifndef _FS_NITRO_H_
 #define _FS_NITRO_H_
 #include <string>
+#ifndef _MSC_VER
+#include <stdint.h>
+#include <string.h>
+#endif
 #include "../types.h"
 
 using namespace std;