diff --git a/sys/rump/Makefile.rump b/sys/rump/Makefile.rump
index a8011ef565d5..f3de7f6ed1d1 100644
--- a/sys/rump/Makefile.rump
+++ b/sys/rump/Makefile.rump
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.rump,v 1.116 2015/08/24 18:17:04 pooka Exp $
+#	$NetBSD: Makefile.rump,v 1.117 2015/08/24 22:31:33 pooka Exp $
 #
 
 .if !defined(_RUMP_MK)
@@ -53,6 +53,7 @@ CPPFLAGS+=	-imacros ${BUILDRUMP_IMACROS}
 CPPFLAGS+=	-I${.CURDIR} -I.
 CPPFLAGS+=	-I${RUMPTOP}/../../common/include
 CPPFLAGS+=	-I${RUMPTOP}/include
+CPPFLAGS+=	-I${RUMPTOP}/include/opt
 CPPFLAGS+=	-I${RUMPTOP}/librump/rumpkern/opt
 
 SHLIB_MAJOR?=	0
diff --git a/sys/rump/include/opt/arp.h b/sys/rump/include/opt/arp.h
new file mode 100644
index 000000000000..d0490818537a
--- /dev/null
+++ b/sys/rump/include/opt/arp.h
@@ -0,0 +1,3 @@
+/*	$NetBSD: arp.h,v 1.1 2015/08/24 22:31:33 pooka Exp $	*/
+
+#define NARP 1
diff --git a/sys/rump/include/opt/pfsync.h b/sys/rump/include/opt/pfsync.h
new file mode 100644
index 000000000000..8a79255f0e4a
--- /dev/null
+++ b/sys/rump/include/opt/pfsync.h
@@ -0,0 +1,2 @@
+/*	$NetBSD: pfsync.h,v 1.1 2015/08/24 22:31:33 pooka Exp $	*/
+
diff --git a/sys/rump/librump/rumpnet/Makefile.rumpnet b/sys/rump/librump/rumpnet/Makefile.rumpnet
index 2a787eb56385..94893f263df5 100644
--- a/sys/rump/librump/rumpnet/Makefile.rumpnet
+++ b/sys/rump/librump/rumpnet/Makefile.rumpnet
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.rumpnet,v 1.17 2014/12/03 00:19:04 christos Exp $
+#	$NetBSD: Makefile.rumpnet,v 1.18 2015/08/24 22:31:33 pooka Exp $
 #
 
 LIB=		rumpnet
@@ -37,7 +37,7 @@ SRCS+=
 # bpf stubs, required for all kernels
 SRCS+=	bpf_stub.c
 
-CPPFLAGS+=	-I${RUMPTOP}/librump/rumpkern -I${RUMPTOP}/librump/rumpnet/opt
+CPPFLAGS+=	-I${RUMPTOP}/librump/rumpkern
 
 .include "${RUMPTOP}/Makefile.rump"
 
diff --git a/sys/rump/librump/rumpnet/opt/arp.h b/sys/rump/librump/rumpnet/opt/arp.h
deleted file mode 100644
index 539c55d49310..000000000000
--- a/sys/rump/librump/rumpnet/opt/arp.h
+++ /dev/null
@@ -1,3 +0,0 @@
-/*	$NetBSD: arp.h,v 1.2 2009/01/01 19:43:57 pooka Exp $	*/
-
-#define NARP 1
diff --git a/sys/rump/librump/rumpnet/opt/pfsync.h b/sys/rump/librump/rumpnet/opt/pfsync.h
deleted file mode 100644
index 88307512cfb6..000000000000
--- a/sys/rump/librump/rumpnet/opt/pfsync.h
+++ /dev/null
@@ -1,2 +0,0 @@
-/*	$NetBSD: pfsync.h,v 1.1 2009/09/14 10:36:50 degroote Exp $	*/
-
diff --git a/sys/rump/net/lib/Makefile.inc b/sys/rump/net/lib/Makefile.inc
index 50fe011b4e1b..2980423bda84 100644
--- a/sys/rump/net/lib/Makefile.inc
+++ b/sys/rump/net/lib/Makefile.inc
@@ -1,8 +1,7 @@
-#	$NetBSD: Makefile.inc,v 1.4 2010/03/01 13:12:20 pooka Exp $
+#	$NetBSD: Makefile.inc,v 1.5 2015/08/24 22:31:34 pooka Exp $
 #
 
 RUMPTOP=	${.CURDIR}/../../..
-CPPFLAGS+=	-I${RUMPTOP}/librump/rumpkern -I${RUMPTOP}/librump/rumpnet \
-		-I${RUMPTOP}/librump/rumpnet/opt
+CPPFLAGS+=	-I${RUMPTOP}/librump/rumpkern -I${RUMPTOP}/librump/rumpnet
 
 .include "${RUMPTOP}/Makefile.rump"