diff --git a/examples/c/decode/file/example_c_decode_file.vcproj b/examples/c/decode/file/example_c_decode_file.vcproj
index 15f108cc..ddd20bca 100644
--- a/examples/c/decode/file/example_c_decode_file.vcproj
+++ b/examples/c/decode/file/example_c_decode_file.vcproj
@@ -50,6 +50,7 @@
 				DebugInformationFormat="4"
 				CompileAs="0"
 				DisableSpecificWarnings="4267;4996"
+				ForcedIncludeFiles="share/msvc2005_int.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -129,6 +130,7 @@
 				DebugInformationFormat="3"
 				CompileAs="0"
 				DisableSpecificWarnings="4267;4996"
+				ForcedIncludeFiles="share/msvc2005_int.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
diff --git a/examples/c/encode/file/example_c_encode_file.vcproj b/examples/c/encode/file/example_c_encode_file.vcproj
index fb08db0c..26f0e9e2 100644
--- a/examples/c/encode/file/example_c_encode_file.vcproj
+++ b/examples/c/encode/file/example_c_encode_file.vcproj
@@ -50,6 +50,7 @@
 				DebugInformationFormat="4"
 				CompileAs="0"
 				DisableSpecificWarnings="4267;4996"
+				ForcedIncludeFiles="share/msvc2005_int.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -129,6 +130,7 @@
 				DebugInformationFormat="3"
 				CompileAs="0"
 				DisableSpecificWarnings="4267;4996"
+				ForcedIncludeFiles="share/msvc2005_int.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
diff --git a/examples/cpp/decode/file/example_cpp_decode_file.vcproj b/examples/cpp/decode/file/example_cpp_decode_file.vcproj
index 7463bca8..59e735da 100644
--- a/examples/cpp/decode/file/example_cpp_decode_file.vcproj
+++ b/examples/cpp/decode/file/example_cpp_decode_file.vcproj
@@ -50,6 +50,7 @@
 				DebugInformationFormat="4"
 				CompileAs="0"
 				DisableSpecificWarnings="4267;4996"
+				ForcedIncludeFiles="share/msvc2005_int.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -129,6 +130,7 @@
 				DebugInformationFormat="3"
 				CompileAs="0"
 				DisableSpecificWarnings="4267;4996"
+				ForcedIncludeFiles="share/msvc2005_int.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
diff --git a/examples/cpp/encode/file/example_cpp_encode_file.vcproj b/examples/cpp/encode/file/example_cpp_encode_file.vcproj
index 333b2033..f81949f9 100644
--- a/examples/cpp/encode/file/example_cpp_encode_file.vcproj
+++ b/examples/cpp/encode/file/example_cpp_encode_file.vcproj
@@ -50,6 +50,7 @@
 				DebugInformationFormat="4"
 				CompileAs="0"
 				DisableSpecificWarnings="4267;4996"
+				ForcedIncludeFiles="share/msvc2005_int.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -129,6 +130,7 @@
 				DebugInformationFormat="3"
 				CompileAs="0"
 				DisableSpecificWarnings="4267;4996"
+				ForcedIncludeFiles="share/msvc2005_int.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
diff --git a/include/FLAC/ordinals.h b/include/FLAC/ordinals.h
index 8018afec..75b830d6 100644
--- a/include/FLAC/ordinals.h
+++ b/include/FLAC/ordinals.h
@@ -39,15 +39,14 @@
  * the 1999 ISO C Standard header file <stdint.h>.
  */
 
-typedef __int8 FLAC__int8;
-typedef uint32_t __int8 FLAC__uint8;
-
-typedef __int16 FLAC__int16;
-typedef __int32 FLAC__int32;
-typedef __int64 FLAC__int64;
-typedef uint32_t __int16 FLAC__uint16;
-typedef uint32_t __int32 FLAC__uint32;
-typedef uint32_t __int64 FLAC__uint64;
+typedef signed __int8 FLAC__int8;
+typedef signed __int16 FLAC__int16;
+typedef signed __int32 FLAC__int32;
+typedef signed __int64 FLAC__int64;
+typedef unsigned __int8 FLAC__uint8;
+typedef unsigned __int16 FLAC__uint16;
+typedef unsigned __int32 FLAC__uint32;
+typedef unsigned __int64 FLAC__uint64;
 
 #else
 
