From 2bd53b683862ce1a53a29f2b3832fd2142ad02c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alejandro=20R.=20Sede=C3=B1o?= <asedeno@mit.edu>
Date: Sun, 7 Feb 2010 19:59:28 -0500
Subject: [PATCH 11/13] Misc header related cleanup

---
 pgssapi.c    |    3 ++-
 pgssapi.h    |    4 ++--
 sshgss.h     |    6 +++++-
 sshgssc.c    |    5 ++---
 sshgssc.h    |    2 +-
 sshnogss.c   |    2 +-
 unix/uxgss.c |    2 +-
 7 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/pgssapi.c b/pgssapi.c
index 4a6e4bf..bdde486 100644
--- a/pgssapi.c
+++ b/pgssapi.c
@@ -1,6 +1,7 @@
 /* This file actually defines the GSSAPI function pointers for
  * functions we plan to import from a GSSAPI library.
  */
+#include "putty.h"
 
 #ifndef NO_GSSAPI
 
@@ -98,4 +99,4 @@ static gss_OID_desc gss_mech_krb5_desc =
 /* iso(1) member-body(2) United States(840) mit(113554) infosys(1) gssapi(2) krb5(2)*/
 const_gss_OID GSS_MECH_KRB5 = &gss_mech_krb5_desc;
 
-#endif /*NO_GSSAPI */
+#endif /* NO_GSSAPI */
diff --git a/pgssapi.h b/pgssapi.h
index cd929cb..4c6cc8a 100644
--- a/pgssapi.h
+++ b/pgssapi.h
@@ -1,9 +1,9 @@
 #ifndef PUTTY_PGSSAPI_H
 #define PUTTY_PGSSAPI_H
 
-#ifndef NO_GSSAPI
-
 #include "putty.h"
+
+#ifndef NO_GSSAPI
 /*******************************************************************************
  *  GSSAPI Definitions, taken from RFC 2744
  ******************************************************************************/
diff --git a/sshgss.h b/sshgss.h
index 454b9dd..f31a149 100644
--- a/sshgss.h
+++ b/sshgss.h
@@ -1,8 +1,10 @@
 #ifndef PUTTY_SSHGSS_H
 #define PUTTY_SSHGSS_H
-#include "puttyps.h"
+#include "putty.h"
 #include "pgssapi.h"
 
+#ifndef NO_GSSAPI
+
 #define SSH2_GSS_OIDTYPE 0x06
 typedef void *Ssh_gss_ctx;
 
@@ -147,4 +149,6 @@ DECL_SSH_GSS_FN(Ssh_gss_stat,
                 ssh_gss_display_status,
                 (Ssh_gss_ctx, Ssh_gss_buf *buf));
 
+#endif /* NO_GSSAPI */
+
 #endif /*PUTTY_SSHGSS_H*/
diff --git a/sshgssc.c b/sshgssc.c
index 6c1be5b..0a4bbbe 100644
--- a/sshgssc.c
+++ b/sshgssc.c
@@ -1,12 +1,11 @@
 #include "putty.h"
 
-#ifndef NO_GSSAPI
-
 #include <string.h>
 #include "sshgssc.h"
-#include "sshgss.h"
 #include "misc.h"
 
+#ifndef NO_GSSAPI
+
 void ssh_gssapi_bind_fns(void)
 {
     BIND_SSH_GSS_FN(indicate_mech, gssapi);
diff --git a/sshgssc.h b/sshgssc.h
index 5065a7f..b0a42ed 100644
--- a/sshgssc.h
+++ b/sshgssc.h
@@ -1,6 +1,6 @@
 #ifndef PUTTY_SSHGSSC_H
 #define PUTTY_SSHGSSC_H
-
+#include "putty.h"
 #ifndef NO_GSSAPI
 
 #include "pgssapi.h"
diff --git a/sshnogss.c b/sshnogss.c
index 6e1f530..8cec130 100644
--- a/sshnogss.c
+++ b/sshnogss.c
@@ -1,5 +1,5 @@
-#ifndef NO_GSSAPI
 #include "putty.h"
+#ifndef NO_GSSAPI
 
 /* For platorms not supporting GSSAPI */
 
diff --git a/unix/uxgss.c b/unix/uxgss.c
index 1557374..ae970ee 100644
--- a/unix/uxgss.c
+++ b/unix/uxgss.c
@@ -1,5 +1,5 @@
-#ifndef NO_GSSAPI
 #include "putty.h"
+#ifndef NO_GSSAPI
 #include "pgssapi.h"
 #include "sshgss.h"
 #include "sshgssc.h"
-- 
1.6.6