100 files changed, 0 insertions, 108 deletions

diff --git a/sys/coda/coda_psdev.c b/sys/coda/coda_psdev.c
index 4cd559da1558..7d31eb8438c0 100644
--- a/sys/coda/coda_psdev.c
+++ b/sys/coda/coda_psdev.c
@@ -65,7 +65,6 @@ extern int coda_nc_initialized;    /* Set if cache has been initialized */
 #include <sys/file.h>
 #include <sys/ioccom.h>
 #include <sys/poll.h>
-#include <sys/conf.h>
 
 #include <coda/coda.h>
 #include <coda/cnode.h>
diff --git a/sys/compat/svr4/svr4_fcntl.c b/sys/compat/svr4/svr4_fcntl.c
index abff2da2c5b8..51b3f6a7792c 100644
--- a/sys/compat/svr4/svr4_fcntl.c
+++ b/sys/compat/svr4/svr4_fcntl.c
@@ -40,7 +40,6 @@
 /*#include <sys/ioctl.h>*/
 #include <sys/kernel.h>
 #include <sys/mount.h>
-#include <sys/malloc.h>
 #include <sys/vnode.h>
 #include <sys/unistd.h>
 
diff --git a/sys/crypto/blowfish/bf_cbc_m.c b/sys/crypto/blowfish/bf_cbc_m.c
index 518023398176..20df977ce78a 100644
--- a/sys/crypto/blowfish/bf_cbc_m.c
+++ b/sys/crypto/blowfish/bf_cbc_m.c
@@ -63,7 +63,6 @@
  */
 
 #include <sys/param.h>
-#include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/systm.h>
 
diff --git a/sys/dev/aic/aic.c b/sys/dev/aic/aic.c
index e6d6bec0f99d..b95a8d8f1907 100644
--- a/sys/dev/aic/aic.c
+++ b/sys/dev/aic/aic.c
@@ -28,7 +28,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/malloc.h>
 #include <sys/kernel.h>
 #include <sys/sysctl.h>
 #include <sys/bus.h>
diff --git a/sys/dev/amd/amd.c b/sys/dev/amd/amd.c
index 3519093bd73b..808afa70d99f 100644
--- a/sys/dev/amd/amd.c
+++ b/sys/dev/amd/amd.c
@@ -53,7 +53,6 @@
 #include <sys/param.h>
 
 #include <sys/systm.h>
-#include <sys/malloc.h>
 #include <sys/queue.h>
 #include <sys/kernel.h>
 
diff --git a/sys/dev/amr/amr_disk.c b/sys/dev/amr/amr_disk.c
index 3fd566b5d9a7..9d6be1d15c4c 100644
--- a/sys/dev/amr/amr_disk.c
+++ b/sys/dev/amr/amr_disk.c
@@ -33,7 +33,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/malloc.h>
 #include <sys/kernel.h>
 
 #include <sys/buf.h>
diff --git a/sys/dev/amr/amr_pci.c b/sys/dev/amr/amr_pci.c
index 382a4a8d3145..a144fcc96078 100644
--- a/sys/dev/amr/amr_pci.c
+++ b/sys/dev/amr/amr_pci.c
@@ -28,7 +28,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/malloc.h>
 #include <sys/kernel.h>
 
 #include <sys/bus.h>
diff --git a/sys/dev/an/if_an.c b/sys/dev/an/if_an.c
index 0364058507c0..dc63b938f332 100644
--- a/sys/dev/an/if_an.c
+++ b/sys/dev/an/if_an.c
@@ -94,7 +94,6 @@
 #include <sys/systm.h>
 #include <sys/sockio.h>
 #include <sys/mbuf.h>
-#include <sys/malloc.h>
 #include <sys/kernel.h>
 #include <sys/socket.h>
 #ifdef ANCACHE
diff --git a/sys/dev/an/if_an_isa.c b/sys/dev/an/if_an_isa.c
index ae79a3ea1bb1..e7984373fd86 100644
--- a/sys/dev/an/if_an_isa.c
+++ b/sys/dev/an/if_an_isa.c
@@ -49,7 +49,6 @@
 #include <sys/systm.h>
 #include <sys/sockio.h>
 #include <sys/mbuf.h>
-#include <sys/malloc.h>
 #include <sys/kernel.h>
 #include <sys/socket.h>
 
diff --git a/sys/dev/an/if_an_pci.c b/sys/dev/an/if_an_pci.c
index c114afb91dda..4b455e0cc8f4 100644
--- a/sys/dev/an/if_an_pci.c
+++ b/sys/dev/an/if_an_pci.c
@@ -62,7 +62,6 @@
 #include <sys/systm.h>
 #include <sys/sockio.h>
 #include <sys/mbuf.h>
-#include <sys/malloc.h>
 #include <sys/kernel.h>
 #include <sys/socket.h>
 
diff --git a/sys/dev/atkbdc/psm.c b/sys/dev/atkbdc/psm.c
index bbcd5f185baf..bcc8a870766e 100644
--- a/sys/dev/atkbdc/psm.c
+++ b/sys/dev/atkbdc/psm.c
@@ -71,7 +71,6 @@
 #include <sys/conf.h>
 #include <sys/poll.h>
 #include <sys/syslog.h>
-#include <sys/malloc.h>
 #include <machine/bus.h>
 #include <sys/rman.h>
 #include <sys/select.h>
diff --git a/sys/dev/bktr/bktr_core.c b/sys/dev/bktr/bktr_core.c
index d338d09b588a..ae8ac66a807e 100644
--- a/sys/dev/bktr/bktr_core.c
+++ b/sys/dev/bktr/bktr_core.c
@@ -110,7 +110,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/conf.h>
 #include <sys/kernel.h>
 #include <sys/signalvar.h>
 #include <sys/vnode.h>
