header cleanup

Change-Id: I4e169911591c56e91c301c5cb0bb3ea2d8140cf2

diff --git a/minix/kernel/arch/i386/acpi.c b/minix/kernel/arch/i386/acpi.c
index 2ab8995db75742be7eb047d5bb132a4e1fd5ef72..63ddde12ed478f208c775e850de9316b520fe928 100644 (file)
--- a/minix/kernel/arch/i386/acpi.c
+++ b/minix/kernel/arch/i386/acpi.c
@@ -1,7 +1,6 @@
 
 #include <string.h>
 
-#include "kernel/kernel.h"
 #include "acpi.h"
 #include "arch_proto.h"
 

diff --git a/minix/kernel/arch/i386/apic.c b/minix/kernel/arch/i386/apic.c
index 4c5ec5d9ae61154b0c108bc4bea55f910799cf1f..39346b679e02e86ce36ec6b9cb944368fa0c18f2 100644 (file)
--- a/minix/kernel/arch/i386/apic.c
+++ b/minix/kernel/arch/i386/apic.c
@@ -1,7 +1,6 @@
 /*
  * APIC handling routines. APIC is a requirement for SMP
  */
-#include "kernel/kernel.h"
 #include <assert.h>
 
 #include <unistd.h>
@@ -10,8 +9,6 @@
 #include <minix/syslib.h>
 #include <machine/cmos.h>
 
-#include "arch_proto.h"
-
 #include <minix/u64.h>
 
 #include "apic.h"

diff --git a/minix/kernel/arch/i386/arch_clock.c b/minix/kernel/arch/i386/arch_clock.c
index 0dc8d76afc0f5d728dc835aa4242ff3ed02ff31b..8573e42f7619ab8fb059964f35fc718dc84b3bef 100644 (file)
--- a/minix/kernel/arch/i386/arch_clock.c
+++ b/minix/kernel/arch/i386/arch_clock.c
@@ -1,15 +1,10 @@
 /* i386-specific clock functions. */
 
 #include <machine/ports.h>
-#include <minix/portio.h>
-
-#include "kernel/kernel.h"
 
 #include "kernel/clock.h"
 #include "kernel/interrupt.h"
 #include <minix/u64.h>
-#include "kernel/glo.h"
-#include "kernel/profile.h"
 
 #include <sys/sched.h> /* for CP_*, CPUSTATES */
 #if CPUSTATES != MINIX_CPUSTATES

diff --git a/minix/kernel/arch/i386/arch_do_vmctl.c b/minix/kernel/arch/i386/arch_do_vmctl.c
index 41083487d67276dbbece8861550c4ea00d88cb60..159cae70f77360f41f6e6290e0403b8a665e5896 100644 (file)
--- a/minix/kernel/arch/i386/arch_do_vmctl.c
+++ b/minix/kernel/arch/i386/arch_do_vmctl.c
@@ -9,7 +9,6 @@
 
 #include "kernel/system.h"
 #include <assert.h>
-#include <minix/type.h>
 
 #include "arch_proto.h"
 

diff --git a/minix/kernel/arch/i386/arch_reset.c b/minix/kernel/arch/i386/arch_reset.c
index 4839a1156d84d992ceefed67ee7a97e394f582be..5746e383f7f49da53808ccc3549a943f14501c05 100644 (file)
--- a/minix/kernel/arch/i386/arch_reset.c
+++ b/minix/kernel/arch/i386/arch_reset.c
@@ -6,7 +6,6 @@
 #include <machine/cmos.h>
 #include <machine/bios.h>
 #include <machine/cpu.h>
-#include <minix/portio.h>
 #include <minix/cpufeature.h>
 #include <sys/reboot.h>
 #include <assert.h>
@@ -14,12 +13,9 @@
 
 #include <minix/u64.h>
 
-#include "archconst.h"
 #include "arch_proto.h"
-#include "serial.h"
 #include "oxpcie.h"
 #include "direct_utils.h"
-#include <machine/multiboot.h>
 
 #ifdef USE_ACPI
 #include "acpi.h"

