Include file cleanup; mac.h and malloc.h at one point had ordering

relationship requirements, and no longer do.

Reminded by:	bde

20 files changed, 20 insertions, 10 deletions

diff --git a/sys/kern/kern_mac.c b/sys/kern/kern_mac.c
index 6d3f124..43c03cc 100644
--- a/sys/kern/kern_mac.c
+++ b/sys/kern/kern_mac.c
@@ -46,6 +46,7 @@
  */
 
 #include "opt_mac.h"
+
 #include <sys/param.h>
 #include <sys/extattr.h>
 #include <sys/kernel.h>
diff --git a/sys/kern/kern_prot.c b/sys/kern/kern_prot.c
index 8a7ac62..1e21b9e 100644
--- a/sys/kern/kern_prot.c
+++ b/sys/kern/kern_prot.c
@@ -52,8 +52,8 @@
 #include <sys/acct.h>
 #include <sys/kernel.h>
 #include <sys/lock.h>
-#include <sys/malloc.h>
 #include <sys/mac.h>
+#include <sys/malloc.h>
 #include <sys/mutex.h>
 #include <sys/sx.h>
 #include <sys/proc.h>
diff --git a/sys/kern/tty_tty.c b/sys/kern/tty_tty.c
index ab04328..91503fc 100644
--- a/sys/kern/tty_tty.c
+++ b/sys/kern/tty_tty.c
@@ -45,8 +45,8 @@
 #include <sys/conf.h>
 #include <sys/kernel.h>
 #include <sys/lock.h>
-#include <sys/mutex.h>
 #include <sys/mac.h>
+#include <sys/mutex.h>
 #include <sys/sx.h>
 #include <sys/proc.h>
 #include <sys/ttycom.h>
diff --git a/sys/kern/uipc_mbuf.c b/sys/kern/uipc_mbuf.c
index 4d66465..39bcdbc 100644
--- a/sys/kern/uipc_mbuf.c
+++ b/sys/kern/uipc_mbuf.c
@@ -41,8 +41,8 @@
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/lock.h>
-#include <sys/malloc.h>
 #include <sys/mac.h>
+#include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/sysctl.h>
 #include <sys/domain.h>
diff --git a/sys/kern/uipc_sockbuf.c b/sys/kern/uipc_sockbuf.c
index 45b356e..1c1a227 100644
--- a/sys/kern/uipc_sockbuf.c
+++ b/sys/kern/uipc_sockbuf.c
@@ -44,8 +44,8 @@
 #include <sys/file.h>	/* for maxfiles */
 #include <sys/kernel.h>
 #include <sys/lock.h>
-#include <sys/malloc.h>
 #include <sys/mac.h>
+#include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/mutex.h>
 #include <sys/proc.h>
diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c
index 9b717c6..cfcec00 100644
--- a/sys/kern/uipc_socket.c
+++ b/sys/kern/uipc_socket.c
@@ -42,8 +42,8 @@
 #include <sys/systm.h>
 #include <sys/fcntl.h>
 #include <sys/lock.h>
-#include <sys/malloc.h>
 #include <sys/mac.h>
+#include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/mutex.h>
 #include <sys/domain.h>
diff --git a/sys/kern/uipc_socket2.c b/sys/kern/uipc_socket2.c
index 45b356e..1c1a227 100644
--- a/sys/kern/uipc_socket2.c
+++ b/sys/kern/uipc_socket2.c
@@ -44,8 +44,8 @@
 #include <sys/file.h>	/* for maxfiles */
 #include <sys/kernel.h>
 #include <sys/lock.h>
-#include <sys/malloc.h>
 #include <sys/mac.h>
+#include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/mutex.h>
 #include <sys/proc.h>
diff --git a/sys/kern/uipc_syscalls.c b/sys/kern/uipc_syscalls.c
index 72c7133..d9c4d88 100644
--- a/sys/kern/uipc_syscalls.c
+++ b/sys/kern/uipc_syscalls.c
@@ -45,6 +45,7 @@
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/lock.h>
+#include <sys/mac.h>
 #include <sys/mutex.h>
 #include <sys/sysproto.h>
 #include <sys/malloc.h>
diff --git a/sys/kern/vfs_extattr.c b/sys/kern/vfs_extattr.c
index 8d4c9b4..a38fa6a 100644
--- a/sys/kern/vfs_extattr.c
+++ b/sys/kern/vfs_extattr.c
@@ -48,8 +48,8 @@
 #include <sys/bio.h>
 #include <sys/buf.h>
 #include <sys/sysent.h>
-#include <sys/malloc.h>
 #include <sys/mac.h>
+#include <sys/malloc.h>
 #include <sys/mount.h>
 #include <sys/mutex.h>
 #include <sys/sysproto.h>