diff --git a/sys/dev/bktr/bktr_i2c.c b/sys/dev/bktr/bktr_i2c.c
index 8458b223f29e..e21ccf319852 100644
--- a/sys/dev/bktr/bktr_i2c.c
+++ b/sys/dev/bktr/bktr_i2c.c
@@ -40,9 +40,7 @@
 #include <sys/systm.h>
 #include <sys/module.h>
 #include <sys/bus.h>
-#include <sys/conf.h>
 #include <sys/uio.h>
-#include <sys/malloc.h>
 #include <sys/select.h>
 
 #include <machine/clock.h>
diff --git a/sys/dev/dc/dcphy.c b/sys/dev/dc/dcphy.c
index 8576d84f8db5..a39adc50fbd9 100644
--- a/sys/dev/dc/dcphy.c
+++ b/sys/dev/dc/dcphy.c
@@ -44,7 +44,6 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
-#include <sys/malloc.h>
 #include <sys/socket.h>
 #include <sys/errno.h>
 #include <sys/module.h>
diff --git a/sys/dev/dc/pnphy.c b/sys/dev/dc/pnphy.c
index 0f8498ef6ff6..583cce92404e 100644
--- a/sys/dev/dc/pnphy.c
+++ b/sys/dev/dc/pnphy.c
@@ -42,7 +42,6 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
-#include <sys/malloc.h>
 #include <sys/socket.h>
 #include <sys/errno.h>
 #include <sys/module.h>
diff --git a/sys/dev/ed/if_ed.c b/sys/dev/ed/if_ed.c
index a5bf1a5c08f5..6a385537e49c 100644
--- a/sys/dev/ed/if_ed.c
+++ b/sys/dev/ed/if_ed.c
@@ -41,7 +41,6 @@
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/sockio.h>
-#include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <sys/syslog.h>
diff --git a/sys/dev/ep/if_ep.c b/sys/dev/ep/if_ep.c
index 35a61983616c..7b4479be174d 100644
--- a/sys/dev/ep/if_ep.c
+++ b/sys/dev/ep/if_ep.c
@@ -64,7 +64,6 @@
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
-#include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <sys/sockio.h>
diff --git a/sys/dev/ex/if_ex.c b/sys/dev/ex/if_ex.c
index bf2624d60485..28f888a927ee 100644
--- a/sys/dev/ex/if_ex.c
+++ b/sys/dev/ex/if_ex.c
@@ -43,7 +43,6 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
-#include <sys/conf.h>
 #include <sys/sockio.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
diff --git a/sys/dev/ida/ida_disk.c b/sys/dev/ida/ida_disk.c
index 6f81c0de6001..1b70bfbb5c74 100644
--- a/sys/dev/ida/ida_disk.c
+++ b/sys/dev/ida/ida_disk.c
@@ -32,7 +32,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/malloc.h>
 #include <sys/kernel.h>
 
 #include <sys/buf.h>
diff --git a/sys/dev/ida/ida_pci.c b/sys/dev/ida/ida_pci.c
index d43a1578aebc..74229cf7a67a 100644
--- a/sys/dev/ida/ida_pci.c
+++ b/sys/dev/ida/ida_pci.c
@@ -28,7 +28,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/malloc.h>
 #include <sys/kernel.h>
 
 #include <sys/buf.h>
diff --git a/sys/dev/ie/if_ie.c b/sys/dev/ie/if_ie.c
index 0b6736f441cb..09e2d9863fda 100644
--- a/sys/dev/ie/if_ie.c
+++ b/sys/dev/ie/if_ie.c
@@ -115,7 +115,6 @@ iomem and and with 0xffff.
 #include <sys/eventhandler.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
-#include <sys/conf.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <sys/sockio.h>
diff --git a/sys/dev/iicbus/iic.c b/sys/dev/iicbus/iic.c
index ea04060a76d6..0a6831b3c14f 100644
--- a/sys/dev/iicbus/iic.c
+++ b/sys/dev/iicbus/iic.c
@@ -33,7 +33,6 @@
 #include <sys/bus.h>
 #include <sys/conf.h>
 #include <sys/uio.h>
-#include <sys/malloc.h>
 #include <sys/fcntl.h>
 
 #include <machine/clock.h>
diff --git a/sys/dev/iicbus/iicbb.c b/sys/dev/iicbus/iicbb.c
index ee9bf5bcf4cf..6dbdc158afea 100644
--- a/sys/dev/iicbus/iicbb.c
+++ b/sys/dev/iicbus/iicbb.c
@@ -49,9 +49,7 @@
 #include <sys/systm.h>
 #include <sys/module.h>
 #include <sys/bus.h>
-#include <sys/conf.h>
 #include <sys/uio.h>
-#include <sys/malloc.h>
 
 #include <machine/clock.h>
 
diff --git a/sys/dev/iicbus/iiconf.c b/sys/dev/iicbus/iiconf.c
index 1fc07bf3b3f7..f8ef5e1794e7 100644
--- a/sys/dev/iicbus/iiconf.c
+++ b/sys/dev/iicbus/iiconf.c
@@ -29,7 +29,6 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
-#include <sys/malloc.h>
 #include <sys/module.h>
 #include <sys/bus.h>
 
diff --git a/sys/dev/iicbus/iicsmb.c b/sys/dev/iicbus/iicsmb.c
index d709f8b190ba..cd2595ef4832 100644
--- a/sys/dev/iicbus/iicsmb.c
+++ b/sys/dev/iicbus/iicsmb.c
@@ -50,9 +50,7 @@
 #include <sys/systm.h>
 #include <sys/module.h>
 #include <sys/bus.h>
-#include <sys/conf.h>
 #include <sys/uio.h>
-#include <sys/malloc.h>
 
 #include <machine/clock.h>
 
