diff --git a/kdc/NTMakefile b/kdc/NTMakefile
index 8ae4b51da..2115ebb7f 100644
--- a/kdc/NTMakefile
+++ b/kdc/NTMakefile
@@ -33,6 +33,8 @@ RELDIR=kdc
 
 !include ../windows/NTMakefile.w32 
 
+intcflags=-I$(OBJ) -I$(SRC)\lib\gssapi -I$(OBJDIR)\lib\gssapi
+
 BINPROGRAMS=$(BINDIR)\string2key.exe
 
 SBINPROGRAMS=$(SBINDIR)\kstash.exe
@@ -59,6 +61,7 @@ clean::
 
 BIN_LIBS=\
 	$(LIBHDB)	\
+	$(LIBGSSAPI)	\
 	$(LIBHEIMDAL)	\
 	$(LIBROKEN)	\
 	$(LIBVERS)
@@ -112,6 +115,7 @@ LIBKDC_OBJS=\
 
 LIBKDC_LIBS=\
 	$(LIBHDB)		\
+	$(LIBGSSAPI)		\
 	$(LIBHEIMBASE)		\
 	$(LIBHEIMDAL)		\
 	$(LIBHEIMNTLM)		\
diff --git a/kuser/Makefile.am b/kuser/Makefile.am
index 2ff2db3a1..a24a81ed8 100644
--- a/kuser/Makefile.am
+++ b/kuser/Makefile.am
@@ -7,6 +7,7 @@ afs_lib = $(LIB_kafs)
 endif
 
 AM_CPPFLAGS += -I$(srcdir)/../lib/krb5 \
+	-I$(srcdir)/../lib/gssapi \
 	$(INCLUDE_libintl) \
 	-DHEIMDAL_LOCALEDIR='"$(localedir)"'
 
diff --git a/kuser/NTMakefile b/kuser/NTMakefile
index f940221c7..87c95f889 100644
--- a/kuser/NTMakefile
+++ b/kuser/NTMakefile
@@ -31,7 +31,7 @@
 
 RELDIR=kuser
 
-intcflags=-I$(OBJ)
+intcflags=-I$(OBJ) -I$(SRC)\lib\gssapi -I$(OBJDIR)\lib\gssapi
 
 !include ../windows/NTMakefile.w32 
 
@@ -55,6 +55,7 @@ NOINSTPROGRAMS=\
 
 
 BINLIBS=\
+	$(LIBGSSAPI)	\
 	$(LIBHEIMDAL)	\
 	$(LIBHEIMNTLM)	\
 	$(LIBHX509)	\
diff --git a/kuser/kuser_locl.h b/kuser/kuser_locl.h
index b02e9ffa7..c6fb5856f 100644
--- a/kuser/kuser_locl.h
+++ b/kuser/kuser_locl.h
@@ -76,7 +76,7 @@
 
 #include <gssapi_mech.h>
 #include <gssapi/gssapi_preauth.h>
-#include "../lib/gssapi/preauth/pa-private.h"
+#include <preauth/pa-private.h>
 
 #if defined(HAVE_SYS_IOCTL_H) && SunOS != 40
 #include <sys/ioctl.h>
diff --git a/lib/gssapi/NTMakefile b/lib/gssapi/NTMakefile
index d5493cb34..9087dc3b0 100644
--- a/lib/gssapi/NTMakefile
+++ b/lib/gssapi/NTMakefile
@@ -320,6 +320,7 @@ INCFILES=				\
     $(INCDIR)\gssapi\gssapi_oid.h	\
     $(INCDIR)\gssapi\gssapi_ntlm.h	\
     $(INCDIR)\gssapi\gssapi_spnego.h	\
+    $(INCDIR)\gssapi\gssapi_preauth.h	\
     $(INCDIR)\gssapi\gkrb5_err.h	\
     $(OBJ)\ntlm\ntlm-private.h		\
     $(OBJ)\spnego\spnego-private.h	\