diff --git a/lustre/include/linux/lprocfs_status.h b/lustre/include/linux/lprocfs_status.h
index db4b7d531507dae780923fda35046213d8fc98cc..85574fa0d3e73098153c7e390d1d4aa61a52ad7d 100644
--- a/lustre/include/linux/lprocfs_status.h
+++ b/lustre/include/linux/lprocfs_status.h
@@ -29,7 +29,7 @@
 #endif
 
 #ifdef __KERNEL__
-#ifdef HAVE_KERNEL_CONFIG_H
+#ifndef AUTOCONF_INCLUDED
 #include <linux/config.h>
 #endif
 #include <linux/autoconf.h>
diff --git a/lustre/include/linux/obd_support.h b/lustre/include/linux/obd_support.h
index be35c268ae52f9172aa55cb7efe3bebe4ec6efc8..858a04b933c295a85e5e47727de2ba21fcf99e15 100644
--- a/lustre/include/linux/obd_support.h
+++ b/lustre/include/linux/obd_support.h
@@ -28,7 +28,7 @@
 #endif
 
 #ifdef __KERNEL__
-#ifdef HAVE_KERNEL_CONFIG_H
+#ifndef AUTOCONF_INCLUDED
 #include <linux/config.h>
 #endif
 #include <linux/autoconf.h>
diff --git a/lustre/llite/llite_mmap.c b/lustre/llite/llite_mmap.c
index f966cfdcd45629e5f3e4b38ece5cbcc42510adcb..a00e6af10ab45f2f13f3968a298857cd03f1cbe1 100644
--- a/lustre/llite/llite_mmap.c
+++ b/lustre/llite/llite_mmap.c
@@ -19,7 +19,7 @@
  *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#ifdef HAVE_KERNEL_CONFIG_H
+#ifndef AUTOCONF_INCLUDED
 #include <linux/config.h>
 #endif
 #include <linux/kernel.h>
diff --git a/lustre/llite/rw.c b/lustre/llite/rw.c
index 723dd908efb4fd0eaf416cb47878f3ff0cc8b14a..005590b4bd52859d982e3734fae1f09a40d9e7f9 100644
--- a/lustre/llite/rw.c
+++ b/lustre/llite/rw.c
@@ -21,7 +21,7 @@
  *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#ifdef HAVE_KERNEL_CONFIG_H
+#ifndef AUTOCONF_INCLUDED
 #include <linux/config.h>
 #endif
 #include <linux/kernel.h>
diff --git a/lustre/llite/rw26.c b/lustre/llite/rw26.c
index c1393917fbf41b91c42ae843a9c92982ccd95b77..aa4c5d307929a24b3aa2b79844a8a5efd923dcd4 100644
--- a/lustre/llite/rw26.c
+++ b/lustre/llite/rw26.c
@@ -21,7 +21,7 @@
  *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#ifdef HAVE_KERNEL_CONFIG_H
+#ifndef AUTOCONF_INCLUDED
 #include <linux/config.h>
 #endif
 #include <linux/kernel.h>
diff --git a/lustre/lvfs/upcall_cache.c b/lustre/lvfs/upcall_cache.c
index 71a002291e72f9d64edc2524d5a49ddc37107c2c..468d4af0c881084f0a96a87c8cc40aaa01112c47 100644
--- a/lustre/lvfs/upcall_cache.c
+++ b/lustre/lvfs/upcall_cache.c
@@ -23,7 +23,7 @@
 
 #define DEBUG_SUBSYSTEM S_SEC
 
-#ifdef HAVE_KERNEL_CONFIG_H
+#ifndef AUTOCONF_INCLUDED
 #include <linux/config.h>
 #endif
 #include <linux/module.h>
diff --git a/lustre/mdc/mdc_reint.c b/lustre/mdc/mdc_reint.c
index 6f8fc77ccfe91139d863c7e5d8d0df6c25ad9bf5..712a70b6a9c7f0bad36123f60b22a3ef6a83bf56 100644
--- a/lustre/mdc/mdc_reint.c
+++ b/lustre/mdc/mdc_reint.c
@@ -28,7 +28,7 @@
 #define DEBUG_SUBSYSTEM S_MDC
 
 #ifdef __KERNEL__
