diff --git a/audio/utils.h b/audio/utils.h
index d8ac6c6038..228bb95302 100644
--- a/audio/utils.h
+++ b/audio/utils.h
@@ -16,7 +16,7 @@
 #ifndef AUDIO_UTILS_H
 #define AUDIO_UTILS_H
 
-#include "../rarch_stdint.h"
+#include <stdint.h>
 #include <stddef.h>
 
 #if __SSE2__
diff --git a/rarch_stdint.h b/compat/rarch_stdint.h
similarity index 90%
rename from rarch_stdint.h
rename to compat/rarch_stdint.h
index 595d94990e..9d8fe7b0ad 100644
--- a/rarch_stdint.h
+++ b/compat/rarch_stdint.h
@@ -1,19 +1,3 @@
-/*  RetroArch - A frontend for libretro.
- *  Copyright (C) 2010-2012 - Hans-Kristian Arntzen
- *  Copyright (C) 2011-2012 - Daniel De Matteis
- * 
- *  RetroArch is free software: you can redistribute it and/or modify it under the terms
- *  of the GNU General Public License as published by the Free Software Found-
- *  ation, either version 3 of the License, or (at your option) any later version.
- *
- *  RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- *  PURPOSE.  See the GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License along with RetroArch.
- *  If not, see <http://www.gnu.org/licenses/>.
- */
-
 // ISO C9x  compliant stdint.h for Microsoft Visual Studio
 // Based on ISO/IEC 9899:TC2 Committee draft (May 6, 2005) WG14/N1124 
 // 
diff --git a/driver.h b/driver.h
index 19a8a08ad9..5908e71fbf 100644
--- a/driver.h
+++ b/driver.h
@@ -20,7 +20,7 @@
 #include <sys/types.h>
 #include "boolean.h"
 #include <stdlib.h>
-#include "rarch_stdint.h"
+#include <stdint.h>
 #include "msvc/msvc_compat.h"
 #include "input/keysym.h"
 
diff --git a/file.h b/file.h
index a8a7bb937c..467f5b75a8 100644
--- a/file.h
+++ b/file.h
@@ -19,7 +19,7 @@
 
 #include "boolean.h"
 #include <stdio.h>
-#include "rarch_stdint.h"
+#include <stdint.h>
 #include <stddef.h>
 #include <sys/types.h>
 #include "general.h"
diff --git a/gfx/state_tracker.h b/gfx/state_tracker.h
index 5a6e5870ac..7c6610b813 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 "../rarch_stdint.h"
+#include <stdint.h>
 #include "../boolean.h"
 
 #ifdef HAVE_CONFIG_H
diff --git a/hash.h b/hash.h
index 24b366c218..5a470f122a 100644
--- a/hash.h
+++ b/hash.h
@@ -16,7 +16,7 @@
 #ifndef __RARCH_HASH_H
 #define __RARCH_HASH_H
 
-#include "rarch_stdint.h"
+#include <stdint.h>
 #include <stddef.h>
 
 // Hashes sha256 and outputs a human readable string for comparing with the cheat XML values.
diff --git a/libretro.h b/libretro.h
index 17c2fcc849..8aa579e863 100755
--- a/libretro.h
+++ b/libretro.h
@@ -1,7 +1,7 @@
 #ifndef LIBRETRO_H__
 #define LIBRETRO_H__
 
-#include "rarch_stdint.h"
+#include <stdint.h>
 #include <stddef.h>
 
 #ifdef __cplusplus
diff --git a/movie.h b/movie.h
index 22d7d25370..c8665ba85d 100644
--- a/movie.h
+++ b/movie.h
@@ -16,7 +16,7 @@
 #ifndef __RARCH_MOVIE_H
 #define __RARCH_MOVIE_H
 
-#include "rarch_stdint.h"
+#include <stdint.h>
 #include <stddef.h>
 #include "boolean.h"
 
