diff --git a/lib/libc/net/getnameinfo.c b/lib/libc/net/getnameinfo.c
index ead0f0040fc3..33c4bfed4e8f 100644
--- a/lib/libc/net/getnameinfo.c
+++ b/lib/libc/net/getnameinfo.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: getnameinfo.c,v 1.54 2013/08/16 15:27:12 christos Exp $	*/
+/*	$NetBSD: getnameinfo.c,v 1.55 2015/05/15 06:58:59 ozaki-r Exp $	*/
 /*	$KAME: getnameinfo.c,v 1.45 2000/09/25 22:43:56 itojun Exp $	*/
 
 /*
@@ -47,10 +47,12 @@
 
 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: getnameinfo.c,v 1.54 2013/08/16 15:27:12 christos Exp $");
+__RCSID("$NetBSD: getnameinfo.c,v 1.55 2015/05/15 06:58:59 ozaki-r Exp $");
 #endif /* LIBC_SCCS and not lint */
 
+#ifndef RUMP_ACTION
 #include "namespace.h"
+#endif
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/un.h>
diff --git a/sbin/route/Makefile b/sbin/route/Makefile
index b52407861738..80b74fe66b2b 100644
--- a/sbin/route/Makefile
+++ b/sbin/route/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.27 2015/04/22 03:07:55 ozaki-r Exp $
+#	$NetBSD: Makefile,v 1.28 2015/05/15 06:58:59 ozaki-r Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
 
 .include <bsd.own.mk>
@@ -8,7 +8,7 @@ MAN=	route.8
 SRCS=	route.c show.c keywords.c rtutil.c
 
 .PATH:		${.CURDIR}/../../lib/libc/net
-RUMPSRCS= if_indextoname.c getifaddrs.c
+RUMPSRCS= if_indextoname.c getifaddrs.c getnameinfo.c
 .if (${MKRUMP} != "no")
 CPPFLAGS+= -DRUMP_ACTION
 .endif
diff --git a/usr.bin/netstat/Makefile b/usr.bin/netstat/Makefile
index fd6139af2b04..21c912df08cb 100644
--- a/usr.bin/netstat/Makefile
+++ b/usr.bin/netstat/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.41 2015/02/07 19:36:06 christos Exp $
+#	$NetBSD: Makefile,v 1.42 2015/05/15 06:58:59 ozaki-r Exp $
 #	from: @(#)Makefile	8.1 (Berkeley) 6/12/93
 
 .include <bsd.own.mk>
@@ -25,7 +25,7 @@ COPTS.show.c += -Wno-format-nonliteral
 .PATH:  ${.CURDIR}/../../sbin/route
 CPPFLAGS+= -DRUMP_ACTION
 RUMPSRCS+= sysctlbyname.c sysctlgetmibinfo.c sysctlnametomib.c
-RUMPSRCS+= if_indextoname.c getifaddrs.c
+RUMPSRCS+= if_indextoname.c getifaddrs.c getnameinfo.c
 
 .if (${USE_INET6} != "no")
 CPPFLAGS+= -DINET6