diff --git a/sys/dev/isp/isp_freebsd.c b/sys/dev/isp/isp_freebsd.c
index ac6a4b77fb05..54b383441250 100644
--- a/sys/dev/isp/isp_freebsd.c
+++ b/sys/dev/isp/isp_freebsd.c
@@ -33,7 +33,6 @@
  * SUCH DAMAGE.
  */
 #include <dev/isp/isp_freebsd.h>
-#include <sys/malloc.h>
 
 static void isp_cam_async(void *, u_int32_t, struct cam_path *, void *);
 static void isp_poll(struct cam_sim *);
diff --git a/sys/dev/lnc/if_lnc.c b/sys/dev/lnc/if_lnc.c
index baa9aca642c6..42e3c029f33b 100644
--- a/sys/dev/lnc/if_lnc.c
+++ b/sys/dev/lnc/if_lnc.c
@@ -68,7 +68,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/conf.h>
 #include <sys/sockio.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
diff --git a/sys/dev/mii/amphy.c b/sys/dev/mii/amphy.c
index 91eb7076ea0a..82dbb3625896 100644
--- a/sys/dev/mii/amphy.c
+++ b/sys/dev/mii/amphy.c
@@ -41,7 +41,6 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
-#include <sys/malloc.h>
 #include <sys/socket.h>
 #include <sys/bus.h>
 
diff --git a/sys/dev/mii/dcphy.c b/sys/dev/mii/dcphy.c
index 8576d84f8db5..a39adc50fbd9 100644
--- a/sys/dev/mii/dcphy.c
+++ b/sys/dev/mii/dcphy.c
@@ -44,7 +44,6 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
-#include <sys/malloc.h>
 #include <sys/socket.h>
 #include <sys/errno.h>
 #include <sys/module.h>
diff --git a/sys/dev/mii/exphy.c b/sys/dev/mii/exphy.c
index 30b6b6310d50..f34f92a4645c 100644
--- a/sys/dev/mii/exphy.c
+++ b/sys/dev/mii/exphy.c
@@ -73,7 +73,6 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
-#include <sys/malloc.h>
 #include <sys/socket.h>
 #include <sys/module.h>
 #include <sys/bus.h>
diff --git a/sys/dev/mii/mlphy.c b/sys/dev/mii/mlphy.c
index 91e0ffb28bde..13ce5ff5fdfa 100644
--- a/sys/dev/mii/mlphy.c
+++ b/sys/dev/mii/mlphy.c
@@ -50,7 +50,6 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
-#include <sys/malloc.h>
 #include <sys/socket.h>
 #include <sys/module.h>
 #include <sys/bus.h>
diff --git a/sys/dev/mii/nsphy.c b/sys/dev/mii/nsphy.c
index 6591979117c9..8de91c711c34 100644
--- a/sys/dev/mii/nsphy.c
+++ b/sys/dev/mii/nsphy.c
@@ -74,7 +74,6 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
-#include <sys/malloc.h>
 #include <sys/socket.h>
 #include <sys/errno.h>
 #include <sys/module.h>
diff --git a/sys/dev/mii/pnphy.c b/sys/dev/mii/pnphy.c
index 0f8498ef6ff6..583cce92404e 100644
--- a/sys/dev/mii/pnphy.c
+++ b/sys/dev/mii/pnphy.c
@@ -42,7 +42,6 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
-#include <sys/malloc.h>
 #include <sys/socket.h>
 #include <sys/errno.h>
 #include <sys/module.h>
diff --git a/sys/dev/mii/rlphy.c b/sys/dev/mii/rlphy.c
index 956160d23516..15e7ee1a160b 100644
--- a/sys/dev/mii/rlphy.c
+++ b/sys/dev/mii/rlphy.c
@@ -39,7 +39,6 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
-#include <sys/malloc.h>
 #include <sys/socket.h>
 #include <sys/bus.h>
 
diff --git a/sys/dev/mii/ukphy.c b/sys/dev/mii/ukphy.c
index cb22eab1cefe..a17651b2b00a 100644
--- a/sys/dev/mii/ukphy.c
+++ b/sys/dev/mii/ukphy.c
@@ -73,7 +73,6 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
-#include <sys/malloc.h>
 #include <sys/socket.h>
 #include <sys/errno.h>
 #include <sys/module.h>
diff --git a/sys/dev/mii/ukphy_subr.c b/sys/dev/mii/ukphy_subr.c
index d39ef4651b93..79ac2e585954 100644
--- a/sys/dev/mii/ukphy_subr.c
+++ b/sys/dev/mii/ukphy_subr.c
@@ -44,7 +44,6 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
-#include <sys/malloc.h>
 #include <sys/socket.h>
 #include <sys/module.h>
 #include <sys/bus.h>
diff --git a/sys/dev/mlx/mlx_disk.c b/sys/dev/mlx/mlx_disk.c
index 50f20c5d78c5..15af6b7481fe 100644
--- a/sys/dev/mlx/mlx_disk.c
+++ b/sys/dev/mlx/mlx_disk.c
@@ -33,7 +33,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/malloc.h>
 #include <sys/kernel.h>
 
 #include <sys/buf.h>
diff --git a/sys/dev/mlx/mlx_pci.c b/sys/dev/mlx/mlx_pci.c
index 004c9aa6c7c9..6fe9a562126a 100644
--- a/sys/dev/mlx/mlx_pci.c
+++ b/sys/dev/mlx/mlx_pci.c
@@ -28,7 +28,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/malloc.h>
 #include <sys/kernel.h>
 
 #include <sys/bus.h>
