diff --git a/src/post_modules/GSSAPI/configure.in b/src/post_modules/GSSAPI/configure.in
index e915121d2b07c22c4465ead208965a75c22b644f..973bc926edb04ca3925307c3dcd90346cced3ab8 100644
--- a/src/post_modules/GSSAPI/configure.in
+++ b/src/post_modules/GSSAPI/configure.in
@@ -39,17 +39,17 @@ if test x$ac_cv_header_gssapi_h = xyes -o \
     AC_MSG_CHECKING([for OID $1])
     AC_CACHE_VAL(pike_cv_have_oid_$1, [
       AC_TRY_LINK([
-#ifdef HAVE_GSSAPI_H
-#include <gssapi.h>
-#elif defined(HAVE_GSSAPI_GSSAPI_H)
+#ifdef HAVE_GSSAPI_GSSAPI_H
 #include <gssapi/gssapi.h>
+#elif defined(HAVE_GSSAPI_H)
+#include <gssapi.h>
 #elif defined(HAVE_GSSGLUE_GSSAPI_GSSAPI_H)
 #include <gssglue/gssapi/gssapi.h>
 #endif
-#ifdef HAVE_GSSAPI_KRB5_H
-#include <gssapi_krb5.h>
-#elif defined(HAVE_GSSAPI_GSSAPI_KRB5_H)
+#ifdef HAVE_GSSAPI_GSSAPI_KRB5_H
 #include <gssapi/gssapi_krb5.h>
+#elif defined(HAVE_GSSAPI_KRB5_H)
+#include <gssapi_krb5.h>
 #elif defined(HAVE_GSSGLUE_GSSAPI_GSSAPI_KRB5_H)
 #include <gssglue/gssapi/gssapi_krb5.h>
 #endif
diff --git a/src/post_modules/GSSAPI/gssapi.cmod b/src/post_modules/GSSAPI/gssapi.cmod
index 2d196ab0e84b9a6d263fb7b582c91fd838f4bf13..4f8e110b9cc670a7709911a91d256a66e330275d 100644
--- a/src/post_modules/GSSAPI/gssapi.cmod
+++ b/src/post_modules/GSSAPI/gssapi.cmod
@@ -55,10 +55,10 @@ DECLARATIONS
 
 #ifdef HAVE_GSSAPI
 
-#ifdef HAVE_GSSAPI_H
-#include <gssapi.h>
-#elif defined (HAVE_GSSAPI_GSSAPI_H)
+#ifdef HAVE_GSSAPI_GSSAPI_H
 #include <gssapi/gssapi.h>
+#elif defined (HAVE_GSSAPI_H)
+#include <gssapi.h>
 #elif defined (HAVE_GSSGLUE_GSSAPI_GSSAPI_H)
 #include <gssglue/gssapi/gssapi.h>
 #endif
@@ -70,10 +70,10 @@ DECLARATIONS
   };									\
   static const gss_OID_desc * const NAME = &PIKE_CONCAT (NAME, _desc)
 
-#ifdef HAVE_GSSAPI_KRB5_H
-#include <gssapi_krb5.h>
-#elif defined (HAVE_GSSAPI_GSSAPI_KRB5_H)
+#ifdef HAVE_GSSAPI_GSSAPI_KRB5_H
 #include <gssapi/gssapi_krb5.h>
+#elif defined (HAVE_GSSAPI_KRB5_H)
+#include <gssapi_krb5.h>
 #elif defined (HAVE_GSSGLUE_GSSAPI_GSSAPI_KRB5_H)
 #include <gssglue/gssapi/gssapi_krb5.h>
 #elif !defined(HAVE_GSS_KRB5_NT_PRINCIPAL_NAME)