diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0ab3cdb..698cc52 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -133,8 +133,12 @@ set (DEBUG_OPTIMIZATION "-O3")
 set (RELEASE_OPTIMIZATION "-O3")
 
 if (BUILDING_WIN)
-	set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -idirafter ${PROJECT_SOURCE_DIR}/include/mingw-fixes")
-	set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DNOMINMAX -idirafter ${PROJECT_SOURCE_DIR}/include/mingw-fixes")
+	set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
+	set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DNOMINMAX")
+	if (MINGW_CROSS)
+		set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -idirafter ${PROJECT_SOURCE_DIR}/include/mingw-fixes")
+		set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -idirafter ${PROJECT_SOURCE_DIR}/include/mingw-fixes")
+	endif ()
 else ()
 	set (CMAKE_C_FLAGS
 		"${CMAKE_C_FLAGS} \
diff --git a/ext/lwip b/ext/lwip
index 17202b3..0c80c03 160000
--- a/ext/lwip
+++ b/ext/lwip
@@ -1 +1 @@
-Subproject commit 17202b31cf1229ad60e606923f723445dded7116
+Subproject commit 0c80c036843d8b5b164b32bd10b63a4d268cb94c
diff --git a/src/Controls.cpp b/src/Controls.cpp
index d74ef45..0f98921 100644
--- a/src/Controls.cpp
+++ b/src/Controls.cpp
@@ -323,7 +323,7 @@ void _zts_run_callbacks()
 	jint rs = jvm->DetachCurrentThread();
     pthread_exit(0);
 #endif
-	return NULL;
+	//return NULL;
 }
 
 //////////////////////////////////////////////////////////////////////////////
@@ -665,9 +665,9 @@ int zts_restart()
 	is replicated here */
 #ifdef SDK_JNI
 	_userCallbackMethodRef = _tmpUserCallbackMethodRef;
-	return zts_start(tmpPath.c_str(), NULL, tmpPort);
+	return ::zts_start(tmpPath.c_str(), NULL, tmpPort);
 #else
-	return zts_start(tmpPath.c_str(), _tmpUserEventCallbackFunc, tmpPort);
+	return ::zts_start(tmpPath.c_str(), _tmpUserEventCallbackFunc, tmpPort);
 #endif
 }
 #ifdef SDK_JNI
diff --git a/src/VirtualTap.hpp b/src/VirtualTap.hpp
index 202023e..7f96a4d 100644
--- a/src/VirtualTap.hpp
+++ b/src/VirtualTap.hpp
@@ -33,8 +33,10 @@
 #ifndef LIBZT_VIRTUALTAP_HPP
 #define LIBZT_VIRTUALTAP_HPP
 
-#ifndef _MSC_VER
-extern int errno;
+#ifdef _MSC_VER
+//extern int errno;
+#include <BaseTsd.h>
+typedef SSIZE_T ssize_t;
 #endif
 
 #include <condition_variable>
diff --git a/src/lwipDriver.cpp b/src/lwipDriver.cpp
index f69d28d..db8dffe 100644
--- a/src/lwipDriver.cpp
+++ b/src/lwipDriver.cpp
@@ -155,7 +155,7 @@ void lwip_driver_init()
 #if defined(_WIN32)
 	sys_init(); // Required for win32 init of critical sections
 #endif
-	void *st = sys_thread_new(ZTS_LWIP_DRIVER_THREAD_NAME, main_lwip_driver_loop,
+	void *st = (void*)sys_thread_new(ZTS_LWIP_DRIVER_THREAD_NAME, main_lwip_driver_loop,
 		NULL, DEFAULT_THREAD_STACKSIZE, DEFAULT_THREAD_PRIO);
 }