--- /tmp/samba-3.0.25rc1/source/include/includes.h	2007-04-10 03:30:59.000000000 +1000
+++ samba/source/include/includes.h	2007-04-16 13:01:11.000000000 +1000
@@ -116,6 +116,17 @@
 #include "system/time.h"
 #include "system/wait.h"
 
+/* Include GSSAPI before RPC, because Solaris 2.6 headers try to decl gss */
+#if HAVE_GSSAPI_H
+#include <gssapi.h>
+#elif HAVE_GSSAPI_GSSAPI_H
+#include <gssapi/gssapi.h>
+#elif HAVE_GSSAPI_GSSAPI_GENERIC_H
+#include <gssapi/gssapi_generic.h>
+#endif
+#undef _GSSAPI_H_   /* Define to allow Sol2.6 headers to succeed */
+#define _GSSAPI_H_
+
 #if defined(HAVE_RPC_RPC_H)
 /*
  * Check for AUTH_ERROR define conflict with rpc/rpc.h in prot.h.
@@ -209,14 +220,6 @@
 #undef HAVE_LDAP
 #endif
 
-#if HAVE_GSSAPI_H
-#include <gssapi.h>
-#elif HAVE_GSSAPI_GSSAPI_H
-#include <gssapi/gssapi.h>
-#elif HAVE_GSSAPI_GSSAPI_GENERIC_H
-#include <gssapi/gssapi_generic.h>
-#endif
-
 #if HAVE_COM_ERR_H
 #include <com_err.h>
 #endif