Converted krb5/free to the PC. Added windows INTERFACE keyword to the

functions and their prototypes and fixed upt the Makefile.in.

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

3 files changed, 131 insertions, 114 deletions

diff --git a/src/include/krb5/ChangeLog b/src/include/krb5/ChangeLog
index 88d1637ab..3f88c4109 100644
--- a/src/include/krb5/ChangeLog
+++ b/src/include/krb5/ChangeLog
@@ -1,3 +1,8 @@
+Tue Feb 21 0:0:32 1995 Keith Vetter (keithv@fusion.com)
+
+	* func-proto.h: added windows INTERFACE keyword to all functions.
+        * krb5.h: moved two typedefs before inclusion of func-proto.h
+
 Mon Feb 20 16:54:51 1995 Keith Vetter (keithv@fusion.com)
 
 	* encryption.h, los-proto.h, rsa-md5.h: added windows 
diff --git a/src/include/krb5/func-proto.h b/src/include/krb5/func-proto.h
index bd7bb6832..666118463 100644
--- a/src/include/krb5/func-proto.h
+++ b/src/include/krb5/func-proto.h
@@ -27,15 +27,15 @@
 #ifndef KRB5_FUNC_PROTO__
 #define KRB5_FUNC_PROTO__
 
-krb5_error_code krb5_init_context
+krb5_error_code INTERFACE krb5_init_context
 	PROTOTYPE((krb5_context *));
-void krb5_free_context
+void INTERFACE krb5_free_context
 	PROTOTYPE((krb5_context));
 
-krb5_error_code	krb5_set_default_in_tkt_etypes
+krb5_error_code	INTERFACE krb5_set_default_in_tkt_etypes
 	PROTOTYPE((krb5_context,
 		   const krb5_enctype *));
-krb5_error_code	krb5_get_default_in_tkt_etypes
+krb5_error_code	INTERFACE krb5_get_default_in_tkt_etypes
 	PROTOTYPE((krb5_context,
 		   krb5_enctype **));
 
@@ -44,43 +44,43 @@ krb5_error_code	krb5_get_default_in_tkt_etypes
 extern krb5_context global_context;
 
 /* libkrb.spec */
-krb5_error_code krb5_kdc_rep_decrypt_proc
+krb5_error_code INTERFACE krb5_kdc_rep_decrypt_proc
 	PROTOTYPE((krb5_context,
 		   const krb5_keyblock *,
 		   krb5_const_pointer,
 		   krb5_kdc_rep * ));
-krb5_error_code krb5_encode_ticket
+krb5_error_code INTERFACE krb5_encode_ticket
 	PROTOTYPE((krb5_context,
 		   const krb5_ticket *,
 		   krb5_data ** ));
-krb5_error_code krb5_encrypt_tkt_part
+krb5_error_code INTERFACE krb5_encrypt_tkt_part
 	PROTOTYPE((krb5_context,
 		   krb5_encrypt_block *,
 		   const krb5_keyblock *,
 		   krb5_ticket * ));
-krb5_error_code krb5_decrypt_tkt_part
+krb5_error_code INTERFACE krb5_decrypt_tkt_part
 	PROTOTYPE((krb5_context,
 		   const krb5_keyblock *,
 		   krb5_ticket * ));
-krb5_error_code krb5_get_cred_from_kdc
+krb5_error_code INTERFACE krb5_get_cred_from_kdc
 	PROTOTYPE((krb5_context,
 		   krb5_ccache,		/* not const, as reading may save
 					   state */
 		   krb5_creds *,
 		   krb5_creds *** ));
-void krb5_free_tgt_creds
+void INTERFACE krb5_free_tgt_creds
 	PROTOTYPE((krb5_context,
 		   krb5_creds ** ));	/* XXX too hard to do with const */
 
 #define	KRB5_GC_USER_USER	1	/* want user-user ticket */
 #define	KRB5_GC_CACHED		2	/* want cached ticket only */
 
-krb5_error_code krb5_get_credentials
+krb5_error_code INTERFACE krb5_get_credentials
 	PROTOTYPE((krb5_context,
 		   const krb5_flags,
 		   krb5_ccache,
 		   krb5_creds * ));
