diff --git a/src/include/config.h.in b/src/include/config.h.in
index 5768846..d072aad 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
 
@@ -99,7 +99,9 @@
 /* The product name */
 #undef PRODUCT_NAME
 
-/* 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/makeruntime.sh.in b/win/makeruntime.sh.in
index eb741f1..09ac6c2 100755
--- a/win/makeruntime.sh.in
+++ b/win/makeruntime.sh.in
@@ -32,10 +32,16 @@ prefix="@prefix@"
 imgdir=.build
 bindir="${imgdir}/bin"
 
+if [ -z "${WIN_ROOT}" ]; then
+	WIN_ROOT="/c/Windows"
+fi
+
 export LANG=C
 
 install_bin() {
 
+	mkdir -p "${bindir}"
+	
 	AGAIN=1
 	until [ $AGAIN = 0 ]; do
 
@@ -102,6 +108,7 @@ install_bin() {
 			winspool.drv
 			ntdll
 			winhttp
+			hid
 		"
 
 		# Remove system DLLs from list
@@ -135,9 +142,14 @@ install_bin() {
 						exit -1
 					fi
 
+				elif [ -e  "${WIN_ROOT}/System32/${FILENAME}" ]; then
+
+					echo "Ignoring ${WIN_ROOT}/System32/${FILENAME}"
+
 				else 
 
-					echo "Can't find ${FILENAME}"
+					echo "Can't find ${prefix}/bin/${FILENAME} or ${WIN_ROOT}/System32/${FILENAME}"
+					find "${prefix}" -iname "${FILENAME}"
 					exit -1
 
 				fi
--
libgit2 0.21.2