diff --git a/lib/gssapi/NTMakefile b/lib/gssapi/NTMakefile
index f1a602e5d..b76de4afe 100644
--- a/lib/gssapi/NTMakefile
+++ b/lib/gssapi/NTMakefile
@@ -245,6 +245,7 @@ INCFILES=				\
     $(INCDIR)\gssapi\gssapi_krb5.h	\
     $(INCDIR)\gssapi\gssapi_ntlm.h	\
     $(INCDIR)\gssapi\gssapi_spnego.h	\
+    $(INCDIR)\gssapi\gkrb5_err.h	\
     $(OBJ)\ntlm\ntlm-private.h		\
     $(OBJ)\spnego\spnego-private.h	\
     $(OBJ)\krb5\gsskrb5-private.h	\
@@ -446,6 +447,9 @@ GCOPTS=-I$(SRCDIR) -I$(OBJ) -Igssapi -DBUILD_GSSAPI_LIB
 {gssapi}.h{$(INCDIR)\gssapi}.h:
 	$(CP) $** $@
 
+{$(OBJ)}.h{$(INCDIR)\gssapi}.h:
+	$(CP) $** $@
+
 {$(OBJ)\gssapi}.hx{$(OBJ)\gssapi}.h:
 	$(CP) $** $@
 
diff --git a/packages/windows/sdk/NTMakefile b/packages/windows/sdk/NTMakefile
index f93f7a96a..264ae5f5f 100644
--- a/packages/windows/sdk/NTMakefile
+++ b/packages/windows/sdk/NTMakefile
@@ -51,6 +51,9 @@ mksdkdirs:
 ! if !exist($(SDKINCDIR)\kadm5)
 	$(MKDIR) $(SDKINCDIR)\kadm5
 ! endif
+! if !exist($(SDKINCDIR)\gssapi)
+	$(MKDIR) $(SDKINCDIR)\gssapi
+! endif
 ! if !exist($(SDKLIBDIR))
 	$(MKDIR) $(SDKLIBDIR)
 ! endif
@@ -74,10 +77,16 @@ INCFILES=\
 	$(SDKINCDIR)\krb5\krb5_locl.h	\
 	$(SDKINCDIR)\kadm5\kadm5_err.h	\
 	$(SDKINCDIR)\kadm5\kadm5-protos.h	\
+	$(SDKINCDIR)\gssapi\gkrb5_err.h		\
+	$(SDKINCDIR)\gssapi\gssapi.h		\
+	$(SDKINCDIR)\gssapi\gssapi_krb5.h	\
+	$(SDKINCDIR)\gssapi\gssapi_ntlm.h	\
+	$(SDKINCDIR)\gssapi\gssapi_spnego.h	\
 
 LIBFILES=\
 	$(SDKLIBDIR)\heimdal.lib	\
 	$(SDKLIBDIR)\libcom_err.lib	\
+	$(SDKLIBDIR)\libgssapi.lib
 
 all:: $(INCFILES) $(LIBFILES)
 
@@ -95,6 +104,8 @@ all:: $(INCFILES) $(LIBFILES)
 {$(INCDIR)\kadm5}.h{$(SDKINCDIR)\kadm5}.h:
 	$(CP) $** $@
 
+{$(INCDIR)\gssapi}.h{$(SDKINCDIR)\gssapi}.h:
+	$(CP) $** $@
 clean::
 	-$(RM) $(SDKINCDIR)\*.*
 	-$(RM) $(SDKINCDIR)\krb5\*.*