diff --git a/sys/dev/pcf/pcf.c b/sys/dev/pcf/pcf.c
index e37823e400c3..2429b3f6eaf2 100644
--- a/sys/dev/pcf/pcf.c
+++ b/sys/dev/pcf/pcf.c
@@ -31,7 +31,6 @@
 #include <sys/kernel.h>
 #include <sys/module.h>
 #include <sys/bus.h>
-#include <sys/malloc.h>
 
 #include <machine/clock.h>
 #include <machine/bus.h>
diff --git a/sys/dev/ppbus/if_plip.c b/sys/dev/ppbus/if_plip.c
index 7a5f8fc5eb4f..2c7940fc02a0 100644
--- a/sys/dev/ppbus/if_plip.c
+++ b/sys/dev/ppbus/if_plip.c
@@ -84,7 +84,6 @@
 #include <sys/systm.h>
 #include <sys/module.h>
 #include <sys/bus.h>
-#include <sys/conf.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <sys/sockio.h>
diff --git a/sys/dev/ppbus/lpbb.c b/sys/dev/ppbus/lpbb.c
index 72e3f76a7c70..9132b478997b 100644
--- a/sys/dev/ppbus/lpbb.c
+++ b/sys/dev/ppbus/lpbb.c
@@ -38,9 +38,7 @@
 #include <sys/systm.h>
 #include <sys/module.h>
 #include <sys/bus.h>
-#include <sys/conf.h>
 #include <sys/uio.h>
-#include <sys/malloc.h>
 
 #include <machine/clock.h>
 
diff --git a/sys/dev/ppbus/pcfclock.c b/sys/dev/ppbus/pcfclock.c
index 9101638d83f0..c82e5dc53f05 100644
--- a/sys/dev/ppbus/pcfclock.c
+++ b/sys/dev/ppbus/pcfclock.c
@@ -32,7 +32,6 @@
 #include <sys/bus.h>
 #include <sys/sockio.h>
 #include <sys/mbuf.h>
-#include <sys/malloc.h>
 #include <sys/kernel.h>
 #include <sys/conf.h>
 #include <sys/fcntl.h>
diff --git a/sys/dev/ppbus/pps.c b/sys/dev/ppbus/pps.c
index f89c560a1ea5..a9a56fe27859 100644
--- a/sys/dev/ppbus/pps.c
+++ b/sys/dev/ppbus/pps.c
@@ -23,7 +23,6 @@
 #include <sys/conf.h>
 #include <sys/timetc.h>
 #include <sys/timepps.h>
-#include <sys/malloc.h>
 #include <machine/bus.h>
 #include <machine/resource.h>
 #include <sys/rman.h>
diff --git a/sys/dev/smbus/smb.c b/sys/dev/smbus/smb.c
index fc0f21ece008..67341ae4f891 100644
--- a/sys/dev/smbus/smb.c
+++ b/sys/dev/smbus/smb.c
@@ -33,7 +33,6 @@
 #include <sys/bus.h>
 #include <sys/conf.h>
 #include <sys/uio.h>
-#include <sys/malloc.h>
 #include <sys/fcntl.h>
 
 #include <machine/clock.h>
diff --git a/sys/dev/smbus/smbconf.c b/sys/dev/smbus/smbconf.c
index 1afb7e9f2219..5e242aa7e912 100644
--- a/sys/dev/smbus/smbconf.c
+++ b/sys/dev/smbus/smbconf.c
@@ -29,7 +29,6 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
-#include <sys/malloc.h>
 #include <sys/module.h>
 #include <sys/bus.h>
 
diff --git a/sys/dev/sn/if_sn.c b/sys/dev/sn/if_sn.c
index cbc18d921c6f..15e00b90c0fe 100644
--- a/sys/dev/sn/if_sn.c
+++ b/sys/dev/sn/if_sn.c
@@ -86,7 +86,6 @@
 #include <sys/kernel.h>
 #include <sys/errno.h>
 #include <sys/sockio.h>
-#include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <sys/syslog.h>
diff --git a/sys/dev/usb/umass.c b/sys/dev/usb/umass.c
index 869994ce14e6..4a0256d9e973 100644
--- a/sys/dev/usb/umass.c
+++ b/sys/dev/usb/umass.c
@@ -98,7 +98,6 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
-#include <sys/conf.h>
 #include <sys/module.h>
 #include <sys/bus.h>
 #include <machine/clock.h>
diff --git a/sys/dev/usb/umodem.c b/sys/dev/usb/umodem.c
index 643ffb01a45c..61cb24d7fb55 100644
--- a/sys/dev/usb/umodem.c
+++ b/sys/dev/usb/umodem.c
@@ -49,7 +49,6 @@
 #include <sys/module.h>
 #include <sys/bus.h>
 #include <sys/ioccom.h>
-#include <sys/conf.h>
 #endif
 #include <sys/tty.h>
 #include <sys/file.h>
diff --git a/sys/dev/usb/usbdi.c b/sys/dev/usb/usbdi.c
index 1c7144fac76e..94fbcf772391 100644
--- a/sys/dev/usb/usbdi.c
+++ b/sys/dev/usb/usbdi.c
@@ -46,7 +46,6 @@
 #elif defined(__FreeBSD__)
 #include <sys/module.h>
 #include <sys/bus.h>
-#include <sys/conf.h>
 #include "usb_if.h"
 #if defined(DIAGNOSTIC) && defined(__i386__)
 #include <machine/cpu.h>
diff --git a/sys/dev/wi/if_wi.c b/sys/dev/wi/if_wi.c
index 0cb88a464ed8..eb8053bee4b9 100644
--- a/sys/dev/wi/if_wi.c
+++ b/sys/dev/wi/if_wi.c
@@ -72,7 +72,6 @@
 #include <sys/systm.h>
 #include <sys/sockio.h>
 #include <sys/mbuf.h>
-#include <sys/malloc.h>
 #include <sys/kernel.h>
 #include <sys/socket.h>
 #include <sys/module.h>
