diff --git a/.github/workflows/winpkg.yml b/.github/workflows/winpkg.yml
index 0585e3d..2a9101c 100644
--- a/.github/workflows/winpkg.yml
+++ b/.github/workflows/winpkg.yml
@@ -66,22 +66,10 @@ jobs:
           repository: PerryWerneck/pw3270-plugin-ipc
           latest: true
           fileName: mingw-w64-x86_64-pw3270-plugin-ipc-5.5-0-x86_64.pkg.tar.zst
-      - name: Unpack lib3270
-        run: tar -C ./.build --zstd -xf mingw-w64-x86_64-lib3270-5.4-0-x86_64.pkg.tar.zst
-      - name: Unpack libv3270
-        run: tar -C ./.build --zstd -xf mingw-w64-x86_64-libv3270-5.4-0-x86_64.pkg.tar.zst
-      - name: Unpack ipcplugin
-        run: tar -C ./.build --zstd -xf mingw-w64-x86_64-pw3270-plugin-ipc-5.5-0-x86_64.pkg.tar.zst
-      - name: Unpack ipc3270
-        run: tar -C ./.build --zstd -xf mingw-w64-x86_64-libipc3270-5.5-0-x86_64.pkg.tar.zst
-      - name: Unpack hllapi
-        run: tar -C ./.build --zstd -xf mingw-w64-x86_64-libhllapi-5.5-0-x86_64.pkg.tar.zst
-      - name: Unpack pw3270
-        run: tar -C ./.build --zstd -xf mingw-w64-x86_64-pw3270-*-x86_64.pkg.tar.zst
-      - name: Make Runtime
+      - name: Make bundle
         run: /bin/bash ./win/bundle
       - name: Make Package
-        run: tar -C ./.build -Jcf mingw-w64-x86_64-pw3270-x86_64.tar.xz .
+        run: tar -C ./.build -Jcf mingw-w64-x86_64-pw3270-bundle-x86_64.tar.xz .
       - uses: ncipollo/release-action@v1
         with:
           tag: ${{ steps.gettag.outputs.tag }}
diff --git a/src/include/config.h.in b/src/include/config.h.in
index 6234a28..955a717 100644
--- a/src/include/config.h.in
+++ b/src/include/config.h.in
@@ -24,12 +24,12 @@
 /* do we have malloc.h? */
 #undef HAVE_MALLOC_H
 
-/* Define to 1 if you have the <memory.h> header file. */
-#undef HAVE_MEMORY_H
-
 /* Define to 1 if you have the <stdint.h> header file. */
 #undef HAVE_STDINT_H
 
+/* Define to 1 if you have the <stdio.h> header file. */
+#undef HAVE_STDIO_H
+
 /* Define to 1 if you have the <stdlib.h> header file. */
 #undef HAVE_STDLIB_H
 
@@ -105,7 +105,9 @@
 /* The schema path */
 #undef PRODUCT_PATH
 
-/* Define to 1 if you have the ANSI C header files. */
+/* Define to 1 if all of the C90 standard headers exist (not just the ones
+   required in a freestanding environment). This macro is provided for
+   backward compatibility; new code need not use it. */
 #undef STDC_HEADERS
 
 /* Version number of package */
diff --git a/win/bundle.in b/win/bundle.in
index 13fef23..65c34e2 100755
--- a/win/bundle.in
+++ b/win/bundle.in
@@ -288,6 +288,22 @@ install_loaders() {
 
 }
 
+unpack() {
+
+	for package in ${srcdir}/*.pkg.tar.zst
+	do
+		echo ${package}
+		tar -C ${buildroot} --zstd -xf ${package}
+		if [ "$?" != "0" ]; then
+			echo "Error unpacking ${package}"
+			exit -1
+		fi
+	done
+
+}
+
+unpack
+
 install_loaders
 install_bin
 install_locale
--
libgit2 0.21.2