From e903932500fc08b143467ce5a1c2702df35d8f0f Mon Sep 17 00:00:00 2001
From: "robert.read" <robert.read>
Date: Thu, 3 Jul 2008 19:46:01 +0000
Subject: [PATCH] Branch HEAD b=15940 i=isaac i=oleg

Convert kp30.h to an internal libcfs include and change users of kp30.h to
include libcfs.h if they were not already.
---
 libcfs/include/libcfs/Makefile.am       | 2 +-
 libcfs/include/libcfs/darwin/kp30.h     | 2 +-
 libcfs/include/libcfs/darwin/lltrace.h  | 2 +-
 libcfs/include/libcfs/libcfs.h          | 2 ++
 libcfs/include/libcfs/linux/kp30.h      | 3 +--
 libcfs/include/libcfs/linux/lltrace.h   | 2 +-
 libcfs/include/libcfs/winnt/kp30.h      | 2 +-
 libcfs/libcfs/darwin/darwin-curproc.c   | 1 -
 libcfs/libcfs/darwin/darwin-debug.c     | 1 -
 libcfs/libcfs/darwin/darwin-fs.c        | 1 -
 libcfs/libcfs/darwin/darwin-mem.c       | 1 -
 libcfs/libcfs/darwin/darwin-module.c    | 1 -
 libcfs/libcfs/darwin/darwin-prim.c      | 1 -
 libcfs/libcfs/darwin/darwin-sync.c      | 1 -
 libcfs/libcfs/darwin/darwin-tcpip.c     | 1 -
 libcfs/libcfs/darwin/darwin-tracefile.c | 1 -
 libcfs/libcfs/darwin/darwin-utils.c     | 2 +-
 libcfs/libcfs/debug.c                   | 1 -
 libcfs/libcfs/linux/linux-curproc.c     | 1 -
 libcfs/libcfs/linux/linux-debug.c       | 3 +--
 libcfs/libcfs/linux/linux-module.c      | 1 -
 libcfs/libcfs/linux/linux-proc.c        | 2 +-
 libcfs/libcfs/linux/linux-tcpip.c       | 2 +-
 libcfs/libcfs/linux/linux-tracefile.c   | 1 -
 libcfs/libcfs/linux/linux-utils.c       | 3 ++-
 libcfs/libcfs/lwt.c                     | 2 +-
 libcfs/libcfs/module.c                  | 2 +-
 libcfs/libcfs/nidstrings.c              | 2 +-
 libcfs/libcfs/tracefile.c               | 1 -
 libcfs/libcfs/user-bitops.c             | 1 -
 libcfs/libcfs/user-lock.c               | 1 -
 libcfs/libcfs/user-prim.c               | 1 -
 libcfs/libcfs/user-tcpip.c              | 1 -
 libcfs/libcfs/watchdog.c                | 1 -
 libcfs/libcfs/winnt/winnt-curproc.c     | 1 -
 libcfs/libcfs/winnt/winnt-debug.c       | 1 -
 libcfs/libcfs/winnt/winnt-module.c      | 1 -
 libcfs/libcfs/winnt/winnt-prim.c        | 1 -
 libcfs/libcfs/winnt/winnt-proc.c        | 1 -
 libcfs/libcfs/winnt/winnt-sync.c        | 1 -
 libcfs/libcfs/winnt/winnt-tcpip.c       | 1 -
 libcfs/libcfs/winnt/winnt-tracefile.c   | 1 -
 lnet/include/lnet/api-support.h         | 2 +-
 lnet/include/lnet/lib-lnet.h            | 2 +-
 lnet/include/lnet/linux/lib-lnet.h      | 2 +-
 lnet/include/lnet/lnetctl.h             | 3 +--
 lnet/include/lnet/lnetst.h              | 2 +-
 lnet/include/lnet/winnt/lib-lnet.h      | 1 -
 lnet/klnds/gmlnd/gmlnd.h                | 2 +-
 lnet/klnds/iiblnd/iiblnd.h              | 2 +-
 lnet/klnds/mxlnd/mxlnd.h                | 2 +-
 lnet/klnds/o2iblnd/o2iblnd.h            | 2 +-
 lnet/klnds/openiblnd/openiblnd.h        | 2 +-
 lnet/klnds/ptllnd/ptllnd.h              | 2 +-
 lnet/klnds/qswlnd/qswlnd.h              | 2 +-
 lnet/klnds/ralnd/ralnd.h                | 2 +-
 lnet/klnds/socklnd/socklnd.h            | 2 +-
 lnet/klnds/socklnd/socklnd_lib-linux.h  | 2 +-
 lnet/klnds/socklnd/socklnd_lib-winnt.h  | 1 -
 lnet/klnds/viblnd/viblnd.h              | 2 +-
 lnet/selftest/conrpc.h                  | 2 +-
 lnet/selftest/console.h                 | 2 +-
 lnet/selftest/selftest.h                | 2 --
 lustre/fid/fid_internal.h               | 3 +--
 lustre/fld/fld_internal.h               | 3 +--
 lustre/include/darwin/lustre_lib.h      | 3 +--
 lustre/include/darwin/obd_cksum.h       | 2 +-
 lustre/include/dt_object.h              | 3 +--
 lustre/include/interval_tree.h          | 2 +-
 lustre/include/liblustre.h              | 5 ++---
 lustre/include/linux/lprocfs_status.h   | 2 +-
 lustre/include/linux/obd_cksum.h        | 2 +-
 lustre/include/linux/obd_support.h      | 2 +-
 lustre/include/lu_object.h              | 3 +--
 lustre/include/lustre/lustre_idl.h      | 2 +-
 lustre/include/lustre_disk.h            | 1 +
 lustre/include/lustre_fid.h             | 3 +--
 lustre/include/lustre_fld.h             | 3 +--
 lustre/include/lustre_lib.h             | 4 ++--
 lustre/include/lustre_mdc.h             | 2 +-
 lustre/include/lustre_mds.h             | 2 +-
 lustre/include/lustre_mdt.h             | 3 +--
 lustre/include/lustre_net.h             | 2 +-
 lustre/include/lvfs.h                   | 2 +-
 lustre/include/obd_support.h            | 2 +-
 lustre/ldlm/interval_tree.c             | 1 -
 lustre/ldlm/ldlm_extent.c               | 1 -
 lustre/ldlm/ldlm_lock.c                 | 1 -
 lustre/ldlm/ldlm_pool.c                 | 1 -
 lustre/lvfs/fsfilt.c                    | 2 +-
 lustre/lvfs/fsfilt_ext3.c               | 2 +-
 lustre/lvfs/fsfilt_reiserfs.c           | 2 +-
 lustre/lvfs/lvfs_linux.c                | 2 +-
 lustre/mdt/mdt_identity.c               | 2 +-
 lustre/mdt/mdt_idmap.c                  | 2 +-
 lustre/mgc/mgc_internal.h               | 2 +-
 lustre/mgs/mgs_internal.h               | 2 +-
 lustre/obdclass/uuid.c                  | 2 +-
 lustre/osc/osc_request.c                | 7 +++----
 lustre/ptlrpc/ptlrpcd.c                 | 1 -
 lustre/ptlrpc/recov_thread.c            | 1 -
 lustre/ptlrpc/service.c                 | 1 -
 lustre/tests/it_test.c                  | 2 +-
 lustre/utils/l_getidentity.c            | 1 -
 lustre/utils/mkfs_lustre.c              | 4 ++--
 105 files changed, 74 insertions(+), 122 deletions(-)

diff --git a/libcfs/include/libcfs/Makefile.am b/libcfs/include/libcfs/Makefile.am
index 472d0ae..733fe3e 100644
--- a/libcfs/include/libcfs/Makefile.am
+++ b/libcfs/include/libcfs/Makefile.am
@@ -4,6 +4,6 @@ SUBDIRS += darwin
 endif
 DIST_SUBDIRS := $(SUBDIRS)
 
-EXTRA_DIST := curproc.h kp30.h libcfs.h list.h lltrace.h \
+EXTRA_DIST := curproc.h libcfs_private.h libcfs.h list.h lltrace.h \
 	portals_utils.h types.h user-lock.h user-prim.h user-time.h \
 	user-tcpip.h user-bitops.h bitmap.h
