diff --git a/CMakeLists.txt b/CMakeLists.txt
index ca6f9fc..9c3ff96 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -439,13 +439,13 @@ set_target_properties (${STATIC_LIB_NAME} PROPERTIES
     OUTPUT_NAME zt
     LIBRARY_OUTPUT_DIRECTORY ${INTERMEDIATE_LIBRARY_OUTPUT_PATH})
 set_target_properties (${STATIC_LIB_NAME} PROPERTIES COMPILE_FLAGS "${ZT_FLAGS}")
-if (BUILDING_WIN)
-	target_link_libraries (
-		${STATIC_LIB_NAME}
-		${ws2_32_LIBRARY_PATH}
-		${shlwapi_LIBRARY_PATH}
-		${iphlpapi_LIBRARY_PATH})
-endif ()
+#if (BUILDING_WIN)
+#	target_link_libraries (
+#		${STATIC_LIB_NAME}
+#		${ws2_32_LIBRARY_PATH}
+#		${shlwapi_LIBRARY_PATH}
+#		${iphlpapi_LIBRARY_PATH})
+#endif ()
 
 # libzt.so/dylib/dll
 add_library (${DYNAMIC_LIB_NAME} SHARED ${libztSrcGlob})
diff --git a/include/mingw-fixes/Synchapi.h b/include/mingw-fixes/Synchapi.h
new file mode 100644
index 0000000..19e1690
--- /dev/null
+++ b/include/mingw-fixes/Synchapi.h
@@ -0,0 +1 @@
+#include <synchapi.h>
diff --git a/src/VirtualTap.hpp b/src/VirtualTap.hpp
index 486225c..5f5f427 100644
--- a/src/VirtualTap.hpp
+++ b/src/VirtualTap.hpp
@@ -119,7 +119,8 @@ public:
 	void threadMain()
 		throw();
 
-#if defined(__MINGW32__)
+//#if defined(__MINGW32__)
+#if 0
 	/* The following is merely to make ZeroTier's OneService happy while building on Windows.
 		we won't use these in libzt */
 	NET_LUID _deviceLuid;