diff --git a/include/share/Makefile.am b/include/share/Makefile.am
index 2d8ca503..079c1690 100644
--- a/include/share/Makefile.am
+++ b/include/share/Makefile.am
@@ -9,6 +9,7 @@ EXTRA_DIST = \
 	getopt.h \
 	grabbag.h \
 	macros.h \
+	msvc2005_int.h \
 	private.h \
 	replaygain_analysis.h \
 	replaygain_synthesis.h \
diff --git a/include/share/compat.h b/include/share/compat.h
index 2083f3a2..94edbd21 100644
--- a/include/share/compat.h
+++ b/include/share/compat.h
@@ -130,14 +130,6 @@
 #    ifndef UINT32_MAX
 #      define UINT32_MAX _UI32_MAX
 #    endif
-     typedef unsigned __int64 uint64_t;
-     typedef unsigned __int32 uint32_t;
-     typedef unsigned __int16 uint16_t;
-     typedef unsigned __int8 uint8_t;
-     typedef __int64 int64_t;
-     typedef __int32 int32_t;
-     typedef __int16 int16_t;
-     typedef __int8  int8_t;
 #    define PRIu64 "I64u"
 #    define PRId64 "I64d"
 #    define PRIx64 "I64x"
diff --git a/src/flac/flac.vcproj b/src/flac/flac.vcproj
index ace4e3c4..0c962b1b 100644
--- a/src/flac/flac.vcproj
+++ b/src/flac/flac.vcproj
@@ -50,6 +50,7 @@
 				DebugInformationFormat="4"
 				CompileAs="0"
 				DisableSpecificWarnings="4267;4996"
+				ForcedIncludeFiles="share/msvc2005_int.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -129,6 +130,7 @@
 				DebugInformationFormat="3"
 				CompileAs="0"
 				DisableSpecificWarnings="4267;4996"
+				ForcedIncludeFiles="share/msvc2005_int.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
diff --git a/src/flac/iffscan.vcproj b/src/flac/iffscan.vcproj
index f1b7520f..8c267508 100644
--- a/src/flac/iffscan.vcproj
+++ b/src/flac/iffscan.vcproj
@@ -50,6 +50,7 @@
 				DebugInformationFormat="4"
 				CompileAs="0"
 				DisableSpecificWarnings="4267;4996"
+				ForcedIncludeFiles="share/msvc2005_int.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -129,6 +130,7 @@
 				DebugInformationFormat="3"
 				CompileAs="0"
 				DisableSpecificWarnings="4267;4996"
+				ForcedIncludeFiles="share/msvc2005_int.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
diff --git a/src/libFLAC++/libFLAC++_dynamic.vcproj b/src/libFLAC++/libFLAC++_dynamic.vcproj
index 56006e00..e1ce90b6 100644
--- a/src/libFLAC++/libFLAC++_dynamic.vcproj
+++ b/src/libFLAC++/libFLAC++_dynamic.vcproj
@@ -49,6 +49,7 @@
 				Detect64BitPortabilityProblems="true"
 				DebugInformationFormat="4"
 				DisableSpecificWarnings="4267;4996"
+				ForcedIncludeFiles="share/msvc2005_int.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -125,6 +126,7 @@
 				Detect64BitPortabilityProblems="true"
 				DebugInformationFormat="3"
 				DisableSpecificWarnings="4267;4996"
+				ForcedIncludeFiles="share/msvc2005_int.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
diff --git a/src/libFLAC++/libFLAC++_static.vcproj b/src/libFLAC++/libFLAC++_static.vcproj
index d0a1e997..20ee93b5 100644
--- a/src/libFLAC++/libFLAC++_static.vcproj
+++ b/src/libFLAC++/libFLAC++_static.vcproj
@@ -49,6 +49,7 @@
 				Detect64BitPortabilityProblems="true"
 				DebugInformationFormat="4"
 				DisableSpecificWarnings="4267;4996"
+				ForcedIncludeFiles="share/msvc2005_int.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -115,6 +116,7 @@
 				Detect64BitPortabilityProblems="true"
 				DebugInformationFormat="3"
 				DisableSpecificWarnings="4267;4996"
+				ForcedIncludeFiles="share/msvc2005_int.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
diff --git a/src/libFLAC/libFLAC_dynamic.vcproj b/src/libFLAC/libFLAC_dynamic.vcproj
index 52e12c03..3815c79b 100644
--- a/src/libFLAC/libFLAC_dynamic.vcproj
+++ b/src/libFLAC/libFLAC_dynamic.vcproj
@@ -52,6 +52,7 @@
 				DebugInformationFormat="4"
 				CompileAs="0"
 				DisableSpecificWarnings="4267;4996"
