diff --git a/conf/common.rmk b/conf/common.rmk
index f680655ed..376700be2 100644
--- a/conf/common.rmk
+++ b/conf/common.rmk
@@ -640,5 +640,6 @@ password_pbkdf2_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
 bin_UTILITIES += grub-mkpasswd-pbkdf2
 grub_mkpasswd_pbkdf2_SOURCES = util/grub-mkpasswd-pbkdf2.c lib/crypto.c lib/libgcrypt-grub/cipher/sha512.c lib/pbkdf2.c util/misc.c kern/err.c
+grub_mkpasswd_pbkdf2_CFLAGS += -Wno-missing-field-initializers -Wno-error -I$(srcdir)/lib/libgcrypt_wrap
 
 include $(srcdir)/conf/gcry.mk
diff --git a/include/grub/cipher_wrap.h b/lib/libgcrypt_wrap/cipher_wrap.h
similarity index 100%
rename from include/grub/cipher_wrap.h
rename to lib/libgcrypt_wrap/cipher_wrap.h
diff --git a/util/import_gcry.py b/util/import_gcry.py
index b66de90cc..fe68c85a4 100644
--- a/util/import_gcry.py
+++ b/util/import_gcry.py
@@ -67,6 +67,12 @@ for cipher_file in cipher_files:
     if cipher_file == "ChangeLog":
         continue
     chlognew = "	* %s" % cipher_file
+    if re.match ("(Manifest|Makefile\.am|ac\.c|cipher\.c|hash-common\.c|hmac-tests\.c|md\.c|pubkey\.c)$", cipher_file):
+        chlog = "%s%s: Removed\n" % (chlog, chlognew)
+        continue
+    # Autogenerated files. Not even worth mentionning in ChangeLog
+    if re.match ("Makefile\.in$", cipher_file):
+        continue
     nch = False
     if re.match (".*\.[ch]$", cipher_file):
         isc = re.match (".*\.c$", cipher_file)
@@ -220,7 +226,7 @@ for cipher_file in cipher_files:
             conf.write ("pkglib_MODULES += %s.mod\n" % modname)
             conf.write ("%s_mod_SOURCES = %s\n" %\
                             (modname, modfiles))
-            conf.write ("%s_mod_CFLAGS = $(COMMON_CFLAGS) -Wno-missing-field-initializers -Wno-error\n" % modname)
+            conf.write ("%s_mod_CFLAGS = $(COMMON_CFLAGS) -Wno-missing-field-initializers -Wno-error -I$(srcdir)/lib/libgcrypt_wrap\n" % modname)
             conf.write ("%s_mod_LDFLAGS = $(COMMON_LDFLAGS)\n\n" % modname)
         elif isc and cipher_file != "camellia.c":
             print ("WARNING: C file isn't a module: %s" % cipher_file)
@@ -229,26 +235,19 @@ for cipher_file in cipher_files:
         if nch:
             chlog = "%s%s\n" % (chlog, chlognew)
         continue
-    if re.match ("(Manifest|Makefile\.am)$", cipher_file):
-        chlog = "%s%sRemoved\n" % (chlog, chlognew)
-        continue
-    # Autogenerated files. Not even worth mentionning in ChangeLog
-    if re.match ("Makefile\.in$", cipher_file):
-        chlog = "%s%sRemoved\n" % (chlog, chlognew)
-        continue
     chlog = "%s%sSkipped unknown file\n" % (chlog, chlognew)
     print ("WARNING: unknown file %s" % cipher_file)
 
 outfile = os.path.join (cipher_dir_out, "types.h")
 fw=open (outfile, "w")
 fw.write ("#include <grub/types.h>\n")
-fw.write ("#include <grub/cipher_wrap.h>\n")
+fw.write ("#include <cipher_wrap.h>\n")
 chlog = "%s	* types.h: New file.\n" % chlog
 fw.close ()
 
 outfile = os.path.join (cipher_dir_out, "memory.h")
 fw=open (outfile, "w")
-fw.write ("#include <grub/cipher_wrap.h>\n")
+fw.write ("#include <cipher_wrap.h>\n")
 chlog = "%s	* memory.h: New file.\n" % chlog
 fw.close ()
 
@@ -256,13 +255,13 @@ fw.close ()
 outfile = os.path.join (cipher_dir_out, "cipher.h")
 fw=open (outfile, "w")
 fw.write ("#include <grub/crypto.h>\n")
-fw.write ("#include <grub/cipher_wrap.h>\n")
+fw.write ("#include <cipher_wrap.h>\n")
 chlog = "%s	* cipher.h: Likewise.\n" % chlog
 fw.close ()
 
 outfile = os.path.join (cipher_dir_out, "g10lib.h")
 fw=open (outfile, "w")
-fw.write ("#include <grub/cipher_wrap.h>\n")
+fw.write ("#include <cipher_wrap.h>\n")
 chlog = "%s	* g10lib.h: Likewise.\n" % chlog
 fw.close ()