diff --git a/sys/dev/xe/if_xe.c b/sys/dev/xe/if_xe.c
index 608f8109514b..00d75c6931dd 100644
--- a/sys/dev/xe/if_xe.c
+++ b/sys/dev/xe/if_xe.c
@@ -120,14 +120,12 @@
 #include <sys/cdefs.h>
 #include <sys/errno.h>
 #include <sys/kernel.h>
-#include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/select.h>
 #include <sys/socket.h>
 #include <sys/sockio.h>
 #include <sys/systm.h>
 #include <sys/uio.h>
-#include <sys/conf.h>
 
 #include <sys/module.h>
 #include <sys/bus.h>
diff --git a/sys/fs/coda/coda_psdev.c b/sys/fs/coda/coda_psdev.c
index 4cd559da1558..7d31eb8438c0 100644
--- a/sys/fs/coda/coda_psdev.c
+++ b/sys/fs/coda/coda_psdev.c
@@ -65,7 +65,6 @@ extern int coda_nc_initialized;    /* Set if cache has been initialized */
 #include <sys/file.h>
 #include <sys/ioccom.h>
 #include <sys/poll.h>
-#include <sys/conf.h>
 
 #include <coda/coda.h>
 #include <coda/cnode.h>
diff --git a/sys/fs/ntfs/ntfs_compr.c b/sys/fs/ntfs/ntfs_compr.c
index bdaac0a251ce..5a8e9f44beb9 100644
--- a/sys/fs/ntfs/ntfs_compr.c
+++ b/sys/fs/ntfs/ntfs_compr.c
@@ -36,7 +36,6 @@
 #include <sys/vnode.h>
 #include <sys/mount.h>
 #include <sys/file.h>
-#include <sys/malloc.h>
 
 #if defined(__NetBSD__)
 #include <miscfs/specfs/specdev.h>
diff --git a/sys/gnu/ext2fs/ext2_bmap.c b/sys/gnu/ext2fs/ext2_bmap.c
index 32ba53c5e516..d56e00590ea7 100644
--- a/sys/gnu/ext2fs/ext2_bmap.c
+++ b/sys/gnu/ext2fs/ext2_bmap.c
@@ -46,7 +46,6 @@
 #include <sys/vnode.h>
 #include <sys/mount.h>
 #include <sys/resourcevar.h>
-#include <sys/conf.h>
 
 #include <ufs/ufs/extattr.h>
 #include <ufs/ufs/quota.h>
diff --git a/sys/gnu/fs/ext2fs/ext2_bmap.c b/sys/gnu/fs/ext2fs/ext2_bmap.c
index 32ba53c5e516..d56e00590ea7 100644
--- a/sys/gnu/fs/ext2fs/ext2_bmap.c
+++ b/sys/gnu/fs/ext2fs/ext2_bmap.c
@@ -46,7 +46,6 @@
 #include <sys/vnode.h>
 #include <sys/mount.h>
 #include <sys/resourcevar.h>
-#include <sys/conf.h>
 
 #include <ufs/ufs/extattr.h>
 #include <ufs/ufs/quota.h>
diff --git a/sys/i386/isa/if_le.c b/sys/i386/isa/if_le.c
index ff910dda1bab..20501962bd10 100644
--- a/sys/i386/isa/if_le.c
+++ b/sys/i386/isa/if_le.c
@@ -41,7 +41,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/conf.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <sys/sockio.h>
diff --git a/sys/i386/isa/if_lnc.c b/sys/i386/isa/if_lnc.c
index baa9aca642c6..42e3c029f33b 100644
--- a/sys/i386/isa/if_lnc.c
+++ b/sys/i386/isa/if_lnc.c
@@ -68,7 +68,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/conf.h>
 #include <sys/sockio.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
diff --git a/sys/i386/isa/if_rdp.c b/sys/i386/isa/if_rdp.c
index 10303a32a71c..5c7d761dea09 100644
--- a/sys/i386/isa/if_rdp.c
+++ b/sys/i386/isa/if_rdp.c
@@ -65,9 +65,7 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/conf.h>
 #include <sys/sockio.h>
-#include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <sys/syslog.h>
diff --git a/sys/i386/isa/if_wi.c b/sys/i386/isa/if_wi.c
index 0cb88a464ed8..eb8053bee4b9 100644
--- a/sys/i386/isa/if_wi.c
+++ b/sys/i386/isa/if_wi.c
@@ -72,7 +72,6 @@
 #include <sys/systm.h>
 #include <sys/sockio.h>
 #include <sys/mbuf.h>
-#include <sys/malloc.h>
 #include <sys/kernel.h>
 #include <sys/socket.h>
 #include <sys/module.h>
diff --git a/sys/i386/isa/pcf.c b/sys/i386/isa/pcf.c
index e37823e400c3..2429b3f6eaf2 100644
--- a/sys/i386/isa/pcf.c
+++ b/sys/i386/isa/pcf.c
@@ -31,7 +31,6 @@
 #include <sys/kernel.h>
 #include <sys/module.h>
 #include <sys/bus.h>
-#include <sys/malloc.h>
 
 #include <machine/clock.h>
 #include <machine/bus.h>
diff --git a/sys/isa/psm.c b/sys/isa/psm.c
index bbcd5f185baf..bcc8a870766e 100644
--- a/sys/isa/psm.c
+++ b/sys/isa/psm.c
@@ -71,7 +71,6 @@
 #include <sys/conf.h>
 #include <sys/poll.h>
 #include <sys/syslog.h>
-#include <sys/malloc.h>
 #include <machine/bus.h>
 #include <sys/rman.h>
 #include <sys/select.h>
