From a29076f4463ea9c75d8f5763b5b7da71bce8ad6f Mon Sep 17 00:00:00 2001
From: rwatson <rwatson@FreeBSD.org>
Date: Fri, 23 Feb 2007 14:39:04 +0000
Subject: More unnecessary include reduction.

---
 sys/security/mac_biba/mac_biba.c                 |  2 --
 sys/security/mac_bsdextended/mac_bsdextended.c   | 19 ++-----------------
 sys/security/mac_ifoff/mac_ifoff.c               | 17 ++---------------
 sys/security/mac_partition/mac_partition.c       | 20 +-------------------
 sys/security/mac_portacl/mac_portacl.c           | 10 +---------
 sys/security/mac_seeotheruids/mac_seeotheruids.c | 18 ++----------------
 sys/security/mac_test/mac_test.c                 | 16 ++++------------
 7 files changed, 12 insertions(+), 90 deletions(-)

diff --git a/sys/security/mac_biba/mac_biba.c b/sys/security/mac_biba/mac_biba.c
index 81d8697..202aeed 100644
--- a/sys/security/mac_biba/mac_biba.c
+++ b/sys/security/mac_biba/mac_biba.c
@@ -39,9 +39,7 @@
  * Biba fixed label mandatory integrity policy.
  */
 
-#include <sys/types.h>
 #include <sys/param.h>
-#include <sys/acl.h>
 #include <sys/conf.h>
 #include <sys/extattr.h>
 #include <sys/kernel.h>
diff --git a/sys/security/mac_bsdextended/mac_bsdextended.c b/sys/security/mac_bsdextended/mac_bsdextended.c
index 1a33003..a0bb805 100644
--- a/sys/security/mac_bsdextended/mac_bsdextended.c
+++ b/sys/security/mac_bsdextended/mac_bsdextended.c
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2005 Tom Rhodes
- * Copyright (c) 1999-2002 Robert N. M. Watson
+ * Copyright (c) 1999-2002, 2007 Robert N. M. Watson
  * Copyright (c) 2001-2005 Networks Associates Technology, Inc.
  * All rights reserved.
  *
@@ -42,34 +42,19 @@
  * mandatory rules regarding users and some system objects.
  */
 
-#include <sys/types.h>
 #include <sys/param.h>
 #include <sys/acl.h>
-#include <sys/conf.h>
 #include <sys/kernel.h>
 #include <sys/jail.h>
 #include <sys/lock.h>
 #include <sys/malloc.h>
+#include <sys/module.h>
 #include <sys/mount.h>
 #include <sys/mutex.h>
-#include <sys/proc.h>
 #include <sys/systm.h>
-#include <sys/sysproto.h>
-#include <sys/sysent.h>
 #include <sys/vnode.h>
-#include <sys/file.h>
-#include <sys/socket.h>
-#include <sys/socketvar.h>
 #include <sys/sysctl.h>
 #include <sys/syslog.h>
-#include <sys/ucred.h>
-
-#include <net/bpfdesc.h>
-#include <net/if.h>
-#include <net/if_types.h>
-#include <net/if_var.h>
-
-#include <vm/vm.h>
 
 #include <security/mac/mac_policy.h>
 #include <security/mac_bsdextended/mac_bsdextended.h>
diff --git a/sys/security/mac_ifoff/mac_ifoff.c b/sys/security/mac_ifoff/mac_ifoff.c
index 6658fcc..778b60b 100644
--- a/sys/security/mac_ifoff/mac_ifoff.c
+++ b/sys/security/mac_ifoff/mac_ifoff.c
@@ -1,5 +1,5 @@
 /*-
- * Copyright (c) 1999-2002 Robert N. M. Watson
+ * Copyright (c) 1999-2002, 2007 Robert N. M. Watson
  * Copyright (c) 2001-2002 Networks Associates Technology, Inc.
  * All rights reserved.
  *
@@ -41,27 +41,14 @@
  * environments.
  */
 
-#include <sys/types.h>
 #include <sys/param.h>
-#include <sys/conf.h>
 #include <sys/kernel.h>
-#include <sys/mount.h>
-#include <sys/proc.h>
-#include <sys/systm.h>
-#include <sys/sysproto.h>
-#include <sys/sysent.h>
-#include <sys/vnode.h>
-#include <sys/file.h>
+#include <sys/module.h>
 #include <sys/socket.h>
-#include <sys/socketvar.h>
 #include <sys/sysctl.h>
 
 #include <net/bpfdesc.h>
-#include <net/if.h>
 #include <net/if_types.h>
-#include <net/if_var.h>
-
-#include <vm/vm.h>
 
 #include <security/mac/mac_policy.h>
 
diff --git a/sys/security/mac_partition/mac_partition.c b/sys/security/mac_partition/mac_partition.c
index 257df3a..7a566b9 100644
--- a/sys/security/mac_partition/mac_partition.c
+++ b/sys/security/mac_partition/mac_partition.c
@@ -39,33 +39,15 @@
  * Experiment with a partition-like model.
  */
 
-#include <sys/types.h>
 #include <sys/param.h>
-#include <sys/conf.h>
 #include <sys/kernel.h>