-krb5_error_code	krb5_get_for_creds
+krb5_error_code	INTERFACE krb5_get_for_creds
 	PROTOTYPE((krb5_context,
 		   const krb5_cksumtype,
 		   char *,
@@ -88,14 +88,14 @@ krb5_error_code	krb5_get_for_creds
 		   krb5_keyblock *,
 		   int,
 		   krb5_data * ));
-krb5_error_code krb5_mk_req
+krb5_error_code INTERFACE krb5_mk_req
 	PROTOTYPE((krb5_context,
 		   krb5_const_principal,
 		   const krb5_flags,
 		   const krb5_checksum *,
 		   krb5_ccache,
 		   krb5_data * ));
-krb5_error_code krb5_mk_req_extended
+krb5_error_code INTERFACE krb5_mk_req_extended
 	PROTOTYPE((krb5_context,
 		   const krb5_flags,
 		   const krb5_checksum *,
@@ -106,31 +106,31 @@ krb5_error_code krb5_mk_req_extended
 		   krb5_creds *,
 		   krb5_authenticator *,
 		   krb5_data * ));
-krb5_error_code krb5_rd_req_simple
+krb5_error_code INTERFACE krb5_rd_req_simple
 	PROTOTYPE((krb5_context,
 		   const krb5_data *,
 		   krb5_const_principal,
 		   const krb5_address *,
 		   krb5_tkt_authent ** ));
-krb5_error_code krb5_mk_rep
+krb5_error_code INTERFACE krb5_mk_rep
 	PROTOTYPE((krb5_context,
 		   const krb5_ap_rep_enc_part *,
 		   const krb5_keyblock *,
 		   krb5_data *));
-krb5_error_code krb5_rd_rep
+krb5_error_code INTERFACE krb5_rd_rep
 	PROTOTYPE((krb5_context,
 		   const krb5_data *,
 		   const krb5_keyblock *,
 		   krb5_ap_rep_enc_part **));
-krb5_error_code krb5_mk_error
+krb5_error_code INTERFACE krb5_mk_error
 	PROTOTYPE((krb5_context,
 		   const krb5_error *,
 		   krb5_data * ));
-krb5_error_code krb5_rd_error
+krb5_error_code INTERFACE krb5_rd_error
 	PROTOTYPE((krb5_context,
 		   const krb5_data *,
 		   krb5_error ** ));
-krb5_error_code krb5_rd_safe
+krb5_error_code INTERFACE krb5_rd_safe
 	PROTOTYPE((krb5_context,
 		   const krb5_data *,
 		   const krb5_keyblock *,
@@ -139,7 +139,7 @@ krb5_error_code krb5_rd_safe
 		   krb5_int32, krb5_int32,
 		   krb5_rcache,
 		   krb5_data * ));
-krb5_error_code krb5_rd_priv
+krb5_error_code INTERFACE krb5_rd_priv
 	PROTOTYPE((krb5_context,
 		   const krb5_data *,
 		   const krb5_keyblock *,
@@ -149,90 +149,90 @@ krb5_error_code krb5_rd_priv
 		   krb5_pointer,
 		   krb5_rcache,
 		   krb5_data * ));
-krb5_error_code krb5_parse_name
+krb5_error_code INTERFACE krb5_parse_name
 	PROTOTYPE((krb5_context,
 		   const char *,
 		   krb5_principal * ));
-krb5_error_code krb5_unparse_name
+krb5_error_code INTERFACE krb5_unparse_name
 	PROTOTYPE((krb5_context,
 		   krb5_const_principal,
 		   char ** ));
-krb5_error_code krb5_unparse_name_ext
+krb5_error_code INTERFACE krb5_unparse_name_ext
 	PROTOTYPE((krb5_context,
 		   krb5_const_principal,
 		   char **,
 		   int *));
-krb5_boolean krb5_address_search
+krb5_boolean INTERFACE krb5_address_search
 	PROTOTYPE((krb5_context,
 		   const krb5_address *,
 		   krb5_address * const *));
