3 files changed, 5 insertions, 3 deletions
diff --git a/Source/Core/Common/Src/Common.h b/Source/Core/Common/Src/Common.h
index 8be00df4ae..fe792ee81d 100644
--- a/Source/Core/Common/Src/Common.h
+++ b/Source/Core/Common/Src/Common.h
@@ -92,8 +92,6 @@ namespace
 	#ifndef _SECURE_SCL
 		#error Please define _SECURE_SCL=0 in the project settings
 	#else
-		template <bool> struct CompileTimeAssert;
-		template<> struct CompileTimeAssert<true> {};
 		CompileTimeAssert<_SECURE_SCL==0> x;
 	#endif
 }
diff --git a/Source/Core/Common/Src/CommonFuncs.h b/Source/Core/Common/Src/CommonFuncs.h
index 4f128c4726..453e23b866 100644
--- a/Source/Core/Common/Src/CommonFuncs.h
+++ b/Source/Core/Common/Src/CommonFuncs.h
@@ -24,6 +24,9 @@
 #define SLEEP(x) usleep(x*1000)
 #endif
 
+template <bool> struct CompileTimeAssert;
+template<> struct CompileTimeAssert<true> {};
+
 #ifndef _WIN32
 
 #if defined __APPLE__
diff --git a/Source/Core/Common/Src/Timer.h b/Source/Core/Common/Src/Timer.h
index e905d962e4..292829f122 100644
--- a/Source/Core/Common/Src/Timer.h
+++ b/Source/Core/Common/Src/Timer.h
@@ -20,8 +20,9 @@
 
 #include "Common.h"
 #include <string>
+#ifdef _WIN32
 #include <mmsystem.h>
-
+#endif
 namespace Common
 {
 class Timer