+				ForcedIncludeFiles="share/msvc2005_int.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -132,6 +133,7 @@
 				DebugInformationFormat="3"
 				CompileAs="0"
 				DisableSpecificWarnings="4267;4996"
+				ForcedIncludeFiles="share/msvc2005_int.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
diff --git a/src/libFLAC/libFLAC_static.vcproj b/src/libFLAC/libFLAC_static.vcproj
index 5bff5d80..6b6edf0c 100644
--- a/src/libFLAC/libFLAC_static.vcproj
+++ b/src/libFLAC/libFLAC_static.vcproj
@@ -52,6 +52,7 @@
 				DebugInformationFormat="4"
 				CompileAs="0"
 				DisableSpecificWarnings="4267;4996"
+				ForcedIncludeFiles="share/msvc2005_int.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -120,6 +121,7 @@
 				DebugInformationFormat="3"
 				CompileAs="0"
 				DisableSpecificWarnings="4267;4996"
+				ForcedIncludeFiles="share/msvc2005_int.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
diff --git a/src/metaflac/metaflac.vcproj b/src/metaflac/metaflac.vcproj
index 076406b8..81259bef 100644
--- a/src/metaflac/metaflac.vcproj
+++ b/src/metaflac/metaflac.vcproj
@@ -50,6 +50,7 @@
 				DebugInformationFormat="4"
 				CompileAs="0"
 				DisableSpecificWarnings="4267;4996"
+				ForcedIncludeFiles="share/msvc2005_int.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -129,6 +130,7 @@
 				DebugInformationFormat="3"
 				CompileAs="0"
 				DisableSpecificWarnings="4267;4996"
+				ForcedIncludeFiles="share/msvc2005_int.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
diff --git a/src/share/getopt/getopt_static.vcproj b/src/share/getopt/getopt_static.vcproj
index 7a95af25..efc4ba76 100644
--- a/src/share/getopt/getopt_static.vcproj
+++ b/src/share/getopt/getopt_static.vcproj
@@ -50,6 +50,7 @@
 				DebugInformationFormat="4"
 				CompileAs="0"
 				DisableSpecificWarnings="4267;4996"
+				ForcedIncludeFiles="share/msvc2005_int.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -117,6 +118,7 @@
 				DebugInformationFormat="3"
 				CompileAs="0"
 				DisableSpecificWarnings="4267;4996"
+				ForcedIncludeFiles="share/msvc2005_int.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
diff --git a/src/share/grabbag/grabbag_static.vcproj b/src/share/grabbag/grabbag_static.vcproj
index bb707060..d9f5a8a2 100644
--- a/src/share/grabbag/grabbag_static.vcproj
+++ b/src/share/grabbag/grabbag_static.vcproj
@@ -50,6 +50,7 @@
 				DebugInformationFormat="4"
 				CompileAs="0"
 				DisableSpecificWarnings="4267;4996"
+				ForcedIncludeFiles="share/msvc2005_int.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -117,6 +118,7 @@
 				DebugInformationFormat="3"
 				CompileAs="0"
 				DisableSpecificWarnings="4267;4996"
+				ForcedIncludeFiles="share/msvc2005_int.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
diff --git a/src/share/replaygain_analysis/replaygain_analysis_static.vcproj b/src/share/replaygain_analysis/replaygain_analysis_static.vcproj
index 152d8271..9645da5f 100644
--- a/src/share/replaygain_analysis/replaygain_analysis_static.vcproj
+++ b/src/share/replaygain_analysis/replaygain_analysis_static.vcproj
@@ -50,6 +50,7 @@
 				DebugInformationFormat="4"
 				CompileAs="0"
 				DisableSpecificWarnings="4267;4996"
+				ForcedIncludeFiles="share/msvc2005_int.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -117,6 +118,7 @@
 				DebugInformationFormat="3"
 				CompileAs="0"
 				DisableSpecificWarnings="4267;4996"
+				ForcedIncludeFiles="share/msvc2005_int.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
diff --git a/src/share/replaygain_synthesis/replaygain_synthesis_static.vcproj b/src/share/replaygain_synthesis/replaygain_synthesis_static.vcproj
index 1e28a9b3..7e148830 100644
--- a/src/share/replaygain_synthesis/replaygain_synthesis_static.vcproj
+++ b/src/share/replaygain_synthesis/replaygain_synthesis_static.vcproj
@@ -50,6 +50,7 @@
 				DebugInformationFormat="4"
 				CompileAs="0"
 				DisableSpecificWarnings="4267;4996"