diff --git a/minix/kernel/arch/i386/arch_smp.c b/minix/kernel/arch/i386/arch_smp.c
index 1b1d0ab9e516aeb746394d62585647d834e623a8..8998b8904b01818d68893811e6f377ba59579ce8 100644 (file)
--- a/minix/kernel/arch/i386/arch_smp.c
+++ b/minix/kernel/arch/i386/arch_smp.c
@@ -6,17 +6,12 @@
 
 #define _SMP
 
-#include "kernel/kernel.h"
-#include "arch_proto.h"
 #include <unistd.h>
 #include <assert.h>
 #include <stdlib.h>
 #include <string.h>
-#include <machine/archtypes.h>
-#include <archconst.h>
 #include <machine/cmos.h>
 #include <machine/bios.h>
-#include <minix/portio.h>
 
 #include "kernel/spinlock.h"
 #include "kernel/smp.h"

diff --git a/minix/kernel/arch/i386/arch_system.c b/minix/kernel/arch/i386/arch_system.c
index d8709f7fb21b4d11f37a85f37639e2f9e2395a32..bd75b575e2644008f0d0565ccd580c7e5d4cdc8d 100644 (file)
--- a/minix/kernel/arch/i386/arch_system.c
+++ b/minix/kernel/arch/i386/arch_system.c
@@ -1,7 +1,5 @@
 /* system dependent functions for use inside the whole kernel. */
 
-#include "kernel/kernel.h"
-
 #include <unistd.h>
 #include <ctype.h>
 #include <string.h>
@@ -17,10 +15,7 @@
 #include <minix/u64.h>
 
 #include "archconst.h"
-#include "arch_proto.h"
-#include "serial.h"
 #include "oxpcie.h"
-#include <machine/multiboot.h>
 
 #include "glo.h"
 

diff --git a/minix/kernel/arch/i386/arch_watchdog.c b/minix/kernel/arch/i386/arch_watchdog.c
index 58b76159dea59f4df19e48bb0dad2a51d5600553..775d487c007f0175830faa721a38b7c28694f6d8 100644 (file)
--- a/minix/kernel/arch/i386/arch_watchdog.c
+++ b/minix/kernel/arch/i386/arch_watchdog.c
@@ -1,6 +1,4 @@
-#include "kernel/kernel.h"
 #include "kernel/watchdog.h"
-#include "arch_proto.h"
 #include "glo.h"
 #include <minix/minlib.h>
 #include <minix/u64.h>

diff --git a/minix/kernel/arch/i386/direct_tty_utils.c b/minix/kernel/arch/i386/direct_tty_utils.c
index eb8364bc9f70682cfe83e03c3bac0d508fc4c2f7..5c577c26d69bf75a5f49378cdab733dd0d95d00f 100644 (file)
--- a/minix/kernel/arch/i386/direct_tty_utils.c
+++ b/minix/kernel/arch/i386/direct_tty_utils.c
@@ -1,19 +1,11 @@
 
-#include "kernel/kernel.h"
 #include <minix/minlib.h>
-#include <minix/const.h>
 #include <minix/cpufeature.h>
-#include <minix/type.h>
-#include <minix/com.h>
-#include <sys/types.h>
-#include <sys/param.h>
 #include <machine/partition.h>
 #include "string.h"
-#include "arch_proto.h"
 #include "direct_utils.h"
 #include "serial.h"
 #include "glo.h"
-#include <machine/multiboot.h>
 
 /* Give non-zero values to avoid them in BSS */
 static int print_line = 1, print_col = 1;

diff --git a/minix/kernel/arch/i386/do_iopenable.c b/minix/kernel/arch/i386/do_iopenable.c
index 97a39e7e59595545c0ce8b6a989c362320ff863d..dbb431b8555db327c9dd5ead611aa7e4dc6e3168 100644 (file)
--- a/minix/kernel/arch/i386/do_iopenable.c
+++ b/minix/kernel/arch/i386/do_iopenable.c
@@ -9,7 +9,6 @@
  */
 
 #include "kernel/system.h"