-#ifdef HAVE_KERNEL_CONFIG_H
+#ifndef AUTOCONF_INCLUDED
 # include <linux/config.h>
 #endif
 # include <linux/module.h>
diff --git a/lustre/mds/mds_lib.c b/lustre/mds/mds_lib.c
index 0678fe9dcc21a2696911cb6f45519889aaaae9b5..678ce53b0a5c98471b47d0a3b61c5f68296bc366 100644
--- a/lustre/mds/mds_lib.c
+++ b/lustre/mds/mds_lib.c
@@ -24,7 +24,7 @@
 
 #define DEBUG_SUBSYSTEM S_MDS
 
-#ifdef HAVE_KERNEL_CONFIG_H
+#ifndef AUTOCONF_INCLUDED
 #include <linux/config.h>
 #endif
 #include <linux/module.h>
diff --git a/lustre/mds/mds_log.c b/lustre/mds/mds_log.c
index 887d6efef4a17db59b965c2ff493c917965dfa93..be4959d1ce2ee8110f161d5bc98371d6a337a82c 100644
--- a/lustre/mds/mds_log.c
+++ b/lustre/mds/mds_log.c
@@ -29,7 +29,7 @@
 
 #define DEBUG_SUBSYSTEM S_MDS
 
-#ifdef HAVE_KERNEL_CONFIG_H
+#ifndef AUTOCONF_INCLUDED
 #include <linux/config.h>
 #endif
 #include <linux/module.h>
diff --git a/lustre/mds/mds_unlink_open.c b/lustre/mds/mds_unlink_open.c
index 28572445fc1c59270b4e5883155d24f9f0e1ad4f..9694dfc9143ef69f280025258745cccf1bc7bf75 100644
--- a/lustre/mds/mds_unlink_open.c
+++ b/lustre/mds/mds_unlink_open.c
@@ -31,7 +31,7 @@
 
 #define DEBUG_SUBSYSTEM S_MDS
 
-#ifdef HAVE_KERNEL_CONFIG_H
+#ifndef AUTOCONF_INCLUDED
 #include <linux/config.h>
 #endif
 #include <linux/module.h>
diff --git a/lustre/mdt/mdt_identity.c b/lustre/mdt/mdt_identity.c
index 9e94281bcce4a6b9e51fcbea9e02cf53ce9e8d9f..f196570f6cdd1a6c42b0bfa44090d6f510b3da9a 100644
--- a/lustre/mdt/mdt_identity.c
+++ b/lustre/mdt/mdt_identity.c
@@ -26,7 +26,7 @@
 #endif
 #define DEBUG_SUBSYSTEM S_MDS
 
-#ifdef HAVE_KERNEL_CONFIG_H
+#ifndef AUTOCONF_INCLUDED
 #include <linux/config.h>
 #endif
 #include <linux/module.h>
diff --git a/lustre/mdt/mdt_idmap.c b/lustre/mdt/mdt_idmap.c
index aaa6ee9f347747c3f2998e5c8c6717a41e506852..567c88430b626503a66503c50d2b84e6b7c870b8 100644
--- a/lustre/mdt/mdt_idmap.c
+++ b/lustre/mdt/mdt_idmap.c
@@ -27,7 +27,7 @@
 #endif
 #define DEBUG_SUBSYSTEM S_MDS
 
-#ifdef HAVE_KERNEL_CONFIG_H
+#ifndef AUTOCONF_INCLUDED
 #include <linux/config.h>
 #endif
 #include <linux/module.h>
diff --git a/lustre/mdt/mdt_rmtacl.c b/lustre/mdt/mdt_rmtacl.c
index 0f6008d5a441f1817f7f835ccfe2e801bff67c1d..13fa70afcd3c9ad1895d564cf4e9b968e7b0bafc 100644
--- a/lustre/mdt/mdt_rmtacl.c
+++ b/lustre/mdt/mdt_rmtacl.c
@@ -26,7 +26,7 @@
 #endif
 #define DEBUG_SUBSYSTEM S_MDS
 
