diff --git a/sys/ia64/ia64/genassym.c b/sys/ia64/ia64/genassym.c
index e8084bfc3e9..8b06f91ac8d 100644
--- a/sys/ia64/ia64/genassym.c
+++ b/sys/ia64/ia64/genassym.c
@@ -61,10 +61,10 @@
 #include <sys/user.h>
 #include <net/if.h>
 #include <netinet/in.h>
-#include <nfs/nfsv2.h>
+#include <nfs/nfsproto.h>
 #include <nfs/rpcv2.h>
-#include <nfs/nfs.h>
-#include <nfs/nfsdiskless.h>
+#include <nfsclient/nfs.h>
+#include <nfsclient/nfsdiskless.h>
 
 ASSYM(GD_CURTHREAD, offsetof(struct globaldata, gd_curthread));
 ASSYM(GD_FPCURTHREAD, offsetof(struct globaldata, gd_fpcurthread));
diff --git a/sys/powerpc/powerpc/genassym.c b/sys/powerpc/powerpc/genassym.c
index 34a2612b174..8b51d8b2ddb 100644
--- a/sys/powerpc/powerpc/genassym.c
+++ b/sys/powerpc/powerpc/genassym.c
@@ -57,10 +57,10 @@
 #include <vm/vm_map.h>
 #include <net/if.h>
 #include <netinet/in.h>
-#include <nfs/nfsv2.h>
+#include <nfs/nfsproto.h>
 #include <nfs/rpcv2.h>
-#include <nfs/nfs.h>
-#include <nfs/nfsdiskless.h>
+#include <nfsclient/nfs.h>
+#include <nfsclient/nfsdiskless.h>
 #include <machine/pcb.h>
 #include <machine/pmap.h>