---
 grub-core/lib/libgcrypt-grub/cipher/camellia.c |    3 +--
 grub-core/lib/libgcrypt/cipher/camellia.c      |    3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

Index: grub-1.99/grub-core/lib/libgcrypt-grub/cipher/camellia.c
===================================================================
--- grub-1.99.orig/grub-core/lib/libgcrypt-grub/cipher/camellia.c
+++ grub-1.99/grub-core/lib/libgcrypt-grub/cipher/camellia.c
@@ -29,9 +29,8 @@ GRUB_MOD_LICENSE ("GPLv3+");
 
 
 #include "camellia.h"
+#include "memory.h"
 
-/* u32 must be 32bit word */
-typedef unsigned int u32;
 typedef unsigned char u8;
 
 /* key constants */
Index: grub-1.99/grub-core/lib/libgcrypt/cipher/camellia.c
===================================================================
--- grub-1.99.orig/grub-core/lib/libgcrypt/cipher/camellia.c
+++ grub-1.99/grub-core/lib/libgcrypt/cipher/camellia.c
@@ -26,10 +26,9 @@
 #include <string.h>
 #include <stdlib.h>
 
+#include "memory.h"
 #include "camellia.h"
 
-/* u32 must be 32bit word */
-typedef unsigned int u32;
 typedef unsigned char u8;
 
 /* key constants */