diff --git a/acinclude.m4 b/acinclude.m4
index 38da5e5cb1..745f38e12a 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -915,7 +915,6 @@ case $AFS_SYSNAME in *_linux* | *_umlinux*)
 
 		 dnl Check for header files
 		 AC_CHECK_LINUX_HEADER([config.h])
-		 AC_CHECK_LINUX_HEADER([completion.h])
 		 AC_CHECK_LINUX_HEADER([exportfs.h])
 		 AC_CHECK_LINUX_HEADER([freezer.h])
 		 AC_CHECK_LINUX_HEADER([key-type.h])
diff --git a/src/afs/afs_call.c b/src/afs/afs_call.c
index d796587dd9..f071e20e64 100644
--- a/src/afs/afs_call.c
+++ b/src/afs/afs_call.c
@@ -41,7 +41,7 @@
 #define	AFS_MINBUFFERS	50
 #endif
 
-#if (defined(AFS_SUN5_ENV) || (defined(AFS_LINUX24_ENV) && defined(HAVE_LINUX_COMPLETION_H)) || defined(AFS_DARWIN80_ENV)) && !defined(UKERNEL)
+#if (defined(AFS_SUN5_ENV) || defined(AFS_LINUX26_ENV) || defined(AFS_DARWIN80_ENV)) && !defined(UKERNEL)
 /* If AFS_DAEMONOP_ENV is defined, it indicates we run "daemon" AFS syscalls by
  * spawning a kernel thread to do the work, instead of running them in the
  * calling process. */
@@ -276,9 +276,9 @@ afs_DaemonOp(long parm, long parm2, long parm3, long parm4, long parm5,
 #endif
 
 
-#if defined(AFS_LINUX24_ENV) && defined(HAVE_LINUX_COMPLETION_H)
+#if defined(AFS_LINUX26_ENV)
 struct afsd_thread_info {
-# if defined(AFS_LINUX26_ENV) && !defined(INIT_WORK_HAS_DATA)
+# if !defined(INIT_WORK_HAS_DATA)
     struct work_struct tq;
 # endif
     unsigned long parm;
diff --git a/src/afs/sysincludes.h b/src/afs/sysincludes.h
index 573fccc88e..11bd482f63 100644
--- a/src/afs/sysincludes.h
+++ b/src/afs/sysincludes.h
@@ -165,9 +165,7 @@ struct xfs_inode_info {
 #  include <linux/mutex.h>
 # endif
 # include <linux/errno.h>
-# ifdef HAVE_LINUX_COMPLETION_H
-#  include <linux/completion.h>
-# endif
+# include <linux/completion.h>
 # if defined(HAVE_LINUX_EXPORTFS_H)
 #  include <linux/exportfs.h>
 # endif
diff --git a/src/cf/linux-test4.m4 b/src/cf/linux-test4.m4
index 798a27b2df..c7c2581c63 100644
--- a/src/cf/linux-test4.m4
+++ b/src/cf/linux-test4.m4
@@ -25,20 +25,6 @@ read_lock(&tasklist_lock);
 		       [])
 ])
 
-AC_DEFUN([LINUX_COMPLETION_H_EXISTS], [
-  AC_CHECK_LINUX_BUILD([for linux/completion.h],
-		       [ac_cv_linux_completion_h_exists],
-[#include <linux/version.h>
-#include <linux/completion.h>],
-[struct completion _c;
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,4,8)
-lose
-#endif],
-		       [HAVE_LINUX_COMPLETION_H]
-		       [Define if your kernel has a usable linux/completion.h],
-		       [])
-])
-
 
 AC_DEFUN([LINUX_EXPORTS_INIT_MM], [
   AC_CHECK_LINUX_BUILD([for exported init_mm],