Index: uts/usr/src/uts/common/rpc/rpc.h
===================================================================
--- uts.orig/usr/src/uts/common/rpc/rpc.h
+++ uts/usr/src/uts/common/rpc/rpc.h
@@ -63,7 +63,6 @@
 #include <rpc/auth_sys.h>	/* protocol for unix style cred */
 #include <rpc/auth_des.h>	/* protocol for des style cred */
 #include <sys/socket.h>		/* generic socket info */
-#include <rpc/rpcsec_gss.h>	/* GSS style security */
 
 #include <rpc/svc.h>		/* service manager and multiplexer */
 #include <rpc/svc_auth.h>	/* service side authenticator */
@@ -72,7 +71,6 @@
 #ifndef _RPCB_PROT_H_RPCGEN	/* Don't include before rpcb_prot defined */
 #include <rpc/rpcb_clnt.h>	/* rpcbind interface functions */
 #endif
-#include <rpc/svc_mt.h>		/* private server definitions */
 #endif
 
 #endif	/* !_RPC_RPC_H */
Index: uts/usr/src/uts/common/rpc/svc_auth.h
===================================================================
--- uts.orig/usr/src/uts/common/rpc/svc_auth.h
+++ uts/usr/src/uts/common/rpc/svc_auth.h
@@ -39,7 +39,6 @@
 /*
  * svc_auth.h, Service side of rpc authentication.
  */
-#include <rpc/rpcsec_gss.h>
 #include <rpc/rpc_msg.h>
 
 #ifdef __cplusplus
@@ -50,6 +49,7 @@ extern "C" {
  * Server side authenticator
  */
 #ifdef _KERNEL
+#include <rpc/rpcsec_gss.h>
 /*
  * Copy of GSS parameters, needed for MT operation
  */