diff --git a/src/RageSurface_Load_PNG.cpp b/src/RageSurface_Load_PNG.cpp
index 69461f38e0..32c7a6e83c 100644
--- a/src/RageSurface_Load_PNG.cpp
+++ b/src/RageSurface_Load_PNG.cpp
@@ -5,8 +5,6 @@
 #include "RageFile.h"
 #include "RageSurface.h"
 
-#include <png.h>
-
 #if defined(_MSC_VER)
 #include "../extern/libpng/include/png.h"
 #pragma comment(lib, "libpng.lib")
diff --git a/src/RageSurface_Save_PNG.cpp b/src/RageSurface_Save_PNG.cpp
index bd567b0366..da26205ec3 100644
--- a/src/RageSurface_Save_PNG.cpp
+++ b/src/RageSurface_Save_PNG.cpp
@@ -6,15 +6,13 @@
 #include "RageLog.h"
 #include "RageUtil.h"
 
-#if defined(WINDOWS)
-#include "png.h"
 #if defined(_MSC_VER)
-#  pragma comment(lib, "libpng.lib")
+#include "../extern/libpng/include/png.h"
+#pragma comment(lib, "libpng.lib")
 #pragma warning(disable: 4611) /* interaction between '_setjmp' and C++ object destruction is non-portable */
-#endif
 #else
-#include <../extern/libpng/include/png.h>
-#endif
+#include <png.h>
+#endif // _MSC_VER
 
 static void SafePngError( png_struct *pPng, const RString &sStr )
 {