-#include "kernel/kernel.h"
 #include <minix/endpoint.h>
 
 #include "arch_proto.h"

diff --git a/minix/kernel/arch/i386/do_readbios.c b/minix/kernel/arch/i386/do_readbios.c
index b7ad3c524127c29a9faa5796cffe566201cc8df5..4fa05b3d09f59dfbefb7bac32ba3544b597bf2f3 100644 (file)
--- a/minix/kernel/arch/i386/do_readbios.c
+++ b/minix/kernel/arch/i386/do_readbios.c
@@ -8,7 +8,6 @@
  */
 
 #include "kernel/system.h"
-#include <minix/type.h>
 
 /*===========================================================================*
  *                             do_readbios                                  *

diff --git a/minix/kernel/arch/i386/i8259.c b/minix/kernel/arch/i386/i8259.c
index 76cf10dac6a751a64a0fa098ef36cc47ca05a3d6..53327f2a6b2655b8adde41f2b43538458869f6d7 100644 (file)
--- a/minix/kernel/arch/i386/i8259.c
+++ b/minix/kernel/arch/i386/i8259.c
@@ -8,7 +8,6 @@
 #include "kernel/kernel.h"
 #include "arch_proto.h"
 #include "hw_intr.h"
-#include <minix/portio.h>
 #include <machine/cpu.h>
 
 #define ICW1_AT         0x11   /* edge triggered, cascade, need ICW4 */

diff --git a/minix/kernel/arch/i386/memory.c b/minix/kernel/arch/i386/memory.c
index b81f5939c10cf512c7dab4b09a0817b3010d54f8..8450aa344f23ee1495802767decc0720ad99b3a6 100644 (file)
--- a/minix/kernel/arch/i386/memory.c
+++ b/minix/kernel/arch/i386/memory.c
@@ -4,7 +4,6 @@
 
 #include <machine/vm.h>
 
-#include <minix/type.h>
 #include <minix/syslib.h>
 #include <minix/cpufeature.h>
 #include <string.h>

diff --git a/minix/kernel/arch/i386/pre_init.c b/minix/kernel/arch/i386/pre_init.c
index 9a0e85dd508e46e78c5d9bd92277a865d5e1ae51..1511bc4d38135d84de4a0f3137777f154c4ee088 100644 (file)
--- a/minix/kernel/arch/i386/pre_init.c
+++ b/minix/kernel/arch/i386/pre_init.c
@@ -1,24 +1,16 @@
 
 #define UNPAGED 1      /* for proper kmain() prototype */
 
-#include "kernel/kernel.h"
 #include <assert.h>
 #include <stdlib.h>
 #include <minix/minlib.h>
-#include <minix/const.h>
-#include <minix/type.h>
 #include <minix/board.h>
-#include <minix/com.h>
-#include <sys/types.h>
-#include <sys/param.h>
 #include <sys/reboot.h>
 #include <machine/partition.h>
 #include "string.h"
-#include "arch_proto.h"
 #include "direct_utils.h"
 #include "serial.h"
 #include "glo.h"
-#include <machine/multiboot.h>
 
 #if USE_SYSDEBUG
 #define MULTIBOOT_VERBOSE 1

diff --git a/minix/kernel/arch/i386/protect.c b/minix/kernel/arch/i386/protect.c
index a62b4ee282514312af5ccef67fe0e101ffd63153..ca9a9fd98d2b022738d434682ee82480cb325887 100644 (file)
--- a/minix/kernel/arch/i386/protect.c
+++ b/minix/kernel/arch/i386/protect.c
@@ -8,10 +8,8 @@
 
 #include <minix/cpufeature.h>
 #include <sys/types.h>
-#include <machine/multiboot.h>
 #include "kernel/kernel.h"
 
-#include "archconst.h"
 #include "arch_proto.h"
 
 #include <sys/exec.h>