diff --git a/sys/kern/imgact_aout.c b/sys/kern/imgact_aout.c
index da640ad4a285..26de83da8986 100644
--- a/sys/kern/imgact_aout.c
+++ b/sys/kern/imgact_aout.c
@@ -33,7 +33,6 @@
 #include <sys/imgact.h>
 #include <sys/imgact_aout.h>
 #include <sys/kernel.h>
-#include <sys/malloc.h>
 #include <sys/namei.h>
 #include <sys/pioctl.h>
 #include <sys/proc.h>
diff --git a/sys/kern/kern_clock.c b/sys/kern/kern_clock.c
index dc1ea6df4b26..791100bde396 100644
--- a/sys/kern/kern_clock.c
+++ b/sys/kern/kern_clock.c
@@ -47,7 +47,6 @@
 #include <sys/callout.h>
 #include <sys/kernel.h>
 #include <sys/proc.h>
-#include <sys/malloc.h>
 #include <sys/resourcevar.h>
 #include <sys/signalvar.h>
 #include <sys/timetc.h>
diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c
index a86c5b88740b..5625a592dbdb 100644
--- a/sys/kern/vfs_bio.c
+++ b/sys/kern/vfs_bio.c
@@ -30,7 +30,6 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/buf.h>
-#include <sys/conf.h>
 #include <sys/eventhandler.h>
 #include <sys/lock.h>
 #include <sys/malloc.h>
diff --git a/sys/miscfs/linprocfs/linprocfs_misc.c b/sys/miscfs/linprocfs/linprocfs_misc.c
index 7603c70e6d84..ab94415706b3 100644
--- a/sys/miscfs/linprocfs/linprocfs_misc.c
+++ b/sys/miscfs/linprocfs/linprocfs_misc.c
@@ -41,7 +41,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/malloc.h>
 #include <sys/proc.h>
 #include <sys/jail.h>
 #include <sys/vnode.h>
diff --git a/sys/net/if_atmsubr.c b/sys/net/if_atmsubr.c
index 0a357a6f6151..d1f62d9c60a2 100644
--- a/sys/net/if_atmsubr.c
+++ b/sys/net/if_atmsubr.c
@@ -47,7 +47,6 @@
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <sys/sockio.h>
-#include <sys/malloc.h>
 #include <sys/errno.h>
 
 #include <net/if.h>
diff --git a/sys/net/if_iso88025subr.c b/sys/net/if_iso88025subr.c
index 5d7b9028d9db..d6a0fd5d81db 100644
--- a/sys/net/if_iso88025subr.c
+++ b/sys/net/if_iso88025subr.c
@@ -45,7 +45,6 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
-#include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <sys/sockio.h> 
diff --git a/sys/netgraph/ng_mppc.c b/sys/netgraph/ng_mppc.c
index 7a20227d2915..af2030ab5016 100644
--- a/sys/netgraph/ng_mppc.c
+++ b/sys/netgraph/ng_mppc.c
@@ -50,7 +50,6 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
-#include <sys/conf.h>
 #include <sys/mbuf.h>
 #include <sys/malloc.h>
 #include <sys/protosw.h>
diff --git a/sys/netgraph/ng_pptpgre.c b/sys/netgraph/ng_pptpgre.c
index 3b4c6aeeb7bc..1bc9c1d10bcc 100644
--- a/sys/netgraph/ng_pptpgre.c
+++ b/sys/netgraph/ng_pptpgre.c
@@ -57,7 +57,6 @@
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/time.h>
-#include <sys/conf.h>
 #include <sys/mbuf.h>
 #include <sys/malloc.h>
 #include <sys/errno.h>
diff --git a/sys/netinet/ip_ecn.c b/sys/netinet/ip_ecn.c
index 7a1657f0c6d8..aeb588e05fe3 100644
--- a/sys/netinet/ip_ecn.c
+++ b/sys/netinet/ip_ecn.c
@@ -39,7 +39,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/errno.h>
 
diff --git a/sys/netinet6/ah_output.c b/sys/netinet6/ah_output.c
index 0cb327900a40..3c3602c4c826 100644
--- a/sys/netinet6/ah_output.c
+++ b/sys/netinet6/ah_output.c
@@ -40,7 +40,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/domain.h>
 #include <sys/protosw.h>
diff --git a/sys/netinet6/dest6.c b/sys/netinet6/dest6.c
index 403ed5de838e..fa61b54890ec 100644
--- a/sys/netinet6/dest6.c
+++ b/sys/netinet6/dest6.c
@@ -31,7 +31,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/domain.h>
 #include <sys/protosw.h>
diff --git a/sys/netinet6/esp_core.c b/sys/netinet6/esp_core.c
index 8eb007e7c674..dc559e125661 100644
--- a/sys/netinet6/esp_core.c
+++ b/sys/netinet6/esp_core.c
@@ -34,7 +34,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/domain.h>
 #include <sys/protosw.h>
diff --git a/sys/netinet6/esp_input.c b/sys/netinet6/esp_input.c
index d09ba274676f..2ff12adb53c3 100644
--- a/sys/netinet6/esp_input.c
+++ b/sys/netinet6/esp_input.c
@@ -39,7 +39,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/domain.h>
 #include <sys/protosw.h>
diff --git a/sys/netinet6/esp_output.c b/sys/netinet6/esp_output.c
index 2386bfd148f2..4509b9a33025 100644
--- a/sys/netinet6/esp_output.c
+++ b/sys/netinet6/esp_output.c
@@ -39,7 +39,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/domain.h>
 #include <sys/protosw.h>
diff --git a/sys/netinet6/icmp6.c b/sys/netinet6/icmp6.c
index 47202965bf4d..05edc914afac 100644
--- a/sys/netinet6/icmp6.c
+++ b/sys/netinet6/icmp6.c
@@ -68,7 +68,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/protosw.h>
 #include <sys/socket.h>
