diff --git a/lustre/include/linux/obd_class.h b/lustre/include/linux/obd_class.h
index d36033394c6400abee3a50022a1b0881b0449c4a..75a77cd333d271e23c2c68ecd229a526c456dfde 100644
--- a/lustre/include/linux/obd_class.h
+++ b/lustre/include/linux/obd_class.h
@@ -31,9 +31,6 @@
 #include <sys/types.h>
 #include <libcfs/list.h>
 #else
-#ifdef HAVE_SEGMENT_H
-# include <asm/segment.h>
-#endif
 #include <asm/uaccess.h>
 #include <linux/types.h>
 #include <linux/fs.h>
diff --git a/lustre/llite/llite_mmap.c b/lustre/llite/llite_mmap.c
index 7dd3e1a7201ca69f69eba42ba52e4122e1e663de..d2e0d66e07edb1dfe5d9d2c3399a4c38d7ba65e7 100644
--- a/lustre/llite/llite_mmap.c
+++ b/lustre/llite/llite_mmap.c
@@ -35,9 +35,6 @@
 #include <linux/fs.h>
 #include <linux/stat.h>
 #include <asm/uaccess.h>
-#ifdef HAVE_SEGMENT_H
-# include <asm/segment.h>
-#endif
 #include <linux/mm.h>
 #include <linux/pagemap.h>
 #include <linux/smp_lock.h>
diff --git a/lustre/llite/rw.c b/lustre/llite/rw.c
index 8466be3036243fdb59e6477542b0e3727cf06ff3..58f0592f59554a8aa3af664e9170da38ff984b8d 100644
--- a/lustre/llite/rw.c
+++ b/lustre/llite/rw.c
@@ -37,9 +37,6 @@
 #include <linux/fs.h>
 #include <linux/stat.h>
 #include <asm/uaccess.h>
-#ifdef HAVE_SEGMENT_H
-# include <asm/segment.h>
-#endif
 #include <linux/mm.h>
 #include <linux/pagemap.h>
 #include <linux/smp_lock.h>
diff --git a/lustre/llite/rw24.c b/lustre/llite/rw24.c
index 60113dac515ac9777d0b0fca697ba7ab21754597..ab83f8f58ac60f8a8d3741c0caa07d2e8f6dce0b 100644
--- a/lustre/llite/rw24.c
+++ b/lustre/llite/rw24.c
@@ -38,9 +38,6 @@
 #include <linux/iobuf.h>
 #include <linux/stat.h>
 #include <asm/uaccess.h>
-#ifdef HAVE_SEGMENT_H
-# include <asm/segment.h>
-#endif
 #include <linux/mm.h>
 #include <linux/pagemap.h>
 #include <linux/smp_lock.h>
diff --git a/lustre/lvfs/upcall_cache.c b/lustre/lvfs/upcall_cache.c
index d871e9f985f6c97a228356d020a1d69324a41f6b..61e1e85e1f59689547c48db1387cc30357b4a39f 100644
--- a/lustre/lvfs/upcall_cache.c
+++ b/lustre/lvfs/upcall_cache.c
@@ -43,9 +43,6 @@
 #include <linux/stat.h>
 #include <asm/uaccess.h>
 #include <linux/slab.h>
-#ifdef HAVE_SEGMENT_H
-# include <asm/segment.h>
-#endif
 
 #include <obd_support.h>
 #include <lustre_lib.h>
diff --git a/lustre/mds/mds_lib.c b/lustre/mds/mds_lib.c
index 8be4657586245a4c85a401f3da3a2494e34cb5d3..9a144a6a75d8fe0b51e44ff8ce3ed41a86f6f2b3 100644
--- a/lustre/mds/mds_lib.c
+++ b/lustre/mds/mds_lib.c
@@ -48,9 +48,6 @@
 #include <linux/stat.h>
 #include <asm/uaccess.h>
 #include <linux/slab.h>
-#ifdef HAVE_SEGMENT_H
-# include <asm/segment.h>
-#endif
 
 #include <obd_support.h>
 #include <lustre_lib.h>
diff --git a/lustre/obdclass/linux/linux-sysctl.c b/lustre/obdclass/linux/linux-sysctl.c
index 1cc81285b4b7bb9ca2948539c838eb8285980ae2..0f860c3c9bd376854a3f8e63b46a0c05ce1e85bf 100644
--- a/lustre/obdclass/linux/linux-sysctl.c
+++ b/lustre/obdclass/linux/linux-sysctl.c
@@ -38,9 +38,6 @@
 #include <linux/stat.h>
 #include <linux/ctype.h>
 #include <asm/bitops.h>
-#ifdef HAVE_SEGMENT_H
-# include <asm/segment.h>
-#endif
 #include <asm/uaccess.h>
 #include <linux/utsname.h>