diff --git a/project/Build.xml b/project/Build.xml
index 296375bd21..db59b062db 100644
--- a/project/Build.xml
+++ b/project/Build.xml
@@ -338,6 +338,8 @@
 			<ext value=".ndll" if="windows || mac || linux" />
 			<ext value=".hdll" if="LIME_HASHLINK" />
 
+			<libpath name="../templates/bin/hl/${BINDIR}" if="LIME_HASHLINK" />
+
 			<section if="windows">
 
 				<section unless="mingw">
@@ -397,8 +399,6 @@
 
 				<section if="LIME_HASHLINK">
 
-					<lib name="-libpath:../templates/bin/hl/${BINDIR}"  />
-
 					<lib name="libhl.lib" />
 
 				</section>
@@ -413,8 +413,6 @@
 
 				<section if="LIME_HASHLINK">
 
-					<lib name="-L../templates/bin/hl/${BINDIR}" />
-
 					<lib name="-lhl" />
 
 				</section>
@@ -449,8 +447,6 @@
 
 					<vflag name="-install_name" value="@executable_path/lime.hdll" />
 
-					<lib name="-L../templates/bin/hl/${BINDIR}" />
-
 					<lib name="-lhl" />
 
 				</section>
@@ -493,7 +489,7 @@
 
 	<section if="LIME_HASHLINK">
 
-		<section if="windows">
+		<section if="isMsvc">
 
 			<copyFile name="lime.lib" from="obj/lib" overwrite="true" toolId="dll" unless="debug" />
 			<copyFile name="lime-debug.lib" from="obj/lib" overwrite="true" toolId="dll" if="debug" />
diff --git a/project/BuildHashlink.xml b/project/BuildHashlink.xml
index e71302585f..673704c7d2 100644
--- a/project/BuildHashlink.xml
+++ b/project/BuildHashlink.xml
@@ -12,6 +12,7 @@
 
 	<files id="hl">
 		<compilerflag value="-I${HASHLINK_PATH}/src" />
+		<compilerflag value="-municode" if="mingw" />
 
 		<file name="src/hashlink_main.c" tag="main" />
 		<file name="${HASHLINK_PATH}/src/code.c" />
@@ -26,6 +27,8 @@
 		<compilerflag value="-DLIBHL_EXPORTS" />
 		<compilerflag value="-DHAVE_CONFIG_H" />
 		<compilerflag value="-DPCRE2_CODE_UNIT_WIDTH=16" />
+		<compilerflag value="-DPCRE2_STATIC" />
+		<compilerflag value="-municode" if="mingw" />
 
 		<compilerflag value="-I${HASHLINK_PATH}/src" />
 		<compilerflag value="-I${HASHLINK_PATH}/include" />
@@ -58,7 +61,7 @@
 		<file name="${HASHLINK_PATH}/src/std/ucs2.c" />
 
 		<!-- PCRE -->
-		 <file name="${HASHLINK_PATH}/include/pcre/pcre2_auto_possess.c" />
+		<file name="${HASHLINK_PATH}/include/pcre/pcre2_auto_possess.c" />
 		<file name="${HASHLINK_PATH}/include/pcre/pcre2_chartables.c" />
 		<file name="${HASHLINK_PATH}/include/pcre/pcre2_compile.c" />
 		<file name="${HASHLINK_PATH}/include/pcre/pcre2_config.c" />
@@ -102,7 +105,9 @@
 		<compilerflag value="-DMBEDTLS_THREADING_C" />
 		<compilerflag value="-DMBEDTLS_THREADING_PTHREAD" unless="windows" />
 		<compilerflag value="-DMBEDTLS_THREADING_ALT" if="windows" />
-		<compilerflag value="/std:c11" if="windows" />
+		<compilerflag value="/std:c11" if="isMsvc" />
+		<compilerflag value="-municode" if="mingw" />
+
 		<file name="${HASHLINK_PATH}/libs/ssl/ssl.c" />
 	</files>
 
@@ -127,6 +132,7 @@
 		<compilerflag value="-I/usr/local/opt/jpeg-turbo/include" if="mac" />
 		<compilerflag value="-I/usr/local/opt/libvorbis/include" if="mac" />
 
