diff --git a/src/meta/adx_header.c b/src/meta/adx_header.c
index c84bde1a..d7d630f8 100644
--- a/src/meta/adx_header.c
+++ b/src/meta/adx_header.c
@@ -1,4 +1,4 @@
-#if _MSC_VER
+#ifdef _MSC_VER
 #define _USE_MATH_DEFINES
 #endif
 #include <math.h>
diff --git a/src/streamfile.h b/src/streamfile.h
index b00bb3ed..7ebbaaa9 100644
--- a/src/streamfile.h
+++ b/src/streamfile.h
@@ -3,7 +3,7 @@
  */
 
 #ifdef _MSC_VER
-	#define _CRT_SECURE_NO_DEPRECATE
+#define _CRT_SECURE_NO_DEPRECATE
 #endif
 
 #include <stdlib.h>
diff --git a/src/streamtypes.h b/src/streamtypes.h
index 573789f2..b05ee779 100644
--- a/src/streamtypes.h
+++ b/src/streamtypes.h
@@ -2,16 +2,17 @@
  * streamtypes.h - widely used type definitions
  */
 
-#include "pstdint.h"
 
 #ifndef _STREAMTYPES_H
 #define _STREAMTYPES_H
 
-/* Fix for Visual C++ 2005: will not compile otherwise */
 #ifdef _MSC_VER
-	#define inline _inline
-	#define strcasecmp _stricmp
-	#define snprintf _snprintf
+#include "pstdint.h"
+#define inline _inline
+#define strcasecmp _stricmp
+#define snprintf _snprintf
+#else
+#include <stdint.h>
 #endif
 
 typedef int16_t sample;
diff --git a/src/vgmstream.c b/src/vgmstream.c
index 39460ecc..bb2067e3 100644
--- a/src/vgmstream.c
+++ b/src/vgmstream.c
@@ -1,5 +1,5 @@
 #ifdef _MSC_VER
-	#define _CRT_SECURE_NO_DEPRECATE
+#define _CRT_SECURE_NO_DEPRECATE
 #endif
 
 #include <stdio.h>