From 85422e62d3453be59520eca83273c2acb880ecd2 Mon Sep 17 00:00:00 2001
From: Bruce Evans <bde@FreeBSD.org>
Date: Thu, 5 Sep 2002 08:13:20 +0000
Subject: [PATCH] Include <sys/malloc.h> instead of depending on namespace
 pollution 2 layers deep in <sys/proc.h> or <sys/vnode.h>.

Removed unused includes.  Sorted includes.
---
 sys/compat/linux/linux_misc.c   | 9 ++++-----
 sys/compat/linux/linux_stats.c  | 3 ++-
 sys/compat/linux/linux_sysctl.c | 6 +-----
 sys/compat/linux/linux_uid16.c  | 6 +++---
 4 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/sys/compat/linux/linux_misc.c b/sys/compat/linux/linux_misc.c
index 8c39153ebf9..67d9b310bec 100644
--- a/sys/compat/linux/linux_misc.c
+++ b/sys/compat/linux/linux_misc.c
@@ -28,24 +28,22 @@
  * $FreeBSD$
  */
 
-#include "opt_compat.h"
 #include "opt_mac.h"
 
 #include <sys/param.h>
-#include <sys/systm.h>
+#include <sys/blist.h>
 #include <sys/fcntl.h>
 #include <sys/imgact_aout.h>
 #include <sys/jail.h>
 #include <sys/kernel.h>
 #include <sys/lock.h>
 #include <sys/mac.h>
+#include <sys/malloc.h>
 #include <sys/mman.h>
 #include <sys/mount.h>
 #include <sys/mutex.h>
 #include <sys/namei.h>
-#include <sys/poll.h>
 #include <sys/proc.h>
-#include <sys/blist.h>
 #include <sys/reboot.h>
 #include <sys/resourcevar.h>
 #include <sys/signalvar.h>
@@ -53,8 +51,8 @@
 #include <sys/syscallsubr.h>
 #include <sys/sysctl.h>
 #include <sys/sysproto.h>
+#include <sys/systm.h>
 #include <sys/time.h>
-#include <sys/unistd.h>
 #include <sys/vmmeter.h>
 #include <sys/vnode.h>
 #include <sys/wait.h>
@@ -73,6 +71,7 @@
 
 #include <machine/../linux/linux.h>
 #include <machine/../linux/linux_proto.h>
+
 #include <compat/linux/linux_mib.h>
 #include <compat/linux/linux_util.h>
 
diff --git a/sys/compat/linux/linux_stats.c b/sys/compat/linux/linux_stats.c
index 485253aaf38..d02186fdedd 100644
--- a/sys/compat/linux/linux_stats.c
+++ b/sys/compat/linux/linux_stats.c
@@ -37,15 +37,16 @@
 #include <sys/filedesc.h>
 #include <sys/proc.h>
 #include <sys/mac.h>
+#include <sys/malloc.h>
 #include <sys/mount.h>
 #include <sys/namei.h>
 #include <sys/stat.h>
-#include <sys/sysctl.h>
 #include <sys/systm.h>
 #include <sys/vnode.h>
 
 #include <machine/../linux/linux.h>
 #include <machine/../linux/linux_proto.h>
+
 #include <compat/linux/linux_util.h>
 
 static int
diff --git a/sys/compat/linux/linux_sysctl.c b/sys/compat/linux/linux_sysctl.c
index d1f6996ba8c..294da08b7d7 100644
--- a/sys/compat/linux/linux_sysctl.c
+++ b/sys/compat/linux/linux_sysctl.c
@@ -28,16 +28,12 @@
  * $FreeBSD$
  */
 
-#include "opt_compat.h"
-
 #include <sys/param.h>
+#include <sys/malloc.h>
 #include <sys/systm.h>
-#include <sys/proc.h>
-#include <sys/sysproto.h>
 
 #include <machine/../linux/linux.h>
 #include <machine/../linux/linux_proto.h>
-#include <compat/linux/linux_util.h>
 
 #define	LINUX_CTL_KERN		1
 #define	LINUX_CTL_VM		2
diff --git a/sys/compat/linux/linux_uid16.c b/sys/compat/linux/linux_uid16.c
index 538c118f7ce..4c8793d711d 100644
--- a/sys/compat/linux/linux_uid16.c
+++ b/sys/compat/linux/linux_uid16.c
@@ -26,18 +26,18 @@
  * $FreeBSD$
  */
 
-#include "opt_compat.h"
-
 #include <sys/param.h>
-#include <sys/systm.h>
 #include <sys/lock.h>
+#include <sys/malloc.h>
 #include <sys/mutex.h>
 #include <sys/proc.h>
 #include <sys/syscallsubr.h>
 #include <sys/sysproto.h>
+#include <sys/systm.h>
 
 #include <machine/../linux/linux.h>
 #include <machine/../linux/linux_proto.h>
+
 #include <compat/linux/linux_util.h>
 
 DUMMY(setfsuid16);