+		<compilerflag value="-municode" if="mingw" />
 
 		<file name="${HASHLINK_PATH}/libs/fmt/fmt.c" />
 		<file name="${HASHLINK_PATH}/libs/fmt/sha1.c" />
@@ -246,6 +252,7 @@
 	</files>
 	<files id="ui">
 		<compilerflag value="-I${HASHLINK_PATH}/src" />
+		<compilerflag value="-municode" if="mingw" />
 
 		<file name="${HASHLINK_PATH}/libs/ui/ui_stub.c" unless="windows" />
 		<file name="${HASHLINK_PATH}/libs/ui/ui_win.c" if="windows" />
@@ -253,20 +260,26 @@
 	<files id="uv">
 		<compilerflag value="-I${HASHLINK_PATH}/src" />
 		<compilerflag value="-I/usr/local/include" if="mac" />
+		<compilerflag value="-municode" if="mingw" />
 
 		<file name="${HASHLINK_PATH}/libs/uv/uv.c" />
 
 		<section if="windows">
 			<compilerflag value="-I${HASHLINK_PATH}/include/libuv/include" />
+			<compilerflag value="-I${HASHLINK_PATH}/include/libuv/src" />
 			<compilerflag value="-DUV_EXPORTS" />
 			<compilerflag value="-DBUILDING_UV_SHARED" />
 			<file name="${HASHLINK_PATH}/include/libuv/src/fs-poll.c" />
+			<file name="${HASHLINK_PATH}/include/libuv/src/idna.c" />
 			<file name="${HASHLINK_PATH}/include/libuv/src/inet.c" />
+			<file name="${HASHLINK_PATH}/include/libuv/src/strscpy.c" />
 			<file name="${HASHLINK_PATH}/include/libuv/src/threadpool.c" />
+			<file name="${HASHLINK_PATH}/include/libuv/src/timer.c" />
 			<file name="${HASHLINK_PATH}/include/libuv/src/uv-common.c" />
 			<file name="${HASHLINK_PATH}/include/libuv/src/version.c" />
 			<file name="${HASHLINK_PATH}/include/libuv/src/win/async.c" />
 			<file name="${HASHLINK_PATH}/include/libuv/src/win/core.c" />
+			<file name="${HASHLINK_PATH}/include/libuv/src/win/detect-wakeup.c" />
 			<file name="${HASHLINK_PATH}/include/libuv/src/win/dl.c" />
 			<file name="${HASHLINK_PATH}/include/libuv/src/win/error.c" />
 			<file name="${HASHLINK_PATH}/include/libuv/src/win/fs-event.c" />
@@ -279,13 +292,10 @@
 			<file name="${HASHLINK_PATH}/include/libuv/src/win/poll.c" />
 			<file name="${HASHLINK_PATH}/include/libuv/src/win/process-stdio.c" />
 			<file name="${HASHLINK_PATH}/include/libuv/src/win/process.c" />
-			<file name="${HASHLINK_PATH}/include/libuv/src/win/req.c" />
 			<file name="${HASHLINK_PATH}/include/libuv/src/win/signal.c" />
-			<file name="${HASHLINK_PATH}/include/libuv/src/win/snprintf.c" />
 			<file name="${HASHLINK_PATH}/include/libuv/src/win/stream.c" />
 			<file name="${HASHLINK_PATH}/include/libuv/src/win/tcp.c" />
 			<file name="${HASHLINK_PATH}/include/libuv/src/win/thread.c" />
-			<file name="${HASHLINK_PATH}/include/libuv/src/win/timer.c" />
 			<file name="${HASHLINK_PATH}/include/libuv/src/win/tty.c" />
 			<file name="${HASHLINK_PATH}/include/libuv/src/win/udp.c" />
 			<file name="${HASHLINK_PATH}/include/libuv/src/win/util.c" />
@@ -313,6 +323,7 @@
 		<section if="windows">
 			<lib name="user32.lib" />
 			<lib name="ws2_32.lib" />
+			<lib name="winmm.lib" />
 		</section>
 	</target>
 
@@ -325,8 +336,7 @@
 		<vflag name="-install_name" value="@executable_path/ssl.hdll" if="mac" />
 
 		<lib name="-lhl" unless="windows" />