-#include <sys/mount.h>
+#include <sys/module.h>
 #include <sys/priv.h>
 #include <sys/proc.h>
 #include <sys/sbuf.h>
 #include <sys/systm.h>
-#include <sys/sysproto.h>
-#include <sys/sysent.h>
-#include <sys/vnode.h>
-#include <sys/file.h>
-#include <sys/socket.h>
-#include <sys/socketvar.h>
-#include <sys/sx.h>
 #include <sys/sysctl.h>
 
-#include <fs/devfs/devfs.h>
-
-#include <net/bpfdesc.h>
-#include <net/if.h>
-#include <net/if_types.h>
-#include <net/if_var.h>
-
-#include <vm/vm.h>
-
 #include <security/mac/mac_policy.h>
 #include <security/mac_partition/mac_partition.h>
 
diff --git a/sys/security/mac_portacl/mac_portacl.c b/sys/security/mac_portacl/mac_portacl.c
index 713b314..113f254 100644
--- a/sys/security/mac_portacl/mac_portacl.c
+++ b/sys/security/mac_portacl/mac_portacl.c
@@ -55,24 +55,18 @@
  * because the kernel only knows about uids and gids.
  */
 
-#include <sys/types.h>
 #include <sys/param.h>
-#include <sys/conf.h>
 #include <sys/domain.h>
 #include <sys/kernel.h>
-#include <sys/libkern.h>
 #include <sys/lock.h>
 #include <sys/malloc.h>
-#include <sys/mount.h>
+#include <sys/module.h>
 #include <sys/mutex.h>
 #include <sys/priv.h>
 #include <sys/proc.h>
 #include <sys/protosw.h>
 #include <sys/queue.h>
 #include <sys/systm.h>
-#include <sys/sysproto.h>
-#include <sys/sysent.h>
-#include <sys/file.h>
 #include <sys/sbuf.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
@@ -81,8 +75,6 @@
 #include <netinet/in.h>
 #include <netinet/in_pcb.h>
 
-#include <vm/vm.h>
-
 #include <security/mac/mac_policy.h>
 
 SYSCTL_DECL(_security_mac);
diff --git a/sys/security/mac_seeotheruids/mac_seeotheruids.c b/sys/security/mac_seeotheruids/mac_seeotheruids.c
index c20dd8b..63278f1 100644
--- a/sys/security/mac_seeotheruids/mac_seeotheruids.c
+++ b/sys/security/mac_seeotheruids/mac_seeotheruids.c
@@ -1,5 +1,5 @@
 /*-
- * Copyright (c) 1999-2002 Robert N. M. Watson
+ * Copyright (c) 1999-2002, 2007 Robert N. M. Watson
  * Copyright (c) 2001-2002 Networks Associates Technology, Inc.
  * All rights reserved.
  *
@@ -40,29 +40,15 @@
  * kernel objects associated with other uids.
  */
 
-#include <sys/types.h>
 #include <sys/param.h>
-#include <sys/conf.h>
 #include <sys/kernel.h>
-#include <sys/mount.h>
+#include <sys/module.h>
 #include <sys/priv.h>
 #include <sys/proc.h>
 #include <sys/systm.h>
-#include <sys/sysproto.h>
-#include <sys/sysent.h>
-#include <sys/vnode.h>
-#include <sys/file.h>
-#include <sys/socket.h>
 #include <sys/socketvar.h>
 #include <sys/sysctl.h>
 
-#include <net/bpfdesc.h>
-#include <net/if.h>
-#include <net/if_types.h>
-#include <net/if_var.h>
-
-#include <vm/vm.h>
-
 #include <security/mac/mac_policy.h>
 
 SYSCTL_DECL(_security_mac);
diff --git a/sys/security/mac_test/mac_test.c b/sys/security/mac_test/mac_test.c
index f1d6622..0ca31e1 100644
--- a/sys/security/mac_test/mac_test.c
+++ b/sys/security/mac_test/mac_test.c
@@ -39,29 +39,23 @@
  * Generic mandatory access module that does nothing.
  */
 
-#include <sys/types.h>
 #include <sys/param.h>
 #include <sys/acl.h>
-#include <sys/conf.h>
 #include <sys/kdb.h>
-#include <sys/extattr.h>
 #include <sys/kernel.h>
 #include <sys/ksem.h>
 #include <sys/malloc.h>
+#include <sys/module.h>
 #include <sys/mount.h>
+#include <sys/msg.h>
 #include <sys/proc.h>
-#include <sys/systm.h>
-#include <sys/sysproto.h>
-#include <sys/sysent.h>
 #include <sys/vnode.h>
-#include <sys/file.h>
+#include <sys/sem.h>
+#include <sys/shm.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 #include <sys/sx.h>
 #include <sys/sysctl.h>
-#include <sys/msg.h>
-#include <sys/sem.h>
-#include <sys/shm.h>
 
 #include <fs/devfs/devfs.h>
 
@@ -70,8 +64,6 @@
 #include <net/if_types.h>
 #include <net/if_var.h>
 
-#include <vm/vm.h>
-
 #include <security/mac/mac_policy.h>
 
 SYSCTL_DECL(_security_mac);
-- 
cgit v1.1