Index: lib/libgcrypt-grub/cipher/camellia.c
===================================================================
--- lib/libgcrypt-grub/cipher/camellia.c.orig
+++ lib/libgcrypt-grub/cipher/camellia.c
@@ -25,11 +25,9 @@
  *  http://info.isl.ntt.co.jp/crypt/eng/camellia/specifications.html
  */
 
-
+#include "memory.h"
 #include "camellia.h"
 
-/* u32 must be 32bit word */
-typedef unsigned int u32;
 typedef unsigned char u8;
 
 /* key constants */