diff --git a/libcfs/include/libcfs/darwin/kp30.h b/libcfs/include/libcfs/darwin/kp30.h
index f9e94b1..ad5ded6 100644
--- a/libcfs/include/libcfs/darwin/kp30.h
+++ b/libcfs/include/libcfs/darwin/kp30.h
@@ -5,7 +5,7 @@
 #define __LIBCFS_DARWIN_KP30__
 
 #ifndef __LIBCFS_KP30_H__
-#error Do not #include this file directly. #include <libcfs/kp30.h> instead
+#error Do not #include this file directly. #include <libcfs/libcfs.h> instead
 #endif
 
 #ifdef __KERNEL__
diff --git a/libcfs/include/libcfs/darwin/lltrace.h b/libcfs/include/libcfs/darwin/lltrace.h
index 31d6e17..1a19c42 100644
--- a/libcfs/include/libcfs/darwin/lltrace.h
+++ b/libcfs/include/libcfs/darwin/lltrace.h
@@ -19,7 +19,7 @@
 #include <unistd.h>
 #include <sys/time.h>
 #include <lnet/types.h>
-#include <libcfs/kp30.h>
+#include <libcfs/libcfs.h>
 #include <mach/vm_param.h>
 #include <lnet/lnetctl.h>
 
diff --git a/libcfs/include/libcfs/libcfs.h b/libcfs/include/libcfs/libcfs.h
index 80518b1..6b0c73d 100644
--- a/libcfs/include/libcfs/libcfs.h
+++ b/libcfs/include/libcfs/libcfs.h
@@ -644,6 +644,8 @@ int cfs_oflags2univ(int flags);
 /* convert universal open flags to local open flags */
 int cfs_univ2oflags(int flags);
 
+#include "libcfs_private.h"
+
 #define _LIBCFS_H
 
 #endif /* _LIBCFS_H */
diff --git a/libcfs/include/libcfs/linux/kp30.h b/libcfs/include/libcfs/linux/kp30.h
index 19355ed..04fbddb 100644
--- a/libcfs/include/libcfs/linux/kp30.h
+++ b/libcfs/include/libcfs/linux/kp30.h
@@ -5,7 +5,7 @@
 #define __LIBCFS_LINUX_KP30_H__
 
 #ifndef __LIBCFS_KP30_H__
-#error Do not #include this file directly. #include <libcfs/kp30.h> instead
+#error Do not #include this file directly. #include <libcfs/libcfs.h> instead
 #endif
 
 #ifdef __KERNEL__
@@ -31,7 +31,6 @@
 # include <linux/highmem.h>
 # include <linux/module.h>
 # include <linux/version.h>
-# include <lnet/lnet.h>
 # include <linux/smp_lock.h>
 # include <asm/atomic.h>
 # include <asm/uaccess.h>
diff --git a/libcfs/include/libcfs/linux/lltrace.h b/libcfs/include/libcfs/linux/lltrace.h
index 1ddd03d..efa5f63 100644
--- a/libcfs/include/libcfs/linux/lltrace.h
+++ b/libcfs/include/libcfs/linux/lltrace.h
@@ -18,8 +18,8 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <sys/time.h>
+#include <libcfs/libcfs.h>
 #include <lnet/types.h>
-#include <libcfs/kp30.h>
 #include <lnet/lnetctl.h>
 #include <linux/limits.h>
 #include <asm/page.h>
diff --git a/libcfs/include/libcfs/winnt/kp30.h b/libcfs/include/libcfs/winnt/kp30.h
index 779d8be..fd8a723 100644
--- a/libcfs/include/libcfs/winnt/kp30.h
+++ b/libcfs/include/libcfs/winnt/kp30.h
@@ -24,7 +24,7 @@
 #define __LIBCFS_WINNT_KP30_H__
 
 #ifndef __LIBCFS_KP30_H__
-#error Do not #include this file directly. #include <libcfs/kp30.h> instead
+#error Do not #include this file directly. #include <libcfs/libcfs.h> instead
 #endif
 
 #include <libcfs/winnt/portals_compat25.h>
diff --git a/libcfs/libcfs/darwin/darwin-curproc.c b/libcfs/libcfs/darwin/darwin-curproc.c
index e12394e..e60052c 100644
--- a/libcfs/libcfs/darwin/darwin-curproc.c
+++ b/libcfs/libcfs/darwin/darwin-curproc.c
@@ -21,7 +21,6 @@
 #define DEBUG_SUBSYSTEM S_LNET
 
 #include <libcfs/libcfs.h>