diff --git a/sys/netinet6/ip6_forward.c b/sys/netinet6/ip6_forward.c
index 2eaf6f5b869d..d1e138b73bd5 100644
--- a/sys/netinet6/ip6_forward.c
+++ b/sys/netinet6/ip6_forward.c
@@ -33,7 +33,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/domain.h>
 #include <sys/protosw.h>
diff --git a/sys/netinet6/ip6_input.c b/sys/netinet6/ip6_input.c
index ca13eca54438..449a4f3afe10 100644
--- a/sys/netinet6/ip6_input.c
+++ b/sys/netinet6/ip6_input.c
@@ -69,7 +69,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/domain.h>
 #include <sys/protosw.h>
diff --git a/sys/netinet6/udp6_usrreq.c b/sys/netinet6/udp6_usrreq.c
index 0ba04abc14a0..abcac276ece0 100644
--- a/sys/netinet6/udp6_usrreq.c
+++ b/sys/netinet6/udp6_usrreq.c
@@ -67,7 +67,6 @@
 
 #include <sys/param.h>
 #include <sys/kernel.h>
-#include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/protosw.h>
 #include <sys/socket.h>
diff --git a/sys/nfs/nfs_common.c b/sys/nfs/nfs_common.c
index 2e197211f72a..dbbb4dd90633 100644
--- a/sys/nfs/nfs_common.c
+++ b/sys/nfs/nfs_common.c
@@ -56,7 +56,6 @@
 #include <sys/malloc.h>
 #include <sys/sysent.h>
 #include <sys/syscall.h>
-#include <sys/conf.h>
 
 #include <vm/vm.h>
 #include <vm/vm_object.h>
diff --git a/sys/nfs/nfs_subs.c b/sys/nfs/nfs_subs.c
index 2e197211f72a..dbbb4dd90633 100644
--- a/sys/nfs/nfs_subs.c
+++ b/sys/nfs/nfs_subs.c
@@ -56,7 +56,6 @@
 #include <sys/malloc.h>
 #include <sys/sysent.h>
 #include <sys/syscall.h>
-#include <sys/conf.h>
 
 #include <vm/vm.h>
 #include <vm/vm_object.h>
diff --git a/sys/nfs/nfs_vnops.c b/sys/nfs/nfs_vnops.c
index cae22655bf76..08437e400f11 100644
--- a/sys/nfs/nfs_vnops.c
+++ b/sys/nfs/nfs_vnops.c
@@ -61,7 +61,6 @@
 #include <sys/lockf.h>
 #include <sys/stat.h>
 #include <sys/sysctl.h>
-#include <sys/conf.h>
 
 #include <vm/vm.h>
 #include <vm/vm_extern.h>
diff --git a/sys/nfsclient/nfs_subs.c b/sys/nfsclient/nfs_subs.c
index 2e197211f72a..dbbb4dd90633 100644
--- a/sys/nfsclient/nfs_subs.c
+++ b/sys/nfsclient/nfs_subs.c
@@ -56,7 +56,6 @@
 #include <sys/malloc.h>
 #include <sys/sysent.h>
 #include <sys/syscall.h>
-#include <sys/conf.h>
 
 #include <vm/vm.h>
 #include <vm/vm_object.h>
diff --git a/sys/nfsclient/nfs_vnops.c b/sys/nfsclient/nfs_vnops.c
index cae22655bf76..08437e400f11 100644
--- a/sys/nfsclient/nfs_vnops.c
+++ b/sys/nfsclient/nfs_vnops.c
@@ -61,7 +61,6 @@
 #include <sys/lockf.h>
 #include <sys/stat.h>
 #include <sys/sysctl.h>
-#include <sys/conf.h>
 
 #include <vm/vm.h>
 #include <vm/vm_extern.h>
diff --git a/sys/nfsserver/nfs_srvsubs.c b/sys/nfsserver/nfs_srvsubs.c
index 2e197211f72a..dbbb4dd90633 100644
--- a/sys/nfsserver/nfs_srvsubs.c
+++ b/sys/nfsserver/nfs_srvsubs.c
@@ -56,7 +56,6 @@
 #include <sys/malloc.h>
 #include <sys/sysent.h>
 #include <sys/syscall.h>
-#include <sys/conf.h>
 
 #include <vm/vm.h>
 #include <vm/vm_object.h>
diff --git a/sys/ntfs/ntfs_compr.c b/sys/ntfs/ntfs_compr.c
index bdaac0a251ce..5a8e9f44beb9 100644
--- a/sys/ntfs/ntfs_compr.c
+++ b/sys/ntfs/ntfs_compr.c
@@ -36,7 +36,6 @@
 #include <sys/vnode.h>
 #include <sys/mount.h>
 #include <sys/file.h>
-#include <sys/malloc.h>
 
 #if defined(__NetBSD__)
 #include <miscfs/specfs/specdev.h>
diff --git a/sys/pc98/cbus/ppc.c b/sys/pc98/cbus/ppc.c
index c5b824e5ad38..14185e622b93 100644
--- a/sys/pc98/cbus/ppc.c
+++ b/sys/pc98/cbus/ppc.c
@@ -33,7 +33,6 @@
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/bus.h>
-#include <sys/malloc.h>
   
 #include <vm/vm.h>
 #include <vm/pmap.h>
diff --git a/sys/pc98/pc98/ppc.c b/sys/pc98/pc98/ppc.c
index c5b824e5ad38..14185e622b93 100644
--- a/sys/pc98/pc98/ppc.c
+++ b/sys/pc98/pc98/ppc.c
@@ -33,7 +33,6 @@
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/bus.h>
-#include <sys/malloc.h>
   
 #include <vm/vm.h>
 #include <vm/pmap.h>
