# else
# include <asm/semaphore.h>
# endif
-# if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-# include <linux/mutex.h>
-# endif
+# include <linux/mutex.h>
# include <linux/errno.h>
# include <linux/completion.h>
# if defined(HAVE_LINUX_EXPORTFS_H)
# include <linux/exportfs.h>
# endif
-# ifdef AFS_LINUX_ENV
-# include <linux/pagemap.h>
-# endif
+# include <linux/pagemap.h>
#else /* AFS_LINUX_ENV */