diff --git a/config.def.h b/config.def.h
index 6d72edec92..d4da7e7a85 100644
--- a/config.def.h
+++ b/config.def.h
@@ -78,7 +78,7 @@ enum
 #define VIDEO_DEFAULT_DRIVER VIDEO_WII
 #elif defined(XENON)
 #define VIDEO_DEFAULT_DRIVER VIDEO_XENON360
-#elif defined(_XBOX)
+#elif defined(_XBOX360)
 #define VIDEO_DEFAULT_DRIVER VIDEO_XDK360
 #elif defined(HAVE_XVIDEO)
 #define VIDEO_DEFAULT_DRIVER VIDEO_XVIDEO
@@ -94,7 +94,7 @@ enum
 #define AUDIO_DEFAULT_DRIVER AUDIO_PS3
 #elif defined(XENON)
 #define AUDIO_DEFAULT_DRIVER AUDIO_XENON360
-#elif defined(_XBOX)
+#elif defined(_XBOX360)
 #define AUDIO_DEFAULT_DRIVER AUDIO_XDK360
 #elif defined(GEKKO)
 #define AUDIO_DEFAULT_DRIVER AUDIO_WII
@@ -128,7 +128,7 @@ enum
 
 #if defined(XENON)
 #define INPUT_DEFAULT_DRIVER INPUT_XENON360
-#elif defined(_XBOX)
+#elif defined(_XBOX360)
 #define INPUT_DEFAULT_DRIVER INPUT_XDK360
 #elif defined(HAVE_SDL)
 #define INPUT_DEFAULT_DRIVER INPUT_SDL
diff --git a/console/griffin/griffin.c b/console/griffin/griffin.c
index fc31a280fb..093c962612 100644
--- a/console/griffin/griffin.c
+++ b/console/griffin/griffin.c
@@ -54,7 +54,7 @@ VIDEO CONTEXT
 
 #if defined(__CELLOS_LV2__)
 #include "../../gfx/context/ps3_ctx.c"
-#elif defined(_XBOX)
+#elif defined(_XBOX360)
 #include "../../gfx/context/xdk360_ctx.c"
 #endif
 
diff --git a/file_path.c b/file_path.c
index b98b7f543f..e5338bae97 100644
--- a/file_path.c
+++ b/file_path.c
@@ -27,7 +27,7 @@
 #define S_ISDIR(x) (x & CELL_FS_S_IFDIR)
 #endif
 
-#ifdef _XBOX360
+#ifdef _XBOX
 #include <xtl.h>
 #endif
 
diff --git a/msvc/RetroArch-Xbox1/RetroArch-Xbox1.vcproj b/msvc/RetroArch-Xbox1/RetroArch-Xbox1.vcproj
index a5feab94cb..2b2e758d52 100644
--- a/msvc/RetroArch-Xbox1/RetroArch-Xbox1.vcproj
+++ b/msvc/RetroArch-Xbox1/RetroArch-Xbox1.vcproj
@@ -19,7 +19,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="&quot;$(SolutionDir)\msvc-stdint&quot;;&quot;$(SolutionDir)\msvc-71&quot;"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)\msvc-stdint&quot;;&quot;$(SolutionDir)\msvc-71&quot;;&quot;$(VSInstallDir)\..\Microsoft Xbox SDK\xbox\include&quot;"
 				PreprocessorDefinitions="_XBOX;_XBOX1;RARCH_CONSOLE;PACKAGE_VERSION=\&quot;0.9.6\&quot;"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
@@ -65,7 +65,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="3"
 				OmitFramePointers="TRUE"
-				AdditionalIncludeDirectories="&quot;$(SolutionDir)\msvc-stdint&quot;;&quot;$(SolutionDir)\msvc-71&quot;"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)\msvc-stdint&quot;;&quot;$(SolutionDir)\msvc-71&quot;;&quot;$(VSInstallDir)\..\Microsoft Xbox SDK\xbox\include&quot;"
 				PreprocessorDefinitions="_XBOX;_XBOX1;RARCH_CONSOLE;PACKAGE_VERSION=\&quot;0.9.6\&quot;"
 				StringPooling="TRUE"
 				BufferSecurityCheck="TRUE"
@@ -114,7 +114,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="3"
 				OmitFramePointers="TRUE"
-				AdditionalIncludeDirectories="&quot;$(SolutionDir)\msvc-stdint&quot;;&quot;$(SolutionDir)\msvc-71&quot;"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)\msvc-stdint&quot;;&quot;$(SolutionDir)\msvc-71&quot;;&quot;$(VSInstallDir)\..\Microsoft Xbox SDK\xbox\include&quot;"
 				PreprocessorDefinitions="_XBOX;_XBOX1;RARCH_CONSOLE;PACKAGE_VERSION=\&quot;0.9.6\&quot;"
 				StringPooling="TRUE"
 				EnableFunctionLevelLinking="TRUE"
@@ -155,7 +155,7 @@
 			ConfigurationType="1">
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="&quot;$(SolutionDir)\msvc-stdint&quot;;&quot;$(SolutionDir)\msvc-71&quot;"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)\msvc-stdint&quot;;&quot;$(SolutionDir)\msvc-71&quot;;&quot;$(VSInstallDir)\..\Microsoft Xbox SDK\xbox\include&quot;"
 				PreprocessorDefinitions="_XBOX;_XBOX1;RARCH_CONSOLE;PACKAGE_VERSION=\&quot;0.9.6\&quot;"
 				UsePrecompiledHeader="0"/>
 			<Tool
@@ -190,7 +190,7 @@
 			ConfigurationType="1">
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="&quot;$(SolutionDir)\msvc-stdint&quot;;&quot;$(SolutionDir)\msvc-71&quot;"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)\msvc-stdint&quot;;&quot;$(SolutionDir)\msvc-71&quot;;&quot;$(VSInstallDir)\..\Microsoft Xbox SDK\xbox\include&quot;"
 				PreprocessorDefinitions="_XBOX;_XBOX1;RARCH_CONSOLE;PACKAGE_VERSION=\&quot;0.9.6\&quot;"
 				UsePrecompiledHeader="0"/>
 			<Tool