Index: head/sys/geom/geom_ctl.c
===================================================================
--- head/sys/geom/geom_ctl.c
+++ head/sys/geom/geom_ctl.c
@@ -38,21 +38,11 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "opt_geom.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/sysctl.h>
-#include <sys/bio.h>
 #include <sys/conf.h>
-#include <sys/disk.h>
 #include <sys/malloc.h>
-#include <sys/sysctl.h>
 #include <sys/sbuf.h>
-
-#include <sys/lock.h>
-#include <sys/mutex.h>
 
 #include <vm/vm.h>
 #include <vm/vm_extern.h>