4 files changed, 6 insertions, 5 deletions
diff --git a/include/dirent.h b/include/dirent.h
index 653bf39..9709513 100644
--- a/include/dirent.h
+++ b/include/dirent.h
@@ -78,7 +78,7 @@ typedef struct _dirdesc {
 
 #endif /* _POSIX_SOURCE */
 
-#ifndef KERNEL
+#ifndef _KERNEL
 
 #include <sys/cdefs.h>
 
@@ -100,6 +100,6 @@ int readdir_r __P((DIR *, struct dirent *, struct dirent **));
 #endif /* not POSIX */
 __END_DECLS
 
-#endif /* !KERNEL */
+#endif /* !_KERNEL */
 
 #endif /* !_DIRENT_H_ */
diff --git a/include/rpc/des_crypt.h b/include/rpc/des_crypt.h
index df0e442..c223cd1 100644
--- a/include/rpc/des_crypt.h
+++ b/include/rpc/des_crypt.h
@@ -1,5 +1,6 @@
 /*
  * @(#)des_crypt.h	2.1 88/08/11 4.0 RPCSRC;	from 1.4 88/02/08 (C) 1986 SMI
+ * $FreeBSD$
  *
  * des_crypt.h, des library routine interface
  * Copyright (C) 1986, Sun Microsystems, Inc.
@@ -101,7 +102,7 @@ ecb_crypt(/* key, buf, len, mode */); /*
 #endif
 __END_DECLS
 
-#ifndef KERNEL
+#ifndef _KERNEL
 /* 
  * Set des parity for a key.
  * DES parity is odd and in the low bit of each byte
diff --git a/include/rpc/svc.h b/include/rpc/svc.h
index b544651..9ef76cf 100644
--- a/include/rpc/svc.h
+++ b/include/rpc/svc.h
@@ -264,7 +264,7 @@ extern int svc_maxfd;
 extern fd_set svc_fdset;
 #define svc_fds svc_fdset.fds_bits[0]	/* compatibility */
 
-#ifndef KERNEL
+#ifndef _KERNEL
 /*
  * a small program implemented by the svc_rpc implementation itself;
  * also see clnt.h for protocol numbers.
diff --git a/include/rpc/xdr.h b/include/rpc/xdr.h
index a82a374..2ce9205 100644
--- a/include/rpc/xdr.h
+++ b/include/rpc/xdr.h
@@ -129,7 +129,7 @@ typedef struct __rpc_xdr {
  * to be decoded.  If this pointer is 0, then the type routines should
  * allocate dynamic storage of the appropriate size and return it.
  */
-#ifdef KERNEL
+#ifdef _KERNEL
 typedef	bool_t (*xdrproc_t) __P((XDR *, void *, u_int));
 #else
 /*