diff --git a/src/JAVA/libjafs/Group.c b/src/JAVA/libjafs/Group.c
index 93b715c8f1..bc89a03f32 100644
--- a/src/JAVA/libjafs/Group.c
+++ b/src/JAVA/libjafs/Group.c
@@ -22,6 +22,8 @@
 #include "Internal.h"
 #include "org_openafs_jafs_Group.h"
 
+#include <afs_vosAdmin.h>
+
 #include <stdio.h>
 #include <afs_ptsAdmin.h>
 #include <afs_AdminPtsErrors.h>
diff --git a/src/JAVA/libjafs/Makefile.in b/src/JAVA/libjafs/Makefile.in
index d67637ebaa..1a764db723 100644
--- a/src/JAVA/libjafs/Makefile.in
+++ b/src/JAVA/libjafs/Makefile.in
@@ -36,10 +36,10 @@ SHARED_FLAGS = -shared -Xlinker -Bsymbolic
 OBJECT_FLAGS = -fPIC -c
 
 ifeq "$(BUILD_TYPE)" "admin"
-	INC := -I${TOP_INCDIR} -I${TOP_INCDIR}/afs/ ${JNI_INC}
+	INC := -I${TOP_SRCDIR}/config -I${TOP_INCDIR} -I${TOP_INCDIR}/afs/ ${JNI_INC}
 	CFLAGS := ${INC} ${DBG} ${OPTMZ} -I${TOP_SRCDIR}/config ${MT_CFLAGS}
 else
-	INC := -I${TOP_SRCDIR}/libuafs -I${TOP_INCDIR} ${JNI_INC}
+	INC := -I${TOP_SRCDIR}/config -I${TOP_SRCDIR}/libuafs -I${TOP_INCDIR} ${JNI_INC}
 	CFLAGS := ${INC} ${DBG} ${OPTMZ} ${FSINCLUDES} -D_REENTRANT -DLIBJUAFS ${MT_CFLAGS}
 endif
 
@@ -94,9 +94,7 @@ LIBJAFS_OBJS +=\
 	${LIBJAFSADMDIR}Internal.o \
 	${LIBJAFSADMDIR}UserToken.o \
 	${LIBJAFSADMDIR}VersionInfo.o \
-	${TOP_SRCDIR}/libuafs/UAFS/AFS_component_version_number.o \
-	${TOP_SRCDIR}/libuafs/UAFS/xdr_int32.o \
-        ${TOP_SRCDIR}/util/rxkstats.o
+	${TOP_SRCDIR}/libuafs/UAFS/xdr_int32.o
 
 ifeq (${SYS_NAME}, ppc64_linux26)
 LIBJAFSADM_OBJS =\
@@ -123,7 +121,6 @@ LIBJAFSADM_OBJS +=\
 	${LIBJAFSADMDIR}Server.o \
 	${LIBJAFSADMDIR}User.o \
 	${LIBJAFSADMDIR}Version2.o \
-	${TOP_SRCDIR}/libuafs/UAFS/AFS_component_version_number.o \
 	${LIBJAFSADMDIR}Volume.o
 
 CORRELATING_SOURCE_FILES =\