-krb5_boolean krb5_address_compare
+krb5_boolean INTERFACE krb5_address_compare
 	PROTOTYPE((krb5_context,
 		   const krb5_address *,
 		   const krb5_address *));
-int krb5_address_order
+int INTERFACE krb5_address_order
 	PROTOTYPE((krb5_context,
 		   const krb5_address *,
 		   const krb5_address *));
-krb5_boolean krb5_realm_compare
+krb5_boolean INTERFACE krb5_realm_compare
 	PROTOTYPE((krb5_context,
 		   krb5_const_principal,
 		   krb5_const_principal));
-krb5_boolean krb5_principal_compare
+krb5_boolean INTERFACE krb5_principal_compare
 	PROTOTYPE((krb5_context,
 		   krb5_const_principal,
 		   krb5_const_principal));
-int krb5_fulladdr_order
+int INTERFACE krb5_fulladdr_order
 	PROTOTYPE((krb5_context,
 		   const krb5_fulladdr *,
 		   const krb5_fulladdr *));
-krb5_error_code krb5_copy_keyblock
+krb5_error_code INTERFACE krb5_copy_keyblock
     	PROTOTYPE((krb5_context,
 		   const krb5_keyblock *,
 	       krb5_keyblock **));
-krb5_error_code krb5_copy_keyblock_contents
+krb5_error_code INTERFACE krb5_copy_keyblock_contents
     	PROTOTYPE((krb5_context,
 		   const krb5_keyblock *,
 	       krb5_keyblock *));
-krb5_error_code krb5_copy_creds
+krb5_error_code INTERFACE krb5_copy_creds
     	PROTOTYPE((krb5_context,
 		   const krb5_creds *,
 	       krb5_creds **));
-krb5_error_code krb5_copy_data
+krb5_error_code INTERFACE krb5_copy_data
     	PROTOTYPE((krb5_context,
 		   const krb5_data *,
 	       krb5_data **));
-krb5_error_code krb5_copy_principal
+krb5_error_code INTERFACE krb5_copy_principal
     	PROTOTYPE((krb5_context,
 		   krb5_const_principal,
 	       krb5_principal *));
-krb5_error_code krb5_copy_addresses
+krb5_error_code INTERFACE krb5_copy_addresses
     	PROTOTYPE((krb5_context,
 		   krb5_address * const *,
 	       krb5_address ***));
-krb5_error_code krb5_copy_ticket
+krb5_error_code INTERFACE krb5_copy_ticket
     	PROTOTYPE((krb5_context,
 		   const krb5_ticket *, krb5_ticket **));
-krb5_error_code krb5_copy_authdata
+krb5_error_code INTERFACE krb5_copy_authdata
     	PROTOTYPE((krb5_context,
 		   krb5_authdata * const *,
 	       krb5_authdata ***));
-krb5_error_code krb5_copy_authenticator
+krb5_error_code INTERFACE krb5_copy_authenticator
     	PROTOTYPE((krb5_context,
 		   const krb5_authenticator *,
 	       krb5_authenticator **));
-krb5_error_code krb5_copy_checksum
+krb5_error_code INTERFACE krb5_copy_checksum
     	PROTOTYPE((krb5_context,
 		   const krb5_checksum *,
 	       krb5_checksum **));
-void krb5_init_ets PROTOTYPE((krb5_context));
-krb5_error_code krb5_generate_subkey
+void INTERFACE krb5_init_ets PROTOTYPE((krb5_context));
+krb5_error_code INTERFACE krb5_generate_subkey
     	PROTOTYPE((krb5_context,
 		   const krb5_keyblock *, krb5_keyblock **));
-krb5_error_code krb5_generate_seq_number
+krb5_error_code INTERFACE krb5_generate_seq_number
     	PROTOTYPE((krb5_context,
 		   const krb5_keyblock *, krb5_int32 *));
-krb5_error_code krb5_get_server_rcache
+krb5_error_code INTERFACE krb5_get_server_rcache
     	PROTOTYPE((krb5_context,
 		   const krb5_data *, krb5_rcache *));
 krb5_error_code krb5_build_principal_ext