-#include <libcfs/kp30.h>
 
 /*
  * Implementation of cfs_curproc API (see lnet/include/libcfs/curproc.h)
diff --git a/libcfs/libcfs/darwin/darwin-debug.c b/libcfs/libcfs/darwin/darwin-debug.c
index 2152d40..c768970 100644
--- a/libcfs/libcfs/darwin/darwin-debug.c
+++ b/libcfs/libcfs/darwin/darwin-debug.c
@@ -1,6 +1,5 @@
 # define DEBUG_SUBSYSTEM S_LNET
 
-#include <libcfs/kp30.h>
 #include <libcfs/libcfs.h>
 #include "tracefile.h"
 
diff --git a/libcfs/libcfs/darwin/darwin-fs.c b/libcfs/libcfs/darwin/darwin-fs.c
index 6fce8d5..6e2d3ea 100644
--- a/libcfs/libcfs/darwin/darwin-fs.c
+++ b/libcfs/libcfs/darwin/darwin-fs.c
@@ -35,7 +35,6 @@
 #define DEBUG_SUBSYSTEM S_LNET
 
 #include <libcfs/libcfs.h>
-#include <libcfs/kp30.h>
 
 /*
  * Kernel APIs for file system in xnu
diff --git a/libcfs/libcfs/darwin/darwin-mem.c b/libcfs/libcfs/darwin/darwin-mem.c
index 3079a56..33e7e0d 100644
--- a/libcfs/libcfs/darwin/darwin-mem.c
+++ b/libcfs/libcfs/darwin/darwin-mem.c
@@ -30,7 +30,6 @@
 #include <sys/malloc.h>
 
 #include <libcfs/libcfs.h>
-#include <libcfs/kp30.h>
 #include "darwin-internal.h"
 
 #if CFS_INDIVIDUAL_ZONE
diff --git a/libcfs/libcfs/darwin/darwin-module.c b/libcfs/libcfs/darwin/darwin-module.c
index 10cb7d8..a8761ab 100644
--- a/libcfs/libcfs/darwin/darwin-module.c
+++ b/libcfs/libcfs/darwin/darwin-module.c
@@ -6,7 +6,6 @@
 
 #define DEBUG_SUBSYSTEM S_LNET
 #include <libcfs/libcfs.h>
-#include <libcfs/kp30.h>
 
 int libcfs_ioctl_getdata(char *buf, char *end, void *arg)
 {
diff --git a/libcfs/libcfs/darwin/darwin-prim.c b/libcfs/libcfs/darwin/darwin-prim.c
index cdcabd9..5a01ea0 100644
--- a/libcfs/libcfs/darwin/darwin-prim.c
+++ b/libcfs/libcfs/darwin/darwin-prim.c
@@ -35,7 +35,6 @@
 #include <kern/thread.h>
 
 #include <libcfs/libcfs.h>
-#include <libcfs/kp30.h>
 
 /*
  * cfs pseudo device, actually pseudo char device in darwin
diff --git a/libcfs/libcfs/darwin/darwin-sync.c b/libcfs/libcfs/darwin/darwin-sync.c
index 8b752e3..8a46d74 100644
--- a/libcfs/libcfs/darwin/darwin-sync.c
+++ b/libcfs/libcfs/darwin/darwin-sync.c
@@ -56,7 +56,6 @@
 #endif
 
 #include <libcfs/libcfs.h>
-#include <libcfs/kp30.h>
 
 #define SLASSERT(e) ON_SYNC_DEBUG(LASSERT(e))
 
diff --git a/libcfs/libcfs/darwin/darwin-tcpip.c b/libcfs/libcfs/darwin/darwin-tcpip.c
index c6609a7..cc6d688 100644
--- a/libcfs/libcfs/darwin/darwin-tcpip.c
+++ b/libcfs/libcfs/darwin/darwin-tcpip.c
@@ -38,7 +38,6 @@
 #define DEBUG_SUBSYSTEM S_LNET
 
 #include <libcfs/libcfs.h>
-#include <libcfs/kp30.h>
 
 static __inline__ struct sockaddr_in
 blank_sin()
diff --git a/libcfs/libcfs/darwin/darwin-tracefile.c b/libcfs/libcfs/darwin/darwin-tracefile.c
index e672ad5..554f687 100644
--- a/libcfs/libcfs/darwin/darwin-tracefile.c
+++ b/libcfs/libcfs/darwin/darwin-tracefile.c
@@ -2,7 +2,6 @@
 #define DEBUG_SUBSYSTEM S_LNET
 #define LUSTRE_TRACEFILE_PRIVATE
 #include <libcfs/libcfs.h>
-#include <libcfs/kp30.h>
 #include "tracefile.h"
 
 /*
diff --git a/libcfs/libcfs/darwin/darwin-utils.c b/libcfs/libcfs/darwin/darwin-utils.c
index cfd7a2d..b77d0bd 100644
--- a/libcfs/libcfs/darwin/darwin-utils.c
+++ b/libcfs/libcfs/darwin/darwin-utils.c
@@ -31,7 +31,7 @@
 #include <sys/fcntl.h>
 #include <lnet/types.h>
 
-#include <libcfs/kp30.h>
+#include <libcfs/libcfs.h>
 
 #ifndef isspace
 inline int
diff --git a/libcfs/libcfs/debug.c b/libcfs/libcfs/debug.c
index 9810bdb..096df42 100644
--- a/libcfs/libcfs/debug.c
+++ b/libcfs/libcfs/debug.c
@@ -27,7 +27,6 @@
 # define DEBUG_SUBSYSTEM S_LNET
 
 #include <stdarg.h>
-#include <libcfs/kp30.h>
 #include <libcfs/libcfs.h>
 #include "tracefile.h"
 
diff --git a/libcfs/libcfs/linux/linux-curproc.c b/libcfs/libcfs/linux/linux-curproc.c
index e446169..551d36a 100644
--- a/libcfs/libcfs/linux/linux-curproc.c
+++ b/libcfs/libcfs/linux/linux-curproc.c
@@ -23,7 +23,6 @@
 #define DEBUG_SUBSYSTEM S_LNET
 
 #include <libcfs/libcfs.h>
-#include <libcfs/kp30.h>
 
 /*
  * Implementation of cfs_curproc API (see portals/include/libcfs/curproc.h)
diff --git a/libcfs/libcfs/linux/linux-debug.c b/libcfs/libcfs/linux/linux-debug.c
index 9b2a9dc..c74183c 100644
--- a/libcfs/libcfs/linux/linux-debug.c
+++ b/libcfs/libcfs/linux/linux-debug.c
@@ -50,9 +50,8 @@
 
 # define DEBUG_SUBSYSTEM S_LNET
 
-#include <libcfs/kp30.h>
-#include <libcfs/linux/portals_compat25.h>
 #include <libcfs/libcfs.h>
+#include <libcfs/linux/portals_compat25.h>
 
 #include "tracefile.h"
 
diff --git a/libcfs/libcfs/linux/linux-module.c b/libcfs/libcfs/linux/linux-module.c
index 6f21853..9a3ee14 100644
--- a/libcfs/libcfs/linux/linux-module.c
+++ b/libcfs/libcfs/linux/linux-module.c
@@ -1,7 +1,6 @@
 #define DEBUG_SUBSYSTEM S_LNET
 
 #include <libcfs/libcfs.h>
-#include <libcfs/kp30.h>
 
 #define LNET_MINOR 240
 
diff --git a/libcfs/libcfs/linux/linux-proc.c b/libcfs/libcfs/linux/linux-proc.c
index ae3312a..f768f43 100644
--- a/libcfs/libcfs/linux/linux-proc.c
+++ b/libcfs/libcfs/linux/linux-proc.c
@@ -54,7 +54,7 @@
 
 # define DEBUG_SUBSYSTEM S_LNET
 
-#include <libcfs/kp30.h>
+#include <libcfs/libcfs.h>
 #include <asm/div64.h>
 #include "tracefile.h"
 
diff --git a/libcfs/libcfs/linux/linux-tcpip.c b/libcfs/libcfs/linux/linux-tcpip.c
index e8ceafd..7740b34 100644
--- a/libcfs/libcfs/linux/linux-tcpip.c
+++ b/libcfs/libcfs/linux/linux-tcpip.c
@@ -20,7 +20,7 @@
  */
 #define DEBUG_SUBSYSTEM S_LNET
 
-#include <libcfs/kp30.h>
+#include <libcfs/libcfs.h>
 #include <libcfs/libcfs.h>
 
 #include <linux/if.h>
diff --git a/libcfs/libcfs/linux/linux-tracefile.c b/libcfs/libcfs/linux/linux-tracefile.c
index 5956027..b5b1b8e 100644
--- a/libcfs/libcfs/linux/linux-tracefile.c
+++ b/libcfs/libcfs/linux/linux-tracefile.c
@@ -2,7 +2,6 @@
 #define LUSTRE_TRACEFILE_PRIVATE
 
 #include <libcfs/libcfs.h>
-#include <libcfs/kp30.h>
 #include "tracefile.h"
 
 #ifndef get_cpu
diff --git a/libcfs/libcfs/linux/linux-utils.c b/libcfs/libcfs/linux/linux-utils.c
index 60f7cb8..8b75885 100644
--- a/libcfs/libcfs/linux/linux-utils.c
+++ b/libcfs/libcfs/linux/linux-utils.c
@@ -25,7 +25,8 @@
  * miscellaneous libcfs stuff
  */
 #define DEBUG_SUBSYSTEM S_LNET
-#include <lnet/types.h>
+#include <libcfs/libcfs.h>
+#include <lnet/lnet.h>
 
 /*
  * Convert server error code to client format. Error codes are from
diff --git a/libcfs/libcfs/lwt.c b/libcfs/libcfs/lwt.c
index 6455ece..0a8ee94 100644
--- a/libcfs/libcfs/lwt.c
+++ b/libcfs/libcfs/lwt.c
@@ -43,7 +43,7 @@
 
 #define DEBUG_SUBSYSTEM S_LNET
 
-#include <libcfs/kp30.h>
+#include <libcfs/libcfs.h>
 
 #if LWT_SUPPORT
 
diff --git a/libcfs/libcfs/module.c b/libcfs/libcfs/module.c
index 5e273cb..dab75fe 100644
--- a/libcfs/libcfs/module.c
+++ b/libcfs/libcfs/module.c
@@ -24,9 +24,9 @@
 #endif
 #define DEBUG_SUBSYSTEM S_LNET
 
+#include <libcfs/libcfs.h>
 #include <lnet/lib-lnet.h>
 #include <lnet/lnet.h>
-#include <libcfs/kp30.h>
 #include "tracefile.h"
 
 void
diff --git a/libcfs/libcfs/nidstrings.c b/libcfs/libcfs/nidstrings.c
index 5f17f5a..4b64830 100644
--- a/libcfs/libcfs/nidstrings.c
+++ b/libcfs/libcfs/nidstrings.c
@@ -26,8 +26,8 @@
 
 #define DEBUG_SUBSYSTEM S_LNET
 
+#include <libcfs/libcfs.h>
 #include <lnet/lnet.h>
-#include <libcfs/kp30.h>
 #ifndef __KERNEL__
 #ifdef HAVE_GETHOSTBYNAME
 # include <netdb.h>
diff --git a/libcfs/libcfs/tracefile.c b/libcfs/libcfs/tracefile.c
index 4a5cf52..8838e42 100644
--- a/libcfs/libcfs/tracefile.c
+++ b/libcfs/libcfs/tracefile.c
@@ -26,7 +26,6 @@
 #define LUSTRE_TRACEFILE_PRIVATE
 #include "tracefile.h"
 
-#include <libcfs/kp30.h>
 #include <libcfs/libcfs.h>
 
 /* XXX move things up to the top, comment */
diff --git a/libcfs/libcfs/user-bitops.c b/libcfs/libcfs/user-bitops.c
index 8f94593..f701b69 100644
--- a/libcfs/libcfs/user-bitops.c
+++ b/libcfs/libcfs/user-bitops.c
@@ -22,7 +22,6 @@
 #ifndef __KERNEL__
 
 #include <libcfs/libcfs.h>
