Move kernel headers to include/minoca/kernel/.

apps/include/osbase.h

@@ -26,7 +26,7 @@ extern "C" {
 // ------------------------------------------------------------------- Includes
 //
 
-#include <minoca/driver.h>
+#include <minoca/kernel/driver.h>
 
 //
 // --------------------------------------------------------------------- Macros

apps/libc/dynamic/armv7/fenva.S

@@ -25,7 +25,7 @@ Environment:
 ## ------------------------------------------------------------------- Includes
 ##
 
-#include <minoca/arm.inc>
+#include <minoca/kernel/arm.inc>
 
 ##
 ## ---------------------------------------------------------------- Definitions

apps/libc/dynamic/armv7/setjmpa.S

@@ -24,7 +24,7 @@ Environment:
 ## ------------------------------------------------------------------- Includes
 ##
 
-#include <minoca/arm.inc>
+#include <minoca/kernel/arm.inc>
 
 ##
 ## ---------------------------------------------------------------- Definitions

apps/libc/dynamic/armv7/tlsaddr.S

@@ -25,7 +25,7 @@ Environment:
 ## ------------------------------------------------------------------- Includes
 ##
 
-#include <minoca/arm.inc>
+#include <minoca/kernel/arm.inc>
 
 ##
 ## ---------------------------------------------------------------- Definitions

apps/libc/dynamic/x64/fenv.S

@@ -25,7 +25,7 @@ Environment:
 ## ------------------------------------------------------------------- Includes
 ##
 
-#include <minoca/x64.inc>
+#include <minoca/kernel/x64.inc>
 
 ##
 ## ---------------------------------------------------------------- Definitions

apps/libc/dynamic/x64/setjmpa.S

@@ -24,7 +24,7 @@ Environment:
 ## ------------------------------------------------------------------- Includes
 ##
 
-#include <minoca/x64.inc>
+#include <minoca/kernel/x64.inc>
 
 ##
 ## ---------------------------------------------------------------- Definitions

apps/libc/dynamic/x86/fenv.S

@@ -25,7 +25,7 @@ Environment:
 ## ------------------------------------------------------------------- Includes
 ##
 
-#include <minoca/x86.inc>
+#include <minoca/kernel/x86.inc>
 
 ##
 ## ---------------------------------------------------------------- Definitions

apps/libc/dynamic/x86/setjmpa.S

@@ -24,7 +24,7 @@ Environment:
 ## ------------------------------------------------------------------- Includes
 ##
 
-#include <minoca/x86.inc>
+#include <minoca/kernel/x86.inc>
 
 ##
 ## ---------------------------------------------------------------- Definitions

apps/libc/dynamic/x86/tlsaddr.S

@@ -25,7 +25,7 @@ Environment:
 ## ------------------------------------------------------------------- Includes
 ##
 
-#include <minoca/x86.inc>
+#include <minoca/kernel/x86.inc>
 
 ##
 ## ---------------------------------------------------------------- Definitions

apps/libc/static/armv7/crt0.S

@@ -24,7 +24,7 @@ Environment:
 ## ------------------------------------------------------------------- Includes
 ##
 
-#include <minoca/arm.inc>
+#include <minoca/kernel/arm.inc>
 
 ##
 ## ---------------------------------------------------------------- Definitions

apps/osbase/armv7/osbasea.S

@@ -24,7 +24,7 @@ Environment:
 ## ------------------------------------------------------------------ Includes
 ##
 
-#include <minoca/arm.inc>
+#include <minoca/kernel/arm.inc>
 
 ##
 ## --------------------------------------------------------------- Definitions

apps/osbase/x86/osbasea.S

@@ -24,7 +24,7 @@ Environment:
 ## ------------------------------------------------------------------- Includes
 ##
 
-#include <minoca/x86.inc>
+#include <minoca/kernel/x86.inc>
 
 ##
 ## ---------------------------------------------------------------- Definitions

apps/profile/profile.c

@@ -25,7 +25,7 @@ Environment:
 //
 
 #include <osbase.h>
-#include <minoca/sp.h>
+#include <minoca/kernel/sp.h>
 #include <mlibc.h>
 
 #include <assert.h>

apps/testapps/ktest/driver/ktestdrv.c

@@ -24,7 +24,7 @@ Environment:
 // ------------------------------------------------------------------- Includes
 //
 
-#include <minoca/driver.h>
+#include <minoca/kernel/driver.h>
 #include "ktestdrv.h"
 #include "testsup.h"
 

apps/testapps/ktest/driver/tblock.c

@@ -24,7 +24,7 @@ Environment:
 // ------------------------------------------------------------------- Includes
 //
 
-#include <minoca/driver.h>
+#include <minoca/kernel/driver.h>
 #include "ktestdrv.h"
 #include "testsup.h"
 

apps/testapps/ktest/driver/tdesc.c

@@ -24,7 +24,7 @@ Environment:
 // ------------------------------------------------------------------- Includes
 //
 
-#include <minoca/driver.h>
+#include <minoca/kernel/driver.h>
 #include "ktestdrv.h"
 #include "testsup.h"
 

apps/testapps/ktest/driver/testsup.c

@@ -24,7 +24,7 @@ Environment:
 // ------------------------------------------------------------------- Includes
 //
 
-#include <minoca/driver.h>
+#include <minoca/kernel/driver.h>
 #include "ktestdrv.h"
 #include "testsup.h"
 #include "ktests.h"

apps/testapps/ktest/driver/tpool.c

@@ -24,7 +24,7 @@ Environment:
 // ------------------------------------------------------------------- Includes
 //
 
-#include <minoca/driver.h>
+#include <minoca/kernel/driver.h>
 #include "ktestdrv.h"
 #include "testsup.h"
 

apps/testapps/ktest/driver/tthread.c

@@ -24,7 +24,7 @@ Environment:
 // ------------------------------------------------------------------- Includes
 //
 
-#include <minoca/driver.h>
+#include <minoca/kernel/driver.h>
 #include "ktestdrv.h"
 #include "testsup.h"
 

apps/testapps/ktest/driver/twork.c

@@ -24,7 +24,7 @@ Environment:
 // ------------------------------------------------------------------- Includes
 //
 
-#include <minoca/driver.h>
+#include <minoca/kernel/driver.h>
 #include "ktestdrv.h"
 #include "testsup.h"
 

boot/bootman/bootim.c

@@ -25,7 +25,7 @@ Environment:
 // ------------------------------------------------------------------- Includes
 //
 
-#include <minoca/kernel.h>
+#include <minoca/kernel/kernel.h>
 #include <minoca/lib/fat/fat.h>
 #include "firmware.h"
 #include "bootlib.h"

boot/bootman/bootman.c

@@ -25,7 +25,7 @@ Environment:
 // ------------------------------------------------------------------- Includes
 //
 
-#include <minoca/kernel.h>
+#include <minoca/kernel/kernel.h>
 #include <minoca/lib/fat/fat.h>
 #include "firmware.h"
 #include "bootlib.h"

boot/bootman/efi/bootxfr.c

@@ -25,7 +25,7 @@ Environment:
 // ------------------------------------------------------------------- Includes
 //
 
-#include <minoca/kernel.h>
+#include <minoca/kernel/kernel.h>
 #include <minoca/uefi/uefi.h>
 #include "firmware.h"
 #include "bootlib.h"

boot/bootman/efi/main.c

@@ -25,7 +25,7 @@ Environment:
 // ------------------------------------------------------------------- Includes
 //
 
-#include <minoca/kernel.h>
+#include <minoca/kernel/kernel.h>
 #include <minoca/uefi/uefi.h>
 #include <minoca/uefi/protocol/loadimg.h>
 #include "firmware.h"

boot/bootman/pcat/bootxfr.c

@@ -25,7 +25,7 @@ Environment:
 // ------------------------------------------------------------------- Includes
 //
 
-#include <minoca/kernel.h>
+#include <minoca/kernel/kernel.h>
 #include "firmware.h"
 #include "bootlib.h"
 #include "bootman.h"

boot/bootman/pcat/main.c

@@ -25,7 +25,7 @@ Environment:
 // ------------------------------------------------------------------- Includes
 //
 
-#include <minoca/kernel.h>
+#include <minoca/kernel/kernel.h>
 #include "firmware.h"
 #include "bootlib.h"
 #include "bootman.h"

boot/bootman/pcat/x86/entry.S

@@ -24,7 +24,7 @@ Environment:
 ## ------------------------------------------------------------------ Includes
 ##
 
-#include <minoca/x86.inc>
+#include <minoca/kernel/x86.inc>
 
 ##
 ## ---------------------------------------------------------------------- Code

boot/fatboot/fatboot.c

@@ -29,7 +29,7 @@ Environment:
 #include <minoca/lib/fat/fatlib.h>
 #include "firmware.h"
 #include "bios.h"
-#include <minoca/x86.h>
+#include <minoca/kernel/x86.h>
 #include "realmode.h"
 
 //

boot/fatboot/prochw.c

@@ -24,9 +24,9 @@ Environment:
 // ------------------------------------------------------------------- Includes
 //
 
-#include <minoca/kernel.h>
-#include <minoca/bootload.h>
-#include <minoca/x86.h>
+#include <minoca/kernel/kernel.h>
+#include <minoca/kernel/bootload.h>
+#include <minoca/kernel/x86.h>
 
 //
 // ---------------------------------------------------------------- Definitions

boot/lib/armv6/archsup.S

@@ -25,7 +25,7 @@ Environment:
 ## ------------------------------------------------------------------- Includes
 ##
 
-#include <minoca/arm.inc>
+#include <minoca/kernel/arm.inc>
 
 ##
 ## ---------------------------------------------------------------- Definitions

boot/lib/armv7/archsup.S

@@ -25,7 +25,7 @@ Environment:
 ## ------------------------------------------------------------------- Includes
 ##
 
-#include <minoca/arm.inc>
+#include <minoca/kernel/arm.inc>
 
 ##
 ## ---------------------------------------------------------------- Definitions

boot/lib/armv7/commsup.S

@@ -25,7 +25,7 @@ Environment:
 ## ------------------------------------------------------------------- Includes
 ##
 
-#include <minoca/arm.inc>
+#include <minoca/kernel/arm.inc>
 
 ##
 ## ---------------------------------------------------------------- Definitions

boot/lib/armv7/inttable.S

@@ -24,7 +24,7 @@ Environment:
 ## ---------------------------------------------------------------- Definitions
 ##
 
-#include <minoca/arm.inc>
+#include <minoca/kernel/arm.inc>
 
 ##
 ## ----------------------------------------------------------------------- Code

boot/lib/armv7/prochw.c

@@ -25,9 +25,9 @@ Environment:
 // ------------------------------------------------------------------- Includes
 //
 
-#include <minoca/kernel.h>
-#include <minoca/kdebug.h>
-#include <minoca/arm.h>
+#include <minoca/kernel/kernel.h>
+#include <minoca/kernel/kdebug.h>
+#include <minoca/kernel/arm.h>
 
 //
 // ---------------------------------------------------------------- Definitions

boot/lib/bootfat.c

@@ -25,7 +25,7 @@ Environment:
 // ------------------------------------------------------------------- Includes
 //
 
-#include <minoca/kernel.h>
+#include <minoca/kernel/kernel.h>
 #include <minoca/lib/fat/fat.h>
 #include "firmware.h"
 #include "bootlib.h"

boot/lib/bootmem.c

@@ -25,7 +25,7 @@ Environment:
 // ------------------------------------------------------------------- Includes
 //
 
-#include <minoca/kernel.h>
+#include <minoca/kernel/kernel.h>
 #include "firmware.h"
 #include "bootlibp.h"
 

boot/lib/efi/armv7/efia.S

@@ -24,7 +24,7 @@ Environment:
 ## ------------------------------------------------------------------- Includes
 ##
 
-#include <minoca/arm.inc>
+#include <minoca/kernel/arm.inc>
 
 ##
 ## ---------------------------------------------------------------- Definitions

boot/lib/efi/armv7/efiarch.c

@@ -24,9 +24,9 @@ Environment:
 // ------------------------------------------------------------------- Includes
 //
 
-#include <minoca/kernel.h>
+#include <minoca/kernel/kernel.h>
 #include <minoca/uefi/uefi.h>
-#include <minoca/arm.h>
+#include <minoca/kernel/arm.h>
 #include "firmware.h"
 #include "efisup.h"
 

boot/lib/efi/dbgser.c

@@ -25,7 +25,7 @@ Environment:
 // ------------------------------------------------------------------- Includes
 //
 
-#include <minoca/kernel.h>
+#include <minoca/kernel/kernel.h>
 #include <minoca/uefi/uefi.h>
 #include <minoca/uefi/protocol/serio.h>
 #include "firmware.h"

boot/lib/efi/disk.c

@@ -24,7 +24,7 @@ Environment:
 // ------------------------------------------------------------------- Includes
 //
 
-#include <minoca/kernel.h>
+#include <minoca/kernel/kernel.h>
 #include <minoca/uefi/uefi.h>
 #include <minoca/uefi/protocol/blockio.h>
 #include <minoca/uefi/protocol/loadimg.h>

boot/lib/efi/fwapi.c

@@ -24,7 +24,7 @@ Environment:
 // ------------------------------------------------------------------- Includes
 //
 
-#include <minoca/kernel.h>
+#include <minoca/kernel/kernel.h>
 #include <minoca/uefi/uefi.h>
 #include "firmware.h"
 #include "bootlibp.h"

boot/lib/efi/memory.c

@@ -24,7 +24,7 @@ Environment:
 // ------------------------------------------------------------------- Includes
 //
 
-#include <minoca/kernel.h>
+#include <minoca/kernel/kernel.h>
 #include <minoca/uefi/uefi.h>
 #include "firmware.h"
 #include "bootlib.h"

boot/lib/efi/time.c

@@ -24,7 +24,7 @@ Environment:
 // ------------------------------------------------------------------- Includes
 //
 
-#include <minoca/kernel.h>
+#include <minoca/kernel/kernel.h>
 #include <minoca/uefi/uefi.h>
 #include "firmware.h"
 #include "bootlib.h"

boot/lib/efi/util.c

@@ -24,7 +24,7 @@ Environment:
 // ------------------------------------------------------------------- Includes
 //
 
-#include <minoca/kernel.h>
+#include <minoca/kernel/kernel.h>
 #include <minoca/smbios.h>
 #include <minoca/uefi/uefi.h>
 #include <minoca/uefi/guid/acpi.h>

boot/lib/efi/video.c

@@ -25,7 +25,7 @@ Environment:
 // ------------------------------------------------------------------- Includes
 //
 
-#include <minoca/kernel.h>
+#include <minoca/kernel/kernel.h>
 #include <minoca/uefi/uefi.h>
 #include <minoca/uefi/protocol/graphout.h>
 #include "firmware.h"

boot/lib/efi/x86/efia.S

@@ -24,7 +24,7 @@ Environment:
 ## ------------------------------------------------------------------ Includes
 ##
 
-#include <minoca/x86.inc>
+#include <minoca/kernel/x86.inc>
 
 ##
 ## ---------------------------------------------------------------------- Code

boot/lib/efi/x86/efiarch.c

@@ -24,9 +24,9 @@ Environment:
 // ------------------------------------------------------------------- Includes
 //
 
-#include <minoca/kernel.h>
+#include <minoca/kernel/kernel.h>
 #include <minoca/uefi/uefi.h>
-#include <minoca/x86.h>
+#include <minoca/kernel/x86.h>
 #include "firmware.h"
 #include "efisup.h"
 

boot/lib/file.c

@@ -24,7 +24,7 @@ Environment:
 // ------------------------------------------------------------------- Includes
 //
 
-#include <minoca/kernel.h>
+#include <minoca/kernel/kernel.h>
 #include <minoca/lib/fat/fat.h>
 #include "firmware.h"
 #include "bootlibp.h"

boot/lib/include/firmware.h

@@ -21,7 +21,7 @@ Author:
 //
 
 #include <minoca/lib/bconf.h>
-#include <minoca/bootload.h>
+#include <minoca/kernel/bootload.h>
 
 //
 // ---------------------------------------------------------------- Definitions

boot/lib/pcat/fwapi.c

@@ -24,8 +24,8 @@ Environment:
 // ------------------------------------------------------------------- Includes
 //
 
-#include <minoca/kernel.h>
-#include <minoca/x86.h>
+#include <minoca/kernel/kernel.h>
+#include <minoca/kernel/x86.h>
 #include "realmode.h"
 #include "firmware.h"
 #include "bootlibp.h"

boot/lib/pcat/int10.c

@@ -24,8 +24,8 @@ Environment:
 // ------------------------------------------------------------------- Includes
 //
 
-#include <minoca/kernel.h>
-#include <minoca/x86.h>
+#include <minoca/kernel/kernel.h>
+#include <minoca/kernel/x86.h>
 #include "firmware.h"
 #include <minoca/lib/basevid.h>
 #include "realmode.h"

boot/lib/pcat/int13.c

@@ -24,9 +24,9 @@ Environment:
 // ------------------------------------------------------------------- Includes
 //
 
-#include <minoca/kernel.h>
+#include <minoca/kernel/kernel.h>
 #include <minoca/lib/partlib.h>
-#include <minoca/x86.h>
+#include <minoca/kernel/x86.h>
 #include "firmware.h"
 #include "bootlib.h"
 #include "realmode.h"

boot/lib/pcat/memory.c

@@ -25,8 +25,8 @@ Environment:
 // ------------------------------------------------------------------- Includes
 //
 
-#include <minoca/kernel.h>
-#include <minoca/x86.h>
+#include <minoca/kernel/kernel.h>
+#include <minoca/kernel/x86.h>
 #include "realmode.h"
 #include "firmware.h"
 #include "bootlib.h"

boot/lib/pcat/realmexe.S

@@ -25,7 +25,7 @@ Environment:
 ## ------------------------------------------------------------------ Includes
 ##
 
-#include <minoca/x86.inc>
+#include <minoca/kernel/x86.inc>
 
 ##
 ## --------------------------------------------------------------- Definitions

boot/lib/pcat/realmode.c

@@ -25,8 +25,8 @@ Environment:
 // ------------------------------------------------------------------- Includes
 //
 
-#include <minoca/kernel.h>
-#include <minoca/x86.h>
+#include <minoca/kernel/kernel.h>
+#include <minoca/kernel/x86.h>
 #include "realmode.h"
 
 //

boot/lib/pcat/reset.c

@@ -25,9 +25,9 @@ Environment:
 // ------------------------------------------------------------------- Includes
 //
 
-#include <minoca/kernel.h>
-#include <minoca/x86.h>
-#include <minoca/ioport.h>
+#include <minoca/kernel/kernel.h>
+#include <minoca/kernel/x86.h>
+#include <minoca/kernel/ioport.h>
 #include "firmware.h"
 #include "bootlib.h"
 #include "realmode.h"

boot/lib/pcat/rsdp.c

@@ -25,7 +25,7 @@ Environment:
 // ------------------------------------------------------------------- Includes
 //
 
-#include <minoca/kernel.h>
+#include <minoca/kernel/kernel.h>
 #include <minoca/smbios.h>
 #include "firmware.h"
 #include "bios.h"

boot/lib/pcat/time.c

@@ -25,8 +25,8 @@ Environment:
 // ------------------------------------------------------------------- Includes
 //
 
-#include <minoca/kernel.h>
-#include <minoca/x86.h>
+#include <minoca/kernel/kernel.h>
+#include <minoca/kernel/x86.h>
 #include "firmware.h"
 #include "bootlib.h"
 #include "realmode.h"

boot/lib/stubs.c

@@ -25,7 +25,7 @@ Environment:
 // ------------------------------------------------------------------- Includes
 //
 
-#include <minoca/kernel.h>
+#include <minoca/kernel/kernel.h>
 #include "firmware.h"
 #include "bootlib.h"
 

boot/lib/version.c

@@ -25,7 +25,7 @@ Environment:
 // ------------------------------------------------------------------- Includes
 //
 
-#include <minoca/kernel.h>
+#include <minoca/kernel/kernel.h>
 
 //
 // --------------------------------------------------------------------- Macros

boot/lib/x86/archsup.S

@@ -25,7 +25,7 @@ Environment:
 ## ------------------------------------------------------------------- Includes
 ##
 
-#include <minoca/x86.inc>
+#include <minoca/kernel/x86.inc>
 
 ##
 ## -------------------------------------------------------------------- Macros

boot/lib/x86/prochw.c

@@ -24,10 +24,10 @@ Environment:
 // ------------------------------------------------------------------- Includes
 //
 
-#include <minoca/kernel.h>
-#include <minoca/bootload.h>
-#include <minoca/x86.h>
-#include <minoca/ioport.h>
+#include <minoca/kernel/kernel.h>
+#include <minoca/kernel/bootload.h>
+#include <minoca/kernel/x86.h>
+#include <minoca/kernel/ioport.h>
 
 //
 // ---------------------------------------------------------------- Definitions

boot/loader/armv6/archsupc.c

@@ -24,8 +24,8 @@ Environment:
 // ------------------------------------------------------------------- Includes
 //
 
-#include <minoca/kernel.h>
-#include <minoca/arm.h>
+#include <minoca/kernel/kernel.h>
+#include <minoca/kernel/arm.h>
 #include "firmware.h"
 #include "bootlib.h"
 #include "paging.h"

boot/loader/armv7/archsupc.c

@@ -24,8 +24,8 @@ Environment:
 // ------------------------------------------------------------------- Includes
 //
 
-#include <minoca/kernel.h>
-#include <minoca/arm.h>
+#include <minoca/kernel/kernel.h>
+#include <minoca/kernel/arm.h>
 #include "firmware.h"
 #include "bootlib.h"
 #include "paging.h"

boot/loader/armv7/dbgparch.c

@@ -24,7 +24,7 @@ Environment:
 // ------------------------------------------------------------------- Includes
 //
 
-#include <minoca/kernel.h>
+#include <minoca/kernel/kernel.h>
 #include "firmware.h"
 #include "bootlib.h"
 #include "loader.h"

boot/loader/armv7/kernxfr.S

@@ -25,7 +25,7 @@ Environment:
 ## ------------------------------------------------------------------ Includes
 ##
 
-#include <minoca/arm.inc>
+#include <minoca/kernel/arm.inc>
 
 ##
 ## --------------------------------------------------------------- Definitions

boot/loader/armv7/paging.c

@@ -24,8 +24,8 @@ Environment:
 // ------------------------------------------------------------------- Includes
 //
 
-#include <minoca/kernel.h>
-#include <minoca/arm.h>
+#include <minoca/kernel/kernel.h>
+#include <minoca/kernel/arm.h>
 #include "firmware.h"
 #include "paging.h"
 

boot/loader/bootim.c

@@ -25,7 +25,7 @@ Environment:
 // ------------------------------------------------------------------- Includes
 //
 
-#include <minoca/kernel.h>
+#include <minoca/kernel/kernel.h>
 #include <minoca/lib/fat/fat.h>
 #include "firmware.h"
 #include "bootlib.h"

boot/loader/dbgport.c

@@ -24,7 +24,7 @@ Environment:
 // ------------------------------------------------------------------- Includes
 //
 
-#include <minoca/kernel.h>
+#include <minoca/kernel/kernel.h>
 #include "firmware.h"
 #include "bootlib.h"
 #include "paging.h"

boot/loader/efi/memory.c

@@ -24,7 +24,7 @@ Environment:
 // ------------------------------------------------------------------- Includes
 //
 
-#include <minoca/kernel.h>
+#include <minoca/kernel/kernel.h>
 #include <minoca/uefi/uefi.h>
 #include "firmware.h"
 #include <minoca/lib/basevid.h>

boot/loader/loader.c

@@ -25,7 +25,7 @@ Environment:
 // ------------------------------------------------------------------- Includes
 //
 
-#include <minoca/kernel.h>
+#include <minoca/kernel/kernel.h>
 #include <minoca/smbios.h>
 #include <minoca/lib/fat/fat.h>
 #include "firmware.h"

boot/loader/pcat/memory.c

@@ -25,8 +25,8 @@ Environment:
 // ------------------------------------------------------------------- Includes
 //
 
-#include <minoca/kernel.h>
-#include <minoca/x86.h>
+#include <minoca/kernel/kernel.h>
+#include <minoca/kernel/x86.h>
 #include "firmware.h"
 #include <minoca/lib/basevid.h>
 #include "bios.h"

boot/loader/x86/archsupc.c

@@ -25,9 +25,9 @@ Environment:
 // ------------------------------------------------------------------- Includes
 //
 
-#include <minoca/kernel.h>
-#include <minoca/x86.h>
-#include <minoca/ioport.h>
+#include <minoca/kernel/kernel.h>
+#include <minoca/kernel/x86.h>
+#include <minoca/kernel/ioport.h>
 #include "firmware.h"
 #include "bootlib.h"
 #include "paging.h"

boot/loader/x86/dbgparch.c

@@ -24,9 +24,9 @@ Environment:
 // ------------------------------------------------------------------- Includes
 //
 
-#include <minoca/kernel.h>
-#include <minoca/ioport.h>
-#include <minoca/x86.h>
+#include <minoca/kernel/kernel.h>
+#include <minoca/kernel/ioport.h>
+#include <minoca/kernel/x86.h>
 #include "firmware.h"
 #include "bootlib.h"
 #include "loader.h"

boot/loader/x86/entry.S

@@ -24,7 +24,7 @@ Environment:
 ## ------------------------------------------------------------------ Includes
 ##
 
-#include <minoca/x86.inc>
+#include <minoca/kernel/x86.inc>
 
 ##
 ## ---------------------------------------------------------------------- Code

boot/loader/x86/kernxfr.S

@@ -25,7 +25,7 @@ Environment:
 ## ------------------------------------------------------------------- Includes
 ##
 
-#include <minoca/x86.inc>
+#include <minoca/kernel/x86.inc>
 
 ##
 ## ---------------------------------------------------------------- Definitions

boot/loader/x86/paging.c

@@ -24,8 +24,8 @@ Environment:
 // ------------------------------------------------------------------- Includes
 //
 
-#include <minoca/kernel.h>
-#include <minoca/x86.h>
+#include <minoca/kernel/kernel.h>
+#include <minoca/kernel/x86.h>
 #include "firmware.h"
 #include "paging.h"
 #include "bootlib.h"

debug/client/dbgapi.h

@@ -20,7 +20,7 @@ Author:
 // ------------------------------------------------------------------- Includes
 //
 
-#include <minoca/ksignals.h>
+#include <minoca/kernel/ksignals.h>
 
 //
 // --------------------------------------------------------------------- Macros

debug/kexts/memory.c

@@ -24,7 +24,7 @@ Environment:
 // ------------------------------------------------------------------- Includes
 //
 
-#include <minoca/driver.h>
+#include <minoca/kernel/driver.h>
 #include "dbgext.h"
 
 #include <assert.h>

debug/kexts/objects.c

@@ -24,7 +24,7 @@ Environment:
 // ------------------------------------------------------------------- Includes
 //
 
-#include <minoca/driver.h>
+#include <minoca/kernel/driver.h>
 #include "dbgext.h"
 
 #include <assert.h>

debug/kexts/reslist.c

@@ -24,7 +24,7 @@ Environment:
 // ------------------------------------------------------------------- Includes
 //
 
-#include <minoca/kernel.h>
+#include <minoca/kernel/kernel.h>
 #include "dbgext.h"
 #include "../../kernel/io/arb.h"
 

debug/kexts/threads.c

@@ -24,8 +24,8 @@ Environment:
 // ------------------------------------------------------------------- Includes
 //
 
-#include <minoca/driver.h>
-#include <minoca/arm.h>
+#include <minoca/kernel/driver.h>
+#include <minoca/kernel/arm.h>
 #include "dbgext.h"
 
 #include <errno.h>

drivers/acpi/acpidrv.c

@@ -24,7 +24,7 @@ Environment:
 // ------------------------------------------------------------------- Includes
 //
 
-#include <minoca/driver.h>
+#include <minoca/kernel/driver.h>
 #include "acpip.h"
 #include "fixedreg.h"
 #include "namespce.h"

drivers/acpi/acpiobj.h

@@ -22,7 +22,7 @@ Author:
 //
 
 #include "oprgnos.h"
-#include <minoca/acpi.h>
+#include <minoca/kernel/acpi.h>
 
 //
 // --------------------------------------------------------------------- Macros

drivers/acpi/aml.c

@@ -24,7 +24,7 @@ Environment:
 // ------------------------------------------------------------------- Includes
 //
 
-#include <minoca/driver.h>
+#include <minoca/kernel/driver.h>
 #include "acpip.h"
 #include "amlos.h"
 #include "amlops.h"

drivers/acpi/amlopcr.c

@@ -25,7 +25,7 @@ Environment:
 // ------------------------------------------------------------------- Includes
 //
 
-#include <minoca/driver.h>
+#include <minoca/kernel/driver.h>
 #include "acpiobj.h"
 #include "amlos.h"
 #include "amlops.h"

drivers/acpi/amlopex.c

@@ -25,7 +25,7 @@ Environment:
 // ------------------------------------------------------------------- Includes
 //
 
-#include <minoca/driver.h>
+#include <minoca/kernel/driver.h>
 #include "acpip.h"
 #include "amlos.h"
 #include "amlops.h"

drivers/acpi/amloptab.c

@@ -25,7 +25,7 @@ Environment:
 // ------------------------------------------------------------------- Includes
 //
 
-#include <minoca/driver.h>
+#include <minoca/kernel/driver.h>
 #include "acpiobj.h"
 #include "amlops.h"
 

drivers/acpi/amlos.c

@@ -25,7 +25,7 @@ Environment:
 // ------------------------------------------------------------------- Includes
 //
 
-#include <minoca/driver.h>
+#include <minoca/kernel/driver.h>
 #include "acpiobj.h"
 #include "amlos.h"
 #include "amlops.h"

drivers/acpi/armv7/procarch.c

@@ -25,7 +25,7 @@ Environment:
 // ------------------------------------------------------------------- Includes
 //
 
-#include <minoca/driver.h>
+#include <minoca/kernel/driver.h>
 #include "../acpip.h"
 #include "../proc.h"
 #include "../namespce.h"

drivers/acpi/drvsup.c

@@ -24,7 +24,7 @@ Environment:
 // ------------------------------------------------------------------- Includes
 //
 
-#include <minoca/driver.h>
+#include <minoca/kernel/driver.h>
 #include <minoca/intrface/acpi.h>
 #include "acpip.h"
 #include "fixedreg.h"

drivers/acpi/earlypci.c

@@ -25,8 +25,8 @@ Environment:
 // ------------------------------------------------------------------- Includes
 //
 
-#include <minoca/driver.h>
-#include <minoca/ioport.h>
+#include <minoca/kernel/driver.h>
+#include <minoca/kernel/ioport.h>
 #include "acpiobj.h"
 #include "amlos.h"
 #include "earlypci.h"

drivers/acpi/fixedreg.c

@@ -26,7 +26,7 @@ Environment:
 // ------------------------------------------------------------------- Includes
 //
 
-#include <minoca/driver.h>
+#include <minoca/kernel/driver.h>
 #include "acpip.h"
 #include "amlos.h"
 #include "fixedreg.h"

drivers/acpi/namespce.c

@@ -24,7 +24,7 @@ Environment:
 // ------------------------------------------------------------------- Includes
 //
 
-#include <minoca/driver.h>
+#include <minoca/kernel/driver.h>
 #include "acpip.h"
 #include "amlos.h"
 #include "amlops.h"

drivers/acpi/oprgn.c

@@ -24,7 +24,7 @@ Environment:
 // ------------------------------------------------------------------- Includes
 //
 
-#include <minoca/driver.h>
+#include <minoca/kernel/driver.h>
 #include "acpiobj.h"
 #include "amlos.h"
 #include "namespce.h"

drivers/acpi/oprgnos.c

@@ -25,7 +25,7 @@ Environment:
 // ------------------------------------------------------------------- Includes
 //
 
-#include <minoca/driver.h>
+#include <minoca/kernel/driver.h>
 #include <minoca/intrface/pci.h>
 #include "acpip.h"
 #include "namespce.h"

drivers/acpi/proc.c

@@ -24,7 +24,7 @@ Environment:
 // ------------------------------------------------------------------- Includes
 //
 
-#include <minoca/driver.h>
+#include <minoca/kernel/driver.h>
 #include "acpip.h"
 #include "proc.h"
 #include "namespce.h"

drivers/acpi/resdesc.c

@@ -25,7 +25,7 @@ Environment:
 // ------------------------------------------------------------------- Includes
 //
 
-#include <minoca/driver.h>
+#include <minoca/kernel/driver.h>
 #include <minoca/intrface/acpi.h>
 #include "acpip.h"
 #include "namespce.h"

drivers/acpi/x86/procarch.c

@@ -25,8 +25,8 @@ Environment:
 // ------------------------------------------------------------------- Includes
 //
 
-#include <minoca/driver.h>
-#include <minoca/x86.h>
+#include <minoca/kernel/driver.h>
+#include <minoca/kernel/x86.h>
 #include "../acpip.h"
 #include "../proc.h"
 #include "../namespce.h"

drivers/ata/ata.c

@@ -24,7 +24,7 @@ Environment:
 // ------------------------------------------------------------------- Includes
 //
 
-#include <minoca/driver.h>
+#include <minoca/kernel/driver.h>
 #include <minoca/intrface/disk.h>
 #include <minoca/intrface/pci.h>
 #include "ata.h"