diff --git a/lnet/libcfs/linux/linux-debug.c b/lnet/libcfs/linux/linux-debug.c
index 8ac8d55bdb9cd887c20903286dff9a671a2b3599..e8029b5ce1df396f842d9e08b182d984d62bbd6e 100644
--- a/lnet/libcfs/linux/linux-debug.c
+++ b/lnet/libcfs/linux/linux-debug.c
@@ -59,7 +59,6 @@
#include <linux/kallsyms.h>
#endif
-static int handled_panic; /* to avoid recursive calls to notifiers */
char portals_upcall[1024] = "/usr/lib/lustre/portals_upcall";
void portals_run_upcall(char **argv)
diff --git a/lustre/include/liblustre.h b/lustre/include/liblustre.h
index 36d44ccfba9eb989dac1874587d0f3cd789f07bd..8f925e63d305df03187fde2a09006cfb0faa46ac 100644
--- a/lustre/include/liblustre.h
+++ b/lustre/include/liblustre.h
@@ -40,9 +40,9 @@
#include <sys/stat.h>
#include <sys/vfs.h>
-#include <portals/list.h>
+#include <libcfs/list.h>
#include <portals/p30.h>
-#include <linux/kp30.h>
+#include <libcfs/kp30.h>
/* definitions for liblustre */
@@ -348,16 +348,7 @@ static inline int kmem_cache_destroy(kmem_cache_t *a)
#define PAGE_CACHE_SHIFT PAGE_SHIFT
#define PAGE_CACHE_MASK PAGE_MASK
-struct page {
- void *addr;
- unsigned long index;
- struct list_head list;
- unsigned long private;
-
- /* internally used by liblustre file i/o */
- int _offset;
- int _count;
-};
+/* struct page decl moved out from here into portals/include/libcfs/user-prim.h */
/* 2.4 defines */
#define PAGE_LIST_ENTRY list
diff --git a/lustre/include/linux/lprocfs_status.h b/lustre/include/linux/lprocfs_status.h
index 2e2474fa2d210a40dce487cb21ae5e7b14a7ed53..17ad96927d7ba67456f4fd0040571a2f502325bb 100644
--- a/lustre/include/linux/lprocfs_status.h
+++ b/lustre/include/linux/lprocfs_status.h
@@ -31,7 +31,7 @@
#include <linux/proc_fs.h>
#include <linux/version.h>
#include <linux/smp.h>
-#include <linux/kp30.h>
+#include <libcfs/kp30.h>
# if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0))
# include <linux/statfs.h>
diff --git a/lustre/include/linux/lustre_compat25.h b/lustre/include/linux/lustre_compat25.h
index db19c012f663e723fa69c03c3c237203fad4c4d4..711f2829ebbfcbd38d3ad6898d68d619cc2a972c 100644
--- a/lustre/include/linux/lustre_compat25.h
+++ b/lustre/include/linux/lustre_compat25.h
@@ -29,7 +29,7 @@
#error sorry, lustre requires at least 2.5.69
#endif
-#include <linux/portals_compat25.h>
+#include <libcfs/linux/portals_compat25.h>
/*
* groups_info related staff
diff --git a/lustre/include/linux/lustre_idl.h b/lustre/include/linux/lustre_idl.h
index 5f64011f179aead34a1a5f8a0e1c586bc5f5a553..21a7278d028b90e9a2962ab64cbcde351ac4ed63 100644
--- a/lustre/include/linux/lustre_idl.h
+++ b/lustre/include/linux/lustre_idl.h
@@ -62,7 +62,7 @@
# include <asm/types.h>
# include <stdint.h>
#endif
-# include <portals/list.h>
+# include <libcfs/list.h>
# include <string.h>
#endif
diff --git a/lustre/include/linux/lustre_lib.h b/lustre/include/linux/lustre_lib.h
index c9b3335027248d40b87b4881746dc0219f6c2d59..8851c3555d901d2fb3faae0a57e59ac949a1dc55 100644
--- a/lustre/include/linux/lustre_lib.h
+++ b/lustre/include/linux/lustre_lib.h
@@ -35,7 +35,7 @@
# include <linux/signal.h>
# include <linux/types.h>
#endif
-#include <linux/kp30.h>
+#include <libcfs/kp30.h>
#include <linux/lustre_idl.h>
#include <linux/lustre_cfg.h>
@@ -486,7 +486,7 @@ static inline void obd_ioctl_freedata(char *buf, int len)
#define OBD_IOC_SMFS_SNAP_ADD _IOWR('f', 230, long)
/* XXX _IOWR('f', 250, long) has been defined in
- * portals/include/linux/kp30.h for debug, don't use it
+ * portals/include/libcfs/kp30.h for debug, don't use it
*/
/* Until such time as we get_info the per-stripe maximum from the OST,
diff --git a/lustre/include/linux/lustre_mds.h b/lustre/include/linux/lustre_mds.h
index 0ed932f09a38dbe0af8a00525b0e7fd5633326e6..19aaee960710058ff6595f7449afc6dfa7bd9ad5 100644
--- a/lustre/include/linux/lustre_mds.h
+++ b/lustre/include/linux/lustre_mds.h
@@ -32,7 +32,7 @@
#endif
#include <linux/lustre_handles.h>
-#include <linux/kp30.h>
+#include <libcfs/kp30.h>
#include <linux/lustre_idl.h>
#include <linux/lustre_lib.h>
#include <linux/lustre_dlm.h>
diff --git a/lustre/include/linux/lustre_net.h b/lustre/include/linux/lustre_net.h
index d0694f9721fbedf7b915221ec88c5de74dac757d..d938260a651706092a8d3a963598cc3983fe98d9 100644
--- a/lustre/include/linux/lustre_net.h
+++ b/lustre/include/linux/lustre_net.h
@@ -32,7 +32,7 @@
#endif
#endif
-#include <linux/kp30.h>
+#include <libcfs/kp30.h>
// #include <linux/obd.h>
#include <portals/p30.h>
#include <linux/lustre_idl.h>
diff --git a/lustre/include/linux/lvfs.h b/lustre/include/linux/lvfs.h
index fcccab41e94587cec6c07f21c2bb4f379683d248..5e3cbd0e3fc50dc48d95d143d59319d6799cf99a 100644
--- a/lustre/include/linux/lvfs.h
+++ b/lustre/include/linux/lvfs.h
@@ -1,7 +1,7 @@
#ifndef __LVFS_H__
#define __LVFS_H__
-#include <linux/kp30.h>
+#include <libcfs/kp30.h>
#define LL_ID_NAMELEN (16 + 1 + 8 + 1)
diff --git a/lustre/include/linux/obd_class.h b/lustre/include/linux/obd_class.h
index 4d07d64bbc450eda53552f4eacd9fe57f9d87d5c..bd7ad68d059f42f84bfd6719da57b1f27a76b39f 100644
--- a/lustre/include/linux/obd_class.h
+++ b/lustre/include/linux/obd_class.h
@@ -25,7 +25,7 @@
#ifndef __KERNEL__
#include <sys/types.h>
-#include <portals/list.h>
+#include <libcfs/list.h>
#else
#include <asm/segment.h>
#include <asm/uaccess.h>
diff --git a/lustre/include/linux/obd_support.h b/lustre/include/linux/obd_support.h
index 57623e89bf2ad0e9b3cc2bf1d2d83708f2b45daf..8783209bcd462dd2cb7607a136aeda0dd615de48 100644
--- a/lustre/include/linux/obd_support.h
+++ b/lustre/include/linux/obd_support.h
@@ -29,7 +29,7 @@
#include <linux/slab.h>
#include <linux/highmem.h>
#endif
-#include <linux/kp30.h>
+#include <libcfs/kp30.h>
#include <linux/lustre_compat25.h>
/* global variables */
diff --git a/lustre/ldlm/ldlm_flock.c b/lustre/ldlm/ldlm_flock.c
index 3a8bd2422abe4e982a811b4d511a4ae61b3766d4..15f46e2e4954a45c85f20149e162555149416544 100644
--- a/lustre/ldlm/ldlm_flock.c
+++ b/lustre/ldlm/ldlm_flock.c
@@ -28,7 +28,7 @@
#include <linux/obd_support.h>
#include <linux/obd_class.h>
#include <linux/lustre_lib.h>
-#include <portals/list.h>
+#include <libcfs/list.h>
#else
#include <liblustre.h>
#endif
diff --git a/lustre/ldlm/ldlm_lock.c b/lustre/ldlm/ldlm_lock.c
index 8a81f043fadd860f5e2524b571e2be2ec22d949c..4b58aeab3827898b95f9cf875978248298bb38ff 100644
--- a/lustre/ldlm/ldlm_lock.c
+++ b/lustre/ldlm/ldlm_lock.c
@@ -29,7 +29,7 @@
# include <linux/lustre_dlm.h>
#else
# include <liblustre.h>
-# include <linux/kp30.h>
+# include <libcfs/kp30.h>
#endif
#include <linux/obd_class.h>
diff --git a/lustre/ldlm/ldlm_lockd.c b/lustre/ldlm/ldlm_lockd.c
index fa963ab197fcd69ed48b48c2fc89c0950bb253e8..5999373d28cdbb3823caa196af481c58bf118589 100644
--- a/lustre/ldlm/ldlm_lockd.c
+++ b/lustre/ldlm/ldlm_lockd.c
@@ -37,7 +37,7 @@
#include <linux/lustre_dlm.h>
#include <linux/obd_class.h>
-#include <portals/list.h>
+#include <libcfs/list.h>
#include "ldlm_internal.h"
extern kmem_cache_t *ldlm_resource_slab;
diff --git a/lustre/lvfs/fsfilt.c b/lustre/lvfs/fsfilt.c
index a9ddf8be92bcbeddd5275feb96edd136b61e5583..cc14ab609683d92a4c21af4866de0725deb1b7d5 100644
--- a/lustre/lvfs/fsfilt.c
+++ b/lustre/lvfs/fsfilt.c
@@ -8,7 +8,7 @@
#include <linux/module.h>
#include <linux/kmod.h>
#include <linux/slab.h>
-#include <linux/kp30.h>
+#include <libcfs/kp30.h>
#include <linux/lustre_fsfilt.h>
LIST_HEAD(fsfilt_types);
diff --git a/lustre/lvfs/fsfilt_ext3.c b/lustre/lvfs/fsfilt_ext3.c
index a9fb04fe9e26c817c5df239370155a1fe2035a1b..4994b1eae735cbd348d4a80341d77f3e8dfe99e7 100644
--- a/lustre/lvfs/fsfilt_ext3.c
+++ b/lustre/lvfs/fsfilt_ext3.c
@@ -42,7 +42,7 @@
#include <ext3/xattr.h>
#endif
-#include <linux/kp30.h>
+#include <libcfs/kp30.h>
#include <linux/lustre_fsfilt.h>
#include <linux/obd.h>
#include <linux/obd_class.h>
diff --git a/lustre/lvfs/fsfilt_reiserfs.c b/lustre/lvfs/fsfilt_reiserfs.c
index 861b663d379a44190863b5086973437e6df4568e..b9f987abdf8bc0d92cdb8d74f1a71e085a2cf42a 100644
--- a/lustre/lvfs/fsfilt_reiserfs.c
+++ b/lustre/lvfs/fsfilt_reiserfs.c
@@ -41,7 +41,7 @@
#include <linux/init.h>
#include <asm/statfs.h>
#endif
-#include <linux/kp30.h>
+#include <libcfs/kp30.h>
#include <linux/lustre_fsfilt.h>
#include <linux/obd.h>
#include <linux/obd_class.h>
diff --git a/lustre/lvfs/fsfilt_smfs.c b/lustre/lvfs/fsfilt_smfs.c
index acbc93ae1581bcddf6efb59f6cbb210bc78ac896..486b97a81807803ccd3289c0cf77b8bb11a2b30a 100644
--- a/lustre/lvfs/fsfilt_smfs.c
+++ b/lustre/lvfs/fsfilt_smfs.c
@@ -31,7 +31,7 @@
#include <linux/pagemap.h>
#include <linux/quotaops.h>
#include <linux/version.h>
-#include <linux/kp30.h>
+#include <libcfs/kp30.h>
#include <linux/lustre_fsfilt.h>
#include <linux/lustre_smfs.h>
#include <linux/obd.h>
diff --git a/lustre/lvfs/fsfilt_snap_ext3.c b/lustre/lvfs/fsfilt_snap_ext3.c
index 4a8e00661137942b79600c51970efba39c71cd72..ffe147ed248f9e6b4de59982518d7af732f009c1 100644
--- a/lustre/lvfs/fsfilt_snap_ext3.c
+++ b/lustre/lvfs/fsfilt_snap_ext3.c
@@ -43,7 +43,7 @@
#include <ext3/xattr.h>
#endif
-#include <linux/kp30.h>
+#include <libcfs/kp30.h>
#include <linux/lustre_fsfilt.h>
#include <linux/obd.h>
#include <linux/obd_class.h>
diff --git a/lustre/lvfs/fsfilt_snap_smfs.c b/lustre/lvfs/fsfilt_snap_smfs.c
index 268db4b77fcbcd74cff648522de1871cfb7ab518..12e33ef57ac19c839695102e611adff58dc9f7b5 100644
--- a/lustre/lvfs/fsfilt_snap_smfs.c
+++ b/lustre/lvfs/fsfilt_snap_smfs.c
@@ -29,7 +29,7 @@
#include <linux/pagemap.h>
#include <linux/quotaops.h>
#include <linux/version.h>
-#include <linux/kp30.h>
+#include <libcfs/kp30.h>
#include <linux/lustre_fsfilt.h>
#include <linux/lustre_smfs.h>
#include <linux/obd.h>
diff --git a/lustre/lvfs/llog_cat.c b/lustre/lvfs/llog_cat.c
index b6fbd8e7a8b9b7826a154e1e388e64f9b4734a0d..b7a5c8fc34acabe46baaffbca55232730594b8ce 100644
--- a/lustre/lvfs/llog_cat.c
+++ b/lustre/lvfs/llog_cat.c
@@ -39,7 +39,7 @@
#endif
#include <linux/lustre_log.h>
-#include <portals/list.h>
+#include <libcfs/list.h>
/* Create a new log handle and add it to the open list.
* This log handle will be closed when all of the records in it are removed.
diff --git a/lustre/lvfs/lvfs_linux.c b/lustre/lvfs/lvfs_linux.c
index e8b7d49c306b59e294dfd04aa4023e2d2f211689..4118a53d0ca9d9a300a86ce6df0513517b5051ee 100644
--- a/lustre/lvfs/lvfs_linux.c
+++ b/lustre/lvfs/lvfs_linux.c
@@ -36,7 +36,7 @@
#include <linux/pagemap.h>
#include <linux/quotaops.h>
#include <linux/version.h>
-#include <linux/kp30.h>
+#include <libcfs/kp30.h>
#include <linux/lustre_fsfilt.h>
#include <linux/obd.h>
#include <linux/obd_class.h>
diff --git a/lustre/lvfs/lvfs_reint.c b/lustre/lvfs/lvfs_reint.c
index 3f8ddc29189472c016e4dab726f44d0adbc5431c..0bf64442415dede9856c18966bd9d4dc499fa7ae 100644
--- a/lustre/lvfs/lvfs_reint.c
+++ b/lustre/lvfs/lvfs_reint.c
@@ -33,7 +33,7 @@
#include <linux/pagemap.h>
#include <linux/quotaops.h>
#include <linux/version.h>
-#include <linux/kp30.h>
+#include <libcfs/kp30.h>
#include <linux/lustre_fsfilt.h>
#include <linux/obd.h>
#include <linux/obd_class.h>
diff --git a/lustre/lvfs/lvfs_undo.c b/lustre/lvfs/lvfs_undo.c
index 570e207e8fcfcd04d3cf031567a82e9e309be90f..0018a59e7598b8b68e11483374c1ea7c83f55358 100644
--- a/lustre/lvfs/lvfs_undo.c
+++ b/lustre/lvfs/lvfs_undo.c
@@ -16,7 +16,7 @@
#include <linux/pagemap.h>
#include <linux/quotaops.h>
#include <linux/version.h>
-#include <linux/kp30.h>
+#include <libcfs/kp30.h>
#include <linux/lustre_fsfilt.h>
#include <linux/obd.h>
#include <linux/obd_class.h>
diff --git a/lustre/mds/mds_fs.c b/lustre/mds/mds_fs.c
index 8242a7a7eee85c140ae8293d5248a332f65985b1..904b6576ce1a001a7f7f9675a1d1f96fb6dfb2a7 100644
--- a/lustre/mds/mds_fs.c
+++ b/lustre/mds/mds_fs.c
@@ -39,7 +39,7 @@
#include <linux/obd_support.h>
#include <linux/lustre_lib.h>
#include <linux/lustre_fsfilt.h>
-#include <portals/list.h>
+#include <libcfs/list.h>
#include <linux/lustre_smfs.h>
#include "mds_internal.h"
diff --git a/lustre/mds/mds_groups.c b/lustre/mds/mds_groups.c
index 33aba61cb15d992d19b4b0273d8df316c192cd0d..7da07f7d30760ac8d20bdfd37ffe63499dbd6c91 100644
--- a/lustre/mds/mds_groups.c
+++ b/lustre/mds/mds_groups.c
@@ -41,7 +41,7 @@
#include <linux/slab.h>
#include <asm/segment.h>
-#include <portals/list.h>
+#include <libcfs/list.h>
#include <linux/obd_support.h>
#include <linux/lustre_lib.h>
#include <linux/lustre_mds.h>
diff --git a/lustre/mds/mds_log.c b/lustre/mds/mds_log.c
index 8b9596936bf24d993a322b94427b9b02549f38e4..734dc1665a6e5e0eb56bfb5db4c888c2a09bf0ec 100644
--- a/lustre/mds/mds_log.c
+++ b/lustre/mds/mds_log.c
@@ -30,7 +30,7 @@
#include <linux/module.h>
#include <linux/version.h>
-#include <portals/list.h>
+#include <libcfs/list.h>
#include <linux/obd_class.h>
#include <linux/lustre_fsfilt.h>
#include <linux/lustre_commit_confd.h>
diff --git a/lustre/mds/mds_unlink_open.c b/lustre/mds/mds_unlink_open.c
index b52f1e5cf0395953037243f918b31dc3503c6896..3f9e111afe154e3905e6556c9a3f99d51de8609f 100644
--- a/lustre/mds/mds_unlink_open.c
+++ b/lustre/mds/mds_unlink_open.c
@@ -32,7 +32,7 @@
#include <linux/module.h>
#include <linux/version.h>
-#include <portals/list.h>
+#include <libcfs/list.h>
#include <linux/obd_class.h>
#include <linux/lustre_fsfilt.h>
#include <linux/lustre_commit_confd.h>
diff --git a/lustre/obdclass/class_obd.c b/lustre/obdclass/class_obd.c
index e87e1d592818324383bd9ae92da601f0f78ce809..21090cfa8d12aa2ea4ccec8efd1a5770f7eaa002 100644
--- a/lustre/obdclass/class_obd.c
+++ b/lustre/obdclass/class_obd.c
@@ -67,7 +67,7 @@
#include <linux/lustre_build_version.h>
#include <linux/lustre_version.h>
#endif
-#include <portals/list.h>
+#include <libcfs/list.h>
#ifndef __KERNEL__
/* liblustre workaround */
diff --git a/lustre/obdclass/llog_ioctl.c b/lustre/obdclass/llog_ioctl.c
index d036c2d6bd5822453567430dd445068c887c39d5..5644386de27f8c105493522cf1729df900cc8d34 100644
--- a/lustre/obdclass/llog_ioctl.c
+++ b/lustre/obdclass/llog_ioctl.c
@@ -15,7 +15,7 @@
#include <linux/fs.h>
#include <linux/obd_class.h>
#include <linux/lustre_log.h>
-#include <portals/list.h>
+#include <libcfs/list.h>
static int str2logid(struct llog_logid *logid, char *str, int len)
{
diff --git a/lustre/obdclass/llog_obd.c b/lustre/obdclass/llog_obd.c
index 7c94552fec1ab82666e3e88209a926abdca96e36..bcecaae783ef57d32d09f2723e4e8e91b8649584 100644
--- a/lustre/obdclass/llog_obd.c
+++ b/lustre/obdclass/llog_obd.c
@@ -22,7 +22,7 @@
#include <linux/obd_class.h>
#include <linux/lustre_log.h>
#include <linux/lustre_mds.h>
-#include <portals/list.h>
+#include <libcfs/list.h>
/* helper functions for calling the llog obd methods */
diff --git a/lustre/obdclass/obd_config.c b/lustre/obdclass/obd_config.c
index 46726e3710c5b295a6f47096c32b87ee0b0ae779..fa0bda61c7ddafd678793dc5f2336f40f1a097e4 100644
--- a/lustre/obdclass/obd_config.c
+++ b/lustre/obdclass/obd_config.c
@@ -37,7 +37,7 @@
#endif
#include <linux/lustre_log.h>
#include <linux/lprocfs_status.h>
-#include <portals/list.h>
+#include <libcfs/list.h>
/* Create a new device and set the type, name and uuid. If
diff --git a/lustre/obdfilter/filter.c b/lustre/obdfilter/filter.c
index d6a225abe2e8cd9fb7cdd80acf7a7a9d38e56696..b441bdbf790cf1a008bc175149f7be5497b5d7b3 100644
--- a/lustre/obdfilter/filter.c
+++ b/lustre/obdfilter/filter.c
@@ -57,7 +57,7 @@
#include <linux/lprocfs_status.h>
#include <linux/lustre_log.h>
#include <linux/lustre_commit_confd.h>
-#include <portals/list.h>
+#include <libcfs/list.h>
#include <linux/lustre_smfs.h>
#include "filter_internal.h"
diff --git a/lustre/obdfilter/filter_log.c b/lustre/obdfilter/filter_log.c
index c271382683d9b67502b2a9408d19d6018114ca83..0237fc072b0ae9d077325a6c9c6d939ee9dd6d71 100644
--- a/lustre/obdfilter/filter_log.c
+++ b/lustre/obdfilter/filter_log.c
@@ -30,7 +30,7 @@
#include <linux/module.h>
#include <linux/version.h>
-#include <portals/list.h>
+#include <libcfs/list.h>
#include <linux/obd_class.h>
#include <linux/lustre_fsfilt.h>
#include <linux/lustre_commit_confd.h>
diff --git a/lustre/obdfilter/filter_lvb.c b/lustre/obdfilter/filter_lvb.c
index aa9a88b8b95f8d6bdec3fdb07ab23bbb1318058a..0b569c3998285c40edbc669e08f241a9ecaaac90 100644
--- a/lustre/obdfilter/filter_lvb.c
+++ b/lustre/obdfilter/filter_lvb.c
@@ -30,7 +30,7 @@
#include <linux/module.h>
#include <linux/version.h>
-#include <portals/list.h>
+#include <libcfs/list.h>
#include <linux/obd_class.h>
#include <linux/lustre_dlm.h>
diff --git a/lustre/osc/osc_request.c b/lustre/osc/osc_request.c
index fcfe9392df025082d5277abea2021980a31ad2a5..f6f1a6c06d3c078cee7c3e933f07cd77a45f2881 100644
--- a/lustre/osc/osc_request.c
+++ b/lustre/osc/osc_request.c
@@ -49,7 +49,7 @@
#endif
#include <linux/lustre_dlm.h>
-#include <linux/kp30.h>
+#include <libcfs/kp30.h>
#include <linux/lustre_net.h>
#include <lustre/lustre_user.h>
#include <linux/obd_ost.h>
diff --git a/lustre/ost/ost_handler.c b/lustre/ost/ost_handler.c
index 616edb550f56ef6e53748f384542bce35b25b503..c6150152f121a0ea56314196e28946e17485c41c 100644
--- a/lustre/ost/ost_handler.c
+++ b/lustre/ost/ost_handler.c
@@ -43,7 +43,7 @@
#include <linux/init.h>
#include <linux/lprocfs_status.h>
#include <linux/lustre_commit_confd.h>
-#include <portals/list.h>
+#include <libcfs/list.h>
void oti_init(struct obd_trans_info *oti, struct ptlrpc_request *req)
{
diff --git a/lustre/ptlrpc/llog_client.c b/lustre/ptlrpc/llog_client.c
index aa9107ae14f7bf67bed48ff4b28de86c704a0965..4ebd88d0445b7029c9ad5442e423c5cbfdbdcc48 100644
--- a/lustre/ptlrpc/llog_client.c
+++ b/lustre/ptlrpc/llog_client.c
@@ -38,7 +38,7 @@
#include <linux/obd_class.h>
#include <linux/lustre_log.h>
#include <linux/lustre_net.h>
-#include <portals/list.h>
+#include <libcfs/list.h>
/* This is a callback from the llog_* functions.
* Assumes caller has already pushed us into the kernel context. */
diff --git a/lustre/ptlrpc/llog_net.c b/lustre/ptlrpc/llog_net.c
index 47205a5edfa6cbb594bba3a79c6e433f69d2e9a5..141caa013285f5e2c5866584e5da92d6403f1ee8 100644
--- a/lustre/ptlrpc/llog_net.c
+++ b/lustre/ptlrpc/llog_net.c
@@ -40,7 +40,7 @@
#include <linux/obd_class.h>
#include <linux/lustre_log.h>
-#include <portals/list.h>
+#include <libcfs/list.h>
#include <linux/lvfs.h>
#ifdef __KERNEL__
diff --git a/lustre/ptlrpc/llog_server.c b/lustre/ptlrpc/llog_server.c
index 6c81fa78b9f47214dfe993310dfd081a74a2c26c..86f4824f2c138ee50f02e5cecb3e0a282dd9e689 100644
--- a/lustre/ptlrpc/llog_server.c
+++ b/lustre/ptlrpc/llog_server.c
@@ -38,7 +38,7 @@
#include <linux/obd_class.h>
#include <linux/lustre_log.h>
#include <linux/lustre_net.h>
-#include <portals/list.h>
+#include <libcfs/list.h>
#include <linux/lustre_fsfilt.h>
#ifdef __KERNEL__
diff --git a/lustre/ptlrpc/ptlrpcd.c b/lustre/ptlrpc/ptlrpcd.c
index 61ce8e661c19552756fd21b8d89361b5ba93bf31..b4eb13b541690a4c00ba3d155dbaf74f351f4f40 100644
--- a/lustre/ptlrpc/ptlrpcd.c
+++ b/lustre/ptlrpc/ptlrpcd.c
@@ -42,7 +42,7 @@
# include <ctype.h>
#endif
-#include <linux/kp30.h>
+#include <libcfs/kp30.h>
#include <linux/lustre_net.h>
#include <linux/lustre_ha.h>
diff --git a/lustre/ptlrpc/recov_thread.c b/lustre/ptlrpc/recov_thread.c
index 0462a553aa83b1a7b46b074094436488ebe0108b..ca6e22a8fcc5f2f9fd3073115cd3e5aa9687bddd 100644
--- a/lustre/ptlrpc/recov_thread.c
+++ b/lustre/ptlrpc/recov_thread.c
@@ -35,18 +35,18 @@
#ifdef __KERNEL__
#include <linux/fs.h>
#else
-# include <portals/list.h>
+# include <libcfs/list.h>
# include <liblustre.h>
#endif
-#include <linux/kp30.h>
+#include <libcfs/kp30.h>
#include <linux/obd_class.h>
#include <linux/lustre_commit_confd.h>
#include <linux/obd_support.h>
#include <linux/obd_class.h>
#include <linux/lustre_net.h>
#include <portals/types.h>
-#include <portals/list.h>
+#include <libcfs/list.h>
#include <linux/lustre_log.h>
#include "ptlrpc_internal.h"
diff --git a/lustre/ptlrpc/service.c b/lustre/ptlrpc/service.c
index 512f62d87fd33a04636d624d349a99ce66cf500d..fa924fcea4cebb926d438ef372e9ec13da4d25cd 100644
--- a/lustre/ptlrpc/service.c
+++ b/lustre/ptlrpc/service.c
@@ -23,7 +23,7 @@
#define DEBUG_SUBSYSTEM S_RPC
#ifndef __KERNEL__
#include <liblustre.h>
-#include <linux/kp30.h>
+#include <libcfs/kp30.h>
#endif
#include <linux/obd_support.h>
#include <linux/obd_class.h>
diff --git a/lustre/smfs/cache.c b/lustre/smfs/cache.c
index 2911adf4fbda0dd5ed0d4f966b867084b0a71c68..400da0ab3cad0341ca461c21aaecc2e7b6c08094 100644
--- a/lustre/smfs/cache.c
+++ b/lustre/smfs/cache.c
@@ -29,7 +29,7 @@
#include <linux/slab.h>
#include <linux/string.h>
#include <linux/lustre_idl.h>
-#include <portals/list.h>
+#include <libcfs/list.h>
#include <linux/obd_class.h>
#include <linux/obd_support.h>
#include <linux/lustre_lib.h>
diff --git a/lustre/tests/mkdirdeep.c b/lustre/tests/mkdirdeep.c
index 1326c1e96bd60a09ec0cd8c40fb6a68eb130ceb4..8641d1df6b99428f6d3aaecf75e2e36bed6ae8d5 100644
--- a/lustre/tests/mkdirdeep.c
+++ b/lustre/tests/mkdirdeep.c
@@ -16,7 +16,7 @@
#include <fcntl.h>
#include <unistd.h>
#include <linux/limits.h>
-#include <portals/lltrace.h>
+#include <libcfs/lltrace.h>
static int opt_verbose = 0;
static int opt_trace = 0;
diff --git a/lustre/utils/obd.c b/lustre/utils/obd.c
index 48a135e45ca29eb518c2e9a7022a332a2004ad40..3c40db243e4c7db84cb7f40a77d17fe46415cbad 100644
--- a/lustre/utils/obd.c
+++ b/lustre/utils/obd.c
@@ -52,10 +52,6 @@
#include <asm/page.h> /* needed for PAGE_SIZE - rread */
-#define __KERNEL__
-#include <linux/list.h>
-#undef __KERNEL__
-
#include <linux/obd_class.h>
#include <portals/ptlctl.h>
#include "parser.h"