diff --git a/intern/smoke/CMakeLists.txt b/intern/smoke/CMakeLists.txt
index 33dcd5be4bc..1ab323fe70d 100644
--- a/intern/smoke/CMakeLists.txt
+++ b/intern/smoke/CMakeLists.txt
@@ -24,7 +24,7 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
-SET(INC ${ZLIB_INC} intern ../../extern/bullet2/src ../memutil ../guardealloc)
+SET(INC ${ZLIB_INC} ${PNG_INC} intern ../../extern/bullet2/src ../memutil ../guardealloc)
 
 FILE(GLOB SRC intern/*.cpp)
 
diff --git a/intern/smoke/intern/IMAGE.h b/intern/smoke/intern/IMAGE.h
index a57f164509e..ba9b469727b 100644
--- a/intern/smoke/intern/IMAGE.h
+++ b/intern/smoke/intern/IMAGE.h
@@ -74,7 +74,11 @@ template < class T > inline float MIN3V( T vec) {
 //////////////////////////////////////////////////////////////////////
 // PNG, POV-Ray, and PBRT output functions
 //////////////////////////////////////////////////////////////////////
+#ifdef WIN32
+#include "png.h"
+#else
 #include <png.h>
+#endif
 
 namespace IMAGE {
 	/*
diff --git a/source/gameengine/GamePlayer/common/CMakeLists.txt b/source/gameengine/GamePlayer/common/CMakeLists.txt
index 909aebfc387..418b77357a4 100644
--- a/source/gameengine/GamePlayer/common/CMakeLists.txt
+++ b/source/gameengine/GamePlayer/common/CMakeLists.txt
@@ -67,6 +67,7 @@ SET(INC
 	../../../../source/blender/gpu
 	../../../../extern/glew/include
 	${PYTHON_INC}
+	${PNG_INC}
 	${ZLIB_INC}
 )
 
diff --git a/source/gameengine/GamePlayer/common/GPC_Canvas.cpp b/source/gameengine/GamePlayer/common/GPC_Canvas.cpp
index 467eb074ed9..54675fa8284 100644
--- a/source/gameengine/GamePlayer/common/GPC_Canvas.cpp
+++ b/source/gameengine/GamePlayer/common/GPC_Canvas.cpp
@@ -33,9 +33,10 @@
 
 #ifdef WIN32
 #include <windows.h>
-#endif
-
 #include "png.h"
+#else
+#include <png.h>
+#endif
 
 #include "RAS_IPolygonMaterial.h"
 #include "GPC_Canvas.h"