diff --git a/minix/kernel/clock.c b/minix/kernel/clock.c
index b4a438efaea1fce5849ad9a0e09b4ca9443a180d..3260e60a1a300774837b8c14b912b1c1cd723e39 100644 (file)
--- a/minix/kernel/clock.c
+++ b/minix/kernel/clock.c
@@ -12,7 +12,6 @@
  *   Sep 24, 2004   redesigned alarm timers  (Jorrit N. Herder)
  */
 
-#include "kernel/kernel.h"
 #include <minix/endpoint.h>
 #include <stdlib.h>
 #include <string.h>

diff --git a/minix/kernel/const.h b/minix/kernel/const.h
index be16f21c04794a56d5b0b7ee5039abaa52b0cc97..42f84992269ea9f819871508ab619b402f07d342 100644 (file)
--- a/minix/kernel/const.h
+++ b/minix/kernel/const.h
@@ -5,7 +5,6 @@
 #include <minix/config.h>
 #include <minix/bitmap.h>
 
-#include "config.h"
 #include "debug.h"
 
 /* Translate an endpoint number to a process number, return success. */

diff --git a/minix/kernel/debug.c b/minix/kernel/debug.c
index 4463512e6810cdf6305920016a6b82e8267732c6..29f0038785ce89d7ab3e5bcab4558a317c393b84 100644 (file)
--- a/minix/kernel/debug.c
+++ b/minix/kernel/debug.c
@@ -6,7 +6,6 @@
 #include "kernel/kernel.h"
 
 #include <minix/callnr.h>
-#include <minix/sysutil.h>
 #include <minix/u64.h>
 #include <limits.h>
 #include <string.h>

diff --git a/minix/kernel/interrupt.c b/minix/kernel/interrupt.c
index c828c2c3bb4af87c1fa2a0839cca313b937e260c..64b4475261354f6c706a63ab13ea46a2a461bcf0 100644 (file)
--- a/minix/kernel/interrupt.c
+++ b/minix/kernel/interrupt.c
@@ -16,7 +16,6 @@
 #include <assert.h>
 
 #include "kernel/kernel.h"
-#include "archconst.h"
 #include "hw_intr.h"
 
 

diff --git a/minix/kernel/main.c b/minix/kernel/main.c
index 546583a0e954108978fb974ab6b18a466f69749b..3198aba7317771fa26463837744aea3bc78c2ee2 100644 (file)
--- a/minix/kernel/main.c
+++ b/minix/kernel/main.c
@@ -8,16 +8,13 @@
  *   main:             MINIX main program
  *   prepare_shutdown: prepare to take MINIX down
  */
-#include "kernel/kernel.h"
 #include <string.h>
 #include <stdlib.h>
 #include <assert.h>
-#include <minix/com.h>
 #include <minix/endpoint.h>
 #include <machine/vmparam.h>
 #include <minix/u64.h>
 #include <minix/board.h>
-#include <minix/type.h>
 #include <sys/reboot.h>
 #include "clock.h"
 #include "direct_utils.h"

diff --git a/minix/kernel/priv.h b/minix/kernel/priv.h
index 4303ac4976a47aafbd6feb86b82055ff882ef927..66fceffab456344b23f5043b5e09631b45e9fbf8 100644 (file)
--- a/minix/kernel/priv.h
+++ b/minix/kernel/priv.h
@@ -12,7 +12,6 @@
  *   Nov 22, 2009  rewrite of privilege management (Cristiano Giuffrida)
  *   Jul 01, 2005  Created.  (Jorrit N. Herder)        
  */
-#include <minix/com.h>
 #include <minix/const.h>
 #include <minix/priv.h>
 #include "kernel/const.h"

diff --git a/minix/kernel/proc.c b/minix/kernel/proc.c
index 62ef6081c6eca825221b51e8ad5dd46e31dd113e..da74c409ba777f935805aec3a8654e489a7184ac 100644 (file)
--- a/minix/kernel/proc.c
+++ b/minix/kernel/proc.c
@@ -29,14 +29,11 @@
  * nonempty lists. As shown above, this is not required with pointer pointers.
  */
 
