diff --git a/Externals/ExternalsReferenceAll.props b/Externals/ExternalsReferenceAll.props
index 38ec0bd827..b63d4ab74d 100644
--- a/Externals/ExternalsReferenceAll.props
+++ b/Externals/ExternalsReferenceAll.props
@@ -34,6 +34,9 @@
{cbc76802-c128-4b17-bf6c-23b08c313e5e}
+
+ {4BC5A148-0AB3-440F-A980-A29B4B999190}
+
{8498f2fa-5ca6-4169-9971-de5b1fe6132c}
diff --git a/Externals/fmt/fmt.vcxproj b/Externals/fmt/fmt.vcxproj
new file mode 100644
index 0000000000..5ff6768e1c
--- /dev/null
+++ b/Externals/fmt/fmt.vcxproj
@@ -0,0 +1,40 @@
+
+
+
+
+
+ {4BC5A148-0AB3-440F-A980-A29B4B999190}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Externals/soundtouch/STTypes.h b/Externals/soundtouch/STTypes.h
index a07bc3dcea..375a0a3789 100644
--- a/Externals/soundtouch/STTypes.h
+++ b/Externals/soundtouch/STTypes.h
@@ -39,21 +39,6 @@
#ifndef STTypes_H
#define STTypes_H
-typedef unsigned int uint;
-typedef unsigned long ulong;
-
-// Patch for MinGW: on Win64 long is 32-bit
-#ifdef _WIN64
- typedef unsigned long long ulongptr;
-#else
- typedef ulong ulongptr;
-#endif
-
-
-// Helper macro for aligning pointer up to next 16-byte boundary
-#define SOUNDTOUCH_ALIGN_POINTER_16(x) ( ( (ulongptr)(x) + 15 ) & ~(ulongptr)15 )
-
-
#if (defined(__GNUC__) && !defined(ANDROID))
// In GCC, include soundtouch_config.h made by config scritps.
// Skip this in Android compilation that uses GCC but without configure scripts.
@@ -63,6 +48,20 @@ typedef unsigned long ulong;
namespace soundtouch
{
+ typedef unsigned int uint;
+ typedef unsigned long ulong;
+
+ // Patch for MinGW: on Win64 long is 32-bit
+ #ifdef _WIN64
+ typedef unsigned long long ulongptr;
+ #else
+ typedef ulong ulongptr;
+ #endif
+
+
+ // Helper macro for aligning pointer up to next 16-byte boundary
+ #define SOUNDTOUCH_ALIGN_POINTER_16(x) ( ( (ulongptr)(x) + 15 ) & ~(ulongptr)15 )
+
/// Activate these undef's to overrule the possible sampletype
/// setting inherited from some other header file:
#undef SOUNDTOUCH_INTEGER_SAMPLES
diff --git a/Externals/soundtouch/cpu_detect.h b/Externals/soundtouch/cpu_detect.h
index 025781dae1..79d5127204 100644
--- a/Externals/soundtouch/cpu_detect.h
+++ b/Externals/soundtouch/cpu_detect.h
@@ -51,6 +51,8 @@
#define SUPPORT_SSE 0x0008
#define SUPPORT_SSE2 0x0010
+using namespace soundtouch;
+
/// Checks which instruction set extensions are supported by the CPU.
///
/// \return A bitmask of supported extensions, see SUPPORT_... defines.
diff --git a/Source/Core/WinUpdater/WinUpdater.vcxproj b/Source/Core/WinUpdater/WinUpdater.vcxproj
index b550b5f107..fd64846a2f 100644
--- a/Source/Core/WinUpdater/WinUpdater.vcxproj
+++ b/Source/Core/WinUpdater/WinUpdater.vcxproj
@@ -36,6 +36,9 @@
{5bdf4b91-1491-4fb0-bc27-78e9a8e97dc3}
+
+ {4BC5A148-0AB3-440F-A980-A29B4B999190}
+
{bdb6578b-0691-4e80-a46c-df21639fd3b8}
diff --git a/Source/DSPTool/DSPTool.vcxproj b/Source/DSPTool/DSPTool.vcxproj
index 59c5f2bc3d..dbbce7cf35 100644
--- a/Source/DSPTool/DSPTool.vcxproj
+++ b/Source/DSPTool/DSPTool.vcxproj
@@ -38,6 +38,9 @@
{D79392F7-06D6-4B4B-A39F-4D587C215D3A}
+
+ {4BC5A148-0AB3-440F-A980-A29B4B999190}
+
diff --git a/Source/VSProps/Base.props b/Source/VSProps/Base.props
index 563086055c..5678d09b1a 100644
--- a/Source/VSProps/Base.props
+++ b/Source/VSProps/Base.props
@@ -55,7 +55,6 @@
true
true
true
- FMT_HEADER_ONLY=1;%(PreprocessorDefinitions)