diff --git a/conf/gcry.rmk b/conf/gcry.rmk
deleted file mode 100644
index 0eb3c79bc..000000000
--- a/conf/gcry.rmk
+++ /dev/null
@@ -1,52 +0,0 @@
-# -*- makefile -*-
-
-pkglib_MODULES += seed.mod
-seed_mod_SOURCES = gcry/cipher/seed.c
-seed_mod_ASFLAGS = $(COMMON_ASFLAGS)
-seed_mod_LDFLAGS = $(COMMON_ASFLAGS)
-
-pkglib_MODULES += twofish.mod
-twofish_mod_SOURCES = gcry/cipher/twofish.c
-twofish_mod_ASFLAGS = $(COMMON_ASFLAGS)
-twofish_mod_LDFLAGS = $(COMMON_ASFLAGS)
-
-pkglib_MODULES += des.mod
-des_mod_SOURCES = gcry/cipher/des.c
-des_mod_ASFLAGS = $(COMMON_ASFLAGS)
-des_mod_LDFLAGS = $(COMMON_ASFLAGS)
-
-pkglib_MODULES += arcfour.mod
-arcfour_mod_SOURCES = gcry/cipher/arcfour.c
-arcfour_mod_ASFLAGS = $(COMMON_ASFLAGS)
-arcfour_mod_LDFLAGS = $(COMMON_ASFLAGS)
-
-pkglib_MODULES += rfc2268.mod
-rfc2268_mod_SOURCES = gcry/cipher/rfc2268.c
-rfc2268_mod_ASFLAGS = $(COMMON_ASFLAGS)
-rfc2268_mod_LDFLAGS = $(COMMON_ASFLAGS)
-
-pkglib_MODULES += cast5.mod
-cast5_mod_SOURCES = gcry/cipher/cast5.c
-cast5_mod_ASFLAGS = $(COMMON_ASFLAGS)
-cast5_mod_LDFLAGS = $(COMMON_ASFLAGS)
-
-pkglib_MODULES += camellia-glue.mod
-camellia-glue_mod_SOURCES = gcry/cipher/camellia-glue.c
-camellia-glue_mod_ASFLAGS = $(COMMON_ASFLAGS)
-camellia-glue_mod_LDFLAGS = $(COMMON_ASFLAGS)
-
-pkglib_MODULES += rijndael.mod
-rijndael_mod_SOURCES = gcry/cipher/rijndael.c
-rijndael_mod_ASFLAGS = $(COMMON_ASFLAGS)
-rijndael_mod_LDFLAGS = $(COMMON_ASFLAGS)
-
-pkglib_MODULES += serpent.mod
-serpent_mod_SOURCES = gcry/cipher/serpent.c
-serpent_mod_ASFLAGS = $(COMMON_ASFLAGS)
-serpent_mod_LDFLAGS = $(COMMON_ASFLAGS)
-
-pkglib_MODULES += blowfish.mod
-blowfish_mod_SOURCES = gcry/cipher/blowfish.c
-blowfish_mod_ASFLAGS = $(COMMON_ASFLAGS)
-blowfish_mod_LDFLAGS = $(COMMON_ASFLAGS)
-
diff --git a/import_gcry.py b/import_gcry.py
index c751f5e6f..738c2c479 100644
--- a/import_gcry.py
+++ b/import_gcry.py
@@ -77,8 +77,8 @@ for cipher_file in cipher_files:
             conf.write ("pkglib_MODULES += %s.mod\n" % modname)
             conf.write ("%s_mod_SOURCES = gcry/cipher/%s\n" %\
                             (modname, cipher_file))
-            conf.write ("%s_mod_CFLAGS = $(COMMON_CFLAGS) -Wno-error\n" % modname)
-            conf.write ("%s_mod_LDFLAGS = $(COMMON_ASFLAGS)\n\n" % modname)
+            conf.write ("%s_mod_CFLAGS = $(COMMON_CFLAGS) -Wno-missing-field-initializers -Wno-error\n" % modname)
+            conf.write ("%s_mod_LDFLAGS = $(COMMON_LDFLAGS)\n\n" % modname)
         elif isc:
             print ("WARNING: c file isn't a module: %s" % cipher_file)
         f.close ()
diff --git a/include/grub/crypto.h b/include/grub/crypto.h
index 36503c1a1..ab482f467 100644
--- a/include/grub/crypto.h
+++ b/include/grub/crypto.h
@@ -63,6 +63,7 @@ typedef enum
     GPG_ERR_WRONG_KEY_USAGE,
     GPG_ERR_WRONG_PUBKEY_ALGO,
   } gcry_err_code_t;
+#define gpg_err_code_t gcry_err_code_t
 
 enum gcry_cipher_modes 
   {
@@ -124,6 +125,53 @@ typedef struct gcry_cipher_spec
   gcry_cipher_stdecrypt_t stdecrypt;
 } gcry_cipher_spec_t;
 
+/* Definition of a function used to report selftest failures. 
+   DOMAIN is a string describing the function block:
+          "cipher", "digest", "pubkey or "random",
+   ALGO   is the algorithm under test,
+   WHAT   is a string describing what has been tested,
+   DESC   is a string describing the error. */
+typedef void (*selftest_report_func_t)(const char *domain,
+                                       int algo, 
+                                       const char *what,
+                                       const char *errdesc);
+
+/* Definition of the selftest functions.  */
+typedef gpg_err_code_t (*selftest_func_t)
+     (int algo, int extended, selftest_report_func_t report);
+
+/* The type used to convey additional information to a cipher.  */
+typedef gpg_err_code_t (*cipher_set_extra_info_t)
+     (void *c, int what, const void *buffer, grub_size_t buflen);
+
+
+/* Extra module specification structures.  These are used for internal
+   modules which provide more functions than available through the
+   public algorithm register APIs.  */
+typedef struct cipher_extra_spec
+{
+  selftest_func_t selftest;
+  cipher_set_extra_info_t set_extra_info;
+} cipher_extra_spec_t;
+
+/* (Forward declaration.)  */
+struct gcry_md_context;
+
+/* This object is used to hold a handle to a message digest object.
+   This structure is private - only to be used by the public gcry_md_*
+   macros.  */
+typedef struct gcry_md_handle 
+{
+  /* Actual context.  */
+  struct gcry_md_context *ctx;
+  
+  /* Buffer management.  */
+  int  bufpos;
+  int  bufsize;
+  unsigned char buf[1];
+} *gcry_md_hd_t;
+
+
 struct grub_cipher
 {
   struct grub_cipher *next;
diff --git a/include/grub/gcry_wrap.h b/include/grub/gcry_wrap.h
index 364946d1b..6f415a2e5 100644
--- a/include/grub/gcry_wrap.h
+++ b/include/grub/gcry_wrap.h
@@ -25,6 +25,8 @@
 #include <grub/dl.h>
 #include <grub/crypto.h>
 
+#define __GNU_LIBRARY__
+
 typedef grub_uint32_t u32;
 typedef grub_uint16_t u16;
 typedef grub_uint8_t byte;