From d7f8e381d4f34c2f0a7807b36dbbd2a5c7353fc7 Mon Sep 17 00:00:00 2001
From: Sascha Wildner <saw@online.de>
Date: Fri, 3 May 2013 18:52:18 +0200
Subject: [PATCH] Unbreak buildworld.

---
 sys/net/bridge/if_bridgevar.h | 3 ++-
 sys/net/ipfw/ip_fw2.h         | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/sys/net/bridge/if_bridgevar.h b/sys/net/bridge/if_bridgevar.h
index 902892d6eb..f46ae2800b 100644
--- a/sys/net/bridge/if_bridgevar.h
+++ b/sys/net/bridge/if_bridgevar.h
@@ -66,7 +66,6 @@
  * $OpenBSD: if_bridge.h,v 1.14 2001/03/22 03:48:29 jason Exp $
  * $NetBSD: if_bridgevar.h,v 1.4 2003/07/08 07:13:50 itojun Exp $
  * $FreeBSD: src/sys/net/if_bridgevar.h,v 1.4 2005/07/06 01:24:45 thompsa Exp $
- * $DragonFly: src/sys/net/bridge/if_bridgevar.h,v 1.10 2008/11/26 12:49:43 sephe Exp $
  */
 
 #ifndef _NET_IF_BRIDGEVAR_H
@@ -78,7 +77,9 @@
 
 #include <sys/callout.h>
 #include <sys/queue.h>
+#ifdef _KERNEL
 #include <net/netisr2.h>
+#endif
 
 /*
  * Commands used in the SIOCSDRVSPEC ioctl.  Note the lookup of the
diff --git a/sys/net/ipfw/ip_fw2.h b/sys/net/ipfw/ip_fw2.h
index 2a6701a58c..8433c53fbf 100644
--- a/sys/net/ipfw/ip_fw2.h
+++ b/sys/net/ipfw/ip_fw2.h
@@ -23,13 +23,14 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/netinet/ip_fw2.h,v 1.1.2.2 2002/08/16 11:03:11 luigi Exp $
- * $DragonFly: src/sys/net/ipfw/ip_fw2.h,v 1.17 2008/09/26 12:12:36 sephe Exp $
  */
 
 #ifndef _IPFW2_H
 #define _IPFW2_H
 
+#ifdef _KERNEL
 #include <net/netisr2.h>
+#endif
 
 /*
  * The kernel representation of ipfw rules is made of a list of
-- 
2.41.0