diff --git a/sys/pccard/pccard_nbk.c b/sys/pccard/pccard_nbk.c
index 3306c02dd84d..34be8b7b6127 100644
--- a/sys/pccard/pccard_nbk.c
+++ b/sys/pccard/pccard_nbk.c
@@ -53,7 +53,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/malloc.h>
 #include <sys/module.h>
 #include <sys/kernel.h>
 #include <sys/queue.h>
diff --git a/sys/pccard/pcic_pci.c b/sys/pccard/pcic_pci.c
index e44136cab0f7..12395dbd147b 100644
--- a/sys/pccard/pcic_pci.c
+++ b/sys/pccard/pcic_pci.c
@@ -32,7 +32,6 @@
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
-#include <sys/malloc.h>
 #include <sys/bus.h>
 #include <pci/pcireg.h>
 #include <pci/pcivar.h>
diff --git a/sys/pci/alpm.c b/sys/pci/alpm.c
index fc7c53749006..fb87c74bc56a 100644
--- a/sys/pci/alpm.c
+++ b/sys/pci/alpm.c
@@ -35,9 +35,7 @@
 #include <sys/systm.h>
 #include <sys/module.h>
 #include <sys/bus.h>
-#include <sys/conf.h>
 #include <sys/uio.h>
-#include <sys/malloc.h>
 
 #include <machine/clock.h>
 
diff --git a/sys/pci/amd.c b/sys/pci/amd.c
index 3519093bd73b..808afa70d99f 100644
--- a/sys/pci/amd.c
+++ b/sys/pci/amd.c
@@ -53,7 +53,6 @@
 #include <sys/param.h>
 
 #include <sys/systm.h>
-#include <sys/malloc.h>
 #include <sys/queue.h>
 #include <sys/kernel.h>
 
diff --git a/sys/pci/if_mn.c b/sys/pci/if_mn.c
index b4ec284b5659..5382bd2f4dad 100644
--- a/sys/pci/if_mn.c
+++ b/sys/pci/if_mn.c
@@ -38,7 +38,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/conf.h>
 #include <sys/mbuf.h>
 #include <sys/kernel.h>
 #include <sys/sysctl.h>
diff --git a/sys/pci/intpm.c b/sys/pci/intpm.c
index 231bd62b07ee..f6999079563e 100644
--- a/sys/pci/intpm.c
+++ b/sys/pci/intpm.c
@@ -37,8 +37,6 @@
 #include <sys/uio.h>
 #include <sys/module.h>
 #include <sys/bus.h>
-#include <sys/conf.h>
-#include <sys/malloc.h>
 #include <sys/rman.h>
 #include <machine/resource.h>
 #include <dev/smbus/smbconf.h>
diff --git a/sys/pci/pci_compat.c b/sys/pci/pci_compat.c
index efd3edfa6f12..59372d772709 100644
--- a/sys/pci/pci_compat.c
+++ b/sys/pci/pci_compat.c
@@ -33,7 +33,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/malloc.h>
 
 #include <vm/vm.h>
 #include <vm/pmap.h>
diff --git a/sys/pci/pcic_p.c b/sys/pci/pcic_p.c
index e44136cab0f7..12395dbd147b 100644
--- a/sys/pci/pcic_p.c
+++ b/sys/pci/pcic_p.c
@@ -32,7 +32,6 @@
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
-#include <sys/malloc.h>
 #include <sys/bus.h>
 #include <pci/pcireg.h>
 #include <pci/pcivar.h>
diff --git a/sys/svr4/svr4_fcntl.c b/sys/svr4/svr4_fcntl.c
index abff2da2c5b8..51b3f6a7792c 100644
--- a/sys/svr4/svr4_fcntl.c
+++ b/sys/svr4/svr4_fcntl.c
@@ -40,7 +40,6 @@
 /*#include <sys/ioctl.h>*/
 #include <sys/kernel.h>
 #include <sys/mount.h>
-#include <sys/malloc.h>
 #include <sys/vnode.h>
 #include <sys/unistd.h>
 
diff --git a/sys/ufs/ffs/ffs_softdep_stub.c b/sys/ufs/ffs/ffs_softdep_stub.c
index 4b8411d32353..9313ebb0ceb4 100644
--- a/sys/ufs/ffs/ffs_softdep_stub.c
+++ b/sys/ufs/ffs/ffs_softdep_stub.c
@@ -47,7 +47,6 @@
 #if (SOFTUPDATES == 0 ) /* SOFTUPDATES not configured in, use these stubs. */
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/malloc.h>
 #include <sys/vnode.h>
 #include <ufs/ufs/quota.h>
 #include <ufs/ufs/inode.h>
diff --git a/sys/ufs/mfs/mfs_vnops.c b/sys/ufs/mfs/mfs_vnops.c
index 3affa85a1db9..7ef7ed01295b 100644
--- a/sys/ufs/mfs/mfs_vnops.c
+++ b/sys/ufs/mfs/mfs_vnops.c
@@ -43,7 +43,6 @@
 #include <sys/malloc.h>
 #include <sys/sysproto.h>
 #include <sys/mman.h>
-#include <sys/conf.h>
 
 #include <ufs/mfs/mfsnode.h>
 #include <ufs/mfs/mfs_extern.h>
diff --git a/sys/ufs/ufs/ufs_bmap.c b/sys/ufs/ufs/ufs_bmap.c
index 32ba53c5e516..d56e00590ea7 100644
--- a/sys/ufs/ufs/ufs_bmap.c
+++ b/sys/ufs/ufs/ufs_bmap.c
@@ -46,7 +46,6 @@
 #include <sys/vnode.h>
 #include <sys/mount.h>
 #include <sys/resourcevar.h>
-#include <sys/conf.h>
 
 #include <ufs/ufs/extattr.h>
 #include <ufs/ufs/quota.h>