+				ForcedIncludeFiles="share/msvc2005_int.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -117,6 +118,7 @@
 				DebugInformationFormat="3"
 				CompileAs="0"
 				DisableSpecificWarnings="4267;4996"
+				ForcedIncludeFiles="share/msvc2005_int.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
diff --git a/src/share/utf8/utf8_static.vcproj b/src/share/utf8/utf8_static.vcproj
index 87b8ad5d..45a031a0 100644
--- a/src/share/utf8/utf8_static.vcproj
+++ b/src/share/utf8/utf8_static.vcproj
@@ -50,6 +50,7 @@
 				DebugInformationFormat="4"
 				CompileAs="0"
 				DisableSpecificWarnings="4267;4996"
+				ForcedIncludeFiles="share/msvc2005_int.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -117,6 +118,7 @@
 				DebugInformationFormat="3"
 				CompileAs="0"
 				DisableSpecificWarnings="4267;4996"
+				ForcedIncludeFiles="share/msvc2005_int.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
diff --git a/src/share/win_utf8_io/win_utf8_io_static.vcproj b/src/share/win_utf8_io/win_utf8_io_static.vcproj
index 00eeea75..b34cbbe2 100644
--- a/src/share/win_utf8_io/win_utf8_io_static.vcproj
+++ b/src/share/win_utf8_io/win_utf8_io_static.vcproj
@@ -50,6 +50,7 @@
 				DebugInformationFormat="4"
 				CompileAs="0"
 				DisableSpecificWarnings="4267;4996"
+				ForcedIncludeFiles="share/msvc2005_int.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -117,6 +118,7 @@
 				DebugInformationFormat="3"
 				CompileAs="0"
 				DisableSpecificWarnings="4267;4996"
+				ForcedIncludeFiles="share/msvc2005_int.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
diff --git a/src/test_grabbag/cuesheet/test_cuesheet.vcproj b/src/test_grabbag/cuesheet/test_cuesheet.vcproj
index 8644a23b..cf0f4d9d 100644
--- a/src/test_grabbag/cuesheet/test_cuesheet.vcproj
+++ b/src/test_grabbag/cuesheet/test_cuesheet.vcproj
@@ -50,6 +50,7 @@
 				DebugInformationFormat="4"
 				CompileAs="0"
 				DisableSpecificWarnings="4267;4996"
+				ForcedIncludeFiles="share/msvc2005_int.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -128,6 +129,7 @@
 				DebugInformationFormat="3"
 				CompileAs="0"
 				DisableSpecificWarnings="4267;4996"
+				ForcedIncludeFiles="share/msvc2005_int.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
diff --git a/src/test_grabbag/picture/test_picture.vcproj b/src/test_grabbag/picture/test_picture.vcproj
index 1ada2edb..9ea05727 100644
--- a/src/test_grabbag/picture/test_picture.vcproj
+++ b/src/test_grabbag/picture/test_picture.vcproj
@@ -50,6 +50,7 @@
 				DebugInformationFormat="4"
 				CompileAs="0"
 				DisableSpecificWarnings="4267;4996"
+				ForcedIncludeFiles="share/msvc2005_int.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -128,6 +129,7 @@
 				DebugInformationFormat="3"
 				CompileAs="0"
 				DisableSpecificWarnings="4267;4996"
+				ForcedIncludeFiles="share/msvc2005_int.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
diff --git a/src/test_libFLAC++/test_libFLAC++.vcproj b/src/test_libFLAC++/test_libFLAC++.vcproj
index 0c8e55c5..b9152c52 100644
--- a/src/test_libFLAC++/test_libFLAC++.vcproj
+++ b/src/test_libFLAC++/test_libFLAC++.vcproj
@@ -49,6 +49,7 @@
 				Detect64BitPortabilityProblems="true"
 				DebugInformationFormat="4"
 				DisableSpecificWarnings="4267;4996"
+				ForcedIncludeFiles="share/msvc2005_int.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -127,6 +128,7 @@
 				Detect64BitPortabilityProblems="true"
 				DebugInformationFormat="3"
 				DisableSpecificWarnings="4267;4996"