diff --git a/msvc/RetroArch-Xbox1/RetroArch-Xbox1.vcproj b/msvc/RetroArch-Xbox1/RetroArch-Xbox1.vcproj
index 0d136e0991..f9bce47649 100644
--- a/msvc/RetroArch-Xbox1/RetroArch-Xbox1.vcproj
+++ b/msvc/RetroArch-Xbox1/RetroArch-Xbox1.vcproj
@@ -20,7 +20,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="&quot;$(SolutionDir)\..\&quot;"
-				PreprocessorDefinitions="_XBOX;_XBOX1;RARCH_CONSOLE"
+				PreprocessorDefinitions="_XBOX;_XBOX1;RARCH_CONSOLE;PACKAGE_VERSION=&quot;0.9.6&quot;"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
 				EnableEnhancedInstructionSet="1"
@@ -66,7 +66,7 @@
 				Optimization="3"
 				OmitFramePointers="TRUE"
 				AdditionalIncludeDirectories="&quot;$(SolutionDir)\..\&quot;"
-				PreprocessorDefinitions="_XBOX;_XBOX1;RARCH_CONSOLE"
+				PreprocessorDefinitions="_XBOX;_XBOX1;RARCH_CONSOLE;PACKAGE_VERSION=&quot;0.9.6&quot;"
 				StringPooling="TRUE"
 				BufferSecurityCheck="TRUE"
 				EnableFunctionLevelLinking="TRUE"
@@ -115,7 +115,7 @@
 				Optimization="3"
 				OmitFramePointers="TRUE"
 				AdditionalIncludeDirectories="&quot;$(SolutionDir)\..\&quot;"
-				PreprocessorDefinitions="_XBOX;_XBOX1;RARCH_CONSOLE"
+				PreprocessorDefinitions="_XBOX;_XBOX1;RARCH_CONSOLE;PACKAGE_VERSION=&quot;0.9.6&quot;"
 				StringPooling="TRUE"
 				EnableFunctionLevelLinking="TRUE"
 				EnableEnhancedInstructionSet="1"
@@ -156,7 +156,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories=""
-				PreprocessorDefinitions="_XBOX;_XBOX1;RARCH_CONSOLE"
+				PreprocessorDefinitions="_XBOX;_XBOX1;RARCH_CONSOLE;PACKAGE_VERSION=&quot;0.9.6&quot;"
 				UsePrecompiledHeader="0"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
@@ -190,7 +190,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories="&quot;$(SolutionDir)\..\&quot;"
-				PreprocessorDefinitions="_XBOX;_XBOX1;RARCH_CONSOLE"
+				PreprocessorDefinitions="_XBOX;_XBOX1;RARCH_CONSOLE;PACKAGE_VERSION=&quot;0.9.6&quot;"
 				UsePrecompiledHeader="0"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
diff --git a/patch.h b/patch.h
index fcf315e41a..ef5761b143 100644
--- a/patch.h
+++ b/patch.h
@@ -16,7 +16,7 @@
 #ifndef __PATCH_H
 #define __PATCH_H
 
-#include "rarch_stdint.h"
+#include <stdint.h>
 #include <stddef.h>
 
 // BPS/UPS/IPS implementation from bSNES (nall::).
diff --git a/ps3/frontend/main.c b/ps3/frontend/main.c
index 38c6f4b785..b61e31c620 100644
--- a/ps3/frontend/main.c
+++ b/ps3/frontend/main.c
@@ -14,7 +14,7 @@
  * If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../../rarch_stdint.h"
+#include <stdint.h>
 #include "../../boolean.h"
 #include <stddef.h>
 #include <string.h>
diff --git a/record/ffemu.h b/record/ffemu.h
index 549ed55268..b9956b7a1b 100644
--- a/record/ffemu.h
+++ b/record/ffemu.h
@@ -16,7 +16,7 @@
 #ifndef __FFEMU_H
 #define __FFEMU_H
 
-#include "../rarch_stdint.h"
+#include <stdint.h>
 #include <stddef.h>
 
 #ifdef __cplusplus