-		<lib name="-L${OUTPUT_DIR}/${BINDIR}" unless="windows" />
-		<lib name="-libpath:${OUTPUT_DIR}/${BINDIR}" if="windows" />
+		<libpath name="${OUTPUT_DIR}/${BINDIR}" />
 		<lib name="libhl.lib" if="windows" />
 
 		<lib name="Advapi32.lib" if="windows" />
@@ -347,8 +357,7 @@
 		<vflag name="-install_name" value="@executable_path/mysql.hdll" if="mac" />
 
 		<lib name="-lhl" unless="windows" />
-		<lib name="-L${OUTPUT_DIR}/${BINDIR}" unless="windows" />
-		<lib name="-libpath:${OUTPUT_DIR}/${BINDIR}" if="windows" />
+		<libpath name="${OUTPUT_DIR}/${BINDIR}" />
 		<lib name="libhl.lib" if="windows" />
 		<lib name="ws2_32.lib" if="windows" />
 	</target>
@@ -373,8 +382,7 @@
 		<lib name="-lturbojpeg" unless="windows" />
 
 		<lib name="-lhl" unless="windows" />
-		<lib name="-L${OUTPUT_DIR}/${BINDIR}" unless="windows" />
-		<lib name="-libpath:${OUTPUT_DIR}/${BINDIR}" if="windows" />
+		<libpath name="${OUTPUT_DIR}/${BINDIR}" />
 		<lib name="libhl.lib" if="windows" />
 		<lib name="${HASHLINK_PATH}/include/turbojpeg/x64/simd.lib" if="windows HXCPP_M64" />
 		<lib name="${HASHLINK_PATH}/include/turbojpeg/x86/simd.lib" if="windows" unless="HXCPP_M64" />
@@ -388,9 +396,8 @@
 		<vflag name="-install_name" value="@executable_path/ui.hdll" if="mac" />
 
 		<lib name="-lhl" unless="windows" />
-		<lib name="-L${OUTPUT_DIR}/${BINDIR}" unless="windows" />
+		<libpath name="${OUTPUT_DIR}/${BINDIR}" />
 		<section if="windows">
-			<lib name="-libpath:${OUTPUT_DIR}/${BINDIR}" />
 			<lib name="libhl.lib" />
 			<lib name="user32.lib" />
 			<lib name="gdi32.lib" />
@@ -409,15 +416,17 @@
 
 		<lib name="-luv" unless="windows" />
 		<lib name="-lhl" unless="windows" />
-		<lib name="-L${OUTPUT_DIR}/${BINDIR}" unless="windows" />
+		<libpath name="${OUTPUT_DIR}/${BINDIR}" />
 		<section if="windows">
-			<lib name="-libpath:${OUTPUT_DIR}/${BINDIR}" />
+			<lib name="ole32.lib" />
+			<lib name="shell32.lib" />
+			<lib name="dbghelp.lib" />
 			<lib name="libhl.lib" />
 			<lib name="psapi.lib" />
 			<lib name="iphlpapi.lib" />
 			<lib name="userenv.lib" />
-			<lib name="advapi32.lib" if="windows" />
-			<lib name="ws2_32.lib" if="windows" />
+			<lib name="advapi32.lib" />
+			<lib name="ws2_32.lib" />
 		</section>
 	</target>
 
@@ -429,10 +438,10 @@
 
 		<!-- Make hashlink pick up binaries in the same directory as itself -->
 		<lib name="-Wl,-rpath=$ORIGIN" if="linux" />
+		<flag value="-municode" if="mingw" />
 
 		<lib name="-lhl" unless="windows" />
-		<lib name="-L${OUTPUT_DIR}/${BINDIR}" unless="windows" />
-		<lib name="-libpath:${OUTPUT_DIR}/${BINDIR}" if="windows" />
+		<libpath name="${OUTPUT_DIR}/${BINDIR}" />
 		<lib name="libhl.lib" if="windows" />
 	</target>
 
@@ -448,10 +457,12 @@
 		<target id="uv" />
 	</target>
 