-#ifdef HAVE_KERNEL_CONFIG_H
+#ifndef AUTOCONF_INCLUDED
 #include <linux/config.h>
 #endif
 #include <linux/module.h>
diff --git a/lustre/obdclass/linux/linux-module.c b/lustre/obdclass/linux/linux-module.c
index 57da96649d84e707c08c7bfa47853203649a2ae4..18d6271dc45f5c1cff11ff8af5388dcf788d8bb0 100644
--- a/lustre/obdclass/linux/linux-module.c
+++ b/lustre/obdclass/linux/linux-module.c
@@ -29,7 +29,7 @@
 #endif
 
 #ifdef __KERNEL__
-#ifdef HAVE_KERNEL_CONFIG_H
+#ifndef AUTOCONF_INCLUDED
 #include <linux/config.h> /* for CONFIG_PROC_FS */
 #endif
 #include <linux/module.h>
diff --git a/lustre/obdfilter/filter.c b/lustre/obdfilter/filter.c
index c7cc02fd50c96a48a8903e46a1ba6d0412d0121e..42d9ffa0f708582471443ba2e8e72b493fd95451 100644
--- a/lustre/obdfilter/filter.c
+++ b/lustre/obdfilter/filter.c
@@ -35,7 +35,7 @@
 
 #define DEBUG_SUBSYSTEM S_FILTER
 
-#ifdef HAVE_KERNEL_CONFIG_H
+#ifndef AUTOCONF_INCLUDED
 #include <linux/config.h>
 #endif
 #include <linux/module.h>
diff --git a/lustre/obdfilter/filter_io.c b/lustre/obdfilter/filter_io.c
index 2a6a326303cf98763c98b9f13185cff13973d97a..04845a70244d2e84a9e457f37dea6862fb2793c6 100644
--- a/lustre/obdfilter/filter_io.c
+++ b/lustre/obdfilter/filter_io.c
@@ -29,7 +29,7 @@
 
 #define DEBUG_SUBSYSTEM S_FILTER
 
-#ifdef HAVE_KERNEL_CONFIG_H
+#ifndef AUTOCONF_INCLUDED
 #include <linux/config.h>
 #endif
 #include <linux/module.h>
diff --git a/lustre/obdfilter/filter_io_26.c b/lustre/obdfilter/filter_io_26.c
index 3371bdda5c6bf999ef367dc2ce699cb9a789f564..cc3bb41b7784c116e9254b074a18e51d2245edb0 100644
--- a/lustre/obdfilter/filter_io_26.c
+++ b/lustre/obdfilter/filter_io_26.c
@@ -27,7 +27,7 @@
  *   license text for more details.
  */
 
-#ifdef HAVE_KERNEL_CONFIG_H
+#ifndef AUTOCONF_INCLUDED
 #include <linux/config.h>
 #endif
 #include <linux/module.h>
diff --git a/lustre/obdfilter/filter_log.c b/lustre/obdfilter/filter_log.c
index b18d80d28e4b68849a2c70ff3ccbb272ca59e913..63d7ad83dd354d0a9b7315b3d5a82d886b0f39fa 100644
--- a/lustre/obdfilter/filter_log.c
+++ b/lustre/obdfilter/filter_log.c
@@ -29,7 +29,7 @@
 
 #define DEBUG_SUBSYSTEM S_FILTER
 
-#ifdef HAVE_KERNEL_CONFIG_H
+#ifndef AUTOCONF_INCLUDED
 #include <linux/config.h>
 #endif
 #include <linux/module.h>
diff --git a/lustre/obdfilter/filter_lvb.c b/lustre/obdfilter/filter_lvb.c
index aaccf0ff80a4f292228f832e99ae9ff3b3789f19..86d01922c19bd96f1f1b944ff33f19e3e409c84a 100644
--- a/lustre/obdfilter/filter_lvb.c
+++ b/lustre/obdfilter/filter_lvb.c
@@ -29,7 +29,7 @@
 
 #define DEBUG_SUBSYSTEM S_FILTER
 
-#ifdef HAVE_KERNEL_CONFIG_H
+#ifndef AUTOCONF_INCLUDED
 #include <linux/config.h>
 #endif
 #include <linux/module.h>