diff --git a/audio/utils.h b/audio/utils.h
index 228bb95302..d8ac6c6038 100644
--- a/audio/utils.h
+++ b/audio/utils.h
@@ -16,7 +16,7 @@
 #ifndef AUDIO_UTILS_H
 #define AUDIO_UTILS_H
 
-#include <stdint.h>
+#include "../rarch_stdint.h"
 #include <stddef.h>
 
 #if __SSE2__
diff --git a/console/console_ext.c b/console/console_ext.c
index e9d87c5f66..0881e39260 100644
--- a/console/console_ext.c
+++ b/console/console_ext.c
@@ -285,7 +285,7 @@ static const struct platform_bind platform_keys[] = {
    { CTRL_UP_MASK | CTRL_RSTICK_UP_MASK, "RStick D-Pad Up" },
    { CTRL_DOWN_MASK | CTRL_RSTICK_DOWN_MASK, "RStick D-Pad Down" },
 };
-#elif defined(_XBOX)
+#elif defined(_XBOX360)
 static const struct platform_bind platform_keys[] = {
    { XINPUT_GAMEPAD_B, "B button" },
    { XINPUT_GAMEPAD_A, "A button" },
@@ -471,7 +471,7 @@ void rarch_input_set_controls_default (void)
    rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_R3]		= platform_keys[PS3_DEVICE_ID_JOYPAD_R3].joykey;
    rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_L2]		= platform_keys[PS3_DEVICE_ID_JOYPAD_L2].joykey;
    rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_L3]		= platform_keys[PS3_DEVICE_ID_JOYPAD_L3].joykey;
-#elif defined(_XBOX)
+#elif defined(_XBOX360)
    rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_B]		= platform_keys[XDK360_DEVICE_ID_JOYPAD_A].joykey;
    rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_Y]		= platform_keys[XDK360_DEVICE_ID_JOYPAD_X].joykey;
    rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_SELECT]	= platform_keys[XDK360_DEVICE_ID_JOYPAD_BACK].joykey;
diff --git a/console/griffin/griffin.c b/console/griffin/griffin.c
index 389e82ed97..fc31a280fb 100644
--- a/console/griffin/griffin.c
+++ b/console/griffin/griffin.c
@@ -86,7 +86,7 @@ VIDEO DRIVER
 
 #ifdef HAVE_OPENGL
 #include "../../gfx/gl.c"
-#elif defined(_XBOX)
+#elif defined(_XBOX360)
 #include "../../360/xdk360_video.cpp"
 #elif defined(GEKKO)
 #include "../../wii/video.c"
@@ -100,7 +100,7 @@ FONTS
 
 #if defined(__CELLOS_LV2__)
 #include "../../gfx/fonts/ps3_libdbgfont.c"
-#elif defined(_XBOX)
+#elif defined(_XBOX360)
 #include "../../gfx/fonts/xdk360_fonts.cpp"
 #elif defined(GEKKO)
 #include "../../gfx/fonts/fonts.c"
@@ -111,7 +111,7 @@ INPUT
 ============================================================ */
 #if defined(__CELLOS_LV2__)
 #include "../../ps3/ps3_input.c"
-#elif defined(_XBOX)
+#elif defined(_XBOX360)
 #include "../../360/xdk360_input.c"
 #elif defined(GEKKO)
 #include "../../wii/input.c"
@@ -157,7 +157,7 @@ AUDIO
 ============================================================ */
 #if defined(__CELLOS_LV2__)
 #include "../../ps3/ps3_audio.c"
-#elif defined(_XBOX)
+#elif defined(_XBOX360)
 #include "../../360/xdk360_audio.cpp"
 #elif defined(GEKKO)
 #include "../../wii/audio.c"
@@ -202,7 +202,7 @@ REWIND
 /*============================================================
 MAIN
 ============================================================ */
-#if defined(_XBOX)
+#if defined(_XBOX360)
 #include "../../360/frontend-xdk/main.c"
 #elif defined(GEKKO)
 #include "../../wii/frontend/main.c"
@@ -230,7 +230,7 @@ NETPLAY
 /*============================================================
 MENU
 ============================================================ */
-#if defined(_XBOX)
+#if defined(_XBOX360)
 #include "../../360/frontend-xdk/menu.cpp"
 #elif defined(GEKKO)
 #include "../rgui/rgui.c"
diff --git a/fifo_buffer.c b/fifo_buffer.c
index a4f452762a..046e6ced17 100644
--- a/fifo_buffer.c
+++ b/fifo_buffer.c
@@ -14,7 +14,7 @@
  */
 
 #include "fifo_buffer.h"
