1 files changed, 4 insertions, 13 deletions

diff --git a/src/common/common_funcs.h b/src/common/common_funcs.h
index 91b74c6bc..59bd16dbf 100644
--- a/src/common/common_funcs.h
+++ b/src/common/common_funcs.h
@@ -5,15 +5,6 @@
 #pragma once
 
 #include "common_types.h"
-#include <cstdlib>
-
-
-#define b2(x)   (   (x) | (   (x) >> 1) )
-#define b4(x)   ( b2(x) | ( b2(x) >> 2) )
-#define b8(x)   ( b4(x) | ( b4(x) >> 4) )
-#define b16(x)  ( b8(x) | ( b8(x) >> 8) )
-#define b32(x)  (b16(x) | (b16(x) >>16) )
-#define ROUND_UP_POW2(x)    (b32(x - 1) + 1)
 
 #define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0]))
 
@@ -43,8 +34,6 @@
 
 #ifndef _MSC_VER
 
-#include <errno.h>
-
 #if defined(__x86_64__) || defined(_M_X64)
 #define Crash() __asm__ __volatile__("int $3")
 #elif defined(_M_ARM)
@@ -80,8 +69,10 @@ inline u64 _rotr64(u64 x, unsigned int shift){
 }
 
 #else // _MSC_VER
-    // Function Cross-Compatibility
-    #define snprintf _snprintf
+    #if (_MSC_VER < 1900)
+        // Function Cross-Compatibility
+        #define snprintf _snprintf
+    #endif
 
     // Locale Cross-Compatibility
     #define locale_t _locale_t