diff --git a/sys/kern/vfs_mount.c b/sys/kern/vfs_mount.c
index fb257b9..ae7f30c 100644
--- a/sys/kern/vfs_mount.c
+++ b/sys/kern/vfs_mount.c
@@ -69,8 +69,8 @@
 #include <sys/cons.h>
 #include <sys/kernel.h>
 #include <sys/linker.h>
-#include <sys/malloc.h>
 #include <sys/mac.h>
+#include <sys/malloc.h>
 #include <sys/mount.h>
 #include <sys/mutex.h>
 #include <sys/namei.h>
diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c
index cfdd863..adf38ee 100644
--- a/sys/kern/vfs_subr.c
+++ b/sys/kern/vfs_subr.c
@@ -54,8 +54,8 @@
 #include <sys/fcntl.h>
 #include <sys/kernel.h>
 #include <sys/kthread.h>
-#include <sys/malloc.h>
 #include <sys/mac.h>
+#include <sys/malloc.h>
 #include <sys/mount.h>
 #include <sys/namei.h>
 #include <sys/stat.h>
diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c
index 8d4c9b4..a38fa6a 100644
--- a/sys/kern/vfs_syscalls.c
+++ b/sys/kern/vfs_syscalls.c
@@ -48,8 +48,8 @@
 #include <sys/bio.h>
 #include <sys/buf.h>
 #include <sys/sysent.h>
-#include <sys/malloc.h>
 #include <sys/mac.h>
+#include <sys/malloc.h>
 #include <sys/mount.h>
 #include <sys/mutex.h>
 #include <sys/sysproto.h>
diff --git a/sys/security/mac/mac_framework.c b/sys/security/mac/mac_framework.c
index 6d3f124..43c03cc 100644
--- a/sys/security/mac/mac_framework.c
+++ b/sys/security/mac/mac_framework.c
@@ -46,6 +46,7 @@
  */
 
 #include "opt_mac.h"
+
 #include <sys/param.h>
 #include <sys/extattr.h>
 #include <sys/kernel.h>
diff --git a/sys/security/mac/mac_internal.h b/sys/security/mac/mac_internal.h
index 6d3f124..43c03cc 100644
--- a/sys/security/mac/mac_internal.h
+++ b/sys/security/mac/mac_internal.h
@@ -46,6 +46,7 @@
  */
 
 #include "opt_mac.h"
+
 #include <sys/param.h>
 #include <sys/extattr.h>
 #include <sys/kernel.h>
diff --git a/sys/security/mac/mac_net.c b/sys/security/mac/mac_net.c
index 6d3f124..43c03cc 100644
--- a/sys/security/mac/mac_net.c
+++ b/sys/security/mac/mac_net.c
@@ -46,6 +46,7 @@
  */
 
 #include "opt_mac.h"
+
 #include <sys/param.h>
 #include <sys/extattr.h>
 #include <sys/kernel.h>
diff --git a/sys/security/mac/mac_pipe.c b/sys/security/mac/mac_pipe.c
index 6d3f124..43c03cc 100644
--- a/sys/security/mac/mac_pipe.c
+++ b/sys/security/mac/mac_pipe.c
@@ -46,6 +46,7 @@
  */
 
 #include "opt_mac.h"
+
 #include <sys/param.h>
 #include <sys/extattr.h>
 #include <sys/kernel.h>
diff --git a/sys/security/mac/mac_process.c b/sys/security/mac/mac_process.c
index 6d3f124..43c03cc 100644
--- a/sys/security/mac/mac_process.c
+++ b/sys/security/mac/mac_process.c
@@ -46,6 +46,7 @@
  */
 
 #include "opt_mac.h"
+
 #include <sys/param.h>
 #include <sys/extattr.h>
 #include <sys/kernel.h>
diff --git a/sys/security/mac/mac_syscalls.c b/sys/security/mac/mac_syscalls.c
index 6d3f124..43c03cc 100644
--- a/sys/security/mac/mac_syscalls.c
+++ b/sys/security/mac/mac_syscalls.c
@@ -46,6 +46,7 @@
  */
 
 #include "opt_mac.h"
+
 #include <sys/param.h>
 #include <sys/extattr.h>
 #include <sys/kernel.h>
diff --git a/sys/security/mac/mac_system.c b/sys/security/mac/mac_system.c
index 6d3f124..43c03cc 100644
--- a/sys/security/mac/mac_system.c
+++ b/sys/security/mac/mac_system.c
@@ -46,6 +46,7 @@
  */
 
 #include "opt_mac.h"
+
 #include <sys/param.h>
 #include <sys/extattr.h>
 #include <sys/kernel.h>
diff --git a/sys/security/mac/mac_vfs.c b/sys/security/mac/mac_vfs.c
index 6d3f124..43c03cc 100644
--- a/sys/security/mac/mac_vfs.c
+++ b/sys/security/mac/mac_vfs.c
@@ -46,6 +46,7 @@
  */
 
 #include "opt_mac.h"
+
 #include <sys/param.h>
 #include <sys/extattr.h>
 #include <sys/kernel.h>