Windows/NT integration (V1_0_WIN32_BRANCH merge)

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

252 files changed, 2281 insertions, 1231 deletions

diff --git a/src/lib/ChangeLog b/src/lib/ChangeLog
index 38f08ba6ce..f1d2d706ac 100644
--- a/src/lib/ChangeLog
+++ b/src/lib/ChangeLog
@@ -1,3 +1,25 @@
+Tue Feb  4 15:52:34 1997  Richard Basch  <basch@lehman.com>
+
+	* gssapi16.def: Declare the library name (win16)
+
+	* krb5_16.def krb5_32.def: New ComErr interface definitions
+
+	* krb5_32.def: Remove unsupported statements (EXETYPE, RESIDENTNAME)
+
+Sun Feb  2 11:22:24 1997  Richard Basch  <basch@lehman.com>
+
+	* krb5_16.def: Need to declare the library name
+
+Thu Jan 30 21:27:07 1997  Richard Basch  <basch@lehman.com>
+
+	* krb5_16.def krb5_32.def: 
+		Export krb5_decrypt, krb5_encrypt,
+		krb5_string_to_key, krb5_process_key, krb5_finish_key,
+		krb5_init_random_key, krb5_finish_random_key,
+		krb5_random_key, krb5_eblock_enctype
+	* Makefile.in
+		Win32 - Link against MSVCRT.LIB (runtime library)
+
 Sat Dec 21 01:23:48 1996  Theodore Y. Ts'o  <tytso@mit.edu>
 
 	* win_glue.c: Change the timebomb to be June 1, 1997.  Make the
diff --git a/src/lib/Makefile.in b/src/lib/Makefile.in
index b8cd3980a8..43662d93c2 100644
--- a/src/lib/Makefile.in
+++ b/src/lib/Makefile.in
@@ -19,38 +19,51 @@ clean-unix::
 	$(RM) $(CLEANLIBS)
 
 clean-windows::
-	$(RM) krb5_16.dll krb5_16.lib krb5_16.bak krb5_16.map winsock.lib
-	$(RM) gssapi.dll gssapi.lib gssapi.bak gssapi.map
+	$(RM) *.dll *.lib *.exp *.map *.bak
+
 #
-# Windows stuff to make krb5_16.dll and krb5_16.lib. Currently it
+# Windows stuff to make krb5.dll and krb5.lib. Currently it
 # combines crypto, krb5, kadm and the util/et directories.
 #
-ALIB  = kadm\kadm.lib
-CLIB  = crypto\crypto.lib
-KLIB  = krb5\krb5.lib
-GLIB  = gssapi\gssapi.lib
-ETLIB = $(BUILDTOP)\util\et\comerr.lib
-PLIB  = $(BUILDTOP)\util\profile\profile.lib
-WLIB  = .\winsock.lib
-LIBS  = $(ALIB) $(CLIB) $(KLIB) $(GLIB) $(ETLIB) $(PLIB) $(WLIB)
-
-lib-windows: winsock.lib krb5_16.lib gssapi.lib 
-
-gssapi.lib:: gssapi.dll
-	implib /nologo gssapi.lib gssapi.dll
+GLIBS = gssapi\gssapi.lib
+KLIBS = krb5\krb5.lib crypto\crypto.lib \
+	$(BUILDTOP)\util\profile\profile.lib \
+	$(BUILDTOP)\util\et\comerr.lib \
+	kadm\kadm.lib des425\des425.lib
+
+##WIN16##KDEF = krb5_16.def
+##WIN32##KDEF = krb5_32.def
+##WIN16##GDEF = gssapi16.def
+##WIN32##GDEF = gssapi32.def
+
+##WIN16##WLIB  = .\winsock.lib
+##WIN16##WINLIBS = $(WLIB) ldllcew libw oldnames
+##WIN32##WINLIBS = msvcrt.lib kernel32.lib wsock32.lib \
+##WIN32##	user32.lib shell32.lib oldnames.lib
+##WIN32##WINDLLFLAGS = /nodefaultlib /incremental:no /pdb:none /release \
+##WIN32##		/nologo /align:0x1000 /base:0x1c000000 /dll /debug
+
+
+
+$(KLIB): $(KLIBS) $(WLIB) $(KDEF) win_glue.obj
+##WIN16##	link /co /seg:400 /noe /nod /nol \
+##WIN16##	   win_glue, $*.dll, $*.map, \
+##WIN16##	   $(KLIBS) $(WINLIBS), $(KDEF)
+##WIN16##	rc /nologo /p /k $*.dll
+##WIN16##	implib /nologo $@ $*.dll
+##WIN32##	link $(WINDLLFLAGS) /def:$(KDEF) /out:$*.dll \
+##WIN32##	   win_glue.obj $(KLIBS) $(WINLIBS)
+
+$(GLIB): $(GLIBS) $(KLIB) $(GDEF) win_glue.obj
+##WIN16##	link /co /seg:400 /noe /nod /nol \
+##WIN16##	   win_glue, $*.dll, $*.map, \
+##WIN16##	   $(GLIBS) $(KLIB) $(WINLIBS), $(GDEF)
+##WIN16##	rc /nologo /p /k $*.dll
+##WIN16##	implib /nologo $@ $*.dll
+##WIN32##	link $(WINDLLFLAGS) /def:$(GDEF) /out:$*.dll \
+##WIN32##	   win_glue.obj $(GLIBS) $(KLIB) $(WINLIBS)
 
-gssapi.dll:: $(GLIB) $(LIBS) gssapi.def win_glue.obj
-	link /co /seg:400 /noe /nod /nol win_glue, gssapi.dll, gssapi.map, \
-	   $(LIBS) ldllcew libw oldnames, gssapi.def
-	rc /nologo /p /k gssapi.dll
 
-krb5_16.lib:: krb5_16.dll
-	implib /nologo krb5_16.lib krb5_16.dll
-
-krb5_16.dll:: $(LIBS) krb5_16.def win_glue.obj
-	link /co /seg:400 /noe /nod /nol win_glue, krb5_16.dll, krb5_16.map, \
-	   $(LIBS) ldllcew libw oldnames, krb5_16.def
-	rc /nologo /p /k krb5_16.dll
 
 sap_glue.obj: win_glue.c
 	$(CC) $(CFLAGS) -DSAP_TIMEBOMB -I$(VERS_DIR) /c \
@@ -59,42 +72,59 @@ sap_glue.obj: win_glue.c
 win_glue.obj: win_glue.c
 	$(CC) $(CFLAGS) /c win_glue.c
 
-sapkrb5.dll:: $(GLIB) $(LIBS) gssapi.def sap_glue.obj
-	link /co /seg:400 /noe /nod /nol sap_glue, sapkrb5.dll, sapkrb5.map, \
-	   $(LIBS) $(VERS_DIR)\vswin.lib ldllcew libw oldnames, sapkrb5.def
-	rc /nologo /p /k sapkrb5.dll
 
-winsock.lib:  winsock.def
-	implib /nologo winsock.lib winsock.def
+
+##WIN16##sapkrb5.dll: $(GLIB) $(LIBS) gssapi.def sap_glue.obj
+##WIN16##	link /co /seg:400 /noe /nod /nol sap_glue, sapkrb5.dll, sapkrb5.map, \
+##WIN16##	   $(LIBS) $(VERS_DIR)\vswin.lib ldllcew libw oldnames, sapkrb5.def
+##WIN16##	rc /nologo /p /k sapkrb5.dll
+
+##WIN16##winsock.lib:  winsock.def
+##WIN16##	implib /nologo winsock.lib winsock.def
+
+
 
 all-windows:: 
 	@echo Making in lib\crypto
 	cd crypto
 	-$(MAKE) -$(MFLAGS)
+	@echo Making in lib\krb5
+	cd ..\krb5
+	-$(MAKE) -$(MFLAGS) 
 	@echo Making in lib\kadm
 	cd ..\kadm
 	-$(MAKE) -$(MFLAGS) 
-	@echo Making in lib\krb5
-	cd ..\krb5
+	@echo Making in lib\des425
+	cd ..\des425
 	-$(MAKE) -$(MFLAGS) 
+#	@echo Making in lib\krb4
+#	cd ..\krb4
+#	-$(MAKE) -$(MFLAGS) 
 	@echo Making in lib\gssapi
 	cd ..\gssapi
 	-$(MAKE) -$(MFLAGS) 
 	@echo Making in lib
 	cd ..
 
-all-windows:: krb5_16.lib gssapi.lib
+all-windows:: lib-windows
+lib-windows: $(KLIB) $(GLIB)
 
 clean-windows::
 	@echo Making clean in lib\crypto
 	cd crypto
 	-$(MAKE) -$(MFLAGS) clean
+	@echo Making clean in lib\krb5
+	cd ..\krb5
+	-$(MAKE) -$(MFLAGS) clean
 	@echo Making clean in lib\kadm
 	cd ..\kadm
 	-$(MAKE) -$(MFLAGS) clean
-	@echo Making clean in lib\krb5
-	cd ..\krb5
+	@echo Making clean in lib\des425
+	cd ..\des425
 	-$(MAKE) -$(MFLAGS) clean
+#	@echo Making clean in lib\krb4
+#	cd ..\krb4
+#	-$(MAKE) -$(MFLAGS) clean
 	@echo Making clean in lib\gssapi
 	cd ..\gssapi
 	-$(MAKE) -$(MFLAGS) clean
diff --git a/src/lib/crypto/crc32/ChangeLog b/src/lib/crypto/crc32/ChangeLog
index b9e7d9e12c..eaf0e8591b 100644
--- a/src/lib/crypto/crc32/ChangeLog
+++ b/src/lib/crypto/crc32/ChangeLog
@@ -1,3 +1,11 @@
+Thu Jan 30 21:30:32 1997  Richard Basch  <basch@lehman.com>
+
+	* crc.c: Declare the functions to take const pointers, where possible.
+
+Thu Nov 21 00:58:04 EST 1996    Richard Basch   <basch@lehman.com>
+
+	* Makefile.in: Win32 build
+
 Tue May 14 19:33:27 1996  Richard Basch  <basch@lehman.com>
 
 	* crc.c: ensure the cksum content length is sufficient
diff --git a/src/lib/crypto/crc32/Makefile.in b/src/lib/crypto/crc32/Makefile.in
index aa3cf87305..34255defb0 100644
--- a/src/lib/crypto/crc32/Makefile.in
+++ b/src/lib/crypto/crc32/Makefile.in
@@ -1,7 +1,9 @@
 CFLAGS = $(CCOPTS) $(DEFS)
 
 ##DOSBUILDTOP = ..\..\..
-##DOSLIBNAME=..\crypto.lib
+##DOSMYNAME=crc32
+##DOSOBJFILE=..\crc32.lst
+##WIN16##LIBNAME=..\crypto.lib
 
 .c.o:
 	$(CC) $(CFLAGS) -c $(srcdir)/$*.c
@@ -13,7 +15,12 @@ SRCS=	$(srcdir)/crc.c
 
 all-unix:: shared $(OBJS) 
 all-mac:: shared $(OBJS) 
-all-windows:: $(OBJS)
+all-windows:: $(OBJFILE)
+
+##DOS$(OBJFILE): $(OBJS)
+##DOS	$(RM) $(OBJFILE)
+##WIN16##	$(CP) nul: $(OBJFILE)
+##WIN32##	$(LIBECHO) -p $(MYNAME)\ *.obj > $(OBJFILE)
 
 shared:
 	mkdir shared
@@ -36,3 +43,4 @@ clean-unix::
 clean-mac::
 	$(RM) shared/*
 clean-windows::
+	$(RM) $(OBJFILE)
diff --git a/src/lib/crypto/crc32/crc.c b/src/lib/crypto/crc32/crc.c
index 9f055200aa..60afb3f4a2 100644
--- a/src/lib/crypto/crc32/crc.c
+++ b/src/lib/crypto/crc32/crc.c
@@ -146,20 +146,28 @@ static u_long const crc_table[256] = {
 /* Windows needs to these prototypes for crc32_cksumtable_entry below */
 
 static krb5_error_code
-crc32_sum_func PROTOTYPE((krb5_pointer in, size_t in_length,
-    krb5_pointer seed, size_t seed_length, krb5_checksum *outcksum));
+crc32_sum_func PROTOTYPE((
+	krb5_const krb5_pointer in,
+	krb5_const size_t in_length,
+	krb5_const krb5_pointer seed,
+	krb5_const size_t seed_length,
+	krb5_checksum FAR *outcksum));
 
 static krb5_error_code
-crc32_verify_func PROTOTYPE((krb5_checksum FAR *cksum, krb5_pointer in,
-	size_t in_length, krb5_pointer seed, size_t seed_length));
+crc32_verify_func PROTOTYPE((
+	krb5_const krb5_checksum FAR *cksum,
+	krb5_const krb5_pointer in,
+	krb5_const size_t in_length,
+	krb5_const krb5_pointer seed,
+	krb5_const size_t seed_length));
 
 static krb5_error_code
 crc32_sum_func(in, in_length, seed, seed_length, outcksum)
-krb5_pointer in;
-size_t in_length;
-krb5_pointer seed;
-size_t seed_length;
-krb5_checksum FAR *outcksum;
+    krb5_const krb5_pointer in;
+    krb5_const size_t in_length;
+    krb5_const krb5_pointer seed;
+    krb5_const size_t seed_length;
+    krb5_checksum FAR *outcksum;
 {
     register u_char *data;
     register u_long c = 0;
@@ -188,11 +196,11 @@ krb5_checksum FAR *outcksum;
 
 static krb5_error_code
 crc32_verify_func(cksum, in, in_length, seed, seed_length)
-krb5_checksum FAR *cksum;
-krb5_pointer in;
-size_t in_length;
-krb5_pointer seed;
-size_t seed_length;
+    krb5_const krb5_checksum FAR *cksum;
+    krb5_const krb5_pointer in;
+    krb5_const size_t in_length;
+    krb5_const krb5_pointer seed;
+    krb5_const size_t seed_length;
 {
     register u_char *data;
     register u_long c = 0;
diff --git a/src/lib/crypto/des/ChangeLog b/src/lib/crypto/des/ChangeLog
index 6edc924c90..76ea951561 100644
--- a/src/lib/crypto/des/ChangeLog
+++ b/src/lib/crypto/des/ChangeLog
@@ -1,3 +1,12 @@
+Thu Jan 30 21:43:19 1997  Richard Basch  <basch@lehman.com>
+
+	* cbc_cksum.c
+		Change functions to take const args where possible
+
+Thu Nov 21 00:58:04 EST 1996    Richard Basch   <basch@lehman.com>
+
+        * Makefile.in: Win32 build
+
 Sat Jun 15 03:51:19 1996  Ezra Peisach  <epeisach@kangaroo.mit.edu>
 
 	* Makefile.in (clean): Add space before \
diff --git a/src/lib/crypto/des/Makefile.in b/src/lib/crypto/des/Makefile.in
index ad665617f5..403cca650c 100644
--- a/src/lib/crypto/des/Makefile.in
+++ b/src/lib/crypto/des/Makefile.in
@@ -1,7 +1,9 @@
 CFLAGS = $(CCOPTS) $(DEFS)
 
 ##DOSBUILDTOP = ..\..\..
-##DOSLIBNAME=..\crypto.lib
+##DOSMYNAME=des
+##DOSOBJFILE=..\des.lst
+##WIN16##LIBNAME=..\crypto.lib
 
 COMERRLIB=$(BUILDTOP)/util/et/libcom_err.$(LIBEXT)
 
@@ -62,11 +64,14 @@ SRCS=	$(srcdir)/afsstring2key.c \
 	$(srcdir)/u_rn_key.c
 
 
-all:: $(OBJS)
+all-unix:: $(OBJS) shared
+all-mac:: $(OBJS) shared
+all-windows:: $(OBJFILE)
 
-all-unix:: shared
-all-mac:: shared
-all-windows::
+##DOS$(OBJFILE): $(OBJS)
+##DOS	$(RM) $(OBJFILE)
+##WIN16##	$(CP) nul: $(OBJFILE)
+##WIN32##	$(LIBECHO) -p $(MYNAME)\ *.obj > $(OBJFILE)
 
 shared:
 	mkdir shared
@@ -109,3 +114,4 @@ clean-unix::
 clean-mac::
 	$(RM) shared/*
 clean-windows::
+	$(RM) $(OBJFILE)
diff --git a/src/lib/crypto/des/cbc_cksum.c b/src/lib/crypto/des/cbc_cksum.c
index c4fb8c0860..29a38a0a59 100644
--- a/src/lib/crypto/des/cbc_cksum.c
+++ b/src/lib/crypto/des/cbc_cksum.c
@@ -44,18 +44,25 @@
 */
 
 static krb5_error_code mit_des_cbc_checksum
-    PROTOTYPE((krb5_pointer, size_t,krb5_pointer,size_t, krb5_checksum FAR * ));
+    PROTOTYPE((krb5_const krb5_pointer,
+	       krb5_const size_t,
+	       krb5_const krb5_pointer,
+	       krb5_const size_t,
+	       krb5_checksum FAR * ));
 
 static krb5_error_code mit_des_cbc_verf_cksum
-    PROTOTYPE ((krb5_checksum FAR *, krb5_pointer, size_t, krb5_pointer,
-                size_t ));
+    PROTOTYPE ((krb5_const krb5_checksum FAR *,
+		krb5_const krb5_pointer,
+		krb5_const size_t,
+		krb5_const krb5_pointer,
+                krb5_const size_t ));
 
 static krb5_error_code
 mit_des_cbc_checksum(in, in_length, key, key_size, cksum)
-    krb5_pointer in;
-    size_t in_length;
-    krb5_pointer key;
-    size_t key_size;
+    krb5_const krb5_pointer in;
+    krb5_const size_t in_length;
+    krb5_const krb5_pointer key;
+    krb5_const size_t key_size;
     krb5_checksum FAR * cksum;
 {
     struct mit_des_ks_struct       *schedule;      /* pointer to key schedules */
@@ -95,11 +102,11 @@ mit_des_cbc_checksum(in, in_length, key, key_size, cksum)
     
 static krb5_error_code
 mit_des_cbc_verf_cksum(cksum, in, in_length, key, key_size)
-    krb5_checksum FAR * cksum;
-    krb5_pointer in;
-    size_t in_length;
-    krb5_pointer key;
-    size_t key_size;
+    krb5_const krb5_checksum FAR * cksum;
+    krb5_const krb5_pointer in;
+    krb5_const size_t in_length;
+    krb5_const krb5_pointer key;
+    krb5_const size_t key_size;
 {
     struct mit_des_ks_struct       *schedule;      /* pointer to key schedules */
     mit_des_cblock	contents;
diff --git a/src/lib/crypto/md4/ChangeLog b/src/lib/crypto/md4/ChangeLog
index 531fd8af72..b275f98232 100644
--- a/src/lib/crypto/md4/ChangeLog
+++ b/src/lib/crypto/md4/ChangeLog
@@ -1,3 +1,12 @@
+Thu Jan 30 21:42:03 1997  Richard Basch  <basch@lehman.com>
+
+	* md4crypto.c md4glue.c:
+		Change functions to take const args where possible
+
+Thu Nov 21 00:58:04 EST 1996    Richard Basch   <basch@lehman.com>
+
+        * Makefile.in: Win32 build
+
 Wed Jun 12 00:10:42 1996  Theodore Ts'o  <tytso@rsts-11.mit.edu>
 
 	* md4.c
diff --git a/src/lib/crypto/md4/Makefile.in b/src/lib/crypto/md4/Makefile.in
index c7af3d1b0c..e4c54f0305 100644
--- a/src/lib/crypto/md4/Makefile.in
+++ b/src/lib/crypto/md4/Makefile.in
@@ -2,7 +2,10 @@
 CFLAGS = $(CCOPTS) $(DEFS) -I$(srcdir)/../des -I"$(srcdir)"
 
 ##DOSBUILDTOP = ..\..\..
-##DOSLIBNAME=..\crypto.lib
+##DOSMYNAME=md4
+##DOSOBJFILE=..\md4.lst
+##WIN16##LIBNAME=..\crypto.lib
+
 RUN_SETUP=@KRB5_RUN_ENV@
 
 .c.o:
@@ -15,7 +18,12 @@ SRCS=	$(srcdir)/md4.c $(srcdir)/md4glue.c $(srcdir)/md4crypto.c
 
 all-unix:: shared $(OBJS) 
 all-mac:: shared $(OBJS) 
-all-windows:: $(OBJS)
+all-windows:: $(OBJFILE)
+
+##DOS$(OBJFILE): $(OBJS)
+##DOS	$(RM) $(OBJFILE)
+##WIN16##	$(CP) nul: $(OBJFILE)
+##WIN32##	$(LIBECHO) -p $(MYNAME)\ *.obj > $(OBJFILE)
 
 shared:
 	mkdir shared
@@ -59,3 +67,4 @@ clean-unix::
 clean-mac::
 	$(RM) shared/*
 clean-windows::
+	$(RM) $(OBJFILE)
diff --git a/src/lib/crypto/md4/md4crypto.c b/src/lib/crypto/md4/md4crypto.c
index 43d6443666..eac9647f2d 100644
--- a/src/lib/crypto/md4/md4crypto.c
+++ b/src/lib/crypto/md4/md4crypto.c
@@ -28,18 +28,6 @@
 #include "rsa-md4.h"
 #include "des_int.h"	/* we cheat a bit and call it directly... */
 
-/* Windows needs to these prototypes for the assignment below */
-
-krb5_error_code
-krb5_md4_crypto_sum_func PROTOTYPE((krb5_pointer in, size_t in_length,
-    krb5_pointer seed, size_t seed_length, krb5_checksum *outcksum));
-
-krb5_error_code
-krb5_md4_crypto_verify_func PROTOTYPE((krb5_checksum FAR *cksum, krb5_pointer in,
-	size_t in_length, krb5_pointer seed, size_t seed_length));
-
-static mit_des_cblock zero_ivec = { 0 };
-
 /*
  * In Kerberos V5 Beta 5 and previous releases the RSA-MD4-DES implementation
  * did not follow RFC1510.  The folowing definitions control the compatibility
@@ -56,6 +44,37 @@ static mit_des_cblock zero_ivec = { 0 };
 #define MD4_K5BETA_COMPAT
 #define MD4_K5BETA_COMPAT_DEF
 
+
+/* Windows needs to these prototypes for the assignment below */
+
+#ifdef MD4_K5BETA_COMPAT
+krb5_error_code
+krb5_md4_crypto_compat_sum_func PROTOTYPE((
+	krb5_const krb5_pointer in,
+	krb5_const size_t in_length,
+	krb5_const krb5_pointer seed,
+	krb5_const size_t seed_length,
+	krb5_checksum *outcksum));
+#endif
+
+krb5_error_code
+krb5_md4_crypto_sum_func PROTOTYPE((
+	krb5_const krb5_pointer in,
+	krb5_const size_t in_length,
+	krb5_const krb5_pointer seed,
+	krb5_const size_t seed_length,
+	krb5_checksum *outcksum));
+
+krb5_error_code
+krb5_md4_crypto_verify_func PROTOTYPE((
+	krb5_const krb5_checksum FAR *cksum,
+	krb5_const krb5_pointer in,
+	krb5_const size_t in_length,
+	krb5_const krb5_pointer seed,
+	krb5_const size_t seed_length));
+
+static mit_des_cblock zero_ivec = { 0 };
+
 static void
 krb5_md4_calculate_cksum(md4ctx, confound, confound_length, in, in_length)
     krb5_MD4_CTX		*md4ctx;
@@ -78,11 +97,11 @@ krb5_md4_calculate_cksum(md4ctx, confound, confound_length, in, in_length)
  */
 krb5_error_code
 krb5_md4_crypto_compat_sum_func(in, in_length, seed, seed_length, outcksum)
-krb5_pointer in;
-size_t in_length;
-krb5_pointer seed;
-size_t seed_length;
-krb5_checksum FAR *outcksum;
+    krb5_const krb5_pointer in;
+    krb5_const size_t in_length;
+    krb5_const krb5_pointer seed;
+    krb5_const size_t seed_length;
+    krb5_checksum FAR *outcksum;
 {
     krb5_octet outtmp[OLD_RSA_MD4_DES_CKSUM_LENGTH];
     krb5_octet *input = (krb5_octet *)in;
@@ -131,11 +150,11 @@ krb5_checksum FAR *outcksum;
  */
 krb5_error_code
 krb5_md4_crypto_sum_func(in, in_length, seed, seed_length, outcksum)
-krb5_pointer in;
-size_t in_length;
-krb5_pointer seed;
-size_t seed_length;
-krb5_checksum FAR *outcksum;
+    krb5_const krb5_pointer in;
+    krb5_const size_t in_length;
+    krb5_const krb5_pointer seed;
+    krb5_const size_t seed_length;
+    krb5_checksum FAR *outcksum;
 {
     krb5_octet outtmp[NEW_RSA_MD4_DES_CKSUM_LENGTH];
     mit_des_cblock	tmpkey;
@@ -195,11 +214,11 @@ krb5_checksum FAR *outcksum;
 
 krb5_error_code
 krb5_md4_crypto_verify_func(cksum, in, in_length, seed, seed_length)
-krb5_checksum FAR *cksum;
-krb5_pointer in;
-size_t in_length;
-krb5_pointer seed;
-size_t seed_length;
+    krb5_const krb5_checksum FAR *cksum;
+    krb5_const krb5_pointer in;
+    krb5_const size_t in_length;
+    krb5_const krb5_pointer seed;
+    krb5_const size_t seed_length;
 {
     krb5_octet outtmp[NEW_RSA_MD4_DES_CKSUM_LENGTH];
     mit_des_cblock	tmpkey;
diff --git a/src/lib/crypto/md4/md4glue.c b/src/lib/crypto/md4/md4glue.c
index df33c8a230..f7e566e9b2 100644
--- a/src/lib/crypto/md4/md4glue.c
+++ b/src/lib/crypto/md4/md4glue.c
@@ -29,20 +29,28 @@
 /* Windows needs to these prototypes for the assignment below */
 
 krb5_error_code
-krb5_md4_sum_func PROTOTYPE((krb5_pointer in, size_t in_length,
-    krb5_pointer seed, size_t seed_length, krb5_checksum *outcksum));
+krb5_md4_sum_func PROTOTYPE((
+	krb5_const krb5_pointer in,
+	krb5_const size_t in_length,
+	krb5_const krb5_pointer seed,
+	krb5_const size_t seed_length,
+	krb5_checksum FAR *outcksum));
 
 krb5_error_code
-krb5_md4_verify_func PROTOTYPE((krb5_checksum FAR *cksum, krb5_pointer in,
-	size_t in_length, krb5_pointer seed, size_t seed_length));
+krb5_md4_verify_func PROTOTYPE((
+	krb5_const krb5_checksum FAR *cksum,
+	krb5_const krb5_pointer in,
+	krb5_const size_t in_length,
+	krb5_const krb5_pointer seed,
+	krb5_const size_t seed_length));
 
 krb5_error_code
 krb5_md4_sum_func(in, in_length, seed, seed_length, outcksum)
-krb5_pointer in;
-size_t in_length;
-krb5_pointer seed;
-size_t seed_length;
-krb5_checksum FAR *outcksum;
+    krb5_const krb5_pointer in;
+    krb5_const size_t in_length;
+    krb5_const krb5_pointer seed;
+    krb5_const size_t seed_length;
+    krb5_checksum FAR *outcksum;
 {
     krb5_octet *input = (krb5_octet *)in;
     krb5_MD4_CTX working;
@@ -66,11 +74,11 @@ krb5_checksum FAR *outcksum;
 
 krb5_error_code
 krb5_md4_verify_func(cksum, in, in_length, seed, seed_length)
-krb5_checksum FAR *cksum;
-krb5_pointer in;
-size_t in_length;
-krb5_pointer seed;
-size_t seed_length;
+    krb5_const krb5_checksum FAR *cksum;
+    krb5_const krb5_pointer in;
+    krb5_const size_t in_length;
+    krb5_const krb5_pointer seed;
+    krb5_const size_t seed_length;
 {
     krb5_octet *input = (krb5_octet *)in;
     krb5_MD4_CTX working;
diff --git a/src/lib/crypto/md5/ChangeLog b/src/lib/crypto/md5/ChangeLog
index 9e73726bc7..b771bedd23 100644
--- a/src/lib/crypto/md5/ChangeLog
+++ b/src/lib/crypto/md5/ChangeLog
@@ -1,3 +1,12 @@
+Thu Jan 30 21:42:50 1997  Richard Basch  <basch@lehman.com>
+
+	* md5crypto.c md5glue.c:
+		Change functions to take const args where possible
+
+Thu Nov 21 00:58:04 EST 1996    Richard Basch   <basch@lehman.com>
+
+        * Makefile.in: Win32 build
+
 Wed Jun 12 00:11:34 1996  Theodore Ts'o  <tytso@rsts-11.mit.edu>
 
 	* rsa-md5.h:
diff --git a/src/lib/crypto/md5/Makefile.in b/src/lib/crypto/md5/Makefile.in
index f7d3292adf..8c009cd83c 100644
--- a/src/lib/crypto/md5/Makefile.in
+++ b/src/lib/crypto/md5/Makefile.in
@@ -1,7 +1,10 @@
 CFLAGS = $(CCOPTS) $(DEFS) -I$(srcdir)/../des
 
 ##DOSBUILDTOP = ..\..\..
-##DOSLIBNAME=..\crypto.lib
+##DOSMYNAME=md5
+##DOSOBJFILE=..\md5.lst
+##WIN16##LIBNAME=..\crypto.lib
+
 RUN_SETUP = @KRB5_RUN_ENV@
 .c.o:
 	$(CC) $(CFLAGS) -c $(srcdir)/$*.c
@@ -13,7 +16,12 @@ SRCS=	$(srcdir)/md5.c $(srcdir)/md5glue.c $(srcdir)/md5crypto.c
 
 all-unix:: shared $(OBJS) 
 all-mac:: shared $(OBJS) 
-all-windows:: $(OBJS)
+all-windows:: $(OBJFILE)
+
+##DOS$(OBJFILE): $(OBJS)
+##DOS	$(RM) $(OBJFILE)
+##WIN16##	$(CP) nul: $(OBJFILE)
+##WIN32##	$(LIBECHO) -p $(MYNAME)\ *.obj > $(OBJFILE)
 
 shared:
 	mkdir shared
@@ -43,3 +51,4 @@ clean-unix::
 clean-mac::
 	$(RM) shared/*
 clean-windows::
+	$(RM) $(OBJFILE)
diff --git a/src/lib/crypto/md5/md5crypto.c b/src/lib/crypto/md5/md5crypto.c
index 1982a56e23..b83e50e77b 100644
--- a/src/lib/crypto/md5/md5crypto.c
+++ b/src/lib/crypto/md5/md5crypto.c
@@ -2,18 +2,6 @@
 #include "rsa-md5.h"
 #include "des_int.h"	/* we cheat a bit and call it directly... */
 
-/* Windows needs to these prototypes for the assignment below */
-
-krb5_error_code
-krb5_md5_crypto_sum_func PROTOTYPE((krb5_pointer in, size_t in_length,
-	krb5_pointer seed, size_t seed_length, krb5_checksum FAR *outcksum));
-
-krb5_error_code
-krb5_md5_crypto_verify_func PROTOTYPE((krb5_checksum FAR *cksum, krb5_pointer in,
-	size_t in_length, krb5_pointer seed, size_t seed_length));
-
-static mit_des_cblock zero_ivec = { 0 };
-
 /*
  * In Kerberos V5 Beta 5 and previous releases the RSA-MD5-DES implementation
  * did not follow RFC1510.  The folowing definitions control the compatibility
@@ -30,6 +18,37 @@ static mit_des_cblock zero_ivec = { 0 };
 #define MD5_K5BETA_COMPAT
 #define MD5_K5BETA_COMPAT_DEF
 
+
+/* Windows needs to these prototypes for the assignment below */
+
+#ifdef MD5_K5BETA_COMPAT
+krb5_error_code
+krb5_md5_crypto_compat_sum_func PROTOTYPE((
+	krb5_const krb5_pointer in,
+	krb5_const size_t in_length,
+	krb5_const krb5_pointer seed,
+	krb5_const size_t seed_length,
+	krb5_checksum FAR *outcksum));
+#endif
+
+krb5_error_code
+krb5_md5_crypto_sum_func PROTOTYPE((
+	krb5_const krb5_pointer in,
+	krb5_const size_t in_length,
+	krb5_const krb5_pointer seed,
+	krb5_const size_t seed_length,
+	krb5_checksum FAR *outcksum));
+
+krb5_error_code
+krb5_md5_crypto_verify_func PROTOTYPE((
+	krb5_const krb5_checksum FAR *cksum,
+	krb5_const krb5_pointer in,
+	krb5_const size_t in_length,
+	krb5_const krb5_pointer seed,
+	krb5_const size_t seed_length));
+
+static mit_des_cblock zero_ivec = { 0 };
+
 static void
 krb5_md5_calculate_cksum(md5ctx, confound, confound_length, in, in_length)
     krb5_MD5_CTX		*md5ctx;
@@ -48,11 +67,11 @@ krb5_md5_calculate_cksum(md5ctx, confound, confound_length, in, in_length)
 #ifdef	MD5_K5BETA_COMPAT
 krb5_error_code
 krb5_md5_crypto_compat_sum_func(in, in_length, seed, seed_length, outcksum)
-krb5_pointer in;
-size_t in_length;
-krb5_pointer seed;
-size_t seed_length;
-krb5_checksum FAR *outcksum;
+    krb5_const krb5_pointer in;
+    krb5_const size_t in_length;
+    krb5_const krb5_pointer seed;
+    krb5_const size_t seed_length;
+    krb5_checksum FAR *outcksum;
 {
     krb5_octet outtmp[OLD_RSA_MD5_DES_CKSUM_LENGTH];
     krb5_octet *input = (krb5_octet *)in;
@@ -96,11 +115,11 @@ krb5_checksum FAR *outcksum;
 
 krb5_error_code
 krb5_md5_crypto_sum_func(in, in_length, seed, seed_length, outcksum)
-krb5_pointer in;
-size_t in_length;
-krb5_pointer seed;
-size_t seed_length;
-krb5_checksum FAR *outcksum;
+    krb5_const krb5_pointer in;
+    krb5_const size_t in_length;
+    krb5_const krb5_pointer seed;
+    krb5_const size_t seed_length;
+    krb5_checksum FAR *outcksum;
 {
     krb5_octet outtmp[NEW_RSA_MD5_DES_CKSUM_LENGTH];
     mit_des_cblock	tmpkey;
@@ -162,11 +181,11 @@ krb5_checksum FAR *outcksum;
 
 krb5_error_code
 krb5_md5_crypto_verify_func(cksum, in, in_length, seed, seed_length)
-krb5_checksum FAR *cksum;
-krb5_pointer in;
-size_t in_length;
-krb5_pointer seed;
-size_t seed_length;
+    krb5_const krb5_checksum FAR *cksum;
+    krb5_const krb5_pointer in;
+    krb5_const size_t in_length;
+    krb5_const krb5_pointer seed;
+    krb5_const size_t seed_length;
 {
     krb5_octet outtmp[NEW_RSA_MD5_DES_CKSUM_LENGTH];
     mit_des_cblock	tmpkey;
diff --git a/src/lib/crypto/md5/md5glue.c b/src/lib/crypto/md5/md5glue.c
index 77aca36866..66d5aa7917 100644
--- a/src/lib/crypto/md5/md5glue.c
+++ b/src/lib/crypto/md5/md5glue.c
@@ -4,20 +4,28 @@
 /* Windows needs to these prototypes for the assignment below */
 
 krb5_error_code
-krb5_md5_sum_func PROTOTYPE((krb5_pointer in, size_t in_length,
-    krb5_pointer seed, size_t seed_length, krb5_checksum *outcksum));
+krb5_md5_sum_func PROTOTYPE((
+	krb5_const krb5_pointer in,
+	krb5_const size_t in_length,
+	krb5_const krb5_pointer seed,
+	krb5_const size_t seed_length,
+	krb5_checksum FAR *outcksum));
 
 krb5_error_code
-krb5_md5_verify_func PROTOTYPE((krb5_checksum FAR *cksum, krb5_pointer in,
-	size_t in_length, krb5_pointer seed, size_t seed_length));
+krb5_md5_verify_func PROTOTYPE((
+	krb5_const krb5_checksum FAR *cksum,
+	krb5_const krb5_pointer in,
+	krb5_const size_t in_length,
+	krb5_const krb5_pointer seed,
+	krb5_const size_t seed_length));
 
 krb5_error_code
 krb5_md5_sum_func(in, in_length, seed, seed_length, outcksum)
-krb5_pointer in;
-size_t in_length;
-krb5_pointer seed;
-size_t seed_length;
-krb5_checksum FAR *outcksum;
+    krb5_const krb5_pointer in;
+    krb5_const size_t in_length;
+    krb5_const krb5_pointer seed;
+    krb5_const size_t seed_length;
+    krb5_checksum FAR *outcksum;
 {
     krb5_octet *input = (krb5_octet *)in;
     krb5_MD5_CTX working;
@@ -40,11 +48,11 @@ krb5_checksum FAR *outcksum;
 
 krb5_error_code
 krb5_md5_verify_func(cksum, in, in_length, seed, seed_length)
-krb5_checksum FAR *cksum;
-krb5_pointer in;
-size_t in_length;
-krb5_pointer seed;
-size_t seed_length;
+    krb5_const krb5_checksum FAR *cksum;
+    krb5_const krb5_pointer in;
+    krb5_const size_t in_length;
+    krb5_const krb5_pointer seed;
+    krb5_const size_t seed_length;
 {
     krb5_octet *input = (krb5_octet *)in;
     krb5_MD5_CTX working;
diff --git a/src/lib/crypto/os/ChangeLog b/src/lib/crypto/os/ChangeLog
index 3671f1349d..97f79106d9 100644
--- a/src/lib/crypto/os/ChangeLog
+++ b/src/lib/crypto/os/ChangeLog
@@ -1,3 +1,13 @@
+Thu Nov 21 00:58:04 EST 1996    Richard Basch   <basch@lehman.com>
+
+        * Makefile.in: Win32 build
+
+	* c_ustime.c: The Win32 time calculation is different from DOS'
+		so the DOS version shouldn't be trying to use the same
+		part of the ifdef.
+
+	* rnd_confoun.c: Fix function declaration (win32)
+
 Wed Jun 12 00:12:52 1996  Theodore Ts'o  <tytso@rsts-11.mit.edu>
 
 	* c_ustime.c: Fix WIN32 to be _WIN32
diff --git a/src/lib/crypto/os/Makefile.in b/src/lib/crypto/os/Makefile.in
index 46e734d11f..134e5c9189 100644
--- a/src/lib/crypto/os/Makefile.in
+++ b/src/lib/crypto/os/Makefile.in
@@ -1,7 +1,9 @@
 CFLAGS = $(CCOPTS) $(DEFS)
 
 ##DOSBUILDTOP = ..\..\..
-##DOSLIBNAME=..\crypto.lib
+##DOSMYNAME=os
+##DOSOBJFILE=..\os.lst
+##WIN16##LIBNAME=..\crypto.lib
 
 LIBOBJS = @LIBOBJS@
 
@@ -15,10 +17,13 @@ OBJS= $(COBJS) $(LIBOBJS)
 SRCS=	rnd_confoun.c c_localaddr.c c_ustime.c
 
 all-unix:: shared $(OBJS)
-
 all-mac:: $(OBJS)
+all-windows:: $(OBJFILE)
 
-all-windows: $(COBJS)
+##DOS$(OBJFILE): $(COBJS)
+##DOS	$(RM) $(OBJFILE)
+##WIN16##	$(CP) nul: $(OBJFILE)
+##WIN32##	$(LIBECHO) -p $(MYNAME)\ *.obj > $(OBJFILE)
 
 shared:
 	mkdir shared
@@ -39,3 +44,4 @@ clean-unix::
 clean-mac::
 	$(RM) shared/*
 clean-windows::
+	$(RM) $(OBJFILE)
diff --git a/src/lib/crypto/os/c_ustime.c b/src/lib/crypto/os/c_ustime.c
index 8b539463f2..57606de10e 100644
--- a/src/lib/crypto/os/c_ustime.c
+++ b/src/lib/crypto/os/c_ustime.c
@@ -121,7 +121,7 @@ krb5_crypto_us_timeofday(seconds, microseconds)
 }
 
 
-#elif defined(_WIN32) || defined(_MSDOS)
+#elif defined(_WIN32)
 
    /* Microsoft Windows NT and 95   (32bit)  */
    /* This one works for WOW (Windows on Windows, ntvdm on Win-NT) */
diff --git a/src/lib/crypto/os/rnd_confoun.c b/src/lib/crypto/os/rnd_confoun.c
index 8db32d1563..e904cb5c7a 100644
--- a/src/lib/crypto/os/rnd_confoun.c
+++ b/src/lib/crypto/os/rnd_confoun.c
@@ -60,9 +60,9 @@ You need a random number generator!
 /*
  * Generate a random confounder
  */
-krb5_error_code
+KRB5_DLLIMP krb5_error_code KRB5_CALLCONV
 krb5_random_confounder(size, fillin)
-int size;
+size_t size;
 krb5_pointer fillin;
 {
     static int seeded = 0;
diff --git a/src/lib/crypto/sha/ChangeLog b/src/lib/crypto/sha/ChangeLog
index 8a312d7fb2..fbb5f0ba80 100644
--- a/src/lib/crypto/sha/ChangeLog
+++ b/src/lib/crypto/sha/ChangeLog
@@ -1,3 +1,15 @@
+Thu Jan 30 21:31:39 1997  Richard Basch  <basch@lehman.com>
+
+	* sha_crypto.c sha_glue.c:
+		Declare the functions to take const args where possible
+		Remove extra includes
+
+	* sha_crypto.c: Function prototypes did not match function names.
+
+Thu Nov 21 00:58:04 EST 1996	Richard Basch	<basch@lehman.com>
+
+	* Makefile.in: Win32 build fixed
+
 Wed Aug 28 17:40:53 1996  Theodore Ts'o  <tytso@rsts-11.mit.edu>
 
 	* shs.c: Only include sys/types.h if present.
diff --git a/src/lib/crypto/sha/Makefile.in b/src/lib/crypto/sha/Makefile.in
index 4f529fdfa6..e45646aed4 100644
--- a/src/lib/crypto/sha/Makefile.in
+++ b/src/lib/crypto/sha/Makefile.in
@@ -1,7 +1,9 @@
 CFLAGS = $(CCOPTS) $(DEFS) -I$(srcdir)/../des
 
 ##DOSBUILDTOP = ..\..\..
-##DOSLIBNAME=..\crypto.lib
+##DOSMYDIR=sha
+##DOSOBJFILE=..\sha.lst
+##WIN16##LIBNAME=..\crypto.lib
 
 .c.o:
 	$(CC) $(CFLAGS) -c $(srcdir)/$*.c
@@ -20,7 +22,12 @@ SRCS=	$(srcdir)/shs.c		\
 
 all-unix:: shared $(OBJS) 
 all-mac:: shared $(OBJS) 
-all-windows:: $(OBJS)
+all-windows:: $(OBJFILE)
+
+##DOS$(OBJFILE): $(OBJS)
+##DOS	$(RM) $(OBJFILE)
+##WIN16##	$(CP) nul: $(OBJFILE)
+##WIN32##	$(LIBECHO) -p $(MYDIR)\ *.obj > $(OBJFILE)
 
 shared:
 	mkdir shared
@@ -45,3 +52,4 @@ clean-unix::
 clean-mac::
 	$(RM) shared/*
 clean-windows::
+	$(RM) $(OBJFILE)
diff --git a/src/lib/crypto/sha/sha_crypto.c b/src/lib/crypto/sha/sha_crypto.c
index af1aee225e..b539b1199f 100644
--- a/src/lib/crypto/sha/sha_crypto.c
+++ b/src/lib/crypto/sha/sha_crypto.c
@@ -1,31 +1,29 @@
-#include "k5-int.h"
 #include "shs.h"
-#include "des_int.h"	/* we cheat a bit and call it directly... */
 
 /* Windows needs to these prototypes for the assignment below */
 
 static krb5_error_code
 krb5_sha_crypto_sum_func
-	PROTOTYPE((krb5_pointer in,
-		   size_t in_length,
-		   krb5_pointer seed,
-		   size_t seed_length,
+	PROTOTYPE((krb5_const krb5_pointer in,
+		   krb5_const size_t in_length,
+		   krb5_const krb5_pointer seed,
+		   krb5_const size_t seed_length,
 		   krb5_checksum FAR *outcksum));
 
 static krb5_error_code
 krb5_sha_crypto_verify_func
-	PROTOTYPE((krb5_checksum FAR *cksum,
-		   krb5_pointer in,
-		   size_t in_length,
-		   krb5_pointer seed,
-		   size_t seed_length));
+	PROTOTYPE((krb5_const krb5_checksum FAR *cksum,
+		   krb5_const krb5_pointer in,
+		   krb5_const size_t in_length,
+		   krb5_const krb5_pointer seed,
+		   krb5_const size_t seed_length));
 
 static krb5_error_code
-shs_crypto_sum_func(in, in_length, seed, seed_length, outcksum)
-    krb5_pointer in;
-    size_t in_length;
-    krb5_pointer seed;
-    size_t seed_length;
+krb5_sha_crypto_sum_func(in, in_length, seed, seed_length, outcksum)
+    krb5_const krb5_pointer in;
+    krb5_const size_t in_length;
+    krb5_const krb5_pointer seed;
+    krb5_const size_t seed_length;
     krb5_checksum FAR *outcksum;
 {
     krb5_error_code retval;
@@ -41,12 +39,12 @@ shs_crypto_sum_func(in, in_length, seed, seed_length, outcksum)
 }
 
 static krb5_error_code
-shs_crypto_verify_func(cksum, in, in_length, seed, seed_length)
-    krb5_checksum FAR *cksum;
-    krb5_pointer in;
-    size_t in_length;
-    krb5_pointer seed;
-    size_t seed_length;
+krb5_sha_crypto_verify_func(cksum, in, in_length, seed, seed_length)
+    krb5_const krb5_checksum FAR *cksum;
+    krb5_const krb5_pointer in;
+    krb5_const size_t in_length;
+    krb5_const krb5_pointer seed;
+    krb5_const size_t seed_length;
 {
     krb5_octet digest[HMAC_SHA_CKSUM_LENGTH];
     krb5_error_code retval;
@@ -70,8 +68,8 @@ cleanup:
 krb5_checksum_entry hmac_sha_cksumtable_entry =
 {
     0,
-    shs_crypto_sum_func,
-    shs_crypto_verify_func,
+    krb5_sha_crypto_sum_func,
+    krb5_sha_crypto_verify_func,
     HMAC_SHA_CKSUM_LENGTH,
     1,					/* is collision proof */
     1,					/* uses key */
diff --git a/src/lib/crypto/sha/sha_glue.c b/src/lib/crypto/sha/sha_glue.c
index 28416fc08c..3a57e01821 100644
--- a/src/lib/crypto/sha/sha_glue.c
+++ b/src/lib/crypto/sha/sha_glue.c
@@ -1,29 +1,28 @@
-#include "k5-int.h"
 #include "shs.h"
 
 krb5_error_code
 krb5_sha_sum_func
-	PROTOTYPE((krb5_pointer		in,
-		   size_t		in_length,
-		   krb5_pointer		seed,
-		   size_t		seed_length,
-		   krb5_checksum	*outcksum));
+	PROTOTYPE((krb5_const krb5_pointer	in,
+		   krb5_const size_t		in_length,
+		   krb5_const krb5_pointer	seed,
+		   krb5_const size_t		seed_length,
+		   krb5_checksum		FAR *outcksum));
 
 krb5_error_code
 krb5_sha_verify_func
-	PROTOTYPE((krb5_checksum	FAR *cksum,
-		   krb5_pointer		in,
-		   size_t		in_length,
-		   krb5_pointer		seed,
-		   size_t		seed_length));
+	PROTOTYPE((krb5_const krb5_checksum	FAR *cksum,
+		   krb5_const krb5_pointer	in,
+		   krb5_const size_t		in_length,
+		   krb5_const krb5_pointer	seed,
+		   krb5_const size_t		seed_length));
 
 krb5_error_code
 krb5_sha_sum_func(in, in_length, seed, seed_length, outcksum)
-	krb5_pointer	in;
-	size_t		in_length;
-	krb5_pointer	seed;
-	size_t		seed_length;
-	krb5_checksum	*outcksum;
+	krb5_const krb5_pointer	in;
+	krb5_const size_t	in_length;
+	krb5_const krb5_pointer	seed;
+	krb5_const size_t	seed_length;
+	krb5_checksum		FAR *outcksum;
 {
     krb5_octet *input = (krb5_octet *)in;
     SHS_INFO working;
@@ -47,11 +46,11 @@ krb5_sha_sum_func(in, in_length, seed, seed_length, outcksum)
 
 krb5_error_code
 krb5_sha_verify_func(cksum, in, in_length, seed, seed_length)
-	krb5_checksum	FAR *cksum;
-	krb5_pointer	in;
-	size_t		in_length;
-	krb5_pointer	seed;
-	size_t		seed_length;
+	krb5_const krb5_checksum	FAR *cksum;
+	krb5_const krb5_pointer		in;
+	krb5_const size_t		in_length;
+	krb5_const krb5_pointer		seed;
+	krb5_const size_t		seed_length;
 {
     krb5_octet *input = (krb5_octet *)in;
     SHS_INFO working;
diff --git a/src/lib/crypto/sha/shs.h b/src/lib/crypto/sha/shs.h
index 77b4ff250e..01acddb825 100644
--- a/src/lib/crypto/sha/shs.h
+++ b/src/lib/crypto/sha/shs.h
@@ -1,21 +1,20 @@
 #ifndef _SHS_DEFINED
 
-#include <krb5.h>
+#include <k5-int.h>
 
 #define _SHS_DEFINED
 
 /* Some useful types */
 
 typedef krb5_octet	BYTE;
-typedef krb5_ui_4	LONG;
 
-/* Exit status of functions. */
+/* Old DOS/Windows compilers are case-insensitive */
+#if !defined(_MSDOS) && !defined(_WIN32)
+typedef krb5_ui_4	LONG;
+#endif
 
-#define OK      0
-#define ERROR   -1
 
 /* Define the following to use the updated SHS implementation */
-
 #define NEW_SHS         /**/
 
 /* The SHS block size and message digest sizes, in bytes */
diff --git a/src/lib/crypto/sha/t_shs.c b/src/lib/crypto/sha/t_shs.c
index de30603e23..87d8a0f9da 100644
--- a/src/lib/crypto/sha/t_shs.c
+++ b/src/lib/crypto/sha/t_shs.c
@@ -37,8 +37,8 @@ int shsTestLevel;
     /* Compare the returned digest and required values */
     for( i = 0; i < 5; i++ )
         if( shsInfo->digest[ i ] != shsTestResults[ shsTestLevel ][ i ] )
-            return( ERROR );
-    return( OK );
+            return( -1 );
+    return( 0 );
 }
 
 main()
@@ -59,11 +59,11 @@ main()
     shsInit( &shsInfo );
     shsUpdate( &shsInfo, ( BYTE * ) "abc", 3 );
     shsFinal( &shsInfo );
-    if( compareSHSresults( &shsInfo, 0 ) == ERROR )
+    if( compareSHSresults( &shsInfo, 0 ) == -1 )
         {
         putchar( '\n' );
         puts( "SHS test 1 failed" );
-        exit( ERROR );
+        exit( -1 );
         }
 #ifdef NEW_SHS
     puts( "passed, result= A9993E364706816ABA3E25717850C26C9CD0D89D" );
@@ -75,11 +75,11 @@ main()
     shsInit( &shsInfo );
     shsUpdate( &shsInfo, ( BYTE * ) "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq", 56 );
     shsFinal( &shsInfo );
-    if( compareSHSresults( &shsInfo, 1 ) == ERROR )
+    if( compareSHSresults( &shsInfo, 1 ) == -1 )
         {
         putchar( '\n' );
         puts( "SHS test 2 failed" );
-        exit( ERROR );
+        exit( -1 );
         }
 #ifdef NEW_SHS
     puts( "passed, result= 84983E441C3BD26EBAAE4AA1F95129E5E54670F1" );
@@ -92,11 +92,11 @@ main()
     for( i = 0; i < 15625; i++ )
         shsUpdate( &shsInfo, ( BYTE * ) "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", 64 );
     shsFinal( &shsInfo );
-    if( compareSHSresults( &shsInfo, 2 ) == ERROR )
+    if( compareSHSresults( &shsInfo, 2 ) == -1 )
         {
         putchar( '\n' );
         puts( "SHS test 3 failed" );
-        exit( ERROR );
+        exit( -1 );
         }
 #ifdef NEW_SHS
     puts( "passed, result= 34AA973CD4C4DAA4F61EEB2BDBAD27316534016F" );
@@ -116,5 +116,5 @@ main()
 #endif
 
     puts( "\nAll SHS tests passed" );
-    exit( OK );
+    exit( 0 );
 }
diff --git a/src/lib/des425/ChangeLog b/src/lib/des425/ChangeLog
index 8b1457e07b..2acf19bac9 100644
--- a/src/lib/des425/ChangeLog
+++ b/src/lib/des425/ChangeLog
@@ -1,3 +1,11 @@
+Thu Nov 21 11:55:16 EST 1996    Richard Basch   <basch@lehman.com>
+
+        * Makefile.in: win32 build
+
+	* des.c, des.h, key_sched.c, new_rnd_key.c, pcbc_encrypt.c,
+	read_passwd.c, unix_time.c:
+		DLL export various functions (mostly for wintel)
+
 Mon Nov 18 20:39:02 1996  Ezra Peisach  <epeisach@mit.edu>
 
 	* configure.in: Set shared library version to 1.0. [krb5-libs/201]
diff --git a/src/lib/des425/Makefile.in b/src/lib/des425/Makefile.in
index 4c1f14ab51..c8e5139960 100644
--- a/src/lib/des425/Makefile.in
+++ b/src/lib/des425/Makefile.in
@@ -1,7 +1,11 @@
 CFLAGS = $(CCOPTS) $(DEFS) -I$(srcdir)/../crypto/des -I$(srcdir)/../../include/kerberosIV
 
 ##DOSBUILDTOP = ..\..
-##DOSLIBNAME=libdes425.lib
+##DOSLIBNAME=des425.lib
+##DOSOBJFILE=des425.lst
+##DOSOBJFILEDEP=des425.lst
+##DOSOBJFILELIST=@des425.lst
+
 RUN_SETUP=@KRB5_RUN_ENV@
 
 .c.o:
@@ -17,7 +21,7 @@ OBJS=	cksum.$(OBJEXT)		\
 	pcbc_encrypt.$(OBJEXT)	\
 	quad_cksum.$(OBJEXT)	\
 	random_key.$(OBJEXT)	\
-	read_passwd.$(OBJEXT) \
+	read_passwd.$(OBJEXT)	\
 	str_to_key.$(OBJEXT)	\
 	unix_time.$(OBJEXT)     \
 	util.$(OBJEXT)		\
@@ -34,7 +38,7 @@ SRCS=	$(srcdir)/cksum.c	\
 	$(srcdir)/quad_cksum.c	\
 	$(srcdir)/random_key.c	\
 	$(srcdir)/read_passwd.c \
-	$(srcdir)/str_to_key.c \
+	$(srcdir)/str_to_key.c	\
 	$(srcdir)/unix_time.c   \
 	$(srcdir)/util.c	\
 	$(srcdir)/weak_key.c	\
@@ -57,7 +61,12 @@ DEPKLIB= $(TOPLIBD)/libcrypto.a
 
 all-unix:: shared $(OBJS)
 all-mac:: $(OBJS)
-all-windows:: $(OBJS)
+all-windows:: $(OBJFILE)
+
+##DOS$(OBJFILE): $(OBJS)
+##DOS	$(RM) $(OBJFILE)
+##WIN16##	$(CP) nul: $(OBJFILE)
+##WIN32##	$(LIBECHO) *.obj > $(OBJFILE)
 
 shared:
 	mkdir shared
@@ -80,6 +89,7 @@ clean-unix::
 
 clean-mac::
 clean-windows::
+	$(RM) des425.lib des425.bak $(OBJFILE)
 
 libdes425.$(STEXT): $(OBJS)
 	$(RM) $@
diff --git a/src/lib/des425/des.c b/src/lib/des425/des.c
index 12e8c3ea7b..6b08899b7f 100644
--- a/src/lib/des425/des.c
+++ b/src/lib/des425/des.c
@@ -51,7 +51,7 @@
 
 #include "des.h"
 
-int
+KRB5_DLLIMP int KRB5_CALLCONV
 des_ecb_encrypt(clear, cipher, schedule, encrypt)
     unsigned long *clear;
     unsigned long *cipher;
diff --git a/src/lib/des425/des.h b/src/lib/des425/des.h
index 9ec87ddc39..2aed529bb4 100644
--- a/src/lib/des425/des.h
+++ b/src/lib/des425/des.h
@@ -67,14 +67,14 @@ typedef struct des_ks_struct bit_64;
  * Windows needs everything prototyped because we're exporting all the fuctions.
  */
 void des_cbc_cksum();
-int des_ecb_encrypt();
+KRB5_DLLIMP int KRB5_CALLCONV des_ecb_encrypt();
 int des_cbc_encrypt();
 void des_fixup_key_parity();
 int des_check_key_parity();
-int des_key_sched();
-int des_new_random_key();
+KRB5_DLLIMP int KRB5_CALLCONV des_key_sched();
+KRB5_DLLIMP int KRB5_CALLCONV des_new_random_key();
 void des_init_random_number_generator();
-void des_set_random_generator_seed();
+KRB5_DLLIMP void KRB5_CALLCONV des_set_random_generator_seed();
 void des_set_sequence_number();
 void des_generate_random_block();
 int des_pcbc_encrypt();
diff --git a/src/lib/des425/key_sched.c b/src/lib/des425/key_sched.c
index d96ef6fe02..cb4ecee968 100644
--- a/src/lib/des425/key_sched.c
+++ b/src/lib/des425/key_sched.c
@@ -48,7 +48,7 @@
 #include <stdio.h>
 #include "des.h"
 
-int
+KRB5_DLLIMP int KRB5_CALLCONV
 des_key_sched(k,schedule)
     register mit_des_cblock k;	/* r11 */
     mit_des_key_schedule schedule;
diff --git a/src/lib/des425/new_rnd_key.c b/src/lib/des425/new_rnd_key.c
index b5a367b5a6..943b9e03b5 100644
--- a/src/lib/des425/new_rnd_key.c
+++ b/src/lib/des425/new_rnd_key.c
@@ -38,7 +38,7 @@ krb5_pointer des425_random_state = 0;
  *        to be a weak des key.  Des_generate_random_block is used to
  *        provide the random bits.
  */
-int
+KRB5_DLLIMP int KRB5_CALLCONV
 des_new_random_key(key)
     mit_des_cblock key;
 {
@@ -102,7 +102,7 @@ des_init_random_number_generator(key)
  * Requires: key is a valid des key.  I.e., has correct parity and is not a
  *           weak des key.
  */
-void
+KRB5_DLLIMP void KRB5_CALLCONV
 des_set_random_generator_seed(key)
     mit_des_cblock key;
 {
diff --git a/src/lib/des425/pcbc_encrypt.c b/src/lib/des425/pcbc_encrypt.c
index 7c7517b232..92bc789a76 100644
--- a/src/lib/des425/pcbc_encrypt.c
+++ b/src/lib/des425/pcbc_encrypt.c
@@ -18,7 +18,7 @@
 /* 
  * copy of include/des.h to avoid collision with local one
  */
-#include "autoconf.h"
+#include "krb5.h"
 
 #ifndef KRB_INT32
 #if (SIZEOF_LONG == 4)
diff --git a/src/lib/des425/read_passwd.c b/src/lib/des425/read_passwd.c
index d9f29d72ea..968c986007 100644
--- a/src/lib/des425/read_passwd.c
+++ b/src/lib/des425/read_passwd.c
@@ -27,6 +27,8 @@
  * echoing.
  */
 
+#if defined(unix)
+
 #include "des.h"
 #include <stdio.h>
 #include <errno.h>
@@ -178,3 +180,8 @@ des_read_password/*_v4_compat_crock*/(k,prompt,verify)
     return ok;
 }
 
+#else /* !unix */
+/*
+ * These are all just dummy functions to make the rest of the library happy...
+ */
+#endif /* unix */
diff --git a/src/lib/des425/unix_time.c b/src/lib/des425/unix_time.c
index ed1110007a..ae7aee4c42 100644
--- a/src/lib/des425/unix_time.c
+++ b/src/lib/des425/unix_time.c
@@ -12,7 +12,7 @@
 
 #include "k5-int.h"
 
-#ifndef _MSDOS
+#if !defined(_MSDOS) && !defined(_WIN32)
 #include <sys/time.h>
 
 krb5_ui_4
@@ -27,8 +27,25 @@ unix_time_gmt_unixsec (usecptr)
 	return now.tv_sec;
 }
 
-#else /* _MSDOS */
+#endif /* !_MSDOS && !_WIN32 */
 
+#ifdef _WIN32
+#include <time.h>
+
+krb5_ui_4
+unix_time_gmt_unixsec (usecptr)
+    krb5_ui_4 *usecptr;
+{
+    time_t gmt;
+
+    time(&gmt);
+    if (usecptr)
+	*usecptr = gmt;
+    return gmt;
+}
+#endif /* _WIN32 */
+
+#ifdef MSDOS
 /*
  * Originally written by John Gilmore, Cygnus Support, May '94.
  * Public Domain.
diff --git a/src/lib/gssapi.def b/src/lib/gssapi.def
deleted file mode 100644
index dd7794750e..0000000000
--- a/src/lib/gssapi.def
+++ /dev/null
@@ -1,72 +0,0 @@
-;----------------------------------------------------
-;   GSSAPI.DEF - GSSAPI.DLL module definition file
-;----------------------------------------------------
-
-LIBRARY		GSSAPI
-DESCRIPTION	'Base Generic Security Service API'
-EXETYPE		WINDOWS
-CODE		PRELOAD MOVEABLE DISCARDABLE
-DATA		PRELOAD MOVEABLE SINGLE
-HEAPSIZE	8192
-
-EXPORTS
-	WEP					@1001 RESIDENTNAME
-	LIBMAIN					@1002
-	GSS_ACQUIRE_CRED			@1
-	GSS_RELEASE_CRED			@2
-	GSS_INIT_SEC_CONTEXT			@3
-	GSS_ACCEPT_SEC_CONTEXT			@4
-	GSS_PROCESS_CONTEXT_TOKEN		@5
-	GSS_DELETE_SEC_CONTEXT			@6
-	GSS_CONTEXT_TIME			@7
-	GSS_SIGN				@8
-	GSS_VERIFY				@9
-	GSS_SEAL				@10
-	GSS_UNSEAL				@11
-	GSS_DISPLAY_STATUS			@12
-	GSS_INDICATE_MECHS			@13
-	GSS_COMPARE_NAME			@14
-	GSS_DISPLAY_NAME			@15
-	GSS_IMPORT_NAME				@16
-	GSS_RELEASE_NAME			@17
-	GSS_RELEASE_BUFFER			@18
-	GSS_RELEASE_OID_SET			@19
-	GSS_INQUIRE_CRED			@20
-
-; GSS-API v2  additional credential calls
-;
-; XXX we need to add the numbers to this!
-;
-	GSS_ADD_CRED
-	GSS_INQUIRE_CRED_BY_MECH
-
-; GSS-API v2  additional context-level calls
-;
-	GSS_INQUIRE_CONTEXT
-	GSS_WRAP_SIZE_LIMIT
-	GSS_EXPORT_SEC_CONTEXT
-	GSS_IMPORT_SEC_CONTEXT
-
-; GSS-API v2  additional calls for OID and OID_set operations
-;
-	GSS_RELEASE_OID
-	GSS_CREATE_EMPTY_OID_SET
-	GSS_ADD_OID_SET_MEMBER
-	GSS_TEST_OID_SET_MEMBER
-	GSS_OID_TO_STR
-	GSS_STR_TO_OID
-
-; GSS-API v2  renamed message protection calls
-;
-	GSS_WRAP
-	GSS_UNWRAP
-	GSS_GET_MIC
-	GSS_VERIFY_MIC
-
-; GSS-API v2  future extensions
-;
-	GSS_INQUIRE_NAMES_FOR_MECH
-;	GSS_INQUIRE_MECHS_FOR_NAME
-;	GSS_CANONICALIZE_NAME
-;	GSS_EXPORT_NAME
-
diff --git a/src/lib/gssapi/ChangeLog b/src/lib/gssapi/ChangeLog
index b29cc371b2..e8c524b881 100644
--- a/src/lib/gssapi/ChangeLog
+++ b/src/lib/gssapi/ChangeLog
@@ -1,3 +1,7 @@
+Thu Nov 21 11:55:16 EST 1996    Richard Basch   <basch@lehman.com>
+
+        * Makefile.in: win32 build
+
 Mon Nov 18 20:39:41 1996  Ezra Peisach  <epeisach@mit.edu>
 
 	* configure.in: Set shared library version to 1.0. [krb5-libs/201]
diff --git a/src/lib/gssapi/Makefile.in b/src/lib/gssapi/Makefile.in
index bd7eac7366..b2410633cc 100644
--- a/src/lib/gssapi/Makefile.in
+++ b/src/lib/gssapi/Makefile.in
@@ -1,6 +1,9 @@
 TST=if test -n "`cat DONE`" ; then
 
 ##DOSBUILDTOP = ..\..
+##DOSLIBNAME=gssapi.lib
+##DOSOBJFILELIST=@generic.lst @krb5.lst
+##DOSOBJFILEDEP=generic.lst krb5.lst
 
 MAC_SUBDIRS = generic krb5
 
@@ -19,7 +22,6 @@ SHLIB_LDFLAGS= $(LDFLAGS) @SHLIB_RPATH_DIRS@
 SHLIB_LIBDIRS= @SHLIB_LIBDIRS@
 
 all-unix::
-
 all-mac::
 
 libgssapi_krb5.$(STEXT): $(LIBDONE)
diff --git a/src/lib/gssapi/generic/ChangeLog b/src/lib/gssapi/generic/ChangeLog
index 30fd1c3c2c..1456356a17 100644
--- a/src/lib/gssapi/generic/ChangeLog
+++ b/src/lib/gssapi/generic/ChangeLog
@@ -1,3 +1,16 @@
+Tue Feb  4 15:55:11 1997  Richard Basch  <basch@lehman.com>
+
+	* Makefile.in: Only override the object build of the error table
+		under Unix
+
+Thu Nov 21 11:55:16 EST 1996    Richard Basch   <basch@lehman.com>
+
+        * Makefile.in: win32 build
+
+	* gssapi.hin, gssapi_generic.c, gssapi_generic.h:
+	DLL export all public gssapi functions; move windows/mac stuff to
+	win-mac.h
+
 Wed Nov 20 13:59:58 1996  Ezra Peisach  <epeisach@mit.edu>
 
 	* Makefile.in (install): Install gssapi.h from the build tree.
diff --git a/src/lib/gssapi/generic/Makefile.in b/src/lib/gssapi/generic/Makefile.in
index 87b414f47c..4b652734e5 100644
--- a/src/lib/gssapi/generic/Makefile.in
+++ b/src/lib/gssapi/generic/Makefile.in
@@ -1,7 +1,9 @@
 CFLAGS = $(CCOPTS) $(DEFS) -I. -I$(srcdir)
 
 ##DOSBUILDTOP = ..\..\..
-##DOSLIBNAME=..\gssapi.$(LIBEXT)
+##DOSMYNAME=generic
+##DOSOBJFILE=..\generic.lst
+##WIN16##LIBNAME=..\gssapi.lib
 
 .c.o:
 	$(CC) $(CFLAGS) -c $(srcdir)/$*.c
@@ -18,17 +20,21 @@ ETHDRS= gssapi_err_generic.h
 
 EHDRDIR= $(BUILDTOP)$(S)include$(S)gssapi
 
-HDRS=	$(EHDRDIR)/gssapi.h \
-	$(EHDRDIR)/gssapi_generic.h
+HDRS=	$(EHDRDIR)$(S)gssapi.h \
+	$(EHDRDIR)$(S)gssapi_generic.h
 
-gssapi_err_generic.$(OBJEXT): gssapi_err_generic.c
+$(EHDRDIR)$(S)gssapi.h: gssapi.h
+	$(CP) gssapi.h $@
+$(EHDRDIR)$(S)gssapi_generic.h: $(srcdir)$(S)gssapi_generic.h
+	$(CP) $(srcdir)$(S)gssapi_generic.h $@
+
+gssapi_err_generic.o: gssapi_err_generic.c
 	$(CC) $(CFLAGS) -c $*.c
+
 @SHARED_RULE_LOCAL@
-##WIN16##	$(LIBCMD) $(PAGESIZE) /nologo $(LIBNAME) -+$@;
-##WIN32##	$(LIBCMD) /out:$(LIBNAME) /nologo $@
 
+gssapi_err_generic.$(OBJEXT): gssapi_err_generic.c
 gssapi_err_generic.h: gssapi_err_generic.et
-
 gssapi_err_generic.c: gssapi_err_generic.et
 
 gssapi.h: gssapi.hin
@@ -83,22 +89,22 @@ OBJS = \
 	util_validate.$(OBJEXT) \
 	gssapi_err_generic.$(OBJEXT)
 
-$(OBJS): $(HDRS) $(ETHDRS)
-
 EXPORTED_HEADERS= gssapi_generic.h
 EXPORTED_BUILT_HEADERS= gssapi.h
 
-all-unix:: shared $(SRCS) $(ETHDRS) $(OBJS)
+$(OBJS): $(EXPORTED_HEADERS) $(ETHDRS)
 
+all-unix:: shared $(SRCS) $(HDRS) $(ETHDRS) $(OBJS)
 all-mac:: $(SRCS) $(HDRS) $(ETHDRS) $(OBJS)
+all-windows:: win-include $(HDRS) $(OBJFILE)
 
-all-windows:: $(SRCS) $(ETHDRS) win-include
-all-windows:: $(OBJS)
+##DOS$(OBJFILE): $(OBJS)
+##DOS	$(RM) $(OBJFILE)
+##WIN16##	$(CP) nul: $(OBJFILE)
+##WIN32##	$(LIBECHO) -p $(MYNAME)\ *.obj > $(OBJFILE)
 
 win-include::
 	if not exist $(EHDRDIR)\nul mkdir $(EHDRDIR)
-	copy gssapi.h $(EHDRDIR)
-	copy gssapi_generic.h $(EHDRDIR)
 
 unixmac: $(SRCS) $(ETHDRS)
 
@@ -109,7 +115,7 @@ clean-mac::
 	$(RM) $(ETHDRS) $(ETSRCS) $(HDRS) shared/*
 
 clean-windows::
-	$(RM) $(EHDRDIR)\gssapi.h $(EHDRDIR)\gssapi_generic.h
+	$(RM) $(HDRS) $(OBJFILE)
 	if exist $(EHDRDIR)\nul rmdir $(EHDRDIR)
 
 # Krb5InstallHeaders($(EXPORTED_HEADERS), $(KRB5_INCDIR)/krb5)
diff --git a/src/lib/gssapi/generic/gssapi.hin b/src/lib/gssapi/generic/gssapi.hin
index 4d2e14d004..685b8aa7b8 100644
--- a/src/lib/gssapi/generic/gssapi.hin
+++ b/src/lib/gssapi/generic/gssapi.hin
@@ -26,82 +26,25 @@
 /*
  * Determine platform-dependent configuration.
  */
-#if defined(_MSDOS) || defined(_WIN32)
-
-#ifdef _MSDOS
-	/* Windows 16 definition */
-
-#define GSS_SIZEOF_INT      2
-#define GSS_SIZEOF_SHORT    2
-#define GSS_SIZEOF_LONG     4
-
-#ifndef FAR
-#define FAR	_far
-#define NEAR	_near
-#endif
-
-#ifndef KRB5_CALLCONV
-#define KRB5_CALLCONV __far __export __pascal
-#define KRB5_CALLCONV_C __far __export __cdecl
-#define KRB5_DLLIMP
-#define INTERFACE   KRB5_CALLCONV
-#define INTERFACE_C KRB5_CALLCONV_C
-#endif /* !KRB5_CALLCONV */
-	
-#else
-	/* Windows 32 specific definitions */
-#define GSS_SIZEOF_INT      4
-#define GSS_SIZEOF_SHORT    2
-#define GSS_SIZEOF_LONG     4
 
-#ifndef KRB5_CALLCONV
-#ifdef KRB5_DLL_FILE
-#define KRB5_DECLSPEC dllexport
-#else
-#define KRB5_DECLSPEC dllimport
-#endif
-#define KRB5_DLLIMP __declspec(KRB5_DECLSPEC)
-#define KRB5_CALLCONV __stdcall
-#define KRB5_CALLCONV_C __cdecl
-#define INTERFACE   KRB5_DLLIMP KRB5_CALLCONV
-#define INTERFACE_C KRB5_DLLIMP KRB5_CALLCONV_C
-#endif /* !KRB5_CALLCONV */
-
-#include <windows.h>
-#endif
-
-#ifndef _SIZE_T_DEFINED
-typedef unsigned int size_t;
-#define _SIZE_T_DEFINED
-#endif /* _SIZE_T_DEFINED */
-
-#ifndef _UID_T_DEFINED
-typedef unsigned int uid_t;
-#define _UID_T_DEFINED
+#if defined(_MSDOS) || defined(_WIN32)
+#include <win-mac.h>
 #endif
-#else /* _MSDOS_ */
 
 #ifndef KRB5_CALLCONV
 #define KRB5_CALLCONV
 #define KRB5_CALLCONV_C
 #define KRB5_DLLIMP
-#define INTERFACE
-#define INTERFACE_C
+#endif
+
+#ifndef FAR
 #define FAR
 #define NEAR
-#endif /* !KRB5_CALLCONV */
+#endif
 
 #define	GSS_SIZEOF_INT		SIZEOF_INT
 #define	GSS_SIZEOF_LONG		SIZEOF_LONG
 #define	GSS_SIZEOF_SHORT	SIZEOF_SHORT
-#endif /* _MSDOS */
-
-#ifndef FAR
-#define FAR
-#endif
-#ifndef NEAR
-#define NEAR
-#endif
 
 /*
  * Make sure we have a definition for PROTOTYPE.
diff --git a/src/lib/gssapi/generic/gssapi_generic.c b/src/lib/gssapi/generic/gssapi_generic.c
index 7072329b75..b078104d2f 100644
--- a/src/lib/gssapi/generic/gssapi_generic.c
+++ b/src/lib/gssapi/generic/gssapi_generic.c
@@ -53,7 +53,7 @@ static gss_OID_desc oids[] = {
    {10, "\052\206\110\206\367\022\001\002\001\004"},
 };
 
-gss_OID gss_nt_user_name = oids+0;
-gss_OID gss_nt_machine_uid_name = oids+1;
-gss_OID gss_nt_string_uid_name = oids+2;
-gss_OID gss_nt_service_name = oids+3;
+KRB5_DLLIMP gss_OID gss_nt_user_name = oids+0;
+KRB5_DLLIMP gss_OID gss_nt_machine_uid_name = oids+1;
+KRB5_DLLIMP gss_OID gss_nt_string_uid_name = oids+2;
+KRB5_DLLIMP gss_OID gss_nt_service_name = oids+3;
diff --git a/src/lib/gssapi/generic/gssapi_generic.h b/src/lib/gssapi/generic/gssapi_generic.h
index 09a9810b04..7b48d396fd 100644
--- a/src/lib/gssapi/generic/gssapi_generic.h
+++ b/src/lib/gssapi/generic/gssapi_generic.h
@@ -33,9 +33,9 @@
 #include <gssapi/gssapi.h>
 #endif
 
-extern gss_OID gss_nt_user_name;
-extern gss_OID gss_nt_machine_uid_name;
-extern gss_OID gss_nt_string_uid_name;
-extern gss_OID gss_nt_service_name;
+KRB5_DLLIMP extern gss_OID gss_nt_user_name;
+KRB5_DLLIMP extern gss_OID gss_nt_machine_uid_name;
+KRB5_DLLIMP extern gss_OID gss_nt_string_uid_name;
+KRB5_DLLIMP extern gss_OID gss_nt_service_name;
 
 #endif /* _GSSAPI_GENERIC_H_ */
diff --git a/src/lib/gssapi/krb5/ChangeLog b/src/lib/gssapi/krb5/ChangeLog
index 8f9ac2c0d4..67bf46319a 100644
--- a/src/lib/gssapi/krb5/ChangeLog
+++ b/src/lib/gssapi/krb5/ChangeLog
@@ -1,9 +1,26 @@
+Wed Feb  5 20:27:50 1997  Richard Basch  <basch@lehman.com>
+
+	* acquire_cred.c (acquire_accept_cred): Removed unused local variable
+
+Tue Feb  4 15:56:01 1997  Richard Basch  <basch@lehman.com>
+
+	* Makefile.in: Only override the object build of the error table
+		under Unix
+
 Wed Dec  4 13:06:13 1996  Barry Jaspan  <bjaspan@mit.edu>
 
 	* acquire_cred.c (acquire_accept_cred): use krb5_kt_get_entry
  	instead of scanning through keytab to find matching principal
  	[krb5-libs/210]
 
+Thu Nov 21 11:55:16 EST 1996    Richard Basch   <basch@lehman.com>
+
+        * Makefile.in: win32 build
+
+	* gssapiP_krb5.h krb5_gss_glue.c:
+	DLL export all public GSSAPI interfaces; adjusted some other
+	declarations accordingly (KRB5_CALLCONV, FAR keywords added)
+
 Wed Nov 20 19:55:29 1996  Marc Horowitz  <marc@cygnus.com>
 
 	* init_sec_context.c (make_ap_rep, krb5_gss_init_sec_context),
diff --git a/src/lib/gssapi/krb5/Makefile.in b/src/lib/gssapi/krb5/Makefile.in
index d48db0291b..45db67345d 100644
--- a/src/lib/gssapi/krb5/Makefile.in
+++ b/src/lib/gssapi/krb5/Makefile.in
@@ -1,18 +1,14 @@
-CFLAGS = $(CCOPTS) $(DEFS) -I. -I$(srcdir) -I../generic -I$(srcdir)/../generic -DUSE_AUTOCONF_H
+CFLAGS = $(CCOPTS) $(DEFS) -I. -I$(srcdir) -I../generic -I$(srcdir)/../generic
 
 ##DOSBUILDTOP = ..\..\..
-##DOSLIBNAME=..\gssapi.$(LIBEXT)
+##DOSMYNAME=krb5
+##DOSOBJFILE = ..\krb5.lst
+##WIN16##LIBNAME=..\gssapi.lib
 
 .c.o:
 	$(CC) $(CFLAGS) -c $(srcdir)/$*.c
 @SHARED_RULE@
 
-all-unix:: shared $(OBJS)
-
-all-mac:: shared $(OBJS)
-
-all-windows:: $(OBJS)
-
 shared:
 	mkdir shared
 
@@ -20,14 +16,13 @@ ETSRCS= gssapi_err_krb5.c
 ETOBJS= gssapi_err_krb5.$(OBJEXT)
 ETHDRS= gssapi_err_krb5.h
 
-gssapi_err_krb5.$(OBJEXT): gssapi_err_krb5.c
+gssapi_err_krb5.o: gssapi_err_krb5.c
 	$(CC) $(CFLAGS) -c $*.c
+
 @SHARED_RULE_LOCAL@
-##WIN16##	$(LIBCMD) $(PAGESIZE) /nologo $(LIBNAME) -+$@;
-##WIN32##	$(LIBCMD) /out:$(LIBNAME) /nologo $@
 
+gssapi_err_krb5.$(OBJEXT): gssapi_err_krb5.c
 gssapi_err_krb5.h: gssapi_err_krb5.et
-
 gssapi_err_krb5.c: gssapi_err_krb5.et
 
 SRCS = \
@@ -115,9 +110,14 @@ HDRS= $(ETHDRS)
 EHDRDIR=$(BUILDTOP)$(S)include$(S)gssapi
 EXPORTED_HEADERS= gssapi_krb5.h
 
-all-unix:: $(SRCS) $(HDRS) includes $(OBJS)
-all-mac:: $(SRCS) $(HDRS) includes $(OBJS)
-all-windows:: win-include $(SRCS) $(HDRS) $(OBJS)
+##DOS$(OBJFILE): $(OBJS)
+##DOS	$(RM) $(OBJFILE)
+##WIN16##	$(CP) nul: $(OBJFILE)
+##WIN32##	$(LIBECHO) -p $(MYNAME)\ *.obj >$(OBJFILE)
+
+all-unix:: shared $(SRCS) $(HDRS) includes $(OBJS)
+all-mac:: shared $(SRCS) $(HDRS) includes $(OBJS)
+all-windows:: win-include $(SRCS) $(HDRS) $(OBJS) $(OBJFILE)
 
 win-include::
 	if not exist $(EHDRDIR)\nul mkdir $(EHDRDIR)
@@ -130,7 +130,7 @@ clean-mac::
 	$(RM) $(ETHDRS) $(ETSRCS) shared/*
 
 clean-windows::
-	$(RM) $(EHDRDIR)\gssapi_krb5.h
+	$(RM) $(EHDRDIR)\gssapi_krb5.h $(OBJFILE)
 	if exist $(EHDRDIR)\nul rmdir $(EHDRDIR)
 
 install::
diff --git a/src/lib/gssapi/krb5/acquire_cred.c b/src/lib/gssapi/krb5/acquire_cred.c
index a99177758f..8f1935038d 100644
--- a/src/lib/gssapi/krb5/acquire_cred.c
+++ b/src/lib/gssapi/krb5/acquire_cred.c
@@ -50,7 +50,6 @@ acquire_accept_cred(context, minor_status, desired_name, output_princ, cred)
    krb5_principal princ;
    krb5_keytab kt;
    krb5_keytab_entry entry;
-   krb5_kt_cursor cur;
 
    *output_princ = NULL;
    cred->keytab = NULL;
diff --git a/src/lib/gssapi/krb5/gssapiP_krb5.h b/src/lib/gssapi/krb5/gssapiP_krb5.h
index 97f2d51d51..d7b01e0210 100644
--- a/src/lib/gssapi/krb5/gssapiP_krb5.h
+++ b/src/lib/gssapi/krb5/gssapiP_krb5.h
@@ -27,11 +27,7 @@
  * $Id$
  */
 
-#if (defined(_MSDOS) || defined(_WIN32) || defined(_MACINTOSH))
-#include <k5-int.h>
-#else
 #include <krb5.h>
-#endif
 #include <memory.h>
 
 /* work around sunos braindamage */
diff --git a/src/lib/gssapi/krb5/krb5_gss_glue.c b/src/lib/gssapi/krb5/krb5_gss_glue.c
index fe3b0208f7..8155d85777 100644
--- a/src/lib/gssapi/krb5/krb5_gss_glue.c
+++ b/src/lib/gssapi/krb5/krb5_gss_glue.c
@@ -26,21 +26,21 @@
 
 #include "gssapiP_krb5.h"
 
-OM_uint32 INTERFACE
+KRB5_DLLIMP OM_uint32 KRB5_CALLCONV
 gss_accept_sec_context(minor_status, context_handle, verifier_cred_handle,
 		       input_token, input_chan_bindings, src_name, mech_type, 
 		       output_token, ret_flags, time_rec, delegated_cred_handle)
-     OM_uint32 *minor_status;
-     gss_ctx_id_t *context_handle;
+     OM_uint32 FAR *minor_status;
+     gss_ctx_id_t FAR *context_handle;
      gss_cred_id_t verifier_cred_handle;
      gss_buffer_t input_token;
      gss_channel_bindings_t input_chan_bindings;
-     gss_name_t *src_name;
-     gss_OID *mech_type;
+     gss_name_t FAR *src_name;
+     gss_OID FAR *mech_type;
      gss_buffer_t output_token;
-     OM_uint32 *ret_flags;
-     OM_uint32 *time_rec;
-     gss_cred_id_t *delegated_cred_handle;
+     OM_uint32 FAR *ret_flags;
+     OM_uint32 FAR *time_rec;
+     gss_cred_id_t FAR *delegated_cred_handle;
 {
    return(krb5_gss_accept_sec_context(minor_status,
 				      context_handle,
@@ -55,17 +55,17 @@ gss_accept_sec_context(minor_status, context_handle, verifier_cred_handle,
 				      delegated_cred_handle));
 }
 
-OM_uint32 INTERFACE
+KRB5_DLLIMP OM_uint32 KRB5_CALLCONV
 gss_acquire_cred(minor_status, desired_name, time_req, desired_mechs,
 		 cred_usage, output_cred_handle, actual_mechs, time_rec)
-     OM_uint32 *minor_status;
+     OM_uint32 FAR *minor_status;
      gss_name_t desired_name;
      OM_uint32 time_req;
      gss_OID_set desired_mechs;
      gss_cred_usage_t cred_usage;
-     gss_cred_id_t *output_cred_handle;
-     gss_OID_set *actual_mechs;
-     OM_uint32 *time_rec;
+     gss_cred_id_t FAR *output_cred_handle;
+     gss_OID_set FAR *actual_mechs;
+     OM_uint32 FAR *time_rec;
 {
    return(krb5_gss_acquire_cred(minor_status,
 				desired_name,
@@ -78,22 +78,22 @@ gss_acquire_cred(minor_status, desired_name, time_req, desired_mechs,
 }
 
 /* V2 */
-OM_uint32 INTERFACE
+KRB5_DLLIMP OM_uint32 KRB5_CALLCONV
 gss_add_cred(minor_status, input_cred_handle, desired_name, desired_mech,
 	     cred_usage, initiator_time_req, acceptor_time_req,
 	     output_cred_handle, actual_mechs, initiator_time_rec,
 	     acceptor_time_rec)
-    OM_uint32		*minor_status;
+    OM_uint32		FAR *minor_status;
     gss_cred_id_t	input_cred_handle;
     gss_name_t		desired_name;
     gss_OID		desired_mech;
     gss_cred_usage_t	cred_usage;
     OM_uint32		initiator_time_req;
     OM_uint32		acceptor_time_req;
-    gss_cred_id_t	*output_cred_handle;
-    gss_OID_set		*actual_mechs;
-    OM_uint32		*initiator_time_rec;
-    OM_uint32		*acceptor_time_rec;
+    gss_cred_id_t	FAR *output_cred_handle;
+    gss_OID_set		FAR *actual_mechs;
+    OM_uint32		FAR *initiator_time_rec;
+    OM_uint32		FAR *acceptor_time_rec;
 {
     return(krb5_gss_add_cred(minor_status, input_cred_handle, desired_name,
 			     desired_mech, cred_usage, initiator_time_req,
@@ -103,74 +103,74 @@ gss_add_cred(minor_status, input_cred_handle, desired_name, desired_mech,
 }
 
 /* V2 */
-OM_uint32 INTERFACE
+KRB5_DLLIMP OM_uint32 KRB5_CALLCONV
 gss_add_oid_set_member(minor_status, member_oid, oid_set)
-    OM_uint32	*minor_status;
+    OM_uint32	FAR *minor_status;
     gss_OID	member_oid;
-    gss_OID_set	*oid_set;
+    gss_OID_set	FAR *oid_set;
 {
     return(generic_gss_add_oid_set_member(minor_status, member_oid, oid_set));
 }
 
-OM_uint32 INTERFACE
+KRB5_DLLIMP OM_uint32 KRB5_CALLCONV
 gss_compare_name(minor_status, name1, name2, name_equal)
-     OM_uint32 *minor_status;
+     OM_uint32 FAR *minor_status;
      gss_name_t name1;
      gss_name_t name2;
-     int *name_equal;
+     int FAR *name_equal;
 {
    return(krb5_gss_compare_name(minor_status, name1,
 				name2, name_equal));
 }
 
-OM_uint32 INTERFACE
+KRB5_DLLIMP OM_uint32 KRB5_CALLCONV
 gss_context_time(minor_status, context_handle, time_rec)
-     OM_uint32 *minor_status;
+     OM_uint32 FAR *minor_status;
      gss_ctx_id_t context_handle;
-     OM_uint32 *time_rec;
+     OM_uint32 FAR *time_rec;
 {
    return(krb5_gss_context_time(minor_status, context_handle,
 				time_rec));
 }
 
 /* V2 */
-OM_uint32 INTERFACE
+KRB5_DLLIMP OM_uint32 KRB5_CALLCONV
 gss_create_empty_oid_set(minor_status, oid_set)
-    OM_uint32	*minor_status;
-    gss_OID_set	*oid_set;
+    OM_uint32	FAR *minor_status;
+    gss_OID_set	FAR *oid_set;
 {
     return(generic_gss_create_empty_oid_set(minor_status, oid_set));
 }
 
-OM_uint32 INTERFACE
+KRB5_DLLIMP OM_uint32 KRB5_CALLCONV
 gss_delete_sec_context(minor_status, context_handle, output_token)
-     OM_uint32 *minor_status;
-     gss_ctx_id_t *context_handle;
+     OM_uint32 FAR *minor_status;
+     gss_ctx_id_t FAR *context_handle;
      gss_buffer_t output_token;
 {
    return(krb5_gss_delete_sec_context(minor_status,
 				      context_handle, output_token));
 }
 
-OM_uint32 INTERFACE
+KRB5_DLLIMP OM_uint32 KRB5_CALLCONV
 gss_display_name(minor_status, input_name, output_name_buffer, output_name_type)
-     OM_uint32 *minor_status;
+     OM_uint32 FAR *minor_status;
      gss_name_t input_name;
      gss_buffer_t output_name_buffer;
-     gss_OID *output_name_type;
+     gss_OID FAR *output_name_type;
 {
    return(krb5_gss_display_name(minor_status, input_name,
 				output_name_buffer, output_name_type));
 }
 
-OM_uint32 INTERFACE
+KRB5_DLLIMP OM_uint32 KRB5_CALLCONV
 gss_display_status(minor_status, status_value, status_type,
 		   mech_type, message_context, status_string)
-     OM_uint32 *minor_status;
+     OM_uint32 FAR *minor_status;
      OM_uint32 status_value;
      int status_type;
      gss_OID mech_type;
-     OM_uint32 *message_context;
+     OM_uint32 FAR *message_context;
      gss_buffer_t status_string;
 {
    return(krb5_gss_display_status(minor_status, status_value,
@@ -179,10 +179,10 @@ gss_display_status(minor_status, status_value, status_type,
 }
 
 /* V2 */
-OM_uint32 INTERFACE
+KRB5_DLLIMP OM_uint32 KRB5_CALLCONV
 gss_export_sec_context(minor_status, context_handle, interprocess_token)
-     OM_uint32		*minor_status;
-     gss_ctx_id_t	*context_handle;
+     OM_uint32		FAR *minor_status;
+     gss_ctx_id_t	FAR *context_handle;
      gss_buffer_t	interprocess_token;
 {
    return(krb5_gss_export_sec_context(minor_status,
@@ -191,10 +191,10 @@ gss_export_sec_context(minor_status, context_handle, interprocess_token)
 }
 
 /* V2 */
-OM_uint32 INTERFACE
+KRB5_DLLIMP OM_uint32 KRB5_CALLCONV
 gss_get_mic(minor_status, context_handle, qop_req,
 	    message_buffer, message_token)
-     OM_uint32		*minor_status;
+     OM_uint32		FAR *minor_status;
      gss_ctx_id_t	context_handle;
      gss_qop_t		qop_req;
      gss_buffer_t	message_buffer;
@@ -204,55 +204,55 @@ gss_get_mic(minor_status, context_handle, qop_req,
 			    qop_req, message_buffer, message_token));
 }
 
-OM_uint32 INTERFACE
+KRB5_DLLIMP OM_uint32 KRB5_CALLCONV
 gss_import_name(minor_status, input_name_buffer, input_name_type, output_name)
-     OM_uint32 *minor_status;
+     OM_uint32 FAR *minor_status;
      gss_buffer_t input_name_buffer;
      gss_OID input_name_type;
-     gss_name_t *output_name;
+     gss_name_t FAR *output_name;
 {
    return(krb5_gss_import_name(minor_status, input_name_buffer,
 			       input_name_type, output_name));
 }
 
 /* V2 */
-OM_uint32 INTERFACE
+KRB5_DLLIMP OM_uint32 KRB5_CALLCONV
 gss_import_sec_context(minor_status, interprocess_token, context_handle)
-     OM_uint32		*minor_status;
+     OM_uint32		FAR *minor_status;
      gss_buffer_t	interprocess_token;
-     gss_ctx_id_t	*context_handle;
+     gss_ctx_id_t	FAR *context_handle;
 {
    return(krb5_gss_import_sec_context(minor_status,
 				      interprocess_token,
 				      context_handle));
 }
 
-OM_uint32 INTERFACE
+KRB5_DLLIMP OM_uint32 KRB5_CALLCONV
 gss_indicate_mechs(minor_status, mech_set)
-     OM_uint32 *minor_status;
-     gss_OID_set *mech_set;
+     OM_uint32 FAR *minor_status;
+     gss_OID_set FAR *mech_set;
 {
    return(krb5_gss_indicate_mechs(minor_status, mech_set));
 }
 
-OM_uint32 INTERFACE
+KRB5_DLLIMP OM_uint32 KRB5_CALLCONV
 gss_init_sec_context(minor_status, claimant_cred_handle, context_handle,
 		     target_name, mech_type, req_flags, time_req,
 		     input_chan_bindings, input_token, actual_mech_type,
 		     output_token, ret_flags, time_rec)
-     OM_uint32 *minor_status;
+     OM_uint32 FAR *minor_status;
      gss_cred_id_t claimant_cred_handle;
-     gss_ctx_id_t *context_handle;
+     gss_ctx_id_t FAR *context_handle;
      gss_name_t target_name;
      gss_OID mech_type;
      OM_uint32 req_flags;
      OM_uint32 time_req;
      gss_channel_bindings_t input_chan_bindings;
      gss_buffer_t input_token;
-     gss_OID *actual_mech_type;
+     gss_OID FAR *actual_mech_type;
      gss_buffer_t output_token;
-     OM_uint32 *ret_flags;
-     OM_uint32 *time_rec;
+     OM_uint32 FAR *ret_flags;
+     OM_uint32 FAR *time_rec;
 {
    return(krb5_gss_init_sec_context(minor_status,
 				    claimant_cred_handle, context_handle,
@@ -262,19 +262,19 @@ gss_init_sec_context(minor_status, claimant_cred_handle, context_handle,
 				    time_rec));
 }
 
-OM_uint32 INTERFACE
+KRB5_DLLIMP OM_uint32 KRB5_CALLCONV
 gss_inquire_context(minor_status, context_handle, initiator_name, acceptor_name,
 		    lifetime_rec, mech_type, ret_flags,
 		    locally_initiated, open)
-     OM_uint32 *minor_status;
+     OM_uint32 FAR *minor_status;
      gss_ctx_id_t context_handle;
-     gss_name_t *initiator_name;
-     gss_name_t *acceptor_name;
-     OM_uint32 *lifetime_rec;
-     gss_OID *mech_type;
-     OM_uint32 *ret_flags;
-     int *locally_initiated;
-     int *open;
+     gss_name_t FAR *initiator_name;
+     gss_name_t FAR *acceptor_name;
+     OM_uint32 FAR *lifetime_rec;
+     gss_OID FAR *mech_type;
+     OM_uint32 FAR *ret_flags;
+     int FAR *locally_initiated;
+     int FAR *open;
 {
    return(krb5_gss_inquire_context(minor_status, context_handle,
 				   initiator_name, acceptor_name, lifetime_rec,
@@ -282,31 +282,31 @@ gss_inquire_context(minor_status, context_handle, initiator_name, acceptor_name,
 				   open));
 }
 
-OM_uint32 INTERFACE
+KRB5_DLLIMP OM_uint32 KRB5_CALLCONV
 gss_inquire_cred(minor_status, cred_handle, name, lifetime_ret,
 		 cred_usage, mechanisms)
-     OM_uint32 *minor_status;
+     OM_uint32 FAR *minor_status;
      gss_cred_id_t cred_handle;
-     gss_name_t *name;
-     OM_uint32 *lifetime_ret;
-     gss_cred_usage_t *cred_usage;
-     gss_OID_set *mechanisms;
+     gss_name_t FAR *name;
+     OM_uint32 FAR *lifetime_ret;
+     gss_cred_usage_t FAR *cred_usage;
+     gss_OID_set FAR *mechanisms;
 {
    return(krb5_gss_inquire_cred(minor_status, cred_handle,
 				name, lifetime_ret, cred_usage, mechanisms));
 }
 
 /* V2 */
-OM_uint32 INTERFACE
+KRB5_DLLIMP OM_uint32 KRB5_CALLCONV
 gss_inquire_cred_by_mech(minor_status, cred_handle, mech_type, name,
 			 initiator_lifetime, acceptor_lifetime, cred_usage)
-     OM_uint32		*minor_status;
+     OM_uint32		FAR *minor_status;
      gss_cred_id_t	cred_handle;
      gss_OID		mech_type;
-     gss_name_t		*name;
-     OM_uint32		*initiator_lifetime;
-     OM_uint32		*acceptor_lifetime;
-     gss_cred_usage_t	*cred_usage;
+     gss_name_t		FAR *name;
+     OM_uint32		FAR *initiator_lifetime;
+     OM_uint32		FAR *acceptor_lifetime;
+     gss_cred_usage_t	FAR *cred_usage;
 {
    return(krb5_gss_inquire_cred_by_mech(minor_status, cred_handle,
 					mech_type, name, initiator_lifetime,
@@ -314,11 +314,11 @@ gss_inquire_cred_by_mech(minor_status, cred_handle, mech_type, name,
 }
 
 /* V2 */
-OM_uint32 INTERFACE
+KRB5_DLLIMP OM_uint32 KRB5_CALLCONV
 gss_inquire_names_for_mech(minor_status, mechanism, name_types)
-    OM_uint32	*minor_status;
+    OM_uint32	FAR *minor_status;
     gss_OID	mechanism;
-    gss_OID_set	*name_types;
+    gss_OID_set	FAR *name_types;
 {
     return(krb5_gss_inquire_names_for_mech(minor_status,
 					   mechanism,
@@ -326,18 +326,18 @@ gss_inquire_names_for_mech(minor_status, mechanism, name_types)
 }
 
 /* V2 */
-OM_uint32 INTERFACE
+KRB5_DLLIMP OM_uint32 KRB5_CALLCONV
 gss_oid_to_str(minor_status, oid, oid_str)
-    OM_uint32		*minor_status;
+    OM_uint32		FAR *minor_status;
     gss_OID		oid;
     gss_buffer_t	oid_str;
 {
     return(generic_gss_oid_to_str(minor_status, oid, oid_str));
 }
 
-OM_uint32 INTERFACE
+KRB5_DLLIMP OM_uint32 KRB5_CALLCONV
 gss_process_context_token(minor_status, context_handle, token_buffer)
-     OM_uint32 *minor_status;
+     OM_uint32 FAR *minor_status;
      gss_ctx_id_t context_handle;
      gss_buffer_t token_buffer;
 {
@@ -345,25 +345,25 @@ gss_process_context_token(minor_status, context_handle, token_buffer)
 					 context_handle, token_buffer));
 }
 
-OM_uint32 INTERFACE
+KRB5_DLLIMP OM_uint32 KRB5_CALLCONV
 gss_release_cred(minor_status, cred_handle)
-     OM_uint32 *minor_status;
-     gss_cred_id_t *cred_handle;
+     OM_uint32 FAR *minor_status;
+     gss_cred_id_t FAR *cred_handle;
 {
    return(krb5_gss_release_cred(minor_status, cred_handle));
 }
 
-OM_uint32 INTERFACE
+KRB5_DLLIMP OM_uint32 KRB5_CALLCONV
 gss_release_name(minor_status, input_name)
-     OM_uint32 *minor_status;
-     gss_name_t *input_name;
+     OM_uint32 FAR *minor_status;
+     gss_name_t FAR *input_name;
 {
    return(krb5_gss_release_name(minor_status, input_name));
 }
 
-OM_uint32 INTERFACE
+KRB5_DLLIMP OM_uint32 KRB5_CALLCONV
 gss_release_buffer(minor_status, buffer)
-     OM_uint32 *minor_status;
+     OM_uint32 FAR *minor_status;
      gss_buffer_t buffer;
 {
    return(generic_gss_release_buffer(minor_status,
@@ -371,32 +371,32 @@ gss_release_buffer(minor_status, buffer)
 }
 
 /* V2 */
-OM_uint32 INTERFACE
+KRB5_DLLIMP OM_uint32 KRB5_CALLCONV
 gss_release_oid(minor_status, oid)
-     OM_uint32	*minor_status;
-     gss_OID	*oid;
+     OM_uint32	FAR *minor_status;
+     gss_OID	FAR *oid;
 {
     return(krb5_gss_release_oid(minor_status, oid));
 }
 
-OM_uint32 INTERFACE
+KRB5_DLLIMP OM_uint32 KRB5_CALLCONV
 gss_release_oid_set(minor_status, set)
-     OM_uint32* minor_status;
-     gss_OID_set *set;
+     OM_uint32 FAR * minor_status;
+     gss_OID_set FAR *set;
 {
    return(generic_gss_release_oid_set(minor_status, set));
 }
 
 /* V1 only */
-OM_uint32 INTERFACE
+KRB5_DLLIMP OM_uint32 KRB5_CALLCONV
 gss_seal(minor_status, context_handle, conf_req_flag, qop_req,
 	 input_message_buffer, conf_state, output_message_buffer)
-     OM_uint32 *minor_status;
+     OM_uint32 FAR *minor_status;
      gss_ctx_id_t context_handle;
      int conf_req_flag;
      int qop_req;
      gss_buffer_t input_message_buffer;
-     int *conf_state;
+     int FAR *conf_state;
      gss_buffer_t output_message_buffer;
 {
    return(krb5_gss_seal(minor_status, context_handle,
@@ -404,11 +404,11 @@ gss_seal(minor_status, context_handle, conf_req_flag, qop_req,
 			conf_state, output_message_buffer));
 }
 
-OM_uint32 INTERFACE
+KRB5_DLLIMP OM_uint32 KRB5_CALLCONV
 gss_sign(minor_status, context_handle,
 	      qop_req, message_buffer, 
 	      message_token)
-     OM_uint32 *minor_status;
+     OM_uint32 FAR *minor_status;
      gss_ctx_id_t context_handle;
      int qop_req;
      gss_buffer_t message_buffer;
@@ -419,29 +419,29 @@ gss_sign(minor_status, context_handle,
 }
 
 /* V2 */
-OM_uint32 INTERFACE
+KRB5_DLLIMP OM_uint32 KRB5_CALLCONV
 gss_verify_mic(minor_status, context_handle,
 	       message_buffer, token_buffer, qop_state)
-     OM_uint32		*minor_status;
+     OM_uint32		FAR *minor_status;
      gss_ctx_id_t	context_handle;
      gss_buffer_t	message_buffer;
      gss_buffer_t	token_buffer;
-     gss_qop_t		*qop_state;
+     gss_qop_t		FAR *qop_state;
 {
     return(krb5_gss_verify_mic(minor_status, context_handle,
 			       message_buffer, token_buffer, qop_state));
 }
 
 /* V2 */
-OM_uint32 INTERFACE
+KRB5_DLLIMP OM_uint32 KRB5_CALLCONV
 gss_wrap(minor_status, context_handle, conf_req_flag, qop_req,
 	 input_message_buffer, conf_state, output_message_buffer)
-    OM_uint32		*minor_status;
+    OM_uint32		FAR *minor_status;
     gss_ctx_id_t	context_handle;
     int			conf_req_flag;
     gss_qop_t		qop_req;
     gss_buffer_t	input_message_buffer;
-    int			*conf_state;
+    int			FAR *conf_state;
     gss_buffer_t	output_message_buffer;
 {
     return(krb5_gss_wrap(minor_status, context_handle, conf_req_flag, qop_req,
@@ -450,37 +450,37 @@ gss_wrap(minor_status, context_handle, conf_req_flag, qop_req,
 }
 
 /* V2 */
-OM_uint32 INTERFACE
+KRB5_DLLIMP OM_uint32 KRB5_CALLCONV
 gss_str_to_oid(minor_status, oid_str, oid)
-    OM_uint32		*minor_status;
+    OM_uint32		FAR *minor_status;
     gss_buffer_t	oid_str;
-    gss_OID		*oid;
+    gss_OID		FAR *oid;
 {
     return(generic_gss_str_to_oid(minor_status, oid_str, oid));
 }
 
 /* V2 */
-OM_uint32 INTERFACE
+KRB5_DLLIMP OM_uint32 KRB5_CALLCONV
 gss_test_oid_set_member(minor_status, member, set, present)
-    OM_uint32	*minor_status;
+    OM_uint32	FAR *minor_status;
     gss_OID	member;
     gss_OID_set	set;
-    int		*present;
+    int		FAR *present;
 {
     return(generic_gss_test_oid_set_member(minor_status, member, set,
 					   present));
 }
 
 /* V1 only */
-OM_uint32 INTERFACE
+KRB5_DLLIMP OM_uint32 KRB5_CALLCONV
 gss_unseal(minor_status, context_handle, input_message_buffer,
 	   output_message_buffer, conf_state, qop_state)
-     OM_uint32 *minor_status;
+     OM_uint32 FAR *minor_status;
      gss_ctx_id_t context_handle;
      gss_buffer_t input_message_buffer;
      gss_buffer_t output_message_buffer;
-     int *conf_state;
-     int *qop_state;
+     int FAR *conf_state;
+     int FAR *qop_state;
 {
    return(krb5_gss_unseal(minor_status, context_handle,
 			  input_message_buffer, output_message_buffer,
@@ -488,29 +488,29 @@ gss_unseal(minor_status, context_handle, input_message_buffer,
 }
 
 /* V2 */
-OM_uint32 INTERFACE
+KRB5_DLLIMP OM_uint32 KRB5_CALLCONV
 gss_unwrap(minor_status, context_handle, input_message_buffer, 
 	   output_message_buffer, conf_state, qop_state)
-    OM_uint32		*minor_status;
+    OM_uint32		FAR *minor_status;
     gss_ctx_id_t	context_handle;
     gss_buffer_t	input_message_buffer;
     gss_buffer_t	output_message_buffer;
-    int			*conf_state;
-    gss_qop_t		*qop_state;
+    int			FAR *conf_state;
+    gss_qop_t		FAR *qop_state;
 {
     return(krb5_gss_unwrap(minor_status, context_handle, input_message_buffer,
 			   output_message_buffer, conf_state, qop_state));
 }
 
 /* V1 only */
-OM_uint32 INTERFACE
+KRB5_DLLIMP OM_uint32 KRB5_CALLCONV
 gss_verify(minor_status, context_handle, message_buffer,
 	   token_buffer, qop_state)
-     OM_uint32 *minor_status;
+     OM_uint32 FAR *minor_status;
      gss_ctx_id_t context_handle;
      gss_buffer_t message_buffer;
      gss_buffer_t token_buffer;
-     int *qop_state;
+     int FAR *qop_state;
 {
    return(krb5_gss_verify(minor_status,
 			  context_handle,
@@ -520,15 +520,15 @@ gss_verify(minor_status, context_handle, message_buffer,
 }
 
 /* V2 interface */
-OM_uint32 INTERFACE
+KRB5_DLLIMP OM_uint32 KRB5_CALLCONV
 gss_wrap_size_limit(minor_status, context_handle, conf_req_flag,
 		    qop_req, req_output_size, max_input_size)
-    OM_uint32		*minor_status;
+    OM_uint32		FAR *minor_status;
     gss_ctx_id_t	context_handle;
     int			conf_req_flag;
     gss_qop_t		qop_req;
     OM_uint32		req_output_size;
-    OM_uint32		*max_input_size;
+    OM_uint32		FAR *max_input_size;
 {
    return(krb5_gss_wrap_size_limit(minor_status, context_handle,
 				   conf_req_flag, qop_req,
diff --git a/src/lib/gssapi/krb5/ser_sctx.c b/src/lib/gssapi/krb5/ser_sctx.c
index 22b5c367ce..36e70d742c 100644
--- a/src/lib/gssapi/krb5/ser_sctx.c
+++ b/src/lib/gssapi/krb5/ser_sctx.c
@@ -25,6 +25,7 @@
 /*
  * ser_sctx.c - Handle [de]serialization of GSSAPI security context.
  */
+#include "k5-int.h"
 #include "gssapiP_krb5.h"
 
 /*
diff --git a/src/lib/gssapi/mechglue/ChangeLog b/src/lib/gssapi/mechglue/ChangeLog
index 9f8fb1bc4a..35c48afca5 100644
--- a/src/lib/gssapi/mechglue/ChangeLog
+++ b/src/lib/gssapi/mechglue/ChangeLog
@@ -1,3 +1,14 @@
+Wed Feb  5 10:37:00 1996  Richard Basch  <basch@lehman.com>
+
+	* g_accept_sec_context.c g_acquire_cred.c g_compare_name.c
+	  g_context_time.c g_delete_sec_context.c g_dsp_name.c
+	  g_dsp_status.c g_exp_sec_context.c g_imp_name.c
+	  g_imp_sec_context.c g_indicate_mechs.c g_init_sec_context.c
+	  g_inq_context.c g_inq_cred.c g_inq_names.c g_process_context.c
+	  g_rel_buffer.c g_rel_cred.c g_rel_name.c g_rel_oid_set.c
+	  g_seal.c g_sign.c g_unseal.c g_verify.c
+		Changed INTERFACE keyword to KRB5_CALLCONV
+
 Mon Nov 18 20:43:54 1996  Ezra Peisach  <epeisach@mit.edu>
 
 	* configure.in: Shared library version number to 1.0. [krb5-libs/201]
diff --git a/src/lib/gssapi/mechglue/g_accept_sec_context.c b/src/lib/gssapi/mechglue/g_accept_sec_context.c
index 286dc2432c..8cc752fe74 100644
--- a/src/lib/gssapi/mechglue/g_accept_sec_context.c
+++ b/src/lib/gssapi/mechglue/g_accept_sec_context.c
@@ -33,7 +33,7 @@
 #include <string.h>
 #include <errno.h>
 
-OM_uint32 INTERFACE
+OM_uint32 KRB5_CALLCONV
 gss_accept_sec_context (minor_status,
                         context_handle,
                         verifier_cred_handle,
diff --git a/src/lib/gssapi/mechglue/g_acquire_cred.c b/src/lib/gssapi/mechglue/g_acquire_cred.c
index 97bc8e0f51..d6ff8897a8 100644
--- a/src/lib/gssapi/mechglue/g_acquire_cred.c
+++ b/src/lib/gssapi/mechglue/g_acquire_cred.c
@@ -378,7 +378,7 @@ error_out:
     return(status);
 }
 
-/* V2 INTERFACE */
+/* V2 KRB5_CALLCONV */
 KRB5_DLLIMP OM_uint32 KRB5_CALLCONV
 gss_add_cred(minor_status, input_cred_handle,
 		  desired_name, desired_mech, cred_usage,
diff --git a/src/lib/gssapi/mechglue/g_compare_name.c b/src/lib/gssapi/mechglue/g_compare_name.c
index 97e08d0f00..851be4a85b 100644
--- a/src/lib/gssapi/mechglue/g_compare_name.c
+++ b/src/lib/gssapi/mechglue/g_compare_name.c
@@ -37,7 +37,7 @@
    (((o1)->length == (o2)->length) && \
     (memcmp((o1)->elements,(o2)->elements,(int) (o1)->length) == 0))
 
-OM_uint32 INTERFACE
+OM_uint32 KRB5_CALLCONV
 gss_compare_name (minor_status,
                   name1,
                   name2,
diff --git a/src/lib/gssapi/mechglue/g_context_time.c b/src/lib/gssapi/mechglue/g_context_time.c
index 7351564f59..6f08c9224e 100644
--- a/src/lib/gssapi/mechglue/g_context_time.c
+++ b/src/lib/gssapi/mechglue/g_context_time.c
@@ -28,7 +28,7 @@
 
 #include "mglueP.h"
 
-OM_uint32 INTERFACE
+OM_uint32 KRB5_CALLCONV
 gss_context_time (minor_status,
                   context_handle,
                   time_rec)
diff --git a/src/lib/gssapi/mechglue/g_delete_sec_context.c b/src/lib/gssapi/mechglue/g_delete_sec_context.c
index 5138569e2a..fae0b0ac33 100644
--- a/src/lib/gssapi/mechglue/g_delete_sec_context.c
+++ b/src/lib/gssapi/mechglue/g_delete_sec_context.c
@@ -32,7 +32,7 @@
 #include <stdlib.h>
 #endif
 
-OM_uint32 INTERFACE 
+OM_uint32 KRB5_CALLCONV 
 gss_delete_sec_context (minor_status,
                         context_handle,
                         output_token)
diff --git a/src/lib/gssapi/mechglue/g_dsp_name.c b/src/lib/gssapi/mechglue/g_dsp_name.c
index c7abaf9b13..8bd0426c33 100644
--- a/src/lib/gssapi/mechglue/g_dsp_name.c
+++ b/src/lib/gssapi/mechglue/g_dsp_name.c
@@ -34,7 +34,7 @@
 #endif
 #include <string.h>
 
-OM_uint32 INTERFACE
+OM_uint32 KRB5_CALLCONV
 gss_display_name (minor_status,
                   input_name,
                   output_name_buffer,
diff --git a/src/lib/gssapi/mechglue/g_dsp_status.c b/src/lib/gssapi/mechglue/g_dsp_status.c
index 3c6e5785b3..4b58c38f70 100644
--- a/src/lib/gssapi/mechglue/g_dsp_status.c
+++ b/src/lib/gssapi/mechglue/g_dsp_status.c
@@ -33,7 +33,7 @@
 #include <stdlib.h>
 #endif
 
-OM_uint32 INTERFACE
+OM_uint32 KRB5_CALLCONV
 gss_display_status (minor_status,
                     status_value,
                     status_type,
diff --git a/src/lib/gssapi/mechglue/g_exp_sec_context.c b/src/lib/gssapi/mechglue/g_exp_sec_context.c
index 61488c70b4..958553b49b 100644
--- a/src/lib/gssapi/mechglue/g_exp_sec_context.c
+++ b/src/lib/gssapi/mechglue/g_exp_sec_context.c
@@ -34,7 +34,7 @@
 #endif
 #include <string.h>
 
-OM_uint32 INTERFACE
+OM_uint32 KRB5_CALLCONV
 gss_export_sec_context(minor_status,
                        context_handle,
                        interprocess_token)
diff --git a/src/lib/gssapi/mechglue/g_imp_name.c b/src/lib/gssapi/mechglue/g_imp_name.c
index 3e90d36e4e..e93b4c9acd 100644
--- a/src/lib/gssapi/mechglue/g_imp_name.c
+++ b/src/lib/gssapi/mechglue/g_imp_name.c
@@ -35,7 +35,7 @@
 #include <string.h>
 #include <errno.h>
 
-OM_uint32 INTERFACE
+OM_uint32 KRB5_CALLCONV
 gss_import_name(minor_status,
                 input_name_buffer,
                 input_name_type,
diff --git a/src/lib/gssapi/mechglue/g_imp_sec_context.c b/src/lib/gssapi/mechglue/g_imp_sec_context.c
index c7ed23d6bb..eed9bbedaf 100644
--- a/src/lib/gssapi/mechglue/g_imp_sec_context.c
+++ b/src/lib/gssapi/mechglue/g_imp_sec_context.c
@@ -34,7 +34,7 @@
 #endif
 #include <string.h>
 
-OM_uint32 INTERFACE
+OM_uint32 KRB5_CALLCONV
 gss_import_sec_context(minor_status,
                        interprocess_token,
                        context_handle)
diff --git a/src/lib/gssapi/mechglue/g_indicate_mechs.c b/src/lib/gssapi/mechglue/g_indicate_mechs.c
index 4bf7eed733..334f7c1b94 100644
--- a/src/lib/gssapi/mechglue/g_indicate_mechs.c
+++ b/src/lib/gssapi/mechglue/g_indicate_mechs.c
@@ -38,7 +38,7 @@ extern gss_mechanism *__gss_mechs_array;
 static gss_OID_set_desc	supported_mechs_desc; 
 static gss_OID_set supported_mechs = NULL;
 
-OM_uint32 INTERFACE
+OM_uint32 KRB5_CALLCONV
 gss_indicate_mechs (minor_status,
                     mech_set)
 
diff --git a/src/lib/gssapi/mechglue/g_init_sec_context.c b/src/lib/gssapi/mechglue/g_init_sec_context.c
index 96d678332e..1e19c57e4e 100644
--- a/src/lib/gssapi/mechglue/g_init_sec_context.c
+++ b/src/lib/gssapi/mechglue/g_init_sec_context.c
@@ -37,7 +37,7 @@
    (((o1)->length == (o2)->length) && \
     (memcmp((o1)->elements,(o2)->elements,(int) (o1)->length) == 0))
 
-OM_uint32 INTERFACE
+OM_uint32 KRB5_CALLCONV
 gss_init_sec_context (minor_status,
                       claimant_cred_handle,
                       context_handle,
diff --git a/src/lib/gssapi/mechglue/g_inq_context.c b/src/lib/gssapi/mechglue/g_inq_context.c
index 105d203f88..3f28c484fc 100644
--- a/src/lib/gssapi/mechglue/g_inq_context.c
+++ b/src/lib/gssapi/mechglue/g_inq_context.c
@@ -32,7 +32,7 @@
 #endif
 
 /* Last argument new for V2 */
-OM_uint32 INTERFACE
+OM_uint32 KRB5_CALLCONV
 gss_inquire_context(
 	    minor_status,
 	    context_handle,
diff --git a/src/lib/gssapi/mechglue/g_inq_cred.c b/src/lib/gssapi/mechglue/g_inq_cred.c
index 27412df02c..e0a2bc4a83 100644
--- a/src/lib/gssapi/mechglue/g_inq_cred.c
+++ b/src/lib/gssapi/mechglue/g_inq_cred.c
@@ -34,7 +34,7 @@
 #include <string.h>
 #include <time.h>
 
-OM_uint32 INTERFACE
+OM_uint32 KRB5_CALLCONV
 gss_inquire_cred(minor_status,
                  cred_handle,
                  name,
@@ -159,7 +159,7 @@ gss_OID_set *		mechanisms;
     return(GSS_S_COMPLETE);
 }
 
-OM_uint32 INTERFACE
+OM_uint32 KRB5_CALLCONV
 gss_inquire_cred_by_mech(minor_status, cred_handle, mech_type, name,
 			 initiator_lifetime, acceptor_lifetime, cred_usage)
     OM_uint32		*minor_status;
diff --git a/src/lib/gssapi/mechglue/g_inq_names.c b/src/lib/gssapi/mechglue/g_inq_names.c
index 9715951910..7c07f44edd 100644
--- a/src/lib/gssapi/mechglue/g_inq_names.c
+++ b/src/lib/gssapi/mechglue/g_inq_names.c
@@ -29,7 +29,7 @@
 #include "mglueP.h"
 
 /* Last argument new for V2 */
-OM_uint32 INTERFACE
+OM_uint32 KRB5_CALLCONV
 gss_inquire_names_for_mech(minor_status, mechanism, name_types)
 
 OM_uint32 *	minor_status;
diff --git a/src/lib/gssapi/mechglue/g_process_context.c b/src/lib/gssapi/mechglue/g_process_context.c
index b09b2a6f5d..dcb4716bc4 100644
--- a/src/lib/gssapi/mechglue/g_process_context.c
+++ b/src/lib/gssapi/mechglue/g_process_context.c
@@ -28,7 +28,7 @@
 
 #include "mglueP.h"
 
-OM_uint32 INTERFACE
+OM_uint32 KRB5_CALLCONV
 gss_process_context_token (minor_status,
                            context_handle,
                            token_buffer)
diff --git a/src/lib/gssapi/mechglue/g_rel_buffer.c b/src/lib/gssapi/mechglue/g_rel_buffer.c
index b39f3057e5..6f8367a1d8 100644
--- a/src/lib/gssapi/mechglue/g_rel_buffer.c
+++ b/src/lib/gssapi/mechglue/g_rel_buffer.c
@@ -32,7 +32,7 @@
 #include <stdlib.h>
 #endif
 
-OM_uint32 INTERFACE
+OM_uint32 KRB5_CALLCONV
 gss_release_buffer (minor_status,
 		    buffer)
 
diff --git a/src/lib/gssapi/mechglue/g_rel_cred.c b/src/lib/gssapi/mechglue/g_rel_cred.c
index 092492e7ff..44d82709e4 100644
--- a/src/lib/gssapi/mechglue/g_rel_cred.c
+++ b/src/lib/gssapi/mechglue/g_rel_cred.c
@@ -32,7 +32,7 @@
 #include <stdlib.h>
 #endif
 
-OM_uint32 INTERFACE
+OM_uint32 KRB5_CALLCONV
 gss_release_cred(minor_status,
                  cred_handle)
 
diff --git a/src/lib/gssapi/mechglue/g_rel_name.c b/src/lib/gssapi/mechglue/g_rel_name.c
index 101b730092..29c3f98199 100644
--- a/src/lib/gssapi/mechglue/g_rel_name.c
+++ b/src/lib/gssapi/mechglue/g_rel_name.c
@@ -33,7 +33,7 @@
 #endif
 #include <string.h>
 
-OM_uint32 INTERFACE
+OM_uint32 KRB5_CALLCONV
 gss_release_name (minor_status,
 		  input_name)
 
diff --git a/src/lib/gssapi/mechglue/g_rel_oid_set.c b/src/lib/gssapi/mechglue/g_rel_oid_set.c
index e52057f225..357c00e67e 100644
--- a/src/lib/gssapi/mechglue/g_rel_oid_set.c
+++ b/src/lib/gssapi/mechglue/g_rel_oid_set.c
@@ -32,7 +32,7 @@
 #include <stdlib.h>
 #endif
 
-OM_uint32 INTERFACE
+OM_uint32 KRB5_CALLCONV
 gss_release_oid_set (minor_status,
 		     set)
 
diff --git a/src/lib/gssapi/mechglue/g_seal.c b/src/lib/gssapi/mechglue/g_seal.c
index 412202deeb..7d66e469ae 100644
--- a/src/lib/gssapi/mechglue/g_seal.c
+++ b/src/lib/gssapi/mechglue/g_seal.c
@@ -28,7 +28,7 @@
 
 #include "mglueP.h"
 
-OM_uint32 INTERFACE
+OM_uint32 KRB5_CALLCONV
 gss_seal (minor_status,
           context_handle,
           conf_req_flag,
@@ -83,7 +83,7 @@ gss_buffer_t		output_message_buffer;
     return(GSS_S_NO_CONTEXT);
 }
 
-OM_uint32 INTERFACE
+OM_uint32 KRB5_CALLCONV
 gss_wrap (minor_status,
           context_handle,
           conf_req_flag,
@@ -109,7 +109,7 @@ gss_buffer_t		output_message_buffer;
 /*
  * New for V2
  */
-OM_uint32 INTERFACE
+OM_uint32 KRB5_CALLCONV
 gss_wrap_size_limit(minor_status, context_handle, conf_req_flag,
 		    qop_req, req_output_size, max_input_size)
     OM_uint32		*minor_status;
diff --git a/src/lib/gssapi/mechglue/g_sign.c b/src/lib/gssapi/mechglue/g_sign.c
index 78eee681d5..4dfd3ec718 100644
--- a/src/lib/gssapi/mechglue/g_sign.c
+++ b/src/lib/gssapi/mechglue/g_sign.c
@@ -28,7 +28,7 @@
 
 #include "mglueP.h"
 
-OM_uint32 INTERFACE
+OM_uint32 KRB5_CALLCONV
 gss_sign (minor_status,
           context_handle,
           qop_req,
@@ -77,7 +77,7 @@ gss_buffer_t		msg_token;
     return(GSS_S_NO_CONTEXT);
 }
 
-OM_uint32 INTERFACE
+OM_uint32 KRB5_CALLCONV
 gss_get_mic (minor_status,
           context_handle,
           qop_req,
diff --git a/src/lib/gssapi/mechglue/g_unseal.c b/src/lib/gssapi/mechglue/g_unseal.c
index 35cab05e2e..9ca1c15129 100644
--- a/src/lib/gssapi/mechglue/g_unseal.c
+++ b/src/lib/gssapi/mechglue/g_unseal.c
@@ -28,7 +28,7 @@
 
 #include "mglueP.h"
 
-OM_uint32 INTERFACE
+OM_uint32 KRB5_CALLCONV
 gss_unseal (minor_status,
             context_handle,
             input_message_buffer,
@@ -80,7 +80,7 @@ int *			qop_state;
     return(GSS_S_NO_CONTEXT);
 }
 
-OM_uint32 INTERFACE
+OM_uint32 KRB5_CALLCONV
 gss_unwrap (minor_status,
             context_handle,
             input_message_buffer,
diff --git a/src/lib/gssapi/mechglue/g_verify.c b/src/lib/gssapi/mechglue/g_verify.c
index 53ed26268f..7fc86b448b 100644
--- a/src/lib/gssapi/mechglue/g_verify.c
+++ b/src/lib/gssapi/mechglue/g_verify.c
@@ -28,7 +28,7 @@
 
 #include "mglueP.h"
 
-OM_uint32 INTERFACE
+OM_uint32 KRB5_CALLCONV
 gss_verify (minor_status,
             context_handle,
             message_buffer,
@@ -77,7 +77,7 @@ int *			qop_state;
     return(GSS_S_NO_CONTEXT);
 }
 
-OM_uint32 INTERFACE
+OM_uint32 KRB5_CALLCONV
 gss_verify_mic (minor_status,
             context_handle,
             message_buffer,
diff --git a/src/lib/gssapi16.def b/src/lib/gssapi16.def
new file mode 100644
index 0000000000..c2cbe93f79
--- /dev/null
+++ b/src/lib/gssapi16.def
@@ -0,0 +1,77 @@
+;----------------------------------------------------
+;   GSSAPI.DEF - GSSAPI.DLL module definition file
+;----------------------------------------------------
+
+LIBRARY		GSSAPI
+DESCRIPTION	'Base Generic Security Service API'
+EXETYPE		WINDOWS
+CODE		PRELOAD MOVEABLE DISCARDABLE
+DATA		PRELOAD MOVEABLE SINGLE
+HEAPSIZE	8192
+
+EXPORTS
+	WEP					@1001 RESIDENTNAME
+	LibMain					@1002
+;
+	gss_acquire_cred
+	gss_release_cred
+	gss_init_sec_context
+	gss_accept_sec_context
+	gss_process_context_token
+	gss_delete_sec_context
+	gss_context_time
+	gss_sign
+	gss_verify
+	gss_seal
+	gss_unseal
+	gss_display_status
+	gss_indicate_mechs
+	gss_compare_name
+	gss_display_name
+	gss_import_name
+	gss_release_name
+	gss_release_buffer
+	gss_release_oid_set
+	gss_inquire_cred
+;
+; GSS-API v2  additional credential calls
+;
+	gss_add_cred
+	gss_inquire_cred_by_mech
+;
+; GSS-API v2  additional context-level calls
+;
+	gss_inquire_context
+	gss_wrap_size_limit
+	gss_export_sec_context
+	gss_import_sec_context
+;
+; GSS-API v2  additional calls for OID and OID_set operations
+;
+	gss_release_oid
+	gss_create_empty_oid_set
+	gss_add_oid_set_member
+	gss_test_oid_set_member
+	gss_oid_to_str
+	gss_str_to_oid
+;
+; GSS-API v2  renamed message protection calls
+;
+	gss_wrap
+	gss_unwrap
+	gss_get_mic
+	gss_verify_mic
+;
+; GSS-API v2  future extensions
+;
+	gss_inquire_names_for_mech
+;	gss_inquire_mechs_for_name
+;	gss_canonicalize_name
+;	gss_export_name
+;
+; GSS-API variables
+;
+	_gss_nt_user_name
+	_gss_nt_machine_uid_name
+	_gss_nt_string_uid_name
+	_gss_nt_service_name
diff --git a/src/lib/gssapi32.def b/src/lib/gssapi32.def
new file mode 100644
index 0000000000..959e0f8d05
--- /dev/null
+++ b/src/lib/gssapi32.def
@@ -0,0 +1,77 @@
+;----------------------------------------------------
+;   GSSAPI.DEF - GSSAPI.DLL module definition file
+;----------------------------------------------------
+
+;LIBRARY		GSSAPI
+DESCRIPTION	'Base Generic Security Service API'
+EXETYPE		WINDOWS
+CODE		PRELOAD MOVEABLE DISCARDABLE
+DATA		PRELOAD MOVEABLE SINGLE
+HEAPSIZE	8192
+
+EXPORTS
+	WEP					@1001 RESIDENTNAME
+	LibMain					@1002
+;
+	gss_acquire_cred
+	gss_release_cred
+	gss_init_sec_context
+	gss_accept_sec_context
+	gss_process_context_token
+	gss_delete_sec_context
+	gss_context_time
+	gss_sign
+	gss_verify
+	gss_seal
+	gss_unseal
+	gss_display_status
+	gss_indicate_mechs
+	gss_compare_name
+	gss_display_name
+	gss_import_name
+	gss_release_name
+	gss_release_buffer
+	gss_release_oid_set
+	gss_inquire_cred
+;
+; GSS-API v2  additional credential calls
+;
+	gss_add_cred
+	gss_inquire_cred_by_mech
+;
+; GSS-API v2  additional context-level calls
+;
+	gss_inquire_context
+	gss_wrap_size_limit
+	gss_export_sec_context
+	gss_import_sec_context
+;
+; GSS-API v2  additional calls for OID and OID_set operations
+;
+	gss_release_oid
+	gss_create_empty_oid_set
+	gss_add_oid_set_member
+	gss_test_oid_set_member
+	gss_oid_to_str
+	gss_str_to_oid
+;
+; GSS-API v2  renamed message protection calls
+;
+	gss_wrap
+	gss_unwrap
+	gss_get_mic
+	gss_verify_mic
+;
+; GSS-API v2  future extensions
+;
+	gss_inquire_names_for_mech
+;	gss_inquire_mechs_for_name
+;	gss_canonicalize_name
+;	gss_export_name
+;
+; GSS-API variables
+;
+	gss_nt_user_name
+	gss_nt_machine_uid_name
+	gss_nt_string_uid_name
+	gss_nt_service_name
diff --git a/src/lib/kadm/ChangeLog b/src/lib/kadm/ChangeLog
index 33c7dbb322..62570f32b7 100644
--- a/src/lib/kadm/ChangeLog
+++ b/src/lib/kadm/ChangeLog
@@ -1,3 +1,10 @@
+Thu Nov 21 00:58:04 EST 1996    Richard Basch   <basch@lehman.com>
+
+        * Makefile.in: Win32 build
+	* adm_conn.c, adm_rw.c:
+		DLL export krb5_adm_connect, krb5_adm_disconnect,
+		krb5_free_adm_data, krb5_send_adm_cmd, krb5_read_adm_reply
+
 Tue Sep 24 13:25:50 1996  Theodore Ts'o  <tytso@rsts-11.mit.edu>
 
 	* Makefile.in: Eliminate extra files not needed for Macintosh and
diff --git a/src/lib/kadm/Makefile.in b/src/lib/kadm/Makefile.in
index 9cd60e7174..f76a58abc4 100644
--- a/src/lib/kadm/Makefile.in
+++ b/src/lib/kadm/Makefile.in
@@ -2,6 +2,8 @@ CFLAGS = $(CCOPTS) $(DEFS)
 
 ##DOSBUILDTOP = ..\..
 ##DOSLIBNAME=kadm.lib
+##DOSOBJFILE=kadm.lst
+
 RUN_SETUP=@KRB5_RUN_ENV@
 BASE_OBJS= adm_conn.$(OBJEXT)	\
 	adm_kt_dec.$(OBJEXT)	\
@@ -35,12 +37,15 @@ SRCS=	$(srcdir)/adm_conn.c	\
 #	$(srcdir)/adm_kw_enc.c
 
 
-all:: $(BASE_OBJS) 
-
-all-unix:: $(DB_OBJS) $(UNIX_OBJS)
+all-unix:: $(BASE_OBJS) $(DB_OBJS) $(UNIX_OBJS)
 all-unix:: libkadm.a
-all-mac:: $(DB_OBJS)
-all-windows::
+all-mac:: $(BASE_OBJS) $(DB_OBJS)
+all-windows:: $(OBJFILE)
+
+##DOS$(OBJFILE): $(BASE_OBJS)
+##DOS	$(RM) $(OBJFILE)
+##WIN16##	$(CP) nul: $(OBJFILE)
+##WIN32##	$(LIBECHO) *.obj > $(OBJFILE)
 
 libkadm.a: $(OBJS) $(UNIX_OBJS)
 	$(RM) $@
@@ -56,7 +61,7 @@ clean-unix::
 clean-mac::
 	$(RM) libkadm.$(LIBEXT)
 clean-windows::
-	$(RM) kadm.lib kadm.bak
+	$(RM) kadm.lib kadm.bak $(OBJFILE)
 
 #
 # t_dbentry
diff --git a/src/lib/kadm/adm_conn.c b/src/lib/kadm/adm_conn.c
index 1534b4b027..d341b8301e 100644
--- a/src/lib/kadm/adm_conn.c
+++ b/src/lib/kadm/adm_conn.c
@@ -602,17 +602,17 @@ kadm_get_auth(kcontext, ctxp, local, remote)
  *	free auth_context
  *	close socket.
  */
-krb5_error_code INTERFACE
+KRB5_DLLIMP krb5_error_code KRB5_CALLCONV
 krb5_adm_connect(kcontext, user, prompt, opassword, sockp, ctxp,
 		 ccachep, ccname, tlife)
     krb5_context	kcontext;	/* Context handle	(In ) */
-    char		*user;		/* User specified	(In ) */
-    char		*prompt;	/* Old password prompt	(In ) */
-    char		*opassword;	/* Old Password		(I/O) */
-    int			*sockp;		/* Socket for conn.	(Out) */
-    krb5_auth_context	*ctxp;		/* Auth context		(Out) */
-    krb5_ccache		*ccachep;	/* Credentials cache	(I/O) */
-    char		*ccname;	/* Cred cache name	(In ) */
+    char		FAR *user;	/* User specified	(In ) */
+    char		FAR *prompt;	/* Old password prompt	(In ) */
+    char		FAR *opassword;	/* Old Password		(I/O) */
+    int			FAR *sockp;	/* Socket for conn.	(Out) */
+    krb5_auth_context	FAR *ctxp;	/* Auth context		(Out) */
+    krb5_ccache		FAR *ccachep;	/* Credentials cache	(I/O) */
+    char		FAR *ccname;	/* Cred cache name	(In ) */
     krb5_timestamp	tlife;		/* Ticket lifetime	(In ) */
 {
     krb5_error_code	kret;
@@ -745,10 +745,10 @@ krb5_adm_connect(kcontext, user, prompt, opassword, sockp, ctxp,
  * If ccache is supplied, then it is destroyed.  Otherwise, the ccache is
  * the caller's responsibility to close.
  */
-void INTERFACE
+KRB5_DLLIMP void KRB5_CALLCONV
 krb5_adm_disconnect(kcontext, socketp, auth_context, ccache)
     krb5_context	kcontext;
-    int			*socketp;
+    int			FAR *socketp;
     krb5_auth_context	auth_context;
     krb5_ccache		ccache;
 {
diff --git a/src/lib/kadm/adm_rw.c b/src/lib/kadm/adm_rw.c
index bed4e4bb15..0d823304d0 100644
--- a/src/lib/kadm/adm_rw.c
+++ b/src/lib/kadm/adm_rw.c
@@ -68,11 +68,11 @@ kadm_copyout_int32(outint, cp)
 /*
  * krb5_free_adm_data()	- Free data blocks allocated by read_adm... routines.
  */
-void INTERFACE
+KRB5_DLLIMP void KRB5_CALLCONV
 krb5_free_adm_data(kcontext, ncomp, datap)
     krb5_context	kcontext;
     krb5_int32		ncomp;
-    krb5_data		*datap;
+    krb5_data		FAR *datap;
 {
     int i;
     
@@ -96,13 +96,13 @@ krb5_free_adm_data(kcontext, ncomp, datap)
  *		.
  *		.
  */
-krb5_error_code INTERFACE
+KRB5_DLLIMP krb5_error_code KRB5_CALLCONV
 krb5_send_adm_cmd(kcontext, sock, ctx, nargs, arglist)
     krb5_context	kcontext;	/* Context handle	(In ) */
     krb5_pointer	sock;		/* Socket to write to	(In ) */
     krb5_auth_context	ctx;		/* Auth context		(In ) */
-    krb5_int32			nargs;		/* Number of arguments	(In ) */
-    krb5_data		*arglist;	/* Components to write	(In ) */
+    krb5_int32		nargs;		/* Number of arguments	(In ) */
+    krb5_data		FAR *arglist;	/* Components to write	(In ) */
 {
     int	writebufsize;
     int i;
@@ -412,14 +412,14 @@ krb5_read_adm_cmd(kcontext, sock, ctx, nargs, arglist)
  * It is the caller's responsibility to free the memory allocated for
  * the read in component list.
  */
-krb5_error_code INTERFACE
+KRB5_DLLIMP krb5_error_code KRB5_CALLCONV
 krb5_read_adm_reply(kcontext, sock, ctx, cmd_stat, ncomps, complist)
     krb5_context	kcontext;	/* Context handle	(In ) */
     krb5_pointer	sock;		/* Socket to read from	(In ) */
     krb5_auth_context	ctx;		/* Auth context		(In ) */
-    krb5_int32		*cmd_stat;	/* Command status	(Out) */
-    krb5_int32		*ncomps;	/* # of reply components(Out) */
-    krb5_data		**complist;	/* List of components	(Out) */
+    krb5_int32		FAR *cmd_stat;	/* Command status	(Out) */
+    krb5_int32		FAR *ncomps;	/* # of reply components(Out) */
+    krb5_data		FAR * FAR *complist;	/* List of components (Out) */
 {
     krb5_data		read_data;
     krb5_error_code	ret;
diff --git a/src/lib/krb5/ChangeLog b/src/lib/krb5/ChangeLog
index e77f6b970f..e2e717c359 100644
--- a/src/lib/krb5/ChangeLog
+++ b/src/lib/krb5/ChangeLog
@@ -1,3 +1,7 @@
+Thu Nov 21 11:55:16 EST 1996    Richard Basch   <basch@lehman.com>
+
+        * Makefile.in: win32 build
+
 Mon Nov 18 20:42:39 1996  Ezra Peisach  <epeisach@mit.edu>
 
 	* configure.in: Set shared library version to 1.0. [krb5-libs/201]
diff --git a/src/lib/krb5/Makefile.in b/src/lib/krb5/Makefile.in
index 7387c76a5c..f9227fa4f9 100644
--- a/src/lib/krb5/Makefile.in
+++ b/src/lib/krb5/Makefile.in
@@ -1,4 +1,7 @@
 ##DOSBUILDTOP = ..\..
+##DOSLIBNAME=krb5.lib
+##DOSOBJFILEDEP=asn1.lst ccache.lst err_tbls.lst free.lst keytab.lst krb.lst os.lst posix.lst rcache.lst
+##DOSOBJFILELIST=@asn1.lst @ccache.lst @err_tbls.lst @free.lst @keytab.lst @krb.lst @os.lst @posix.lst @rcache.lst
 
 ANAME_DBDEP=@ANAME_DBDEP@
 ANAME_DBLIB=@ANAME_DBLIB@
@@ -28,7 +31,6 @@ SHLIB_LDFLAGS= $(LDFLAGS) @SHLIB_RPATH_DIRS@
 SHLIB_LIBDIRS= @SHLIB_LIBDIRS@
 
 all-unix::
-
 all-windows::
 
 libkrb5.$(STEXT): $(LIBDONE)
@@ -47,62 +49,62 @@ clean-windows::
 	$(RM) krb5.lib krb5.bak
 
 all-windows::
-	cd ASN.1
-	@echo Making in lib\asn.1
+	cd asn.1
+	@echo Making in krb5\asn.1
 	-$(MAKE) -$(MFLAGS)
-	cd ..\CCACHE
-	@echo Making in lib\ccache
+	cd ..\ccache
+	@echo Making in krb5\ccache
 	-$(MAKE) -$(MFLAGS)
 	cd ..\error_tables
-	@echo Making in lib\error_tables
+	@echo Making in krb5\error_tables
 	-$(MAKE) -$(MFLAGS)
-	cd ..\FREE
-	@echo Making in lib\free
+	cd ..\free
+	@echo Making in krb5\free
 	-$(MAKE) -$(MFLAGS)
-	cd ..\KEYTAB
-	@echo Making in lib\keytab
+	cd ..\keytab
+	@echo Making in krb5\keytab
 	-$(MAKE) -$(MFLAGS)
-	cd ..\KRB
-	@echo Making in lib\krb
+	cd ..\krb
+	@echo Making in krb5\krb
 	-$(MAKE) -$(MFLAGS)
-	cd ..\OS
-	@echo Making in lib\os
+	cd ..\os
+	@echo Making in krb5\os
 	-$(MAKE) -$(MFLAGS)
-	cd ..\POSIX
-	@echo Making in lib\posix
+	cd ..\posix
+	@echo Making in krb5\posix
 	-$(MAKE) -$(MFLAGS)
-	cd ..\RCACHE
-	@echo Making in lib\rcache
+	cd ..\rcache
+	@echo Making in krb5\rcache
 	-$(MAKE) -$(MFLAGS)
 	cd ..
 
 clean-windows::
 	cd ASN.1
-	@echo Making clean in lib\asn.1
+	@echo Making clean in krb5\asn.1
 	-$(MAKE) -$(MFLAGS) clean
 	cd ..\CCACHE
-	@echo Making clean in lib\ccache
+	@echo Making clean in krb5\ccache
 	-$(MAKE) -$(MFLAGS) clean
 	cd ..\error_tables
-	@echo Making clean in lib\error_tables
+	@echo Making clean in krb5\error_tables
 	-$(MAKE) -$(MFLAGS) clean
 	cd ..\FREE
-	@echo Making clean in lib\free
+	@echo Making clean in krb5\free
 	-$(MAKE) -$(MFLAGS) clean
 	cd ..\KEYTAB
-	@echo Making clean in lib\keytab
+	@echo Making clean in krb5\keytab
 	-$(MAKE) -$(MFLAGS) clean
 	cd ..\KRB
-	@echo Making clean in lib\krb
+	@echo Making clean in krb5\krb
 	-$(MAKE) -$(MFLAGS) clean
 	cd ..\OS
-	@echo Making clean in lib\os
+	@echo Making clean in krb5\os
 	-$(MAKE) -$(MFLAGS) clean
 	cd ..\POSIX
-	@echo Making clean in lib\posix
+	@echo Making clean in krb5\posix
 	-$(MAKE) -$(MFLAGS) clean
 	cd ..\RCACHE
-	@echo Making clean in lib\rcache
+	@echo Making clean in krb5\rcache
 	-$(MAKE) -$(MFLAGS) clean
 	cd ..
 	@echo Making clean locally
diff --git a/src/lib/krb5/asn.1/ChangeLog b/src/lib/krb5/asn.1/ChangeLog
index 8aa3684e2d..64ce1a4a2a 100644
--- a/src/lib/krb5/asn.1/ChangeLog
+++ b/src/lib/krb5/asn.1/ChangeLog
@@ -1,3 +1,7 @@
+Thu Nov 21 11:55:16 EST 1996    Richard Basch   <basch@lehman.com>
+
+        * Makefile.in: win32 build
+
 Thu Nov 14 20:57:55 1996  Theodore Y. Ts'o  <tytso@mit.edu>
 
 	* asn1_k_encode.c (asn1_encode_principal_name): Be liberal about
diff --git a/src/lib/krb5/asn.1/Makefile.in b/src/lib/krb5/asn.1/Makefile.in
index 034566e70b..91afd6fd67 100644
--- a/src/lib/krb5/asn.1/Makefile.in
+++ b/src/lib/krb5/asn.1/Makefile.in
@@ -1,7 +1,9 @@
 CFLAGS=$(CCOPTS) $(DEFS)
 
 ##DOSBUILDTOP = ..\..\..
-##DOSLIBNAME=..\krb5.lib
+##DOSMYDIR=asn.1
+##DOSOBJFILE=..\asn1.lst
+##WIN16##LIBNAME=..\krb5.lib
 
 EHDRDIR=$(BUILDTOP)/include/krb5/asn.1
 
@@ -35,7 +37,12 @@ OBJS= \
 
 all-unix:: shared $(OBJS)
 all-mac::  $(OBJS)
-all-windows:: $(OBJS)
+all-windows:: $(OBJFILE)
+
+##DOS$(OBJFILE): $(OBJS)
+##DOS	$(RM) $(OBJFILE)
+##WIN16##	$(CP) nul: $(OBJFILE)
+##WIN32##	$(LIBECHO) -p $(MYDIR)\ *.obj > $(OBJFILE)
 
 shared:
 	mkdir shared
@@ -47,4 +54,4 @@ clean-mac::
 	$(RM) $(OBJS)
 
 clean-windows::
-	$(RM) *.obj
+	$(RM) $(OBJFILE)
diff --git a/src/lib/krb5/ccache/ChangeLog b/src/lib/krb5/ccache/ChangeLog
index 56cea92975..f2b4d65d93 100644
--- a/src/lib/krb5/ccache/ChangeLog
+++ b/src/lib/krb5/ccache/ChangeLog
@@ -1,7 +1,15 @@
+Thu Nov 21 11:55:16 EST 1996    Richard Basch   <basch@lehman.com>
+
+        * Makefile.in: win32 build
+
+	* ccbase.c, ccdefault.c:
+	DLL export basic ccache functions
+
 Thu Jun  6 00:04:38 1996  Theodore Y. Ts'o  <tytso@mit.edu>
 
 	* Makefile.in (all-windows): Don't pass $(LIBCMD) on the command
-		line.  It's set in the windows.in prologue for all Makefiles anyway.
+		line.  It's set in the windows.in prologue for all
+		Makefiles anyway.
 
 Wed Feb  7 00:23:18 1996  Theodore Y. Ts'o  <tytso@dcl>
 
diff --git a/src/lib/krb5/ccache/Makefile.in b/src/lib/krb5/ccache/Makefile.in
index c95b6f7a9a..5661182c50 100644
--- a/src/lib/krb5/ccache/Makefile.in
+++ b/src/lib/krb5/ccache/Makefile.in
@@ -1,7 +1,9 @@
 CFLAGS = $(CCOPTS) $(DEFS) -I$(srcdir)$(S)file -I$(srcdir)$(S)stdio
 
 ##DOSBUILDTOP = ..\..\..
-##DOSLIBNAME=..\krb5.lib
+##DOSMYNAME=ccache
+##DOSOBJFILE=..\$(MYNAME).lst
+##WIN16##LIBNAME=..\krb5.lib
 
 MAC_SUBDIRS = file stdio
 
@@ -22,11 +24,19 @@ SRCS=	$(srcdir)/ccbase.c \
 all-unix:: shared $(OBJS) 
 
 all-mac:: $(OBJS) 
-all-windows:: $(OBJS) 
-	cd FILE
-	@echo Making in ccache\file
-	-$(MAKE) -$(MFLAGS)
-	cd ..
+all-windows:: subdirs $(OBJFILE) 
+
+##DOSsubdirs:: file\file.lst
+##DOSfile\file.lst::
+##DOS	cd file
+##DOS	@echo Making in krb5\ccache\file
+##DOS	-$(MAKE) -$(MFLAGS)
+##DOS	cd ..
+
+##DOS$(OBJFILE): $(OBJS) file\file.lst
+##DOS	$(RM) $(OBJFILE)
+##WIN16##	$(CP) nul: $(OBJFILE)
+##WIN32##	$(LIBECHO) -p $(MYNAME)\ *.obj file\*.obj > $(OBJFILE)
 
 shared: 
 	mkdir shared
@@ -36,8 +46,9 @@ clean-unix::
 
 clean-mac:
 clean-windows::
-	cd FILE
-	@echo Making clean in ccache\file
+	cd file
+	@echo Making clean in krb5\ccache\file
 	-$(MAKE) -$(MFLAGS) clean
 	cd ..
-	@echo Making clean locally
+	@echo Making clean in krb5\ccache
+	$(RM) $(OBJFILE)
diff --git a/src/lib/krb5/ccache/ccbase.c b/src/lib/krb5/ccache/ccbase.c
index 05a18d0dfc..e8bff024d2 100644
--- a/src/lib/krb5/ccache/ccbase.c
+++ b/src/lib/krb5/ccache/ccbase.c
@@ -26,7 +26,6 @@
 
 #include "k5-int.h"
 
-extern krb5_cc_ops *krb5_cc_dfl_ops;
 struct krb5_cc_typelist
  {
   krb5_cc_ops *ops;
@@ -39,10 +38,10 @@ static struct krb5_cc_typelist *cc_typehead = 0;
  * If override is set, replace any existing ccache with that type tag
  */
 
-krb5_error_code
+KRB5_DLLIMP krb5_error_code KRB5_CALLCONV
 krb5_cc_register(context, ops, override)
    krb5_context context;
-   krb5_cc_ops *ops;
+   krb5_cc_ops FAR *ops;
    krb5_boolean override;
 {
     struct krb5_cc_typelist *t;
@@ -73,7 +72,7 @@ krb5_cc_register(context, ops, override)
  * particular cache type.
  */
 
-krb5_error_code
+KRB5_DLLIMP krb5_error_code KRB5_CALLCONV
 krb5_cc_resolve (context, name, cache)
    krb5_context context;
    char *name;
diff --git a/src/lib/krb5/ccache/ccdefault.c b/src/lib/krb5/ccache/ccdefault.c
index c5b8f4c73f..5e3cd53a9e 100644
--- a/src/lib/krb5/ccache/ccdefault.c
+++ b/src/lib/krb5/ccache/ccdefault.c
@@ -26,10 +26,10 @@
 
 #include "k5-int.h"
 
-krb5_error_code INTERFACE
+KRB5_DLLIMP krb5_error_code KRB5_CALLCONV
 krb5_cc_default(context, ccache)
    krb5_context context;
-   krb5_ccache *ccache;
+   krb5_ccache FAR *ccache;
 {
     return krb5_cc_resolve(context, krb5_cc_default_name(context), ccache);
 }
diff --git a/src/lib/krb5/ccache/file/ChangeLog b/src/lib/krb5/ccache/file/ChangeLog
index 8b568c1781..43f4a70385 100644
--- a/src/lib/krb5/ccache/file/ChangeLog
+++ b/src/lib/krb5/ccache/file/ChangeLog
@@ -1,3 +1,16 @@
+Thu Nov 21 11:55:16 EST 1996    Richard Basch   <basch@lehman.com>
+
+        * Makefile.in: win32 build
+
+	* configure.in: Test for chmod and fchmod (not on Windows)
+
+	* fcc-proto.h, fcc_close.c, fcc_destry.c, fcc_eseq.c, fcc_gennew.c,
+	fcc_getnam.c, fcc_gprin.c, fcc_init.c, fcc_nseq.c, fcc_ops.c,
+	fcc_reslv.c, fcc_retrv.c, fcc_sflags.c, fcc_sseq.c, fcc_store.c:
+		Changed the calling conventions of the internal ccache
+		functions to comply with the new function calling
+		conventions of the ccache dispatch functions (win16/win32)
+
 Thu Aug 15 16:46:00 1996  Tom Yu  <tlyu@mit.edu>
 
 	* fcc_retrv.c (flags_match): Add parens to def'n of flags_match to
diff --git a/src/lib/krb5/ccache/file/Makefile.in b/src/lib/krb5/ccache/file/Makefile.in
index 48805c3c15..1c1c24677a 100644
--- a/src/lib/krb5/ccache/file/Makefile.in
+++ b/src/lib/krb5/ccache/file/Makefile.in
@@ -1,7 +1,9 @@
 CFLAGS = $(CCOPTS) $(DEFS)
 
 ##DOSBUILDTOP = ..\..\..\..
-##DOSLIBNAME=..\..\krb5.lib
+##DOSMYNAME = ccache\file
+##DOSOBJFILE = file.lst
+##WIN16##LIBNAME=..\..\krb5.lib
 
 .c.o:
 	$(CC) $(CFLAGS) -c $(srcdir)/$*.c
@@ -25,7 +27,12 @@ SRCS 	= $(srcdir)/fcc_close.c $(srcdir)/fcc_destry.c $(srcdir)/fcc_eseq.c \
 
 all-unix:: shared $(OBJS)
 all-mac:: $(OBJS)
-all-windows:: $(OBJS)
+all-windows:: $(OBJFILE)
+
+##DOS$(OBJFILE): $(OBJS)
+##DOS	$(RM) $(OBJFILE)
+##WIN16##	$(CP) nul: $(OBJFILE)
+##WIN32##	$(LIBECHO) -p $(MYNAME)\ *.obj > $(OBJFILE)
 
 shared: 
 	mkdir shared
@@ -35,3 +42,4 @@ clean-unix::
 
 clean-mac::
 clean-windows::
+	$(RM) $(OBJFILE)
diff --git a/src/lib/krb5/ccache/file/configure.in b/src/lib/krb5/ccache/file/configure.in
index ee042a1159..72b51d7a16 100644
--- a/src/lib/krb5/ccache/file/configure.in
+++ b/src/lib/krb5/ccache/file/configure.in
@@ -2,6 +2,7 @@ AC_INIT(configure.in)
 CONFIG_RULES
 AC_HAVE_HEADERS(unistd.h)
 AC_FUNC_CHECK(flock,AC_DEFINE(HAVE_FLOCK))
+AC_HAVE_FUNCS(fchmod chmod)
 V5_SHARED_LIB_OBJS
 SubdirLibraryRule([${OBJS}])
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/lib/krb5/ccache/file/fcc-proto.h b/src/lib/krb5/ccache/file/fcc-proto.h
index 7e8f7c1585..61b5cf3c15 100644
--- a/src/lib/krb5/ccache/file/fcc-proto.h
+++ b/src/lib/krb5/ccache/file/fcc-proto.h
@@ -127,7 +127,7 @@ KRB5_DLLIMP krb5_error_code KRB5_CALLCONV krb5_fcc_set_flags
         KRB5_PROTOTYPE((krb5_context, krb5_ccache id , krb5_flags flags ));
 
 /* fcc_ops.c */
-extern krb5_cc_ops krb5_cc_file_ops;
+KRB5_DLLIMP extern krb5_cc_ops krb5_cc_file_ops;
 krb5_error_code krb5_change_cache
    KRB5_PROTOTYPE((void));
 
diff --git a/src/lib/krb5/ccache/file/fcc_close.c b/src/lib/krb5/ccache/file/fcc_close.c
index 71e52f549d..6e7997afdf 100644
--- a/src/lib/krb5/ccache/file/fcc_close.c
+++ b/src/lib/krb5/ccache/file/fcc_close.c
@@ -35,7 +35,7 @@
  * Closes the file cache, invalidates the id, and frees any resources
  * associated with the cache.
  */
-krb5_error_code INTERFACE
+krb5_error_code KRB5_CALLCONV
 krb5_fcc_close(context, id)
    krb5_context context;
    krb5_ccache id;
diff --git a/src/lib/krb5/ccache/file/fcc_destry.c b/src/lib/krb5/ccache/file/fcc_destry.c
index 02deb7293b..37914e1f99 100644
--- a/src/lib/krb5/ccache/file/fcc_destry.c
+++ b/src/lib/krb5/ccache/file/fcc_destry.c
@@ -34,7 +34,7 @@
  * Errors:
  * system errors
  */
-krb5_error_code INTERFACE
+krb5_error_code KRB5_CALLCONV
 krb5_fcc_destroy(context, id)
    krb5_context context;
    krb5_ccache id;
diff --git a/src/lib/krb5/ccache/file/fcc_eseq.c b/src/lib/krb5/ccache/file/fcc_eseq.c
index 369d667a6e..d6ce34e2df 100644
--- a/src/lib/krb5/ccache/file/fcc_eseq.c
+++ b/src/lib/krb5/ccache/file/fcc_eseq.c
@@ -40,7 +40,7 @@
  * and invalidates the cursor (it must never be used after this call).
  */
 /* ARGSUSED */
-krb5_error_code INTERFACE
+krb5_error_code KRB5_CALLCONV
 krb5_fcc_end_seq_get(context, id, cursor)
    krb5_context context;
    krb5_ccache id;
diff --git a/src/lib/krb5/ccache/file/fcc_gennew.c b/src/lib/krb5/ccache/file/fcc_gennew.c
index 177e0e9608..a76a192771 100644
--- a/src/lib/krb5/ccache/file/fcc_gennew.c
+++ b/src/lib/krb5/ccache/file/fcc_gennew.c
@@ -53,7 +53,7 @@ extern krb5_cc_ops krb5_fcc_ops;
  * 		krb5_ccache.  id is undefined.
  * system errors (from open)
  */
-krb5_error_code INTERFACE
+krb5_error_code KRB5_CALLCONV
 krb5_fcc_generate_new (context, id)
    krb5_context context;
    krb5_ccache *id;
@@ -111,8 +111,8 @@ krb5_fcc_generate_new (context, id)
 	  int errsave, cnt;
 
 	  /* Ignore user's umask, set mode = 0600 */
-#ifdef NOFCHMOD
-#ifndef NOCHMOD
+#ifndef HAVE_FCHMOD
+#ifdef HAVE_CHMOD
 	  chmod(((krb5_fcc_data *) lid->data)->filename, S_IRUSR | S_IWUSR);
 #endif
 #else
diff --git a/src/lib/krb5/ccache/file/fcc_getnam.c b/src/lib/krb5/ccache/file/fcc_getnam.c
index 514535957e..6a7b9557c4 100644
--- a/src/lib/krb5/ccache/file/fcc_getnam.c
+++ b/src/lib/krb5/ccache/file/fcc_getnam.c
@@ -35,7 +35,7 @@
  * Returns:
  * The name of the file cred cache id.
  */
-KRB5_DLLIMP char * KRB5_CALLCONV
+char * KRB5_CALLCONV
 krb5_fcc_get_name (context, id)
    krb5_context context;
    krb5_ccache id;
diff --git a/src/lib/krb5/ccache/file/fcc_gprin.c b/src/lib/krb5/ccache/file/fcc_gprin.c
index 97369db010..72d6c7780f 100644
--- a/src/lib/krb5/ccache/file/fcc_gprin.c
+++ b/src/lib/krb5/ccache/file/fcc_gprin.c
@@ -40,7 +40,7 @@
  * system errors
  * KRB5_CC_NOMEM
  */
-krb5_error_code INTERFACE
+krb5_error_code KRB5_CALLCONV
 krb5_fcc_get_principal(context, id, princ)
    krb5_context context;
    krb5_ccache id;
diff --git a/src/lib/krb5/ccache/file/fcc_init.c b/src/lib/krb5/ccache/file/fcc_init.c
index 8f661bab35..b3bf74de14 100644
--- a/src/lib/krb5/ccache/file/fcc_init.c
+++ b/src/lib/krb5/ccache/file/fcc_init.c
@@ -40,7 +40,7 @@
  * system errors
  * permission errors
  */
-krb5_error_code INTERFACE
+krb5_error_code KRB5_CALLCONV
 krb5_fcc_initialize(context, id, princ)
    krb5_context context;
    krb5_ccache id;
@@ -51,8 +51,8 @@ krb5_fcc_initialize(context, id, princ)
 
      MAYBE_OPEN(context, id, FCC_OPEN_AND_ERASE);
 
-#ifdef NOFCHMOD
-#ifndef NOCHMOD
+#ifndef HAVE_FCHMOD
+#ifdef HAVE_CHMOD
      reti = chmod(((krb5_fcc_data *) id->data)->filename, S_IREAD | S_IWRITE);
 #endif
 #else
diff --git a/src/lib/krb5/ccache/file/fcc_nseq.c b/src/lib/krb5/ccache/file/fcc_nseq.c
index 96650ac45a..92df32927b 100644
--- a/src/lib/krb5/ccache/file/fcc_nseq.c
+++ b/src/lib/krb5/ccache/file/fcc_nseq.c
@@ -48,7 +48,7 @@
  * Errors:
  * system errors
  */
-krb5_error_code INTERFACE
+krb5_error_code KRB5_CALLCONV
 krb5_fcc_next_cred(context, id, cursor, creds)
    krb5_context context;
    krb5_ccache id;
diff --git a/src/lib/krb5/ccache/file/fcc_ops.c b/src/lib/krb5/ccache/file/fcc_ops.c
index c9ff939781..e873bed0b0 100644
--- a/src/lib/krb5/ccache/file/fcc_ops.c
+++ b/src/lib/krb5/ccache/file/fcc_ops.c
@@ -64,7 +64,7 @@ krb5_change_cache (void) {
     return 0;
 }
 
-unsigned int INTERFACE
+KRB5_DLLIMP unsigned int KRB5_CALLCONV
 krb5_get_notification_message (void) {
     static unsigned int message = 0;
 
@@ -80,7 +80,7 @@ krb5_change_cache ()
 {
     return 0;
 }
-unsigned int INTERFACE
+unsigned int
 krb5_get_notification_message ()
 {
     return 0;
diff --git a/src/lib/krb5/ccache/file/fcc_reslv.c b/src/lib/krb5/ccache/file/fcc_reslv.c
index 4b6d381c9a..8ba7d78b09 100644
--- a/src/lib/krb5/ccache/file/fcc_reslv.c
+++ b/src/lib/krb5/ccache/file/fcc_reslv.c
@@ -49,7 +49,7 @@ extern krb5_cc_ops krb5_fcc_ops;
  * 		krb5_ccache.  id is undefined.
  * permission errors
  */
-krb5_error_code INTERFACE
+krb5_error_code KRB5_CALLCONV
 krb5_fcc_resolve (context, id, residual)
    krb5_context context;
    krb5_ccache *id;
diff --git a/src/lib/krb5/ccache/file/fcc_retrv.c b/src/lib/krb5/ccache/file/fcc_retrv.c
index ab0db7c8e2..e12d06e582 100644
--- a/src/lib/krb5/ccache/file/fcc_retrv.c
+++ b/src/lib/krb5/ccache/file/fcc_retrv.c
@@ -90,7 +90,7 @@ register const krb5_data *data1, *data2;
  * permission errors
  * KRB5_CC_NOMEM
  */
-krb5_error_code INTERFACE
+krb5_error_code KRB5_CALLCONV
 krb5_fcc_retrieve(context, id, whichfields, mcreds, creds)
    krb5_context context;
    krb5_ccache id;
diff --git a/src/lib/krb5/ccache/file/fcc_sflags.c b/src/lib/krb5/ccache/file/fcc_sflags.c
index d74f2b0e84..9f9b60140f 100644
--- a/src/lib/krb5/ccache/file/fcc_sflags.c
+++ b/src/lib/krb5/ccache/file/fcc_sflags.c
@@ -39,7 +39,7 @@
  * Effects:
  * Sets the operational flags of id to flags.
  */
-krb5_error_code INTERFACE
+krb5_error_code KRB5_CALLCONV
 krb5_fcc_set_flags(context, id, flags)
    krb5_context context;
    krb5_ccache id;
diff --git a/src/lib/krb5/ccache/file/fcc_sseq.c b/src/lib/krb5/ccache/file/fcc_sseq.c
index dac38941c7..8e215becdf 100644
--- a/src/lib/krb5/ccache/file/fcc_sseq.c
+++ b/src/lib/krb5/ccache/file/fcc_sseq.c
@@ -40,7 +40,7 @@
  * KRB5_CC_NOMEM
  * system errors
  */
-krb5_error_code INTERFACE
+krb5_error_code KRB5_CALLCONV
 krb5_fcc_start_seq_get(context, id, cursor)
    krb5_context context;
    krb5_ccache id;
diff --git a/src/lib/krb5/ccache/file/fcc_store.c b/src/lib/krb5/ccache/file/fcc_store.c
index fec27aeb69..4915e4e395 100644
--- a/src/lib/krb5/ccache/file/fcc_store.c
+++ b/src/lib/krb5/ccache/file/fcc_store.c
@@ -41,7 +41,7 @@
  * system errors
  * storage failure errors
  */
-krb5_error_code INTERFACE
+krb5_error_code KRB5_CALLCONV
 krb5_fcc_store(context, id, creds)
    krb5_context context;
    krb5_ccache id;
diff --git a/src/lib/krb5/ccache/memory/mcc-proto.h b/src/lib/krb5/ccache/memory/mcc-proto.h
index 6cc83f9af0..d41ad49523 100644
--- a/src/lib/krb5/ccache/memory/mcc-proto.h
+++ b/src/lib/krb5/ccache/memory/mcc-proto.h
@@ -29,46 +29,46 @@
 #define KRB5_MCC_PROTO__
 
 /* mcc_close.c */
-krb5_error_code INTERFACE krb5_mcc_close
+krb5_error_code KRB5_CALLCONV krb5_mcc_close
 	PROTOTYPE((krb5_context, krb5_ccache id ));
 
 /* mcc_destry.c */
-krb5_error_code INTERFACE krb5_mcc_destroy 
+krb5_error_code KRB5_CALLCONV krb5_mcc_destroy 
 	PROTOTYPE((krb5_context, krb5_ccache id ));
 
 /* mcc_eseq.c */
-krb5_error_code INTERFACE krb5_mcc_end_seq_get 
+krb5_error_code KRB5_CALLCONV krb5_mcc_end_seq_get 
 	PROTOTYPE((krb5_context, krb5_ccache id , krb5_cc_cursor *cursor ));
 
 /* mcc_gennew.c */
-krb5_error_code INTERFACE krb5_mcc_generate_new 
+krb5_error_code KRB5_CALLCONV krb5_mcc_generate_new 
 	PROTOTYPE((krb5_context, krb5_ccache *id ));
 
 /* mcc_getnam.c */
-char * INTERFACE krb5_mcc_get_name 
+char * KRB5_CALLCONV krb5_mcc_get_name 
 	PROTOTYPE((krb5_context, krb5_ccache id ));
 
 /* mcc_gprin.c */
-krb5_error_code INTERFACE krb5_mcc_get_principal 
+krb5_error_code KRB5_CALLCONV krb5_mcc_get_principal 
 	PROTOTYPE((krb5_context, krb5_ccache id , krb5_principal *princ ));
 
 /* mcc_init.c */
-krb5_error_code INTERFACE krb5_mcc_initialize 
+krb5_error_code KRB5_CALLCONV krb5_mcc_initialize 
 	PROTOTYPE((krb5_context, krb5_ccache id , krb5_principal princ ));
 
 /* mcc_nseq.c */
-krb5_error_code INTERFACE krb5_mcc_next_cred 
+krb5_error_code KRB5_CALLCONV krb5_mcc_next_cred 
 	PROTOTYPE((krb5_context, 
 		   krb5_ccache id , 
 		   krb5_cc_cursor *cursor , 
 		   krb5_creds *creds ));
 
 /* mcc_reslv.c */
-krb5_error_code INTERFACE krb5_mcc_resolve 
+krb5_error_code KRB5_CALLCONV krb5_mcc_resolve 
 	PROTOTYPE((krb5_context, krb5_ccache *id , char *residual ));
 
 /* mcc_retrv.c */
-krb5_error_code INTERFACE krb5_mcc_retrieve 
+krb5_error_code KRB5_CALLCONV krb5_mcc_retrieve 
 	PROTOTYPE((krb5_context, 
 		   krb5_ccache id , 
 		   krb5_flags whichfields , 
@@ -76,15 +76,15 @@ krb5_error_code INTERFACE krb5_mcc_retrieve
 		   krb5_creds *creds ));
 
 /* mcc_sseq.c */
-krb5_error_code INTERFACE krb5_mcc_start_seq_get 
+krb5_error_code KRB5_CALLCONV krb5_mcc_start_seq_get 
 	PROTOTYPE((krb5_context, krb5_ccache id , krb5_cc_cursor *cursor ));
 
 /* mcc_store.c */
-krb5_error_code INTERFACE krb5_mcc_store 
+krb5_error_code KRB5_CALLCONV krb5_mcc_store 
 	PROTOTYPE((krb5_context, krb5_ccache id , krb5_creds *creds ));
 
 /* mcc_sflags.c */
-krb5_error_code INTERFACE krb5_mcc_set_flags 
+krb5_error_code KRB5_CALLCONV krb5_mcc_set_flags 
 	PROTOTYPE((krb5_context, krb5_ccache id , krb5_flags flags ));
 
 /* mcc_ops.c */
diff --git a/src/lib/krb5/ccache/memory/mcc_close.c b/src/lib/krb5/ccache/memory/mcc_close.c
index b40a9b3601..514a4adfa7 100644
--- a/src/lib/krb5/ccache/memory/mcc_close.c
+++ b/src/lib/krb5/ccache/memory/mcc_close.c
@@ -35,7 +35,7 @@
  * Closes the file cache, invalidates the id, and frees any resources
  * associated with the cache.
  */
-krb5_error_code INTERFACE
+krb5_error_code KRB5_CALLCONV
 krb5_mcc_close(context, id)
    krb5_context context;
    krb5_ccache id;
diff --git a/src/lib/krb5/ccache/memory/mcc_destry.c b/src/lib/krb5/ccache/memory/mcc_destry.c
index 0c050523d8..e6946789de 100644
--- a/src/lib/krb5/ccache/memory/mcc_destry.c
+++ b/src/lib/krb5/ccache/memory/mcc_destry.c
@@ -52,7 +52,7 @@ krb5_mcc_free(context, id)
  * Errors:
  * none
  */
-krb5_error_code INTERFACE
+krb5_error_code KRB5_CALLCONV
 krb5_mcc_destroy(context, id)
    krb5_context context;
    krb5_ccache id;
diff --git a/src/lib/krb5/ccache/memory/mcc_eseq.c b/src/lib/krb5/ccache/memory/mcc_eseq.c
index 907951b859..c3d264cdd4 100644
--- a/src/lib/krb5/ccache/memory/mcc_eseq.c
+++ b/src/lib/krb5/ccache/memory/mcc_eseq.c
@@ -40,7 +40,7 @@
  * and invalidates the cursor (it must never be used after this call).
  */
 /* ARGSUSED */
-krb5_error_code INTERFACE
+krb5_error_code KRB5_CALLCONV
 krb5_mcc_end_seq_get(context, id, cursor)
    krb5_context context;
    krb5_ccache id;
diff --git a/src/lib/krb5/ccache/memory/mcc_gennew.c b/src/lib/krb5/ccache/memory/mcc_gennew.c
index 0e7dfa56fc..76249610a9 100644
--- a/src/lib/krb5/ccache/memory/mcc_gennew.c
+++ b/src/lib/krb5/ccache/memory/mcc_gennew.c
@@ -43,7 +43,7 @@ extern krb5_cc_ops krb5_mcc_ops;
  *              krb5_ccache.  id is undefined.
  * system errors (from open)
  */
-krb5_error_code INTERFACE
+krb5_error_code KRB5_CALLCONV
 krb5_mcc_generate_new (context, id)
    krb5_context context;
    krb5_ccache *id;
diff --git a/src/lib/krb5/ccache/memory/mcc_getnam.c b/src/lib/krb5/ccache/memory/mcc_getnam.c
index fdfcaa84c2..e86b0836e8 100644
--- a/src/lib/krb5/ccache/memory/mcc_getnam.c
+++ b/src/lib/krb5/ccache/memory/mcc_getnam.c
@@ -35,7 +35,7 @@
  * Returns:
  * The name of the file cred cache id.
  */
-char * INTERFACE
+char * KRB5_CALLCONV
 krb5_mcc_get_name (context, id)
    krb5_context context;
    krb5_ccache id;
diff --git a/src/lib/krb5/ccache/memory/mcc_gprin.c b/src/lib/krb5/ccache/memory/mcc_gprin.c
index 2cc55d32de..81624d73a4 100644
--- a/src/lib/krb5/ccache/memory/mcc_gprin.c
+++ b/src/lib/krb5/ccache/memory/mcc_gprin.c
@@ -40,7 +40,7 @@
  * system errors
  * KRB5_CC_NOMEM
  */
-krb5_error_code INTERFACE
+krb5_error_code KRB5_CALLCONV
 krb5_mcc_get_principal(context, id, princ)
    krb5_context context;
    krb5_ccache id;
diff --git a/src/lib/krb5/ccache/memory/mcc_init.c b/src/lib/krb5/ccache/memory/mcc_init.c
index 8aac3f16af..5f4a40ae7a 100644
--- a/src/lib/krb5/ccache/memory/mcc_init.c
+++ b/src/lib/krb5/ccache/memory/mcc_init.c
@@ -40,7 +40,7 @@
  */
 void krb5_mcc_free KRB5_PROTOTYPE((krb5_context context, krb5_ccache id));
 
-krb5_error_code INTERFACE
+krb5_error_code KRB5_CALLCONV
 krb5_mcc_initialize(context, id, princ)
    krb5_context context;
    krb5_ccache id;
diff --git a/src/lib/krb5/ccache/memory/mcc_nseq.c b/src/lib/krb5/ccache/memory/mcc_nseq.c
index 30ecdba7e1..a68b9f95a9 100644
--- a/src/lib/krb5/ccache/memory/mcc_nseq.c
+++ b/src/lib/krb5/ccache/memory/mcc_nseq.c
@@ -46,7 +46,7 @@
  * Errors:
  * system errors
  */
-krb5_error_code INTERFACE
+krb5_error_code KRB5_CALLCONV
 krb5_mcc_next_cred(context, id, cursor, creds)
    krb5_context context;
    krb5_ccache id;
diff --git a/src/lib/krb5/ccache/memory/mcc_reslv.c b/src/lib/krb5/ccache/memory/mcc_reslv.c
index 6146c6c2bf..a2468d8d03 100644
--- a/src/lib/krb5/ccache/memory/mcc_reslv.c
+++ b/src/lib/krb5/ccache/memory/mcc_reslv.c
@@ -49,7 +49,7 @@ extern krb5_cc_ops krb5_mcc_ops;
  *              krb5_ccache.  id is undefined.
  * permission errors
  */
-krb5_error_code INTERFACE
+krb5_error_code KRB5_CALLCONV
 krb5_mcc_resolve (context, id, residual)
    krb5_context context;
    krb5_ccache *id;
diff --git a/src/lib/krb5/ccache/memory/mcc_retrv.c b/src/lib/krb5/ccache/memory/mcc_retrv.c
index bb07171b44..ae3510129d 100644
--- a/src/lib/krb5/ccache/memory/mcc_retrv.c
+++ b/src/lib/krb5/ccache/memory/mcc_retrv.c
@@ -86,7 +86,7 @@ register const krb5_data *data1, *data2;
  * permission errors
  * KRB5_CC_NOMEM
  */
-krb5_error_code INTERFACE
+krb5_error_code KRB5_CALLCONV
 krb5_mcc_retrieve(context, id, whichfields, mcreds, creds)
    krb5_context context;
    krb5_ccache id;
diff --git a/src/lib/krb5/ccache/memory/mcc_sflags.c b/src/lib/krb5/ccache/memory/mcc_sflags.c
index 1484ab8b12..a12c696f9c 100644
--- a/src/lib/krb5/ccache/memory/mcc_sflags.c
+++ b/src/lib/krb5/ccache/memory/mcc_sflags.c
@@ -39,7 +39,7 @@
  * Effects:
  * Sets the operational flags of id to flags.
  */
-krb5_error_code INTERFACE
+krb5_error_code KRB5_CALLCONV
 krb5_mcc_set_flags(context, id, flags)
    krb5_context context;
    krb5_ccache id;
diff --git a/src/lib/krb5/ccache/memory/mcc_sseq.c b/src/lib/krb5/ccache/memory/mcc_sseq.c
index 5954de3d62..bb87e47df5 100644
--- a/src/lib/krb5/ccache/memory/mcc_sseq.c
+++ b/src/lib/krb5/ccache/memory/mcc_sseq.c
@@ -40,7 +40,7 @@
  * KRB5_CC_NOMEM
  * system errors
  */
-krb5_error_code INTERFACE
+krb5_error_code KRB5_CALLCONV
 krb5_mcc_start_seq_get(context, id, cursor)
    krb5_context context;
    krb5_ccache id;
diff --git a/src/lib/krb5/ccache/memory/mcc_store.c b/src/lib/krb5/ccache/memory/mcc_store.c
index 8b2e22dfa4..91a433f60f 100644
--- a/src/lib/krb5/ccache/memory/mcc_store.c
+++ b/src/lib/krb5/ccache/memory/mcc_store.c
@@ -23,7 +23,7 @@
  * system errors
  * storage failure errors
  */
-krb5_error_code INTERFACE
+krb5_error_code KRB5_CALLCONV
 krb5_mcc_store(context, id, creds)
    krb5_context context;
    krb5_ccache id;
diff --git a/src/lib/krb5/ccache/ser_cc.c b/src/lib/krb5/ccache/ser_cc.c
index 384e8ebb23..c834769eb3 100644
--- a/src/lib/krb5/ccache/ser_cc.c
+++ b/src/lib/krb5/ccache/ser_cc.c
@@ -203,7 +203,7 @@ krb5_ccache_internalize(kcontext, argp, buffer, lenremain)
 /*
  * Register the ccache serializer.
  */
-krb5_error_code
+KRB5_DLLIMP krb5_error_code KRB5_CALLCONV
 krb5_ser_ccache_init(kcontext)
     krb5_context	kcontext;
 {
diff --git a/src/lib/krb5/error_tables/ChangeLog b/src/lib/krb5/error_tables/ChangeLog
index ce88cc63db..863749bbdb 100644
--- a/src/lib/krb5/error_tables/ChangeLog
+++ b/src/lib/krb5/error_tables/ChangeLog
@@ -1,3 +1,9 @@
+Thu Nov 21 11:55:16 EST 1996    Richard Basch   <basch@lehman.com>
+
+        * Makefile.in: win32 build
+
+	* init_ets.c: dll export krb5_init_ets()
+
 Fri Dec 13 14:55:43 1996  Theodore Y. Ts'o  <tytso@mit.edu>
 
 	* krb5_err.et: Added the error codes KRB5_APPL_EXPIRED and
diff --git a/src/lib/krb5/error_tables/Makefile.in b/src/lib/krb5/error_tables/Makefile.in
index 10ddf764c4..84fb64bd9c 100644
--- a/src/lib/krb5/error_tables/Makefile.in
+++ b/src/lib/krb5/error_tables/Makefile.in
@@ -1,7 +1,9 @@
 CFLAGS = $(CCOPTS) $(DEFS)
 
 ##DOSBUILDTOP = ..\..\..
-##DOSLIBNAME=..\krb5.lib
+##DOSMYNAME=error_tables
+##DOSOBJFILE=..\err_tbls.lst
+##WIN16##LIBNAME=..\krb5.lib
 
 EHDRDIR=$(BUILDTOP)$(S)include$(S)krb5
 
@@ -30,8 +32,12 @@ SRCS= asn1_err.c kdb5_err.c krb5_err.c kv5m_err.c adm_err.c \
 
 all-unix:: $(HDRS) shared $(OBJS)
 all-mac:: $(OBJS)
+all-windows:: $(OBJFILE)
 
-all-windows:: $(OBJS)
+##DOS$(OBJFILE): $(OBJS)
+##DOS	$(RM) $(OBJFILE)
+##WIN16##	$(CP) nul: $(OBJFILE)
+##WIN32##	$(LIBECHO) -p $(MYNAME)\ *.obj > $(OBJFILE)
 
 shared:
 	mkdir shared
diff --git a/src/lib/krb5/error_tables/init_ets.c b/src/lib/krb5/error_tables/init_ets.c
index 7a4e32ffc0..9de65c5d3e 100644
--- a/src/lib/krb5/error_tables/init_ets.c
+++ b/src/lib/krb5/error_tables/init_ets.c
@@ -26,7 +26,7 @@
 
 #include "k5-int.h"
 
-void INTERFACE
+KRB5_DLLIMP void KRB5_CALLCONV
 krb5_init_ets (context)
      krb5_context context;
 {
diff --git a/src/lib/krb5/free/ChangeLog b/src/lib/krb5/free/ChangeLog
index 6ad05dcbe7..327124b52a 100644
--- a/src/lib/krb5/free/ChangeLog
+++ b/src/lib/krb5/free/ChangeLog
@@ -1,3 +1,15 @@
+Thu Nov 21 11:55:16 EST 1996    Richard Basch   <basch@lehman.com>
+
+        * Makefile.in: win32 build
+
+	* f_addr.c f_address.c f_ap_rep.c f_ap_req.c f_arep_enc.c 
+	f_auth_cnt.c f_authdata.c f_authent.c f_chksum.c f_cred.c
+	f_cred_cnt.c f_cred_enc.c f_creds.c f_enc_kdc.c f_enc_tkt.c
+	f_error.c f_kdc_rp.c f_kdc_rq.c f_keyblock.c f_last_req.c
+	f_padata.c f_princ.c f_priv.c f_priv_enc.c f_pwd_data.c
+	f_pwd_seq.c f_safe.c f_tckt.c f_tckts.c f_tkt_auth.c
+		DLL export free routines in krb5.h
+
 Fri Aug  2 14:03:44 1996  Barry Jaspan  <bjaspan@DUN-DUN-NOODLES>
 
 	* f_keyblock.c (krb5_free_keyblock_contents): added
diff --git a/src/lib/krb5/free/Makefile.in b/src/lib/krb5/free/Makefile.in
index 60b93b0059..0384d53e0a 100644
--- a/src/lib/krb5/free/Makefile.in
+++ b/src/lib/krb5/free/Makefile.in
@@ -1,7 +1,9 @@
 CFLAGS = $(CCOPTS) $(DEFS)
 
 ##DOSBUILDTOP = ..\..\..
-##DOSLIBNAME=..\krb5.lib
+##DOSMYNAME=free
+##DOSOBJFILE=..\$(MYNAME).lst
+##WIN16##LIBNAME=..\krb5.lib
 
 .c.o:
 	$(CC) $(CFLAGS) -c $(srcdir)/$*.c
@@ -77,7 +79,12 @@ SRCS=	\
 
 all-unix:: shared $(OBJS)
 all-mac:: $(OBJS)
-all-windows:: $(OBJS)
+all-windows:: $(OBJFILE)
+
+##DOS$(OBJFILE): $(OBJS)
+##DOS	$(RM) $(OBJFILE)
+##WIN16##	$(CP) nul: $(OBJFILE)
+##WIN32##	$(LIBECHO) -p $(MYNAME)\ *.obj > $(OBJFILE)
 
 shared:
 	mkdir shared
@@ -87,5 +94,5 @@ clean-unix::
 
 clean-mac::
 clean-windows::
-
+	$(RM) $(OBJFILE)
 
diff --git a/src/lib/krb5/free/f_addr.c b/src/lib/krb5/free/f_addr.c
index d8f58b767e..9faea10be5 100644
--- a/src/lib/krb5/free/f_addr.c
+++ b/src/lib/krb5/free/f_addr.c
@@ -25,10 +25,10 @@
 
 #include "k5-int.h"
 
-void
+KRB5_DLLIMP void KRB5_CALLCONV
 krb5_free_address(context, val)
     krb5_context context;
-    krb5_address *val;
+    krb5_address FAR *val;
 {
     if (val->contents)
 	krb5_xfree(val->contents);
diff --git a/src/lib/krb5/free/f_address.c b/src/lib/krb5/free/f_address.c
index 7f3bfa6627..7387eba688 100644
--- a/src/lib/krb5/free/f_address.c
+++ b/src/lib/krb5/free/f_address.c
@@ -26,10 +26,10 @@
 
 #include "k5-int.h"
 
-void INTERFACE
+KRB5_DLLIMP void KRB5_CALLCONV
 krb5_free_addresses(context, val)
     krb5_context context;
-    krb5_address **val;
+    krb5_address FAR * FAR *val;
 {
     register krb5_address **temp;
 
diff --git a/src/lib/krb5/free/f_ap_rep.c b/src/lib/krb5/free/f_ap_rep.c
index 0301af1629..50e67109c5 100644
--- a/src/lib/krb5/free/f_ap_rep.c
+++ b/src/lib/krb5/free/f_ap_rep.c
@@ -26,10 +26,10 @@
 
 #include "k5-int.h"
 
-void
+KRB5_DLLIMP void KRB5_CALLCONV
 krb5_free_ap_rep(context, val)
     krb5_context context;
-    register krb5_ap_rep *val;
+    register krb5_ap_rep FAR *val;
 {
     if (val->enc_part.ciphertext.data)
 	krb5_xfree(val->enc_part.ciphertext.data);
diff --git a/src/lib/krb5/free/f_ap_req.c b/src/lib/krb5/free/f_ap_req.c
index 1b9a93a7eb..8e63a6ed74 100644
--- a/src/lib/krb5/free/f_ap_req.c
+++ b/src/lib/krb5/free/f_ap_req.c
@@ -26,10 +26,10 @@
 
 #include "k5-int.h"
 
-void
+KRB5_DLLIMP void KRB5_CALLCONV
 krb5_free_ap_req(context, val)
     krb5_context context;
-    register krb5_ap_req *val;
+    register krb5_ap_req FAR *val;
 {
     if (val->ticket)
 	krb5_free_ticket(context, val->ticket);
diff --git a/src/lib/krb5/free/f_arep_enc.c b/src/lib/krb5/free/f_arep_enc.c
index ec1d5ef90c..99eff9a0fd 100644
--- a/src/lib/krb5/free/f_arep_enc.c
+++ b/src/lib/krb5/free/f_arep_enc.c
@@ -26,10 +26,10 @@
 
 #include "k5-int.h"
 
-void INTERFACE
+KRB5_DLLIMP void KRB5_CALLCONV
 krb5_free_ap_rep_enc_part(context, val)
     krb5_context context;
-    krb5_ap_rep_enc_part *val;
+    krb5_ap_rep_enc_part FAR *val;
 {
     if (val->subkey)
 	krb5_free_keyblock(context, val->subkey);
diff --git a/src/lib/krb5/free/f_auth_cnt.c b/src/lib/krb5/free/f_auth_cnt.c
index d061f26f9d..8b7a11a9d3 100644
--- a/src/lib/krb5/free/f_auth_cnt.c
+++ b/src/lib/krb5/free/f_auth_cnt.c
@@ -27,10 +27,10 @@
 
 #include "k5-int.h"
 
-void
+KRB5_DLLIMP void KRB5_CALLCONV
 krb5_free_authenticator_contents(context, val)
     krb5_context context;
-    krb5_authenticator *val;
+    krb5_authenticator FAR *val;
 {
     if (val->checksum)
 	krb5_free_checksum(context, val->checksum);
diff --git a/src/lib/krb5/free/f_authdata.c b/src/lib/krb5/free/f_authdata.c
index fba8dd3192..f91a26ba26 100644
--- a/src/lib/krb5/free/f_authdata.c
+++ b/src/lib/krb5/free/f_authdata.c
@@ -26,10 +26,10 @@
 
 #include "k5-int.h"
 
-void
+KRB5_DLLIMP void KRB5_CALLCONV
 krb5_free_authdata(context, val)
     krb5_context context;
-krb5_authdata **val;
+    krb5_authdata FAR * FAR *val;
 {
     register krb5_authdata **temp;
 
diff --git a/src/lib/krb5/free/f_authent.c b/src/lib/krb5/free/f_authent.c
index f4d1c06595..898da745c8 100644
--- a/src/lib/krb5/free/f_authent.c
+++ b/src/lib/krb5/free/f_authent.c
@@ -27,10 +27,10 @@
 
 #include "k5-int.h"
 
-void
+KRB5_DLLIMP void KRB5_CALLCONV
 krb5_free_authenticator(context, val)
     krb5_context context;
-    krb5_authenticator *val;
+    krb5_authenticator FAR *val;
 {
     if (val->checksum)
 	krb5_free_checksum(context, val->checksum);
diff --git a/src/lib/krb5/free/f_chksum.c b/src/lib/krb5/free/f_chksum.c
index beab7450be..ac2fd76744 100644
--- a/src/lib/krb5/free/f_chksum.c
+++ b/src/lib/krb5/free/f_chksum.c
@@ -26,7 +26,7 @@
 
 #include "k5-int.h"
 
-void
+KRB5_DLLIMP void KRB5_CALLCONV
 krb5_free_checksum(context, val)
     krb5_context context;
     register krb5_checksum *val;
diff --git a/src/lib/krb5/free/f_cred.c b/src/lib/krb5/free/f_cred.c
index 7cc2a9a97b..b572aeb8e6 100644
--- a/src/lib/krb5/free/f_cred.c
+++ b/src/lib/krb5/free/f_cred.c
@@ -26,10 +26,10 @@
 
 #include "k5-int.h"
 
-void
+KRB5_DLLIMP void KRB5_CALLCONV
 krb5_free_cred(context, val)
     krb5_context context;
-    register krb5_cred *val;
+    register krb5_cred FAR *val;
 {
     if (val->tickets)
         krb5_free_tickets(context, val->tickets);
diff --git a/src/lib/krb5/free/f_cred_cnt.c b/src/lib/krb5/free/f_cred_cnt.c
index 575b075550..6f40499b47 100644
--- a/src/lib/krb5/free/f_cred_cnt.c
+++ b/src/lib/krb5/free/f_cred_cnt.c
@@ -31,10 +31,10 @@
  * the credentials structures 
  */
 
-void INTERFACE
+KRB5_DLLIMP void KRB5_CALLCONV
 krb5_free_cred_contents(context, val)
     krb5_context context;
-    krb5_creds *val;
+    krb5_creds FAR *val;
 {
     if (val->client)
 	krb5_free_principal(context, val->client);
diff --git a/src/lib/krb5/free/f_cred_enc.c b/src/lib/krb5/free/f_cred_enc.c
index d14b3d861b..24c06eae15 100644
--- a/src/lib/krb5/free/f_cred_enc.c
+++ b/src/lib/krb5/free/f_cred_enc.c
@@ -26,10 +26,10 @@
 
 #include "k5-int.h"
 
-void 
+KRB5_DLLIMP void KRB5_CALLCONV 
 krb5_free_cred_enc_part(context, val)
     krb5_context context;
-    register krb5_cred_enc_part *val;
+    register krb5_cred_enc_part FAR *val;
 {
     register krb5_cred_info **temp;
     
diff --git a/src/lib/krb5/free/f_creds.c b/src/lib/krb5/free/f_creds.c
index 7d00afe307..b47b4fdfd2 100644
--- a/src/lib/krb5/free/f_creds.c
+++ b/src/lib/krb5/free/f_creds.c
@@ -26,10 +26,10 @@
 
 #include "k5-int.h"
 
-void INTERFACE
+KRB5_DLLIMP void KRB5_CALLCONV
 krb5_free_creds(context, val)
     krb5_context context;
-    krb5_creds *val;
+    krb5_creds FAR *val;
 {
     krb5_free_cred_contents(context, val);
     krb5_xfree(val);
diff --git a/src/lib/krb5/free/f_enc_kdc.c b/src/lib/krb5/free/f_enc_kdc.c
index 102237674f..b45d28a629 100644
--- a/src/lib/krb5/free/f_enc_kdc.c
+++ b/src/lib/krb5/free/f_enc_kdc.c
@@ -26,7 +26,7 @@
 
 #include "k5-int.h"
 
-void
+KRB5_DLLIMP void KRB5_CALLCONV
 krb5_free_enc_kdc_rep_part(context, val)
     krb5_context context;
     register krb5_enc_kdc_rep_part *val;
diff --git a/src/lib/krb5/free/f_enc_tkt.c b/src/lib/krb5/free/f_enc_tkt.c
index 3c2aa3ae4d..409ed5ac0e 100644
--- a/src/lib/krb5/free/f_enc_tkt.c
+++ b/src/lib/krb5/free/f_enc_tkt.c
@@ -26,10 +26,10 @@
 
 #include "k5-int.h"
 
-void
+KRB5_DLLIMP void KRB5_CALLCONV
 krb5_free_enc_tkt_part(context, val)
     krb5_context context;
-    krb5_enc_tkt_part *val;
+    krb5_enc_tkt_part FAR *val;
 {
     if (val->session)
 	krb5_free_keyblock(context, val->session);
diff --git a/src/lib/krb5/free/f_error.c b/src/lib/krb5/free/f_error.c
index a24a6c4094..16b5c52a78 100644
--- a/src/lib/krb5/free/f_error.c
+++ b/src/lib/krb5/free/f_error.c
@@ -26,10 +26,10 @@
 
 #include "k5-int.h"
 
-void
+KRB5_DLLIMP void KRB5_CALLCONV
 krb5_free_error(context, val)
     krb5_context context;
-    register krb5_error *val;
+    register krb5_error FAR *val;
 {
     if (val->client)
 	krb5_free_principal(context, val->client);
diff --git a/src/lib/krb5/free/f_kdc_rp.c b/src/lib/krb5/free/f_kdc_rp.c
index aba2fff316..b424f368ed 100644
--- a/src/lib/krb5/free/f_kdc_rp.c
+++ b/src/lib/krb5/free/f_kdc_rp.c
@@ -26,10 +26,10 @@
 
 #include "k5-int.h"
 
-void
+KRB5_DLLIMP void KRB5_CALLCONV
 krb5_free_kdc_rep(context, val)
     krb5_context context;
-krb5_kdc_rep *val;
+    krb5_kdc_rep FAR *val;
 {
     if (val->padata)
 	krb5_free_pa_data(context, val->padata);
diff --git a/src/lib/krb5/free/f_kdc_rq.c b/src/lib/krb5/free/f_kdc_rq.c
index 2b1ad9082b..9116850a31 100644
--- a/src/lib/krb5/free/f_kdc_rq.c
+++ b/src/lib/krb5/free/f_kdc_rq.c
@@ -26,10 +26,10 @@
 
 #include "k5-int.h"
 
-void
+KRB5_DLLIMP void KRB5_CALLCONV
 krb5_free_kdc_req(context, val)
     krb5_context context;
-    krb5_kdc_req *val;
+    krb5_kdc_req FAR *val;
 {
     if (val->padata)
 	krb5_free_pa_data(context, val->padata);
diff --git a/src/lib/krb5/free/f_keyblock.c b/src/lib/krb5/free/f_keyblock.c
index f3e13cfefc..8d6950eeba 100644
--- a/src/lib/krb5/free/f_keyblock.c
+++ b/src/lib/krb5/free/f_keyblock.c
@@ -26,10 +26,10 @@
 
 #include "k5-int.h"
 
-void
+KRB5_DLLIMP void KRB5_CALLCONV
 krb5_free_keyblock_contents(context, key)
      krb5_context context;
-     register krb5_keyblock *key;
+     register krb5_keyblock FAR *key;
 {
      if (key->contents) {
 	  memset(key->contents, 0, key->length);
@@ -38,10 +38,10 @@ krb5_free_keyblock_contents(context, key)
      return;
 }
 
-void
+KRB5_DLLIMP void KRB5_CALLCONV
 krb5_free_keyblock(context, val)
     krb5_context context;
-    register krb5_keyblock *val;
+    register krb5_keyblock FAR *val;
 {
     krb5_free_keyblock_contents(context, val);
     krb5_xfree(val);
diff --git a/src/lib/krb5/free/f_last_req.c b/src/lib/krb5/free/f_last_req.c
index 278b6f4b7a..cb0959f284 100644
--- a/src/lib/krb5/free/f_last_req.c
+++ b/src/lib/krb5/free/f_last_req.c
@@ -26,10 +26,10 @@
 
 #include "k5-int.h"
 
-void
+KRB5_DLLIMP void KRB5_CALLCONV
 krb5_free_last_req(context, val)
     krb5_context context;
-    krb5_last_req_entry **val;
+    krb5_last_req_entry FAR * FAR *val;
 {
     register krb5_last_req_entry **temp;
 
diff --git a/src/lib/krb5/free/f_padata.c b/src/lib/krb5/free/f_padata.c
index 9540014519..332bf02e31 100644
--- a/src/lib/krb5/free/f_padata.c
+++ b/src/lib/krb5/free/f_padata.c
@@ -26,10 +26,10 @@
 
 #include "k5-int.h"
 
-void
+KRB5_DLLIMP void KRB5_CALLCONV
 krb5_free_pa_data(context, val)
     krb5_context context;
-    krb5_pa_data **val;
+    krb5_pa_data FAR * FAR *val;
 {
     register krb5_pa_data **temp;
 
diff --git a/src/lib/krb5/free/f_princ.c b/src/lib/krb5/free/f_princ.c
index 4ccf7393d3..af1c07e790 100644
--- a/src/lib/krb5/free/f_princ.c
+++ b/src/lib/krb5/free/f_princ.c
@@ -26,7 +26,7 @@
 
 #include "k5-int.h"
 
-void INTERFACE
+KRB5_DLLIMP void KRB5_CALLCONV
 krb5_free_principal(context, val)
     krb5_context context;
     krb5_principal val;
diff --git a/src/lib/krb5/free/f_priv.c b/src/lib/krb5/free/f_priv.c
index 06861421af..f781ce6b1f 100644
--- a/src/lib/krb5/free/f_priv.c
+++ b/src/lib/krb5/free/f_priv.c
@@ -26,10 +26,10 @@
 
 #include "k5-int.h"
 
-void
+KRB5_DLLIMP void KRB5_CALLCONV
 krb5_free_priv(context, val)
     krb5_context context;
-register krb5_priv *val;
+    register krb5_priv FAR *val;
 {
     if (val->enc_part.ciphertext.data)
 	krb5_xfree(val->enc_part.ciphertext.data);
diff --git a/src/lib/krb5/free/f_priv_enc.c b/src/lib/krb5/free/f_priv_enc.c
index 8e25602bb2..cc48e08bab 100644
--- a/src/lib/krb5/free/f_priv_enc.c
+++ b/src/lib/krb5/free/f_priv_enc.c
@@ -26,10 +26,10 @@
 
 #include "k5-int.h"
 
-void
+KRB5_DLLIMP void KRB5_CALLCONV
 krb5_free_priv_enc_part(context, val)
     krb5_context context;
-    register krb5_priv_enc_part *val;
+    register krb5_priv_enc_part FAR *val;
 {
     if (val->user_data.data)
 	krb5_xfree(val->user_data.data);
diff --git a/src/lib/krb5/free/f_pwd_data.c b/src/lib/krb5/free/f_pwd_data.c
index 2a92336b32..386e004741 100644
--- a/src/lib/krb5/free/f_pwd_data.c
+++ b/src/lib/krb5/free/f_pwd_data.c
@@ -26,10 +26,10 @@
 
 #include "k5-int.h"
 
-void
+KRB5_DLLIMP void KRB5_CALLCONV
 krb5_free_pwd_data(context, val)
     krb5_context context;
-krb5_pwd_data *val;
+    krb5_pwd_data FAR *val;
 {
     if (val->element)
 	krb5_free_pwd_sequences(context, val->element);
diff --git a/src/lib/krb5/free/f_pwd_seq.c b/src/lib/krb5/free/f_pwd_seq.c
index 436fb68307..af1a969f0c 100644
--- a/src/lib/krb5/free/f_pwd_seq.c
+++ b/src/lib/krb5/free/f_pwd_seq.c
@@ -26,10 +26,10 @@
 
 #include "k5-int.h"
 
-void
+KRB5_DLLIMP void KRB5_CALLCONV
 krb5_free_pwd_sequences(context, val)
     krb5_context context;
-    passwd_phrase_element **val;
+    passwd_phrase_element FAR * FAR *val;
 {
     if ((*val)->passwd)
 	krb5_xfree((*val)->passwd);
diff --git a/src/lib/krb5/free/f_safe.c b/src/lib/krb5/free/f_safe.c
index 11a3159f4a..30a8650cef 100644
--- a/src/lib/krb5/free/f_safe.c
+++ b/src/lib/krb5/free/f_safe.c
@@ -26,10 +26,10 @@
 
 #include "k5-int.h"
 
-void
+KRB5_DLLIMP void KRB5_CALLCONV
 krb5_free_safe(context, val)
     krb5_context context;
-    register krb5_safe *val;
+    register krb5_safe FAR *val;
 {
     if (val->user_data.data)
 	krb5_xfree(val->user_data.data);
diff --git a/src/lib/krb5/free/f_tckt.c b/src/lib/krb5/free/f_tckt.c
index 8344345eb9..bfc8fbf77d 100644
--- a/src/lib/krb5/free/f_tckt.c
+++ b/src/lib/krb5/free/f_tckt.c
@@ -26,10 +26,10 @@
 
 #include "k5-int.h"
 
-void
+KRB5_DLLIMP void KRB5_CALLCONV
 krb5_free_ticket(context, val)
     krb5_context context;
-    krb5_ticket *val;
+    krb5_ticket FAR *val;
 {
     if (val->server)
 	krb5_free_principal(context, val->server);
diff --git a/src/lib/krb5/free/f_tckts.c b/src/lib/krb5/free/f_tckts.c
index 1a1af1e189..f211eff6f8 100644
--- a/src/lib/krb5/free/f_tckts.c
+++ b/src/lib/krb5/free/f_tckts.c
@@ -26,10 +26,10 @@
 
 #include "k5-int.h"
 
-void
+KRB5_DLLIMP void KRB5_CALLCONV
 krb5_free_tickets(context, val)
     krb5_context context;
-    krb5_ticket **val;
+    krb5_ticket FAR * FAR *val;
 {
     register krb5_ticket **temp;
 
diff --git a/src/lib/krb5/free/f_tgt_cred.c b/src/lib/krb5/free/f_tgt_cred.c
index ddf726826b..93fd3c17df 100644
--- a/src/lib/krb5/free/f_tgt_cred.c
+++ b/src/lib/krb5/free/f_tgt_cred.c
@@ -26,10 +26,10 @@
 
 #include "k5-int.h"
 
-void
+KRB5_DLLIMP void KRB5_CALLCONV
 krb5_free_tgt_creds(context, tgts)
     krb5_context context;
-    krb5_creds **tgts;
+    krb5_creds FAR * FAR *tgts;
 {
     register krb5_creds **tgtpp;
     for (tgtpp = tgts; *tgtpp; tgtpp++)
diff --git a/src/lib/krb5/free/f_tkt_auth.c b/src/lib/krb5/free/f_tkt_auth.c
index 2ef99f4827..8bfc9b9e4c 100644
--- a/src/lib/krb5/free/f_tkt_auth.c
+++ b/src/lib/krb5/free/f_tkt_auth.c
@@ -26,10 +26,10 @@
 
 #include "k5-int.h"
 
-void
+KRB5_DLLIMP void KRB5_CALLCONV
 krb5_free_tkt_authent(context, val)
     krb5_context context;
-    krb5_tkt_authent *val;
+    krb5_tkt_authent FAR *val;
 {
     if (val->ticket)
 	    krb5_free_ticket(context, val->ticket);
diff --git a/src/lib/krb5/keytab/ChangeLog b/src/lib/krb5/keytab/ChangeLog
index e860ba5cd8..85fbb79df0 100644
--- a/src/lib/krb5/keytab/ChangeLog
+++ b/src/lib/krb5/keytab/ChangeLog
@@ -1,3 +1,10 @@
+Thu Nov 21 11:55:16 EST 1996    Richard Basch   <basch@lehman.com>
+
+        * Makefile.in: win32 build
+
+	* ktadd.c,ktbase.c,ktdefault.c,ktfr_entry.c,ktremove.c,read_servi.c:
+	DLL export the keytab dispatch functions
+
 Thu Jun  6 00:04:38 1996  Theodore Y. Ts'o  <tytso@mit.edu>
 
 	* Makefile.in (all-windows): Don't pass $(LIBCMD) on the command
diff --git a/src/lib/krb5/keytab/Makefile.in b/src/lib/krb5/keytab/Makefile.in
index 760fc4e97e..fa7acc83af 100644
--- a/src/lib/krb5/keytab/Makefile.in
+++ b/src/lib/krb5/keytab/Makefile.in
@@ -1,7 +1,9 @@
 CFLAGS = $(CCOPTS) $(DEFS)
 
 ##DOSBUILDTOP = ..\..\..
-##DOSLIBNAME=..\krb5.lib
+##DOSMYNAME=keytab
+##DOSOBJFILE=..\$(MYNAME).lst
+##WIN16##LIBNAME=..\krb5.lib
 
 MAC_SUBDIRS = file
 
@@ -30,11 +32,19 @@ shared:
 
 all-unix:: shared $(OBJS)
 all-mac:: $(OBJS)
-all-windows:: $(OBJS)
-	cd file
-	@echo Making in keytab\file
-	-$(MAKE) -$(MFLAGS)
-	cd ..
+all-windows:: subdirs $(OBJFILE)
+
+##DOSsubdirs:: file\file.lst
+##DOSfile\file.lst::
+##DOS	cd file
+##DOS	@echo Making in krb5\keytab\file
+##DOS	-$(MAKE) -$(MFLAGS)
+##DOS	cd ..
+
+##DOS$(OBJFILE): $(OBJS) file\file.lst
+##DOS	$(RM) $(OBJFILE)
+##WIN16##	$(CP) nul: $(OBJFILE)
+##WIN32##	$(LIBECHO) -p $(MYNAME)\ *.obj file\*.obj > $(OBJFILE)
 
 clean-unix::
 	$(RM) shared/*
@@ -42,8 +52,9 @@ clean-unix::
 clean-mac::
 clean-windows::
 	cd file
-	@echo Making clean in keytab\file
+	@echo Making clean in krb5\keytab\file
 	-$(MAKE) -$(MFLAGS) clean
 	cd ..
-	@echo Making clean locally
+	@echo Making clean in krb5\keytab
+	$(RM) $(OBJFILE)
 
diff --git a/src/lib/krb5/keytab/file/ChangeLog b/src/lib/krb5/keytab/file/ChangeLog
index f14e2a0301..7109cf7c13 100644
--- a/src/lib/krb5/keytab/file/ChangeLog
+++ b/src/lib/krb5/keytab/file/ChangeLog
@@ -1,3 +1,12 @@
+Thu Nov 21 11:55:16 EST 1996    Richard Basch   <basch@lehman.com>
+
+        * Makefile.in: win32 build
+
+	* ktf_add.c, ktf_close.c, ktf_g_ent.c, ktf_g_name.c, ktf_next.c,
+	ktf_remove.c, ktf_resolv.c, ktf_ssget.c, ktf_wreslv.c, ktfile.h
+		Change the functions declarations to include FAR pointers
+		and KRB5_CALLCONV so that they can be utilized by a DLL.
+	
 Tue Nov 19 17:06:59 1996  Barry Jaspan  <bjaspan@mit.edu>
 
 	* ktf_g_ent.c (krb5_ktfile_get_entry): return KRB5_KT_KVNONOTFOUND
diff --git a/src/lib/krb5/keytab/file/Makefile.in b/src/lib/krb5/keytab/file/Makefile.in
index 36291e9f0d..4b27d33cf2 100644
--- a/src/lib/krb5/keytab/file/Makefile.in
+++ b/src/lib/krb5/keytab/file/Makefile.in
@@ -1,7 +1,9 @@
 CFLAGS = $(CCOPTS) $(DEFS)
 
 ##DOSBUILDTOP = ..\..\..\..
-##DOSLIBNAME=..\..\krb5.lib
+##DOSMYNAME=keytab\file
+##DOSOBJFILE= file.lst
+##WIN16##LIBNAME=..\..\krb5.lib
 
 .c.o:
 	$(CC) $(CFLAGS) -c $(srcdir)/$*.c
@@ -43,7 +45,12 @@ OBJS = \
 
 all-unix:: shared $(OBJS)
 all-mac:: $(OBJS)
-all-windows:: $(OBJS)
+all-windows:: $(OBJFILE)
+
+##DOS$(OBJFILE): $(OBJS)
+##DOS	$(RM) $(OBJFILE)
+##WIN16##	$(CP) nul: $(OBJFILE)
+##WIN32##	$(LIBECHO) -p $(MYNAME)\ *.obj > $(OBJFILE)
 
 shared:
 	mkdir shared
@@ -53,3 +60,4 @@ clean-unix::
 
 clean-mac::
 clean-windows::
+	$(RM) $(OBJFILE)
diff --git a/src/lib/krb5/keytab/file/ktf_add.c b/src/lib/krb5/keytab/file/ktf_add.c
index aac429c047..8979ad8c99 100644
--- a/src/lib/krb5/keytab/file/ktf_add.c
+++ b/src/lib/krb5/keytab/file/ktf_add.c
@@ -27,7 +27,7 @@
 #include "k5-int.h"
 #include "ktfile.h"
 
-krb5_error_code
+krb5_error_code KRB5_CALLCONV 
 krb5_ktfile_add(context, id, entry)
    krb5_context context;
    krb5_keytab id;
diff --git a/src/lib/krb5/keytab/file/ktf_close.c b/src/lib/krb5/keytab/file/ktf_close.c
index 93ee92e680..a538aa719e 100644
--- a/src/lib/krb5/keytab/file/ktf_close.c
+++ b/src/lib/krb5/keytab/file/ktf_close.c
@@ -28,7 +28,7 @@
 #include "k5-int.h"
 #include "ktfile.h"
 
-krb5_error_code
+krb5_error_code KRB5_CALLCONV 
 krb5_ktfile_close(context, id)
     krb5_context context;
   krb5_keytab id;
diff --git a/src/lib/krb5/keytab/file/ktf_endget.c b/src/lib/krb5/keytab/file/ktf_endget.c
index 25ef4de7e0..66f862e187 100644
--- a/src/lib/krb5/keytab/file/ktf_endget.c
+++ b/src/lib/krb5/keytab/file/ktf_endget.c
@@ -27,7 +27,7 @@
 #include "k5-int.h"
 #include "ktfile.h"
 
-krb5_error_code
+krb5_error_code KRB5_CALLCONV 
 krb5_ktfile_end_get(context, id, cursor)
     krb5_context context;
 krb5_keytab id;
diff --git a/src/lib/krb5/keytab/file/ktf_g_ent.c b/src/lib/krb5/keytab/file/ktf_g_ent.c
index e42dcdbd44..67050a8381 100644
--- a/src/lib/krb5/keytab/file/ktf_g_ent.c
+++ b/src/lib/krb5/keytab/file/ktf_g_ent.c
@@ -29,7 +29,7 @@
 #include "k5-int.h"
 #include "ktfile.h"
 
-krb5_error_code
+krb5_error_code KRB5_CALLCONV
 krb5_ktfile_get_entry(context, id, principal, kvno, enctype, entry)
    krb5_context context;
    krb5_keytab id;
diff --git a/src/lib/krb5/keytab/file/ktf_g_name.c b/src/lib/krb5/keytab/file/ktf_g_name.c
index fadb9bc94a..b0cd4d8e6e 100644
--- a/src/lib/krb5/keytab/file/ktf_g_name.c
+++ b/src/lib/krb5/keytab/file/ktf_g_name.c
@@ -27,7 +27,7 @@
 #include "k5-int.h"
 #include "ktfile.h"
 
-krb5_error_code
+krb5_error_code KRB5_CALLCONV
 krb5_ktfile_get_name(context, id, name, len)
     krb5_context context;
   krb5_keytab id;
diff --git a/src/lib/krb5/keytab/file/ktf_next.c b/src/lib/krb5/keytab/file/ktf_next.c
index 7b13ede5ae..acabb7c355 100644
--- a/src/lib/krb5/keytab/file/ktf_next.c
+++ b/src/lib/krb5/keytab/file/ktf_next.c
@@ -27,7 +27,7 @@
 #include "k5-int.h"
 #include "ktfile.h"
 
-krb5_error_code
+krb5_error_code KRB5_CALLCONV 
 krb5_ktfile_get_next(context, id, entry, cursor)
     krb5_context context;
 krb5_keytab id;
diff --git a/src/lib/krb5/keytab/file/ktf_remove.c b/src/lib/krb5/keytab/file/ktf_remove.c
index 644209f7ad..3d9e627b54 100644
--- a/src/lib/krb5/keytab/file/ktf_remove.c
+++ b/src/lib/krb5/keytab/file/ktf_remove.c
@@ -27,7 +27,7 @@
 #include "k5-int.h"
 #include "ktfile.h"
 
-krb5_error_code
+krb5_error_code KRB5_CALLCONV 
 krb5_ktfile_remove(context, id, entry)
     krb5_context context;
 krb5_keytab id;
diff --git a/src/lib/krb5/keytab/file/ktf_resolv.c b/src/lib/krb5/keytab/file/ktf_resolv.c
index 415f3c5f33..93c06d022d 100644
--- a/src/lib/krb5/keytab/file/ktf_resolv.c
+++ b/src/lib/krb5/keytab/file/ktf_resolv.c
@@ -28,7 +28,7 @@
 #include "k5-int.h"
 #include "ktfile.h"
 
-krb5_error_code
+krb5_error_code KRB5_CALLCONV 
 krb5_ktfile_resolve(context, name, id)
     krb5_context context;
   const char *name;
diff --git a/src/lib/krb5/keytab/file/ktf_ssget.c b/src/lib/krb5/keytab/file/ktf_ssget.c
index 1001b2ee74..b66c4cabaa 100644
--- a/src/lib/krb5/keytab/file/ktf_ssget.c
+++ b/src/lib/krb5/keytab/file/ktf_ssget.c
@@ -27,7 +27,7 @@
 #include "k5-int.h"
 #include "ktfile.h"
 
-krb5_error_code
+krb5_error_code KRB5_CALLCONV
 krb5_ktfile_start_seq_get(context, id, cursorp)
     krb5_context context;
 krb5_keytab id;
diff --git a/src/lib/krb5/keytab/file/ktf_wreslv.c b/src/lib/krb5/keytab/file/ktf_wreslv.c
index 9df5922a9d..e132293a04 100644
--- a/src/lib/krb5/keytab/file/ktf_wreslv.c
+++ b/src/lib/krb5/keytab/file/ktf_wreslv.c
@@ -28,7 +28,7 @@
 #include "k5-int.h"
 #include "ktfile.h"
 
-krb5_error_code
+krb5_error_code KRB5_CALLCONV
 krb5_ktfile_wresolve(context, name, id)
     krb5_context context;
   const char *name;
diff --git a/src/lib/krb5/keytab/file/ktfile.h b/src/lib/krb5/keytab/file/ktfile.h
index 0b2542ceb4..155f246036 100644
--- a/src/lib/krb5/keytab/file/ktfile.h
+++ b/src/lib/krb5/keytab/file/ktfile.h
@@ -62,27 +62,27 @@ typedef struct _krb5_ktfile_data {
 extern struct _krb5_kt_ops krb5_ktf_ops;
 extern struct _krb5_kt_ops krb5_ktf_writable_ops;
 
-krb5_error_code krb5_ktfile_resolve 
+krb5_error_code KRB5_CALLCONV krb5_ktfile_resolve 
 	PROTOTYPE((krb5_context,
 		   const char *,
 		   krb5_keytab *));
 
-krb5_error_code krb5_ktfile_wresolve 
+krb5_error_code KRB5_CALLCONV krb5_ktfile_wresolve 
 	PROTOTYPE((krb5_context,
 		   const char *,
 		   krb5_keytab *));
 
-krb5_error_code krb5_ktfile_get_name 
+krb5_error_code KRB5_CALLCONV krb5_ktfile_get_name 
 	PROTOTYPE((krb5_context,
 		   krb5_keytab,
 		   char *,
 		   int));
 
-krb5_error_code krb5_ktfile_close 
+krb5_error_code KRB5_CALLCONV krb5_ktfile_close 
 	PROTOTYPE((krb5_context,
 		   krb5_keytab));
 
-krb5_error_code krb5_ktfile_get_entry 
+krb5_error_code KRB5_CALLCONV krb5_ktfile_get_entry 
 	PROTOTYPE((krb5_context,
 		   krb5_keytab,
 		   krb5_principal,
@@ -90,29 +90,29 @@ krb5_error_code krb5_ktfile_get_entry
 		   krb5_enctype,
 		   krb5_keytab_entry *));
 
-krb5_error_code krb5_ktfile_start_seq_get 
+krb5_error_code KRB5_CALLCONV krb5_ktfile_start_seq_get 
 	PROTOTYPE((krb5_context,
 		   krb5_keytab,
 		   krb5_kt_cursor *));
 
-krb5_error_code krb5_ktfile_get_next 
+krb5_error_code KRB5_CALLCONV krb5_ktfile_get_next 
 	PROTOTYPE((krb5_context,
 		   krb5_keytab,
 		   krb5_keytab_entry *,
 		   krb5_kt_cursor *));
 
-krb5_error_code krb5_ktfile_end_get 
+krb5_error_code KRB5_CALLCONV krb5_ktfile_end_get 
 	PROTOTYPE((krb5_context,
 		   krb5_keytab,
 		   krb5_kt_cursor *));
 
 /* routines to be included on extended version (write routines) */
-krb5_error_code krb5_ktfile_add 
+krb5_error_code KRB5_CALLCONV krb5_ktfile_add 
 	PROTOTYPE((krb5_context,
 		   krb5_keytab,
 		   krb5_keytab_entry *));
 
-krb5_error_code krb5_ktfile_remove 
+krb5_error_code KRB5_CALLCONV krb5_ktfile_remove 
 	PROTOTYPE((krb5_context,
 		   krb5_keytab,
 		   krb5_keytab_entry *));
diff --git a/src/lib/krb5/keytab/ktadd.c b/src/lib/krb5/keytab/ktadd.c
index 56d31028c2..ab805c94dd 100644
--- a/src/lib/krb5/keytab/ktadd.c
+++ b/src/lib/krb5/keytab/ktadd.c
@@ -26,11 +26,11 @@
 
 #include "k5-int.h"
 
-krb5_error_code
+KRB5_DLLIMP krb5_error_code KRB5_CALLCONV
 krb5_kt_add_entry (context, id, entry)
     krb5_context context;
     krb5_keytab id;
-    krb5_keytab_entry *entry;
+    krb5_keytab_entry FAR *entry;
 {
     if (id->ops->add)
 	return (*id->ops->add)(context, id, entry);
diff --git a/src/lib/krb5/keytab/ktbase.c b/src/lib/krb5/keytab/ktbase.c
index e78c3dc718..3e821edc74 100644
--- a/src/lib/krb5/keytab/ktbase.c
+++ b/src/lib/krb5/keytab/ktbase.c
@@ -39,10 +39,10 @@ static struct krb5_kt_typelist *kt_typehead = &krb5_kt_typelist_dfl;
  * don't replace if it already exists; return an error instead.
  */
 
-krb5_error_code
+KRB5_DLLIMP krb5_error_code KRB5_CALLCONV
 krb5_kt_register(context, ops)
     krb5_context context;
-    krb5_kt_ops *ops;
+    krb5_kt_ops FAR *ops;
 {
     struct krb5_kt_typelist *t;
     for (t = kt_typehead;t && strcmp(t->ops->prefix,ops->prefix);t = t->next)
@@ -68,11 +68,11 @@ krb5_kt_register(context, ops)
  * particular keytab type.
  */
 
-krb5_error_code
+KRB5_DLLIMP krb5_error_code KRB5_CALLCONV
 krb5_kt_resolve (context, name, ktid)
     krb5_context context;
-    const char *name;
-    krb5_keytab *ktid;
+    const char FAR *name;
+    krb5_keytab FAR *ktid;
 {
     struct krb5_kt_typelist *tlist;
     char *pfx, *resid, *cp;
@@ -184,7 +184,7 @@ krb5_keytab_internalize(kcontext, argp, buffer, lenremain)
     return(kret);
 }
 
-krb5_error_code
+KRB5_DLLIMP krb5_error_code KRB5_CALLCONV
 krb5_ser_keytab_init(kcontext)
     krb5_context	kcontext;
 {
diff --git a/src/lib/krb5/keytab/ktdefault.c b/src/lib/krb5/keytab/ktdefault.c
index 1e34b76ceb..6178d43ddb 100644
--- a/src/lib/krb5/keytab/ktdefault.c
+++ b/src/lib/krb5/keytab/ktdefault.c
@@ -27,10 +27,10 @@
 #include "k5-int.h"
 #include <stdio.h>
 
-krb5_error_code
+KRB5_DLLIMP krb5_error_code KRB5_CALLCONV
 krb5_kt_default(context, id)
     krb5_context context;
-    krb5_keytab *id;
+    krb5_keytab FAR *id;
 {
     char defname[BUFSIZ];
     krb5_error_code retval;
diff --git a/src/lib/krb5/keytab/ktfr_entry.c b/src/lib/krb5/keytab/ktfr_entry.c
index 5aaa775129..92c3235e48 100644
--- a/src/lib/krb5/keytab/ktfr_entry.c
+++ b/src/lib/krb5/keytab/ktfr_entry.c
@@ -26,10 +26,10 @@
 
 #include "k5-int.h"
 
-krb5_error_code
+KRB5_DLLIMP krb5_error_code KRB5_CALLCONV
 krb5_kt_free_entry (context, entry)
     krb5_context context;
-    krb5_keytab_entry *entry;
+    krb5_keytab_entry FAR *entry;
 {
     if (!entry)
 	return 0;
diff --git a/src/lib/krb5/keytab/ktremove.c b/src/lib/krb5/keytab/ktremove.c
index 377c4a0a7d..6fc9dd3cfe 100644
--- a/src/lib/krb5/keytab/ktremove.c
+++ b/src/lib/krb5/keytab/ktremove.c
@@ -26,11 +26,11 @@
 
 #include "k5-int.h"
 
-krb5_error_code
+KRB5_DLLIMP krb5_error_code KRB5_CALLCONV
 krb5_kt_remove_entry (context, id, entry)
     krb5_context context;
     krb5_keytab id;
-    krb5_keytab_entry *entry;
+    krb5_keytab_entry FAR *entry;
 {
     if (id->ops->remove)
 	return (*id->ops->remove)(context, id, entry);
diff --git a/src/lib/krb5/keytab/read_servi.c b/src/lib/krb5/keytab/read_servi.c
index a17443461e..b6f058e491 100644
--- a/src/lib/krb5/keytab/read_servi.c
+++ b/src/lib/krb5/keytab/read_servi.c
@@ -40,14 +40,14 @@
  * returns: Either KSUCCESS or error code.
  * errors: error code if not found or keyprocarg is invalid.
  */
-krb5_error_code
+KRB5_DLLIMP krb5_error_code KRB5_CALLCONV
 krb5_kt_read_service_key(context, keyprocarg, principal, vno, enctype, key)
     krb5_context context;
     krb5_pointer keyprocarg;
     krb5_principal principal;
     krb5_kvno vno;
     krb5_enctype enctype;
-    krb5_keyblock ** key;
+    krb5_keyblock FAR * FAR * key;
 {
     krb5_error_code kerror = KSUCCESS;
     char keytabname[MAX_KEYTAB_NAME_LEN + 1]; /* + 1 for NULL termination */
diff --git a/src/lib/krb5/krb/ChangeLog b/src/lib/krb5/krb/ChangeLog
index 025691fcfa..1d6f06b85d 100644
--- a/src/lib/krb5/krb/ChangeLog
+++ b/src/lib/krb5/krb/ChangeLog
@@ -1,3 +1,16 @@
+Sun Feb  2 20:57:15 1997  Richard Basch  <basch@lehman.com>
+
+	* serialize.c: Added FAR declarations to pointer arguments for
+		all functions declared as KRB5_DLLIMP.
+
+Thu Jan 30 21:44:37 1997  Richard Basch  <basch@lehman.com>
+
+	* crypto_glue.c:
+		Export more crypto-layer functions:
+		krb5_encrypt, krb5_decrypt, krb5_eblock_enctype,
+		krb5_process_key, krb5_finish_key, krb5_string_to_key,
+		krb5_init_random_key, krb5_finish_random_key, krb5_random_key
+
 Mon Dec 23 17:20:03 1996  Theodore Y. Ts'o  <tytso@mit.edu>
 
 	* Makefile.in (SRCS): Add brand.c to the SRCS line so that the
@@ -16,6 +29,20 @@ Sat Dec 21 01:26:11 1996  Theodore Y. Ts'o  <tytso@mit.edu>
 		code, which is returned to the user if the timebomb should
 		be activated.
 
+Thu Nov 21 14:55:16 EST 1996    Richard Basch   <basch@lehman.com>
+
+        * Makefile.in: win32 build
+
+	* auth_con.c bld_pr_ext.c conv_princ.c copy_addrs.c copy_athctr.c
+	copy_auth.c copy_cksum.c copy_creds.c copy_data.c copy_key.c
+	copy_princ.c copy_tick.c cp_key_cnt.c decrypt_tk.c fwd_tgt.c
+	gc_via_tkt.c get_creds.c get_in_tkt.c in_tkt_ktb.c in_tkt_pwd.c
+	in_tkt_sky.c init_ctx.c mk_cred.c mk_error.c mk_priv.c mk_rep.c
+	mk_req.c mk_req_ext.c mk_safe.c parse.c princ_comp.c rd_cred.c
+	rd_error.c rd_priv.c rd_rep.c rd_req.c rd_safe.c recvauth.c
+	sendauth.c str_conv.c unparse.c valid_times.c
+		DLL export various functions (see lib/krb5.def for full list)
+
 Thu Nov 21 13:54:01 1996  Ezra Peisach  <epeisach@mit.edu>
 
 	* recvauth.c (krb5_recvauth): If there is an error, and the server
diff --git a/src/lib/krb5/krb/Makefile.in b/src/lib/krb5/krb/Makefile.in
index 2ec9e933ba..8ee61e8f33 100644
--- a/src/lib/krb5/krb/Makefile.in
+++ b/src/lib/krb5/krb/Makefile.in
@@ -2,7 +2,9 @@ CFLAGS = $(CCOPTS) $(DEFS)
 RUN_SETUP = @KRB5_RUN_ENV@
 
 ##DOSBUILDTOP = ..\..\..
-##DOSLIBNAME=..\krb5.lib
+##DOSMYNAME=krb
+##DOSOBJFILE=..\$(MYNAME).lst
+##WIN16##LIBNAME=..\krb5.lib
 
 .c.o:
 	$(CC) $(CFLAGS) -c $(srcdir)/$*.c
@@ -26,6 +28,7 @@ OBJS=	addr_comp.$(OBJEXT)	\
 	copy_princ.$(OBJEXT)	\
 	copy_tick.$(OBJEXT)	\
 	cp_key_cnt.$(OBJEXT)	\
+	crypto_glue.$(OBJEXT)	\
 	decode_kdc.$(OBJEXT)	\
 	decrypt_tk.$(OBJEXT)	\
 	encode_kdc.$(OBJEXT)	\
@@ -100,6 +103,7 @@ SRCS=	$(srcdir)/addr_comp.c	\
 	$(srcdir)/copy_princ.c	\
 	$(srcdir)/copy_tick.c	\
 	$(srcdir)/cp_key_cnt.c	\
+	$(srcdir)/crypto_glue.c	\
 	$(srcdir)/decode_kdc.c	\
 	$(srcdir)/decrypt_tk.c	\
 	$(srcdir)/encode_kdc.c	\
@@ -157,7 +161,12 @@ SRCS=	$(srcdir)/addr_comp.c	\
 
 all-unix:: shared $(OBJS)
 all-mac:: shared $(OBJS)
-all-windows:: $(OBJS)
+all-windows:: $(OBJFILE)
+
+##DOS$(OBJFILE): $(OBJS)
+##DOS	$(RM) $(OBJFILE)
+##WIN16##	$(CP) nul: $(OBJFILE)
+##WIN32##	$(LIBECHO) -p $(MYNAME)\ *.obj > $(OBJFILE)
 
 shared:
 	mkdir shared
@@ -222,3 +231,4 @@ clean-unix::
 clean-mac::
 	$(RM) shared/*
 clean-windows::
+	$(RM) $(OBJFILE)
diff --git a/src/lib/krb5/krb/auth_con.c b/src/lib/krb5/krb/auth_con.c
index ec8918208a..b258b0dd28 100644
--- a/src/lib/krb5/krb/auth_con.c
+++ b/src/lib/krb5/krb/auth_con.c
@@ -26,10 +26,10 @@ actx_copy_addr(context, inad, outad)
     return 0;
 }
 
-krb5_error_code
+KRB5_DLLIMP krb5_error_code KRB5_CALLCONV
 krb5_auth_con_init(context, auth_context)
     krb5_context      	  context;
-    krb5_auth_context  * auth_context;
+    krb5_auth_context  FAR * auth_context;
 {
     *auth_context =
             (krb5_auth_context)malloc(sizeof(struct _krb5_auth_context));
@@ -48,7 +48,7 @@ krb5_auth_con_init(context, auth_context)
     return 0;
 }
 
-krb5_error_code
+KRB5_DLLIMP krb5_error_code KRB5_CALLCONV
 krb5_auth_con_free(context, auth_context)
     krb5_context      	  context;
     krb5_auth_context     auth_context;
@@ -172,18 +172,18 @@ krb5_auth_con_setports(context, auth_context, local_port, remote_port)
  * Once decrypted this key is no longer necessary and is then overwritten
  * with the session key sent by the client.
  */
-krb5_error_code
+KRB5_DLLIMP krb5_error_code KRB5_CALLCONV
 krb5_auth_con_setuseruserkey(context, auth_context, keyblock)
     krb5_context      	  context;
     krb5_auth_context 	  auth_context;
-    krb5_keyblock       * keyblock;		
+    krb5_keyblock   FAR * keyblock;		
 {
     if (auth_context->keyblock)
 	krb5_free_keyblock(context, auth_context->keyblock);
     return(krb5_copy_keyblock(context, keyblock, &(auth_context->keyblock)));
 }
 
-krb5_error_code
+KRB5_DLLIMP krb5_error_code KRB5_CALLCONV
 krb5_auth_con_getkey(context, auth_context, keyblock)
     krb5_context      	  context;
     krb5_auth_context 	  auth_context;
@@ -195,11 +195,11 @@ krb5_auth_con_getkey(context, auth_context, keyblock)
     return 0;
 }
 
-krb5_error_code
+KRB5_DLLIMP krb5_error_code KRB5_CALLCONV
 krb5_auth_con_getlocalsubkey(context, auth_context, keyblock)
     krb5_context      	  context;
     krb5_auth_context 	  auth_context;
-    krb5_keyblock      ** keyblock;		
+    krb5_keyblock FAR * FAR * keyblock;		
 {
     if (auth_context->local_subkey)
     	return krb5_copy_keyblock(context,auth_context->local_subkey,keyblock);
@@ -207,11 +207,11 @@ krb5_auth_con_getlocalsubkey(context, auth_context, keyblock)
     return 0;
 }
 
-krb5_error_code
+KRB5_DLLIMP krb5_error_code KRB5_CALLCONV
 krb5_auth_con_getremotesubkey(context, auth_context, keyblock)
     krb5_context      	  context;
     krb5_auth_context 	  auth_context;
-    krb5_keyblock      ** keyblock;		
+    krb5_keyblock FAR * FAR * keyblock;		
 {
     if (auth_context->remote_subkey)
     	return krb5_copy_keyblock(context,auth_context->remote_subkey,keyblock);
@@ -219,7 +219,7 @@ krb5_auth_con_getremotesubkey(context, auth_context, keyblock)
     return 0;
 }
 
-krb5_error_code
+KRB5_DLLIMP krb5_error_code KRB5_CALLCONV
 krb5_auth_con_set_req_cksumtype(context, auth_context, cksumtype)
     krb5_context      	  context;
     krb5_auth_context 	  auth_context;
@@ -239,7 +239,7 @@ krb5_auth_con_set_safe_cksumtype(context, auth_context, cksumtype)
     return 0;
 }
 
-krb5_error_code
+KRB5_DLLIMP krb5_error_code KRB5_CALLCONV
 krb5_auth_con_getlocalseqnumber(context, auth_context, seqnumber)
     krb5_context      	  context;
     krb5_auth_context 	  auth_context;
@@ -249,21 +249,21 @@ krb5_auth_con_getlocalseqnumber(context, auth_context, seqnumber)
     return 0;
 }
 
-krb5_error_code
+KRB5_DLLIMP krb5_error_code KRB5_CALLCONV
 krb5_auth_con_getauthenticator(context, auth_context, authenticator)
     krb5_context      	  context;
     krb5_auth_context 	  auth_context;
-    krb5_authenticator ** authenticator;		
+    krb5_authenticator FAR * FAR * authenticator;		
 {
     return (krb5_copy_authenticator(context, auth_context->authentp,
 				    authenticator));
 }
 
-krb5_error_code
+KRB5_DLLIMP krb5_error_code KRB5_CALLCONV
 krb5_auth_con_getremoteseqnumber(context, auth_context, seqnumber)
     krb5_context      	  context;
     krb5_auth_context 	  auth_context;
-    krb5_int32	  	* seqnumber;		
+    krb5_int32	    FAR * seqnumber;		
 {
     *seqnumber = auth_context->remote_seq_number;
     return 0;
@@ -307,7 +307,7 @@ krb5_auth_con_getivector(context, auth_context, ivector)
     return 0;
 }
 
-krb5_error_code
+KRB5_DLLIMP krb5_error_code KRB5_CALLCONV
 krb5_auth_con_setflags(context, auth_context, flags)
     krb5_context      	  context;
     krb5_auth_context 	  auth_context;
@@ -317,11 +317,11 @@ krb5_auth_con_setflags(context, auth_context, flags)
     return 0;
 }
 
-krb5_error_code
+KRB5_DLLIMP krb5_error_code KRB5_CALLCONV
 krb5_auth_con_getflags(context, auth_context, flags)
     krb5_context      	  context;
     krb5_auth_context 	  auth_context;
-    krb5_int32		* flags;
+    krb5_int32	    FAR * flags;
 {
     *flags = auth_context->auth_context_flags;
     return 0;
diff --git a/src/lib/krb5/krb/bld_pr_ext.c b/src/lib/krb5/krb/bld_pr_ext.c
index 85c62c5096..8b201759ff 100644
--- a/src/lib/krb5/krb/bld_pr_ext.c
+++ b/src/lib/krb5/krb/bld_pr_ext.c
@@ -32,15 +32,15 @@
 #include <varargs.h>
 #endif
 
-krb5_error_code INTERFACE_C
+KRB5_DLLIMP krb5_error_code KRB5_CALLCONV_C
 #ifdef HAVE_STDARG_H
-krb5_build_principal_ext(krb5_context context,  krb5_principal * princ, int rlen, const char * realm, ...)
+krb5_build_principal_ext(krb5_context context,  krb5_principal FAR * princ, int rlen, const char FAR * realm, ...)
 #else
 krb5_build_principal_ext(context, princ, rlen, realm, va_alist)
     krb5_context context;
-    krb5_principal *princ;
+    krb5_principal FAR *princ;
     int rlen;
-    const char *realm;
+    const char FAR *realm;
     va_dcl
 #endif
 {
diff --git a/src/lib/krb5/krb/bld_princ.c b/src/lib/krb5/krb/bld_princ.c
index d78fea5f5c..364c234ca2 100644
--- a/src/lib/krb5/krb/bld_princ.c
+++ b/src/lib/krb5/krb/bld_princ.c
@@ -96,7 +96,7 @@ krb5_build_principal_va(context, princ, rlen, realm, ap)
     return 0;
 }
 
-krb5_error_code
+KRB5_DLLIMP krb5_error_code KRB5_CALLCONV_C
 #ifdef HAVE_STDARG_H
 krb5_build_principal(krb5_context context,  krb5_principal * princ, int rlen,
     const char * realm, ...)
diff --git a/src/lib/krb5/krb/conv_princ.c b/src/lib/krb5/krb/conv_princ.c
index d11fac3375..6a72abc728 100644
--- a/src/lib/krb5/krb/conv_princ.c
+++ b/src/lib/krb5/krb/conv_princ.c
@@ -102,13 +102,13 @@ static char *strnchr(s, c, n)
 /* XXX This calls for a new error code */
 #define KRB5_INVALID_PRINCIPAL KRB5_LNAME_BADFORMAT
 
-krb5_error_code
+KRB5_DLLIMP krb5_error_code KRB5_CALLCONV
 krb5_524_conv_principal(context, princ, name, inst, realm)
     krb5_context context;
     const krb5_principal princ;
-    char *name;
-    char *inst;
-    char *realm;
+    char FAR *name;
+    char FAR *inst;
+    char FAR *realm;
 {
      const struct krb_convert *p;
      krb5_data *compo;
@@ -170,13 +170,13 @@ krb5_524_conv_principal(context, princ, name, inst, realm)
      return 0;
 }
 
-krb5_error_code
+KRB5_DLLIMP krb5_error_code KRB5_CALLCONV
 krb5_425_conv_principal(context, name, instance, realm, princ)
    krb5_context context;
-   const char	*name;
-   const char	*instance;
-   const char	*realm;
-   krb5_principal	*princ;
+   const char	FAR *name;
+   const char	FAR *instance;
+   const char	FAR *realm;
+   krb5_principal	FAR *princ;
 {
      const struct krb_convert *p;
      char buf[256];		/* V4 instances are limited to 40 characters */
diff --git a/src/lib/krb5/krb/copy_addrs.c b/src/lib/krb5/krb/copy_addrs.c
index 4d93ebf98a..596a1267e9 100644
--- a/src/lib/krb5/krb/copy_addrs.c
+++ b/src/lib/krb5/krb/copy_addrs.c
@@ -26,11 +26,11 @@
 
 #include "k5-int.h"
 
-krb5_error_code
+KRB5_DLLIMP krb5_error_code KRB5_CALLCONV
 krb5_copy_addr(context, inad, outad)
     krb5_context context;
-const krb5_address *inad;
-krb5_address **outad;
+    const krb5_address FAR *inad;
+    krb5_address FAR * FAR *outad;
 {
     krb5_address *tmpad;
 
@@ -53,11 +53,11 @@ krb5_address **outad;
 /*
  * Copy an address array, with fresh allocation.
  */
-krb5_error_code
+KRB5_DLLIMP krb5_error_code KRB5_CALLCONV
 krb5_copy_addresses(context, inaddr, outaddr)
     krb5_context context;
-    krb5_address * const * inaddr;
-    krb5_address ***outaddr;
+    krb5_address FAR * const FAR * inaddr;
+    krb5_address FAR * FAR * FAR *outaddr;
 {
     krb5_error_code retval;
     krb5_address ** tempaddr;
diff --git a/src/lib/krb5/krb/copy_athctr.c b/src/lib/krb5/krb/copy_athctr.c
index d162fb2152..e2bec676c1 100644
--- a/src/lib/krb5/krb/copy_athctr.c
+++ b/src/lib/krb5/krb/copy_athctr.c
@@ -26,11 +26,11 @@
 
 #include "k5-int.h"
 
-krb5_error_code
+KRB5_DLLIMP krb5_error_code KRB5_CALLCONV
 krb5_copy_authenticator(context, authfrom, authto)
     krb5_context context;
-const krb5_authenticator *authfrom;
-krb5_authenticator **authto;
+    const krb5_authenticator FAR *authfrom;
+    krb5_authenticator FAR *FAR *authto;
 {
     krb5_error_code retval;
     krb5_authenticator *tempto;
diff --git a/src/lib/krb5/krb/copy_auth.c b/src/lib/krb5/krb/copy_auth.c
index 759608ca5b..7594b91367 100644
--- a/src/lib/krb5/krb/copy_auth.c
+++ b/src/lib/krb5/krb/copy_auth.c
@@ -53,11 +53,11 @@ krb5_authdata **outad;
 /*
  * Copy an authdata array, with fresh allocation.
  */
-krb5_error_code
+KRB5_DLLIMP krb5_error_code KRB5_CALLCONV
 krb5_copy_authdata(context, inauthdat, outauthdat)
     krb5_context context;
-krb5_authdata * const * inauthdat;
-krb5_authdata ***outauthdat;
+    krb5_authdata FAR * const FAR * inauthdat;
+    krb5_authdata FAR * FAR * FAR *outauthdat;
 {
     krb5_error_code retval;
     krb5_authdata ** tempauthdat;
diff --git a/src/lib/krb5/krb/copy_cksum.c b/src/lib/krb5/krb/copy_cksum.c
index c0bf8a24ac..8adc82a906 100644
--- a/src/lib/krb5/krb/copy_cksum.c
+++ b/src/lib/krb5/krb/copy_cksum.c
@@ -26,11 +26,11 @@
 
 #include "k5-int.h"
 
-krb5_error_code
+KRB5_DLLIMP krb5_error_code KRB5_CALLCONV
 krb5_copy_checksum(context, ckfrom, ckto)
     krb5_context context;
-    const krb5_checksum *ckfrom;
-    krb5_checksum **ckto;
+    const krb5_checksum FAR *ckfrom;
+    krb5_checksum FAR * FAR *ckto;
 {
     krb5_checksum *tempto;
 
diff --git a/src/lib/krb5/krb/copy_creds.c b/src/lib/krb5/krb/copy_creds.c
index 712ca38331..a8fea1166e 100644
--- a/src/lib/krb5/krb/copy_creds.c
+++ b/src/lib/krb5/krb/copy_creds.c
@@ -30,7 +30,7 @@
  * Copy credentials, allocating fresh storage where needed.
  */
 
-krb5_error_code
+KRB5_DLLIMP krb5_error_code KRB5_CALLCONV
 krb5_copy_creds(context, incred, outcred)
     krb5_context context;
     const krb5_creds *incred;
diff --git a/src/lib/krb5/krb/copy_data.c b/src/lib/krb5/krb/copy_data.c
index fb2e8708d8..df4f7831e7 100644
--- a/src/lib/krb5/krb/copy_data.c
+++ b/src/lib/krb5/krb/copy_data.c
@@ -29,11 +29,11 @@
 /*
  * Copy a data structure, with fresh allocation.
  */
-krb5_error_code
+KRB5_DLLIMP krb5_error_code KRB5_CALLCONV
 krb5_copy_data(context, indata, outdata)
     krb5_context context;
-    const krb5_data *indata;
-    krb5_data **outdata;
+    const krb5_data FAR *indata;
+    krb5_data FAR * FAR *outdata;
 {
     krb5_data *tempdata;
 
diff --git a/src/lib/krb5/krb/copy_key.c b/src/lib/krb5/krb/copy_key.c
index e71f39961a..39fcb7df8f 100644
--- a/src/lib/krb5/krb/copy_key.c
+++ b/src/lib/krb5/krb/copy_key.c
@@ -29,11 +29,11 @@
 /*
  * Copy a keyblock, including alloc'ed storage.
  */
-krb5_error_code
+KRB5_DLLIMP krb5_error_code KRB5_CALLCONV
 krb5_copy_keyblock(context, from, to)
     krb5_context context;
-    const krb5_keyblock *from;
-    krb5_keyblock **to;
+    const krb5_keyblock FAR *from;
+    krb5_keyblock FAR * FAR *to;
 {
 	krb5_keyblock	*new_key;
 
diff --git a/src/lib/krb5/krb/copy_princ.c b/src/lib/krb5/krb/copy_princ.c
index 4dbf44e7ee..2a4025e8d3 100644
--- a/src/lib/krb5/krb/copy_princ.c
+++ b/src/lib/krb5/krb/copy_princ.c
@@ -29,11 +29,11 @@
 /*
  * Copy a principal structure, with fresh allocation.
  */
-krb5_error_code
+KRB5_DLLIMP krb5_error_code KRB5_CALLCONV
 krb5_copy_principal(context, inprinc, outprinc)
     krb5_context context;
     krb5_const_principal inprinc;
-    krb5_principal *outprinc;
+    krb5_principal FAR *outprinc;
 {
     register krb5_principal tempprinc;
     register int i, nelems;
diff --git a/src/lib/krb5/krb/copy_tick.c b/src/lib/krb5/krb/copy_tick.c
index a4dbed4df8..9235db1116 100644
--- a/src/lib/krb5/krb/copy_tick.c
+++ b/src/lib/krb5/krb/copy_tick.c
@@ -95,7 +95,7 @@ krb5_copy_enc_tkt_part(context, partfrom, partto)
     return 0;
 }
 
-krb5_error_code
+KRB5_DLLIMP krb5_error_code KRB5_CALLCONV
 krb5_copy_ticket(context, from, pto)
     krb5_context context;
     const krb5_ticket *from;
diff --git a/src/lib/krb5/krb/cp_key_cnt.c b/src/lib/krb5/krb/cp_key_cnt.c
index fd32cae154..6cc6ef843e 100644
--- a/src/lib/krb5/krb/cp_key_cnt.c
+++ b/src/lib/krb5/krb/cp_key_cnt.c
@@ -29,11 +29,11 @@
 /*
  * Copy a keyblock, including alloc'ed storage.
  */
-krb5_error_code
+KRB5_DLLIMP krb5_error_code KRB5_CALLCONV
 krb5_copy_keyblock_contents(context, from, to)
     krb5_context context;
-    const krb5_keyblock *from;
-    krb5_keyblock *to;
+    const krb5_keyblock FAR *from;
+    krb5_keyblock FAR *to;
 {
     *to = *from;
     to->contents = (krb5_octet *)malloc(to->length);
diff --git a/src/lib/krb5/krb/crypto_glue.c b/src/lib/krb5/krb/crypto_glue.c
new file mode 100644
index 0000000000..615adc6535
--- /dev/null
+++ b/src/lib/krb5/krb/crypto_glue.c
@@ -0,0 +1,233 @@
+/*
+ * lib/krb5/krb/crypto_glue.c
+ *
+ * Copyright 1996 by the Massachusetts Institute of Technology.
+ * All Rights Reserved.
+ *
+ * Export of this software from the United States of America may
+ *   require a specific license from the United States Government.
+ *   It is the responsibility of any person or organization contemplating
+ *   export to obtain such a license before exporting.
+ * 
+ * WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
+ * distribute this software and its documentation for any purpose and
+ * without fee is hereby granted, provided that the above copyright
+ * notice appear in all copies and that both that copyright notice and
+ * this permission notice appear in supporting documentation, and that
+ * the name of M.I.T. not be used in advertising or publicity pertaining
+ * to distribution of the software without specific, written prior
+ * permission.  M.I.T. makes no representations about the suitability of
+ * this software for any purpose.  It is provided "as is" without express
+ * or implied warranty.
+ *
+ * Exported routines:
+ *   krb5_use_enctype()
+ *   krb5_checksum_size()
+ *   krb5_encrypt_size()
+ *   krb5_calculate_checksum()
+ *   krb5_verify_checksum()
+ *   krb5_encrypt()
+ *   krb5_decrypt()
+ *   krb5_process_key()
+ *   krb5_finish_key()
+ *   krb5_string_to_key()
+ *   krb5_init_random_key()
+ *   krb5_finish_random_key()
+ *   krb5_random_key()
+ *   krb5_eblock_enctype()
+ *
+ * Internal library routines:
+ *   is_coll_proof_cksum()
+ *   is_keyed_cksum()
+ *   valid_cksumtype()
+ *   valid_enctype()
+ */
+
+#include "k5-int.h"
+
+
+KRB5_DLLIMP size_t KRB5_CALLCONV
+krb5_encrypt_size(length, crypto)
+    krb5_const size_t			length;
+    krb5_const krb5_cryptosystem_entry	FAR * crypto;
+{
+    return krb5_roundup(length + crypto->pad_minimum, crypto->block_length);
+}
+
+krb5_boolean KRB5_CALLCONV
+valid_enctype(ktype)
+    krb5_const krb5_enctype	ktype;
+{
+    return ((ktype<=krb5_max_enctype) && (ktype>0) && krb5_enctype_array[ktype]);
+}
+
+krb5_boolean KRB5_CALLCONV
+valid_cksumtype(cktype)
+    krb5_const krb5_cksumtype	cktype;
+{
+    return ((cktype<=krb5_max_cksum) && (cktype>0) && krb5_cksumarray[cktype]);
+}
+
+krb5_boolean KRB5_CALLCONV
+is_coll_proof_cksum(cktype)
+    krb5_const krb5_cksumtype	cktype;
+{
+    return(krb5_cksumarray[cktype]->is_collision_proof);
+}
+
+krb5_boolean KRB5_CALLCONV
+is_keyed_cksum(cktype)
+    krb5_const krb5_cksumtype	cktype;
+{
+    return (krb5_cksumarray[cktype]->uses_key);
+}
+
+KRB5_DLLIMP krb5_error_code KRB5_CALLCONV
+krb5_use_enctype(context, eblock, enctype)
+    krb5_context		context;
+    krb5_encrypt_block		FAR * eblock;
+    krb5_const krb5_enctype	enctype;
+{
+    eblock->crypto_entry = krb5_enctype_array[(enctype)]->system;
+    return 0;
+}
+
+KRB5_DLLIMP size_t KRB5_CALLCONV
+krb5_checksum_size(context, cktype)
+    krb5_context		context;
+    krb5_const krb5_cksumtype	cktype;
+{
+    return krb5_cksumarray[cktype]->checksum_length;
+}
+
+KRB5_DLLIMP krb5_error_code KRB5_CALLCONV
+krb5_calculate_checksum(context, cktype, in, in_length, seed, seed_length, outcksum)
+    krb5_context		context;
+    krb5_const krb5_cksumtype	cktype;
+    krb5_pointer		in;
+    krb5_const size_t		in_length;
+    krb5_const krb5_pointer	seed;
+    krb5_const size_t		seed_length;
+    krb5_checksum	FAR *outcksum;
+{
+    return krb5_x(((*krb5_cksumarray[cktype]->sum_func)),
+		  (in, in_length, seed, seed_length, outcksum));
+}
+
+KRB5_DLLIMP krb5_error_code KRB5_CALLCONV
+krb5_verify_checksum(context, cktype, cksum, in, in_length, seed, seed_length)
+    krb5_context		context;
+    krb5_const krb5_cksumtype	cktype;
+    krb5_const krb5_checksum	FAR *cksum;
+    krb5_const krb5_pointer	in;
+    krb5_const size_t		in_length;
+    krb5_const krb5_pointer	seed;
+    krb5_const size_t		seed_length;
+{
+    return krb5_x((*krb5_cksumarray[cktype]->sum_verf_func),
+		  (cksum, in, in_length, seed, seed_length));
+}
+
+KRB5_DLLIMP krb5_enctype KRB5_CALLCONV
+krb5_eblock_enctype(context, eblock)
+    krb5_context			context;
+    krb5_const krb5_encrypt_block	FAR * eblock;
+{
+    return eblock->crypto_entry->proto_enctype;
+}
+
+KRB5_DLLIMP krb5_error_code KRB5_CALLCONV
+krb5_encrypt(context, inptr, outptr, size, eblock, ivec)
+    krb5_context	context;
+    krb5_const krb5_pointer	inptr;
+    krb5_pointer		outptr;
+    krb5_const size_t		size;
+    krb5_encrypt_block		FAR * eblock;
+    krb5_pointer		ivec;
+{
+    return krb5_x(eblock->crypto_entry->encrypt_func,
+		  (inptr, outptr, size, eblock, ivec));
+}
+
+
+KRB5_DLLIMP krb5_error_code KRB5_CALLCONV
+krb5_decrypt(context, inptr, outptr, size, eblock, ivec)
+    krb5_context		context;
+    krb5_const krb5_pointer	inptr;
+    krb5_pointer		outptr;
+    krb5_const size_t		size;
+    krb5_encrypt_block		FAR * eblock;
+    krb5_pointer		ivec;
+{
+    return krb5_x(eblock->crypto_entry->decrypt_func,
+		  (inptr, outptr, size, eblock, ivec));
+}
+
+
+KRB5_DLLIMP krb5_error_code KRB5_CALLCONV
+krb5_process_key(context, eblock, key)
+    krb5_context		context;
+    krb5_encrypt_block		FAR * eblock;
+    krb5_const krb5_keyblock	FAR * key;
+{
+    return krb5_x(eblock->crypto_entry->process_key,
+		  (eblock, key));
+}
+
+KRB5_DLLIMP krb5_error_code KRB5_CALLCONV
+krb5_finish_key(context, eblock)
+    krb5_context	context;
+    krb5_encrypt_block	FAR * eblock;
+{
+    return krb5_x(eblock->crypto_entry->finish_key,(eblock));
+}
+
+
+KRB5_DLLIMP krb5_error_code KRB5_CALLCONV
+krb5_string_to_key(context, eblock, keyblock, data, princ)
+    krb5_context			context;
+    krb5_const krb5_encrypt_block	FAR * eblock;
+    krb5_keyblock			FAR * keyblock;
+    krb5_const krb5_data		FAR * data;
+    krb5_const krb5_data		FAR * princ;
+{
+    return krb5_x(eblock->crypto_entry->string_to_key,
+		  (eblock, keyblock, data, princ));
+}
+
+
+KRB5_DLLIMP krb5_error_code KRB5_CALLCONV
+krb5_init_random_key(context, eblock, keyblock, ptr)
+    krb5_context			context;
+    krb5_const krb5_encrypt_block	FAR * eblock;
+    krb5_const krb5_keyblock		FAR * keyblock;
+    krb5_pointer			FAR * ptr;
+{
+    return krb5_x(eblock->crypto_entry->init_random_key,
+		  (eblock, keyblock, ptr));
+}
+
+
+KRB5_DLLIMP krb5_error_code KRB5_CALLCONV
+krb5_finish_random_key(context, eblock, ptr)
+    krb5_context			context;
+    krb5_const krb5_encrypt_block	FAR * eblock;
+    krb5_pointer			FAR * ptr;
+{
+    return krb5_x(eblock->crypto_entry->finish_random_key,
+		  (eblock, ptr));
+}
+
+
+KRB5_DLLIMP krb5_error_code KRB5_CALLCONV
+krb5_random_key(context, eblock, ptr, keyblock)
+    krb5_context			context;
+    krb5_const krb5_encrypt_block	FAR * eblock;
+    krb5_pointer			ptr;
+    krb5_keyblock			FAR * FAR * keyblock;
+{
+    return krb5_x(eblock->crypto_entry->random_key,
+		  (eblock, ptr, keyblock));
+}
+
+
diff --git a/src/lib/krb5/krb/decrypt_tk.c b/src/lib/krb5/krb/decrypt_tk.c
index f8850b1784..354a3f2a06 100644
--- a/src/lib/krb5/krb/decrypt_tk.c
+++ b/src/lib/krb5/krb/decrypt_tk.c
@@ -35,11 +35,11 @@
 
 */
 
-krb5_error_code
+KRB5_DLLIMP krb5_error_code KRB5_CALLCONV
 krb5_decrypt_tkt_part(context, srv_key, ticket)
     krb5_context context;
-    const krb5_keyblock *srv_key;
-    register krb5_ticket *ticket;
+    const krb5_keyblock FAR *srv_key;
+    register krb5_ticket FAR *ticket;
 {
     krb5_enc_tkt_part *dec_tkt_part;
     krb5_encrypt_block eblock;
diff --git a/src/lib/krb5/krb/encrypt_tk.c b/src/lib/krb5/krb/encrypt_tk.c
index 6203b78366..cb1fb28b9d 100644
--- a/src/lib/krb5/krb/encrypt_tk.c
+++ b/src/lib/krb5/krb/encrypt_tk.c
@@ -57,7 +57,7 @@ krb5_encrypt_tkt_part(context, srv_key, dec_ticket)
 #define cleanup_scratch() { (void) memset(scratch->data, 0, scratch->length); \
 krb5_free_data(context, scratch); }
 
-    krb5_use_enctype(kdc_context, &eblock, srv_key->enctype);
+    krb5_use_enctype(context, &eblock, srv_key->enctype);
 
     dec_ticket->enc_part.ciphertext.length =
 	krb5_encrypt_size(scratch->length, eblock.crypto_entry);
diff --git a/src/lib/krb5/krb/fwd_tgt.c b/src/lib/krb5/krb/fwd_tgt.c
index 6e10ad2ee7..ed95b75fd6 100644
--- a/src/lib/krb5/krb/fwd_tgt.c
+++ b/src/lib/krb5/krb/fwd_tgt.c
@@ -29,17 +29,17 @@
 #define flags2options(flags) (flags & KDC_TKT_COMMON_MASK)
 
 /* Get a TGT for use at the remote host */
-krb5_error_code
+KRB5_DLLIMP krb5_error_code KRB5_CALLCONV
 krb5_fwd_tgt_creds(context, auth_context, rhost, client, server, cc,
 		   forwardable, outbuf)
     krb5_context context;
     krb5_auth_context auth_context;
-    char *rhost;
+    char FAR *rhost;
     krb5_principal client;
     krb5_principal server;
     krb5_ccache cc;
     int forwardable;      /* Should forwarded TGT also be forwardable? */
-    krb5_data *outbuf;
+    krb5_data FAR *outbuf;
 {
     krb5_replay_data replaydata;
     krb5_data * scratch = 0;
@@ -143,6 +143,3 @@ errout:
     krb5_free_cred_contents(context, &tgt);
     return retval;
 }
-
-
-
diff --git a/src/lib/krb5/krb/gc_via_tkt.c b/src/lib/krb5/krb/gc_via_tkt.c
index 0ee9197703..2ea4fc8158 100644
--- a/src/lib/krb5/krb/gc_via_tkt.c
+++ b/src/lib/krb5/krb/gc_via_tkt.c
@@ -98,7 +98,7 @@ cleanup:
     return retval;
 }
  
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_get_cred_via_tkt (context, tkt, kdcoptions, address, in_cred, out_cred)
     krb5_context 	  context;
     krb5_creds 		* tkt;
diff --git a/src/lib/krb5/krb/get_creds.c b/src/lib/krb5/krb/get_creds.c
index 4ff62f174b..3e2885d663 100644
--- a/src/lib/krb5/krb/get_creds.c
+++ b/src/lib/krb5/krb/get_creds.c
@@ -87,13 +87,13 @@ krb5_get_credentials_core(context, options, ccache, in_creds, out_creds,
     return 0;
 }
 
-krb5_error_code INTERFACE
+KRB5_DLLIMP krb5_error_code KRB5_CALLCONV
 krb5_get_credentials(context, options, ccache, in_creds, out_creds)
     krb5_context context;
     const krb5_flags options;
     krb5_ccache ccache;
-    krb5_creds *in_creds;
-    krb5_creds **out_creds;
+    krb5_creds FAR *in_creds;
+    krb5_creds FAR * FAR *out_creds;
 {
     krb5_error_code retval;
     krb5_creds mcreds;
@@ -195,7 +195,7 @@ krb5_get_credentials_val_renew_core(context, options, ccache,
     return retval;
 }
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_get_credentials_validate(context, options, ccache, in_creds, out_creds)
     krb5_context context;
     const krb5_flags options;
@@ -208,7 +208,7 @@ krb5_get_credentials_validate(context, options, ccache, in_creds, out_creds)
 					       INT_GC_VALIDATE));
 }
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_get_credentials_renew(context, options, ccache, in_creds, out_creds)
     krb5_context context;
     const krb5_flags options;
diff --git a/src/lib/krb5/krb/get_in_tkt.c b/src/lib/krb5/krb/get_in_tkt.c
index 048a56ca8c..8d42b2de81 100644
--- a/src/lib/krb5/krb/get_in_tkt.c
+++ b/src/lib/krb5/krb/get_in_tkt.c
@@ -361,21 +361,21 @@ make_preauth_list(context, ptypes, ret_list)
 
 #define MAX_IN_TKT_LOOPS 16
 
-krb5_error_code
+KRB5_DLLIMP krb5_error_code KRB5_CALLCONV
 krb5_get_in_tkt(context, options, addrs, ktypes, ptypes, key_proc, keyseed,
 		decrypt_proc, decryptarg, creds, ccache, ret_as_reply)
     krb5_context context;
     const krb5_flags options;
-    krb5_address * const * addrs;
-    krb5_enctype * ktypes;
-    krb5_preauthtype * ptypes;
+    krb5_address FAR * const FAR * addrs;
+    krb5_enctype FAR * ktypes;
+    krb5_preauthtype FAR * ptypes;
     git_key_proc key_proc;
     krb5_const_pointer keyseed;
     git_decrypt_proc decrypt_proc;
     krb5_const_pointer decryptarg;
-    krb5_creds * creds;
+    krb5_creds FAR * creds;
     krb5_ccache ccache;
-    krb5_kdc_rep ** ret_as_reply;
+    krb5_kdc_rep FAR * FAR * ret_as_reply;
 {
     krb5_error_code	retval;
     krb5_timestamp	time_now;
diff --git a/src/lib/krb5/krb/in_tkt_ktb.c b/src/lib/krb5/krb/in_tkt_ktb.c
index 257ecce0f2..0c901c1b9f 100644
--- a/src/lib/krb5/krb/in_tkt_ktb.c
+++ b/src/lib/krb5/krb/in_tkt_ktb.c
@@ -105,18 +105,18 @@ cleanup:
  returns system errors, encryption errors
 
  */
-krb5_error_code
+KRB5_DLLIMP krb5_error_code KRB5_CALLCONV
 krb5_get_in_tkt_with_keytab(context, options, addrs, ktypes, pre_auth_types, 
 			    keytab, ccache, creds, ret_as_reply)
     krb5_context context;
     const krb5_flags options;
-    krb5_address * const * addrs;
-    krb5_enctype * ktypes;
-    krb5_preauthtype * pre_auth_types;
+    krb5_address FAR * const FAR * addrs;
+    krb5_enctype FAR * ktypes;
+    krb5_preauthtype FAR * pre_auth_types;
     const krb5_keytab keytab;
     krb5_ccache ccache;
-    krb5_creds * creds;
-    krb5_kdc_rep ** ret_as_reply;
+    krb5_creds FAR * creds;
+    krb5_kdc_rep FAR *FAR * ret_as_reply;
 {
     struct keytab_keyproc_arg arg;
 
diff --git a/src/lib/krb5/krb/in_tkt_pwd.c b/src/lib/krb5/krb/in_tkt_pwd.c
index 52ef240b92..7373f62f19 100644
--- a/src/lib/krb5/krb/in_tkt_pwd.c
+++ b/src/lib/krb5/krb/in_tkt_pwd.c
@@ -97,18 +97,18 @@ pwd_keyproc(context, type, salt, keyseed, key)
 
  returns system errors, encryption errors
  */
-krb5_error_code INTERFACE
+KRB5_DLLIMP krb5_error_code KRB5_CALLCONV
 krb5_get_in_tkt_with_password(context, options, addrs, ktypes, pre_auth_types, 
 			      password, ccache, creds, ret_as_reply)
     krb5_context context;
     const krb5_flags options;
-    krb5_address * const * addrs;
-    krb5_enctype * ktypes;
-    krb5_preauthtype * pre_auth_types;
-    const char * password;
+    krb5_address FAR * const FAR * addrs;
+    krb5_enctype FAR * ktypes;
+    krb5_preauthtype FAR * pre_auth_types;
+    const char FAR * password;
     krb5_ccache ccache;
-    krb5_creds * creds;
-    krb5_kdc_rep ** ret_as_reply;
+    krb5_creds FAR * creds;
+    krb5_kdc_rep FAR * FAR * ret_as_reply;
 {
     krb5_error_code retval;
     krb5_data data;
diff --git a/src/lib/krb5/krb/in_tkt_sky.c b/src/lib/krb5/krb/in_tkt_sky.c
index 9e4bea0dc8..3c7a0cd320 100644
--- a/src/lib/krb5/krb/in_tkt_sky.c
+++ b/src/lib/krb5/krb/in_tkt_sky.c
@@ -94,18 +94,18 @@ skey_keyproc(context, type, salt, keyseed, key)
  returns system errors, encryption errors
 
  */
-krb5_error_code
+KRB5_DLLIMP krb5_error_code KRB5_CALLCONV
 krb5_get_in_tkt_with_skey(context, options, addrs, ktypes, pre_auth_types, 
 			  key, ccache, creds, ret_as_reply)
     krb5_context context;
     const krb5_flags options;
-    krb5_address * const * addrs;
-    krb5_enctype * ktypes;
-    krb5_preauthtype * pre_auth_types;
-    const krb5_keyblock * key;
+    krb5_address FAR * const FAR * addrs;
+    krb5_enctype FAR * ktypes;
+    krb5_preauthtype FAR * pre_auth_types;
+    const krb5_keyblock FAR * key;
     krb5_ccache ccache;
-    krb5_creds * creds;
-    krb5_kdc_rep ** ret_as_reply;
+    krb5_creds FAR * creds;
+    krb5_kdc_rep FAR * FAR * ret_as_reply;
 
 {
     if (key) 
diff --git a/src/lib/krb5/krb/init_ctx.c b/src/lib/krb5/krb/init_ctx.c
index 9daa7f8d1e..fe725af54c 100644
--- a/src/lib/krb5/krb/init_ctx.c
+++ b/src/lib/krb5/krb/init_ctx.c
@@ -31,7 +31,7 @@
 extern krb5_error_code krb5_vercheck();
 #endif
 
-krb5_error_code INTERFACE
+KRB5_DLLIMP krb5_error_code KRB5_CALLCONV
 krb5_init_context(context)
 	krb5_context *context;
 {
@@ -139,7 +139,7 @@ cleanup:
 	return retval;
 }
 
-void
+KRB5_DLLIMP void KRB5_CALLCONV
 krb5_free_context(ctx)
 	krb5_context	ctx;
 {
diff --git a/src/lib/krb5/krb/mk_cred.c b/src/lib/krb5/krb/mk_cred.c
index 11c6a1d3e9..7640e7a282 100644
--- a/src/lib/krb5/krb/mk_cred.c
+++ b/src/lib/krb5/krb/mk_cred.c
@@ -198,14 +198,14 @@ cleanup:
  * This functions takes as input an array of krb5_credentials, and
  * outputs an encoded KRB_CRED message suitable for krb5_rd_cred
  */
-krb5_error_code INTERFACE
+KRB5_DLLIMP krb5_error_code KRB5_CALLCONV
 krb5_mk_ncred(context, auth_context, ppcreds, ppdata, outdata)
 
     krb5_context 	  context;
     krb5_auth_context	  auth_context;
-    krb5_creds 	       ** ppcreds;
-    krb5_data 	       ** ppdata;
-    krb5_replay_data  	* outdata;
+    krb5_creds 	       FAR * FAR * ppcreds;
+    krb5_data 	       FAR * FAR * ppdata;
+    krb5_replay_data  	FAR * outdata;
 {
     krb5_address * premote_fulladdr = NULL;
     krb5_address * plocal_fulladdr = NULL;
@@ -346,13 +346,13 @@ error:
 /*
  * A convenience function that calls krb5_mk_ncred.
  */
-krb5_error_code INTERFACE
+KRB5_DLLIMP krb5_error_code KRB5_CALLCONV
 krb5_mk_1cred(context, auth_context, pcreds, ppdata, outdata)
     krb5_context 	  context;
     krb5_auth_context	  auth_context;
-    krb5_creds 		* pcreds;
-    krb5_data 	       ** ppdata;
-    krb5_replay_data  	* outdata;
+    krb5_creds 		FAR * pcreds;
+    krb5_data 	       FAR * FAR * ppdata;
+    krb5_replay_data  	FAR * outdata;
 {
     krb5_error_code retval;
     krb5_creds **ppcreds;
diff --git a/src/lib/krb5/krb/mk_error.c b/src/lib/krb5/krb/mk_error.c
index 292ffeaebd..77e502fdea 100644
--- a/src/lib/krb5/krb/mk_error.c
+++ b/src/lib/krb5/krb/mk_error.c
@@ -34,11 +34,11 @@
 
  returns system errors
  */
-krb5_error_code
+KRB5_DLLIMP krb5_error_code KRB5_CALLCONV
 krb5_mk_error(context, dec_err, enc_err)
     krb5_context context;
-    const krb5_error *dec_err;
-    krb5_data *enc_err;
+    const krb5_error FAR *dec_err;
+    krb5_data FAR *enc_err;
 {
     krb5_error_code retval;
     krb5_data *new_enc_err;
diff --git a/src/lib/krb5/krb/mk_priv.c b/src/lib/krb5/krb/mk_priv.c
index dabfd8dc90..7986e18562 100644
--- a/src/lib/krb5/krb/mk_priv.c
+++ b/src/lib/krb5/krb/mk_priv.c
@@ -133,13 +133,13 @@ clean_scratch:
 }
 
 
-krb5_error_code
+KRB5_DLLIMP krb5_error_code KRB5_CALLCONV
 krb5_mk_priv(context, auth_context, userdata, outbuf, outdata)
     krb5_context 	  context;
     krb5_auth_context 	  auth_context;
-    const krb5_data   	* userdata;
-    krb5_data         	* outbuf;
-    krb5_replay_data  	* outdata;
+    const krb5_data   	FAR * userdata;
+    krb5_data         	FAR * outbuf;
+    krb5_replay_data  	FAR * outdata;
 {
     krb5_error_code 	  retval;
     krb5_keyblock       * keyblock;
diff --git a/src/lib/krb5/krb/mk_rep.c b/src/lib/krb5/krb/mk_rep.c
index b1c17b6b91..45784284c3 100644
--- a/src/lib/krb5/krb/mk_rep.c
+++ b/src/lib/krb5/krb/mk_rep.c
@@ -36,11 +36,11 @@
  returns system errors
 */
 
-krb5_error_code
+KRB5_DLLIMP krb5_error_code KRB5_CALLCONV
 krb5_mk_rep(context, auth_context, outbuf)
     krb5_context 	  context;
     krb5_auth_context	  auth_context;
-    krb5_data 		* outbuf;
+    krb5_data 		FAR * outbuf;
 {
     krb5_error_code 	  retval;
     krb5_enctype 	  enctype;
diff --git a/src/lib/krb5/krb/mk_req.c b/src/lib/krb5/krb/mk_req.c
index e793b95923..a454a5759e 100644
--- a/src/lib/krb5/krb/mk_req.c
+++ b/src/lib/krb5/krb/mk_req.c
@@ -46,17 +46,17 @@
  returns system errors
 */
 
-krb5_error_code
+KRB5_DLLIMP krb5_error_code KRB5_CALLCONV
 krb5_mk_req(context, auth_context, ap_req_options, service, hostname, in_data,
 	      ccache, outbuf)
     krb5_context          context;
-    krb5_auth_context   * auth_context;
+    krb5_auth_context   FAR * auth_context;
     const krb5_flags      ap_req_options;
-    char		* service;
-    char		* hostname;
-    krb5_data           * in_data;
+    char		FAR * service;
+    char		FAR * hostname;
+    krb5_data           FAR * in_data;
     krb5_ccache 	  ccache;
-    krb5_data 		* outbuf;
+    krb5_data 		FAR * outbuf;
 {
     krb5_error_code 	  retval;
     krb5_principal	  server;
diff --git a/src/lib/krb5/krb/mk_req_ext.c b/src/lib/krb5/krb/mk_req_ext.c
index 733dd319cc..3bec52e51e 100644
--- a/src/lib/krb5/krb/mk_req_ext.c
+++ b/src/lib/krb5/krb/mk_req_ext.c
@@ -67,15 +67,15 @@ krb5_generate_authenticator PROTOTYPE((krb5_context,
 				       const krb5_checksum *, krb5_keyblock *,
 				       krb5_int32, krb5_authdata ** ));
 
-krb5_error_code INTERFACE
+KRB5_DLLIMP krb5_error_code KRB5_CALLCONV
 krb5_mk_req_extended(context, auth_context, ap_req_options, in_data, in_creds,
 		     outbuf)
     krb5_context 	  context;
-    krb5_auth_context	* auth_context;
+    krb5_auth_context	FAR * auth_context;
     const krb5_flags 	  ap_req_options;
-    krb5_data		* in_data;
-    krb5_creds 		* in_creds;
-    krb5_data 		* outbuf;
+    krb5_data		FAR * in_data;
+    krb5_creds 		FAR * in_creds;
+    krb5_data 		FAR * outbuf;
 {
     krb5_error_code 	  retval;
     krb5_checksum	  checksum;
diff --git a/src/lib/krb5/krb/mk_safe.c b/src/lib/krb5/krb/mk_safe.c
index dfa253a4ed..1a44a75e59 100644
--- a/src/lib/krb5/krb/mk_safe.c
+++ b/src/lib/krb5/krb/mk_safe.c
@@ -119,13 +119,13 @@ cleanup_scratch:
     return retval;
 }
 
-krb5_error_code
+KRB5_DLLIMP krb5_error_code KRB5_CALLCONV
 krb5_mk_safe(context, auth_context, userdata, outbuf, outdata)
     krb5_context 	  context;
     krb5_auth_context 	  auth_context;
-    const krb5_data   	* userdata;
-    krb5_data         	* outbuf;
-    krb5_replay_data  	* outdata;
+    const krb5_data   	FAR * userdata;
+    krb5_data         	FAR * outbuf;
+    krb5_replay_data  	FAR * outdata;
 {
     krb5_error_code 	  retval;
     krb5_keyblock       * keyblock;
diff --git a/src/lib/krb5/krb/parse.c b/src/lib/krb5/krb/parse.c
index 0b41a201a2..3b2305f19a 100644
--- a/src/lib/krb5/krb/parse.c
+++ b/src/lib/krb5/krb/parse.c
@@ -60,11 +60,11 @@
  * May the fleas of a thousand camels infest the ISO, they who think
  * that arbitrarily large multi-component names are a Good Thing.....
  */
-krb5_error_code INTERFACE
+KRB5_DLLIMP krb5_error_code KRB5_CALLCONV
 krb5_parse_name(context, name, nprincipal)
     	krb5_context context;
-	const char	*name;
-	krb5_principal	*nprincipal;
+	const char	FAR *name;
+	krb5_principal	FAR *nprincipal;
 {
 	register const char	*cp;
 	register char	*q;
diff --git a/src/lib/krb5/krb/princ_comp.c b/src/lib/krb5/krb/princ_comp.c
index 35c5847c6a..635d22cc39 100644
--- a/src/lib/krb5/krb/princ_comp.c
+++ b/src/lib/krb5/krb/princ_comp.c
@@ -43,7 +43,7 @@ krb5_realm_compare(context, princ1, princ2)
     return TRUE;
 }
 
-krb5_boolean
+KRB5_DLLIMP krb5_boolean KRB5_CALLCONV
 krb5_principal_compare(context, princ1, princ2)
     krb5_context context;
     krb5_const_principal princ1;
diff --git a/src/lib/krb5/krb/rd_cred.c b/src/lib/krb5/krb/rd_cred.c
index 874960bf51..05eb7d7461 100644
--- a/src/lib/krb5/krb/rd_cred.c
+++ b/src/lib/krb5/krb/rd_cred.c
@@ -225,13 +225,13 @@ cleanup_cred:
  * This functions takes as input an KRB_CRED message, validates it, and
  * outputs the nonce and an array of the forwarded credentials.
  */
-krb5_error_code
+KRB5_DLLIMP krb5_error_code KRB5_CALLCONV
 krb5_rd_cred(context, auth_context, pcreddata, pppcreds, outdata)
     krb5_context          context;
     krb5_auth_context     auth_context;
-    krb5_data 		* pcreddata;       
-    krb5_creds        *** pppcreds;
-    krb5_replay_data  	* outdata;
+    krb5_data 		FAR * pcreddata;       
+    krb5_creds        FAR * FAR * FAR * pppcreds;
+    krb5_replay_data  	FAR * outdata;
 {
     krb5_error_code       retval;
     krb5_keyblock       * keyblock;
diff --git a/src/lib/krb5/krb/rd_error.c b/src/lib/krb5/krb/rd_error.c
index bf07539276..7f8e4226ea 100644
--- a/src/lib/krb5/krb/rd_error.c
+++ b/src/lib/krb5/krb/rd_error.c
@@ -36,11 +36,11 @@
  *  returns system errors
  */
 
-krb5_error_code
+KRB5_DLLIMP krb5_error_code KRB5_CALLCONV
 krb5_rd_error(context,  enc_errbuf, dec_error)
     krb5_context context;
-    const krb5_data *enc_errbuf;
-    krb5_error **dec_error;
+    const krb5_data FAR *enc_errbuf;
+    krb5_error FAR * FAR *dec_error;
 {
     if (!krb5_is_krb_error(enc_errbuf))
 	return KRB5KRB_AP_ERR_MSG_TYPE;
diff --git a/src/lib/krb5/krb/rd_priv.c b/src/lib/krb5/krb/rd_priv.c
index 7acb6f3f8c..e6c0fe3612 100644
--- a/src/lib/krb5/krb/rd_priv.c
+++ b/src/lib/krb5/krb/rd_priv.c
@@ -170,13 +170,13 @@ cleanup_privmsg:;
     return retval;
 }
 
-krb5_error_code
+KRB5_DLLIMP krb5_error_code KRB5_CALLCONV
 krb5_rd_priv(context, auth_context, inbuf, outbuf, outdata)
     krb5_context 	  context;
     krb5_auth_context 	  auth_context;
-    const krb5_data   	* inbuf;
-    krb5_data 	      	* outbuf;
-    krb5_replay_data  	* outdata;
+    const krb5_data   	FAR * inbuf;
+    krb5_data 	      	FAR * outbuf;
+    krb5_replay_data  	FAR * outdata;
 {
     krb5_error_code 	  retval;
     krb5_keyblock       * keyblock;
diff --git a/src/lib/krb5/krb/rd_rep.c b/src/lib/krb5/krb/rd_rep.c
index 13e8363eeb..d4d559d14a 100644
--- a/src/lib/krb5/krb/rd_rep.c
+++ b/src/lib/krb5/krb/rd_rep.c
@@ -38,12 +38,12 @@
  *  returns system errors, encryption errors, replay errors
  */
 
-krb5_error_code INTERFACE
+KRB5_DLLIMP krb5_error_code KRB5_CALLCONV
 krb5_rd_rep(context, auth_context, inbuf, repl)
     krb5_context 	  context;
     krb5_auth_context	  auth_context;
-    const krb5_data 	* inbuf;
-    krb5_ap_rep_enc_part **repl;
+    const krb5_data 	FAR * inbuf;
+    krb5_ap_rep_enc_part FAR * FAR *repl;
 {
     krb5_error_code 	  retval;
     krb5_ap_rep 	* reply;
diff --git a/src/lib/krb5/krb/rd_req.c b/src/lib/krb5/krb/rd_req.c
index e46b3bd913..7fbe1727cf 100644
--- a/src/lib/krb5/krb/rd_req.c
+++ b/src/lib/krb5/krb/rd_req.c
@@ -42,16 +42,16 @@
  *  returns system errors, encryption errors, replay errors
  */
 
-krb5_error_code
+KRB5_DLLIMP krb5_error_code KRB5_CALLCONV
 krb5_rd_req(context, auth_context, inbuf, server, keytab, 
 	    ap_req_options, ticket)
     krb5_context 	  context;
-    krb5_auth_context   * auth_context;
-    const krb5_data 	* inbuf;
+    krb5_auth_context   FAR * auth_context;
+    const krb5_data 	FAR * inbuf;
     krb5_const_principal  server;	/* XXX do we really need this */
     krb5_keytab		  keytab;
-    krb5_flags		* ap_req_options;
-    krb5_ticket	       ** ticket;
+    krb5_flags		FAR * ap_req_options;
+    krb5_ticket	       FAR *FAR * ticket;
 {
     krb5_error_code 	  retval;
     krb5_ap_req 	* request;
diff --git a/src/lib/krb5/krb/rd_safe.c b/src/lib/krb5/krb/rd_safe.c
index 7298605c05..9f23ff383c 100644
--- a/src/lib/krb5/krb/rd_safe.c
+++ b/src/lib/krb5/krb/rd_safe.c
@@ -147,13 +147,13 @@ cleanup:
     return retval;
 }
 
-krb5_error_code
+KRB5_DLLIMP krb5_error_code KRB5_CALLCONV
 krb5_rd_safe(context, auth_context, inbuf, outbuf, outdata)
     krb5_context 	  context;
     krb5_auth_context 	  auth_context;
-    const krb5_data   	* inbuf;
-    krb5_data 	      	* outbuf;
-    krb5_replay_data  	* outdata;
+    const krb5_data   	FAR * inbuf;
+    krb5_data 	      	FAR * outbuf;
+    krb5_replay_data  	FAR * outdata;
 {
     krb5_error_code 	  retval;
     krb5_keyblock	* keyblock;
diff --git a/src/lib/krb5/krb/recvauth.c b/src/lib/krb5/krb/recvauth.c
index d5e7b5fc53..5bde73aa40 100644
--- a/src/lib/krb5/krb/recvauth.c
+++ b/src/lib/krb5/krb/recvauth.c
@@ -34,20 +34,20 @@
 
 static char *sendauth_version = "KRB5_SENDAUTH_V1.0";
 
-krb5_error_code
+KRB5_DLLIMP krb5_error_code KRB5_CALLCONV
 krb5_recvauth(context, auth_context,
 	      /* IN */
 	      fd, appl_version, server, flags, keytab,
 	      /* OUT */
 	      ticket)
     krb5_context 	  context;
-    krb5_auth_context   * auth_context;
+    krb5_auth_context   FAR * auth_context;
     krb5_pointer	  fd;
-    char		* appl_version;
+    char		FAR * appl_version;
     krb5_principal	  server;
     krb5_int32		  flags;
     krb5_keytab		  keytab;
-    krb5_ticket	       ** ticket;
+    krb5_ticket	       FAR * FAR * ticket;
 {
     krb5_auth_context	  new_auth_context;
     krb5_flags		  ap_option;
diff --git a/src/lib/krb5/krb/sendauth.c b/src/lib/krb5/krb/sendauth.c
index d77afdc9b6..54a9ac0008 100644
--- a/src/lib/krb5/krb/sendauth.c
+++ b/src/lib/krb5/krb/sendauth.c
@@ -35,7 +35,7 @@
 
 static char *sendauth_version = "KRB5_SENDAUTH_V1.0";
 
-krb5_error_code
+KRB5_DLLIMP krb5_error_code KRB5_CALLCONV
 krb5_sendauth(context, auth_context,
 	      /* IN */
 	      fd, appl_version, client, server, ap_req_options, in_data,
@@ -45,18 +45,18 @@ krb5_sendauth(context, auth_context,
 	      /* OUT */
 	      error, rep_result, out_creds)
     	krb5_context 		  context;
-    	krb5_auth_context       * auth_context;
+    	krb5_auth_context       FAR * auth_context;
 	krb5_pointer		  fd;
-	char			* appl_version;
+	char			FAR * appl_version;
 	krb5_principal		  client;
 	krb5_principal		  server;
 	krb5_flags		  ap_req_options;
-	krb5_data		* in_data;
-	krb5_creds		* in_creds;
+	krb5_data		FAR * in_data;
+	krb5_creds		FAR * in_creds;
 	krb5_ccache	  	  ccache;
-	krb5_error             ** error;
-	krb5_ap_rep_enc_part   ** rep_result;
-	krb5_creds	       ** out_creds;
+	krb5_error             FAR * FAR * error;
+	krb5_ap_rep_enc_part   FAR * FAR * rep_result;
+	krb5_creds	       FAR * FAR * out_creds;
 {
 	krb5_octet		result;
 	krb5_creds 		creds;
diff --git a/src/lib/krb5/krb/ser_actx.c b/src/lib/krb5/krb/ser_actx.c
index 8be618a89b..5705b711fc 100644
--- a/src/lib/krb5/krb/ser_actx.c
+++ b/src/lib/krb5/krb/ser_actx.c
@@ -541,7 +541,7 @@ krb5_auth_context_internalize(kcontext, argp, buffer, lenremain)
 /*
  * Register the auth_context serializer.
  */
-krb5_error_code
+KRB5_DLLIMP krb5_error_code KRB5_CALLCONV
 krb5_ser_auth_context_init(kcontext)
     krb5_context	kcontext;
 {
diff --git a/src/lib/krb5/krb/ser_ctx.c b/src/lib/krb5/krb/ser_ctx.c
index 2bdb1ad711..13392a7388 100644
--- a/src/lib/krb5/krb/ser_ctx.c
+++ b/src/lib/krb5/krb/ser_ctx.c
@@ -633,7 +633,7 @@ krb5_oscontext_internalize(kcontext, argp, buffer, lenremain)
 /*
  * Register the context serializers.
  */
-krb5_error_code
+KRB5_DLLIMP krb5_error_code KRB5_CALLCONV
 krb5_ser_context_init(kcontext)
     krb5_context	kcontext;
 {
diff --git a/src/lib/krb5/krb/serialize.c b/src/lib/krb5/krb/serialize.c
index 392caf4da0..084ecb677c 100644
--- a/src/lib/krb5/krb/serialize.c
+++ b/src/lib/krb5/krb/serialize.c
@@ -91,7 +91,7 @@ krb5_register_serializer(kcontext, entry)
  * krb5_size_opaque()	- Determine the size necessary to serialize a given
  *			  piece of opaque data.
  */
-krb5_error_code
+KRB5_DLLIMP krb5_error_code KRB5_CALLCONV
 krb5_size_opaque(kcontext, odtype, arg, sizep)
     krb5_context	kcontext;
     krb5_magic		odtype;
@@ -111,13 +111,13 @@ krb5_size_opaque(kcontext, odtype, arg, sizep)
 /*
  * krb5_externalize_opaque()	- Externalize a piece of opaque data.
  */
-krb5_error_code
+KRB5_DLLIMP krb5_error_code KRB5_CALLCONV
 krb5_externalize_opaque(kcontext, odtype, arg, bufpp, sizep)
     krb5_context	kcontext;
     krb5_magic		odtype;
     krb5_pointer	arg;
-    krb5_octet		**bufpp;
-    size_t		*sizep;
+    krb5_octet		FAR * FAR *bufpp;
+    size_t		FAR *sizep;
 {
     krb5_error_code	kret;
     krb5_ser_handle	shandle;
@@ -172,13 +172,13 @@ krb5_externalize_data(kcontext, arg, bufpp, sizep)
  * krb5_internalize_opaque()	- Convert external representation into a data
  *				  structure.
  */
-krb5_error_code
+KRB5_DLLIMP krb5_error_code KRB5_CALLCONV
 krb5_internalize_opaque(kcontext, odtype, argp, bufpp, sizep)
     krb5_context	kcontext;
     krb5_magic		odtype;
-    krb5_pointer	*argp;
-    krb5_octet		**bufpp;
-    size_t		*sizep;
+    krb5_pointer	FAR *argp;
+    krb5_octet		FAR * FAR *bufpp;
+    size_t		FAR *sizep;
 {
     krb5_error_code	kret;
     krb5_ser_handle	shandle;
@@ -195,11 +195,11 @@ krb5_internalize_opaque(kcontext, odtype, argp, bufpp, sizep)
  * krb5_ser_pack_int32()	- Pack a 4-byte integer if space is availble.
  *				  Update buffer pointer and remaining space.
  */
-krb5_error_code
+KRB5_DLLIMP krb5_error_code KRB5_CALLCONV
 krb5_ser_pack_int32(iarg, bufp, remainp)
     krb5_int32		iarg;
-    krb5_octet		**bufp;
-    size_t		*remainp;
+    krb5_octet		FAR * FAR *bufp;
+    size_t		FAR *remainp;
 {
     if (*remainp >= sizeof(krb5_int32)) {
 	(*bufp)[0] = (krb5_octet) ((iarg >> 24) & 0xff);
@@ -217,12 +217,12 @@ krb5_ser_pack_int32(iarg, bufp, remainp)
 /*
  * krb5_ser_pack_bytes()	- Pack a string of bytes.
  */
-krb5_error_code
+KRB5_DLLIMP krb5_error_code KRB5_CALLCONV
 krb5_ser_pack_bytes(ostring, osize, bufp, remainp)
-    krb5_octet	*ostring;
+    krb5_octet	FAR *ostring;
     size_t	osize;
-    krb5_octet	**bufp;
-    size_t	*remainp;
+    krb5_octet	FAR * FAR *bufp;
+    size_t	FAR *remainp;
 {
     if (*remainp >= osize) {
 	memcpy(*bufp, ostring, osize);
@@ -237,11 +237,11 @@ krb5_ser_pack_bytes(ostring, osize, bufp, remainp)
 /*
  * krb5_ser_unpack_int32()	- Unpack a 4-byte integer if it's there.
  */
-krb5_error_code
+KRB5_DLLIMP krb5_error_code KRB5_CALLCONV
 krb5_ser_unpack_int32(intp, bufp, remainp)
-    krb5_int32	*intp;
-    krb5_octet	**bufp;
-    size_t	*remainp;
+    krb5_int32	FAR *intp;
+    krb5_octet	FAR * FAR *bufp;
+    size_t	FAR *remainp;
 {
     if (*remainp >= sizeof(krb5_int32)) {
 	*intp = (((krb5_int32) ((unsigned char) (*bufp)[0]) << 24) |
@@ -259,12 +259,12 @@ krb5_ser_unpack_int32(intp, bufp, remainp)
 /*
  * krb5_ser_unpack_bytes()	- Unpack a byte string if it's there.
  */
-krb5_error_code
+KRB5_DLLIMP krb5_error_code KRB5_CALLCONV
 krb5_ser_unpack_bytes(istring, isize, bufp, remainp)
-    krb5_octet	*istring;
+    krb5_octet	FAR *istring;
     size_t	isize;
-    krb5_octet	**bufp;
-    size_t	*remainp;
+    krb5_octet	FAR * FAR *bufp;
+    size_t	FAR *remainp;
 {
     if (*remainp >= isize) {
 	memcpy(istring, *bufp, isize);
diff --git a/src/lib/krb5/krb/str_conv.c b/src/lib/krb5/krb/str_conv.c
index 76a79a86b2..d8b2e6d94d 100644
--- a/src/lib/krb5/krb/str_conv.c
+++ b/src/lib/krb5/krb/str_conv.c
@@ -367,10 +367,10 @@ strptime(buf, format, tm)
  *
  * These routines return 0 for success, EINVAL for invalid entry.
  */
-krb5_error_code
+KRB5_DLLIMP krb5_error_code KRB5_CALLCONV
 krb5_string_to_enctype(string, enctypep)
-    char		* string;
-    krb5_enctype	* enctypep;
+    char		FAR * string;
+    krb5_enctype	FAR * enctypep;
 {
     int i;
     int found;
@@ -386,10 +386,10 @@ krb5_string_to_enctype(string, enctypep)
     return((found) ? 0 : EINVAL);
 }
 
-krb5_error_code
+KRB5_DLLIMP krb5_error_code KRB5_CALLCONV
 krb5_string_to_salttype(string, salttypep)
-    char	* string;
-    krb5_int32	* salttypep;
+    char	FAR * string;
+    krb5_int32	FAR * salttypep;
 {
     int i;
     int found;
@@ -405,10 +405,10 @@ krb5_string_to_salttype(string, salttypep)
     return((found) ? 0 : EINVAL);
 }
 
-krb5_error_code
+KRB5_DLLIMP krb5_error_code KRB5_CALLCONV
 krb5_string_to_cksumtype(string, cksumtypep)
-    char		* string;
-    krb5_cksumtype	* cksumtypep;
+    char		FAR * string;
+    krb5_cksumtype	FAR * cksumtypep;
 {
     int i;
     int found;
@@ -424,10 +424,10 @@ krb5_string_to_cksumtype(string, cksumtypep)
     return((found) ? 0 : EINVAL);
 }
 
-krb5_error_code
+KRB5_DLLIMP krb5_error_code KRB5_CALLCONV
 krb5_string_to_timestamp(string, timestampp)
-    char		* string;
-    krb5_timestamp	* timestampp;
+    char		FAR * string;
+    krb5_timestamp	FAR * timestampp;
 {
     int i;
     int found;
@@ -454,10 +454,10 @@ krb5_string_to_timestamp(string, timestampp)
     return((found) ? 0 : EINVAL);
 }
 
-krb5_error_code
+KRB5_DLLIMP krb5_error_code KRB5_CALLCONV
 krb5_string_to_deltat(string, deltatp)
-    char	* string;
-    krb5_deltat	* deltatp;
+    char	FAR * string;
+    krb5_deltat	FAR * deltatp;
 {
     int i;
     int found;
@@ -502,10 +502,10 @@ krb5_string_to_deltat(string, deltatp)
  * These routines return 0 for success, EINVAL for invalid parameter, ENOMEM
  * if the supplied buffer/length will not contain the output.
  */
-krb5_error_code
+KRB5_DLLIMP krb5_error_code KRB5_CALLCONV
 krb5_enctype_to_string(enctype, buffer, buflen)
     krb5_enctype	enctype;
-    char		* buffer;
+    char		FAR * buffer;
     size_t		buflen;
 {
     int i;
@@ -529,10 +529,10 @@ krb5_enctype_to_string(enctype, buffer, buflen)
 	return(EINVAL);
 }
 
-krb5_error_code
+KRB5_DLLIMP krb5_error_code KRB5_CALLCONV
 krb5_salttype_to_string(salttype, buffer, buflen)
     krb5_int32	salttype;
-    char	* buffer;
+    char	FAR * buffer;
     size_t	buflen;
 {
     int i;
@@ -556,10 +556,10 @@ krb5_salttype_to_string(salttype, buffer, buflen)
 	return(EINVAL);
 }
 
-krb5_error_code
+KRB5_DLLIMP krb5_error_code KRB5_CALLCONV
 krb5_cksumtype_to_string(cksumtype, buffer, buflen)
     krb5_cksumtype	cksumtype;
-    char		* buffer;
+    char		FAR * buffer;
     size_t		buflen;
 {
     int i;
@@ -583,10 +583,10 @@ krb5_cksumtype_to_string(cksumtype, buffer, buflen)
 	return(EINVAL);
 }
 
-krb5_error_code
+KRB5_DLLIMP krb5_error_code KRB5_CALLCONV
 krb5_timestamp_to_string(timestamp, buffer, buflen)
     krb5_timestamp	timestamp;
-    char		* buffer;
+    char		FAR * buffer;
     size_t		buflen;
 {
 #if	HAVE_STRFTIME
@@ -605,12 +605,12 @@ krb5_timestamp_to_string(timestamp, buffer, buflen)
 #endif	/* HAVE_STRFTIME */
 }
 
-krb5_error_code
+KRB5_DLLIMP krb5_error_code KRB5_CALLCONV
 krb5_timestamp_to_sfstring(timestamp, buffer, buflen, pad)
     krb5_timestamp	timestamp;
-    char		* buffer;
+    char		FAR * buffer;
     size_t		buflen;
-    char		* pad;
+    char		FAR * pad;
 {
     struct tm	*tmp;
     size_t i;
@@ -640,10 +640,10 @@ krb5_timestamp_to_sfstring(timestamp, buffer, buflen, pad)
     return((ndone) ? 0 : ENOMEM);
 }
 
-krb5_error_code
+KRB5_DLLIMP krb5_error_code KRB5_CALLCONV
 krb5_deltat_to_string(deltat, buffer, buflen)
     krb5_deltat	deltat;
-    char	* buffer;
+    char	FAR * buffer;
     size_t	buflen;
 {
     int			days, hours, minutes, seconds;
diff --git a/src/lib/krb5/krb/unparse.c b/src/lib/krb5/krb/unparse.c
index 7247d9a44a..1f0c79110f 100644
--- a/src/lib/krb5/krb/unparse.c
+++ b/src/lib/krb5/krb/unparse.c
@@ -54,12 +54,12 @@
 #define REALM_SEP	'@'
 #define	COMPONENT_SEP	'/'
 
-krb5_error_code
+KRB5_DLLIMP krb5_error_code KRB5_CALLCONV
 krb5_unparse_name_ext(context, principal, name, size)
     krb5_context context;
     krb5_const_principal principal;
-    register char **name;
-    int	*size;
+    register char FAR * FAR *name;
+    int	FAR *size;
 {
 	register char *cp, *q;
 	register int i,j;
@@ -185,7 +185,7 @@ krb5_unparse_name_ext(context, principal, name, size)
     return 0;
 }
 
-krb5_error_code INTERFACE
+KRB5_DLLIMP krb5_error_code KRB5_CALLCONV
 krb5_unparse_name(context, principal, name)
     krb5_context context;
     krb5_const_principal principal;
diff --git a/src/lib/krb5/krb/valid_times.c b/src/lib/krb5/krb/valid_times.c
index b1e26ced73..ed377d16be 100644
--- a/src/lib/krb5/krb/valid_times.c
+++ b/src/lib/krb5/krb/valid_times.c
@@ -33,7 +33,8 @@
  * field in a krb5_ticket.
  */
 
-krb5_error_code krb5_validate_times(context, times)
+krb5_error_code
+krb5_validate_times(context, times)
 	krb5_context		context;
 	krb5_ticket_times *	times;
 {
diff --git a/src/lib/krb5/os/ChangeLog b/src/lib/krb5/os/ChangeLog
index a1d63cf2d4..bd9bb29cbc 100644
--- a/src/lib/krb5/os/ChangeLog
+++ b/src/lib/krb5/os/ChangeLog
@@ -1,3 +1,13 @@
+Thu Nov 21 11:55:16 EST 1996	Richard Basch	<basch@lehman.com>
+
+	* Makefile.in: win32 build
+
+	* ccdefname.c, def_realm.c, free_hstrl.c, genaddrs.c, hst_realm.c,
+	init_os_ctx.c, ktdefname.c, localaddr.c, sn2princ.c, timeofday.c,
+	ustime.c
+		DLL export several more common functions (see lib/krb5.def
+		for the full list of functions exported)
+
 Wed Nov 13 02:53:31 1996  Tom Yu  <tlyu@mit.edu>
 
 	* osconfig.c: Add warning re: global variables.
diff --git a/src/lib/krb5/os/Makefile.in b/src/lib/krb5/os/Makefile.in
index 72c7e04025..236ed80e83 100644
--- a/src/lib/krb5/os/Makefile.in
+++ b/src/lib/krb5/os/Makefile.in
@@ -2,8 +2,10 @@ CFLAGS = $(CCOPTS) $(DEFS)
 KRB5_RUN_ENV = @KRB5_RUN_ENV@
 
 ##DOSBUILDTOP = ..\..\..
-##DOSLIBNAME=..\krb5.lib
 ##DOSDBFLAGS=
+##DOSMYNAME=os
+##DOSOBJFILE=..\$(MYNAME).lst
+##WIN16##LIBNAME=..\krb5.lib
 
 .c.o:
 	$(CC) $(CFLAGS) -c $(srcdir)/$*.c
@@ -90,10 +92,13 @@ SRCS= \
 	$(srcdir)/write_msg.c
 
 all-unix:: shared $(OBJS)
-
 all-mac:: $(OBJS)
+all-windows:: $(OBJFILE)
 
-all-windows:: $(OBJS)
+##DOS$(OBJFILE): $(OBJS)
+##DOS	$(RM) $(OBJFILE)
+##WIN16##	$(CP) nul: $(OBJFILE)
+##WIN32##	$(LIBECHO) -p $(MYNAME)\ *.obj > $(OBJFILE)
 
 shared:
 	mkdir shared
@@ -155,4 +160,4 @@ clean-unix::
 	$(RM) shared/*
 clean-mac::
 clean-windows::
-
+	$(RM) $(OBJFILE)
diff --git a/src/lib/krb5/os/ccdefname.c b/src/lib/krb5/os/ccdefname.c
index 1db1706f2e..639fc666b6 100644
--- a/src/lib/krb5/os/ccdefname.c
+++ b/src/lib/krb5/os/ccdefname.c
@@ -83,7 +83,7 @@ OSErr		err;
 #endif
 
 
-char *
+KRB5_DLLIMP char FAR * KRB5_CALLCONV
 krb5_cc_default_name(context)
     krb5_context context;
 {
diff --git a/src/lib/krb5/os/def_realm.c b/src/lib/krb5/os/def_realm.c
index 053a604be5..3c2e4a9523 100644
--- a/src/lib/krb5/os/def_realm.c
+++ b/src/lib/krb5/os/def_realm.c
@@ -44,10 +44,10 @@
 extern char *krb5_config_file;		/* extern so can be set at
 					   load/runtime */
 
-krb5_error_code INTERFACE
+KRB5_DLLIMP krb5_error_code KRB5_CALLCONV
 krb5_get_default_realm(context, lrealm)
     krb5_context context;
-    char **lrealm;
+    char FAR * FAR *lrealm;
 {
     char *realm;
     char *cp;
@@ -79,7 +79,7 @@ krb5_get_default_realm(context, lrealm)
     return(0);
 }
 
-krb5_error_code INTERFACE
+KRB5_DLLIMP krb5_error_code KRB5_CALLCONV
 krb5_set_default_realm(context, lrealm)
     krb5_context context;
     const char *lrealm;
diff --git a/src/lib/krb5/os/free_hstrl.c b/src/lib/krb5/os/free_hstrl.c
index f112041e4e..63bd3b3389 100644
--- a/src/lib/krb5/os/free_hstrl.c
+++ b/src/lib/krb5/os/free_hstrl.c
@@ -31,10 +31,10 @@
  Frees the storage taken by a realm list returned by krb5_get_local_realm.
  */
 
-krb5_error_code
+KRB5_DLLIMP krb5_error_code KRB5_CALLCONV
 krb5_free_host_realm(context, realmlist)
     krb5_context context;
-    char * const *realmlist;
+    char FAR * const FAR *realmlist;
 {
     /* same format, so why duplicate code? */
     return krb5_free_krbhst(context, realmlist);
diff --git a/src/lib/krb5/os/genaddrs.c b/src/lib/krb5/os/genaddrs.c
index 3260662c5b..b8e677481d 100644
--- a/src/lib/krb5/os/genaddrs.c
+++ b/src/lib/krb5/os/genaddrs.c
@@ -32,12 +32,12 @@
 #include <netinet/in.h>
 #endif
 
-krb5_error_code INTERFACE
+KRB5_DLLIMP krb5_error_code KRB5_CALLCONV
 krb5_auth_con_genaddrs(context, auth_context, infd, flags)
-    krb5_context 	  context;
-    krb5_auth_context 	  auth_context;
-    int				  	infd;
-    int					flags;
+    krb5_context 	context;
+    krb5_auth_context 	auth_context;
+    int		  	infd;
+    int			flags;
 {
     krb5_error_code 	  retval;
     krb5_address	* laddr;
diff --git a/src/lib/krb5/os/hst_realm.c b/src/lib/krb5/os/hst_realm.c
index b93ed379e9..6ff814abf2 100644
--- a/src/lib/krb5/os/hst_realm.c
+++ b/src/lib/krb5/os/hst_realm.c
@@ -77,11 +77,11 @@
 #define MAXHOSTNAMELEN 64
 #endif
 
-krb5_error_code
+KRB5_DLLIMP krb5_error_code KRB5_CALLCONV
 krb5_get_host_realm(context, host, realmsp)
     krb5_context context;
-    const char *host;
-    char ***realmsp;
+    const char FAR *host;
+    char FAR * FAR * FAR *realmsp;
 {
     char **retrealms;
     char *default_realm, *realm, *cp;
diff --git a/src/lib/krb5/os/init_os_ctx.c b/src/lib/krb5/os/init_os_ctx.c
index 5f8d48f5f5..9b74a38f14 100644
--- a/src/lib/krb5/os/init_os_ctx.c
+++ b/src/lib/krb5/os/init_os_ctx.c
@@ -195,7 +195,7 @@ krb5_os_init_context(ctx)
 	return retval;
 }
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_set_config_files(ctx, filenames)
 	krb5_context ctx;
 	const char **filenames;
@@ -214,7 +214,7 @@ krb5_set_config_files(ctx, filenames)
 	return 0;
 }
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_secure_config_files(ctx)
 	krb5_context ctx;
 {
diff --git a/src/lib/krb5/os/ktdefname.c b/src/lib/krb5/os/ktdefname.c
index 29eb54fe2c..c645635ab0 100644
--- a/src/lib/krb5/os/ktdefname.c
+++ b/src/lib/krb5/os/ktdefname.c
@@ -30,10 +30,10 @@
 
 extern char *krb5_defkeyname;
 
-krb5_error_code
+KRB5_DLLIMP krb5_error_code KRB5_CALLCONV
 krb5_kt_default_name(context, name, namesize)
     krb5_context context;
-    char *name;
+    char FAR *name;
     int namesize;
 {
     char *cp = 0;
diff --git a/src/lib/krb5/os/localaddr.c b/src/lib/krb5/os/localaddr.c
index e93e45083c..cb204b597e 100644
--- a/src/lib/krb5/os/localaddr.c
+++ b/src/lib/krb5/os/localaddr.c
@@ -26,10 +26,10 @@
 
 #include "k5-int.h"
 
-krb5_error_code INTERFACE
+KRB5_DLLIMP krb5_error_code KRB5_CALLCONV
 krb5_os_localaddr(context, addr)
     krb5_context context;
-    krb5_address ***addr;
+    krb5_address FAR * FAR * FAR *addr;
 {
     return krb5_crypto_os_localaddr(addr);
 }
diff --git a/src/lib/krb5/os/sn2princ.c b/src/lib/krb5/os/sn2princ.c
index 75f52ace6f..1cb133761c 100644
--- a/src/lib/krb5/os/sn2princ.c
+++ b/src/lib/krb5/os/sn2princ.c
@@ -32,13 +32,13 @@
 #include <sys/param.h>
 #endif
 
-krb5_error_code INTERFACE
+KRB5_DLLIMP krb5_error_code KRB5_CALLCONV
 krb5_sname_to_principal(context, hostname, sname, type, ret_princ)
     krb5_context context;
-    const char * hostname;
-    const char * sname;
+    const char FAR * hostname;
+    const char FAR * sname;
     krb5_int32 type;
-    krb5_principal * ret_princ;
+    krb5_principal FAR * ret_princ;
 {
     struct hostent *hp;
     char **hrealms, *realm, *remote_host;
diff --git a/src/lib/krb5/os/timeofday.c b/src/lib/krb5/os/timeofday.c
index 72adc440e7..131406fbb4 100644
--- a/src/lib/krb5/os/timeofday.c
+++ b/src/lib/krb5/os/timeofday.c
@@ -39,10 +39,10 @@
 extern int errno;
 #endif
 
-krb5_error_code INTERFACE
+KRB5_DLLIMP krb5_error_code KRB5_CALLCONV
 krb5_timeofday(context, timeret)
     krb5_context context;
-    register krb5_int32 *timeret;
+    register krb5_int32 FAR *timeret;
 {
     krb5_os_context os_ctx = context->os_context;
     timetype tval;
diff --git a/src/lib/krb5/os/ustime.c b/src/lib/krb5/os/ustime.c
index ee7535324f..2c8b7d4ab3 100644
--- a/src/lib/krb5/os/ustime.c
+++ b/src/lib/krb5/os/ustime.c
@@ -30,10 +30,11 @@
 
 #include "k5-int.h"
 
-krb5_error_code INTERFACE
+KRB5_DLLIMP krb5_error_code KRB5_CALLCONV
 krb5_us_timeofday(context, seconds, microseconds)
     krb5_context context;
-    krb5_int32 *seconds, *microseconds;
+    krb5_int32 FAR *seconds;
+    krb5_int32 FAR *microseconds;
 {
     krb5_os_context os_ctx = context->os_context;
     krb5_int32 sec, usec;
diff --git a/src/lib/krb5/posix/ChangeLog b/src/lib/krb5/posix/ChangeLog
index e94ad00dc3..76d7a62cf6 100644
--- a/src/lib/krb5/posix/ChangeLog
+++ b/src/lib/krb5/posix/ChangeLog
@@ -1,3 +1,12 @@
+Tue Feb  4 15:54:11 1997  Richard Basch  <basch@lehman.com>
+
+	* Makefile.in: Only build sscanf for Win16
+	* sscanf.c: Export sscanf in Windows DLL
+
+Thu Nov 21 11:55:16 EST 1996    Richard Basch   <basch@lehman.com>
+
+        * Makefile.in: win32 build
+
 Mon Jun 10 21:51:35 1996  Theodore Ts'o  <tytso@rsts-11.mit.edu>
 
 	* syslog.c: Change _WINDOWS to _MSDOS, and add check for _WIN32.
diff --git a/src/lib/krb5/posix/Makefile.in b/src/lib/krb5/posix/Makefile.in
index c056c0cc9e..f1475edaac 100644
--- a/src/lib/krb5/posix/Makefile.in
+++ b/src/lib/krb5/posix/Makefile.in
@@ -1,7 +1,9 @@
 CFLAGS = $(CCOPTS) $(DEFS)
 
 ##DOSBUILDTOP = ..\..\..
-##DOSLIBNAME=..\krb5.lib
+##DOSMYNAME=posix
+##DOSOBJFILE=..\$(MYNAME).lst
+##WIN16##LIBNAME=..\krb5.lib
 
 .c.o:
 	$(CC) $(CFLAGS) -c $(srcdir)/$*.c
@@ -13,7 +15,15 @@ OBJS = setenv.$(OBJEXT)	@LIBOBJS@
 
 all-unix:: shared $(OBJS)
 all-mac: $(OBJS)
-all-windows:: syslog.obj sscanf.obj
+all-windows:: $(OBJFILE)
+
+##WIN16##$(OBJFILE): syslog.obj sscanf.obj
+##WIN16##	$(RM) $(OBJFILE)
+##WIN16##	$(CP) nul: $(OBJFILE)
+
+##WIN32##$(OBJFILE): syslog.obj
+##WIN32##	$(RM) $(OBJFILE)
+##WIN32##	$(LIBECHO) -p $(MYNAME)\ *.obj > $(OBJFILE)
 
 shared:
 	mkdir shared
@@ -23,5 +33,5 @@ clean-unix::
 
 clean-mac::
 clean-windows::
-
+	$(RM) $(OBJFILE)
 
diff --git a/src/lib/krb5/posix/sscanf.c b/src/lib/krb5/posix/sscanf.c
index 3dbc415e6a..9a96ff93f9 100644
--- a/src/lib/krb5/posix/sscanf.c
+++ b/src/lib/krb5/posix/sscanf.c
@@ -49,6 +49,8 @@
 #include <stdarg.h>
 #include <string.h>
 
+#include "k5-int.h"
+
 #if 0
 #if __STDC__
 #include <stdarg.h>
@@ -104,7 +106,7 @@ static u_char *__sccl(char *tab, u_char *fmt);
 /*
  * sscanf
  */
-int
+KRB5_DLLIMP int KRB5_CALLCONV_C
 sscanf(char *str, char const *fmt0, ...)
 {
 	va_list ap;
diff --git a/src/lib/krb5/rcache/ChangeLog b/src/lib/krb5/rcache/ChangeLog
index b5554fd25a..1a0d6c9f06 100644
--- a/src/lib/krb5/rcache/ChangeLog
+++ b/src/lib/krb5/rcache/ChangeLog
@@ -1,3 +1,11 @@
+Thu Nov 21 11:55:16 EST 1996    Richard Basch   <basch@lehman.com>
+
+        * Makefile.in: win32 build
+
+	* rc_dfl.c, rc_dfl.h: Win32/DLL calling conventions for rcache
+		functions.  (Most rcache routines are still not exported
+		pending an API review).
+
 Mon Nov 18 15:25:51 1996  Theodore Y. Ts'o  <tytso@mit.edu>
 
 	* rc_dfl.c: Apply jik's fix to allow the expunging of the replay
diff --git a/src/lib/krb5/rcache/Makefile.in b/src/lib/krb5/rcache/Makefile.in
index 0225fca21d..078ed1857c 100644
--- a/src/lib/krb5/rcache/Makefile.in
+++ b/src/lib/krb5/rcache/Makefile.in
@@ -1,7 +1,9 @@
 CFLAGS = $(CCOPTS) $(DEFS)
 
 ##DOSBUILDTOP = ..\..\..
-##DOSLIBNAME=..\krb5.lib
+##DOSMYNAME=rcache
+##DOSOBJFILE=..\$(MYNAME).lst
+##WIN16##LIBNAME=..\krb5.lib
 
 .c.o:
 	$(CC) $(CFLAGS) -c $(srcdir)/$*.c
@@ -25,13 +27,18 @@ SRCS=	\
 
 all-unix:: shared $(OBJS)
 all-mac:: $(OBJS)
-all-windows:: $(OBJS)
+all-windows:: $(OBJFILE)
+
+##DOS$(OBJFILE): $(OBJS)
+##DOS	$(RM) $(OBJFILE)
+##WIN16##	$(CP) nul: $(OBJFILE)
+##WIN32##	$(LIBECHO) -p $(MYNAME)\ *.obj > $(OBJFILE)
 
 shared:
 	mkdir shared
 
 clean-mac::
 clean-windows::
-
+	$(RM) $(OBJFILE)
 clean-unix::
 	$(RM) shared/*
diff --git a/src/lib/krb5/rcache/rc_dfl.c b/src/lib/krb5/rcache/rc_dfl.c
index 9eede53235..57679f3697 100644
--- a/src/lib/krb5/rcache/rc_dfl.c
+++ b/src/lib/krb5/rcache/rc_dfl.c
@@ -170,14 +170,16 @@ static int rc_store(context, id, rep)
  return CMP_HOHUM;
 }
 
-char * krb5_rc_dfl_get_name(context, id)
+char * KRB5_CALLCONV
+krb5_rc_dfl_get_name(context, id)
     krb5_context context;
     krb5_rcache id;
 {
  return ((struct dfl_data *) (id->data))->name;
 }
 
-krb5_error_code krb5_rc_dfl_get_span(context, id, lifespan)
+krb5_error_code KRB5_CALLCONV
+krb5_rc_dfl_get_span(context, id, lifespan)
     krb5_context context;
     krb5_rcache id;
     krb5_deltat *lifespan;
@@ -186,7 +188,8 @@ krb5_error_code krb5_rc_dfl_get_span(context, id, lifespan)
  return 0;
 }
 
-krb5_error_code krb5_rc_dfl_init(context, id, lifespan)
+krb5_error_code KRB5_CALLCONV
+krb5_rc_dfl_init(context, id, lifespan)
     krb5_context context;
 krb5_rcache id;
 krb5_deltat lifespan;
@@ -232,7 +235,8 @@ krb5_error_code krb5_rc_dfl_close_no_free(context, id)
  return 0;
 }
 
-krb5_error_code krb5_rc_dfl_close(context, id)
+krb5_error_code KRB5_CALLCONV
+krb5_rc_dfl_close(context, id)
     krb5_context context;
     krb5_rcache id;
 {
@@ -241,7 +245,8 @@ krb5_error_code krb5_rc_dfl_close(context, id)
     return 0;
 }
 
-krb5_error_code krb5_rc_dfl_destroy(context, id)
+krb5_error_code KRB5_CALLCONV
+krb5_rc_dfl_destroy(context, id)
     krb5_context context;
 krb5_rcache id;
 {
@@ -252,7 +257,8 @@ krb5_rcache id;
  return krb5_rc_dfl_close(context, id);
 }
 
-krb5_error_code krb5_rc_dfl_resolve(context, id, name)
+krb5_error_code KRB5_CALLCONV
+krb5_rc_dfl_resolve(context, id, name)
     krb5_context context;
     krb5_rcache id;
     char *name;
@@ -385,7 +391,8 @@ errout:
     
 
 
-krb5_error_code krb5_rc_dfl_recover(context, id)
+krb5_error_code KRB5_CALLCONV
+krb5_rc_dfl_recover(context, id)
     krb5_context context;
 krb5_rcache id;
 {
@@ -497,7 +504,8 @@ krb5_rc_io_store (context, t, rep)
     return ret;
 }
 
-krb5_error_code krb5_rc_dfl_store(context, id, rep)
+krb5_error_code KRB5_CALLCONV
+krb5_rc_dfl_store(context, id, rep)
     krb5_context context;
 krb5_rcache id;
 krb5_donot_replay *rep;
@@ -533,7 +541,8 @@ krb5_donot_replay *rep;
  return 0;
 }
 
-krb5_error_code krb5_rc_dfl_expunge(context, id)
+krb5_error_code KRB5_CALLCONV
+krb5_rc_dfl_expunge(context, id)
     krb5_context context;
 krb5_rcache id;
 {
diff --git a/src/lib/krb5/rcache/rc_dfl.h b/src/lib/krb5/rcache/rc_dfl.h
index 6529b6d41c..aaa5e820d0 100644
--- a/src/lib/krb5/rcache/rc_dfl.h
+++ b/src/lib/krb5/rcache/rc_dfl.h
@@ -15,34 +15,34 @@
 
 extern krb5_rc_ops krb5_rc_dfl_ops; /* initialized to the following */
 
-krb5_error_code krb5_rc_dfl_init 
+krb5_error_code KRB5_CALLCONV krb5_rc_dfl_init 
     	PROTOTYPE((krb5_context,
 		   krb5_rcache,
 		   krb5_deltat));
-krb5_error_code krb5_rc_dfl_recover 
+krb5_error_code KRB5_CALLCONV krb5_rc_dfl_recover 
 	PROTOTYPE((krb5_context,
 		   krb5_rcache)); 
-krb5_error_code krb5_rc_dfl_destroy 
+krb5_error_code KRB5_CALLCONV krb5_rc_dfl_destroy 
 	PROTOTYPE((krb5_context,
 		   krb5_rcache));
-krb5_error_code krb5_rc_dfl_close 
+krb5_error_code KRB5_CALLCONV krb5_rc_dfl_close 
 	PROTOTYPE((krb5_context,
 		   krb5_rcache));
-krb5_error_code krb5_rc_dfl_store 
+krb5_error_code KRB5_CALLCONV krb5_rc_dfl_store 
 	PROTOTYPE((krb5_context,
 		   krb5_rcache,
 		   krb5_donot_replay *));
-krb5_error_code krb5_rc_dfl_expunge 
+krb5_error_code KRB5_CALLCONV krb5_rc_dfl_expunge 
 	PROTOTYPE((krb5_context,
 		   krb5_rcache));
-krb5_error_code krb5_rc_dfl_get_span 
+krb5_error_code KRB5_CALLCONV krb5_rc_dfl_get_span 
 	PROTOTYPE((krb5_context,
 		   krb5_rcache,
 		   krb5_deltat *));
-char * krb5_rc_dfl_get_name 
+char * KRB5_CALLCONV krb5_rc_dfl_get_name 
 	PROTOTYPE((krb5_context,
 		   krb5_rcache));
-krb5_error_code krb5_rc_dfl_resolve 
+krb5_error_code KRB5_CALLCONV krb5_rc_dfl_resolve 
 	PROTOTYPE((krb5_context,
 		   krb5_rcache,
 		   char *));
diff --git a/src/lib/krb5/rcache/ser_rc.c b/src/lib/krb5/rcache/ser_rc.c
index 4ebfbe080d..f70dfbfe3e 100644
--- a/src/lib/krb5/rcache/ser_rc.c
+++ b/src/lib/krb5/rcache/ser_rc.c
@@ -208,7 +208,7 @@ krb5_rcache_internalize(kcontext, argp, buffer, lenremain)
 /*
  * Register the rcache serializer.
  */
-krb5_error_code
+KRB5_DLLIMP krb5_error_code KRB5_CALLCONV
 krb5_ser_rcache_init(kcontext)
     krb5_context	kcontext;
 {
diff --git a/src/lib/krb5_16.def b/src/lib/krb5_16.def
index abd9c7ee75..38a01227ba 100644
--- a/src/lib/krb5_16.def
+++ b/src/lib/krb5_16.def
@@ -1,65 +1,191 @@
 ;----------------------------------------------------
-;   KRB5_16.DEF - KRB5_16.DLL module definition file
+;   KRB5.DEF - KRB5.DLL module definition file
 ;----------------------------------------------------
 
-LIBRARY   	KRB5_16
-DESCRIPTION 	'DLL for Kerberos 5'
-EXETYPE   	WINDOWS
-CODE      	PRELOAD MOVEABLE DISCARDABLE
-DATA      	PRELOAD MOVEABLE SINGLE
-HEAPSIZE  	8192
+LIBRARY		KRB5_16
+DESCRIPTION	'DLL for Kerberos 5'
+EXETYPE		WINDOWS
+CODE		PRELOAD MOVEABLE DISCARDABLE
+DATA		PRELOAD MOVEABLE SINGLE
+HEAPSIZE	8192
 
 EXPORTS
-	WEP                                     @1001 RESIDENTNAME
-	LIBMAIN                         	@1002
-	GSS_ACQUIRE_CRED			@1
-	GSS_RELEASE_CRED			@2
-	GSS_INIT_SEC_CONTEXT			@3
-	GSS_ACCEPT_SEC_CONTEXT			@4
-	GSS_PROCESS_CONTEXT_TOKEN		@5
-	GSS_DELETE_SEC_CONTEXT			@6
-	GSS_CONTEXT_TIME			@7
-	GSS_SIGN				@8
-	GSS_VERIFY				@9
-	GSS_SEAL				@10
-	GSS_UNSEAL				@11
-	GSS_DISPLAY_STATUS			@12
-	GSS_INDICATE_MECHS			@13
-	GSS_COMPARE_NAME			@14
-	GSS_DISPLAY_NAME			@15
-	GSS_IMPORT_NAME				@16
-	GSS_RELEASE_NAME			@17
-	GSS_RELEASE_BUFFER			@18
-	GSS_RELEASE_OID_SET			@19
-	GSS_INQUIRE_CRED			@20
+	WEP					@1001 RESIDENTNAME
+	LibMain					@1002
 ; Kerberos 5
+	_krb5_build_principal
 	_krb5_build_principal_ext
-	KRB5_CC_DEFAULT
-	KRB5_FREE_ADDRESSES
-	KRB5_FREE_AP_REP_ENC_PART
-	KRB5_FREE_CRED_CONTENTS
-	KRB5_FREE_CREDS
-	KRB5_FREE_PRINCIPAL
-	KRB5_GET_CREDENTIALS
-	KRB5_GET_DEFAULT_REALM
-	KRB5_GET_IN_TKT_WITH_PASSWORD
-	KRB5_GET_NOTIFICATION_MESSAGE
-	KRB5_INIT_CONTEXT
-	KRB5_INIT_ETS
-	KRB5_MK_REQ_EXTENDED
-	KRB5_OS_LOCALADDR
-	KRB5_PARSE_NAME
-	KRB5_RD_REP
-	KRB5_SNAME_TO_PRINCIPAL
-	KRB5_TIMEOFDAY
-	KRB5_US_TIMEOFDAY
-	KRB5_UNPARSE_NAME
+	krb5_copy_addr
+	krb5_copy_addresses
+	krb5_copy_authdata
+	krb5_copy_authenticator
+	krb5_copy_checksum
+	krb5_copy_creds
+	krb5_copy_data
+	krb5_copy_keyblock
+	krb5_copy_keyblock_contents
+	krb5_copy_principal
+	krb5_copy_ticket
+	krb5_decrypt_tkt_part
+	krb5_free_address
+	krb5_free_addresses
+	krb5_free_ap_rep
+	krb5_free_ap_rep_enc_part
+	krb5_free_ap_req
+	krb5_free_authdata
+	krb5_free_authenticator
+	krb5_free_authenticator_contents
+	krb5_free_checksum
+	krb5_free_context
+	krb5_free_cred
+	krb5_free_cred_contents
+	krb5_free_cred_enc_part
+	krb5_free_creds
+	krb5_free_enc_kdc_rep_part
+	krb5_free_enc_tkt_part
+	krb5_free_error
+	krb5_free_host_realm
+	krb5_free_kdc_rep
+	krb5_free_kdc_req
+	krb5_free_keyblock
+	krb5_free_keyblock_contents
+	krb5_free_last_req
+	krb5_free_pa_data
+	krb5_free_principal
+	krb5_free_priv
+	krb5_free_priv_enc_part
+	krb5_free_pwd_data
+	krb5_free_pwd_sequences
+	krb5_free_safe
+	krb5_free_tgt_creds
+	krb5_free_ticket
+	krb5_free_tickets
+	krb5_free_tkt_authent
+	krb5_fwd_tgt_creds
+	krb5_get_credentials
+	krb5_get_default_realm
+	krb5_get_host_realm
+	krb5_get_in_tkt
+	krb5_get_in_tkt_with_keytab
+	krb5_get_in_tkt_with_password
+	krb5_get_in_tkt_with_skey
+	krb5_get_notification_message
+	krb5_init_context
+	krb5_init_ets
+	krb5_mk_error
+	krb5_mk_priv
+	krb5_mk_rep
+	krb5_mk_req
+	krb5_mk_req_extended
+	krb5_mk_safe
+	krb5_os_localaddr
+	krb5_parse_name
+	krb5_principal_compare
+	krb5_rd_cred
+	krb5_rd_error
+	krb5_rd_priv
+	krb5_rd_rep
+	krb5_rd_req
+	krb5_rd_safe
+	krb5_recvauth
+	krb5_sendauth
+	krb5_sname_to_principal
+	krb5_timeofday
+	krb5_unparse_name
+	krb5_unparse_name_ext
+	krb5_us_timeofday
+;
+	krb5_use_enctype
+	krb5_checksum_size
+	krb5_encrypt_size
+	krb5_calculate_checksum
+	krb5_verify_checksum
+	krb5_eblock_enctype
+;
+	krb5_decrypt
+	krb5_encrypt
+	krb5_string_to_key
+	krb5_process_key
+	krb5_finish_key
+	krb5_init_random_key
+	krb5_finish_random_key
+	krb5_random_key
+;
+	krb5_425_conv_principal
+	krb5_524_conv_principal
+;
+	krb5_cksumtype_to_string
+	krb5_deltat_to_string
+	krb5_enctype_to_string
+	krb5_salttype_to_string
+	krb5_string_to_cksumtype
+	krb5_string_to_deltat
+	krb5_string_to_enctype
+	krb5_string_to_salttype
+	krb5_string_to_timestamp
+	krb5_timestamp_to_sfstring
+	krb5_timestamp_to_string
+;
+	krb5_auth_con_free
+	krb5_auth_con_genaddrs
+	krb5_auth_con_getflags
+	krb5_auth_con_getkey
+	krb5_auth_con_getlocalsubkey
+	krb5_auth_con_getremotesubkey
+	krb5_auth_con_init
+	krb5_auth_con_setflags
+	krb5_auth_con_getlocalseqnumber
+	krb5_auth_con_getremoteseqnumber
+	krb5_auth_con_setuseruserkey
+	krb5_auth_con_getauthenticator
+	krb5_auth_con_set_req_cksumtype
+;
+	krb5_cc_default
+	krb5_cc_register
+	krb5_cc_resolve
+;
+	krb5_kt_default
+	krb5_kt_register
+	krb5_kt_resolve
+	krb5_kt_add_entry
+	krb5_kt_free_entry
+	krb5_kt_read_service_key
+	krb5_kt_remove_entry
 ;Kadm routines
-	KRB5_ADM_CONNECT
-	KRB5_ADM_DISCONNECT
-	KRB5_FREE_ADM_DATA
-	KRB5_READ_ADM_REPLY
-	KRB5_SEND_ADM_CMD
+	krb5_adm_connect
+	krb5_adm_disconnect
+	krb5_free_adm_data
+	krb5_read_adm_reply
+	krb5_send_adm_cmd
 ;Com_err routines
-        _com_err
-        ERROR_MESSAGE
+	_com_err
+	error_message
+	et_init
+	et_shutdown
+	et_add_error_table
+	et_error_message
+	_et_com_err
+	_et_com_err_va
+	et_set_hook
+	__et_list
+;
+;Temporary exports (DO NOT USE)
+	_sscanf
+	_decode_krb5_ticket
+	des_ecb_encrypt
+	des_new_random_key
+	des_key_sched
+	des_set_random_generator_seed
+	krb5_random_confounder
+	krb5_size_opaque
+	krb5_internalize_opaque
+	krb5_externalize_opaque
+	krb5_ser_pack_int32
+	krb5_ser_unpack_int32
+	krb5_ser_pack_bytes
+	krb5_ser_unpack_bytes
+	krb5_ser_auth_context_init
+	krb5_ser_context_init
+	krb5_ser_ccache_init
+	krb5_ser_keytab_init
+	krb5_ser_rcache_init
diff --git a/src/lib/krb5_32.def b/src/lib/krb5_32.def
new file mode 100644
index 0000000000..76371cc6bd
--- /dev/null
+++ b/src/lib/krb5_32.def
@@ -0,0 +1,189 @@
+;----------------------------------------------------
+;   KRB5.DEF - KRB5.DLL module definition file
+;----------------------------------------------------
+
+;LIBRARY		KRB5
+DESCRIPTION	'DLL for Kerberos 5'
+CODE		PRELOAD MOVEABLE DISCARDABLE
+DATA		PRELOAD MOVEABLE SINGLE
+HEAPSIZE	8192
+
+EXPORTS
+	WEP					@1001
+	LibMain					@1002
+; Kerberos 5
+	krb5_build_principal
+	krb5_build_principal_ext
+	krb5_copy_addr
+	krb5_copy_addresses
+	krb5_copy_authdata
+	krb5_copy_authenticator
+	krb5_copy_checksum
+	krb5_copy_creds
+	krb5_copy_data
+	krb5_copy_keyblock
+	krb5_copy_keyblock_contents
+	krb5_copy_principal
+	krb5_copy_ticket
+	krb5_decrypt_tkt_part
+	krb5_free_address
+	krb5_free_addresses
+	krb5_free_ap_rep
+	krb5_free_ap_rep_enc_part
+	krb5_free_ap_req
+	krb5_free_authdata
+	krb5_free_authenticator
+	krb5_free_authenticator_contents
+	krb5_free_checksum
+	krb5_free_context
+	krb5_free_cred
+	krb5_free_cred_contents
+	krb5_free_cred_enc_part
+	krb5_free_creds
+	krb5_free_enc_kdc_rep_part
+	krb5_free_enc_tkt_part
+	krb5_free_error
+	krb5_free_host_realm
+	krb5_free_kdc_rep
+	krb5_free_kdc_req
+	krb5_free_keyblock
+	krb5_free_keyblock_contents
+	krb5_free_last_req
+	krb5_free_pa_data
+	krb5_free_principal
+	krb5_free_priv
+	krb5_free_priv_enc_part
+	krb5_free_pwd_data
+	krb5_free_pwd_sequences
+	krb5_free_safe
+	krb5_free_tgt_creds
+	krb5_free_ticket
+	krb5_free_tickets
+	krb5_free_tkt_authent
+	krb5_fwd_tgt_creds
+	krb5_get_credentials
+	krb5_get_default_realm
+	krb5_get_host_realm
+	krb5_get_in_tkt
+	krb5_get_in_tkt_with_keytab
+	krb5_get_in_tkt_with_password
+	krb5_get_in_tkt_with_skey
+	krb5_get_notification_message
+	krb5_init_context
+	krb5_init_ets
+	krb5_mk_error
+	krb5_mk_priv
+	krb5_mk_rep
+	krb5_mk_req
+	krb5_mk_req_extended
+	krb5_mk_safe
+	krb5_os_localaddr
+	krb5_parse_name
+	krb5_principal_compare
+	krb5_rd_cred
+	krb5_rd_error
+	krb5_rd_priv
+	krb5_rd_rep
+	krb5_rd_req
+	krb5_rd_safe
+	krb5_recvauth
+	krb5_sendauth
+	krb5_sname_to_principal
+	krb5_timeofday
+	krb5_unparse_name
+	krb5_unparse_name_ext
+	krb5_us_timeofday
+;
+	krb5_use_enctype
+	krb5_checksum_size
+	krb5_encrypt_size
+	krb5_calculate_checksum
+	krb5_verify_checksum
+	krb5_eblock_enctype
+;
+	krb5_decrypt
+	krb5_encrypt
+	krb5_string_to_key
+	krb5_process_key
+	krb5_finish_key
+	krb5_init_random_key
+	krb5_finish_random_key
+	krb5_random_key
+;
+	krb5_425_conv_principal
+	krb5_524_conv_principal
+;
+	krb5_cksumtype_to_string
+	krb5_deltat_to_string
+	krb5_enctype_to_string
+	krb5_salttype_to_string
+	krb5_string_to_cksumtype
+	krb5_string_to_deltat
+	krb5_string_to_enctype
+	krb5_string_to_salttype
+	krb5_string_to_timestamp
+	krb5_timestamp_to_sfstring
+	krb5_timestamp_to_string
+;
+	krb5_auth_con_free
+	krb5_auth_con_genaddrs
+	krb5_auth_con_getflags
+	krb5_auth_con_getkey
+	krb5_auth_con_getlocalsubkey
+	krb5_auth_con_getremotesubkey
+	krb5_auth_con_init
+	krb5_auth_con_setflags
+	krb5_auth_con_getlocalseqnumber
+	krb5_auth_con_getremoteseqnumber
+	krb5_auth_con_setuseruserkey
+	krb5_auth_con_getauthenticator
+	krb5_auth_con_set_req_cksumtype
+;
+	krb5_cc_default
+	krb5_cc_register
+	krb5_cc_resolve
+;
+	krb5_kt_default
+	krb5_kt_register
+	krb5_kt_resolve
+	krb5_kt_add_entry
+	krb5_kt_free_entry
+	krb5_kt_read_service_key
+	krb5_kt_remove_entry
+;Kadm routines
+	krb5_adm_connect
+	krb5_adm_disconnect
+	krb5_free_adm_data
+	krb5_read_adm_reply
+	krb5_send_adm_cmd
+;Com_err routines
+	com_err
+	error_message
+	et_init
+	et_shutdown
+	et_add_error_table
+	et_error_message
+	et_com_err
+	et_com_err_va
+	et_set_hook
+	_et_list
+;
+;Temporary exports (DO NOT USE)
+	decode_krb5_ticket
+	des_ecb_encrypt
+	des_new_random_key
+	des_key_sched
+	des_set_random_generator_seed
+	krb5_random_confounder
+	krb5_size_opaque
+	krb5_internalize_opaque
+	krb5_externalize_opaque
+	krb5_ser_pack_int32
+	krb5_ser_unpack_int32
+	krb5_ser_pack_bytes
+	krb5_ser_unpack_bytes
+	krb5_ser_auth_context_init
+	krb5_ser_context_init
+	krb5_ser_ccache_init
+	krb5_ser_keytab_init
+	krb5_ser_rcache_init
diff --git a/src/lib/libkrb5.def b/src/lib/libkrb5.def
deleted file mode 100644
index 9d9d5e5ef7..0000000000
--- a/src/lib/libkrb5.def
+++ /dev/null
@@ -1,65 +0,0 @@
-;----------------------------------------------------
-;   LIBKRB5.DEF - LIBKRB5.DLL module definition file
-;----------------------------------------------------
-
-LIBRARY   	LIBKRB5
-DESCRIPTION 	'DLL for Kerberos 5'
-EXETYPE   	WINDOWS
-CODE      	PRELOAD MOVEABLE DISCARDABLE
-DATA      	PRELOAD MOVEABLE SINGLE
-HEAPSIZE  	8192
-
-EXPORTS
-	WEP                                     @1001 RESIDENTNAME
-	LIBMAIN                         	@1002
-	GSS_ACQUIRE_CRED			@1
-	GSS_RELEASE_CRED			@2
-	GSS_INIT_SEC_CONTEXT			@3
-	GSS_ACCEPT_SEC_CONTEXT			@4
-	GSS_PROCESS_CONTEXT_TOKEN		@5
-	GSS_DELETE_SEC_CONTEXT			@6
-	GSS_CONTEXT_TIME			@7
-	GSS_SIGN				@8
-	GSS_VERIFY				@9
-	GSS_SEAL				@10
-	GSS_UNSEAL				@11
-	GSS_DISPLAY_STATUS			@12
-	GSS_INDICATE_MECHS			@13
-	GSS_COMPARE_NAME			@14
-	GSS_DISPLAY_NAME			@15
-	GSS_IMPORT_NAME				@16
-	GSS_RELEASE_NAME			@17
-	GSS_RELEASE_BUFFER			@18
-	GSS_RELEASE_OID_SET			@19
-	GSS_INQUIRE_CRED			@20
-; Kerberos 5
-	_krb5_build_principal_ext
-	KRB5_CC_DEFAULT
-	KRB5_FREE_ADDRESSES
-	KRB5_FREE_AP_REP_ENC_PART
-	KRB5_FREE_CRED_CONTENTS
-	KRB5_FREE_CREDS
-	KRB5_FREE_PRINCIPAL
-	KRB5_GET_CREDENTIALS
-	KRB5_GET_DEFAULT_REALM
-	KRB5_GET_IN_TKT_WITH_PASSWORD
-	KRB5_GET_NOTIFICATION_MESSAGE
-	KRB5_INIT_CONTEXT
-	KRB5_INIT_ETS
-	KRB5_MK_REQ_EXTENDED
-	KRB5_OS_LOCALADDR
-	KRB5_PARSE_NAME
-	KRB5_RD_REP
-	KRB5_SNAME_TO_PRINCIPAL
-	KRB5_TIMEOFDAY
-	KRB5_US_TIMEOFDAY
-	KRB5_UNPARSE_NAME
-;Kadm routines
-	KRB5_ADM_CONNECT
-	KRB5_ADM_DISCONNECT
-	KRB5_FREE_ADM_DATA
-	KRB5_READ_ADM_REPLY
-	KRB5_SEND_ADM_CMD
-;Com_err routines
-        _com_err
-        ERROR_MESSAGE