-#include <minix/com.h>
-#include <minix/ipcconst.h>
 #include <stddef.h>
 #include <signal.h>
 #include <assert.h>
 #include <string.h>
 
-#include "kernel/kernel.h"
 #include "vm.h"
 #include "clock.h"
 #include "spinlock.h"

diff --git a/minix/kernel/profile.c b/minix/kernel/profile.c
index cbb71df065563f4a39c068040830bbd586b3b452..61d1ee7660854c377d22d5aa91d89359af83d076 100644 (file)
--- a/minix/kernel/profile.c
+++ b/minix/kernel/profile.c
@@ -6,13 +6,8 @@
  *   14 Aug, 2006   Created, (Rogier Meurs)
  */
 
-#include <minix/config.h>
-
 #include "kernel/kernel.h"
 
-#include <minix/profile.h>
-#include <minix/portio.h>
-
 #if SPROFILE
 
 #include <string.h>

diff --git a/minix/kernel/system.c b/minix/kernel/system.c
index fbfce305d879eec202cdeb2d313a838ad9bb19f5..01d716c7e4ef493bcc42a7c21704676cd3b5a61f 100644 (file)
--- a/minix/kernel/system.c
+++ b/minix/kernel/system.c
@@ -32,7 +32,6 @@
  *   Sep 30, 2004   source code documentation updated  (Jorrit N. Herder)
  */
 
-#include "kernel/kernel.h"
 #include "kernel/system.h"
 #include "kernel/vm.h"
 #include "kernel/clock.h"

diff --git a/minix/kernel/system/do_copy.c b/minix/kernel/system/do_copy.c
index fb037368b6569b214a47d4c89e9cc785cff75d79..3a9c98348dbd963f397b69280df1a002e64ad386 100644 (file)
--- a/minix/kernel/system/do_copy.c
+++ b/minix/kernel/system/do_copy.c
@@ -12,7 +12,6 @@
 
 #include "kernel/system.h"
 #include "kernel/vm.h"
-#include <minix/type.h>
 #include <assert.h>
 
 #if (USE_VIRCOPY || USE_PHYSCOPY)

diff --git a/minix/kernel/system/do_devio.c b/minix/kernel/system/do_devio.c
index e55d314c662d1899a5ec0cef164aa86b344ccb54..7666b65a18a63f5e3bfde3f76c2bda2f8b27a784 100644 (file)
--- a/minix/kernel/system/do_devio.c
+++ b/minix/kernel/system/do_devio.c
@@ -10,7 +10,6 @@
 #include "kernel/system.h"
 #include <minix/devio.h>
 #include <minix/endpoint.h>
-#include <minix/portio.h>
 
 #if USE_DEVIO
 

diff --git a/minix/kernel/system/do_irqctl.c b/minix/kernel/system/do_irqctl.c
index 584b753df738b3fe6338d7f61dc3a19b1fa8771a..c56bee41321846b6f297b13eed0d47e3e8093525 100644 (file)
--- a/minix/kernel/system/do_irqctl.c
+++ b/minix/kernel/system/do_irqctl.c
@@ -9,7 +9,6 @@
  *    m_krn_lsys_sys_irqctl.hook_id    (returns index of irq hook assigned at kernel)
  */
 
-#include "kernel/kernel.h"
 #include "kernel/system.h"
 
 #include <minix/endpoint.h>

diff --git a/minix/kernel/system/do_privctl.c b/minix/kernel/system/do_privctl.c
index fc332a82e41f044a5412d3d24b336fb76d7d026e..74469124b9a5ac03741c75b301d0bb0254c936b2 100644 (file)
--- a/minix/kernel/system/do_privctl.c
+++ b/minix/kernel/system/do_privctl.c
@@ -10,7 +10,6 @@
  */
 
 #include "kernel/system.h"
-#include "kernel/ipc.h"
 #include <signal.h>
 #include <string.h>
 #include <minix/endpoint.h>

