diff --git a/src/afs/afs_nfsdisp.c b/src/afs/afs_nfsdisp.c
index 801cc9bd82..3762722293 100644
--- a/src/afs/afs_nfsdisp.c
+++ b/src/afs/afs_nfsdisp.c
@@ -12,6 +12,8 @@
 
 RCSID("$Header$");
 
+/* Ugly Ugly Ugly  but precludes conflicting XDR macros; We want kernel xdr */
+#define __XDR_INCLUDE__
 #include "../afs/stds.h"
 #include "../afs/sysincludes.h" /* Standard vendor system headers */
 #if defined(AFS_SUN55_ENV) && !defined(AFS_NONFSTRANS) 
diff --git a/src/libafs/Makefile.common.in b/src/libafs/Makefile.common.in
index 4378945e72..62cef417da 100644
--- a/src/libafs/Makefile.common.in
+++ b/src/libafs/Makefile.common.in
@@ -128,7 +128,6 @@ AFSAOBJS = \
 AFSNFSOBJS = \
 	afs_nfsclnt.o	\
 	afs_nfsdisp.o	\
-	afs_nfsdisp_v3.o \
 	afs_call_nfs.o \
 	afs_pioctl_nfs.o \
 	$(AFS_OS_NFSOBJS)
@@ -263,8 +262,6 @@ afs_nfsclnt.o: $(AFS)/afs_nfsclnt.c
 	$(CRULE1)
 afs_nfsdisp.o: $(AFS)/afs_nfsdisp.c
 	$(CRULE1)
-afs_nfsdisp_v3.o: $(AFS)/afs_nfsdisp_v3.c
-	$(CRULE1)
 rx.o: $(RX)/rx.c
 	$(CRULE1)
 rx_clock.o: $(RX)/rx_clock.c