-#include <libcfs/kp30.h>
 #include <libcfs/user-bitops.h>
 
 #define OFF_BY_START(start)     ((start)/BITS_PER_LONG)
diff --git a/libcfs/libcfs/user-lock.c b/libcfs/libcfs/user-lock.c
index c521dc7..a5ef616 100644
--- a/libcfs/libcfs/user-lock.c
+++ b/libcfs/libcfs/user-lock.c
@@ -37,7 +37,6 @@
 
 #include <stdlib.h>
 #include <libcfs/libcfs.h>
-#include <libcfs/kp30.h>
 
 /*
  * Optional debugging (magic stamping and checking ownership) can be added.
diff --git a/libcfs/libcfs/user-prim.c b/libcfs/libcfs/user-prim.c
index ffa32c1..5719623 100644
--- a/libcfs/libcfs/user-prim.c
+++ b/libcfs/libcfs/user-prim.c
@@ -32,7 +32,6 @@
 #ifndef __KERNEL__
 
 #include <libcfs/libcfs.h>
-#include <libcfs/kp30.h>
 
 #include <sys/mman.h>
 #ifndef  __CYGWIN__
diff --git a/libcfs/libcfs/user-tcpip.c b/libcfs/libcfs/user-tcpip.c
index e0cedb9..5158131 100644
--- a/libcfs/libcfs/user-tcpip.c
+++ b/libcfs/libcfs/user-tcpip.c
@@ -22,7 +22,6 @@
 #if !defined(__KERNEL__) || !defined(REDSTORM)
 
 #include <libcfs/libcfs.h>
-#include <libcfs/kp30.h>
 
 #include <sys/socket.h>
 #ifdef	HAVE_NETINET_IN_H
diff --git a/libcfs/libcfs/watchdog.c b/libcfs/libcfs/watchdog.c
index 89d757c..9fcc20c 100644
--- a/libcfs/libcfs/watchdog.c
+++ b/libcfs/libcfs/watchdog.c
@@ -22,7 +22,6 @@
 
 #define DEBUG_SUBSYSTEM S_LNET
 
-#include <libcfs/kp30.h>
 #include <libcfs/libcfs.h>
 #include "tracefile.h"
 
diff --git a/libcfs/libcfs/winnt/winnt-curproc.c b/libcfs/libcfs/winnt/winnt-curproc.c
index e21c5c9..d0acab4 100644
--- a/libcfs/libcfs/winnt/winnt-curproc.c
+++ b/libcfs/libcfs/winnt/winnt-curproc.c
@@ -21,7 +21,6 @@
 #define DEBUG_SUBSYSTEM S_LNET
 
 #include <libcfs/libcfs.h>
-#include <libcfs/kp30.h>
 
 
 /*
diff --git a/libcfs/libcfs/winnt/winnt-debug.c b/libcfs/libcfs/winnt/winnt-debug.c
index 9e94f84..902a7fc 100644
--- a/libcfs/libcfs/winnt/winnt-debug.c
+++ b/libcfs/libcfs/winnt/winnt-debug.c
@@ -18,7 +18,6 @@
 
 # define DEBUG_SUBSYSTEM S_LNET
 
-#include <libcfs/kp30.h>
 #include <libcfs/libcfs.h>
 #include "tracefile.h"
 
diff --git a/libcfs/libcfs/winnt/winnt-module.c b/libcfs/libcfs/winnt/winnt-module.c
index 2b6b008..029d69e 100644
--- a/libcfs/libcfs/winnt/winnt-module.c
+++ b/libcfs/libcfs/winnt/winnt-module.c
@@ -21,7 +21,6 @@
 #define DEBUG_SUBSYSTEM S_LIBCFS
 
 #include <libcfs/libcfs.h>
-#include <libcfs/kp30.h>
 
 #define LIBCFS_MINOR 240
 
diff --git a/libcfs/libcfs/winnt/winnt-prim.c b/libcfs/libcfs/winnt/winnt-prim.c
index 064b071..b03ca0e 100644
--- a/libcfs/libcfs/winnt/winnt-prim.c
+++ b/libcfs/libcfs/winnt/winnt-prim.c
@@ -20,7 +20,6 @@
 #define DEBUG_SUBSYSTEM S_LNET
 
 #include <libcfs/libcfs.h>
-#include <libcfs/kp30.h>
 
 
 /*
diff --git a/libcfs/libcfs/winnt/winnt-proc.c b/libcfs/libcfs/winnt/winnt-proc.c
index cfb8d38..c6bad3f 100644
--- a/libcfs/libcfs/winnt/winnt-proc.c
+++ b/libcfs/libcfs/winnt/winnt-proc.c
@@ -25,7 +25,6 @@
 # define DEBUG_SUBSYSTEM S_LNET
 
 #include <libcfs/libcfs.h>
-#include <libcfs/kp30.h>
 #include "tracefile.h"
 
 #ifdef __KERNEL__
diff --git a/libcfs/libcfs/winnt/winnt-sync.c b/libcfs/libcfs/winnt/winnt-sync.c
index 5094bef..921c02e 100644
--- a/libcfs/libcfs/winnt/winnt-sync.c
+++ b/libcfs/libcfs/winnt/winnt-sync.c
@@ -19,7 +19,6 @@
 #define DEBUG_SUBSYSTEM S_LIBCFS
 
 #include <libcfs/libcfs.h>
-#include <libcfs/kp30.h>
 
 
 /*
diff --git a/libcfs/libcfs/winnt/winnt-tcpip.c b/libcfs/libcfs/winnt/winnt-tcpip.c
index d0c725c..cffe8a7 100644
--- a/libcfs/libcfs/winnt/winnt-tcpip.c
+++ b/libcfs/libcfs/winnt/winnt-tcpip.c
@@ -22,7 +22,6 @@
 #define DEBUG_SUBSYSTEM S_LIBCFS
 
 #include <libcfs/libcfs.h>
-#include <libcfs/kp30.h>
 #include <lnet/lnet.h>
 
 #define TDILND_MODULE_NAME L"Tdilnd"
diff --git a/libcfs/libcfs/winnt/winnt-tracefile.c b/libcfs/libcfs/winnt/winnt-tracefile.c
index 61ba735..a4bb168 100644
--- a/libcfs/libcfs/winnt/winnt-tracefile.c
+++ b/libcfs/libcfs/winnt/winnt-tracefile.c
@@ -20,7 +20,6 @@
 #define LUSTRE_TRACEFILE_PRIVATE
 
 #include <libcfs/libcfs.h>
-#include <libcfs/kp30.h>
 #include "tracefile.h"
 
 #ifndef get_cpu
diff --git a/lnet/include/lnet/api-support.h b/lnet/include/lnet/api-support.h
index 717559f..811983f 100644
--- a/lnet/include/lnet/api-support.h
+++ b/lnet/include/lnet/api-support.h
@@ -11,8 +11,8 @@
 #error Unsupported Operating System
 #endif
 
+#include <libcfs/libcfs.h>
 #include <lnet/types.h>
-#include <libcfs/kp30.h>
 #include <lnet/lnet.h>
 
 #endif
diff --git a/lnet/include/lnet/lib-lnet.h b/lnet/include/lnet/lib-lnet.h
index a93354b..492d92e 100644
--- a/lnet/include/lnet/lib-lnet.h
+++ b/lnet/include/lnet/lib-lnet.h
@@ -19,8 +19,8 @@
 #error Unsupported Operating System
 #endif
 
+#include <libcfs/libcfs.h>
 #include <lnet/types.h>
-#include <libcfs/kp30.h>
 #include <lnet/lnet.h>
 #include <lnet/lib-types.h>
 
diff --git a/lnet/include/lnet/linux/lib-lnet.h b/lnet/include/lnet/linux/lib-lnet.h
index 9c38fd3..d307da2 100644
--- a/lnet/include/lnet/linux/lib-lnet.h
+++ b/lnet/include/lnet/linux/lib-lnet.h
@@ -12,7 +12,7 @@
 # include <asm/page.h>
 # include <linux/string.h>
 # include <asm/io.h>
-# include <libcfs/kp30.h>
+# include <libcfs/libcfs.h>
 
 static inline __u64
 lnet_page2phys (struct page *p)
diff --git a/lnet/include/lnet/lnetctl.h b/lnet/include/lnet/lnetctl.h
index 72b8e47..07b2797 100644
--- a/lnet/include/lnet/lnetctl.h
+++ b/lnet/include/lnet/lnetctl.h
@@ -21,9 +21,8 @@
 #ifndef _PTLCTL_H_
 #define _PTLCTL_H_
 
-#include <lnet/types.h>
-#include <libcfs/kp30.h>
 #include <libcfs/libcfs.h>
+#include <lnet/types.h>
 
 #define LNET_DEV_ID 0
 #define LNET_DEV_PATH "/dev/lnet"
diff --git a/lnet/include/lnet/lnetst.h b/lnet/include/lnet/lnetst.h
index 511c458..8fa3cd9 100644
--- a/lnet/include/lnet/lnetst.h
+++ b/lnet/include/lnet/lnetst.h
@@ -9,7 +9,7 @@
 #ifndef __LNET_ST_H__
 #define __LNET_ST_H__
 
-#include <libcfs/kp30.h>
+#include <libcfs/libcfs.h>
 #include <lnet/lnet.h>
 #include <lnet/lib-types.h>
 
diff --git a/lnet/include/lnet/winnt/lib-lnet.h b/lnet/include/lnet/winnt/lib-lnet.h
index bb3e5af..668f85b 100644
--- a/lnet/include/lnet/winnt/lib-lnet.h
+++ b/lnet/include/lnet/winnt/lib-lnet.h
@@ -10,7 +10,6 @@
 
 #ifdef __KERNEL__
 # include <libcfs/libcfs.h>
-# include <libcfs/kp30.h>
 
 static inline __u64
 lnet_page2phys (struct page *p)
diff --git a/lnet/klnds/gmlnd/gmlnd.h b/lnet/klnds/gmlnd/gmlnd.h
index b47fd8f..1c9fe1f 100644
--- a/lnet/klnds/gmlnd/gmlnd.h
+++ b/lnet/klnds/gmlnd/gmlnd.h
@@ -64,7 +64,7 @@
 
 #define DEBUG_SUBSYSTEM S_LND
 
-#include "libcfs/kp30.h"
+#include "libcfs/libcfs.h"
 #include "lnet/lnet.h"
 #include "lnet/lib-lnet.h"
 
diff --git a/lnet/klnds/iiblnd/iiblnd.h b/lnet/klnds/iiblnd/iiblnd.h
index 008d59d..ab4c7bf 100644
--- a/lnet/klnds/iiblnd/iiblnd.h
+++ b/lnet/klnds/iiblnd/iiblnd.h
@@ -51,7 +51,7 @@
 
 #define DEBUG_SUBSYSTEM S_LND
 
-#include <libcfs/kp30.h>
+#include <libcfs/libcfs.h>
 #include <lnet/lnet.h>
 #include <lnet/lib-lnet.h>
 
diff --git a/lnet/klnds/mxlnd/mxlnd.h b/lnet/klnds/mxlnd/mxlnd.h
index 4071903..926ba7d 100644
--- a/lnet/klnds/mxlnd/mxlnd.h
+++ b/lnet/klnds/mxlnd/mxlnd.h
@@ -63,7 +63,7 @@
 
 #define DEBUG_SUBSYSTEM S_LND
 
-#include "libcfs/kp30.h"
+#include "libcfs/libcfs.h"
 #include "lnet/lnet.h"
 #include "lnet/lib-lnet.h"
 
diff --git a/lnet/klnds/o2iblnd/o2iblnd.h b/lnet/klnds/o2iblnd/o2iblnd.h
index 7da4289..a49f487 100644
--- a/lnet/klnds/o2iblnd/o2iblnd.h
+++ b/lnet/klnds/o2iblnd/o2iblnd.h
@@ -56,7 +56,7 @@
 
 #define DEBUG_SUBSYSTEM S_LND
 
-#include <libcfs/kp30.h>
+#include <libcfs/libcfs.h>
 #include <lnet/lnet.h>
 #include <lnet/lib-lnet.h>
 
diff --git a/lnet/klnds/openiblnd/openiblnd.h b/lnet/klnds/openiblnd/openiblnd.h
index 4354dd2..7deb1a2 100644
--- a/lnet/klnds/openiblnd/openiblnd.h
+++ b/lnet/klnds/openiblnd/openiblnd.h
@@ -54,7 +54,7 @@
 
 #define DEBUG_SUBSYSTEM S_LND
 
-#include <libcfs/kp30.h>
+#include <libcfs/libcfs.h>
 #include <lnet/lnet.h>
 #include <lnet/lib-lnet.h>
 
diff --git a/lnet/klnds/ptllnd/ptllnd.h b/lnet/klnds/ptllnd/ptllnd.h
index b1d4360..85c40a5 100755
--- a/lnet/klnds/ptllnd/ptllnd.h
+++ b/lnet/klnds/ptllnd/ptllnd.h
@@ -51,7 +51,7 @@
 
 #define DEBUG_SUBSYSTEM S_LND
 
-#include <libcfs/kp30.h>
+#include <libcfs/libcfs.h>
 #include <lnet/lnet.h>
 #include <lnet/lib-lnet.h>
 #include <portals/p30.h>
diff --git a/lnet/klnds/qswlnd/qswlnd.h b/lnet/klnds/qswlnd/qswlnd.h
index 7016bf9..a58b8d4 100644
--- a/lnet/klnds/qswlnd/qswlnd.h
+++ b/lnet/klnds/qswlnd/qswlnd.h
@@ -62,7 +62,7 @@
 
 #define DEBUG_SUBSYSTEM S_LND
 
-#include <libcfs/kp30.h>
+#include <libcfs/libcfs.h>
 #include <lnet/lnet.h>
 #include <lnet/lib-lnet.h>
 
diff --git a/lnet/klnds/ralnd/ralnd.h b/lnet/klnds/ralnd/ralnd.h
index e4281c3..264cb2e 100644
--- a/lnet/klnds/ralnd/ralnd.h
+++ b/lnet/klnds/ralnd/ralnd.h
@@ -54,7 +54,7 @@
 
 #define DEBUG_SUBSYSTEM S_LND
 
-#include <libcfs/kp30.h>
+#include <libcfs/libcfs.h>
 #include <lnet/lnet.h>
 #include <lnet/lib-lnet.h>
 
diff --git a/lnet/klnds/socklnd/socklnd.h b/lnet/klnds/socklnd/socklnd.h
index 0835a34..a9f3fe8 100644
--- a/lnet/klnds/socklnd/socklnd.h
+++ b/lnet/klnds/socklnd/socklnd.h
@@ -40,7 +40,7 @@
 #error Unsupported Operating System
 #endif
 
-#include <libcfs/kp30.h>
+#include <libcfs/libcfs.h>
 #include <lnet/lnet.h>
 #include <lnet/lib-lnet.h>
 #include <lnet/socklnd.h>
diff --git a/lnet/klnds/socklnd/socklnd_lib-linux.h b/lnet/klnds/socklnd/socklnd_lib-linux.h
index 39aab81..e5917a4 100644
--- a/lnet/klnds/socklnd/socklnd_lib-linux.h
+++ b/lnet/klnds/socklnd/socklnd_lib-linux.h
@@ -40,7 +40,7 @@
 # include <linux/syscalls.h>
 #endif
 
-#include <libcfs/kp30.h>
+#include <libcfs/libcfs.h>
 #include <libcfs/linux/portals_compat25.h>
 
 #include <linux/crc32.h>
diff --git a/lnet/klnds/socklnd/socklnd_lib-winnt.h b/lnet/klnds/socklnd/socklnd_lib-winnt.h
index 492c9f5..178eadf 100755
--- a/lnet/klnds/socklnd/socklnd_lib-winnt.h
+++ b/lnet/klnds/socklnd/socklnd_lib-winnt.h
@@ -7,7 +7,6 @@
 #define __WINNT_TDILND_LIB_H__
 
 #include <libcfs/libcfs.h>
-#include <libcfs/kp30.h>
 
 #ifndef CONFIG_SMP
 
diff --git a/lnet/klnds/viblnd/viblnd.h b/lnet/klnds/viblnd/viblnd.h
index 2a254de..f3a5e19 100644
--- a/lnet/klnds/viblnd/viblnd.h
+++ b/lnet/klnds/viblnd/viblnd.h
@@ -56,7 +56,7 @@
 
 #define DEBUG_SUBSYSTEM S_LND
 
-#include <libcfs/kp30.h>
+#include <libcfs/libcfs.h>
 #include <lnet/lnet.h>
 #include <lnet/lib-lnet.h>
 
diff --git a/lnet/selftest/conrpc.h b/lnet/selftest/conrpc.h
index cd57511..b2242c7 100644
--- a/lnet/selftest/conrpc.h
+++ b/lnet/selftest/conrpc.h
@@ -12,7 +12,7 @@
 #define __LST_CONRPC_H__
 
 #ifdef __KERNEL__
-#include <libcfs/kp30.h>
+#include <libcfs/libcfs.h>
 #include <lnet/lnet.h>
 #include <lnet/lib-types.h>
 #include <lnet/lnetst.h>
diff --git a/lnet/selftest/console.h b/lnet/selftest/console.h
index 222f542..92c14d7 100644
--- a/lnet/selftest/console.h
+++ b/lnet/selftest/console.h
@@ -13,7 +13,7 @@
 
 #ifdef __KERNEL__
 
-#include <libcfs/kp30.h>
+#include <libcfs/libcfs.h>
 #include <lnet/lnet.h>
 #include <lnet/lib-types.h>
 #include <lnet/lnetst.h>
diff --git a/lnet/selftest/selftest.h b/lnet/selftest/selftest.h
index 5038350..37228e4 100644
--- a/lnet/selftest/selftest.h
+++ b/lnet/selftest/selftest.h
@@ -35,8 +35,6 @@ typedef struct { volatile int counter; } atomic_t;
 #define atomic_dec(a)  do { (a)->counter--; } while (0)
 
 #endif
-
-#include <libcfs/kp30.h>
 #include <libcfs/libcfs.h>
 #include <lnet/lnet.h>
 #include <lnet/lib-lnet.h>
diff --git a/lustre/fid/fid_internal.h b/lustre/fid/fid_internal.h
index 39f795e..12321ff 100644
--- a/lustre/fid/fid_internal.h
+++ b/lustre/fid/fid_internal.h
@@ -30,8 +30,7 @@
 #include <lustre/lustre_idl.h>
 #include <dt_object.h>
 
-#include <libcfs/list.h>
-#include <libcfs/kp30.h>
+#include <libcfs/libcfs.h>
 
 #include <linux/types.h>
 
diff --git a/lustre/fld/fld_internal.h b/lustre/fld/fld_internal.h
index 4fbd6c2..08f80af 100644
--- a/lustre/fld/fld_internal.h
+++ b/lustre/fld/fld_internal.h
@@ -31,8 +31,7 @@
 #include <lustre/lustre_idl.h>
 #include <dt_object.h>
 
-#include <libcfs/list.h>
-#include <libcfs/kp30.h>
+#include <libcfs/libcfs.h>
 
 #include <linux/types.h>
 #include <lustre_req_layout.h>
diff --git a/lustre/include/darwin/lustre_lib.h b/lustre/include/darwin/lustre_lib.h
index 5adadae..96a97ff 100644
--- a/lustre/include/darwin/lustre_lib.h
+++ b/lustre/include/darwin/lustre_lib.h
@@ -1,4 +1,4 @@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
+
  * vim:expandtab:shiftwidth=8:tabstop=8:
  *
  *  Copyright (C) 2001 Cluster File Systems, Inc. <braam@clusterfs.com>
@@ -31,7 +31,6 @@
 
 #include <string.h>
 #include <libcfs/libcfs.h>
-#include <libcfs/kp30.h> 
 
 #ifndef LP_POISON
 #define LI_POISON ((int)0x5a5a5a5a)
diff --git a/lustre/include/darwin/obd_cksum.h b/lustre/include/darwin/obd_cksum.h
index 205433b..3671831 100644
--- a/lustre/include/darwin/obd_cksum.h
+++ b/lustre/include/darwin/obd_cksum.h
@@ -27,7 +27,7 @@
 #error Do not #include this file directly. #include <obd_chsum.h> instead
 #endif
 
-#include <libcfs/kp30.h>
+#include <libcfs/libcfs.h>
 
 #if !defined(__KERNEL__) && defined(HAVE_ADLER)
 #  include <zlib.h>
diff --git a/lustre/include/dt_object.h b/lustre/include/dt_object.h
index 3d2d920..fa9fb17 100644
--- a/lustre/include/dt_object.h
+++ b/lustre/include/dt_object.h
@@ -40,8 +40,7 @@
  */
 #include <lu_object.h>
 