diff --git a/minix/kernel/system/do_safecopy.c b/minix/kernel/system/do_safecopy.c
index 0990df7e77d1738c725f8241295cc494eab94d91..83ad0ad4ecf98903eaef15b3a9109377ba491479 100644 (file)
--- a/minix/kernel/system/do_safecopy.c
+++ b/minix/kernel/system/do_safecopy.c
@@ -16,7 +16,6 @@
 #include <assert.h>
 
 #include "kernel/system.h"
-#include "kernel/kernel.h"
 #include "kernel/vm.h"
 
 #define MAX_INDIRECT_DEPTH 5   /* up to how many indirect grants to follow? */

diff --git a/minix/kernel/system/do_safememset.c b/minix/kernel/system/do_safememset.c
index 0f9deda38844ffb3befe5700c5ad4561ab372af2..9b356051a1b349b963170feb3e17519b5e14d4a5 100644 (file)
--- a/minix/kernel/system/do_safememset.c
+++ b/minix/kernel/system/do_safememset.c
@@ -13,7 +13,6 @@
 #include <minix/safecopies.h>
 
 #include "kernel/system.h"
-#include "kernel/kernel.h"
 
 /*===========================================================================*
  *                              do_safememset                                *

diff --git a/minix/kernel/system/do_update.c b/minix/kernel/system/do_update.c
index 34c35f624e6349229584805a6b5a1d3636994722..68328cb7285a1ed3280c85fa123d037151567b0d 100644 (file)
--- a/minix/kernel/system/do_update.c
+++ b/minix/kernel/system/do_update.c
@@ -8,7 +8,6 @@
  */
 
 #include "kernel/system.h"
-#include "kernel/ipc.h"
 #include <string.h>
 #include <assert.h>
 

diff --git a/minix/kernel/system/do_vdevio.c b/minix/kernel/system/do_vdevio.c
index d70fde65500352b561b7628a6d74fd50a2d3a6a5..6af9b602c37bab5c24f25dbd075bbd75b808c369 100644 (file)
--- a/minix/kernel/system/do_vdevio.c
+++ b/minix/kernel/system/do_vdevio.c
@@ -10,7 +10,6 @@
 #include "kernel/system.h"
 #include <minix/devio.h>
 #include <minix/endpoint.h>
-#include <minix/portio.h>
 
 #if USE_VDEVIO
 

diff --git a/minix/kernel/system/do_vmctl.c b/minix/kernel/system/do_vmctl.c
index 6d33fc98c702e1473f41a1492d457bf9c16dd4db..5e991990b743d6e120c17389b1a22173409a5357 100644 (file)
--- a/minix/kernel/system/do_vmctl.c
+++ b/minix/kernel/system/do_vmctl.c
@@ -9,9 +9,7 @@
 
 #include "kernel/system.h"
 #include "kernel/vm.h"
-#include "kernel/debug.h"
 #include <assert.h>
-#include <minix/type.h>
 
 /*===========================================================================*
  *                             do_vmctl                                     *

diff --git a/minix/kernel/table.c b/minix/kernel/table.c
index d52d2fa032a80ace9dd91f6fc5b24127418bcf96..7953d110d0f54d935e4e5100a4199aa8808988f8 100644 (file)
--- a/minix/kernel/table.c
+++ b/minix/kernel/table.c
@@ -30,7 +30,6 @@
 #define _TABLE
 
 #include "kernel/kernel.h"
-#include <minix/com.h>
 
 /* The system image table lists all programs that are part of the boot image. 
  * The order of the entries here MUST agree with the order of the programs

diff --git a/minix/kernel/watchdog.c b/minix/kernel/watchdog.c
index 69e72f159bf7d0378024eea213b2442142f5a473..65bb9ff030511b6f7320e4106cc86913f44eca3d 100644 (file)
--- a/minix/kernel/watchdog.c
+++ b/minix/kernel/watchdog.c
@@ -6,7 +6,6 @@
 
 #include "watchdog.h"
 #include "arch/i386/glo.h"
-#include "profile.h"
 
 unsigned watchdog_local_timer_ticks = 0U;
 struct arch_watchdog *watchdog;