diff --git a/sys/conf/options b/sys/conf/options
index 31d603f1e668..05af43c1154e 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -216,7 +216,6 @@ BRIDGE			opt_bdg.h
 MROUTING		opt_mrouting.h
 INET			opt_inet.h
 INET6			opt_inet.h
-IPSEC			opt_ipsec.h
 IPDIVERT
 DUMMYNET		opt_ipdn.h
 IPFILTER_LKM		opt_ipfilter.h
@@ -225,7 +224,6 @@ IPFIREWALL_VERBOSE	opt_ipfw.h
 IPFIREWALL_VERBOSE_LIMIT	opt_ipfw.h
 IPFIREWALL_DEFAULT_TO_ACCEPT	opt_ipfw.h
 IPFIREWALL_FORWARD		opt_ipfw.h
-IPV6FIREWALL		opt_ip6fw.h
 IPSTEALTH
 IPX			opt_ipx.h
 IPXIP			opt_ipx.h
diff --git a/sys/netinet6/icmp6.c b/sys/netinet6/icmp6.c
index e06c6ef10434..425a5d57cc1c 100644
--- a/sys/netinet6/icmp6.c
+++ b/sys/netinet6/icmp6.c
@@ -65,7 +65,6 @@
  */
 
 #include "opt_inet.h"
-#include "opt_ipsec.h"
 #include "opt_key.h"
 
 #include <sys/param.h>
diff --git a/sys/netinet6/in6_pcb.c b/sys/netinet6/in6_pcb.c
index 884410aaafc8..8aee5b300804 100644
--- a/sys/netinet6/in6_pcb.c
+++ b/sys/netinet6/in6_pcb.c
@@ -66,7 +66,6 @@
  */
 
 #include "opt_inet.h"
-#include "opt_ipsec.h"
 #include "opt_key.h"
 
 #include <sys/param.h>
diff --git a/sys/netinet6/in6_proto.c b/sys/netinet6/in6_proto.c
index 8189d010896f..1d1c7a3e2662 100644
--- a/sys/netinet6/in6_proto.c
+++ b/sys/netinet6/in6_proto.c
@@ -65,7 +65,6 @@
  */
 
 #include "opt_inet.h"
-#include "opt_ipsec.h"
 
 #include <sys/param.h>
 #include <sys/socket.h>
diff --git a/sys/netinet6/ip6_forward.c b/sys/netinet6/ip6_forward.c
index 0a4745bd13a8..a50ba6c04521 100644
--- a/sys/netinet6/ip6_forward.c
+++ b/sys/netinet6/ip6_forward.c
@@ -29,9 +29,7 @@
  * $FreeBSD$
  */
 
-#include "opt_ip6fw.h"
 #include "opt_inet.h"
-#include "opt_ipsec.h"
 #include "opt_key.h"
 
 #include <sys/param.h>
diff --git a/sys/netinet6/ip6_input.c b/sys/netinet6/ip6_input.c
index dc12b0f3784d..097d5a0c0fb7 100644
--- a/sys/netinet6/ip6_input.c
+++ b/sys/netinet6/ip6_input.c
@@ -64,9 +64,7 @@
  *	@(#)ip_input.c	8.2 (Berkeley) 1/4/94
  */
 
-#include "opt_ip6fw.h"
 #include "opt_inet.h"
-#include "opt_ipsec.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netinet6/ip6_output.c b/sys/netinet6/ip6_output.c
index c452ad350829..de85510975d0 100644
--- a/sys/netinet6/ip6_output.c
+++ b/sys/netinet6/ip6_output.c
@@ -64,9 +64,7 @@
  *	@(#)ip_output.c	8.3 (Berkeley) 1/21/94
  */
 
-#include "opt_ip6fw.h"
 #include "opt_inet.h"
-#include "opt_ipsec.h"
 #include "opt_key.h"
 
 #include <sys/param.h>
diff --git a/sys/netinet6/mld6.c b/sys/netinet6/mld6.c
index 8c5824a4321c..43cb9b7a36a2 100644
--- a/sys/netinet6/mld6.c
+++ b/sys/netinet6/mld6.c
@@ -69,7 +69,6 @@
  */
 
 #include "opt_inet.h"
-#include "opt_ipsec.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netinet6/nd6_nbr.c b/sys/netinet6/nd6_nbr.c
index 2836d48a383a..de09176c0a7f 100644
--- a/sys/netinet6/nd6_nbr.c
+++ b/sys/netinet6/nd6_nbr.c
@@ -30,7 +30,6 @@
  */
 
 #include "opt_inet.h"
-#include "opt_ipsec.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netinet6/raw_ip6.c b/sys/netinet6/raw_ip6.c
index 5698f1c3a344..c54874e8a3cd 100644
--- a/sys/netinet6/raw_ip6.c
+++ b/sys/netinet6/raw_ip6.c
@@ -65,7 +65,6 @@
  */
 
 #include "opt_inet.h"
-#include "opt_ipsec.h"
 
 #include <stddef.h>