diff --git a/source/blender/datatoc/CMakeLists.txt b/source/blender/datatoc/CMakeLists.txt
index 78ae00d8a83..a1776c312f4 100644
--- a/source/blender/datatoc/CMakeLists.txt
+++ b/source/blender/datatoc/CMakeLists.txt
@@ -39,9 +39,9 @@ if(NOT WITH_HEADLESS)
 	)
 
 	include_directories(${PNG_INCLUDE_DIR})
+	link_directories(${PNG_LIBPATH} ${ZLIB_LIBPATH})
 
 	add_executable(datatoc_icon ${SRC})
 
-	link_directories(${PNG_LIBPATH} ${ZLIB_LIBPATH})
-	target_link_libraries(datatoc_icon ${PNG_LIBRARIES})
+	target_link_libraries(datatoc_icon ${PNG_LIBRARIES} ${ZLIB_LIBRARIES})
 endif()
diff --git a/source/blender/datatoc/datatoc_icon.c b/source/blender/datatoc/datatoc_icon.c
index 82eeb3af9b2..1569e554f9f 100644
--- a/source/blender/datatoc/datatoc_icon.c
+++ b/source/blender/datatoc/datatoc_icon.c
@@ -32,7 +32,7 @@
 #include "../blenlib/BLI_sys_types.h"
 
 /* for DIR */
-#ifndef WIN32
+#if !defined(WIN32) || defined(__MINGW64__)
 #  include <dirent.h>
 #endif