@@ -246,171 +246,183 @@ krb5_error_code krb5_build_principal_va
 		   krb5_principal *, int, const char *, va_list));
 #endif
 
-krb5_error_code krb5_425_conv_principal
+krb5_error_code INTERFACE krb5_425_conv_principal
 	PROTOTYPE((krb5_context,
 		   const char *name, const char *instance, const char *realm,
 		   krb5_principal *princ));
 
-krb5_error_code krb5_obtain_padata
+krb5_error_code INTERFACE 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 krb5_verify_padata
+krb5_error_code INTERFACE 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 krb5_kt_register
+krb5_error_code INTERFACE krb5_kt_register
 	PROTOTYPE((krb5_context,
 		   krb5_kt_ops * ));
-krb5_error_code krb5_kt_resolve
+krb5_error_code INTERFACE krb5_kt_resolve
 	PROTOTYPE((krb5_context,
 		   const char *,
 		   krb5_keytab * ));
-krb5_error_code krb5_kt_default_name
+krb5_error_code INTERFACE krb5_kt_default_name
 	PROTOTYPE((krb5_context,
 		   char *,
 		   int ));
-krb5_error_code krb5_kt_default
+krb5_error_code INTERFACE krb5_kt_default
 	PROTOTYPE((krb5_context,
 		   krb5_keytab * ));
-krb5_error_code krb5_kt_free_entry
+krb5_error_code INTERFACE 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 krb5_kt_remove_entry
+krb5_error_code INTERFACE krb5_kt_remove_entry
 	PROTOTYPE((krb5_context,
 		   krb5_keytab,
 		   krb5_keytab_entry * ));
-krb5_error_code krb5_kt_add_entry
+krb5_error_code INTERFACE krb5_kt_add_entry
 	PROTOTYPE((krb5_context,
 		   krb5_keytab,
 		   krb5_keytab_entry * ));
-krb5_error_code krb5_principal2salt
+krb5_error_code INTERFACE krb5_principal2salt
 	PROTOTYPE((krb5_context,
 		   krb5_const_principal, krb5_data *));
-krb5_error_code krb5_principal2salt_norealm
+krb5_error_code INTERFACE krb5_principal2salt_norealm
 	PROTOTYPE((krb5_context,
 		   krb5_const_principal, krb5_data *));
 
 /* librc.spec--see rcache.h */
 
 /* libcc.spec */
-krb5_error_code krb5_cc_resolve
+krb5_error_code INTERFACE krb5_cc_resolve
 	PROTOTYPE((krb5_context,
 		   char *,
 		   krb5_ccache * ));
-krb5_error_code krb5_cc_generate_new
+krb5_error_code INTERFACE krb5_cc_generate_new
 	PROTOTYPE((krb5_context,
 		   krb5_cc_ops *,
 		   krb5_ccache * ));
-char *krb5_cc_default_name
+char * INTERFACE krb5_cc_default_name
 	PROTOTYPE((krb5_context));
-krb5_error_code krb5_cc_default
+krb5_error_code INTERFACE krb5_cc_default
 	PROTOTYPE((krb5_context,
 		   krb5_ccache *));
 
 /* chk_trans.c */
-krb5_error_code krb5_check_transited_list
+krb5_error_code INTERFACE krb5_check_transited_list
     PROTOTYPE((krb5_context,
 		   krb5_data *trans, krb5_data *realm1, krb5_data *realm2));
 
 /* free_rtree.c */
-void krb5_free_realm_tree
+void INTERFACE krb5_free_realm_tree
 	PROTOTYPE((krb5_context,
 		   krb5_principal *));
 
 /* krb5_free.c */
-void krb5_free_principal
+void INTERFACE krb5_free_principal
 	PROTOTYPE((krb5_context,
 		   krb5_principal ));
-void krb5_free_authenticator
+void INTERFACE krb5_free_authenticator
 	PROTOTYPE((krb5_context,
 		   krb5_authenticator * ));
-void krb5_free_authenticator_contents
+void INTERFACE krb5_free_authenticator_contents
 	PROTOTYPE((krb5_context,
 		   krb5_authenticator * ));
