diff --git a/src/framework/Platform/Define.h b/src/framework/Platform/Define.h
index ec70a2e5a..4f840ea03 100644
--- a/src/framework/Platform/Define.h
+++ b/src/framework/Platform/Define.h
@@ -119,9 +119,18 @@ typedef uint16      WORD;
 typedef uint32      DWORD;
 #endif // COMPILER
 
+#define CONCAT(x, y) CONCAT1(x, y)
+#define CONCAT1(x, y) x##y
+#define STATIC_ASSERT_WORKAROUND(expr, msg) typedef char CONCAT(static_assert_failed_at_line_, __LINE__) [(expr) ? 1 : -1]
+
 #if COMPILER == COMPILER_GNU
 #  if !defined(__GXX_EXPERIMENTAL_CXX0X__) || (__GNUC__ < 4) || (__GNUC__ == 4) && (__GNUC_MINOR__ < 7)
 #    define override
+#    define static_assert(a, b) STATIC_ASSERT_WORKAROUND(a, b)
+#  endif
+#elif COMPILER == COMPILER_MICROSOFT
+#  if _MSC_VER < 1600
+#    define static_assert(a, b) STATIC_ASSERT_WORKAROUND(a, b)
 #  endif
 #endif
 
diff --git a/src/game/movement/typedefs.h b/src/game/movement/typedefs.h
index b7e55d910..02d64ae37 100644
--- a/src/game/movement/typedefs.h
+++ b/src/game/movement/typedefs.h
@@ -44,12 +44,6 @@ namespace Movement
         return ms / 1000.f;
     }
 
-#ifndef static_assert
-#define CONCAT(x, y) CONCAT1 (x, y)
-#define CONCAT1(x, y) x##y
-#define static_assert(expr, msg) typedef char CONCAT(static_assert_failed_at_line_, __LINE__) [(expr) ? 1 : -1]
-#endif
-
     template<class T, T limit>
     class counter
     {
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index a352d8b49..3fbd73155 100644
--- a/src/shared/revision_nr.h
+++ b/src/shared/revision_nr.h
@@ -1,4 +1,4 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
- #define REVISION_NR "0069"
+ #define REVISION_NR "0070"
 #endif // __REVISION_NR_H__