diff --git a/src/MMBitmap.h b/src/MMBitmap.h
index b32b9a58..b34f57b5 100644
--- a/src/MMBitmap.h
+++ b/src/MMBitmap.h
@@ -5,12 +5,7 @@
 #include "types.h"
 #include "rgb.h"
 #include <assert.h>
-
-#if defined(_MSC_VER)
-	#include "ms_stdint.h"
-#else
-	#include <stdint.h>
-#endif
+#include <stdint.h>
 
 #ifdef __cplusplus
 extern "C" 
diff --git a/src/deadbeef_rand.h b/src/deadbeef_rand.h
index d607db66..ec569a24 100644
--- a/src/deadbeef_rand.h
+++ b/src/deadbeef_rand.h
@@ -1,11 +1,7 @@
 #ifndef DEADBEEF_RAND_H
 #define DEADBEEF_RAND_H
 
-#if defined(_MSC_VER)
-	#include "ms_stdint.h"
-#else
-	#include <stdint.h>
-#endif
+#include <stdint.h>
 
 #define DEADBEEF_MAX UINT32_MAX
 
diff --git a/src/io.h b/src/io.h
index b341d452..47eb974f 100644
--- a/src/io.h
+++ b/src/io.h
@@ -4,12 +4,8 @@
 
 #include "MMBitmap.h"
 #include <stddef.h>
+#include <stdint.h>
 
-#if defined(_MSC_VER)
-	#include "ms_stdint.h"
-#else
-	#include <stdint.h>
-#endif
 
 enum _MMImageType {
 	kInvalidImageType = 0,
diff --git a/src/rgb.h b/src/rgb.h
index 2dbeea2c..f7e032fe 100644
--- a/src/rgb.h
+++ b/src/rgb.h
@@ -5,12 +5,8 @@
 #include <stdlib.h> /* For abs() */
 #include <math.h>
 #include "inline_keywords.h" /* For H_INLINE */
+#include <stdint.h>
 
-#if defined(_MSC_VER)
-	#include "ms_stdint.h"
-#else
-	#include <stdint.h>
-#endif
 
 /* RGB colors in MMBitmaps are stored as BGR for convenience in converting
  * to/from certain formats (mainly OpenGL).
diff --git a/src/str_io.h b/src/str_io.h
index 1f7639c7..0a6f8ed0 100644
--- a/src/str_io.h
+++ b/src/str_io.h
@@ -4,12 +4,8 @@
 
 #include "MMBitmap.h"
 #include "io.h"
+#include <stdint.h>
 
-#if defined(_MSC_VER)
-	#include "ms_stdint.h"
-#else
-	#include <stdint.h>
-#endif
 
 enum _MMBMPStringError {
 	kMMBMPStringGenericError = 0,
diff --git a/src/uthash.h b/src/uthash.h
index 9f6c2b53..1ea0fea1 100644
--- a/src/uthash.h
+++ b/src/uthash.h
@@ -27,12 +27,8 @@
 
 #include <string.h> /* memcmp, strlen */
 #include <stddef.h> /* ptrdiff_t */
+#include <stdint.h>
 
-#if defined(_MSC_VER)
-	#include "ms_stdint.h"
-#else
-	#include <stdint.h>
-#endif
 
 #define UTHASH_VERSION 1.8