-#include <libcfs/list.h>
-#include <libcfs/kp30.h>
+#include <libcfs/libcfs.h>
 
 struct seq_file;
 struct proc_dir_entry;
diff --git a/lustre/include/interval_tree.h b/lustre/include/interval_tree.h
index 41436c1..404c2f7 100644
--- a/lustre/include/interval_tree.h
+++ b/lustre/include/interval_tree.h
@@ -29,7 +29,7 @@
 #define _INTERVAL_H__
 
 #include <libcfs/types.h>  /* __u8, __u64 etc. */
-#include <libcfs/kp30.h>   /* LASSERT. */
+#include <libcfs/libcfs.h>   /* LASSERT. */
 
 struct interval_node {
         struct interval_node   *in_left;
diff --git a/lustre/include/liblustre.h b/lustre/include/liblustre.h
index e59581f..79ffd50 100644
--- a/lustre/include/liblustre.h
+++ b/lustre/include/liblustre.h
@@ -34,9 +34,8 @@
 #define __LINUX_SPINLOCK_H
 #endif
 
-#include <libcfs/list.h>
+#include <libcfs/libcfs.h>
 #include <lnet/lnet.h>
-#include <libcfs/kp30.h>
 #include <libcfs/user-bitops.h>
 
 #include <sys/mman.h>
@@ -66,9 +65,9 @@
 #include <fcntl.h>
 #include <assert.h>
 
+#include <libcfs/libcfs.h>
 #include <libcfs/list.h>
 #include <lnet/lnet.h>
-#include <libcfs/kp30.h>
 #include <libcfs/user-bitops.h>
 
 #ifndef _IOWR
diff --git a/lustre/include/linux/lprocfs_status.h b/lustre/include/linux/lprocfs_status.h
index 1c50c8c..9aafd24 100644
--- a/lustre/include/linux/lprocfs_status.h
+++ b/lustre/include/linux/lprocfs_status.h
@@ -38,7 +38,7 @@
 #include <linux/version.h>
 #include <linux/smp.h>
 #include <linux/rwsem.h>
-#include <libcfs/kp30.h>
+#include <libcfs/libcfs.h>
 #include <linux/statfs.h>
 
 #else 
diff --git a/lustre/include/linux/obd_cksum.h b/lustre/include/linux/obd_cksum.h
index 3beb3df..af06411 100644
--- a/lustre/include/linux/obd_cksum.h
+++ b/lustre/include/linux/obd_cksum.h
@@ -31,7 +31,7 @@
 #include <linux/autoconf.h>
 #endif
 
-#include <libcfs/kp30.h>
+#include <libcfs/libcfs.h>
 
 /* Prefer the kernel's version, if it exports it, because it might be
  * optimized for this CPU. */
diff --git a/lustre/include/linux/obd_support.h b/lustre/include/linux/obd_support.h
index dada502..bc5f3ee 100644
--- a/lustre/include/linux/obd_support.h
+++ b/lustre/include/linux/obd_support.h
@@ -35,7 +35,7 @@
 #include <linux/slab.h>
 #include <linux/highmem.h>
 #endif
-#include <libcfs/kp30.h>
+#include <libcfs/libcfs.h>
 #include <linux/lustre_compat25.h>
 #include <lustre/lustre_idl.h>
 
diff --git a/lustre/include/lu_object.h b/lustre/include/lu_object.h
index 378a8fc..6a74131 100644
--- a/lustre/include/lu_object.h
+++ b/lustre/include/lu_object.h
@@ -30,8 +30,7 @@
  */
 #include <lustre/lustre_idl.h>
 
-#include <libcfs/list.h>
-#include <libcfs/kp30.h>
+#include <libcfs/libcfs.h>
 
 /*
  * Layered objects support for CMD3/C5.
diff --git a/lustre/include/lustre/lustre_idl.h b/lustre/include/lustre/lustre_idl.h
index 9d4913f..94f0e6b 100644
--- a/lustre/include/lustre/lustre_idl.h
+++ b/lustre/include/lustre/lustre_idl.h
@@ -52,7 +52,7 @@
 #ifndef _LUSTRE_IDL_H_
 #define _LUSTRE_IDL_H_
 
-#include <libcfs/kp30.h>
+#include <libcfs/libcfs.h>
 
 #include <lustre/types.h>
 
diff --git a/lustre/include/lustre_disk.h b/lustre/include/lustre_disk.h
index ccb1340..0b7a84b 100644
--- a/lustre/include/lustre_disk.h
+++ b/lustre/include/lustre_disk.h
@@ -26,6 +26,7 @@
 #ifndef _LUSTRE_DISK_H
 #define _LUSTRE_DISK_H
 
+#include <libcfs/libcfs.h>
 #include <lnet/types.h>
 
 /****************** on-disk files *********************/
diff --git a/lustre/include/lustre_fid.h b/lustre/include/lustre_fid.h
index d47304d..abb1def 100644
--- a/lustre/include/lustre_fid.h
+++ b/lustre/include/lustre_fid.h
@@ -31,8 +31,7 @@
 #include <lustre_req_layout.h>
 #include <lustre_mdt.h>
 
-#include <libcfs/list.h>
-#include <libcfs/kp30.h>
+#include <libcfs/libcfs.h>
 
 struct lu_site;
 struct lu_context;
diff --git a/lustre/include/lustre_fld.h b/lustre/include/lustre_fld.h
index 4202836..d82b680 100644
--- a/lustre/include/lustre_fld.h
+++ b/lustre/include/lustre_fld.h
@@ -27,8 +27,7 @@
 #include <lustre_mdt.h>
 #include <dt_object.h>
 
-#include <libcfs/list.h>
-#include <libcfs/kp30.h>
+#include <libcfs/libcfs.h>
 
 struct lu_client_fld;
 struct lu_server_fld;
diff --git a/lustre/include/lustre_lib.h b/lustre/include/lustre_lib.h
index c84b994..98bcf81 100644
--- a/lustre/include/lustre_lib.h
+++ b/lustre/include/lustre_lib.h
@@ -25,7 +25,7 @@
 #ifndef _LUSTRE_LIB_H
 #define _LUSTRE_LIB_H
 
-#include <libcfs/kp30.h>
+#include <libcfs/libcfs.h>
 #include <lustre/lustre_idl.h>
 #include <lustre_ver.h>
 #include <lustre_cfg.h>
@@ -500,7 +500,7 @@ static inline void obd_ioctl_freedata(char *buf, int len)
 #define ECHO_IOC_CANCEL                _IOWR('f', 203, OBD_IOC_DATA_TYPE)
 
 /* XXX _IOWR('f', 250, long) has been defined in
- * lnet/include/libcfs/kp30.h for debug, don't use it
+ * libcfs/include/libcfs/libcfs_private.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/lustre_mdc.h b/lustre/include/lustre_mdc.h
index 598754b..9a9a02a 100644
--- a/lustre/include/lustre_mdc.h
+++ b/lustre/include/lustre_mdc.h
@@ -26,7 +26,7 @@
 # endif /* HAVE_VFS_INTENT_PATCHES */
 #endif /* __KERNEL__ */
 #include <lustre_handles.h>
-#include <libcfs/kp30.h>
+#include <libcfs/libcfs.h>
 #include <lustre/lustre_idl.h>
 #include <lustre_lib.h>
 #include <lustre_dlm.h>
diff --git a/lustre/include/lustre_mds.h b/lustre/include/lustre_mds.h
index 7f9f24d..822ea3a 100644
--- a/lustre/include/lustre_mds.h
+++ b/lustre/include/lustre_mds.h
@@ -11,7 +11,7 @@
 #define _LUSTRE_MDS_H
 
 #include <lustre_handles.h>
-#include <libcfs/kp30.h>
+#include <libcfs/libcfs.h>
 #include <lustre/lustre_idl.h>
 #include <lustre_lib.h>
 #include <lustre_dlm.h>
diff --git a/lustre/include/lustre_mdt.h b/lustre/include/lustre_mdt.h
index 28d6beb..5891941 100644
--- a/lustre/include/lustre_mdt.h
+++ b/lustre/include/lustre_mdt.h
@@ -27,8 +27,7 @@
 #include <lustre_req_layout.h>
 #include <md_object.h>
 #include <dt_object.h>
-#include <libcfs/list.h>
-#include <libcfs/kp30.h>
+#include <libcfs/libcfs.h>
 
 /*
  * Common thread info for mdt, seq and fld
diff --git a/lustre/include/lustre_net.h b/lustre/include/lustre_net.h
index 097f7fd..d3bb4c6 100644
--- a/lustre/include/lustre_net.h
+++ b/lustre/include/lustre_net.h
@@ -33,7 +33,7 @@
 #error Unsupported operating system.
 #endif
 
-#include <libcfs/kp30.h>
+#include <libcfs/libcfs.h>
 // #include <obd.h>
 #include <lnet/lnet.h>
 #include <lustre/lustre_idl.h>
diff --git a/lustre/include/lvfs.h b/lustre/include/lvfs.h
index 42e8544..96110fd 100644
--- a/lustre/include/lvfs.h
+++ b/lustre/include/lvfs.h
@@ -26,7 +26,7 @@
 
 #define LL_FID_NAMELEN (16 + 1 + 8 + 1)
 
-#include <libcfs/kp30.h>
+#include <libcfs/libcfs.h>
 #if defined(__linux__)
 #include <linux/lvfs.h>
 #elif defined(__APPLE__)
diff --git a/lustre/include/obd_support.h b/lustre/include/obd_support.h
index 1b800b6..6765019 100644
--- a/lustre/include/obd_support.h
+++ b/lustre/include/obd_support.h
@@ -23,7 +23,7 @@
 #ifndef _OBD_SUPPORT
 #define _OBD_SUPPORT
 
-#include <libcfs/kp30.h>
+#include <libcfs/libcfs.h>
 #include <lvfs.h>
 #include <lprocfs_status.h>
 
diff --git a/lustre/ldlm/interval_tree.c b/lustre/ldlm/interval_tree.c
index bedf5b3..b0e0a9b 100644
--- a/lustre/ldlm/interval_tree.c
+++ b/lustre/ldlm/interval_tree.c
@@ -29,7 +29,6 @@
 # include <lustre_dlm.h>
 #else
 # include <liblustre.h>
-# include <libcfs/kp30.h>
 #endif
 #include <obd_support.h>
 #include <interval_tree.h>
diff --git a/lustre/ldlm/ldlm_extent.c b/lustre/ldlm/ldlm_extent.c
index 8e84b5c..39ee48a 100644
--- a/lustre/ldlm/ldlm_extent.c
+++ b/lustre/ldlm/ldlm_extent.c
@@ -29,7 +29,6 @@
 # include <liblustre.h>
 #else
 # include <libcfs/libcfs.h>
-# include <libcfs/kp30.h>
 #endif
 
 #include <lustre_dlm.h>
diff --git a/lustre/ldlm/ldlm_lock.c b/lustre/ldlm/ldlm_lock.c
index 4b690a9..bb29ae3 100644
--- a/lustre/ldlm/ldlm_lock.c
+++ b/lustre/ldlm/ldlm_lock.c
@@ -33,7 +33,6 @@
 # endif
 #else
 # include <liblustre.h>
-# include <libcfs/kp30.h>
 #endif
 
 #include <obd_class.h>
diff --git a/lustre/ldlm/ldlm_pool.c b/lustre/ldlm/ldlm_pool.c
index bd89cfa..3d5c712 100644
--- a/lustre/ldlm/ldlm_pool.c
+++ b/lustre/ldlm/ldlm_pool.c
@@ -90,7 +90,6 @@
 # include <lustre_dlm.h>
 #else
 # include <liblustre.h>
-# include <libcfs/kp30.h>
 #endif
 
 #include <obd_class.h>
diff --git a/lustre/lvfs/fsfilt.c b/lustre/lvfs/fsfilt.c
index f063fd4..635164a 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 <libcfs/kp30.h>
+#include <libcfs/libcfs.h>
 #include <lustre_fsfilt.h>
 
 CFS_LIST_HEAD(fsfilt_types);
diff --git a/lustre/lvfs/fsfilt_ext3.c b/lustre/lvfs/fsfilt_ext3.c
index e65ce42..78ea867 100644
--- a/lustre/lvfs/fsfilt_ext3.c
+++ b/lustre/lvfs/fsfilt_ext3.c
@@ -41,7 +41,7 @@
 #include <linux/quotaio_v2.h>
 #include <ext3/xattr.h>
 
-#include <libcfs/kp30.h>
+#include <libcfs/libcfs.h>
 #include <lustre_fsfilt.h>
 #include <obd.h>
 #include <lustre_quota.h>
diff --git a/lustre/lvfs/fsfilt_reiserfs.c b/lustre/lvfs/fsfilt_reiserfs.c
index 83c3022..098f8312 100644
--- a/lustre/lvfs/fsfilt_reiserfs.c
+++ b/lustre/lvfs/fsfilt_reiserfs.c
@@ -39,7 +39,7 @@
 #include <linux/version.h>
 #include <linux/init.h>
 #include <asm/statfs.h>
-#include <libcfs/kp30.h>
+#include <libcfs/libcfs.h>
 #include <lustre_fsfilt.h>
 #include <obd.h>
 #include <linux/module.h>
diff --git a/lustre/lvfs/lvfs_linux.c b/lustre/lvfs/lvfs_linux.c
index ccc6a0c..827e747 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 <libcfs/kp30.h>
+#include <libcfs/libcfs.h>
 #include <lustre_fsfilt.h>
 #include <obd.h>
 #include <linux/module.h>
diff --git a/lustre/mdt/mdt_identity.c b/lustre/mdt/mdt_identity.c
index 8312040..c5e13a8 100644
--- a/lustre/mdt/mdt_identity.c
+++ b/lustre/mdt/mdt_identity.c
@@ -45,7 +45,7 @@
 #include <asm/uaccess.h>
 #include <linux/slab.h>
 
-#include <libcfs/kp30.h>
+#include <libcfs/libcfs.h>
 #include <obd.h>
 #include <obd_class.h>
 #include <obd_support.h>
diff --git a/lustre/mdt/mdt_idmap.c b/lustre/mdt/mdt_idmap.c
index 468c779..8c0f434 100644
--- a/lustre/mdt/mdt_idmap.c
+++ b/lustre/mdt/mdt_idmap.c
@@ -46,7 +46,7 @@
 #include <asm/uaccess.h>
 #include <linux/slab.h>
 
-#include <libcfs/kp30.h>
+#include <libcfs/libcfs.h>
 #include <obd.h>
 #include <obd_class.h>
 #include <obd_support.h>
diff --git a/lustre/mgc/mgc_internal.h b/lustre/mgc/mgc_internal.h
index 1edf122..e2d0c7c 100644
--- a/lustre/mgc/mgc_internal.h
+++ b/lustre/mgc/mgc_internal.h
@@ -5,7 +5,7 @@
 #ifndef _MGC_INTERNAL_H
 #define _MGC_INTERNAL_H
 
-#include <libcfs/kp30.h>
+#include <libcfs/libcfs.h>
 #include <lustre/lustre_idl.h>
 #include <lustre_lib.h>
 #include <lustre_dlm.h>
diff --git a/lustre/mgs/mgs_internal.h b/lustre/mgs/mgs_internal.h
index f2a511b..e0833f9 100644
--- a/lustre/mgs/mgs_internal.h
+++ b/lustre/mgs/mgs_internal.h
@@ -8,7 +8,7 @@
 #ifdef __KERNEL__
 # include <linux/fs.h>
 #endif
-#include <libcfs/kp30.h>
+#include <libcfs/libcfs.h>
 #include <lustre/lustre_idl.h>
 #include <lustre_lib.h>
 #include <lustre_dlm.h>
diff --git a/lustre/obdclass/uuid.c b/lustre/obdclass/uuid.c
index 5783e09..13c9dc3 100644
--- a/lustre/obdclass/uuid.c
+++ b/lustre/obdclass/uuid.c
@@ -9,7 +9,7 @@
 #ifndef __KERNEL__
 # include <liblustre.h>
 #else
-# include <libcfs/kp30.h>
+# include <libcfs/libcfs.h>
 #endif
 
 #include <obd_support.h>
diff --git a/lustre/osc/osc_request.c b/lustre/osc/osc_request.c
index 43f8c7e..72661a4 100644
--- a/lustre/osc/osc_request.c
+++ b/lustre/osc/osc_request.c
@@ -34,14 +34,13 @@
 #endif
 #define DEBUG_SUBSYSTEM S_OSC
 
-#ifdef __KERNEL__
-# include <libcfs/libcfs.h>
-#else /* __KERNEL__ */
+#include <libcfs/libcfs.h>
+
+#ifndef __KERNEL__
 # include <liblustre.h>
 #endif
 
 #include <lustre_dlm.h>
-#include <libcfs/kp30.h>
 #include <lustre_net.h>
 #include <lustre/lustre_user.h>
 #include <obd_cksum.h>
diff --git a/lustre/ptlrpc/ptlrpcd.c b/lustre/ptlrpc/ptlrpcd.c
index b2c06be..f8199e3 100644
--- a/lustre/ptlrpc/ptlrpcd.c
+++ b/lustre/ptlrpc/ptlrpcd.c
@@ -33,7 +33,6 @@
 # include <ctype.h>
 #endif
 
-#include <libcfs/kp30.h>
 #include <lustre_net.h>
 # include <lustre_lib.h>
 
diff --git a/lustre/ptlrpc/recov_thread.c b/lustre/ptlrpc/recov_thread.c
index 90af251..1f21db5 100644
--- a/lustre/ptlrpc/recov_thread.c
+++ b/lustre/ptlrpc/recov_thread.c
@@ -42,7 +42,6 @@
 # include <liblustre.h>
 #endif
 
-#include <libcfs/kp30.h>
 #include <obd_class.h>
 #include <lustre_commit_confd.h>
 #include <obd_support.h>
diff --git a/lustre/ptlrpc/service.c b/lustre/ptlrpc/service.c
index 46cb740..95fcefcb 100644
--- a/lustre/ptlrpc/service.c
+++ b/lustre/ptlrpc/service.c
@@ -26,7 +26,6 @@
 #define DEBUG_SUBSYSTEM S_RPC
 #ifndef __KERNEL__
 #include <liblustre.h>
-#include <libcfs/kp30.h>
 #endif
 #include <obd_support.h>
 #include <obd_class.h>
diff --git a/lustre/tests/it_test.c b/lustre/tests/it_test.c
index 2019ce0..3ba9f31 100644
--- a/lustre/tests/it_test.c
+++ b/lustre/tests/it_test.c
@@ -7,7 +7,7 @@
 #include <time.h>
 #include <sys/time.h>
 
-#include <libcfs/kp30.h>
+#include <libcfs/libcfs.h>
 #include <../ldlm/interval_tree.c>
 
 #define dprintf(fmt, args...) //printf(fmt, ##args)
diff --git a/lustre/utils/l_getidentity.c b/lustre/utils/l_getidentity.c
index 65e9f0b..7ab7937b 100644
--- a/lustre/utils/l_getidentity.c
+++ b/lustre/utils/l_getidentity.c
@@ -37,7 +37,6 @@
 #include <liblustre.h>
 #include <lustre/lustre_user.h>
 #include <lustre/lustre_idl.h>
-#include <libcfs/kp30.h>
 
 #define PERM_PATHNAME "/etc/lustre/perm.conf"
 
diff --git a/lustre/utils/mkfs_lustre.c b/lustre/utils/mkfs_lustre.c
index 8f85235..3bfe70d 100644
--- a/lustre/utils/mkfs_lustre.c
+++ b/lustre/utils/mkfs_lustre.c
@@ -40,9 +40,9 @@
 #include <limits.h>
 
 #ifdef __linux__
-/* kp30.h is not really needed here, but on SLES10/PPC, fs.h includes idr.h which
+/* libcfs.h is not really needed here, but on SLES10/PPC, fs.h includes idr.h which
  * requires BITS_PER_LONG to be defined */
-#include <libcfs/kp30.h>
+#include <libcfs/libcfs.h>
 #include <linux/fs.h> /* for BLKGETSIZE64 */
 #include <linux/version.h>
 #endif
-- 
1.8.3.1