+				ForcedIncludeFiles="share/msvc2005_int.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
diff --git a/src/test_libFLAC/test_libFLAC.vcproj b/src/test_libFLAC/test_libFLAC.vcproj
index c31c366a..bcca1cc3 100644
--- a/src/test_libFLAC/test_libFLAC.vcproj
+++ b/src/test_libFLAC/test_libFLAC.vcproj
@@ -50,6 +50,7 @@
 				DebugInformationFormat="4"
 				CompileAs="0"
 				DisableSpecificWarnings="4267;4996"
+				ForcedIncludeFiles="share/msvc2005_int.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -129,6 +130,7 @@
 				DebugInformationFormat="3"
 				CompileAs="0"
 				DisableSpecificWarnings="4267;4996"
+				ForcedIncludeFiles="share/msvc2005_int.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
diff --git a/src/test_libs_common/test_libs_common_static.vcproj b/src/test_libs_common/test_libs_common_static.vcproj
index 0f1d37c6..763d3e71 100644
--- a/src/test_libs_common/test_libs_common_static.vcproj
+++ b/src/test_libs_common/test_libs_common_static.vcproj
@@ -50,6 +50,7 @@
 				DebugInformationFormat="4"
 				CompileAs="0"
 				DisableSpecificWarnings="4267;4996"
+				ForcedIncludeFiles="share/msvc2005_int.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -117,6 +118,7 @@
 				DebugInformationFormat="3"
 				CompileAs="0"
 				DisableSpecificWarnings="4267;4996"
+				ForcedIncludeFiles="share/msvc2005_int.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
diff --git a/src/test_seeking/test_seeking.vcproj b/src/test_seeking/test_seeking.vcproj
index bfeeef72..bcfe310b 100644
--- a/src/test_seeking/test_seeking.vcproj
+++ b/src/test_seeking/test_seeking.vcproj
@@ -50,6 +50,7 @@
 				DebugInformationFormat="4"
 				CompileAs="0"
 				DisableSpecificWarnings="4267;4996"
+				ForcedIncludeFiles="share/msvc2005_int.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -129,6 +130,7 @@
 				DebugInformationFormat="3"
 				CompileAs="0"
 				DisableSpecificWarnings="4267;4996"
+				ForcedIncludeFiles="share/msvc2005_int.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
diff --git a/src/test_streams/test_streams.vcproj b/src/test_streams/test_streams.vcproj
index 415ecc06..65ed81ca 100644
--- a/src/test_streams/test_streams.vcproj
+++ b/src/test_streams/test_streams.vcproj
@@ -50,6 +50,7 @@
 				DebugInformationFormat="4"
 				CompileAs="0"
 				DisableSpecificWarnings="4267;4996"
+				ForcedIncludeFiles="share/msvc2005_int.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -128,6 +129,7 @@
 				DebugInformationFormat="3"
 				CompileAs="0"
 				DisableSpecificWarnings="4267;4996"
+				ForcedIncludeFiles="share/msvc2005_int.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
diff --git a/src/utils/flacdiff/flacdiff.vcproj b/src/utils/flacdiff/flacdiff.vcproj
index 0c79b2fd..e7831e2e 100644
--- a/src/utils/flacdiff/flacdiff.vcproj
+++ b/src/utils/flacdiff/flacdiff.vcproj
@@ -49,6 +49,7 @@
 				Detect64BitPortabilityProblems="true"
 				DebugInformationFormat="4"
 				DisableSpecificWarnings="4267;4996"
+				ForcedIncludeFiles="share/msvc2005_int.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -127,6 +128,7 @@
 				Detect64BitPortabilityProblems="true"
 				DebugInformationFormat="3"
 				DisableSpecificWarnings="4267;4996"
+				ForcedIncludeFiles="share/msvc2005_int.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
diff --git a/src/utils/flactimer/flactimer.vcproj b/src/utils/flactimer/flactimer.vcproj
index edcc40da..b18bf60c 100644
--- a/src/utils/flactimer/flactimer.vcproj
+++ b/src/utils/flactimer/flactimer.vcproj
@@ -49,6 +49,7 @@
 				Detect64BitPortabilityProblems="true"
 				DebugInformationFormat="4"
 				DisableSpecificWarnings="4267;4996"
+				ForcedIncludeFiles="share/msvc2005_int.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -126,6 +127,7 @@
 				Detect64BitPortabilityProblems="true"
 				DebugInformationFormat="3"
 				DisableSpecificWarnings="4267;4996"
+				ForcedIncludeFiles="share/msvc2005_int.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"