-void krb5_free_addresses
+void INTERFACE krb5_free_addresses
 	PROTOTYPE((krb5_context,
 		   krb5_address ** ));
-void krb5_free_address
+void INTERFACE krb5_free_address
 	PROTOTYPE((krb5_context,
 		   krb5_address * ));
-void krb5_free_authdata
+void INTERFACE krb5_free_authdata
 	PROTOTYPE((krb5_context,
 		   krb5_authdata ** ));
-void krb5_free_enc_tkt_part
+void INTERFACE krb5_free_enc_tkt_part
 	PROTOTYPE((krb5_context,
 		   krb5_enc_tkt_part * ));
-void krb5_free_ticket
+void INTERFACE krb5_free_ticket
 	PROTOTYPE((krb5_context,
 		   krb5_ticket * ));
-void krb5_free_tickets
+void INTERFACE krb5_free_tickets
 	PROTOTYPE((krb5_context,
 		   krb5_ticket ** ));
-void krb5_free_kdc_req
+void INTERFACE krb5_free_kdc_req
 	PROTOTYPE((krb5_context,
 		   krb5_kdc_req * ));
-void krb5_free_kdc_rep
+void INTERFACE krb5_free_kdc_rep
 	PROTOTYPE((krb5_context,
 		   krb5_kdc_rep * ));
-void krb5_free_last_req
+void INTERFACE krb5_free_last_req
 	PROTOTYPE((krb5_context,
 		   krb5_last_req_entry ** ));
-void krb5_free_enc_kdc_rep_part
+void INTERFACE krb5_free_enc_kdc_rep_part
 	PROTOTYPE((krb5_context,
 		   krb5_enc_kdc_rep_part * ));
-void krb5_free_error
+void INTERFACE krb5_free_error
 	PROTOTYPE((krb5_context,
 		   krb5_error * ));
-void krb5_free_ap_req
+void INTERFACE krb5_free_ap_req
 	PROTOTYPE((krb5_context,
 		   krb5_ap_req * ));
-void krb5_free_ap_rep
+void INTERFACE krb5_free_ap_rep
 	PROTOTYPE((krb5_context,
 		   krb5_ap_rep * ));
-void krb5_free_safe
+void INTERFACE krb5_free_safe
 	PROTOTYPE((krb5_context,
 		   krb5_safe * ));
-void krb5_free_priv
+void INTERFACE krb5_free_priv
 	PROTOTYPE((krb5_context,
 		   krb5_priv * ));
-void krb5_free_priv_enc_part
+void INTERFACE krb5_free_priv_enc_part
 	PROTOTYPE((krb5_context,
 		   krb5_priv_enc_part * ));
-void krb5_free_kdc_req
+void INTERFACE krb5_free_kdc_req
 	PROTOTYPE((krb5_context,
 		   krb5_kdc_req * ));
-void krb5_free_creds
+void INTERFACE krb5_free_cred
+   PROTOTYPE((krb5_context, 
+         krb5_cred *));
+void INTERFACE krb5_free_creds
 	PROTOTYPE((krb5_context,
 		   krb5_creds *));
-void krb5_free_cred_contents
+void INTERFACE krb5_free_cred_contents
 	PROTOTYPE((krb5_context,
 		   krb5_creds *));
-void krb5_free_checksum
+void INTERFACE krb5_free_cred_enc_part
+   PROTOTYPE((krb5_context,
+         krb5_cred_enc_part *));
+void INTERFACE krb5_free_checksum
 	PROTOTYPE((krb5_context,
 		   krb5_checksum *));
-void krb5_free_keyblock
+void INTERFACE krb5_free_keyblock
 	PROTOTYPE((krb5_context,
 		   krb5_keyblock *));
-void krb5_free_pa_data
+void INTERFACE krb5_free_pa_data
 	PROTOTYPE((krb5_context,
 		   krb5_pa_data **));
-void krb5_free_ap_rep_enc_part
+void INTERFACE krb5_free_ap_rep_enc_part
 	PROTOTYPE((krb5_context,
 		   krb5_ap_rep_enc_part *));