-	<copyFile name="libhl.lib" from="obj/lib" overwrite="true" toolId="dll" if="windows" />
-	<copyFile name="ssl.lib" from="obj/lib" allowMissing="true" overwrite="true" toolid="dll" if="windows" />
-	<copyFile name="mysql.lib" from="obj/lib" allowMissing="true" overwrite="true" toolId="dll" if="windows" />
-	<copyFile name="fmt.lib" from="obj/lib" allowMissing="true" overwrite="true" toolId="dll" if="windows" />
-	<copyFile name="ui.lib" from="obj/lib" allowMissing="true" overwrite="true" toolId="dll" if="windows" />
-	<copyFile name="uv.lib" from="obj/lib" allowMissing="true" overwrite="true" toolId="dll" if="windows" />
+	<section if="windows">
+		<copyFile name="libhl.lib" from="obj/lib" overwrite="true" toolId="dll" if="isMsvc" />
+		<copyFile name="ssl.lib" from="obj/lib" allowMissing="true" overwrite="true" toolid="dll" />
+		<copyFile name="mysql.lib" from="obj/lib" allowMissing="true" overwrite="true" toolId="dll" />
+		<copyFile name="fmt.lib" from="obj/lib" allowMissing="true" overwrite="true" toolId="dll" />
+		<copyFile name="ui.lib" from="obj/lib" allowMissing="true" overwrite="true" toolId="dll" />
+		<copyFile name="uv.lib" from="obj/lib" allowMissing="true" overwrite="true" toolId="dll" />
+	</section>
 </xml>
\ No newline at end of file
diff --git a/project/include/system/CFFI.h b/project/include/system/CFFI.h
index f145258f98..8e374f3c25 100644
--- a/project/include/system/CFFI.h
+++ b/project/include/system/CFFI.h
@@ -3,6 +3,7 @@
 
 #define HL_NAME(n) lime_##n
 #include <hl.h>
+#undef _GUID
 #undef DEFINE_PRIM
 #define DEFINE_HL_PRIM(t, name, args) DEFINE_PRIM_WITH_NAME(t, name, args, name)
 
diff --git a/project/lib/hashlink b/project/lib/hashlink
index 03110f7e11..5b646f82cd 160000
--- a/project/lib/hashlink
+++ b/project/lib/hashlink
@@ -1 +1 @@
-Subproject commit 03110f7e11fb76acf13312864b1d0bb700a6eda4
+Subproject commit 5b646f82cd3f307277e8224b889a36d774a26ef5
diff --git a/project/src/hashlink_main.c b/project/src/hashlink_main.c
index 3722812736..ea24e421d7 100644
--- a/project/src/hashlink_main.c
+++ b/project/src/hashlink_main.c
@@ -1,7 +1,7 @@
 #ifdef HX_WIN_MAIN
 extern int wmain(int argc, wchar_t *argv[]);
 
-int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow) {
-	return wmain(__argc, __argv);
+int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow) {
+	return wmain(__argc, __wargv);
 }
 #endif
\ No newline at end of file
diff --git a/src/lime/tools/HashlinkHelper.hx b/src/lime/tools/HashlinkHelper.hx
index 659c496cbc..7ffa821c00 100644
--- a/src/lime/tools/HashlinkHelper.hx
+++ b/src/lime/tools/HashlinkHelper.hx
@@ -11,7 +11,7 @@ import hxp.System;
 
 class HashlinkHelper
 {
-	public static inline var BUNDLED_HL_VER = "1.14.0";
+	public static inline var BUNDLED_HL_VER = "1.16.0";
 
 	public static function copyHashlink(project:HXProject, targetDirectory:String, applicationDirectory:String, executablePath:String, ?is64 = true)
 	{
diff --git a/tools/platforms/WindowsPlatform.hx b/tools/platforms/WindowsPlatform.hx
index 2bb77e7dcd..35db7f9df6 100644
--- a/tools/platforms/WindowsPlatform.hx
+++ b/tools/platforms/WindowsPlatform.hx
@@ -197,8 +197,6 @@ class WindowsPlatform extends PlatformTarget
 			{
 				ProjectHelper.copyLibrary(project, ndll, "Windows" + (is64 ? "64" : ""), "", ".hdll", applicationDirectory, project.debug,
 					".hdll");
-				ProjectHelper.copyLibrary(project, ndll, "Windows" + (is64 ? "64" : ""), "", ".lib", applicationDirectory, project.debug,
-					".lib");
 			}
 			else
 			{