diff --git a/plugins/amd64-unicode/nsis7z.dll b/plugins/amd64-unicode/nsis7z.dll
index 628e4e6..7c137a7 100755
Binary files a/plugins/amd64-unicode/nsis7z.dll and b/plugins/amd64-unicode/nsis7z.dll differ
diff --git a/plugins/x86-ansi/nsis7z.dll b/plugins/x86-ansi/nsis7z.dll
index 95a2a94..9063b51 100755
Binary files a/plugins/x86-ansi/nsis7z.dll and b/plugins/x86-ansi/nsis7z.dll differ
diff --git a/plugins/x86-unicode/nsis7z.dll b/plugins/x86-unicode/nsis7z.dll
index 19a26ab..1fd0d93 100755
Binary files a/plugins/x86-unicode/nsis7z.dll and b/plugins/x86-unicode/nsis7z.dll differ
diff --git a/tools/linux/overlay/include/CommCtrl.h b/tools/linux/overlay/include/CommCtrl.h
index 27ae447..f815756 100644
--- a/tools/linux/overlay/include/CommCtrl.h
+++ b/tools/linux/overlay/include/CommCtrl.h
@@ -1,3 +1,5 @@
-/* Linux/MinGW cross-build shim: CommCtrl.h → commctrl.h */
+/* Linux/MinGW cross-build shim: CommCtrl.h → commctrl.h
+ * Uses #include_next so this shim is skipped on the recursive search,
+ * forwarding to the real MinGW system commctrl.h without infinite recursion. */
 #pragma GCC system_header
-#include <commctrl.h>
+#include_next <commctrl.h>
diff --git a/tools/linux/overlay/include/MAPI.h b/tools/linux/overlay/include/MAPI.h
index 77c8dec..a54df54 100644
--- a/tools/linux/overlay/include/MAPI.h
+++ b/tools/linux/overlay/include/MAPI.h
@@ -1,3 +1,5 @@
-/* Linux/MinGW cross-build shim: MAPI.h → mapi.h */
+/* Linux/MinGW cross-build shim: MAPI.h → mapi.h
+ * Uses #include_next so this shim is skipped on the recursive search,
+ * forwarding to the real MinGW system mapi.h without infinite recursion. */
 #pragma GCC system_header
-#include <mapi.h>
+#include_next <mapi.h>
diff --git a/tools/linux/overlay/include/NTSecAPI.h b/tools/linux/overlay/include/NTSecAPI.h
index 65219b6..3130d46 100644
--- a/tools/linux/overlay/include/NTSecAPI.h
+++ b/tools/linux/overlay/include/NTSecAPI.h
@@ -1,3 +1,5 @@
-/* Linux/MinGW cross-build shim: NTSecAPI.h → ntsecapi.h */
+/* Linux/MinGW cross-build shim: NTSecAPI.h → ntsecapi.h
+ * Uses #include_next so this shim is skipped on the recursive search,
+ * forwarding to the real MinGW system ntsecapi.h without infinite recursion. */
 #pragma GCC system_header
-#include <ntsecapi.h>
+#include_next <ntsecapi.h>
diff --git a/tools/linux/overlay/include/Psapi.h b/tools/linux/overlay/include/Psapi.h
index edb1cd5..9d6a330 100644
--- a/tools/linux/overlay/include/Psapi.h
+++ b/tools/linux/overlay/include/Psapi.h
@@ -1,3 +1,5 @@
-/* Linux/MinGW cross-build shim: Psapi.h → psapi.h */
+/* Linux/MinGW cross-build shim: Psapi.h → psapi.h
+ * Uses #include_next so this shim is skipped on the recursive search,
+ * forwarding to the real MinGW system psapi.h without infinite recursion. */
 #pragma GCC system_header
-#include <psapi.h>
+#include_next <psapi.h>
diff --git a/tools/linux/overlay/include/ShlObj.h b/tools/linux/overlay/include/ShlObj.h
index b1e0f49..d65ba0f 100644
--- a/tools/linux/overlay/include/ShlObj.h
+++ b/tools/linux/overlay/include/ShlObj.h
@@ -1,3 +1,5 @@
-/* Linux/MinGW cross-build shim: ShlObj.h → shlobj.h */
+/* Linux/MinGW cross-build shim: ShlObj.h → shlobj.h
+ * Uses #include_next so this shim is skipped on the recursive search,
+ * forwarding to the real MinGW system shlobj.h without infinite recursion. */
 #pragma GCC system_header
-#include <shlobj.h>
+#include_next <shlobj.h>
diff --git a/tools/linux/overlay/include/Windows.h b/tools/linux/overlay/include/Windows.h
index 0ce95e0..76d3740 100644
--- a/tools/linux/overlay/include/Windows.h
+++ b/tools/linux/overlay/include/Windows.h
@@ -1,3 +1,5 @@
-/* Linux/MinGW cross-build shim: Windows.h → windows.h */
+/* Linux/MinGW cross-build shim: Windows.h → windows.h
+ * Uses #include_next so this shim is skipped on the recursive search,
+ * forwarding to the real MinGW system windows.h without infinite recursion. */
 #pragma GCC system_header
-#include <windows.h>
+#include_next <windows.h>