diff --git a/dm-bht.c b/dm-bht.c
index 57ad231..aa3f834 100644
--- a/dm-bht.c
+++ b/dm-bht.c
@@ -7,6 +7,8 @@
  * This file is released under the GPL.
  */
 
+#include <string.h>
+
 #include <asm/atomic.h>
 #include <asm/page.h>
 #include <linux/bitops.h>  /* for fls() */
@@ -18,10 +20,8 @@
 #include <linux/errno.h>
 #include <linux/gfp.h>
 #include <linux/kernel.h>
-#include <linux/mm_types.h>
 #include <linux/scatterlist.h>
 #include <linux/slab.h>  /* k*alloc */
-#include <linux/string.h>  /* memset */
 
 #include "verity/dm-bht.h"
 
diff --git a/include/linux/mm.h b/include/linux/mm.h
deleted file mode 100644
index a57f2a0..0000000
--- a/include/linux/mm.h
+++ /dev/null
@@ -1,11 +0,0 @@
-/* Copyright (C) 2012 The Chromium OS Authors. All rights reserved.
- * Use of this source code is governed by the GPL v2 license that can
- * be found in the LICENSE file.
- *
- * Parts of this file are derived from the Linux kernel from the file with
- * the same name and path under include/.
- */
-#ifndef VERITY_INCLUDE_LINUX_MM_H_
-#define VERITY_INCLUDE_LINUX_MM_H_
-
-#endif  /* VERITY_INCLUDE_LINUX_MM_H_ */
diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
deleted file mode 100644
index e69de29..0000000
--- a/include/linux/mm_types.h
+++ /dev/null
diff --git a/include/linux/string.h b/include/linux/string.h
deleted file mode 100644
index c052085..0000000
--- a/include/linux/string.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/* Copyright (C) 2010 The Chromium OS Authors. All rights reserved.
- * Use of this source code is governed by the GPL v2 license that can
- * be found in the LICENSE file.
- * 
- * Parts of this file are derived from the Linux kernel from the file with
- * the same name and path under include/.
- */
-#ifndef VERITY_INCLUDE_LINUX_STRING_H_
-#define VERITY_INCLUDE_LINUX_STRING_H_
-
-#include <string.h>
-
-#endif  /* VERITY_INCLUDE_LINUX_STRING_H_ */
diff --git a/kernel/sha1_generic.c b/kernel/sha1_generic.c
index f52c65f..1b4ac01 100644
--- a/kernel/sha1_generic.c
+++ b/kernel/sha1_generic.c
@@ -18,7 +18,6 @@
  */
 #include <crypto/internal/hash.h>
 #include <linux/init.h>
-#include <linux/mm.h>
 #include <linux/cryptohash.h>
 #include <linux/types.h>
 #include <crypto/sha.h>
diff --git a/kernel/sha256_generic.c b/kernel/sha256_generic.c
index 8c4bfb2..8de85c3 100644
--- a/kernel/sha256_generic.c
+++ b/kernel/sha256_generic.c
@@ -19,7 +19,6 @@
  */
 #include <crypto/internal/hash.h>
 #include <linux/init.h>
-#include <linux/mm.h>
 #include <linux/types.h>
 #include <crypto/sha.h>
 #include <asm/byteorder.h>
diff --git a/kernel/sha512_generic.c b/kernel/sha512_generic.c
index 982de53..673d4ff 100644
--- a/kernel/sha512_generic.c
+++ b/kernel/sha512_generic.c
@@ -12,7 +12,6 @@
  */
 #include <crypto/internal/hash.h>
 #include <linux/kernel.h>
-#include <linux/mm.h>
 #include <linux/init.h>
 #include <linux/crypto.h>
 #include <linux/types.h>