diff --git a/grub-core/disk/AFSplitter.c b/grub-core/disk/AFSplitter.c
index 6c3dc488e..ebcc35221 100644
--- a/grub-core/disk/AFSplitter.c
+++ b/grub-core/disk/AFSplitter.c
@@ -20,28 +20,13 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include <grub/types.h>
-#include <grub/misc.h>
-#include <grub/mm.h>
-#include <grub/dl.h>
-#include <grub/term.h>
-#include <grub/err.h>
-#include <grub/lib/arg.h>
-#include <grub/disk.h>
 #include <grub/crypto.h>
-#include <grub/env.h>
-#include <grub/normal.h>
-#include <grub/command.h>
+#include <grub/mm.h>
+#include <grub/misc.h>
 
 gcry_err_code_t AF_merge (const gcry_md_spec_t * hash, grub_uint8_t * src,
 			  grub_uint8_t * dst, grub_size_t blocksize,
 			  grub_size_t blocknumbers);
-static void diffuse (const gcry_md_spec_t * hash, grub_uint8_t * src,
-		     grub_uint8_t * dst, grub_size_t size);
-gcry_err_code_t AF_split (const gcry_md_spec_t * hash, grub_uint8_t * src,
-			  grub_uint8_t * dst, grub_size_t blocksize,
-			  grub_size_t blocknumbers);
-
 
 static void
 diffuse (const gcry_md_spec_t * hash, grub_uint8_t * src,
diff --git a/grub-core/disk/luks.c b/grub-core/disk/luks.c
index 47d10d63c..78fcabb03 100644
--- a/grub-core/disk/luks.c
+++ b/grub-core/disk/luks.c
@@ -20,11 +20,9 @@
 #include <grub/misc.h>
 #include <grub/mm.h>
 #include <grub/dl.h>
-#include <grub/term.h>
 #include <grub/err.h>
 #include <grub/disk.h>
 #include <grub/crypto.h>
-#include <grub/normal.h>
 #include <grub/extcmd.h>
 #include <grub/i18n.h>