-void krb5_free_tkt_authent
+void INTERFACE krb5_free_tkt_authent
 	PROTOTYPE((krb5_context,
 		   krb5_tkt_authent *));
+void INTERFACE krb5_free_pwd_data
+   PROTOTYPE((krb5_context,
+         krb5_pwd_data *));
+void INTERFACE krb5_free_pwd_sequences
+   PROTOTYPE((krb5_context,
+         passwd_phrase_element **));
 
 /* Only put things which don't have pointers to the narrow types in this
    section */
 
-krb5_error_code krb5_encode_kdc_rep
+krb5_error_code INTERFACE krb5_encode_kdc_rep
 	PROTOTYPE((krb5_context,
 		   const krb5_msgtype,
 		   const krb5_enc_kdc_rep_part *,
@@ -419,7 +431,7 @@ krb5_error_code krb5_encode_kdc_rep
 		   krb5_kdc_rep *,
 		   krb5_data ** ));
 
-krb5_error_code krb5_send_tgs
+krb5_error_code INTERFACE krb5_send_tgs
 	PROTOTYPE((krb5_context,
 		   const krb5_flags,
 		   const krb5_ticket_times *,
@@ -433,7 +445,7 @@ krb5_error_code krb5_send_tgs
 		   krb5_creds *,
 		   krb5_response * ));
 
-krb5_error_code krb5_get_in_tkt
+krb5_error_code INTERFACE krb5_get_in_tkt
 	PROTOTYPE((krb5_context,
 		   const krb5_flags,
 		   krb5_address * const *,
@@ -454,7 +466,7 @@ krb5_error_code krb5_get_in_tkt
 		   krb5_ccache,
 		   krb5_kdc_rep ** ));
 
-krb5_error_code krb5_get_in_tkt_with_password
+krb5_error_code INTERFACE krb5_get_in_tkt_with_password
 	PROTOTYPE((krb5_context,
 		   const krb5_flags,
 		   krb5_address * const *,
@@ -465,7 +477,7 @@ krb5_error_code krb5_get_in_tkt_with_password
 		   krb5_creds *,
 		   krb5_kdc_rep ** ));
 
-krb5_error_code krb5_get_in_tkt_with_skey
+krb5_error_code INTERFACE krb5_get_in_tkt_with_skey
 	PROTOTYPE((krb5_context,
 		   const krb5_flags,
 		   krb5_address * const *,
@@ -476,7 +488,7 @@ krb5_error_code krb5_get_in_tkt_with_skey
 		   krb5_creds *,
 		   krb5_kdc_rep ** ));
 
-krb5_error_code krb5_get_in_tkt_with_keytab
+krb5_error_code INTERFACE krb5_get_in_tkt_with_keytab
 	PROTOTYPE((krb5_context,
 		   const krb5_flags,
 		   krb5_address * const *,
@@ -488,21 +500,21 @@ krb5_error_code krb5_get_in_tkt_with_keytab
 		   krb5_kdc_rep ** ));
 
 
-krb5_error_code krb5_decode_kdc_rep
+krb5_error_code INTERFACE krb5_decode_kdc_rep
 	PROTOTYPE((krb5_context,
 		   krb5_data *,
 		   const krb5_keyblock *,
 		   const krb5_enctype,
 		   krb5_kdc_rep ** ));
 