-#include <stdint.h>
+#include "rarch_stdint.h"
 
 struct fifo_buffer
 {
diff --git a/file.c b/file.c
index 4c0700b19e..a40d276a79 100644
--- a/file.c
+++ b/file.c
@@ -26,12 +26,15 @@
 #include "compat/strl.h"
 #include "hash.h"
 
+#ifdef _XBOX360
+#include <xtl.h>
+#endif
+
 #if defined(_WIN32) && !defined(_XBOX)
 #include <io.h>
 #include <fcntl.h>
 #include <windows.h>
 #elif defined(_XBOX)
-#include <xtl.h>
 #define setmode _setmode
 #define INVALID_FILE_ATTRIBUTES -1
 #endif
diff --git a/general.h b/general.h
index fb40bc17ff..0a1375971e 100644
--- a/general.h
+++ b/general.h
@@ -42,7 +42,7 @@
 #include <time/time.h>
 #endif
 
-#if defined(XENON) || defined(__CELLOS_LV2__)
+#if defined(XENON) || defined(__CELLOS_LV2__) || defined(_XBOX1)
 #undef PATH_MAX
 #define PATH_MAX 4096
 #endif
@@ -64,7 +64,7 @@
 #if defined(_WIN32) && !defined(_XBOX)
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
-#elif defined(_XBOX)
+#elif defined(_XBOX360)
 #include <xtl.h>
 #endif
 
@@ -245,7 +245,7 @@ struct console_settings
 #ifdef RARCH_CONSOLE
    uint32_t input_loop;
 #endif
-#ifdef _XBOX
+#ifdef _XBOX360
    uint32_t color_format;
    DWORD volume_device_type;
 #endif
diff --git a/gfx/state_tracker.h b/gfx/state_tracker.h
index 7c6610b813..5a6e5870ac 100644
--- a/gfx/state_tracker.h
+++ b/gfx/state_tracker.h
@@ -16,7 +16,7 @@
 #ifndef __RARCH_SNES_TRACKER_H
 #define __RARCH_SNES_TRACKER_H
 
-#include <stdint.h>
+#include "../rarch_stdint.h"
 #include "../boolean.h"
 
 #ifdef HAVE_CONFIG_H
diff --git a/hash.h b/hash.h
index 5a470f122a..24b366c218 100644
--- a/hash.h
+++ b/hash.h
@@ -16,7 +16,7 @@
 #ifndef __RARCH_HASH_H
 #define __RARCH_HASH_H
 
-#include <stdint.h>
+#include "rarch_stdint.h"
 #include <stddef.h>
 
 // Hashes sha256 and outputs a human readable string for comparing with the cheat XML values.
diff --git a/msvc/RetroArch-Xbox1/RetroArch-Xbox1.vcproj b/msvc/RetroArch-Xbox1/RetroArch-Xbox1.vcproj
index 1521d6e3da..0d136e0991 100644
--- a/msvc/RetroArch-Xbox1/RetroArch-Xbox1.vcproj
+++ b/msvc/RetroArch-Xbox1/RetroArch-Xbox1.vcproj
@@ -20,11 +20,11 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="&quot;$(SolutionDir)\..\&quot;"
-				PreprocessorDefinitions="_XBOX;RARCH_CONSOLE"
+				PreprocessorDefinitions="_XBOX;_XBOX1;RARCH_CONSOLE"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
 				EnableEnhancedInstructionSet="1"
-				UsePrecompiledHeader="3"
+				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="FALSE"
 				DebugInformationFormat="4"/>
@@ -66,12 +66,12 @@
 				Optimization="3"
 				OmitFramePointers="TRUE"
 				AdditionalIncludeDirectories="&quot;$(SolutionDir)\..\&quot;"
-				PreprocessorDefinitions="_XBOX;RARCH_CONSOLE"
+				PreprocessorDefinitions="_XBOX;_XBOX1;RARCH_CONSOLE"
 				StringPooling="TRUE"
 				BufferSecurityCheck="TRUE"
 				EnableFunctionLevelLinking="TRUE"
 				EnableEnhancedInstructionSet="1"
-				UsePrecompiledHeader="3"
+				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="FALSE"
 				DebugInformationFormat="3"/>
@@ -115,11 +115,11 @@
 				Optimization="3"
 				OmitFramePointers="TRUE"
 				AdditionalIncludeDirectories="&quot;$(SolutionDir)\..\&quot;"
-				PreprocessorDefinitions="_XBOX;RARCH_CONSOLE"
+				PreprocessorDefinitions="_XBOX;_XBOX1;RARCH_CONSOLE"
 				StringPooling="TRUE"
 				EnableFunctionLevelLinking="TRUE"
 				EnableEnhancedInstructionSet="1"
-				UsePrecompiledHeader="3"
+				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="FALSE"
 				DebugInformationFormat="3"/>
@@ -156,7 +156,8 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories=""
-				PreprocessorDefinitions="_XBOX;RARCH_CONSOLE"/>
+				PreprocessorDefinitions="_XBOX;_XBOX1;RARCH_CONSOLE"
+				UsePrecompiledHeader="0"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
@@ -189,7 +190,8 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories="&quot;$(SolutionDir)\..\&quot;"
-				PreprocessorDefinitions="_XBOX;RARCH_CONSOLE"/>
+				PreprocessorDefinitions="_XBOX;_XBOX1;RARCH_CONSOLE"
+				UsePrecompiledHeader="0"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
@@ -224,12 +226,36 @@
 			Filter="">
 			<File
 				RelativePath="..\..\console\griffin\griffin.c">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						CompileAs="2"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Profile|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						CompileAs="2"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Profile_FastCap|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						CompileAs="2"/>
+				</FileConfiguration>
 				<FileConfiguration
 					Name="Release|Win32">
 					<Tool
 						Name="VCCLCompilerTool"
 						CompileAs="2"/>
 				</FileConfiguration>
+				<FileConfiguration
+					Name="Release_LTCG|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						CompileAs="2"/>
+				</FileConfiguration>
 			</File>
 		</Filter>
 	</Files>
diff --git a/patch.h b/patch.h
index ef5761b143..fcf315e41a 100644
--- a/patch.h
+++ b/patch.h
@@ -16,7 +16,7 @@
 #ifndef __PATCH_H
 #define __PATCH_H
 
-#include <stdint.h>
+#include "rarch_stdint.h"
 #include <stddef.h>
 
 // BPS/UPS/IPS implementation from bSNES (nall::).