diff --git a/sys/dev/wtap/if_wtap.c b/sys/dev/wtap/if_wtap.c
index 2b098bcc3dd..dd332c538c8 100644
--- a/sys/dev/wtap/if_wtap.c
+++ b/sys/dev/wtap/if_wtap.c
@@ -33,11 +33,8 @@
  */
 #include "if_wtapvar.h"
 #include <sys/uio.h>    /* uio struct */
-#include <net/if.h>
 #include <net/if_var.h>
-#include <net/vnet.h>
 
-#include <net80211/ieee80211_ratectl.h>
 #include "if_medium.h"
 #include "wtap_hal/hal.h"
 
diff --git a/sys/dev/wtap/if_wtap_module.c b/sys/dev/wtap/if_wtap_module.c
index 52a371fd4b8..6b5f8502bd0 100644
--- a/sys/dev/wtap/if_wtap_module.c
+++ b/sys/dev/wtap/if_wtap_module.c
@@ -28,52 +28,19 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGES.
  */
+
 #include <sys/param.h>
 #include <sys/module.h>
-#include <sys/kernel.h>
-#include <sys/systm.h>
-#include <sys/sysctl.h>
-#include <sys/mbuf.h>
 #include <sys/malloc.h>
-#include <sys/lock.h>
-#include <sys/mutex.h>
-#include <sys/proc.h>
-#include <sys/ucred.h>
 #include <sys/jail.h>
 
-#include <sys/sockio.h>
 #include <sys/socket.h>
-#include <sys/socketvar.h>
-#include <sys/errno.h>
-#include <sys/callout.h>
-#include <sys/endian.h>
-#include <sys/kthread.h>
-#include <sys/taskqueue.h>
-#include <sys/priv.h>
-#include <sys/sysctl.h>
-
-#include <machine/bus.h>
 
 #include <net/if.h>
-#include <net/if_dl.h>
 #include <net/if_media.h>
-#include <net/if_types.h>
-#include <net/if_arp.h>
 #include <net/ethernet.h>
-#include <net/if_llc.h>
-#include <net/vnet.h>
-
-#include <net80211/ieee80211_var.h>
-#include <net80211/ieee80211_regdomain.h>
-
-#include <net/bpf.h>
-
-#include <sys/errno.h>
-#include <sys/conf.h>   /* cdevsw struct */
-#include <sys/uio.h>    /* uio struct */
 
 #include <netinet/in.h>
-#include <netinet/if_ether.h>
 
 #include "if_wtapvar.h"
 #include "if_wtapioctl.h"
diff --git a/sys/dev/wtap/if_wtapioctl.h b/sys/dev/wtap/if_wtapioctl.h
index 6cde392ab7c..05f88a5dcb8 100644
--- a/sys/dev/wtap/if_wtapioctl.h
+++ b/sys/dev/wtap/if_wtapioctl.h
@@ -40,7 +40,7 @@
 #ifndef _DEV_WTAP_WTAPIOCTL_H
 #define _DEV_WTAP_WTAPIOCTL_H
 
-#include <sys/param.h>
+#include <sys/types.h>
 #include <net80211/ieee80211_radiotap.h>
 
 #define	SIOCGATHSTATS	_IOWR('i', 137, struct ifreq)
diff --git a/sys/dev/wtap/if_wtapvar.h b/sys/dev/wtap/if_wtapvar.h
index 4a733636884..0cc0fd487a1 100644
--- a/sys/dev/wtap/if_wtapvar.h
+++ b/sys/dev/wtap/if_wtapvar.h
@@ -34,46 +34,18 @@
 
 #include <sys/param.h>
 #include <sys/conf.h>
-#include <sys/module.h>
-#include <sys/kernel.h>
-#include <sys/systm.h>
-#include <sys/sysctl.h>
-#include <sys/mbuf.h>
 #include <sys/malloc.h>
-#include <sys/lock.h>
-#include <sys/mutex.h>
 
 #include <sys/sockio.h>
 #include <sys/socket.h>
-#include <sys/socketvar.h>
-#include <sys/errno.h>
-#include <sys/callout.h>
-#include <sys/endian.h>
-#include <sys/kthread.h>
-#include <sys/taskqueue.h>
-#include <sys/priv.h>
-#include <sys/sysctl.h>
-
-#include <machine/bus.h>
 
 #include <net/if.h>
-#include <net/if_dl.h>
 #include <net/if_media.h>
-#include <net/if_types.h>
-#include <net/if_arp.h>
 #include <net/ethernet.h>
-#include <net/if_llc.h>
 
 #include <net80211/ieee80211_var.h>
 #include <net80211/ieee80211_regdomain.h>
 
-#include <net/bpf.h>
-
-#include <net/vnet.h>
-
-#include <netinet/in.h>
-#include <netinet/if_ether.h>
-
 #if 0
 #define DWTAP_PRINTF(...) printf(__VA_ARGS__)
 #else
diff --git a/sys/dev/wtap/plugins/visibility.c b/sys/dev/wtap/plugins/visibility.c
index 2ff695fba5f..1e6a9057728 100644
--- a/sys/dev/wtap/plugins/visibility.c
+++ b/sys/dev/wtap/plugins/visibility.c
@@ -28,52 +28,14 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGES.
  */
+
 #include <sys/param.h>
-#include <sys/module.h>
-#include <sys/kernel.h>
-#include <sys/systm.h>
-#include <sys/sysctl.h>
-#include <sys/mbuf.h>
-#include <sys/malloc.h>
-#include <sys/lock.h>
-#include <sys/mutex.h>
-#include <sys/proc.h>
-#include <sys/ucred.h>
 #include <sys/jail.h>
 
-#include <sys/sockio.h>
 #include <sys/socket.h>
-#include <sys/socketvar.h>
-#include <sys/errno.h>
-#include <sys/callout.h>
-#include <sys/endian.h>
-#include <sys/kthread.h>
-#include <sys/taskqueue.h>
-#include <sys/priv.h>
-#include <sys/sysctl.h>
-
-#include <machine/bus.h>
 
 #include <net/if.h>
-#include <net/if_dl.h>
-#include <net/if_media.h>
-#include <net/if_types.h>
-#include <net/if_arp.h>
-#include <net/ethernet.h>
-#include <net/if_llc.h>
-#include <net/vnet.h>
-
-#include <net80211/ieee80211_var.h>
-#include <net80211/ieee80211_regdomain.h>
-
-#include <net/bpf.h>
-
-#include <sys/errno.h>
-#include <sys/conf.h>   /* cdevsw struct */
-#include <sys/uio.h>    /* uio struct */
-
 #include <netinet/in.h>
-#include <netinet/if_ether.h>
 
 #include "visibility.h"
 
diff --git a/sys/dev/wtap/plugins/visibility_ioctl.h b/sys/dev/wtap/plugins/visibility_ioctl.h
index b9c43984b4f..a5c09e6af22 100644
--- a/sys/dev/wtap/plugins/visibility_ioctl.h
+++ b/sys/dev/wtap/plugins/visibility_ioctl.h
@@ -36,8 +36,6 @@
 #ifndef _VISIBILITY_IOCTL_H
 #define _VISIBILITY_IOCTL_H
 
-#include <sys/param.h>
-
 struct link {
       int	op; //0 remove, 1 link
       int 	id1;