-typedef krb5_error_code (*krb5_rdreq_key_proc) PROTOTYPE((krb5_context,
+typedef krb5_error_code (INTERFACE *krb5_rdreq_key_proc) PROTOTYPE((krb5_context,
 							  krb5_pointer, 
 							  krb5_principal,
 							  krb5_kvno,
 							  krb5_keytype,
 							  krb5_keyblock **));
 	
-krb5_error_code krb5_rd_req
+krb5_error_code INTERFACE krb5_rd_req
 	PROTOTYPE((krb5_context,
 		   const krb5_data *,
 		   krb5_const_principal,
@@ -513,7 +525,7 @@ krb5_error_code krb5_rd_req
 		   krb5_rcache,
 		   krb5_tkt_authent ** ));
 
-krb5_error_code krb5_rd_req_decoded
+krb5_error_code INTERFACE krb5_rd_req_decoded
 	PROTOTYPE((krb5_context,
 		   const krb5_ap_req *,
 		   krb5_const_principal,
@@ -524,14 +536,14 @@ krb5_error_code krb5_rd_req_decoded
 		   krb5_rcache,
 		   krb5_tkt_authent ** ));
 
-krb5_error_code krb5_kt_read_service_key
+krb5_error_code INTERFACE krb5_kt_read_service_key
 	PROTOTYPE((krb5_context,
 		   krb5_pointer,
 		   krb5_principal,
 		   krb5_kvno,
 		   krb5_keytype,
 		   krb5_keyblock **));
-krb5_error_code krb5_mk_safe
+krb5_error_code INTERFACE krb5_mk_safe
 	PROTOTYPE((krb5_context,
 		   const krb5_data *,
 		   const krb5_cksumtype ,
@@ -541,7 +553,7 @@ krb5_error_code krb5_mk_safe
 		   krb5_int32, krb5_int32,
 		   krb5_rcache,
 		   krb5_data * ));
-krb5_error_code krb5_mk_priv
+krb5_error_code INTERFACE krb5_mk_priv
 	PROTOTYPE((krb5_context,
 		   const krb5_data *,
 		   const krb5_enctype,
@@ -552,12 +564,12 @@ krb5_error_code krb5_mk_priv
 		   krb5_rcache,
 		   krb5_pointer,
 		   krb5_data * ));
-krb5_error_code krb5_cc_register
+krb5_error_code INTERFACE krb5_cc_register
 	PROTOTYPE((krb5_context,
 		   krb5_cc_ops *,
 		   krb5_boolean ));
 
-krb5_error_code krb5_sendauth 
+krb5_error_code INTERFACE krb5_sendauth 
 	PROTOTYPE((krb5_context,
 		   krb5_pointer,
 		   char *,
@@ -572,7 +584,7 @@ krb5_error_code krb5_sendauth
 		   krb5_error **,
 		   krb5_ap_rep_enc_part **));
 	
-krb5_error_code krb5_recvauth PROTOTYPE((krb5_context,
+krb5_error_code INTERFACE krb5_recvauth PROTOTYPE((krb5_context,
 		   krb5_pointer,
 		   char *,
 		   krb5_principal,
@@ -587,7 +599,7 @@ krb5_error_code krb5_recvauth PROTOTYPE((krb5_context,
 		   krb5_ticket **,
 		   krb5_authenticator **));
 
-krb5_error_code krb5_walk_realm_tree
+krb5_error_code INTERFACE krb5_walk_realm_tree
     	PROTOTYPE((krb5_context,
 		   const krb5_data *,
 	       const krb5_data *,
diff --git a/src/include/krb5/krb5.h b/src/include/krb5/krb5.h
index c5feedecf..fc762edec 100644
--- a/src/include/krb5/krb5.h
+++ b/src/include/krb5/krb5.h
@@ -297,14 +297,6 @@ typedef struct _krb5_cred {
     krb5_cred_enc_part *enc_part2; 	/* unencrypted version, if available*/
 } krb5_cred;
 
-/* these need to be here so the typedefs are available for the prototypes */
-#include <krb5/safepriv.h>
-#include <krb5/ccache.h>
-#include <krb5/rcache.h>
-#include <krb5/keytab.h>
-#include <krb5/func-proto.h>
-#include <krb5/free.h>
-
 /* Sandia password generation structures */
 typedef struct _passwd_phrase_element {
     krb5_magic magic;
@@ -318,6 +310,14 @@ typedef struct _krb5_pwd_data {
     passwd_phrase_element **element;
 } krb5_pwd_data;
 
+/* these need to be here so the typedefs are available for the prototypes */
+#include <krb5/safepriv.h>
+#include <krb5/ccache.h>
+#include <krb5/rcache.h>
+#include <krb5/keytab.h>
+#include <krb5/func-proto.h>
+#include <krb5/free.h>
+
 /* The name of the Kerberos ticket granting service... and its size */
 #define	KRB5_TGS_NAME		"krbtgt"
 #define KRB5_TGS_NAME_SIZE	6