diff --git a/sys/modules/ipfw/Makefile b/sys/modules/ipfw/Makefile
index 6f877e4fb6e..cd5a6f791e4 100644
--- a/sys/modules/ipfw/Makefile
+++ b/sys/modules/ipfw/Makefile
@@ -3,9 +3,7 @@
 .PATH: ${.CURDIR}/../../netinet
 
 KMOD=	ipfw
-SRCS=	ip_fw2.c ip_fw_pfil.c \
-	opt_inet.h opt_ipfw.h opt_ipdn.h opt_ipdivert.h opt_ipsec.h \
-	opt_pfil_hooks.h
+SRCS=	ip_fw2.c ip_fw_pfil.c
 
 CFLAGS+= -DIPFIREWALL
 #
@@ -16,7 +14,5 @@ CFLAGS+= -DIPFIREWALL
 #If you want it to pass all packets by default
 #CFLAGS+= -DIPFIREWALL_DEFAULT_TO_ACCEPT
 #
-opt_inet.h:
-	echo "#define INET 1" > opt_inet.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/netinet/ip_fw2.c b/sys/netinet/ip_fw2.c
index 5b9b965ca82..2cb6c857935 100644
--- a/sys/netinet/ip_fw2.c
+++ b/sys/netinet/ip_fw2.c
@@ -32,6 +32,7 @@
  * Implement IP packet firewall (new version)
  */
 
+#if !defined(KLD_MODULE)
 #include "opt_ipfw.h"
 #include "opt_ipdn.h"
 #include "opt_ipdivert.h"
@@ -40,6 +41,7 @@
 #ifndef INET
 #error IPFIREWALL requires INET.
 #endif /* INET */
+#endif
 
 #define IPFW2	1
 #if IPFW2
diff --git a/sys/netinet/ip_fw_pfil.c b/sys/netinet/ip_fw_pfil.c
index e88f41d61fb..0f7d544acc5 100644
--- a/sys/netinet/ip_fw_pfil.c
+++ b/sys/netinet/ip_fw_pfil.c
@@ -26,6 +26,7 @@
  * $FreeBSD$
  */
 
+#if !defined(KLD_MODULE)
 #include "opt_ipfw.h"
 #include "opt_ipdn.h"
 #include "opt_ipdivert.h"
@@ -34,9 +35,10 @@
 #ifndef INET
 #error IPFIREWALL requires INET.
 #endif /* INET */
-#if !defined(KLD_MODULE) && !defined(PFIL_HOOKS)
+#if !defined(PFIL_HOOKS)
 #error IPFIREWALL requires PFIL_HOOKS.
 #endif
+#endif
 
 #include <sys/param.h>
 #include <sys/systm.h>