diff --git a/base/png_io_c.h b/base/png_io_c.h
index cbd132c..2f71f34 100644
--- a/base/png_io_c.h
+++ b/base/png_io_c.h
@@ -1,7 +1,18 @@
 #include "png_io.h"
 #include "os.h"
 // #include "libpng/png.c"
-#include <png.h>
+#if defined(IS_MACOSX)
+	#include <png.h>
+#elif defined(USE_X11)
+	#include <png.h>
+#elif defined(IS_WINDOWS)
+	#if defined (__x86_64__)
+		#include "../cdeps/win64/png.h"
+	#else
+		#include "../cdeps/win32/png.h"
+	#endif
+#endif
+
 #include <stdio.h> /* fopen() */
 #include <stdlib.h> /* malloc/realloc */
 #include <assert.h>
diff --git a/robotgo.go b/robotgo.go
index 09b38ff..5833c54 100644
--- a/robotgo.go
+++ b/robotgo.go
@@ -32,8 +32,9 @@ package robotgo
 	#cgo linux LDFLAGS:-L/usr/src -lpng -lz -lX11 -lXtst -lX11-xcb -lxcb -lxcb-xkb -lxkbcommon -lxkbcommon-x11 -lm
 //#endif
 	// #cgo windows LDFLAGS: -lgdi32 -luser32 -lpng -lz
-	#cgo windows,amd64 LDFLAGS: -lgdi32 -luser32 -L/cdeps/win64 -lpng -L/cdeps/win64 -lz
-	#cgo windows,386 LDFLAGS: -lgdi32 -luser32 -L/cdeps/win32 -lpng -L/cdeps/win32 -lz
+	#cgo windows LDFLAGS: -lgdi32 -luser32
+	#cgo windows,amd64 LDFLAGS: -L/cdeps/win64 -lpng -L/cdeps/win64 -lz
+	#cgo windows,386 LDFLAGS: -L/cdeps/win32 -lpng -L/cdeps/win32 -lz
 // #include <AppKit/NSEvent.h>
 #include "screen/goScreen.h"
 #include "mouse/goMouse.h"