Windows global stuff:

 o removed INTERFACE from non-api functions
 o add FAR to pointers visible to the world
 o made the tests for __STDC__ also check for _WINDOWS
 o creates GSSAPI.DLL & GSSAPI.LIB as per spec.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@5354 dc483132-0cff-0310-8789-dd5450dbe970

24 files changed, 374 insertions, 355 deletions

diff --git a/src/include/ChangeLog b/src/include/ChangeLog
index 2de0f8fb0e..70c42d3b6d 100644
--- a/src/include/ChangeLog
+++ b/src/include/ChangeLog
@@ -1,3 +1,9 @@
+Thu Apr 13 16:05:08 1995 Keith Vetter (keithv@fusion.com)
+
+	* bsdlib.h, bstring.h, fake-std.h, syslog.h:  __STDC__ conditionals
+           also check for the _WINDOWS define.
+        * krb5.h: added FAR to pointers visible to the world.
+
 Tue Mar 28 18:12:32 1995  John Gilmore  (gnu at toad.com)
 
 	* Makefile.in (KRB5_HEADERS, install):  `Make install' now works.
diff --git a/src/include/bsdlib.h b/src/include/bsdlib.h
index 60e203e579..8ee3d40cf6 100644
--- a/src/include/bsdlib.h
+++ b/src/include/bsdlib.h
@@ -4,7 +4,7 @@
  */
 #ifndef __BSDLIB__
 #define __BSDLIB__
-#ifdef __STDC__
+#if defined(__STDC__) || defined(_WINDOWS)
 /* compat-4.3 */
 extern char *ecvt  (double , int , int *, int *);
 extern char *fcvt  (double , int , int *, int *);
diff --git a/src/include/bstring.h b/src/include/bstring.h
index 33d0ba6060..c7d0d61372 100644
--- a/src/include/bstring.h
+++ b/src/include/bstring.h
@@ -4,7 +4,7 @@
  */
 #ifndef __BSTRING__
 #define __BSTRING__
-#ifdef __STDC__
+#if defined(__STDC__) || defined(_WINDOWS)
 /* compat-sys5 */
 /* these are in <string.h> */
 extern int bcmp  (const char *, const char *, int );
diff --git a/src/include/fake-stdlib.h b/src/include/fake-stdlib.h
index 77dfe4019c..5f021a2280 100644
--- a/src/include/fake-stdlib.h
+++ b/src/include/fake-stdlib.h
@@ -1,5 +1,4 @@
-#ifdef __STDC__
-# define	P(s) s
+#if defined(__STDC__) || defined(_WINDOWS)
 #else
 # define P(s) ()
 #endif
@@ -201,7 +200,7 @@ char *initstate P((unsigned , char *, int ));
 int isatty P((int ));
 double ldexp P((double , int ));
 int longjmperror P((void ));
-#ifdef __STDC__
+#if defined(__STDC__) || defined(_WINDOWS)
 void *malloc P((size_t ));
 #else
 char *malloc P((unsigned ));
@@ -466,7 +465,7 @@ struct ttyent *getttyent P((void ));
 struct ttyent *getttynam P((const char * ));
 unsigned long inet_network P((const char * ));
 int initgroups P((char * , int  ));
-#ifdef __STDC__
+#if defined(__STDC__) || defined(_WINDOWS)
 void *malloc P((unsigned ));
 #else
 char *malloc P((unsigned ));
diff --git a/src/include/krb5.h b/src/include/krb5.h
index f322bac9c8..239ff4ebc7 100644
--- a/src/include/krb5.h
+++ b/src/include/krb5.h
@@ -34,10 +34,10 @@
 
 typedef struct _krb5_context {
 	krb5_magic	magic;
-	krb5_enctype  * etypes;
+	krb5_enctype  FAR *etypes;
 	int		etype_count;
-	void	      * os_context;
-} * krb5_context;
+	void	      FAR *os_context;
+} FAR * krb5_context;
 
 struct _krb5_auth_context;
 typedef struct _krb5_auth_context krb5_auth_context;
@@ -64,7 +64,7 @@ typedef struct _krb5_authdata {
     krb5_magic magic;
     krb5_authdatatype ad_type;
     int length;
-    krb5_octet *contents;
+    krb5_octet FAR *contents;
 } krb5_authdata;
 
 /* structure for transited encoding */
@@ -78,12 +78,12 @@ typedef struct _krb5_enc_tkt_part {
     krb5_magic magic;
     /* to-be-encrypted portion */
     krb5_flags flags;			/* flags */
-    krb5_keyblock *session;		/* session key: includes keytype */
+    krb5_keyblock FAR *session;		/* session key: includes keytype */
     krb5_principal client;		/* client name/realm */
     krb5_transited transited;		/* list of transited realms */
     krb5_ticket_times times;		/* auth, start, end, renew_till */
-    krb5_address **caddrs;		/* array of ptrs to addresses */
-    krb5_authdata **authorization_data;	/* auth data */
+    krb5_address FAR * FAR *caddrs;	/* array of ptrs to addresses */
+    krb5_authdata FAR * FAR *authorization_data; /* auth data */
 } krb5_enc_tkt_part;
 
 typedef struct _krb5_ticket {
@@ -92,7 +92,7 @@ typedef struct _krb5_ticket {
     krb5_principal server;		/* server name/realm */
     krb5_enc_data enc_part;		/* encryption type, kvno, encrypted
 					   encoding */
-    krb5_enc_tkt_part *enc_part2;	/* ptr to decrypted version, if
+    krb5_enc_tkt_part FAR *enc_part2;	/* ptr to decrypted version, if
 					   available */
 } krb5_ticket;
 
@@ -100,18 +100,18 @@ typedef struct _krb5_ticket {
 typedef struct _krb5_authenticator {
     krb5_magic magic;
     krb5_principal client;		/* client name/realm */
-    krb5_checksum *checksum;		/* checksum, includes type, optional */
+    krb5_checksum FAR *checksum;	/* checksum, includes type, optional */
     krb5_int32 cusec;			/* client usec portion */
     krb5_timestamp ctime;		/* client sec portion */
-    krb5_keyblock *subkey;		/* true session key, optional */
+    krb5_keyblock FAR *subkey;		/* true session key, optional */
     krb5_int32 seq_number;		/* sequence #, optional */
-    krb5_authdata **authorization_data; /* New add by Ari, auth data */
+    krb5_authdata FAR * FAR *authorization_data; /* New add by Ari, auth data */
 } krb5_authenticator;
 
 typedef struct _krb5_tkt_authent {
     krb5_magic magic;
-    krb5_ticket *ticket;
-    krb5_authenticator *authenticator;
+    krb5_ticket FAR *ticket;
+    krb5_authenticator FAR *authenticator;
     krb5_flags ap_options;
 } krb5_tkt_authent;
 
@@ -125,12 +125,12 @@ typedef struct _krb5_creds {
     krb5_boolean is_skey;		/* true if ticket is encrypted in
 					   another ticket's skey */
     krb5_flags ticket_flags;		/* flags in ticket */
-    krb5_address **addresses;		/* addrs in ticket */
+    krb5_address FAR * FAR *addresses;	/* addrs in ticket */
     krb5_data ticket;			/* ticket string itself */
     krb5_data second_ticket;		/* second ticket, if related to
 					   ticket (via DUPLICATE-SKEY or
 					   ENC-TKT-IN-SKEY) */
-    krb5_authdata **authdata;		/* authorization data */
+    krb5_authdata FAR * FAR *authdata;	/* authorization data */
 } krb5_creds;
 
 /* Last request fields */
@@ -145,13 +145,13 @@ typedef struct _krb5_pa_data {
     krb5_magic magic;
     krb5_ui_2  pa_type;
     int length;
-    krb5_octet *contents;
+    krb5_octet FAR *contents;
 } krb5_pa_data;
 
 typedef struct _krb5_kdc_req {
     krb5_magic magic;
     krb5_msgtype msg_type;		/* AS_REQ or TGS_REQ? */
-    krb5_pa_data **padata;		/* e.g. encoded AP_REQ */
+    krb5_pa_data FAR * FAR *padata;	/* e.g. encoded AP_REQ */
     /* real body */
     krb5_flags kdc_options;		/* requested options */
     krb5_principal client;		/* includes realm; optional */
@@ -162,26 +162,26 @@ typedef struct _krb5_kdc_req {
     krb5_timestamp rtime;		/* (optional) requested renew_till */
     krb5_int32 nonce;			/* nonce to match request/response */
     int netypes;			/* # of etypes, must be positive */
-    krb5_enctype *etype;		/* requested encryption type(s) */
-    krb5_address **addresses;		/* requested addresses, optional */
+    krb5_enctype FAR *etype;		/* requested encryption type(s) */
+    krb5_address FAR * FAR *addresses;	/* requested addresses, optional */
     krb5_enc_data authorization_data;	/* encrypted auth data; OPTIONAL */
-    krb5_authdata **unenc_authdata;	/* unencrypted auth data,
+    krb5_authdata FAR * FAR *unenc_authdata; /* unencrypted auth data,
 					   if available */
-    krb5_ticket **second_ticket;	/* second ticket array; OPTIONAL */
+    krb5_ticket FAR * FAR *second_ticket;/* second ticket array; OPTIONAL */
 } krb5_kdc_req;
 
 typedef struct _krb5_enc_kdc_rep_part {
     krb5_magic magic;
     /* encrypted part: */
     krb5_msgtype msg_type;		/* krb5 message type */
-    krb5_keyblock *session;		/* session key */
-    krb5_last_req_entry **last_req;	/* array of ptrs to entries */
+    krb5_keyblock FAR *session;		/* session key */
+    krb5_last_req_entry FAR * FAR *last_req; /* array of ptrs to entries */
     krb5_int32 nonce;			/* nonce from request */
     krb5_timestamp key_exp;		/* expiration date */
     krb5_flags flags;			/* ticket flags */
     krb5_ticket_times times;		/* lifetime info */
     krb5_principal server;		/* server's principal identifier */
-    krb5_address **caddrs;		/* array of ptrs to addresses,
+    krb5_address FAR * FAR *caddrs;	/* array of ptrs to addresses,
 					   optional */
 } krb5_enc_kdc_rep_part;
 
@@ -189,12 +189,12 @@ typedef struct _krb5_kdc_rep {
     krb5_magic magic;
     /* cleartext part: */
     krb5_msgtype msg_type;		/* AS_REP or KDC_REP? */
-    krb5_pa_data **padata;		/* preauthentication data from KDC */
+    krb5_pa_data FAR * FAR *padata;	/* preauthentication data from KDC */
     krb5_principal client;		/* client's principal identifier */
-    krb5_ticket *ticket;		/* ticket */
+    krb5_ticket FAR *ticket;		/* ticket */
     krb5_enc_data enc_part;		/* encryption type, kvno, encrypted
 					   encoding */
-    krb5_enc_kdc_rep_part *enc_part2;	/* unencrypted version, if available */
+    krb5_enc_kdc_rep_part FAR *enc_part2;/* unencrypted version, if available */
 } krb5_kdc_rep;
 
 /* error message structure */
@@ -216,7 +216,7 @@ typedef struct _krb5_error {
 typedef struct _krb5_ap_req {
     krb5_magic magic;
     krb5_flags ap_options;		/* requested options */
-    krb5_ticket *ticket;		/* ticket */
+    krb5_ticket FAR *ticket;		/* ticket */
     krb5_enc_data authenticator;	/* authenticator (already encrypted) */
 } krb5_ap_req;
 
@@ -229,7 +229,7 @@ typedef struct _krb5_ap_rep_enc_part {
     krb5_magic magic;
     krb5_timestamp ctime;		/* client time, seconds portion */
     krb5_int32 cusec;			/* client time, microseconds portion */
-    krb5_keyblock *subkey;		/* true session key, optional */
+    krb5_keyblock FAR *subkey;		/* true session key, optional */
     krb5_int32 seq_number;		/* sequence #, optional */
 } krb5_ap_rep_enc_part;
 
@@ -246,9 +246,9 @@ typedef struct _krb5_safe {
     krb5_int32 usec;			/* microsecond portion of time,
 					   optional */
     krb5_int32 seq_number;		/* sequence #, optional */
-    krb5_address *s_address;		/* sender address */
-    krb5_address *r_address;		/* recipient address, optional */
-    krb5_checksum *checksum;		/* data integrity checksum */
+    krb5_address FAR *s_address;	/* sender address */
+    krb5_address FAR *r_address;	/* recipient address, optional */
+    krb5_checksum FAR *checksum;	/* data integrity checksum */
 } krb5_safe;
 
 typedef struct _krb5_priv {
@@ -262,20 +262,20 @@ typedef struct _krb5_priv_enc_part {
     krb5_timestamp timestamp;		/* client time, optional */
     krb5_int32 usec;			/* microsecond portion of time, opt. */
     krb5_int32 seq_number;		/* sequence #, optional */
-    krb5_address *s_address;		/* sender address */
-    krb5_address *r_address;		/* recipient address, optional */
+    krb5_address FAR *s_address;	/* sender address */
+    krb5_address FAR *r_address;	/* recipient address, optional */
 } krb5_priv_enc_part;
 
 typedef struct _krb5_cred_info {
     krb5_magic magic;
-    krb5_keyblock* session;             /* session key used to encrypt */
+    krb5_keyblock FAR *session;         /* session key used to encrypt */
 					/* ticket */
     krb5_principal client;              /* client name/realm, optional */
     krb5_principal server;              /* server name/realm, optional */
     krb5_flags flags;			/* ticket flags, optional */
     krb5_ticket_times times;		/* auth, start, end, renew_till, */
                                         /* optional */
-    krb5_address **caddrs;		/* array of ptrs to addresses */
+    krb5_address FAR * FAR *caddrs;	/* array of ptrs to addresses */
 } krb5_cred_info;
 
 typedef struct _krb5_cred_enc_part {
@@ -283,29 +283,29 @@ typedef struct _krb5_cred_enc_part {
     krb5_int32 nonce;                   /* nonce, optional */
     krb5_timestamp timestamp;           /* client time */
     krb5_int32 usec;                    /* microsecond portion of time */
-    krb5_address *s_address;            /* sender address, optional */
-    krb5_address *r_address;            /* recipient address, optional */
-    krb5_cred_info **ticket_info;
+    krb5_address FAR *s_address;        /* sender address, optional */
+    krb5_address FAR *r_address;        /* recipient address, optional */
+    krb5_cred_info FAR * FAR *ticket_info;
 } krb5_cred_enc_part;    
 
 typedef struct _krb5_cred {
     krb5_magic magic;
-    krb5_ticket **tickets;		/* tickets */
+    krb5_ticket FAR * FAR *tickets;	/* tickets */
     krb5_enc_data enc_part;		/* encrypted part */
-    krb5_cred_enc_part *enc_part2; 	/* unencrypted version, if available*/
+    krb5_cred_enc_part FAR *enc_part2; 	/* unencrypted version, if available*/
 } krb5_cred;
 
 /* Sandia password generation structures */
 typedef struct _passwd_phrase_element {
     krb5_magic magic;
-    krb5_data *passwd;
-    krb5_data *phrase;
+    krb5_data FAR *passwd;
+    krb5_data FAR *phrase;
 } passwd_phrase_element;
 
 typedef struct _krb5_pwd_data {
     krb5_magic magic;
     int sequence_count;
-    passwd_phrase_element **element;
+    passwd_phrase_element FAR * FAR *element;
 } krb5_pwd_data;
 
 /* these need to be here so the typedefs are available for the prototypes */
diff --git a/src/include/krb5/ChangeLog b/src/include/krb5/ChangeLog
index bdafb01f66..023c2b6630 100644
--- a/src/include/krb5/ChangeLog
+++ b/src/include/krb5/ChangeLog
@@ -1,3 +1,14 @@
+Thu Apr 13 15:49:16 1995 Keith Vetter (keithv@fusion.com)
+
+        * asn1.h, ccache.h, encryption.h, func-pro.h, hostaddr.h, keytab.h,
+          los-prot.h, preauth.h, rcache.h: 
+            removed unneeded INTERFACE from non-api functions.
+        * adm_defs.h, ccache.h, encryption.h, hostaddr.h, k5-free.h, keytab.h,
+          macros.h, rcache.h:
+           Added FAR to pointers visible to the world.
+        * base-def.h, ext-prot.h, rsa-md5.h: __STDC__ condition also 
+           checks for the _WINDOWS define.
+
 Wed Apr 5 16:41:41 1995 Keith Vetter (keithv@fusion.com)
 
 	* los-proto.h, func-proto.h: moved krb5_us_timeofday and 
diff --git a/src/include/krb5/adm_defs.h b/src/include/krb5/adm_defs.h
index 6bca9c0b78..0c4ed05c36 100644
--- a/src/include/krb5/adm_defs.h
+++ b/src/include/krb5/adm_defs.h
@@ -92,11 +92,11 @@ typedef struct {
     char appl_code;
     char oper_code;
     char retn_code;
-    char *message;
+    char FAR *message;
 } kadmin_requests;
 
 #if 0
-static char *oper_type[] = {
+static char FAR *oper_type[] = {
 	"complete",					/* 0 */
 	"addition",					/* 1 */
 	"deletion",					/* 2 */
@@ -111,7 +111,7 @@ static char *oper_type[] = {
 
 
 #if 0
-static char *ksrvutil_message[] = {
+static char FAR *ksrvutil_message[] = {
 	"Service Key Changed",				/* 0 */
 	"New Key and Version Received"			/* 1 */
 };
@@ -121,7 +121,7 @@ static char *ksrvutil_message[] = {
 #define KADMSAG		0x01
 
 #if 0
-static char *kadmind_general_response[] = {
+static char FAR *kadmind_general_response[] = {
 	"Success",					/* 0 */
 	"Service Access Granted"			/* 1 */
 };
@@ -132,7 +132,7 @@ static char *kadmind_general_response[] = {
 #define KPASSBAD	0x01
 
 #if 0
-static char *kadmind_kpasswd_response[] = {
+static char FAR *kadmind_kpasswd_response[] = {
 	"Password Changed",				/* 0 */
 	"Password NOT Changed!"				/* 1 */
 };
@@ -143,7 +143,7 @@ static char *kadmind_kpasswd_response[] = {
 #define KSRVCATASTROPHE	0x02
 
 #if 0
-static char *kadmind_ksrvutil_response[] = {
+static char FAR *kadmind_ksrvutil_response[] = {
 	"Service Password Change Complete",		/* 0 */
 	"One or More Service Password Change(s) Failed!",	/* 1 */
 	"Database Update Failure - Possible Catastrophe!!"	/* 2 */
@@ -154,7 +154,7 @@ static char *kadmind_ksrvutil_response[] = {
 #define KADMBAD		0x01
 
 #if 0
-static char *kadmind_kadmin_response[] = {
+static char FAR *kadmind_kadmin_response[] = {
 	"Administrative Service Completed",		/* 0 */
 	"Principal Unknown!",				/* 1 */
 	"Principal Already Exists!",			/* 2 */
diff --git a/src/include/krb5/asn1.h b/src/include/krb5/asn1.h
index f142179f87..89efd4cda2 100644
--- a/src/include/krb5/asn1.h
+++ b/src/include/krb5/asn1.h
@@ -115,72 +115,72 @@
              Returns ENOMEM if memory runs out.
 */
 
-krb5_error_code INTERFACE encode_krb5_authenticator
+krb5_error_code encode_krb5_authenticator
 	PROTOTYPE((const krb5_authenticator *rep, krb5_data **code));
 
-krb5_error_code INTERFACE encode_krb5_ticket
+krb5_error_code encode_krb5_ticket
 	PROTOTYPE((const krb5_ticket *rep, krb5_data **code));
 
-krb5_error_code INTERFACE encode_krb5_encryption_key
+krb5_error_code encode_krb5_encryption_key
 	PROTOTYPE((const krb5_keyblock *rep, krb5_data **code));
 
-krb5_error_code INTERFACE encode_krb5_enc_tkt_part
+krb5_error_code encode_krb5_enc_tkt_part
 	PROTOTYPE((const krb5_enc_tkt_part *rep, krb5_data **code));
 
-krb5_error_code INTERFACE encode_krb5_enc_kdc_rep_part
+krb5_error_code encode_krb5_enc_kdc_rep_part
 	PROTOTYPE((const krb5_enc_kdc_rep_part *rep, krb5_data **code));
 
 /* yes, the translation is identical to that used for KDC__REP */ 
-krb5_error_code INTERFACE encode_krb5_as_rep
+krb5_error_code encode_krb5_as_rep
 	PROTOTYPE((const krb5_kdc_rep *rep, krb5_data **code));
 
 /* yes, the translation is identical to that used for KDC__REP */ 
-krb5_error_code INTERFACE encode_krb5_tgs_rep
+krb5_error_code encode_krb5_tgs_rep
 	PROTOTYPE((const krb5_kdc_rep *rep, krb5_data **code));
 
-krb5_error_code INTERFACE encode_krb5_ap_req
+krb5_error_code encode_krb5_ap_req
 	PROTOTYPE((const krb5_ap_req *rep, krb5_data **code));
 
-krb5_error_code INTERFACE encode_krb5_ap_rep
+krb5_error_code encode_krb5_ap_rep
 	PROTOTYPE((const krb5_ap_rep *rep, krb5_data **code));
 
-krb5_error_code INTERFACE encode_krb5_ap_rep_enc_part
+krb5_error_code encode_krb5_ap_rep_enc_part
 	PROTOTYPE((const krb5_ap_rep_enc_part *rep, krb5_data **code));
 
-krb5_error_code INTERFACE encode_krb5_as_req
+krb5_error_code encode_krb5_as_req
 	PROTOTYPE((const krb5_kdc_req *rep, krb5_data **code));
 
-krb5_error_code INTERFACE encode_krb5_tgs_req
+krb5_error_code encode_krb5_tgs_req
 	PROTOTYPE((const krb5_kdc_req *rep, krb5_data **code));
 
-krb5_error_code INTERFACE encode_krb5_kdc_req_body
+krb5_error_code encode_krb5_kdc_req_body
 	PROTOTYPE((const krb5_kdc_req *rep, krb5_data **code));
 
-krb5_error_code INTERFACE encode_krb5_safe
+krb5_error_code encode_krb5_safe
 	PROTOTYPE((const krb5_safe *rep, krb5_data **code));
 
-krb5_error_code INTERFACE encode_krb5_priv
+krb5_error_code encode_krb5_priv
 	PROTOTYPE((const krb5_priv *rep, krb5_data **code));
 
-krb5_error_code INTERFACE encode_krb5_enc_priv_part
+krb5_error_code encode_krb5_enc_priv_part
 	PROTOTYPE((const krb5_priv_enc_part *rep, krb5_data **code));
 
-krb5_error_code INTERFACE encode_krb5_cred
+krb5_error_code encode_krb5_cred
 	PROTOTYPE((const krb5_cred *rep, krb5_data **code));
 
-krb5_error_code INTERFACE encode_krb5_enc_cred_part
+krb5_error_code encode_krb5_enc_cred_part
 	PROTOTYPE((const krb5_cred_enc_part *rep, krb5_data **code));
 
-krb5_error_code INTERFACE encode_krb5_error
+krb5_error_code encode_krb5_error
 	PROTOTYPE((const krb5_error *rep, krb5_data **code));
 
-krb5_error_code INTERFACE encode_krb5_authdata
+krb5_error_code encode_krb5_authdata
 	PROTOTYPE((const krb5_authdata **rep, krb5_data **code));
 
-krb5_error_code INTERFACE encode_krb5_pwd_sequence
+krb5_error_code encode_krb5_pwd_sequence
 	PROTOTYPE((const passwd_phrase_element *rep, krb5_data **code));
 
-krb5_error_code INTERFACE encode_krb5_pwd_data
+krb5_error_code encode_krb5_pwd_data
 	PROTOTYPE((const krb5_pwd_data *rep, krb5_data **code));
 
 /*************************************************************************
@@ -203,70 +203,70 @@ krb5_error_code INTERFACE encode_krb5_pwd_data
              Returns asn1 and krb5 errors.
 */
 
-krb5_error_code INTERFACE decode_krb5_authenticator
+krb5_error_code decode_krb5_authenticator
 	PROTOTYPE((const krb5_data *code, krb5_authenticator **rep));
 
-krb5_error_code INTERFACE decode_krb5_ticket
+krb5_error_code decode_krb5_ticket
 	PROTOTYPE((const krb5_data *code, krb5_ticket **rep));
 
-krb5_error_code INTERFACE decode_krb5_encryption_key
+krb5_error_code decode_krb5_encryption_key
 	PROTOTYPE((const krb5_data *output, krb5_keyblock **rep));
 
-krb5_error_code INTERFACE decode_krb5_enc_tkt_part
+krb5_error_code decode_krb5_enc_tkt_part
 	PROTOTYPE((const krb5_data *output, krb5_enc_tkt_part **rep));
 
-krb5_error_code INTERFACE decode_krb5_enc_kdc_rep_part
+krb5_error_code decode_krb5_enc_kdc_rep_part
 	PROTOTYPE((const krb5_data *output, krb5_enc_kdc_rep_part **rep));
 
-krb5_error_code INTERFACE decode_krb5_as_rep
+krb5_error_code decode_krb5_as_rep
 	PROTOTYPE((const krb5_data *output, krb5_kdc_rep **rep));
 
-krb5_error_code INTERFACE decode_krb5_tgs_rep
+krb5_error_code decode_krb5_tgs_rep
 	PROTOTYPE((const krb5_data *output, krb5_kdc_rep **rep));
 
-krb5_error_code INTERFACE decode_krb5_ap_req
+krb5_error_code decode_krb5_ap_req
 	PROTOTYPE((const krb5_data *output, krb5_ap_req **rep));
 
-krb5_error_code INTERFACE decode_krb5_ap_rep
+krb5_error_code decode_krb5_ap_rep
 	PROTOTYPE((const krb5_data *output, krb5_ap_rep **rep));
 
-krb5_error_code INTERFACE decode_krb5_ap_rep_enc_part
+krb5_error_code decode_krb5_ap_rep_enc_part
 	PROTOTYPE((const krb5_data *output, krb5_ap_rep_enc_part **rep));
 
-krb5_error_code INTERFACE decode_krb5_as_req
+krb5_error_code decode_krb5_as_req
 	PROTOTYPE((const krb5_data *output, krb5_kdc_req **rep));
 
-krb5_error_code INTERFACE decode_krb5_tgs_req
+krb5_error_code decode_krb5_tgs_req
 	PROTOTYPE((const krb5_data *output, krb5_kdc_req **rep));
 
-krb5_error_code INTERFACE decode_krb5_kdc_req_body
+krb5_error_code decode_krb5_kdc_req_body
 	PROTOTYPE((const krb5_data *output, krb5_kdc_req **rep));
 
-krb5_error_code INTERFACE decode_krb5_safe
+krb5_error_code decode_krb5_safe
 	PROTOTYPE((const krb5_data *output, krb5_safe **rep));
 
-krb5_error_code INTERFACE decode_krb5_priv
+krb5_error_code decode_krb5_priv
 	PROTOTYPE((const krb5_data *output, krb5_priv **rep));
 
-krb5_error_code INTERFACE decode_krb5_enc_priv_part
+krb5_error_code decode_krb5_enc_priv_part
 	PROTOTYPE((const krb5_data *output, krb5_priv_enc_part **rep));
 
-krb5_error_code INTERFACE decode_krb5_cred
+krb5_error_code decode_krb5_cred
 	PROTOTYPE((const krb5_data *output, krb5_cred **rep));
 
-krb5_error_code INTERFACE decode_krb5_enc_cred_part
+krb5_error_code decode_krb5_enc_cred_part
 	PROTOTYPE((const krb5_data *output, krb5_cred_enc_part **rep));
 
-krb5_error_code INTERFACE decode_krb5_error
+krb5_error_code decode_krb5_error
 	PROTOTYPE((const krb5_data *output, krb5_error **rep));
 
-krb5_error_code INTERFACE decode_krb5_authdata
+krb5_error_code decode_krb5_authdata
 	PROTOTYPE((const krb5_data *output, krb5_authdata ***rep));
 
-krb5_error_code INTERFACE decode_krb5_pwd_sequence
+krb5_error_code decode_krb5_pwd_sequence
 	PROTOTYPE((const krb5_data *output, passwd_phrase_element **rep));
 
-krb5_error_code INTERFACE decode_krb5_pwd_data
+krb5_error_code decode_krb5_pwd_data
 	PROTOTYPE((const krb5_data *output, krb5_pwd_data **rep));
 
 /*************************************************************************
diff --git a/src/include/krb5/base-defs.h b/src/include/krb5/base-defs.h
index 2929c7cab5..52ce3d5c93 100644
--- a/src/include/krb5/base-defs.h
+++ b/src/include/krb5/base-defs.h
@@ -62,14 +62,14 @@ typedef struct _krb5_data {
 
 /* make const & volatile available without effect */
 
-#if !defined(__STDC__) && !defined(HAS_ANSI_CONST)
+#if !defined(__STDC__) && !defined(HAS_ANSI_CONST) && !defined(_WINDOWS)
 #define const
 #endif
-#if !defined(__STDC__) && !defined(HAS_ANSI_VOLATILE)
+#if !defined(__STDC__) && !defined(HAS_ANSI_VOLATILE) && !defined(_WINDOWS)
 #define volatile
 #endif
 
-#if defined(__STDC__) || defined(HAS_VOID_TYPE)
+#if defined(__STDC__) || defined(HAS_VOID_TYPE) || defined(_WINDOWS)
 typedef	void FAR * krb5_pointer;
 typedef void const FAR * krb5_const_pointer;
 #else
@@ -77,9 +77,9 @@ typedef char FAR * krb5_pointer;
 typedef char const FAR * krb5_const_pointer;
 #endif
 
-#if defined(__STDC__) || defined(KRB5_PROVIDE_PROTOTYPES)
+#if defined(__STDC__) || defined(KRB5_PROVIDE_PROTOTYPES) || defined(_WINDOWS)
 #define PROTOTYPE(x) x
-#if defined(__STDC__) || defined(HAVE_STDARG_H)
+#if defined(__STDC__) || defined(HAVE_STDARG_H) || defined(_WINDOWS)
 #define	STDARG_P(x) x
 #else
 #define STDARG_P(x) ()
diff --git a/src/include/krb5/ccache.h b/src/include/krb5/ccache.h
index 90d855da30..988ec731ba 100644
--- a/src/include/krb5/ccache.h
+++ b/src/include/krb5/ccache.h
@@ -32,36 +32,36 @@ typedef	krb5_pointer	krb5_cc_cursor;	/* cursor for sequential lookup */
 
 typedef struct _krb5_ccache {
     krb5_magic magic;
-    struct _krb5_cc_ops *ops;
+    struct _krb5_cc_ops FAR *ops;
     krb5_pointer data;
-} *krb5_ccache;
+} FAR *krb5_ccache;
 
 typedef struct _krb5_cc_ops {
     krb5_magic magic;
-    char *prefix;
-    char *(INTERFACE *get_name) NPROTOTYPE((krb5_context, krb5_ccache));
-    krb5_error_code (INTERFACE *resolve) NPROTOTYPE((krb5_context, krb5_ccache *, 
-					    char *));
-    krb5_error_code (INTERFACE *gen_new) NPROTOTYPE((krb5_context, krb5_ccache *));
+    char FAR *prefix;
+    char FAR * (INTERFACE *get_name) NPROTOTYPE((krb5_context, krb5_ccache));
+    krb5_error_code (INTERFACE *resolve) NPROTOTYPE((krb5_context, krb5_ccache FAR *,
+					    char FAR *));
+    krb5_error_code (INTERFACE *gen_new) NPROTOTYPE((krb5_context, krb5_ccache FAR *));
     krb5_error_code (INTERFACE *init) NPROTOTYPE((krb5_context, krb5_ccache,
 					    krb5_principal));
     krb5_error_code (INTERFACE *destroy) NPROTOTYPE((krb5_context, krb5_ccache));
     krb5_error_code (INTERFACE *close) NPROTOTYPE((krb5_context, krb5_ccache));
     krb5_error_code (INTERFACE *store) NPROTOTYPE((krb5_context, krb5_ccache,
-					    krb5_creds *));
+					    krb5_creds FAR *));
     krb5_error_code (INTERFACE *retrieve) NPROTOTYPE((krb5_context, krb5_ccache,
-					    krb5_flags, krb5_creds *,
-					    krb5_creds *));
+					    krb5_flags, krb5_creds FAR *,
+					    krb5_creds FAR *));
     krb5_error_code (INTERFACE *get_princ) NPROTOTYPE((krb5_context, krb5_ccache,
-					    krb5_principal *));
+					    krb5_principal FAR *));
     krb5_error_code (INTERFACE *get_first) NPROTOTYPE((krb5_context, krb5_ccache,
-					    krb5_cc_cursor *));
+					    krb5_cc_cursor FAR *));
     krb5_error_code (INTERFACE *get_next) NPROTOTYPE((krb5_context, krb5_ccache,
-					    krb5_cc_cursor *, krb5_creds *));
+					    krb5_cc_cursor FAR *, krb5_creds FAR *));
     krb5_error_code (INTERFACE *end_get) NPROTOTYPE((krb5_context, krb5_ccache,
-					    krb5_cc_cursor *));
+					    krb5_cc_cursor FAR *));
     krb5_error_code (INTERFACE *remove_cred) NPROTOTYPE((krb5_context, krb5_ccache,
-					    krb5_flags, krb5_creds *));
+					    krb5_flags, krb5_creds FAR *));
     krb5_error_code (INTERFACE *set_flags) NPROTOTYPE((krb5_context, krb5_ccache,
 					    krb5_flags));
 } krb5_cc_ops;
@@ -93,6 +93,6 @@ typedef struct _krb5_cc_ops {
 #define krb5_cc_set_flags(context, cache, flags) (*(cache)->ops->set_flags)(context, cache, flags)
 #define krb5_cc_get_name(context, cache) (*(cache)->ops->get_name)(context, cache)
 
-extern krb5_cc_ops *krb5_cc_dfl_ops;
+extern krb5_cc_ops FAR *krb5_cc_dfl_ops;
 
 #endif /* KRB5_CCACHE__ */
diff --git a/src/include/krb5/encryption.h b/src/include/krb5/encryption.h
index c54630e38e..0b72c20505 100644
--- a/src/include/krb5/encryption.h
+++ b/src/include/krb5/encryption.h
@@ -33,20 +33,20 @@ typedef struct _krb5_keyblock {
     krb5_keytype keytype;
     krb5_enctype etype;	/* hint of what encryption type to use */
     int length;
-    krb5_octet *contents;
+    krb5_octet FAR *contents;
 } krb5_keyblock;
 
 typedef struct _krb5_checksum {
     krb5_magic magic;
     krb5_cksumtype checksum_type;	/* checksum type */
     int length;
-    krb5_octet *contents;
+    krb5_octet FAR *contents;
 } krb5_checksum;
 
 typedef struct _krb5_encrypt_block {
     krb5_magic magic;
-    struct _krb5_cryptosystem_entry *crypto_entry;
-    krb5_keyblock *key;
+    struct _krb5_cryptosystem_entry FAR *crypto_entry;
+    krb5_keyblock FAR *key;
     krb5_pointer priv;			/* for private use, e.g. DES
 					   key schedules */
 } krb5_encrypt_block;
@@ -61,30 +61,30 @@ typedef struct _krb5_enc_data {
 /* could be used in a table to find an etype and initialize a block */
 typedef struct _krb5_cryptosystem_entry {
     krb5_magic magic;
-    krb5_error_code (INTERFACE *encrypt_func) NPROTOTYPE(( krb5_const_pointer /* in */,
+    krb5_error_code (*encrypt_func) NPROTOTYPE(( krb5_const_pointer /* in */,
 					       krb5_pointer /* out */,
 					       const size_t,
-					       krb5_encrypt_block *,
+					       krb5_encrypt_block FAR *,
 					       krb5_pointer));
-    krb5_error_code (INTERFACE *decrypt_func) NPROTOTYPE(( krb5_const_pointer /* in */,
+    krb5_error_code (*decrypt_func) NPROTOTYPE(( krb5_const_pointer /* in */,
 					       krb5_pointer /* out */,
 					       const size_t,
-					       krb5_encrypt_block *,
+					       krb5_encrypt_block FAR *,
 					       krb5_pointer));
-    krb5_error_code (INTERFACE *process_key) NPROTOTYPE(( krb5_encrypt_block *,
-					      const krb5_keyblock *));
-    krb5_error_code (INTERFACE *finish_key) NPROTOTYPE(( krb5_encrypt_block *));
-    krb5_error_code (INTERFACE *string_to_key) NPROTOTYPE(( const krb5_encrypt_block *,
+    krb5_error_code (*process_key) NPROTOTYPE(( krb5_encrypt_block FAR *,
+					      const krb5_keyblock FAR *));
+    krb5_error_code (*finish_key) NPROTOTYPE(( krb5_encrypt_block FAR *));
+    krb5_error_code (*string_to_key) NPROTOTYPE((const krb5_encrypt_block FAR *,
 						 const krb5_keytype,
-						krb5_keyblock *,
-						const krb5_data *,
- 	                                        const krb5_data *));
-    krb5_error_code  (INTERFACE *init_random_key) NPROTOTYPE(( const krb5_keyblock *,
-						   krb5_pointer *));
-    krb5_error_code  (INTERFACE *finish_random_key) NPROTOTYPE(( krb5_pointer *));
-    krb5_error_code (INTERFACE *random_key) NPROTOTYPE(( const krb5_encrypt_block *,
+						krb5_keyblock FAR *,
+						const krb5_data FAR *,
+ 	                                        const krb5_data FAR *));
+    krb5_error_code  (*init_random_key) NPROTOTYPE((const krb5_keyblock FAR *,
+						   krb5_pointer FAR *));
+    krb5_error_code  (*finish_random_key) NPROTOTYPE(( krb5_pointer FAR *));
+    krb5_error_code (*random_key) NPROTOTYPE(( const krb5_encrypt_block FAR *,
 					      krb5_pointer,
-					      krb5_keyblock **));
+					      krb5_keyblock FAR * FAR *));
     int block_length;
     int pad_minimum;			/* needed for cksum size computation */
     int keysize;
@@ -98,12 +98,12 @@ typedef struct _krb5_cryptosystem_entry {
 
 typedef struct _krb5_cs_table_entry {
     krb5_magic magic;
-    krb5_cryptosystem_entry *system;
+    krb5_cryptosystem_entry FAR *system;
     krb5_pointer random_sequence;	/* from init_random_key() */
 } krb5_cs_table_entry;
 
 /* could be used in a table to find a sumtype */
-typedef krb5_error_code  (INTERFACE *SUM_FUNC) NPROTOTYPE (
+typedef krb5_error_code  (*SUM_FUNC) NPROTOTYPE (
 			(krb5_pointer /* in */,
 			size_t /* in_length */,
 			krb5_pointer /* key/seed */,
diff --git a/src/include/krb5/ext-proto.h b/src/include/krb5/ext-proto.h
index e916fa0008..d6919dc1a9 100644
--- a/src/include/krb5/ext-proto.h
+++ b/src/include/krb5/ext-proto.h
@@ -31,7 +31,7 @@
 #ifdef HAS_STDLIB_H
 #include <stdlib.h>
 #else
-#ifdef __STDC__
+#if defined(__STDC__) || defined(_WINDOWS)
 #ifdef NO_STDLIB_H
 #include <fake-stdlib.h>
 #else
diff --git a/src/include/krb5/func-proto.h b/src/include/krb5/func-proto.h
index ce1c9280b0..f7fb11b218 100644
--- a/src/include/krb5/func-proto.h
+++ b/src/include/krb5/func-proto.h
@@ -29,13 +29,13 @@
 
 krb5_error_code INTERFACE krb5_init_context
 	PROTOTYPE((krb5_context FAR *));
-void INTERFACE krb5_free_context
+void krb5_free_context
 	PROTOTYPE((krb5_context));
 
-krb5_error_code	INTERFACE krb5_set_default_in_tkt_etypes
+krb5_error_code krb5_set_default_in_tkt_etypes
 	PROTOTYPE((krb5_context,
 		   const krb5_enctype *));
-krb5_error_code	INTERFACE krb5_get_default_in_tkt_etypes
+krb5_error_code krb5_get_default_in_tkt_etypes
 	PROTOTYPE((krb5_context,
 		   krb5_enctype **));
 
@@ -44,32 +44,32 @@ krb5_error_code	INTERFACE krb5_get_default_in_tkt_etypes
 extern krb5_context global_context;
 
 /* libkrb.spec */
-krb5_error_code INTERFACE krb5_kdc_rep_decrypt_proc
+krb5_error_code krb5_kdc_rep_decrypt_proc
 	PROTOTYPE((krb5_context,
 		   const krb5_keyblock *,
 		   krb5_const_pointer,
 		   krb5_kdc_rep * ));
-krb5_error_code INTERFACE krb5_encode_ticket
+krb5_error_code krb5_encode_ticket
 	PROTOTYPE((krb5_context,
 		   const krb5_ticket *,
 		   krb5_data ** ));
-krb5_error_code INTERFACE krb5_encrypt_tkt_part
+krb5_error_code krb5_encrypt_tkt_part
 	PROTOTYPE((krb5_context,
 		   krb5_encrypt_block *,
 		   const krb5_keyblock *,
 		   krb5_ticket * ));
-krb5_error_code INTERFACE krb5_decrypt_tkt_part
+krb5_error_code krb5_decrypt_tkt_part
 	PROTOTYPE((krb5_context,
 		   const krb5_keyblock *,
 		   krb5_ticket * ));
-krb5_error_code INTERFACE krb5_get_cred_from_kdc
+krb5_error_code krb5_get_cred_from_kdc
 	PROTOTYPE((krb5_context,
 		   krb5_ccache,		/* not const, as reading may save
 					   state */
 		   krb5_creds *,
 		   krb5_creds **,
 		   krb5_creds *** ));
-void INTERFACE krb5_free_tgt_creds
+void krb5_free_tgt_creds
 	PROTOTYPE((krb5_context,
 		   krb5_creds ** ));	/* XXX too hard to do with const */
 
@@ -82,7 +82,7 @@ krb5_error_code INTERFACE krb5_get_credentials
 		   krb5_ccache,
 		   krb5_creds FAR *,
 		   krb5_creds FAR * FAR *));
-krb5_error_code	INTERFACE krb5_get_for_creds
+krb5_error_code krb5_get_for_creds
 	PROTOTYPE((krb5_context,
 		   const krb5_cksumtype,
 		   char *,
@@ -90,7 +90,7 @@ krb5_error_code	INTERFACE krb5_get_for_creds
 		   krb5_keyblock *,
 		   int,
 		   krb5_data * ));
-krb5_error_code INTERFACE krb5_mk_req
+krb5_error_code krb5_mk_req
 	PROTOTYPE((krb5_context,
 		   krb5_auth_context **,
 		   const krb5_flags,
@@ -106,7 +106,7 @@ krb5_error_code INTERFACE krb5_mk_req_extended
 		   krb5_data FAR *,
 		   krb5_creds FAR *,
 		   krb5_data FAR * ));
-krb5_error_code INTERFACE krb5_mk_rep
+krb5_error_code krb5_mk_rep
 	PROTOTYPE((krb5_context,
 		   krb5_auth_context *,
 		   krb5_data *));
@@ -115,21 +115,21 @@ krb5_error_code INTERFACE krb5_rd_rep
 		   krb5_auth_context FAR *,
 		   const krb5_data FAR *,
 		   krb5_ap_rep_enc_part FAR * FAR *));
-krb5_error_code INTERFACE krb5_mk_error
+krb5_error_code krb5_mk_error
 	PROTOTYPE((krb5_context,
 		   const krb5_error *,
 		   krb5_data * ));
-krb5_error_code INTERFACE krb5_rd_error
+krb5_error_code krb5_rd_error
 	PROTOTYPE((krb5_context,
 		   const krb5_data *,
 		   krb5_error ** ));
-krb5_error_code INTERFACE krb5_rd_safe
+krb5_error_code krb5_rd_safe
 	PROTOTYPE((krb5_context,
 		   krb5_auth_context *,
 		   const krb5_data *,
 		   krb5_data *,
 		   krb5_replay_data *));
-krb5_error_code INTERFACE krb5_rd_priv
+krb5_error_code krb5_rd_priv
 	PROTOTYPE((krb5_context,
 		   krb5_auth_context *,
 		   const krb5_data *,
@@ -143,158 +143,158 @@ krb5_error_code INTERFACE krb5_unparse_name
 	PROTOTYPE((krb5_context,
 		   krb5_const_principal,
 		   char FAR * FAR * ));
-krb5_error_code INTERFACE krb5_unparse_name_ext
+krb5_error_code krb5_unparse_name_ext
 	PROTOTYPE((krb5_context,
 		   krb5_const_principal,
 		   char **,
 		   int *));
-krb5_boolean INTERFACE krb5_address_search
+krb5_boolean krb5_address_search
 	PROTOTYPE((krb5_context,
 		   const krb5_address *,
 		   krb5_address * const *));
-krb5_boolean INTERFACE krb5_address_compare
+krb5_boolean krb5_address_compare
 	PROTOTYPE((krb5_context,
 		   const krb5_address *,
 		   const krb5_address *));
-int INTERFACE krb5_address_order
+int krb5_address_order
 	PROTOTYPE((krb5_context,
 		   const krb5_address *,
 		   const krb5_address *));
-krb5_boolean INTERFACE krb5_realm_compare
+krb5_boolean krb5_realm_compare
 	PROTOTYPE((krb5_context,
 		   krb5_const_principal,
 		   krb5_const_principal));
-krb5_boolean INTERFACE krb5_principal_compare
+krb5_boolean krb5_principal_compare
 	PROTOTYPE((krb5_context,
 		   krb5_const_principal,
 		   krb5_const_principal));
-int INTERFACE krb5_fulladdr_order
+int krb5_fulladdr_order
 	PROTOTYPE((krb5_context,
 		   const krb5_fulladdr *,
 		   const krb5_fulladdr *));
-krb5_error_code INTERFACE krb5_copy_keyblock
+krb5_error_code krb5_copy_keyblock
     	PROTOTYPE((krb5_context,
 		   const krb5_keyblock *,
 	       krb5_keyblock **));
-krb5_error_code INTERFACE krb5_copy_keyblock_contents
+krb5_error_code krb5_copy_keyblock_contents
     	PROTOTYPE((krb5_context,
 		   const krb5_keyblock *,
 	       krb5_keyblock *));
-krb5_error_code INTERFACE krb5_copy_creds
+krb5_error_code krb5_copy_creds
     	PROTOTYPE((krb5_context,
 		   const krb5_creds *,
 	       krb5_creds **));
-krb5_error_code INTERFACE krb5_copy_data
+krb5_error_code krb5_copy_data
     	PROTOTYPE((krb5_context,
 		   const krb5_data *,
 	       krb5_data **));
-krb5_error_code INTERFACE krb5_copy_principal
+krb5_error_code krb5_copy_principal
     	PROTOTYPE((krb5_context,
 		   krb5_const_principal,
 	       krb5_principal *));
-krb5_error_code INTERFACE krb5_copy_addresses
+krb5_error_code krb5_copy_addresses
     	PROTOTYPE((krb5_context,
 		   krb5_address * const *,
 	       krb5_address ***));
-krb5_error_code INTERFACE krb5_copy_ticket
+krb5_error_code krb5_copy_ticket
     	PROTOTYPE((krb5_context,
 		   const krb5_ticket *, krb5_ticket **));
-krb5_error_code INTERFACE krb5_copy_authdata
+krb5_error_code krb5_copy_authdata
     	PROTOTYPE((krb5_context,
 		   krb5_authdata * const *,
 	       krb5_authdata ***));
-krb5_error_code INTERFACE krb5_copy_authenticator
+krb5_error_code krb5_copy_authenticator
     	PROTOTYPE((krb5_context,
 		   const krb5_authenticator *,
 	       krb5_authenticator **));
-krb5_error_code INTERFACE krb5_copy_checksum
+krb5_error_code krb5_copy_checksum
     	PROTOTYPE((krb5_context,
 		   const krb5_checksum *,
 	       krb5_checksum **));
 void INTERFACE krb5_init_ets PROTOTYPE((krb5_context));
-krb5_error_code INTERFACE krb5_generate_subkey
+krb5_error_code krb5_generate_subkey
     	PROTOTYPE((krb5_context,
 		   const krb5_keyblock *, krb5_keyblock **));
-krb5_error_code INTERFACE krb5_generate_seq_number
+krb5_error_code krb5_generate_seq_number
     	PROTOTYPE((krb5_context,
 		   const krb5_keyblock *, krb5_int32 *));
-krb5_error_code INTERFACE krb5_get_server_rcache
+krb5_error_code krb5_get_server_rcache
     	PROTOTYPE((krb5_context,
 		   const krb5_data *, krb5_rcache *));
 krb5_error_code INTERFACE_C krb5_build_principal_ext
     	STDARG_P((krb5_context, krb5_principal FAR *, int, const char FAR *, ...));
-krb5_error_code INTERFACE_C krb5_build_principal
+krb5_error_code krb5_build_principal
     	STDARG_P((krb5_context, krb5_principal *, int, const char *, ...));
 #ifdef va_start
 /* XXX depending on varargs include file defining va_start... */
-krb5_error_code INTERFACE_C krb5_build_principal_va
+krb5_error_code krb5_build_principal_va
     	PROTOTYPE((krb5_context,
 		   krb5_principal *, int, const char *, va_list));
 #endif
 
-krb5_error_code INTERFACE krb5_425_conv_principal
+krb5_error_code krb5_425_conv_principal
 	PROTOTYPE((krb5_context,
 		   const char *name, const char *instance, const char *realm,
 		   krb5_principal *princ));
 
-krb5_error_code INTERFACE krb5_obtain_padata
+krb5_error_code krb5_obtain_padata
     	PROTOTYPE((krb5_context,
 		   int type, krb5_principal client, krb5_address **src_addr,
 	           krb5_keyblock *encrypt_key, krb5_pa_data **data));
 
-krb5_error_code INTERFACE krb5_verify_padata
+krb5_error_code krb5_verify_padata
     	PROTOTYPE((krb5_context,
 		   krb5_pa_data * data, krb5_principal client,
 	       krb5_address **src_addr, krb5_keyblock *decrypt_key,
 	       int *req_id, int *flags));
 
 /* libkt.spec */
-krb5_error_code INTERFACE krb5_kt_register
+krb5_error_code krb5_kt_register
 	PROTOTYPE((krb5_context,
 		   krb5_kt_ops * ));
-krb5_error_code INTERFACE krb5_kt_resolve
+krb5_error_code krb5_kt_resolve
 	PROTOTYPE((krb5_context,
 		   const char *,
 		   krb5_keytab * ));
-krb5_error_code INTERFACE krb5_kt_default_name
+krb5_error_code krb5_kt_default_name
 	PROTOTYPE((krb5_context,
 		   char *,
 		   int ));
-krb5_error_code INTERFACE krb5_kt_default
+krb5_error_code krb5_kt_default
 	PROTOTYPE((krb5_context,
 		   krb5_keytab * ));
-krb5_error_code INTERFACE krb5_kt_free_entry
+krb5_error_code krb5_kt_free_entry
 	PROTOTYPE((krb5_context,
 		   krb5_keytab_entry * ));
 /* remove and add are functions, so that they can return NOWRITE
    if not a writable keytab */
-krb5_error_code INTERFACE krb5_kt_remove_entry
+krb5_error_code krb5_kt_remove_entry
 	PROTOTYPE((krb5_context,
 		   krb5_keytab,
 		   krb5_keytab_entry * ));
-krb5_error_code INTERFACE krb5_kt_add_entry
+krb5_error_code krb5_kt_add_entry
 	PROTOTYPE((krb5_context,
 		   krb5_keytab,
 		   krb5_keytab_entry * ));
-krb5_error_code INTERFACE krb5_principal2salt
+krb5_error_code krb5_principal2salt
 	PROTOTYPE((krb5_context,
 		   krb5_const_principal, krb5_data *));
-krb5_error_code INTERFACE krb5_principal2salt_norealm
+krb5_error_code krb5_principal2salt_norealm
 	PROTOTYPE((krb5_context,
 		   krb5_const_principal, krb5_data *));
 
 /* librc.spec--see rcache.h */
 
 /* libcc.spec */
-krb5_error_code INTERFACE krb5_cc_resolve
+krb5_error_code krb5_cc_resolve
 	PROTOTYPE((krb5_context,
 		   char *,
 		   krb5_ccache * ));
-krb5_error_code INTERFACE krb5_cc_generate_new
+krb5_error_code krb5_cc_generate_new
 	PROTOTYPE((krb5_context,
 		   krb5_cc_ops *,
 		   krb5_ccache * ));
-char * INTERFACE krb5_cc_default_name
+char * krb5_cc_default_name
 	PROTOTYPE((krb5_context));
 krb5_error_code INTERFACE krb5_cc_default
 	PROTOTYPE((krb5_context,
@@ -303,12 +303,12 @@ unsigned int INTERFACE krb5_get_notification_message
    PROTOTYPE((void));
 
 /* chk_trans.c */
-krb5_error_code INTERFACE krb5_check_transited_list
+krb5_error_code krb5_check_transited_list
     PROTOTYPE((krb5_context,
 		   krb5_data *trans, krb5_data *realm1, krb5_data *realm2));
 
 /* free_rtree.c */
-void INTERFACE krb5_free_realm_tree
+void krb5_free_realm_tree
 	PROTOTYPE((krb5_context,
 		   krb5_principal *));
 
@@ -316,64 +316,64 @@ void INTERFACE krb5_free_realm_tree
 void INTERFACE krb5_free_principal
 	PROTOTYPE((krb5_context,
 		   krb5_principal ));
-void INTERFACE krb5_free_authenticator
+void krb5_free_authenticator
 	PROTOTYPE((krb5_context,
 		   krb5_authenticator * ));
-void INTERFACE krb5_free_authenticator_contents
+void krb5_free_authenticator_contents
 	PROTOTYPE((krb5_context,
 		   krb5_authenticator * ));
 void INTERFACE krb5_free_addresses
 	PROTOTYPE((krb5_context,
 		   krb5_address FAR * FAR * ));
-void INTERFACE krb5_free_address
+void krb5_free_address
 	PROTOTYPE((krb5_context,
 		   krb5_address * ));
-void INTERFACE krb5_free_authdata
+void krb5_free_authdata
 	PROTOTYPE((krb5_context,
 		   krb5_authdata ** ));
-void INTERFACE krb5_free_enc_tkt_part
+void krb5_free_enc_tkt_part
 	PROTOTYPE((krb5_context,
 		   krb5_enc_tkt_part * ));
-void INTERFACE krb5_free_ticket
+void krb5_free_ticket
 	PROTOTYPE((krb5_context,
 		   krb5_ticket * ));
-void INTERFACE krb5_free_tickets
+void krb5_free_tickets
 	PROTOTYPE((krb5_context,
 		   krb5_ticket ** ));
-void INTERFACE krb5_free_kdc_req
+void krb5_free_kdc_req
 	PROTOTYPE((krb5_context,
 		   krb5_kdc_req * ));
-void INTERFACE krb5_free_kdc_rep
+void krb5_free_kdc_rep
 	PROTOTYPE((krb5_context,
 		   krb5_kdc_rep * ));
-void INTERFACE krb5_free_last_req
+void krb5_free_last_req
 	PROTOTYPE((krb5_context,
 		   krb5_last_req_entry ** ));
-void INTERFACE krb5_free_enc_kdc_rep_part
+void krb5_free_enc_kdc_rep_part
 	PROTOTYPE((krb5_context,
 		   krb5_enc_kdc_rep_part * ));
-void INTERFACE krb5_free_error
+void krb5_free_error
 	PROTOTYPE((krb5_context,
 		   krb5_error * ));
-void INTERFACE krb5_free_ap_req
+void krb5_free_ap_req
 	PROTOTYPE((krb5_context,
 		   krb5_ap_req * ));
-void INTERFACE krb5_free_ap_rep
+void krb5_free_ap_rep
 	PROTOTYPE((krb5_context,
 		   krb5_ap_rep * ));
-void INTERFACE krb5_free_safe
+void krb5_free_safe
 	PROTOTYPE((krb5_context,
 		   krb5_safe * ));
-void INTERFACE krb5_free_priv
+void krb5_free_priv
 	PROTOTYPE((krb5_context,
 		   krb5_priv * ));
-void INTERFACE krb5_free_priv_enc_part
+void krb5_free_priv_enc_part
 	PROTOTYPE((krb5_context,
 		   krb5_priv_enc_part * ));
-void INTERFACE krb5_free_kdc_req
+void krb5_free_kdc_req
 	PROTOTYPE((krb5_context,
 		   krb5_kdc_req * ));
-void INTERFACE krb5_free_cred
+void krb5_free_cred
    PROTOTYPE((krb5_context, 
          krb5_cred *));
 void INTERFACE krb5_free_creds
@@ -382,28 +382,28 @@ void INTERFACE krb5_free_creds
 void INTERFACE krb5_free_cred_contents
 	PROTOTYPE((krb5_context,
 		   krb5_creds FAR *));
-void INTERFACE krb5_free_cred_enc_part
+void krb5_free_cred_enc_part
    PROTOTYPE((krb5_context,
          krb5_cred_enc_part *));
-void INTERFACE krb5_free_checksum
+void krb5_free_checksum
 	PROTOTYPE((krb5_context,
 		   krb5_checksum *));
-void INTERFACE krb5_free_keyblock
+void krb5_free_keyblock
 	PROTOTYPE((krb5_context,
 		   krb5_keyblock *));
-void INTERFACE krb5_free_pa_data
+void krb5_free_pa_data
 	PROTOTYPE((krb5_context,
 		   krb5_pa_data **));
 void INTERFACE krb5_free_ap_rep_enc_part
 	PROTOTYPE((krb5_context,
 		   krb5_ap_rep_enc_part FAR *));
-void INTERFACE krb5_free_tkt_authent
+void krb5_free_tkt_authent
 	PROTOTYPE((krb5_context,
 		   krb5_tkt_authent *));
-void INTERFACE krb5_free_pwd_data
+void krb5_free_pwd_data
    PROTOTYPE((krb5_context,
          krb5_pwd_data *));
-void INTERFACE krb5_free_pwd_sequences
+void krb5_free_pwd_sequences
    PROTOTYPE((krb5_context,
          passwd_phrase_element **));
 
@@ -431,7 +431,7 @@ krb5_error_code INTERFACE krb5_sname_to_principal
 /* Only put things which don't have pointers to the narrow types in this
    section */
 
-krb5_error_code INTERFACE krb5_encode_kdc_rep
+krb5_error_code krb5_encode_kdc_rep
 	PROTOTYPE((krb5_context,
 		   const krb5_msgtype,
 		   const krb5_enc_kdc_rep_part *,
@@ -440,7 +440,7 @@ krb5_error_code INTERFACE krb5_encode_kdc_rep
 		   krb5_kdc_rep *,
 		   krb5_data ** ));
 
-krb5_error_code INTERFACE krb5_send_tgs
+krb5_error_code krb5_send_tgs
 	PROTOTYPE((krb5_context,
 		   const krb5_flags,
 		   const krb5_ticket_times *,
@@ -454,19 +454,19 @@ krb5_error_code INTERFACE krb5_send_tgs
 		   krb5_creds *,
 		   krb5_response * ));
 
-krb5_error_code INTERFACE krb5_get_in_tkt
+krb5_error_code krb5_get_in_tkt
 	PROTOTYPE((krb5_context,
 		   const krb5_flags,
 		   krb5_address * const *,
 		   krb5_enctype *,
 		   krb5_preauthtype *,
-		   krb5_error_code (INTERFACE * )(krb5_context,
+		   krb5_error_code ( * )(krb5_context,
 					const krb5_keytype,
                                         krb5_data *,
                                         krb5_const_pointer,
                                         krb5_keyblock **),
 		   krb5_const_pointer,
-		   krb5_error_code (INTERFACE * )(krb5_context,
+		   krb5_error_code ( * )(krb5_context,
 					const krb5_keyblock *,
 					krb5_const_pointer,
 					krb5_kdc_rep * ),
@@ -486,7 +486,7 @@ krb5_error_code INTERFACE krb5_get_in_tkt_with_password
 		   krb5_creds FAR *,
 		   krb5_kdc_rep FAR * FAR * ));
 
-krb5_error_code INTERFACE krb5_get_in_tkt_with_skey
+krb5_error_code krb5_get_in_tkt_with_skey
 	PROTOTYPE((krb5_context,
 		   const krb5_flags,
 		   krb5_address * const *,
@@ -497,7 +497,7 @@ krb5_error_code INTERFACE krb5_get_in_tkt_with_skey
 		   krb5_creds *,
 		   krb5_kdc_rep ** ));
 
-krb5_error_code INTERFACE krb5_get_in_tkt_with_keytab
+krb5_error_code krb5_get_in_tkt_with_keytab
 	PROTOTYPE((krb5_context,
 		   const krb5_flags,
 		   krb5_address * const *,
@@ -509,14 +509,14 @@ krb5_error_code INTERFACE krb5_get_in_tkt_with_keytab
 		   krb5_kdc_rep ** ));
 
 
-krb5_error_code INTERFACE krb5_decode_kdc_rep
+krb5_error_code krb5_decode_kdc_rep
 	PROTOTYPE((krb5_context,
 		   krb5_data *,
 		   const krb5_keyblock *,
 		   const krb5_enctype,
 		   krb5_kdc_rep ** ));
 
-krb5_error_code INTERFACE krb5_rd_req
+krb5_error_code krb5_rd_req
 	PROTOTYPE((krb5_context,
 		   krb5_auth_context **,
 		   const krb5_data *,
@@ -525,7 +525,7 @@ krb5_error_code INTERFACE krb5_rd_req
 		   krb5_flags *,
 		   krb5_ticket **));
 
-krb5_error_code INTERFACE krb5_rd_req_decoded
+krb5_error_code krb5_rd_req_decoded
 	PROTOTYPE((krb5_context,
 		   krb5_auth_context **,
 		   const krb5_ap_req *,
@@ -534,31 +534,31 @@ krb5_error_code INTERFACE krb5_rd_req_decoded
 		   krb5_flags *,
 		   krb5_ticket **));
 
-krb5_error_code INTERFACE krb5_kt_read_service_key
+krb5_error_code krb5_kt_read_service_key
 	PROTOTYPE((krb5_context,
 		   krb5_pointer,
 		   krb5_principal,
 		   krb5_kvno,
 		   krb5_keytype,
 		   krb5_keyblock **));
-krb5_error_code INTERFACE krb5_mk_safe
+krb5_error_code krb5_mk_safe
 	PROTOTYPE((krb5_context,
 		   krb5_auth_context *,
 		   const krb5_data *,
 		   krb5_data *,
 		   krb5_replay_data *));
-krb5_error_code INTERFACE krb5_mk_priv
+krb5_error_code krb5_mk_priv
 	PROTOTYPE((krb5_context,
 		   krb5_auth_context *,
 		   const krb5_data *,
 		   krb5_data *,
 		   krb5_replay_data *));
-krb5_error_code INTERFACE krb5_cc_register
+krb5_error_code krb5_cc_register
 	PROTOTYPE((krb5_context,
 		   krb5_cc_ops *,
 		   krb5_boolean ));
 
-krb5_error_code INTERFACE krb5_sendauth 
+krb5_error_code krb5_sendauth 
 	PROTOTYPE((krb5_context,
 		   krb5_auth_context **,
 		   krb5_pointer,
@@ -573,7 +573,7 @@ krb5_error_code INTERFACE krb5_sendauth
 		   krb5_ap_rep_enc_part **,
 		   krb5_creds **));
 	
-krb5_error_code INTERFACE krb5_recvauth PROTOTYPE((krb5_context,
+krb5_error_code krb5_recvauth PROTOTYPE((krb5_context,
 		   krb5_auth_context **,
 		   krb5_pointer,
 		   char *,
@@ -583,14 +583,14 @@ krb5_error_code INTERFACE krb5_recvauth PROTOTYPE((krb5_context,
 		   krb5_keytab,
 		   krb5_ticket **));
 
-krb5_error_code INTERFACE krb5_walk_realm_tree
+krb5_error_code krb5_walk_realm_tree
     	PROTOTYPE((krb5_context,
 		   const krb5_data *,
 	       const krb5_data *,
 	       krb5_principal **,
 	       int));
 
-krb5_error_code INTERFACE krb5_mk_cred
+krb5_error_code krb5_mk_cred
     	PROTOTYPE((krb5_context,
                    krb5_kdc_rep *,
                    krb5_enctype,
@@ -599,92 +599,92 @@ krb5_error_code INTERFACE krb5_mk_cred
                    krb5_address *,
                    krb5_data *));
 
-krb5_error_code INTERFACE krb5_auth_con_init
+krb5_error_code krb5_auth_con_init
 	PROTOTYPE((krb5_context,
 		   krb5_auth_context **));
 
-krb5_error_code INTERFACE krb5_auth_con_free
+krb5_error_code krb5_auth_con_free
 	PROTOTYPE((krb5_context,
 		   krb5_auth_context *));
 
-krb5_error_code INTERFACE krb5_auth_con_setflags
+krb5_error_code krb5_auth_con_setflags
 	PROTOTYPE((krb5_context,
 		   krb5_auth_context *,
 		   krb5_int32));
 
-krb5_error_code INTERFACE krb5_auth_con_getflags
+krb5_error_code krb5_auth_con_getflags
 	PROTOTYPE((krb5_context,
 		   krb5_auth_context *,
 		   krb5_int32 *));
 
-krb5_error_code INTERFACE krb5_auth_con_setaddrs
+krb5_error_code krb5_auth_con_setaddrs
 	PROTOTYPE((krb5_context,
 		   krb5_auth_context *,
 		   krb5_address *,
 		   krb5_address *));
 
-krb5_error_code INTERFACE krb5_auth_con_getaddrs
+krb5_error_code krb5_auth_con_getaddrs
 	PROTOTYPE((krb5_context,
 		   krb5_auth_context *,
 		   krb5_address **,
 		   krb5_address **));
 
-krb5_error_code INTERFACE krb5_auth_con_setuseruserkey
+krb5_error_code krb5_auth_con_setuseruserkey
 	PROTOTYPE((krb5_context,
 		   krb5_auth_context *,
 		   krb5_keyblock *));
 
-krb5_error_code INTERFACE krb5_auth_con_getlocalsubkey
+krb5_error_code krb5_auth_con_getlocalsubkey
 	PROTOTYPE((krb5_context,
 		   krb5_auth_context *,
 		   krb5_keyblock **));
 
-krb5_error_code INTERFACE krb5_auth_con_setcksumtype
+krb5_error_code krb5_auth_con_setcksumtype
 	PROTOTYPE((krb5_context,
 		   krb5_auth_context *,
 		   krb5_cksumtype));
 
-krb5_error_code INTERFACE krb5_auth_con_getcksumtype
+krb5_error_code krb5_auth_con_getcksumtype
 	PROTOTYPE((krb5_context,
 		   krb5_auth_context *,
 		   krb5_cksumtype *));
 
-krb5_error_code INTERFACE krb5_auth_con_getlocalseqnumber
+krb5_error_code krb5_auth_con_getlocalseqnumber
 	PROTOTYPE((krb5_context,
 		   krb5_auth_context *,
 		   krb5_int32 *));
 
-krb5_error_code INTERFACE krb5_auth_con_getremoteseqnumber
+krb5_error_code krb5_auth_con_getremoteseqnumber
 	PROTOTYPE((krb5_context,
 		   krb5_auth_context *,
 		   krb5_int32 *));
 
-krb5_error_code INTERFACE krb5_auth_con_setivector
+krb5_error_code krb5_auth_con_setivector
 	PROTOTYPE((krb5_context,
 		   krb5_auth_context *,
 		   krb5_pointer));
 
-krb5_error_code INTERFACE krb5_auth_con_getivector
+krb5_error_code krb5_auth_con_getivector
 	PROTOTYPE((krb5_context,
 		   krb5_auth_context *,
 		   krb5_pointer *));
 
-krb5_error_code INTERFACE krb5_auth_con_setrcache
+krb5_error_code krb5_auth_con_setrcache
 	PROTOTYPE((krb5_context,
 		   krb5_auth_context *,
 		   krb5_rcache));
 
-krb5_error_code INTERFACE krb5_auth_con_getrcache
+krb5_error_code krb5_auth_con_getrcache
 	PROTOTYPE((krb5_context,
 		   krb5_auth_context *,
 		   krb5_rcache *));
 
-krb5_error_code INTERFACE krb5_auth_con_getauthenticator
+krb5_error_code krb5_auth_con_getauthenticator
    PROTOTYPE((krb5_context,
          krb5_auth_context *,
          krb5_authenticator **));
 
-krb5_error_code INTERFACE krb5_auth_con_getremotesubkey
+krb5_error_code krb5_auth_con_getremotesubkey
    PROTOTYPE((krb5_context,
          krb5_auth_context *,
          krb5_keyblock **));
diff --git a/src/include/krb5/hostaddr.h b/src/include/krb5/hostaddr.h
index a7a8b9922f..ff420164fd 100644
--- a/src/include/krb5/hostaddr.h
+++ b/src/include/krb5/hostaddr.h
@@ -32,7 +32,7 @@ typedef struct _krb5_address {
     krb5_magic magic;
     krb5_addrtype addrtype;
     int length;
-    krb5_octet *contents;
+    krb5_octet FAR *contents;
 } krb5_address;
 
 /* per Kerberos v5 protocol spec */
@@ -50,7 +50,7 @@ typedef struct _krb5_address {
 
 /* implementation-specific stuff: */
 typedef struct _krb5_fulladdr {
-    krb5_address *address;
+    krb5_address FAR *address;
     unsigned long port;			/* port, for some address types.
 					   large enough for most protos? */
 } krb5_fulladdr;
diff --git a/src/include/krb5/k5-free.h b/src/include/krb5/k5-free.h
index 600f3cd7cc..e45abdfa93 100644
--- a/src/include/krb5/k5-free.h
+++ b/src/include/krb5/k5-free.h
@@ -29,7 +29,7 @@
 #define KRB5_FREE__
 
 /* to keep lint happy */
-#define krb5_xfree(val) free((char *)(val))
+#define krb5_xfree(val) free((char FAR *)(val))
 
 #define krb5_free_data(context, val) { krb5_xfree((val)->data); krb5_xfree(val);}
 
diff --git a/src/include/krb5/keytab.h b/src/include/krb5/keytab.h
index c9e138c141..5135f3eee3 100644
--- a/src/include/krb5/keytab.h
+++ b/src/include/krb5/keytab.h
@@ -45,56 +45,56 @@ typedef struct krb5_keytab_entry_st {
 
 typedef struct _krb5_kt {
     krb5_magic magic;
-    struct _krb5_kt_ops *ops;
+    struct _krb5_kt_ops FAR *ops;
     krb5_pointer data;
-} *krb5_keytab;
+} FAR *krb5_keytab;
 
 
 typedef struct _krb5_kt_ops {
     krb5_magic magic;
-    char *prefix;
+    char FAR *prefix;
     /* routines always present */
-    krb5_error_code (INTERFACE *resolve) 
+    krb5_error_code (*resolve) 
 	NPROTOTYPE((krb5_context,
-		    const char *,
-		    krb5_keytab *));
-    krb5_error_code (INTERFACE *get_name) 
+		    const char FAR *,
+		    krb5_keytab FAR *));
+    krb5_error_code (*get_name) 
 	NPROTOTYPE((krb5_context,
 		    krb5_keytab,
-		    char *,
+		    char FAR *,
 		    int));
-    krb5_error_code (INTERFACE *close) 
+    krb5_error_code (*close) 
 	NPROTOTYPE((krb5_context,
 		    krb5_keytab));
-    krb5_error_code (INTERFACE *get) 
+    krb5_error_code (*get) 
 	NPROTOTYPE((krb5_context,
 		    krb5_keytab,
 		    krb5_principal,
 		    krb5_kvno,
 		    krb5_keytype,
-		    krb5_keytab_entry *));
-    krb5_error_code (INTERFACE *start_seq_get) 
+		    krb5_keytab_entry FAR *));
+    krb5_error_code (*start_seq_get) 
 	NPROTOTYPE((krb5_context,
 		    krb5_keytab,
-		    krb5_kt_cursor *));	
-    krb5_error_code (INTERFACE *get_next) 
+		    krb5_kt_cursor FAR *));	
+    krb5_error_code (*get_next) 
 	NPROTOTYPE((krb5_context,
 		    krb5_keytab,
-		    krb5_keytab_entry *,
-		    krb5_kt_cursor *));
-    krb5_error_code (INTERFACE *end_get) 
+		    krb5_keytab_entry FAR *,
+		    krb5_kt_cursor FAR *));
+    krb5_error_code (*end_get) 
 	NPROTOTYPE((krb5_context,
 		    krb5_keytab,
-		    krb5_kt_cursor *));
+		    krb5_kt_cursor FAR *));
     /* routines to be included on extended version (write routines) */
-    krb5_error_code (INTERFACE *add) 
+    krb5_error_code (*add) 
 	NPROTOTYPE((krb5_context,
 		    krb5_keytab,
-		    krb5_keytab_entry *));
-    krb5_error_code (INTERFACE *remove) 
+		    krb5_keytab_entry FAR *));
+    krb5_error_code (*remove) 
 	NPROTOTYPE((krb5_context,
 		    krb5_keytab,
-		  krb5_keytab_entry *));
+		  krb5_keytab_entry FAR *));
 } krb5_kt_ops;
 
 #define krb5_kt_get_name(context, keytab, name, namelen) (*(keytab)->ops->get_name)(context, keytab,name,namelen)
diff --git a/src/include/krb5/los-proto.h b/src/include/krb5/los-proto.h
index 202f6a1400..d0f4f361aa 100644
--- a/src/include/krb5/los-proto.h
+++ b/src/include/krb5/los-proto.h
@@ -29,102 +29,102 @@
 
 #include <stdio.h>
 
-krb5_error_code INTERFACE krb5_init_os_context
+krb5_error_code krb5_init_os_context
 	PROTOTYPE((krb5_context));
-void INTERFACE krb5_free_os_context
+void krb5_free_os_context
 	PROTOTYPE((krb5_context));
 
 /* libos.spec */
-krb5_error_code INTERFACE krb5_read_password
+krb5_error_code krb5_read_password
 	PROTOTYPE((krb5_context,
 		   char *,
 		   char *,
 		   char *,
 		   int * ));
-krb5_error_code INTERFACE krb5_lock_file
+krb5_error_code krb5_lock_file
 	PROTOTYPE((krb5_context,
 		   FILE *,
 		   char *,
 		   int  ));
-krb5_error_code INTERFACE krb5_unlock_file
+krb5_error_code krb5_unlock_file
 	PROTOTYPE((krb5_context,
 		   FILE *,
 		   char * ));
-int INTERFACE krb5_net_read
+int krb5_net_read
 	PROTOTYPE((krb5_context,
 		   int ,
 		   char *,
 		   int  ));
-int INTERFACE krb5_net_write
+int krb5_net_write
 	PROTOTYPE((krb5_context,
 		   int ,
 		   const char *,
 		   int  ));
-krb5_error_code INTERFACE krb5_sendto_kdc
+krb5_error_code krb5_sendto_kdc
 	PROTOTYPE((krb5_context,
 		   const krb5_data *,
 		   const krb5_data *,
 		   krb5_data * ));
-krb5_error_code INTERFACE krb5_get_krbhst
+krb5_error_code krb5_get_krbhst
 	PROTOTYPE((krb5_context,
 		   const krb5_data *,
 		   char *** ));
-krb5_error_code INTERFACE krb5_free_krbhst
+krb5_error_code krb5_free_krbhst
 	PROTOTYPE((krb5_context,
 		   char * const * ));
-krb5_error_code INTERFACE krb5_aname_to_localname
+krb5_error_code krb5_aname_to_localname
 	PROTOTYPE((krb5_context,
 		   krb5_const_principal,
 		   const int,
 		   char * ));
-krb5_error_code INTERFACE krb5_get_host_realm
+krb5_error_code krb5_get_host_realm
 	PROTOTYPE((krb5_context,
 		   const char *,
 		   char *** ));
-krb5_error_code INTERFACE krb5_free_host_realm
+krb5_error_code krb5_free_host_realm
 	PROTOTYPE((krb5_context,
 		   char * const * ));
-krb5_error_code INTERFACE krb5_get_realm_domain
+krb5_error_code krb5_get_realm_domain
 	PROTOTYPE((krb5_context,
 		   const char *,
 		   char ** ));
-krb5_boolean INTERFACE krb5_kuserok
+krb5_boolean krb5_kuserok
 	PROTOTYPE((krb5_context,
 		   krb5_principal, const char *));
-krb5_error_code INTERFACE krb5_random_confounder
+krb5_error_code krb5_random_confounder
 	PROTOTYPE((int,
 		   krb5_pointer ));
-krb5_error_code INTERFACE krb5_gen_replay_name
+krb5_error_code krb5_gen_replay_name
     PROTOTYPE((krb5_context,
 		   const krb5_address *,
 	       const char *,
 	       char **));
-krb5_error_code INTERFACE krb5_gen_portaddr
+krb5_error_code krb5_gen_portaddr
     PROTOTYPE((krb5_context,
 		   const krb5_address *,
 	       krb5_const_pointer,
 	       krb5_address **));
-krb5_error_code INTERFACE krb5_create_secure_file
+krb5_error_code krb5_create_secure_file
 	PROTOTYPE((krb5_context,
 		   const char * pathname));
-krb5_error_code INTERFACE krb5_sync_disk_file
+krb5_error_code krb5_sync_disk_file
 	PROTOTYPE((krb5_context,
 		   FILE *fp));
 
 
-krb5_error_code INTERFACE krb5_read_message 
+krb5_error_code krb5_read_message 
 	PROTOTYPE((krb5_context,
 		   krb5_pointer, 
 		   krb5_data *));
-krb5_error_code INTERFACE krb5_write_message 
+krb5_error_code krb5_write_message 
 	PROTOTYPE((krb5_context,
 		   krb5_pointer, 
 		   krb5_data *));
 
-krb5_error_code INTERFACE krb5_os_init_context
+krb5_error_code krb5_os_init_context
         PROTOTYPE((krb5_context));
 
-void INTERFACE krb5_os_free_context
+void krb5_os_free_context
         PROTOTYPE((krb5_context));
 
 krb5_error_code krb5_find_config_files
diff --git a/src/include/krb5/macros.h b/src/include/krb5/macros.h
index 263a25c17c..e4085c1943 100644
--- a/src/include/krb5/macros.h
+++ b/src/include/krb5/macros.h
@@ -28,6 +28,6 @@
 #ifndef KRB5_MACROS__
 #define KRB5_MACROS__
 
-#define krb5_princ_aref(princ, n, plen) (char *)(*plen = princ[n]->length, princ[n]->data)
+#define krb5_princ_aref(princ, n, plen) (char FAR *)(*plen = princ[n]->length, princ[n]->data)
 
 #endif /* KRB5_MACROS__ */
diff --git a/src/include/krb5/preauth.h b/src/include/krb5/preauth.h
index 3a16ee5cca..a22e196b8f 100644
--- a/src/include/krb5/preauth.h
+++ b/src/include/krb5/preauth.h
@@ -35,11 +35,11 @@
 /*
  * Note: these typedefs are subject to change.... [tytso:19920903.1609EDT]
  */
-typedef krb5_error_code (INTERFACE krb5_preauth_obtain_proc)
+typedef krb5_error_code (krb5_preauth_obtain_proc)
     PROTOTYPE((krb5_context, krb5_principal client, krb5_address **src_addr,
 	       krb5_pa_data *pa_data));
 
-typedef krb5_error_code (INTERFACE krb5_preauth_verify_proc)
+typedef krb5_error_code (krb5_preauth_verify_proc)
     PROTOTYPE((krb5_context, krb5_principal client, krb5_address **src_addr,
 	       krb5_data *data));
 
@@ -67,19 +67,19 @@ krb5_error_code verify_random_padata
 	       krb5_data *data));
 #endif
 
-krb5_error_code INTERFACE get_unixtime_padata
+krb5_error_code get_unixtime_padata
     PROTOTYPE((krb5_context, krb5_principal client, 
 	       krb5_address **src_addr, krb5_pa_data *data));
 
-krb5_error_code INTERFACE verify_unixtime_padata
+krb5_error_code verify_unixtime_padata
     PROTOTYPE((krb5_context, krb5_principal client, krb5_address **src_addr,
 	       krb5_data *data));
 
-krb5_error_code INTERFACE get_securid_padata
+krb5_error_code get_securid_padata
     PROTOTYPE((krb5_context, krb5_principal client, krb5_address **src_addr,
 	       krb5_pa_data *data));
 
-krb5_error_code INTERFACE verify_securid_padata
+krb5_error_code verify_securid_padata
     PROTOTYPE((krb5_context, krb5_principal client, krb5_address **src_addr,
 	       krb5_data *data));
 
diff --git a/src/include/krb5/rcache.h b/src/include/krb5/rcache.h
index 249514e244..93833f7c4a 100644
--- a/src/include/krb5/rcache.h
+++ b/src/include/krb5/rcache.h
@@ -30,55 +30,55 @@
 
 typedef struct krb5_rc_st {
     krb5_magic magic;
-    struct _krb5_rc_ops *ops;
+    struct _krb5_rc_ops FAR *ops;
     krb5_pointer data;
-} *krb5_rcache;
+} FAR *krb5_rcache;
 
 typedef struct _krb5_donot_replay {
     krb5_magic magic;
-    char *server;			/* null-terminated */
-    char *client;			/* null-terminated */
+    char FAR *server;			/* null-terminated */
+    char FAR *client;			/* null-terminated */
     krb5_int32 cusec;
     krb5_timestamp ctime;
 } krb5_donot_replay;
 
 typedef struct _krb5_rc_ops {
     krb5_magic magic;
-    char *type;
-    krb5_error_code (INTERFACE *init)NPROTOTYPE((krb5_context, krb5_rcache,krb5_deltat)); /* create */
-    krb5_error_code (INTERFACE *recover)NPROTOTYPE((krb5_context, krb5_rcache)); /* open */
-    krb5_error_code (INTERFACE *destroy)NPROTOTYPE((krb5_context, krb5_rcache));
-    krb5_error_code (INTERFACE *close)NPROTOTYPE((krb5_context, krb5_rcache));
-    krb5_error_code (INTERFACE *store)NPROTOTYPE((krb5_context, krb5_rcache,krb5_donot_replay *));
-    krb5_error_code (INTERFACE *expunge)NPROTOTYPE((krb5_context, krb5_rcache));
-    krb5_error_code (INTERFACE *get_span)NPROTOTYPE((krb5_context, krb5_rcache,krb5_deltat *));
-    char *(INTERFACE *get_name)NPROTOTYPE((krb5_context, krb5_rcache));
-    krb5_error_code (INTERFACE *resolve)NPROTOTYPE((krb5_context, krb5_rcache, char *));
+    char FAR *type;
+    krb5_error_code (*init)NPROTOTYPE((krb5_context, krb5_rcache,krb5_deltat)); /* create */
+    krb5_error_code (*recover)NPROTOTYPE((krb5_context, krb5_rcache)); /* open */
+    krb5_error_code (*destroy)NPROTOTYPE((krb5_context, krb5_rcache));
+    krb5_error_code (*close)NPROTOTYPE((krb5_context, krb5_rcache));
+    krb5_error_code (*store)NPROTOTYPE((krb5_context, krb5_rcache,krb5_donot_replay FAR *));
+    krb5_error_code (*expunge)NPROTOTYPE((krb5_context, krb5_rcache));
+    krb5_error_code (*get_span)NPROTOTYPE((krb5_context, krb5_rcache,krb5_deltat FAR *));
+    char FAR *(*get_name)NPROTOTYPE((krb5_context, krb5_rcache));
+    krb5_error_code (*resolve)NPROTOTYPE((krb5_context, krb5_rcache, char FAR *));
 } krb5_rc_ops;
 
-krb5_error_code INTERFACE krb5_rc_default 
+krb5_error_code krb5_rc_default 
 	PROTOTYPE((krb5_context,
-		   krb5_rcache *));
-krb5_error_code INTERFACE krb5_rc_register_type 
+		   krb5_rcache FAR *));
+krb5_error_code krb5_rc_register_type 
 	PROTOTYPE((krb5_context,
-		   krb5_rc_ops *));
-krb5_error_code INTERFACE krb5_rc_resolve_type 
+		   krb5_rc_ops FAR *));
+krb5_error_code krb5_rc_resolve_type 
 	PROTOTYPE((krb5_context,
-		   krb5_rcache *,char *));
-krb5_error_code INTERFACE krb5_rc_resolve_full 
+		   krb5_rcache FAR *,char FAR *));
+krb5_error_code krb5_rc_resolve_full 
 	PROTOTYPE((krb5_context,
-		   krb5_rcache *,char *));
-char * INTERFACE krb5_rc_get_type 
+		   krb5_rcache FAR *,char FAR *));
+char FAR * krb5_rc_get_type 
 	PROTOTYPE((krb5_context,
 		   krb5_rcache));
-char * INTERFACE krb5_rc_default_type 
+char FAR * krb5_rc_default_type 
 	PROTOTYPE((krb5_context));
-char * INTERFACE krb5_rc_default_name 
+char FAR * krb5_rc_default_name 
 	PROTOTYPE((krb5_context));
-krb5_error_code INTERFACE krb5_auth_to_rep 
+krb5_error_code krb5_auth_to_rep 
 	PROTOTYPE((krb5_context,
-		   krb5_tkt_authent *,
-		   krb5_donot_replay *));
+		   krb5_tkt_authent FAR *,
+		   krb5_donot_replay FAR *));
 
 #define krb5_rc_initialize(context, id, span) (*(id)->ops->init)(context, id, span)
 #define krb5_rc_recover(context, id) (*(id)->ops->recover)(context, id)
diff --git a/src/include/krb5/rsa-md5.h b/src/include/krb5/rsa-md5.h
index f315df1ba5..b962830aaf 100644
--- a/src/include/krb5/rsa-md5.h
+++ b/src/include/krb5/rsa-md5.h
@@ -48,14 +48,14 @@ typedef struct {
   unsigned char digest[16];		/* actual digest after MD5Final call */
 } MD5_CTX;
 
-#if defined(__STDC__) || defined(KRB5_PROVIDE_PROTOTYPES)
-extern void INTERFACE MD5Init(MD5_CTX FAR *);
-extern void INTERFACE MD5Update (MD5_CTX FAR *, unsigned char FAR *, unsigned int);
-extern void INTERFACE MD5Final (MD5_CTX FAR *);
+#if defined(__STDC__) || defined(KRB5_PROVIDE_PROTOTYPES) || defined(_WINDOWS)
+extern void MD5Init(MD5_CTX FAR *);
+extern void MD5Update (MD5_CTX FAR *, unsigned char FAR *, unsigned int);
+extern void MD5Final (MD5_CTX FAR *);
 #else
-extern void INTERFACE MD5Init();
-extern void INTERFACE MD5Update ();
-extern void INTERFACE MD5Final ();
+extern void MD5Init();
+extern void MD5Update ();
+extern void MD5Final ();
 #endif
 
 #define	RSA_MD5_CKSUM_LENGTH		16
diff --git a/src/include/sys/ChangeLog b/src/include/sys/ChangeLog
new file mode 100644
index 0000000000..c8ddad3a62
--- /dev/null
+++ b/src/include/sys/ChangeLog
@@ -0,0 +1,3 @@
+Thu Apr 13 16:05:08 1995 Keith Vetter (keithv@fusion.com)
+
+	* syslog.h:  __STDC__ conditionals also check for the _WINDOWS define.
diff --git a/src/include/sys/syslog.h b/src/include/sys/syslog.h
index 8e3a80f215..682243e76b 100644
--- a/src/include/sys/syslog.h
+++ b/src/include/sys/syslog.h
@@ -90,7 +90,7 @@
 #define LOG_NOWAIT	0x10	/* if forking to log on console, don't wait() */
 
 #ifndef KERNEL
-#if defined(__STDC__) || defined(KRB5_PROVIDE_PROTOTYPES)
+#if defined(__STDC__) || defined(KRB5_PROVIDE_PROTOTYPES) || defined(_WINDOWS)
 extern void syslog  (int , const char *, ... );
 #ifdef va_start				
 /* XXX depending on #define of va_start in <stdarg.h> */
diff --git a/src/include/syslog.h b/src/include/syslog.h
index dcbda9782d..567fc74f3e 100644
--- a/src/include/syslog.h
+++ b/src/include/syslog.h
@@ -90,7 +90,7 @@
 #define LOG_NOWAIT	0x10	/* if forking to log on console, don't wait() */
 
 #ifndef KERNEL
-#if defined(__STDC__) || defined(KRB5_PROVIDE_PROTOTYPES)
+#if defined(__STDC__) || defined(KRB5_PROVIDE_PROTOTYPES) || defined(_WINDOWS)
 extern void syslog  (int , const char *, ... );
 #ifdef va_start				
 /* XXX depending on #define of va_start in <stdarg.h> */