From 1b7a28efb82d15a9ba8d258dcb96a837dbcca6b4 Mon Sep 17 00:00:00 2001
From: Travis Geiselbrecht <travisg@gmail.com>
Date: Mon, 17 Jun 2019 18:28:51 -0700
Subject: [PATCH] [include][lk] fixup lk/ include path move

---
 app/accelerometer/accelerometer.c                  |  4 ++--
 app/cdcserialtest/cdcserialtest.c                  |  2 +-
 app/inetsrv/inetsrv.c                              |  8 ++++----
 app/lkboot/commands.c                              |  8 ++++----
 app/lkboot/dcc.c                                   |  8 ++++----
 app/lkboot/inet.c                                  |  8 ++++----
 app/lkboot/lkboot.c                                |  8 ++++----
 app/lpcboot/lpc43xx-spifi.c                        |  4 ++--
 app/lpcboot/lpcboot.c                              |  4 ++--
 app/mdebug/jtag.c                                  |  2 +-
 app/mdebug/mdebug.c                                |  2 +-
 app/mdebug/rswd.c                                  |  4 ++--
 app/mdebug/swd-m0sub.c                             |  2 +-
 app/mdebug/swd-sgpio.c                             |  2 +-
 app/mdebug/swo-uart1.c                             |  4 ++--
 app/moot/fsboot.c                                  |  6 +++---
 app/moot/moot.c                                    |  6 +++---
 app/moot/stubs.c                                   |  4 ++--
 app/moot/usbboot.c                                 |  4 ++--
 app/ndebugtest/ndebugtest.c                        |  4 ++--
 app/pcitests/pci_tests.c                           |  4 ++--
 app/shell/shell.c                                  |  2 +-
 app/tests/benchmarks.c                             |  2 +-
 app/tests/cbuf_tests.c                             |  4 ++--
 app/tests/clock_tests.c                            |  2 +-
 app/tests/fibo.c                                   |  2 +-
 app/tests/float.c                                  |  2 +-
 app/tests/float_instructions.S                     |  2 +-
 app/tests/mem_tests.c                              |  4 ++--
 app/tests/port_tests.c                             |  6 +++---
 app/tests/printf_tests.c                           |  4 ++--
 app/tests/tests.c                                  |  4 ++--
 app/tests/thread_tests.c                           |  6 +++---
 app/udctest/udctest.c                              |  2 +-
 app/usbtest/descriptor.c                           |  6 +++---
 app/usbtest/usbtest.c                              |  6 +++---
 app/zynq-common/init.c                             |  4 ++--
 arch/arm/arm-m/arch.c                              |  2 +-
 arch/arm/arm-m/cache.c                             |  2 +-
 arch/arm/arm-m/exceptions.c                        |  6 +++---
 arch/arm/arm-m/include/arch/arm/cm.h               |  2 +-
 arch/arm/arm-m/spin_cycles.c                       |  2 +-
 arch/arm/arm-m/start.c                             |  4 ++--
 arch/arm/arm-m/systick/systick.c                   |  6 +++---
 arch/arm/arm-m/thread.c                            |  4 ++--
 arch/arm/arm-m/vectab.c                            |  2 +-
 arch/arm/arm/arch.c                                | 10 +++++-----
 arch/arm/arm/asm.S                                 |  2 +-
 arch/arm/arm/cache-ops.S                           |  2 +-
 arch/arm/arm/debug.c                               |  4 ++--
 arch/arm/arm/exceptions.S                          |  2 +-
 arch/arm/arm/faults.c                              |  4 ++--
 arch/arm/arm/fpu.c                                 |  2 +-
 arch/arm/arm/include/arch/aspace.h                 |  4 ++--
 arch/arm/arm/mmu.c                                 | 10 +++++-----
 arch/arm/arm/mp.c                                  |  4 ++--
 arch/arm/arm/ops.S                                 |  2 +-
 arch/arm/arm/start.S                               |  2 +-
 arch/arm/arm/thread.c                              |  4 ++--
 arch/arm/include/arch/arch_ops.h                   |  4 ++--
 arch/arm/include/arch/arm.h                        |  2 +-
 arch/arm/include/arch/arm/mmu.h                    |  2 +-
 arch/arm/include/arch/spinlock.h                   |  2 +-
 arch/arm64/arch.c                                  |  4 ++--
 arch/arm64/asm.S                                   |  2 +-
 arch/arm64/cache-ops.S                             |  2 +-
 arch/arm64/exceptions.S                            |  2 +-
 arch/arm64/exceptions_c.c                          |  4 ++--
 arch/arm64/fpu.c                                   |  2 +-
 arch/arm64/include/arch/arch_ops.h                 |  4 ++--
 arch/arm64/include/arch/arm64.h                    |  2 +-
 arch/arm64/include/arch/arm64/mmu.h                |  2 +-
 arch/arm64/include/arch/aspace.h                   |  4 ++--
 arch/arm64/mmu.c                                   |  6 +++---
 arch/arm64/mp.c                                    |  4 ++--
 arch/arm64/spinlock.S                              |  2 +-
 arch/arm64/start.S                                 |  2 +-
 arch/arm64/thread.c                                |  4 ++--
 arch/microblaze/arch.c                             |  4 ++--
 arch/microblaze/asm.S                              |  2 +-
 arch/microblaze/exceptions.c                       |  4 ++--
 arch/microblaze/include/arch/arch_ops.h            |  2 +-
 arch/microblaze/start.S                            |  2 +-
 arch/microblaze/thread.c                           |  4 ++--
 arch/mips/arch.c                                   |  6 +++---
 arch/mips/asm.S                                    |  2 +-
 arch/mips/exceptions.c                             |  6 +++---
 arch/mips/include/arch/arch_ops.h                  |  2 +-
 arch/mips/include/arch/mips.h                      |  2 +-
 arch/mips/start.S                                  |  2 +-
 arch/mips/thread.c                                 |  4 ++--
 arch/mips/timer.c                                  |  8 ++++----
 arch/mips/vectors.S                                |  2 +-
 arch/or1k/arch.c                                   |  6 +++---
 arch/or1k/asm.S                                    |  2 +-
 arch/or1k/faults.c                                 |  2 +-
 arch/or1k/include/arch/arch_ops.h                  |  2 +-
 arch/or1k/mmu.c                                    |  6 +++---
 arch/or1k/start.S                                  |  2 +-
 arch/or1k/thread.c                                 |  4 ++--
 arch/riscv/arch.c                                  |  4 ++--
 arch/riscv/asm.S                                   |  2 +-
 arch/riscv/clint.c                                 | 10 +++++-----
 arch/riscv/exceptions.c                            |  4 ++--
 arch/riscv/include/arch/arch_ops.h                 |  4 ++--
 arch/riscv/start.S                                 |  2 +-
 arch/riscv/thread.c                                |  4 ++--
 arch/x86/32/asm.S                                  |  2 +-
 arch/x86/32/exceptions.S                           |  2 +-
 arch/x86/32/mmu.c                                  |  8 ++++----
 arch/x86/32/ops.S                                  |  2 +-
 arch/x86/32/start.S                                |  2 +-
 arch/x86/64/asm.S                                  |  2 +-
 arch/x86/64/exceptions.S                           |  2 +-
 arch/x86/64/mmu.c                                  |  8 ++++----
 arch/x86/64/ops.S                                  |  2 +-
 arch/x86/64/start.S                                |  2 +-
 arch/x86/arch.c                                    |  2 +-
 arch/x86/descriptor.c                              |  2 +-
 arch/x86/faults.c                                  |  4 ++--
 arch/x86/fpu.c                                     |  2 +-
 arch/x86/gdt.S                                     |  2 +-
 arch/x86/include/arch/arch_ops.h                   |  2 +-
 arch/x86/include/arch/aspace.h                     |  2 +-
 arch/x86/include/arch/x86.h                        |  2 +-
 arch/x86/include/arch/x86/mmu.h                    |  2 +-
 arch/x86/thread.c                                  |  2 +-
 dev/cache/pl310/pl310.c                            |  6 +++---
 dev/class/block_api.c                              |  2 +-
 dev/class/fb_api.c                                 |  2 +-
 dev/class/i2c_api.c                                |  2 +-
 dev/class/netif_api.c                              |  2 +-
 dev/class/spi_api.c                                |  2 +-
 dev/class/uart_api.c                               |  2 +-
 dev/driver.c                                       |  4 ++--
 dev/fbcon/fbcon.c                                  |  4 ++--
 dev/gpio_i2c/gpio_i2c.c                            |  6 +++---
 dev/interrupt/arm_gic/arm_gic.c                    | 10 +++++-----
 dev/interrupt/or1k_pic/or1k_pic.c                  |  4 ++--
 dev/keys/gpio_keypad.c                             |  2 +-
 dev/keys/keys.c                                    |  4 ++--
 dev/net/pcnet/pcnet.c                              |  8 ++++----
 dev/net/smc91c96/smc91c96.c                        |  4 ++--
 dev/timer/arm_cortex_a9/arm_cortex_a9_timer.c      |  6 +++---
 dev/timer/arm_generic/arm_generic_timer.c          |  2 +-
 dev/timer/or1k_ticktimer/or1k_ticktimer.c          |  4 ++--
 dev/usb/class/bulktest/bulktest.c                  |  8 ++++----
 dev/usb/class/cdcserial/cdcserial.c                |  4 ++--
 dev/usb/usb.c                                      |  8 ++++----
 dev/virtio/block/include/dev/virtio/block.h        |  2 +-
 dev/virtio/block/virtio-block.c                    | 10 +++++-----
 dev/virtio/gpu/include/dev/virtio/gpu.h            |  2 +-
 dev/virtio/gpu/virtio-gpu.c                        | 10 +++++-----
 dev/virtio/include/dev/virtio.h                    |  4 ++--
 dev/virtio/include/dev/virtio/virtio_ring.h        |  2 +-
 dev/virtio/net/include/dev/virtio/net.h            |  2 +-
 dev/virtio/net/virtio-net.c                        | 10 +++++-----
 dev/virtio/virtio.c                                | 12 ++++++------
 dev/virtio/virtio_priv.h                           |  2 +-
 external/arch/arm/arm-m/CMSIS/Include/cmsis_gcc.h  |  2 +-
 external/lib/aes/test/aes_test.c                   |  4 ++--
 external/lib/cksum/debug.c                         |  2 +-
 external/lib/cksum/include/lib/cksum.h             |  2 +-
 external/lib/heap/dlmalloc/dlmalloc.c              |  2 +-
 external/lib/lwip/include/arch/cc.h                |  2 +-
 external/lib/lwip/netif.c                          |  8 ++++----
 external/lib/lwip/sys_arch.c                       |  4 ++--
 .../STM32F7xx_HAL_Driver/Src/stm32f7xx_hal_qspi.c  |  2 +-
 .../stm32f7xx/STM32F7xx_HAL_Driver/lk_hal.c        |  2 +-
 include/app.h                                      |  2 +-
 include/arch.h                                     |  2 +-
 include/arch/mmu.h                                 |  2 +-
 include/arch/ops.h                                 |  2 +-
 include/dev/class/block.h                          |  2 +-
 include/dev/class/fb.h                             |  2 +-
 include/dev/class/i2c.h                            |  2 +-
 include/dev/class/netif.h                          |  4 ++--
 include/dev/class/spi.h                            |  2 +-
 include/dev/display.h                              |  2 +-
 include/dev/driver.h                               |  4 ++--
 include/dev/pci.h                                  |  2 +-
 include/dev/usb.h                                  |  2 +-
 include/dev/usbc.h                                 |  2 +-
 include/hw/usb.h                                   |  2 +-
 include/kernel/debug.h                             |  4 ++--
 include/kernel/event.h                             |  2 +-
 include/kernel/mp.h                                |  2 +-
 include/kernel/mutex.h                             |  4 ++--
 include/kernel/port.h                              |  2 +-
 include/kernel/semaphore.h                         |  2 +-
 include/kernel/spinlock.h                          |  2 +-
 include/kernel/thread.h                            |  6 +++---
 include/kernel/timer.h                             |  4 ++--
 include/kernel/vm.h                                |  4 ++--
 include/kernel/wait.h                              |  4 ++--
 include/lib/console.h                              |  2 +-
 include/lib/dpc.h                                  |  2 +-
 include/lib/font.h                                 |  2 +-
 include/lib/gfx.h                                  |  2 +-
 include/lib/page_alloc.h                           |  2 +-
 include/lib/ptable.h                               |  2 +-
 include/platform.h                                 |  2 +-
 include/platform/debug.h                           |  2 +-
 include/target.h                                   |  2 +-
 kernel/debug.c                                     |  4 ++--
 kernel/event.c                                     |  4 ++--
 kernel/init.c                                      |  4 ++--
 kernel/mp.c                                        |  4 ++--
 kernel/mutex.c                                     |  4 ++--
 kernel/novm/novm.c                                 |  4 ++--
 kernel/port.c                                      |  8 ++++----
 kernel/semaphore.c                                 |  4 ++--
 kernel/thread.c                                    |  6 +++---
 kernel/timer.c                                     |  6 +++---
 kernel/vm/bootalloc.c                              |  2 +-
 kernel/vm/pmm.c                                    |  8 ++++----
 kernel/vm/vm.c                                     |  6 +++---
 kernel/vm/vmm.c                                    |  4 ++--
 lib/bcache/bcache.c                                |  6 +++---
 lib/bio/bio.c                                      | 10 +++++-----
 lib/bio/debug.c                                    |  4 ++--
 lib/bio/include/lib/bio.h                          |  2 +-
 lib/bio/mem.c                                      |  4 ++--
 lib/bio/subdev.c                                   |  6 +++---
 lib/bootargs/bootargs.c                            |  4 ++--
 lib/bootimage/bootimage.c                          |  6 +++---
 lib/bootimage/include/lib/bootimage.h              |  2 +-
 lib/buildsig/buildsig.c                            |  6 +++---
 lib/cbuf/cbuf.c                                    |  6 +++---
 lib/cbuf/include/lib/cbuf.h                        |  2 +-
 lib/cdcconsole/cdcconsole.c                        |  4 ++--
 lib/console/console.c                              |  6 +++---
 lib/debug/debug.c                                  |  4 ++--
 lib/debugcommands/debugcommands.c                  |  4 ++--
 lib/dpc/dpc.c                                      |  6 +++---
 lib/elf/elf.c                                      |  6 +++---
 lib/evlog/evlog.c                                  |  6 +++---
 lib/font/font.c                                    |  2 +-
 lib/fs/debug.c                                     |  4 ++--
 lib/fs/ext2/dir.c                                  |  6 +++---
 lib/fs/ext2/ext2.c                                 |  6 +++---
 lib/fs/ext2/file.c                                 |  6 +++---
 lib/fs/ext2/io.c                                   |  4 ++--
 lib/fs/fat32/fat.c                                 |  6 +++---
 lib/fs/fat32/file.c                                |  6 +++---
 lib/fs/fs.c                                        |  8 ++++----
 lib/fs/include/lib/fs.h                            |  2 +-
 lib/fs/memfs/memfs.c                               |  8 ++++----
 lib/fs/shell.c                                     |  6 +++---
 lib/fs/spifs/spifs.c                               | 10 +++++-----
 lib/fs/spifs/test/spifstest.c                      |  2 +-
 lib/gfx/gfx.c                                      |  4 ++--
 lib/gfxconsole/gfxconsole.c                        |  2 +-
 lib/heap/cmpctmalloc/cmpctmalloc.c                 |  4 ++--
 lib/heap/cmpctmalloc/include/lib/cmpctmalloc.h     |  2 +-
 lib/heap/heap_wrapper.c                            |  8 ++++----
 lib/heap/include/lib/heap.h                        |  2 +-
 lib/heap/miniheap/include/lib/miniheap.h           |  2 +-
 lib/heap/miniheap/miniheap.c                       |  8 ++++----
 lib/heap/new.cpp                                   |  2 +-
 lib/heap/page_alloc.c                              |  4 ++--
 lib/io/console.c                                   |  6 +++---
 lib/io/include/lib/io.h                            |  4 ++--
 lib/io/io.c                                        |  4 ++--
 lib/iovec/iovec.c                                  |  4 ++--
 lib/klog/include/lib/klog.h                        |  2 +-
 lib/klog/klog.c                                    |  6 +++---
 lib/libc/include/assert.h                          |  4 ++--
 lib/libc/include/ctype.h                           |  2 +-
 lib/libc/include/errno.h                           |  2 +-
 lib/libc/include/iovec.h                           |  2 +-
 lib/libc/include/malloc.h                          |  2 +-
 lib/libc/include/printf.h                          |  2 +-
 lib/libc/include/rand.h                            |  2 +-
 lib/libc/include/stdio.h                           |  2 +-
 lib/libc/include/stdlib.h                          |  2 +-
 lib/libc/include/string.h                          |  2 +-
 lib/libc/include/strings.h                         |  2 +-
 lib/libc/printf.c                                  |  2 +-
 lib/libc/pure_virtual.cpp                          |  2 +-
 lib/libc/stdio.c                                   |  2 +-
 lib/libc/string/arch/arm/arm-m/memcpy.S            |  2 +-
 lib/libc/string/arch/arm/arm-m/memset.S            |  2 +-
 lib/libc/string/arch/arm/arm/memcpy.S              |  2 +-
 lib/libc/string/arch/arm/arm/memset.S              |  2 +-
 lib/libc/string/arch/x86-64/memcpy.S               |  2 +-
 lib/libc/string/arch/x86-64/memset.S               |  2 +-
 lib/libc/string/arch/x86/memcpy.S                  |  2 +-
 lib/libc/string/arch/x86/memset.S                  |  2 +-
 lib/minip/arp.c                                    |  4 ++--
 lib/minip/dhcp.c                                   |  4 ++--
 lib/minip/include/lib/minip.h                      |  2 +-
 lib/minip/include/lib/pktbuf.h                     |  2 +-
 lib/minip/lk_console.c                             |  2 +-
 lib/minip/minip-internal.h                         |  4 ++--
 lib/minip/minip.c                                  |  8 ++++----
 lib/minip/net_timer.c                              | 10 +++++-----
 lib/minip/pktbuf.c                                 |  4 ++--
 lib/minip/tcp.c                                    |  6 +++---
 lib/minip/udp.c                                    |  6 +++---
 lib/norfs/include/lib/norfs_inode.h                |  2 +-
 lib/norfs/norfs.c                                  |  6 +++---
 lib/norfs/test/norfs_test.c                        |  2 +-
 lib/norfs/test/norfs_test_helper.c                 |  2 +-
 lib/partition/partition.c                          |  4 ++--
 lib/pool/include/lib/pool.h                        |  2 +-
 lib/ptable/ptable.c                                |  8 ++++----
 lib/sysparam/sysparam.c                            |  8 ++++----
 lib/text/text.c                                    |  4 ++--
 lib/tftp/include/lib/tftp.h                        |  2 +-
 lib/tftp/tftp.c                                    |  8 ++++----
 lib/tga/tga.c                                      |  6 +++---
 lib/unittest/include/unittest.h                    |  2 +-
 lib/unittest/unittest.c                            |  2 +-
 lib/version/include/lib/version.h                  |  2 +-
 lib/version/version.c                              |  4 ++--
 lib/watchdog/watchdog.c                            |  4 ++--
 platform/alterasoc/clocks.c                        |  4 ++--
 platform/alterasoc/debug.c                         |  4 ++--
 platform/alterasoc/include/platform/alterasoc.h    |  2 +-
 platform/alterasoc/platform.c                      |  6 +++---
 platform/alterasoc/uart.c                          |  6 +++---
 platform/amlogic-s912d/platform.c                  |  6 +++---
 platform/amlogic-s912d/uart.c                      |  4 ++--
 platform/armemu/blkdev.c                           |  8 ++++----
 platform/armemu/debug.c                            |  2 +-
 platform/armemu/display.c                          |  8 ++++----
 platform/armemu/interrupts.c                       |  6 +++---
 platform/armemu/net.c                              |  4 ++--
 platform/armemu/platform.c                         |  4 ++--
 platform/armemu/timer.c                            |  2 +-
 platform/bcm28xx/gpio.c                            |  2 +-
 platform/bcm28xx/intc.c                            |  6 +++---
 platform/bcm28xx/mailbox.c                         |  8 ++++----
 platform/bcm28xx/miniuart.c                        |  4 ++--
 platform/bcm28xx/platform.c                        |  8 ++++----
 platform/bcm28xx/uart.c                            |  4 ++--
 platform/cc13xx/include/platform/ti-rf.h           |  2 +-
 platform/cc13xx/init.c                             |  2 +-
 platform/cc13xx/radio.c                            |  4 ++--
 platform/cc13xx/vectab.c                           |  4 ++--
 platform/debug.c                                   |  6 +++---
 platform/init.c                                    |  4 ++--
 platform/lpc15xx/debug.c                           |  6 +++---
 platform/lpc15xx/init.c                            |  4 ++--
 platform/lpc15xx/vectab.c                          |  4 ++--
 platform/lpc43xx/debug.c                           |  4 ++--
 platform/lpc43xx/gpio.c                            |  2 +-
 platform/lpc43xx/init.c                            |  2 +-
 platform/lpc43xx/udc.c                             |  4 ++--
 platform/lpc43xx/vectab.c                          |  4 ++--
 platform/mediatek/common/gic/mt_gic_v3.c           |  4 ++--
 platform/mediatek/mt6735/debug.c                   |  2 +-
 platform/mediatek/mt6735/interrupts.c              |  4 ++--
 platform/mediatek/mt6735/mt_gpt.c                  |  6 +++---
 platform/mediatek/mt6735/platform.c                |  6 +++---
 platform/mediatek/mt6735/timer.c                   |  6 +++---
 platform/mediatek/mt6735/uart.c                    |  4 ++--
 platform/mediatek/mt6797/debug.c                   |  2 +-
 platform/mediatek/mt6797/interrupts.c              |  4 ++--
 platform/mediatek/mt6797/mt_gpt.c                  |  6 +++---
 platform/mediatek/mt6797/platform.c                |  6 +++---
 platform/mediatek/mt6797/timer.c                   |  6 +++---
 platform/mediatek/mt6797/uart.c                    |  4 ++--
 platform/microblaze/intc.c                         |  6 +++---
 platform/microblaze/platform.c                     |  2 +-
 platform/microblaze/timer.c                        |  6 +++---
 platform/microblaze/uartlite.c                     |  4 ++--
 platform/nrf51xxx/debug.c                          |  4 ++--
 platform/nrf51xxx/gpio.c                           |  2 +-
 platform/nrf51xxx/init.c                           |  4 ++--
 platform/nrf51xxx/timer.c                          |  6 +++---
 platform/nrf51xxx/uart.c                           |  6 +++---
 platform/nrf51xxx/vectab.c                         |  4 ++--
 platform/nrf52xxx/debug.c                          |  4 ++--
 platform/nrf52xxx/gpio.c                           |  2 +-
 platform/nrf52xxx/init.c                           |  4 ++--
 platform/nrf52xxx/timer.c                          |  4 ++--
 platform/nrf52xxx/uart.c                           |  6 +++---
 platform/nrf52xxx/vectab.c                         |  4 ++--
 platform/or1ksim/include/platform/or1ksim.h        |  2 +-
 platform/or1ksim/platform.c                        |  2 +-
 platform/or1ksim/uart.c                            |  4 ++--
 platform/pc/debug.c                                |  2 +-
 platform/pc/ide.c                                  |  8 ++++----
 platform/pc/include/pcnet.h                        |  2 +-
 platform/pc/include/platform/console.h             |  2 +-
 platform/pc/interrupts.c                           |  6 +++---
 platform/pc/keyboard.c                             |  8 ++++----
 platform/pc/pci.c                                  |  6 +++---
 platform/pc/platform.c                             |  4 ++--
 platform/pc/timer.c                                |  6 +++---
 platform/pc/uart.c                                 |  4 ++--
 platform/power.c                                   |  6 +++---
 platform/qemu-mips/debug.c                         |  4 ++--
 platform/qemu-mips/intc.c                          |  8 ++++----
 platform/qemu-mips/platform.c                      |  2 +-
 platform/qemu-virt-arm/debug.c                     |  4 ++--
 platform/qemu-virt-arm/platform.c                  |  6 +++---
 platform/qemu-virt-arm/secondary_boot.S            |  2 +-
 platform/qemu-virt-arm/uart.c                      |  4 ++--
 platform/sifive/platform.c                         |  2 +-
 platform/sifive/plic.c                             |  8 ++++----
 platform/sifive/uart.c                             |  4 ++--
 platform/stellaris/debug.c                         |  4 ++--
 platform/stellaris/gpio.c                          |  2 +-
 platform/stellaris/include/ti_driverlib.h          |  2 +-
 platform/stellaris/init.c                          |  4 ++--
 platform/stellaris/usbc.c                          |  8 ++++----
 platform/stellaris/vectab.c                        |  4 ++--
 platform/stm32/power.c                             |  6 +++---
 platform/stm32f0xx/can.c                           |  2 +-
 platform/stm32f0xx/debug.c                         |  4 ++--
 platform/stm32f0xx/dma.c                           |  2 +-
 platform/stm32f0xx/exti.c                          |  2 +-
 platform/stm32f0xx/gpio.c                          |  2 +-
 platform/stm32f0xx/i2c.c                           |  2 +-
 platform/stm32f0xx/include/platform/can.h          |  2 +-
 .../stm32f0xx/include/platform/timer_capture.h     |  2 +-
 platform/stm32f0xx/init.c                          |  4 ++--
 platform/stm32f0xx/usbc.c                          |  8 ++++----
 platform/stm32f0xx/vectab.c                        |  4 ++--
 platform/stm32f1xx/debug.c                         |  4 ++--
 platform/stm32f1xx/flash_nor.c                     |  6 +++---
 platform/stm32f1xx/gpio.c                          |  2 +-
 platform/stm32f1xx/init.c                          |  4 ++--
 platform/stm32f1xx/timer.c                         |  6 +++---
 platform/stm32f1xx/uart.c                          |  4 ++--
 platform/stm32f1xx/vectab.c                        |  4 ++--
 platform/stm32f2xx/debug.c                         |  4 ++--
 platform/stm32f2xx/gpio.c                          |  2 +-
 platform/stm32f2xx/init.c                          |  4 ++--
 platform/stm32f2xx/timer.c                         |  6 +++---
 platform/stm32f2xx/uart.c                          |  4 ++--
 platform/stm32f2xx/vectab.c                        |  4 ++--
 platform/stm32f4xx/debug.c                         |  4 ++--
 platform/stm32f4xx/flash.c                         | 10 +++++-----
 platform/stm32f4xx/gpio.c                          |  2 +-
 platform/stm32f4xx/init.c                          |  4 ++--
 platform/stm32f4xx/timer.c                         |  6 +++---
 platform/stm32f4xx/uart.c                          |  4 ++--
 platform/stm32f4xx/vectab.c                        |  4 ++--
 platform/stm32f7xx/debug.c                         |  4 ++--
 platform/stm32f7xx/eth.c                           |  8 ++++----
 platform/stm32f7xx/flash.c                         |  6 +++---
 platform/stm32f7xx/gpio.c                          |  4 ++--
 platform/stm32f7xx/init.c                          |  6 +++---
 platform/stm32f7xx/qspi.c                          |  6 +++---
 platform/stm32f7xx/sdram.c                         |  8 ++++----
 platform/stm32f7xx/timer.c                         |  6 +++---
 platform/stm32f7xx/uart.c                          |  6 +++---
 platform/stm32f7xx/usbc.c                          |  8 ++++----
 platform/stm32f7xx/vectab.c                        |  4 ++--
 platform/zynq/clocks.c                             | 10 +++++-----
 platform/zynq/debug.c                              |  4 ++--
 platform/zynq/fpga.c                               |  6 +++---
 platform/zynq/gem.c                                | 14 +++++++-------
 platform/zynq/gpio.c                               |  4 ++--
 platform/zynq/include/platform/zynq.h              |  6 +++---
 platform/zynq/platform.c                           |  4 ++--
 platform/zynq/qspi.c                               |  6 +++---
 platform/zynq/spiflash.c                           | 12 ++++++------
 platform/zynq/start.S                              |  2 +-
 platform/zynq/swdt.c                               |  6 +++---
 platform/zynq/timer.c                              |  6 +++---
 platform/zynq/uart.c                               |  4 ++--
 target/dartuinoP0/init.c                           | 10 +++++-----
 target/dartuinoP0/memory_lcd.c                     |  6 +++---
 .../projects/bootloader/bootloader_stubs.c         |  2 +-
 target/dartuinoP0/sensor_bus.c                     |  2 +-
 target/dartuinoP0/usb.c                            |  8 ++++----
 target/init.c                                      |  6 +++---
 target/lm3s6965evb/init.c                          |  6 +++---
 target/lpcexpresso1549/init.c                      |  6 +++---
 target/lpclink2/init.c                             |  4 ++--
 target/lpcxpresso4337/init.c                       |  4 ++--
 target/mt6735/init.c                               |  4 ++--
 target/mt6797/init.c                               |  4 ++--
 target/nrf-pca10000/init.c                         |  6 +++---
 target/nrf-pca10028/init.c                         |  6 +++---
 target/nrf-pca10040/init.c                         |  6 +++---
 target/nrf-pca10056/init.c                         |  6 +++---
 target/nucleo-f072rb/init.c                        |  6 +++---
 target/nucleo-f072rb/usb.c                         |  8 ++++----
 target/pc-x86/config.c                             |  2 +-
 target/qemu-m4/init.c                              |  8 ++++----
 target/qemu-m4/m4display.c                         |  4 ++--
 target/stellaris-launchpad/init.c                  |  6 +++---
 target/stellaris-launchpad/usb.c                   |  6 +++---
 target/stm32-h103/init.c                           |  6 +++---
 target/stm32-p107/init.c                           |  8 ++++----
 target/stm32-p407/init.c                           |  8 ++++----
 target/stm3220g/init.c                             |  8 ++++----
 target/stm32746g-eval2/init.c                      | 10 +++++-----
 target/stm32746g-eval2/lcd.c                       |  8 ++++----
 target/stm32746g-eval2/sram.c                      |  8 ++++----
 target/stm32f4-discovery/init.c                    |  8 ++++----
 target/stm32f429i-disco/init.c                     | 10 +++++-----
 target/stm32f746g-disco/init.c                     | 10 +++++-----
 target/stm32f746g-disco/lcd.c                      |  8 ++++----
 target/stm32f746g-disco/usb.c                      |  8 ++++----
 top/init.c                                         |  6 +++---
 top/main.c                                         |  4 ++--
 503 files changed, 1057 insertions(+), 1057 deletions(-)

diff --git a/app/accelerometer/accelerometer.c b/app/accelerometer/accelerometer.c
index d36de47b..077f8271 100644
--- a/app/accelerometer/accelerometer.c
+++ b/app/accelerometer/accelerometer.c
@@ -21,10 +21,10 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 #include <app.h>
-#include <debug.h>
+#include <lk/debug.h>
 #include <stdio.h>
 #include <dev/accelerometer.h>
-#include <compiler.h>
+#include <lk/compiler.h>
 
 
 #if defined(WITH_LIB_CONSOLE)
diff --git a/app/cdcserialtest/cdcserialtest.c b/app/cdcserialtest/cdcserialtest.c
index ad033ef8..e2962fe7 100644
--- a/app/cdcserialtest/cdcserialtest.c
+++ b/app/cdcserialtest/cdcserialtest.c
@@ -24,7 +24,7 @@
 
 #include <app.h>
 #include <assert.h>
-#include <err.h>
+#include <lk/err.h>
 #include <dev/usb/class/cdcserial.h>
 #include <kernel/thread.h>
 
diff --git a/app/inetsrv/inetsrv.c b/app/inetsrv/inetsrv.c
index fbc8bd5c..ef439197 100644
--- a/app/inetsrv/inetsrv.c
+++ b/app/inetsrv/inetsrv.c
@@ -21,12 +21,12 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 #include <app.h>
-#include <err.h>
-#include <debug.h>
-#include <trace.h>
+#include <lk/err.h>
+#include <lk/debug.h>
+#include <lk/trace.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <compiler.h>
+#include <lk/compiler.h>
 #include <kernel/thread.h>
 #include <lib/minip.h>
 #include <lib/tftp.h>
diff --git a/app/lkboot/commands.c b/app/lkboot/commands.c
index f0d567ca..f8765e3a 100644
--- a/app/lkboot/commands.c
+++ b/app/lkboot/commands.c
@@ -25,14 +25,14 @@
 #include <platform.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <debug.h>
+#include <lk/debug.h>
 #include <string.h>
 #include <endian.h>
 #include <malloc.h>
 #include <arch.h>
-#include <err.h>
-#include <trace.h>
-#include <pow2.h>
+#include <lk/err.h>
+#include <lk/trace.h>
+#include <lk/pow2.h>
 
 #include <kernel/thread.h>
 #include <kernel/vm.h>
diff --git a/app/lkboot/dcc.c b/app/lkboot/dcc.c
index 14952a19..f175ea4a 100644
--- a/app/lkboot/dcc.c
+++ b/app/lkboot/dcc.c
@@ -23,12 +23,12 @@
 #include "lkboot.h"
 
 #include <stdio.h>
-#include <debug.h>
+#include <lk/debug.h>
 #include <string.h>
-#include <compiler.h>
-#include <err.h>
+#include <lk/compiler.h>
+#include <lk/err.h>
 #include <assert.h>
-#include <trace.h>
+#include <lk/trace.h>
 #include <stdlib.h>
 #include <lib/cbuf.h>
 #include <app/lkboot.h>
diff --git a/app/lkboot/inet.c b/app/lkboot/inet.c
index defac381..580d1e57 100644
--- a/app/lkboot/inet.c
+++ b/app/lkboot/inet.c
@@ -26,12 +26,12 @@
 
 #include <platform.h>
 #include <stdio.h>
-#include <debug.h>
+#include <lk/debug.h>
 #include <string.h>
-#include <pow2.h>
-#include <err.h>
+#include <lk/pow2.h>
+#include <lk/err.h>
 #include <assert.h>
-#include <trace.h>
+#include <lk/trace.h>
 
 #include <app/lkboot.h>
 
diff --git a/app/lkboot/lkboot.c b/app/lkboot/lkboot.c
index 35c7f7ef..807d6051 100644
--- a/app/lkboot/lkboot.c
+++ b/app/lkboot/lkboot.c
@@ -27,12 +27,12 @@
 
 #include <platform.h>
 #include <stdio.h>
-#include <debug.h>
+#include <lk/debug.h>
 #include <string.h>
-#include <pow2.h>
-#include <err.h>
+#include <lk/pow2.h>
+#include <lk/err.h>
 #include <assert.h>
-#include <trace.h>
+#include <lk/trace.h>
 
 #include <lib/sysparam.h>
 
diff --git a/app/lpcboot/lpc43xx-spifi.c b/app/lpcboot/lpc43xx-spifi.c
index 73968edd..f516a094 100644
--- a/app/lpcboot/lpc43xx-spifi.c
+++ b/app/lpcboot/lpc43xx-spifi.c
@@ -21,11 +21,11 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include <debug.h>
+#include <lk/debug.h>
 #include <string.h>
 #include <stdlib.h>
 #include <printf.h>
-#include <reg.h>
+#include <lk/reg.h>
 
 #include <platform/lpc43xx-spifi.h>
 
diff --git a/app/lpcboot/lpcboot.c b/app/lpcboot/lpcboot.c
index 21438e09..86daae22 100644
--- a/app/lpcboot/lpcboot.c
+++ b/app/lpcboot/lpcboot.c
@@ -22,8 +22,8 @@
  */
 
 #include <app.h>
-#include <err.h>
-#include <debug.h>
+#include <lk/err.h>
+#include <lk/debug.h>
 #include <string.h>
 #include <stdlib.h>
 #include <printf.h>
diff --git a/app/mdebug/jtag.c b/app/mdebug/jtag.c
index 517ab5c1..744aa2c8 100644
--- a/app/mdebug/jtag.c
+++ b/app/mdebug/jtag.c
@@ -16,7 +16,7 @@
  */
 
 #include <app.h>
-#include <debug.h>
+#include <lk/debug.h>
 #include <string.h>
 #include <stdlib.h>
 #include <printf.h>
diff --git a/app/mdebug/mdebug.c b/app/mdebug/mdebug.c
index f186f39f..f54e4c1c 100644
--- a/app/mdebug/mdebug.c
+++ b/app/mdebug/mdebug.c
@@ -16,7 +16,7 @@
  */
 
 #include <app.h>
-#include <debug.h>
+#include <lk/debug.h>
 #include <string.h>
 #include <stdlib.h>
 #include <printf.h>
diff --git a/app/mdebug/rswd.c b/app/mdebug/rswd.c
index 7daa8b71..ccffa90c 100644
--- a/app/mdebug/rswd.c
+++ b/app/mdebug/rswd.c
@@ -15,8 +15,8 @@
  * limitations under the License.
  */
 
-#include <reg.h>
-#include <debug.h>
+#include <lk/reg.h>
+#include <lk/debug.h>
 #include <string.h>
 #include <stdlib.h>
 #include <printf.h>
diff --git a/app/mdebug/swd-m0sub.c b/app/mdebug/swd-m0sub.c
index 63ce42a7..a2cf9715 100644
--- a/app/mdebug/swd-m0sub.c
+++ b/app/mdebug/swd-m0sub.c
@@ -16,7 +16,7 @@
  */
 
 #include <app.h>
-#include <debug.h>
+#include <lk/debug.h>
 #include <string.h>
 #include <stdlib.h>
 #include <printf.h>
diff --git a/app/mdebug/swd-sgpio.c b/app/mdebug/swd-sgpio.c
index 52213874..8a319d91 100644
--- a/app/mdebug/swd-sgpio.c
+++ b/app/mdebug/swd-sgpio.c
@@ -16,7 +16,7 @@
  */
 
 #include <app.h>
-#include <debug.h>
+#include <lk/debug.h>
 #include <string.h>
 #include <stdlib.h>
 #include <printf.h>
diff --git a/app/mdebug/swo-uart1.c b/app/mdebug/swo-uart1.c
index 7803a1dc..32d00a43 100644
--- a/app/mdebug/swo-uart1.c
+++ b/app/mdebug/swo-uart1.c
@@ -16,8 +16,8 @@
  */
 
 #include <string.h>
-#include <debug.h>
-#include <reg.h>
+#include <lk/debug.h>
+#include <lk/reg.h>
 #include <kernel/thread.h>
 
 #include <dev/udc.h>
diff --git a/app/moot/fsboot.c b/app/moot/fsboot.c
index b0bd00e7..95fe9a6e 100644
--- a/app/moot/fsboot.c
+++ b/app/moot/fsboot.c
@@ -24,13 +24,13 @@
 
 #include <app/moot/fsboot.h>
 #include <app/moot/stubs.h>
-#include <compiler.h>
-#include <err.h>
+#include <lk/compiler.h>
+#include <lk/err.h>
 #include <lib/bio.h>
 #include <lib/bootimage.h>
 #include <lib/fs.h>
 #include <stdio.h>
-#include <trace.h>
+#include <lk/trace.h>
 
 #define MAX_FPATH_LEN 64
 
diff --git a/app/moot/moot.c b/app/moot/moot.c
index 434760be..07309f69 100644
--- a/app/moot/moot.c
+++ b/app/moot/moot.c
@@ -30,12 +30,12 @@
 #include <app.h>
 #include <arch.h>
 #include <assert.h>
-#include <debug.h>
-#include <err.h>
+#include <lk/debug.h>
+#include <lk/err.h>
 #include <kernel/event.h>
 #include <lk/init.h>
 #include <stdlib.h>
-#include <trace.h>
+#include <lk/trace.h>
 
 static void do_boot(void)
 {
diff --git a/app/moot/stubs.c b/app/moot/stubs.c
index 463c75b1..3e7c1420 100644
--- a/app/moot/stubs.c
+++ b/app/moot/stubs.c
@@ -23,8 +23,8 @@
  */
 
 #include <app/moot/stubs.h>
-#include <compiler.h>
-#include <err.h>
+#include <lk/compiler.h>
+#include <lk/err.h>
 
 // Fail by default. System must override this.
 __WEAK status_t moot_mount_default_fs(char **mount_path, char **device_name)
diff --git a/app/moot/usbboot.c b/app/moot/usbboot.c
index f726c882..d0f1162e 100644
--- a/app/moot/usbboot.c
+++ b/app/moot/usbboot.c
@@ -28,7 +28,7 @@
 #include <dev/udc.h>
 #include <dev/usb.h>
 #include <dev/usbc.h>
-#include <err.h>
+#include <lk/err.h>
 #include <kernel/event.h>
 #include <kernel/thread.h>
 #include <lib/bio.h>
@@ -38,7 +38,7 @@
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
-#include <trace.h>
+#include <lk/trace.h>
 
 #define LOCAL_TRACE 0
 #define COMMAND_MAGIC (0x4d4f4f54)  // MOOT
diff --git a/app/ndebugtest/ndebugtest.c b/app/ndebugtest/ndebugtest.c
index db1737e2..9c5cb2d3 100644
--- a/app/ndebugtest/ndebugtest.c
+++ b/app/ndebugtest/ndebugtest.c
@@ -55,8 +55,8 @@
 #include <lib/ndebug/user.h>
 
 #include <app.h>
-#include <debug.h>
-#include <err.h>
+#include <lk/debug.h>
+#include <lk/err.h>
 #include <string.h>
 
 static void ndebugtest_entry(const struct app_descriptor *app, void *args)
diff --git a/app/pcitests/pci_tests.c b/app/pcitests/pci_tests.c
index 2a24453c..636f7195 100644
--- a/app/pcitests/pci_tests.c
+++ b/app/pcitests/pci_tests.c
@@ -21,12 +21,12 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 #include <app.h>
-#include <debug.h>
+#include <lk/debug.h>
 #include <stdint.h>
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <compiler.h>
+#include <lk/compiler.h>
 #include <platform.h>
 #include <dev/pci.h>
 
diff --git a/app/shell/shell.c b/app/shell/shell.c
index c7faee12..ace38485 100644
--- a/app/shell/shell.c
+++ b/app/shell/shell.c
@@ -21,7 +21,7 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 #include <app.h>
-#include <debug.h>
+#include <lk/debug.h>
 #include <lib/console.h>
 
 static void shell_init(const struct app_descriptor *app)
diff --git a/app/tests/benchmarks.c b/app/tests/benchmarks.c
index a4672f99..38425a19 100644
--- a/app/tests/benchmarks.c
+++ b/app/tests/benchmarks.c
@@ -23,7 +23,7 @@
 #include <sys/types.h>
 #include <stdio.h>
 #include <rand.h>
-#include <err.h>
+#include <lk/err.h>
 #include <stdlib.h>
 #include <string.h>
 #include <app/tests.h>
diff --git a/app/tests/cbuf_tests.c b/app/tests/cbuf_tests.c
index 9fdd05b8..f093275a 100644
--- a/app/tests/cbuf_tests.c
+++ b/app/tests/cbuf_tests.c
@@ -1,6 +1,6 @@
 #include <assert.h>
-#include <debug.h>
-#include <err.h>
+#include <lk/debug.h>
+#include <lk/err.h>
 #include <lib/cbuf.h>
 #include <lib/console.h>
 #include <lib/heap.h>
diff --git a/app/tests/clock_tests.c b/app/tests/clock_tests.c
index c75cdc2b..f9d4a315 100644
--- a/app/tests/clock_tests.c
+++ b/app/tests/clock_tests.c
@@ -22,7 +22,7 @@
  */
 #include <stdio.h>
 #include <rand.h>
-#include <err.h>
+#include <lk/err.h>
 #include <app/tests.h>
 #include <kernel/thread.h>
 #include <kernel/mutex.h>
diff --git a/app/tests/fibo.c b/app/tests/fibo.c
index 26f395af..cbc6b1ca 100644
--- a/app/tests/fibo.c
+++ b/app/tests/fibo.c
@@ -22,7 +22,7 @@
  */
 #include <stdio.h>
 #include <rand.h>
-#include <err.h>
+#include <lk/err.h>
 #include <app/tests.h>
 #include <kernel/thread.h>
 #include <kernel/mutex.h>
diff --git a/app/tests/float.c b/app/tests/float.c
index 11e39332..9a319e77 100755
--- a/app/tests/float.c
+++ b/app/tests/float.c
@@ -24,7 +24,7 @@
 
 #include <stdio.h>
 #include <rand.h>
-#include <err.h>
+#include <lk/err.h>
 #include <lib/console.h>
 #include <app/tests.h>
 #include <kernel/thread.h>
diff --git a/app/tests/float_instructions.S b/app/tests/float_instructions.S
index 297fcbd1..d810bfa4 100644
--- a/app/tests/float_instructions.S
+++ b/app/tests/float_instructions.S
@@ -20,7 +20,7 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <asm.h>
+#include <lk/asm.h>
 
 #if ARM_WITH_VFP
 
diff --git a/app/tests/mem_tests.c b/app/tests/mem_tests.c
index 7a6ca760..f60cf8a6 100644
--- a/app/tests/mem_tests.c
+++ b/app/tests/mem_tests.c
@@ -23,12 +23,12 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <err.h>
+#include <lk/err.h>
 #include <arch.h>
 #include <arch/ops.h>
 #include <lib/console.h>
 #include <platform.h>
-#include <debug.h>
+#include <lk/debug.h>
 
 #if WITH_KERNEL_VM
 #include <kernel/vm.h>
diff --git a/app/tests/port_tests.c b/app/tests/port_tests.c
index 33cd305e..7e8b28a7 100644
--- a/app/tests/port_tests.c
+++ b/app/tests/port_tests.c
@@ -21,11 +21,11 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include <debug.h>
-#include <err.h>
+#include <lk/debug.h>
+#include <lk/err.h>
 #include <rand.h>
 #include <string.h>
-#include <trace.h>
+#include <lk/trace.h>
 
 #include <kernel/event.h>
 #include <kernel/port.h>
diff --git a/app/tests/printf_tests.c b/app/tests/printf_tests.c
index 3a9747fa..3246f67c 100644
--- a/app/tests/printf_tests.c
+++ b/app/tests/printf_tests.c
@@ -21,10 +21,10 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 #include <app/tests.h>
-#include <err.h>
+#include <lk/err.h>
 #include <stdio.h>
 #include <string.h>
-#include <debug.h>
+#include <lk/debug.h>
 
 int printf_tests(int argc, const cmd_args *argv)
 {
diff --git a/app/tests/tests.c b/app/tests/tests.c
index 55c03b42..10ace9f6 100644
--- a/app/tests/tests.c
+++ b/app/tests/tests.c
@@ -21,9 +21,9 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 #include <app.h>
-#include <debug.h>
+#include <lk/debug.h>
 #include <app/tests.h>
-#include <compiler.h>
+#include <lk/compiler.h>
 
 #if defined(WITH_LIB_CONSOLE)
 #include <lib/console.h>
diff --git a/app/tests/thread_tests.c b/app/tests/thread_tests.c
index 20c5b399..a214de46 100644
--- a/app/tests/thread_tests.c
+++ b/app/tests/thread_tests.c
@@ -20,10 +20,10 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <debug.h>
-#include <trace.h>
+#include <lk/debug.h>
+#include <lk/trace.h>
 #include <rand.h>
-#include <err.h>
+#include <lk/err.h>
 #include <assert.h>
 #include <string.h>
 #include <app/tests.h>
diff --git a/app/udctest/udctest.c b/app/udctest/udctest.c
index d5db84e0..4367c7fe 100644
--- a/app/udctest/udctest.c
+++ b/app/udctest/udctest.c
@@ -23,7 +23,7 @@
 
 
 #include <app.h>
-#include <debug.h>
+#include <lk/debug.h>
 #include <string.h>
 #include <stdlib.h>
 #include <printf.h>
diff --git a/app/usbtest/descriptor.c b/app/usbtest/descriptor.c
index a258a7de..504ccc9c 100644
--- a/app/usbtest/descriptor.c
+++ b/app/usbtest/descriptor.c
@@ -1,8 +1,8 @@
-#include <err.h>
-#include <debug.h>
+#include <lk/err.h>
+#include <lk/debug.h>
 #include <stdio.h>
 #include <target.h>
-#include <compiler.h>
+#include <lk/compiler.h>
 #include <dev/usb.h>
 #include <dev/usbc.h>
 #include <hw/usb.h>
diff --git a/app/usbtest/usbtest.c b/app/usbtest/usbtest.c
index ea5f7fe6..c901c429 100644
--- a/app/usbtest/usbtest.c
+++ b/app/usbtest/usbtest.c
@@ -1,9 +1,9 @@
 #include <app.h>
-#include <debug.h>
-#include <err.h>
+#include <lk/debug.h>
+#include <lk/err.h>
 #include <string.h>
 #include <stdlib.h>
-#include <trace.h>
+#include <lk/trace.h>
 #include <dev/usb.h>
 #include <dev/usbc.h>
 #include <kernel/debug.h>
diff --git a/app/zynq-common/init.c b/app/zynq-common/init.c
index 0eab28e1..7723d1cf 100644
--- a/app/zynq-common/init.c
+++ b/app/zynq-common/init.c
@@ -23,8 +23,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <debug.h>
-#include <trace.h>
+#include <lk/debug.h>
+#include <lk/trace.h>
 #include <lk/init.h>
 #include <lib/bootargs.h>
 #include <lib/bootimage.h>
diff --git a/arch/arm/arm-m/arch.c b/arch/arm/arm-m/arch.c
index 563b3690..21a00759 100644
--- a/arch/arm/arm-m/arch.c
+++ b/arch/arm/arm-m/arch.c
@@ -20,7 +20,7 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <debug.h>
+#include <lk/debug.h>
 #include <arch.h>
 #include <arch/ops.h>
 #include <arch/arm.h>
diff --git a/arch/arm/arm-m/cache.c b/arch/arm/arm-m/cache.c
index 4699fbd8..59af7786 100644
--- a/arch/arm/arm-m/cache.c
+++ b/arch/arm/arm-m/cache.c
@@ -20,7 +20,7 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <debug.h>
+#include <lk/debug.h>
 #include <arch.h>
 #include <arch/ops.h>
 #include <arch/arm.h>
diff --git a/arch/arm/arm-m/exceptions.c b/arch/arm/arm-m/exceptions.c
index 1a796edf..46ef6a6c 100644
--- a/arch/arm/arm-m/exceptions.c
+++ b/arch/arm/arm-m/exceptions.c
@@ -20,11 +20,11 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <debug.h>
+#include <lk/debug.h>
 #include <stdio.h>
-#include <compiler.h>
+#include <lk/compiler.h>
 #include <stdint.h>
-#include <bits.h>
+#include <lk/bits.h>
 #include <kernel/thread.h>
 #include <arch/arm/cm.h>
 #include <platform.h>
diff --git a/arch/arm/arm-m/include/arch/arm/cm.h b/arch/arm/arm-m/include/arch/arm/cm.h
index 8e886b2d..cddbe260 100644
--- a/arch/arm/arm-m/include/arch/arm/cm.h
+++ b/arch/arm/arm-m/include/arch/arm/cm.h
@@ -25,7 +25,7 @@
 
 /* support header for all cortex-m class cpus */
 
-#include <compiler.h>
+#include <lk/compiler.h>
 #include <stdint.h>
 #include <stdbool.h>
 #include <sys/types.h>
diff --git a/arch/arm/arm-m/spin_cycles.c b/arch/arm/arm-m/spin_cycles.c
index 01e07f0e..c65b279d 100644
--- a/arch/arm/arm-m/spin_cycles.c
+++ b/arch/arm/arm-m/spin_cycles.c
@@ -20,7 +20,7 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <compiler.h>
+#include <lk/compiler.h>
 #include <kernel/debug.h>
 
 __ALIGNED(8) __NAKED
diff --git a/arch/arm/arm-m/start.c b/arch/arm/arm-m/start.c
index 323231b0..76a38811 100644
--- a/arch/arm/arm-m/start.c
+++ b/arch/arm/arm-m/start.c
@@ -20,8 +20,8 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <debug.h>
-#include <compiler.h>
+#include <lk/debug.h>
+#include <lk/compiler.h>
 #include <stdint.h>
 
 /* externals */
diff --git a/arch/arm/arm-m/systick/systick.c b/arch/arm/arm-m/systick/systick.c
index b4fdda5d..b55a9be4 100644
--- a/arch/arm/arm-m/systick/systick.c
+++ b/arch/arm/arm-m/systick/systick.c
@@ -29,10 +29,10 @@
 #include <sys/types.h>
 #include <string.h>
 #include <stdlib.h>
-#include <debug.h>
+#include <lk/debug.h>
 #include <assert.h>
-#include <trace.h>
-#include <err.h>
+#include <lk/trace.h>
+#include <lk/err.h>
 #include <kernel/thread.h>
 #include <arch/arm.h>
 #include <arch/arm/cm.h>
diff --git a/arch/arm/arm-m/thread.c b/arch/arm/arm-m/thread.c
index fbca962c..b08ff6dd 100644
--- a/arch/arm/arm-m/thread.c
+++ b/arch/arm/arm-m/thread.c
@@ -23,8 +23,8 @@
 #include <sys/types.h>
 #include <string.h>
 #include <stdlib.h>
-#include <debug.h>
-#include <trace.h>
+#include <lk/debug.h>
+#include <lk/trace.h>
 #include <assert.h>
 #include <kernel/thread.h>
 #include <arch/arm.h>
diff --git a/arch/arm/arm-m/vectab.c b/arch/arm/arm-m/vectab.c
index 416ce34f..63700988 100644
--- a/arch/arm/arm-m/vectab.c
+++ b/arch/arm/arm-m/vectab.c
@@ -20,7 +20,7 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <compiler.h>
+#include <lk/compiler.h>
 #include <stdint.h>
 
 /*
diff --git a/arch/arm/arm/arch.c b/arch/arm/arm/arch.c
index 1d747672..e6cdebc0 100644
--- a/arch/arm/arm/arch.c
+++ b/arch/arm/arm/arch.c
@@ -20,13 +20,13 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <debug.h>
-#include <trace.h>
+#include <lk/debug.h>
+#include <lk/trace.h>
 #include <stdlib.h>
-#include <err.h>
-#include <trace.h>
+#include <lk/err.h>
+#include <lk/trace.h>
 #include <stdio.h>
-#include <reg.h>
+#include <lk/reg.h>
 #include <arch.h>
 #include <arch/ops.h>
 #include <arch/mmu.h>
diff --git a/arch/arm/arm/asm.S b/arch/arm/arm/asm.S
index bcfa0be5..58b4cb7f 100644
--- a/arch/arm/arm/asm.S
+++ b/arch/arm/arm/asm.S
@@ -20,7 +20,7 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <asm.h>
+#include <lk/asm.h>
 #include <arch/arm/cores.h>
 
     /* context switch frame is as follows:
diff --git a/arch/arm/arm/cache-ops.S b/arch/arm/arm/cache-ops.S
index 6ae02d44..c370c56a 100644
--- a/arch/arm/arm/cache-ops.S
+++ b/arch/arm/arm/cache-ops.S
@@ -20,7 +20,7 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <asm.h>
+#include <lk/asm.h>
 #include <arch/ops.h>
 #include <arch/defines.h>
 
diff --git a/arch/arm/arm/debug.c b/arch/arm/arm/debug.c
index 01c39bc0..20a720df 100644
--- a/arch/arm/arm/debug.c
+++ b/arch/arm/arm/debug.c
@@ -20,8 +20,8 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <trace.h>
-#include <err.h>
+#include <lk/trace.h>
+#include <lk/err.h>
 #include <malloc.h>
 #include <lk/init.h>
 #include <arch/arm.h>
diff --git a/arch/arm/arm/exceptions.S b/arch/arm/arm/exceptions.S
index 0f03f4ee..11320ac5 100644
--- a/arch/arm/arm/exceptions.S
+++ b/arch/arm/arm/exceptions.S
@@ -20,7 +20,7 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <asm.h>
+#include <lk/asm.h>
 #include <arch/asm.h>
 #include <arch/arm/cores.h>
 
diff --git a/arch/arm/arm/faults.c b/arch/arm/arm/faults.c
index 0908b55c..e39539ac 100644
--- a/arch/arm/arm/faults.c
+++ b/arch/arm/arm/faults.c
@@ -20,8 +20,8 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <debug.h>
-#include <bits.h>
+#include <lk/debug.h>
+#include <lk/bits.h>
 #include <arch/arm.h>
 #include <kernel/thread.h>
 #include <platform.h>
diff --git a/arch/arm/arm/fpu.c b/arch/arm/arm/fpu.c
index 94bd0108..e68a18e1 100644
--- a/arch/arm/arm/fpu.c
+++ b/arch/arm/arm/fpu.c
@@ -22,7 +22,7 @@
  */
 #include <arch/arm.h>
 #include <assert.h>
-#include <trace.h>
+#include <lk/trace.h>
 #include <stdbool.h>
 #include <string.h>
 #include <kernel/thread.h>
diff --git a/arch/arm/arm/include/arch/aspace.h b/arch/arm/arm/include/arch/aspace.h
index 8410fd67..1bd924a9 100644
--- a/arch/arm/arm/include/arch/aspace.h
+++ b/arch/arm/arm/include/arch/aspace.h
@@ -22,8 +22,8 @@
  */
 #pragma once
 
-#include <compiler.h>
-#include <list.h>
+#include <lk/compiler.h>
+#include <lk/list.h>
 
 __BEGIN_CDECLS
 
diff --git a/arch/arm/arm/mmu.c b/arch/arm/arm/mmu.c
index 45c3125b..743f40c9 100644
--- a/arch/arm/arm/mmu.c
+++ b/arch/arm/arm/mmu.c
@@ -20,14 +20,14 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <debug.h>
-#include <trace.h>
+#include <lk/debug.h>
+#include <lk/trace.h>
 #include <stdlib.h>
 #include <sys/types.h>
-#include <err.h>
+#include <lk/err.h>
 #include <string.h>
-#include <compiler.h>
-#include <pow2.h>
+#include <lk/compiler.h>
+#include <lk/pow2.h>
 #include <arch.h>
 #include <arch/ops.h>
 #include <arch/mmu.h>
diff --git a/arch/arm/arm/mp.c b/arch/arm/arm/mp.c
index 27647b22..227cf650 100644
--- a/arch/arm/arm/mp.c
+++ b/arch/arm/arm/mp.c
@@ -23,8 +23,8 @@
 #include <arch/mp.h>
 
 #include <assert.h>
-#include <trace.h>
-#include <err.h>
+#include <lk/trace.h>
+#include <lk/err.h>
 #include <platform/interrupts.h>
 #include <arch/ops.h>
 
diff --git a/arch/arm/arm/ops.S b/arch/arm/arm/ops.S
index 0eeb5665..60fc1061 100644
--- a/arch/arm/arm/ops.S
+++ b/arch/arm/arm/ops.S
@@ -20,7 +20,7 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <asm.h>
+#include <lk/asm.h>
 #include <arch/arm/cores.h>
 
 .text
diff --git a/arch/arm/arm/start.S b/arch/arm/arm/start.S
index cb566386..8e1a2892 100644
--- a/arch/arm/arm/start.S
+++ b/arch/arm/arm/start.S
@@ -20,7 +20,7 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <asm.h>
+#include <lk/asm.h>
 #include <arch/arm/cores.h>
 #include <arch/arm/mmu.h>
 #include <kernel/vm.h>
diff --git a/arch/arm/arm/thread.c b/arch/arm/arm/thread.c
index 28974dba..de38808b 100644
--- a/arch/arm/arm/thread.c
+++ b/arch/arm/arm/thread.c
@@ -23,8 +23,8 @@
 #include <sys/types.h>
 #include <string.h>
 #include <stdlib.h>
-#include <debug.h>
-#include <trace.h>
+#include <lk/debug.h>
+#include <lk/trace.h>
 #include <kernel/thread.h>
 #include <arch/arm.h>
 
diff --git a/arch/arm/include/arch/arch_ops.h b/arch/arm/include/arch/arch_ops.h
index 879565cd..094df83c 100644
--- a/arch/arm/include/arch/arch_ops.h
+++ b/arch/arm/include/arch/arch_ops.h
@@ -25,8 +25,8 @@
 #ifndef ASSEMBLY
 
 #include <stdbool.h>
-#include <compiler.h>
-#include <reg.h>
+#include <lk/compiler.h>
+#include <lk/reg.h>
 #include <arch/arm.h>
 
 #if ARM_ISA_ARMV7M
diff --git a/arch/arm/include/arch/arm.h b/arch/arm/include/arch/arm.h
index 3368e9bf..85a8c74b 100644
--- a/arch/arm/include/arch/arm.h
+++ b/arch/arm/include/arch/arm.h
@@ -26,7 +26,7 @@
 #include <stdbool.h>
 #include <sys/types.h>
 #include <arch/arm/cores.h>
-#include <compiler.h>
+#include <lk/compiler.h>
 
 /* due to the cp15 accessors below, you're gonna have a bad time if you try
  * to compile in thumb mode. Either compile in ARM only or get a thumb2 capable cpu.
diff --git a/arch/arm/include/arch/arm/mmu.h b/arch/arm/include/arch/arm/mmu.h
index 036500fe..491f3ed0 100644
--- a/arch/arm/include/arch/arm/mmu.h
+++ b/arch/arm/include/arch/arm/mmu.h
@@ -207,7 +207,7 @@
 
 #include <sys/types.h>
 #include <assert.h>
-#include <compiler.h>
+#include <lk/compiler.h>
 #include <arch/arm.h>
 
 __BEGIN_CDECLS
diff --git a/arch/arm/include/arch/spinlock.h b/arch/arm/include/arch/spinlock.h
index 01382a6d..ef183c11 100644
--- a/arch/arm/include/arch/spinlock.h
+++ b/arch/arm/include/arch/spinlock.h
@@ -22,7 +22,7 @@
  */
 #pragma once
 
-#include <compiler.h>
+#include <lk/compiler.h>
 #include <arch/ops.h>
 #include <stdbool.h>
 
diff --git a/arch/arm64/arch.c b/arch/arm64/arch.c
index fe670cdb..56f79c34 100644
--- a/arch/arm64/arch.c
+++ b/arch/arm64/arch.c
@@ -20,7 +20,7 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <debug.h>
+#include <lk/debug.h>
 #include <stdlib.h>
 #include <arch.h>
 #include <arch/ops.h>
@@ -31,7 +31,7 @@
 #include <lk/init.h>
 #include <lk/main.h>
 #include <platform.h>
-#include <trace.h>
+#include <lk/trace.h>
 
 #define LOCAL_TRACE 0
 
diff --git a/arch/arm64/asm.S b/arch/arm64/asm.S
index 397aba56..4b71df2a 100644
--- a/arch/arm64/asm.S
+++ b/arch/arm64/asm.S
@@ -20,7 +20,7 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <asm.h>
+#include <lk/asm.h>
 #include <arch/asm_macros.h>
 
 /* void arm64_context_switch(vaddr_t *old_sp, vaddr_t new_sp); */
diff --git a/arch/arm64/cache-ops.S b/arch/arm64/cache-ops.S
index f5fa49d1..56b50125 100644
--- a/arch/arm64/cache-ops.S
+++ b/arch/arm64/cache-ops.S
@@ -21,7 +21,7 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include <asm.h>
+#include <lk/asm.h>
 #include <arch/ops.h>
 #include <arch/defines.h>
 
diff --git a/arch/arm64/exceptions.S b/arch/arm64/exceptions.S
index 98932fbc..31efc9bb 100644
--- a/arch/arm64/exceptions.S
+++ b/arch/arm64/exceptions.S
@@ -20,7 +20,7 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <asm.h>
+#include <lk/asm.h>
 #include <arch/asm_macros.h>
 
 .section .text.boot.vectab
diff --git a/arch/arm64/exceptions_c.c b/arch/arm64/exceptions_c.c
index f2ec3fb9..925ae803 100644
--- a/arch/arm64/exceptions_c.c
+++ b/arch/arm64/exceptions_c.c
@@ -21,8 +21,8 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 #include <stdio.h>
-#include <debug.h>
-#include <bits.h>
+#include <lk/debug.h>
+#include <lk/bits.h>
 #include <arch/arch_ops.h>
 #include <arch/arm64.h>
 
diff --git a/arch/arm64/fpu.c b/arch/arm64/fpu.c
index 83fa4f4d..b0bc4ee5 100644
--- a/arch/arm64/fpu.c
+++ b/arch/arm64/fpu.c
@@ -23,7 +23,7 @@
 
 #include <arch/arm64.h>
 #include <kernel/thread.h>
-#include <trace.h>
+#include <lk/trace.h>
 
 #define LOCAL_TRACE 0
 
diff --git a/arch/arm64/include/arch/arch_ops.h b/arch/arm64/include/arch/arch_ops.h
index ee18c1c5..e3ca0936 100644
--- a/arch/arm64/include/arch/arch_ops.h
+++ b/arch/arm64/include/arch/arch_ops.h
@@ -25,8 +25,8 @@
 #ifndef ASSEMBLY
 
 #include <stdbool.h>
-#include <compiler.h>
-#include <reg.h>
+#include <lk/compiler.h>
+#include <lk/reg.h>
 #include <arch/arm64.h>
 
 #define USE_GCC_ATOMICS 1
diff --git a/arch/arm64/include/arch/arm64.h b/arch/arm64/include/arch/arm64.h
index 9efa77c8..f7449760 100644
--- a/arch/arm64/include/arch/arm64.h
+++ b/arch/arm64/include/arch/arm64.h
@@ -24,7 +24,7 @@
 
 #include <stdbool.h>
 #include <sys/types.h>
-#include <compiler.h>
+#include <lk/compiler.h>
 
 __BEGIN_CDECLS
 
diff --git a/arch/arm64/include/arch/arm64/mmu.h b/arch/arm64/include/arch/arm64/mmu.h
index b3902efe..ab9be0d9 100644
--- a/arch/arm64/include/arch/arm64/mmu.h
+++ b/arch/arm64/include/arch/arm64/mmu.h
@@ -315,7 +315,7 @@
 
 #include <sys/types.h>
 #include <assert.h>
-#include <compiler.h>
+#include <lk/compiler.h>
 #include <arch/arm64.h>
 
 typedef uint64_t pte_t;
diff --git a/arch/arm64/include/arch/aspace.h b/arch/arm64/include/arch/aspace.h
index 96657262..8ea484d6 100644
--- a/arch/arm64/include/arch/aspace.h
+++ b/arch/arm64/include/arch/aspace.h
@@ -22,8 +22,8 @@
  */
 #pragma once
 
-#include <compiler.h>
-#include <list.h>
+#include <lk/compiler.h>
+#include <lk/list.h>
 #include <arch/arm64/mmu.h>
 
 __BEGIN_CDECLS
diff --git a/arch/arm64/mmu.c b/arch/arm64/mmu.c
index 547db8d3..e1724645 100644
--- a/arch/arm64/mmu.c
+++ b/arch/arm64/mmu.c
@@ -23,14 +23,14 @@
 
 #include <arch/arm64/mmu.h>
 #include <assert.h>
-#include <debug.h>
-#include <err.h>
+#include <lk/debug.h>
+#include <lk/err.h>
 #include <kernel/vm.h>
 #include <lib/heap.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/types.h>
-#include <trace.h>
+#include <lk/trace.h>
 
 #define LOCAL_TRACE 0
 #define TRACE_CONTEXT_SWITCH 0
diff --git a/arch/arm64/mp.c b/arch/arm64/mp.c
index e3584c85..20aac544 100644
--- a/arch/arm64/mp.c
+++ b/arch/arm64/mp.c
@@ -23,8 +23,8 @@
 #include <arch/mp.h>
 
 #include <assert.h>
-#include <trace.h>
-#include <err.h>
+#include <lk/trace.h>
+#include <lk/err.h>
 #include <platform/interrupts.h>
 #include <arch/ops.h>
 
diff --git a/arch/arm64/spinlock.S b/arch/arm64/spinlock.S
index ef5b3d13..7a0b1964 100644
--- a/arch/arm64/spinlock.S
+++ b/arch/arm64/spinlock.S
@@ -20,7 +20,7 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <asm.h>
+#include <lk/asm.h>
 
 .text
 
diff --git a/arch/arm64/start.S b/arch/arm64/start.S
index 1ad9c9d3..595e8e22 100644
--- a/arch/arm64/start.S
+++ b/arch/arm64/start.S
@@ -1,4 +1,4 @@
-#include <asm.h>
+#include <lk/asm.h>
 #include <arch/arm64/mmu.h>
 #include <arch/asm_macros.h>
 #include <kernel/vm.h>
diff --git a/arch/arm64/thread.c b/arch/arm64/thread.c
index bb12fc3b..18c73ce4 100644
--- a/arch/arm64/thread.c
+++ b/arch/arm64/thread.c
@@ -23,8 +23,8 @@
 #include <sys/types.h>
 #include <string.h>
 #include <stdlib.h>
-#include <debug.h>
-#include <trace.h>
+#include <lk/debug.h>
+#include <lk/trace.h>
 #include <kernel/thread.h>
 #include <arch/arm64.h>
 
diff --git a/arch/microblaze/arch.c b/arch/microblaze/arch.c
index 3dad6464..90a9b950 100644
--- a/arch/microblaze/arch.c
+++ b/arch/microblaze/arch.c
@@ -20,8 +20,8 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <trace.h>
-#include <debug.h>
+#include <lk/trace.h>
+#include <lk/debug.h>
 #include <stdint.h>
 #include <arch/microblaze.h>
 
diff --git a/arch/microblaze/asm.S b/arch/microblaze/asm.S
index 24933fdb..5bf08bd3 100644
--- a/arch/microblaze/asm.S
+++ b/arch/microblaze/asm.S
@@ -20,7 +20,7 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <asm.h>
+#include <lk/asm.h>
 
 /* void microblaze_context_switch(
     struct microblaze_context_switch_frame *oldcs,
diff --git a/arch/microblaze/exceptions.c b/arch/microblaze/exceptions.c
index 857662ee..b41bc81b 100644
--- a/arch/microblaze/exceptions.c
+++ b/arch/microblaze/exceptions.c
@@ -20,8 +20,8 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <compiler.h>
-#include <trace.h>
+#include <lk/compiler.h>
+#include <lk/trace.h>
 #include <arch/microblaze.h>
 #include <kernel/thread.h>
 
diff --git a/arch/microblaze/include/arch/arch_ops.h b/arch/microblaze/include/arch/arch_ops.h
index 8646f347..0b088135 100644
--- a/arch/microblaze/include/arch/arch_ops.h
+++ b/arch/microblaze/include/arch/arch_ops.h
@@ -22,7 +22,7 @@
  */
 #pragma once
 
-#include <compiler.h>
+#include <lk/compiler.h>
 
 #define USE_MSRSET 1
 
diff --git a/arch/microblaze/start.S b/arch/microblaze/start.S
index 1a35a51b..2f16de85 100644
--- a/arch/microblaze/start.S
+++ b/arch/microblaze/start.S
@@ -20,7 +20,7 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <asm.h>
+#include <lk/asm.h>
 
 .section ".vectors", "ax"
 .globl _vectab
diff --git a/arch/microblaze/thread.c b/arch/microblaze/thread.c
index 41410bd8..1bd36ee7 100644
--- a/arch/microblaze/thread.c
+++ b/arch/microblaze/thread.c
@@ -20,8 +20,8 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <debug.h>
-#include <trace.h>
+#include <lk/debug.h>
+#include <lk/trace.h>
 #include <sys/types.h>
 #include <string.h>
 #include <stdlib.h>
diff --git a/arch/mips/arch.c b/arch/mips/arch.c
index e12982fa..a8a4eb1b 100644
--- a/arch/mips/arch.c
+++ b/arch/mips/arch.c
@@ -20,10 +20,10 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <trace.h>
-#include <debug.h>
+#include <lk/trace.h>
+#include <lk/debug.h>
 #include <stdint.h>
-#include <bits.h>
+#include <lk/bits.h>
 #include <arch/mips.h>
 #include <platform.h>
 
diff --git a/arch/mips/asm.S b/arch/mips/asm.S
index 7700039d..cebef9ac 100644
--- a/arch/mips/asm.S
+++ b/arch/mips/asm.S
@@ -20,7 +20,7 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <asm.h>
+#include <lk/asm.h>
 
 /* void mips_context_switch(
     struct mips_context_switch_frame *oldcs,
diff --git a/arch/mips/exceptions.c b/arch/mips/exceptions.c
index f2b10359..137bc2cb 100644
--- a/arch/mips/exceptions.c
+++ b/arch/mips/exceptions.c
@@ -20,11 +20,11 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <trace.h>
-#include <debug.h>
+#include <lk/trace.h>
+#include <lk/debug.h>
 #include <assert.h>
 #include <stdint.h>
-#include <bits.h>
+#include <lk/bits.h>
 #include <kernel/thread.h>
 #include <kernel/debug.h>
 #include <arch/mips.h>
diff --git a/arch/mips/include/arch/arch_ops.h b/arch/mips/include/arch/arch_ops.h
index 42a178b0..bbd88e81 100644
--- a/arch/mips/include/arch/arch_ops.h
+++ b/arch/mips/include/arch/arch_ops.h
@@ -22,7 +22,7 @@
  */
 #pragma once
 
-#include <compiler.h>
+#include <lk/compiler.h>
 #include <arch/mips.h>
 
 static inline void arch_enable_ints(void)
diff --git a/arch/mips/include/arch/mips.h b/arch/mips/include/arch/mips.h
index a73eb663..e0354bf9 100644
--- a/arch/mips/include/arch/mips.h
+++ b/arch/mips/include/arch/mips.h
@@ -23,7 +23,7 @@
 #pragma once
 
 #ifndef ASSEMBLY
-#include <compiler.h>
+#include <lk/compiler.h>
 #include <stdint.h>
 #include <sys/types.h>
 
diff --git a/arch/mips/start.S b/arch/mips/start.S
index 4097648d..e7e748f3 100644
--- a/arch/mips/start.S
+++ b/arch/mips/start.S
@@ -20,7 +20,7 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <asm.h>
+#include <lk/asm.h>
 
 .section ".text.boot"
 FUNCTION(_start)
diff --git a/arch/mips/thread.c b/arch/mips/thread.c
index eaef3d99..718f3047 100644
--- a/arch/mips/thread.c
+++ b/arch/mips/thread.c
@@ -20,8 +20,8 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <debug.h>
-#include <trace.h>
+#include <lk/debug.h>
+#include <lk/trace.h>
 #include <sys/types.h>
 #include <string.h>
 #include <stdlib.h>
diff --git a/arch/mips/timer.c b/arch/mips/timer.c
index 2b665cda..274a78f0 100644
--- a/arch/mips/timer.c
+++ b/arch/mips/timer.c
@@ -21,12 +21,12 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 #include <arch/mips.h>
-#include <err.h>
-#include <trace.h>
-#include <debug.h>
+#include <lk/err.h>
+#include <lk/trace.h>
+#include <lk/debug.h>
 #include <assert.h>
 #include <stdint.h>
-#include <bits.h>
+#include <lk/bits.h>
 #include <arch/ops.h>
 #include <platform.h>
 #include <platform/timer.h>
diff --git a/arch/mips/vectors.S b/arch/mips/vectors.S
index aacfde42..88361f0c 100644
--- a/arch/mips/vectors.S
+++ b/arch/mips/vectors.S
@@ -20,7 +20,7 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <asm.h>
+#include <lk/asm.h>
 #include <arch/mips.h>
 
 .section ".text.vectab"
diff --git a/arch/or1k/arch.c b/arch/or1k/arch.c
index b2c78907..6d98ae15 100644
--- a/arch/or1k/arch.c
+++ b/arch/or1k/arch.c
@@ -20,9 +20,9 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <trace.h>
-#include <err.h>
-#include <debug.h>
+#include <lk/trace.h>
+#include <lk/err.h>
+#include <lk/debug.h>
 #include <arch/or1k.h>
 #include <arch/ops.h>
 #include <arch/mmu.h>
diff --git a/arch/or1k/asm.S b/arch/or1k/asm.S
index b1643a08..fb0d81b2 100644
--- a/arch/or1k/asm.S
+++ b/arch/or1k/asm.S
@@ -20,7 +20,7 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <asm.h>
+#include <lk/asm.h>
 
 /* void or1k_context_switch(
     struct or1k_context_switch_frame *oldcs,
diff --git a/arch/or1k/faults.c b/arch/or1k/faults.c
index 646af00f..f6108185 100644
--- a/arch/or1k/faults.c
+++ b/arch/or1k/faults.c
@@ -20,7 +20,7 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <debug.h>
+#include <lk/debug.h>
 #include <arch/or1k.h>
 #include <kernel/thread.h>
 #include <platform.h>
diff --git a/arch/or1k/include/arch/arch_ops.h b/arch/or1k/include/arch/arch_ops.h
index ef7438ca..d3e5fa25 100644
--- a/arch/or1k/include/arch/arch_ops.h
+++ b/arch/or1k/include/arch/arch_ops.h
@@ -22,7 +22,7 @@
  */
 #pragma once
 
-#include <compiler.h>
+#include <lk/compiler.h>
 #include <arch/or1k.h>
 
 #ifndef ASSEMBLY
diff --git a/arch/or1k/mmu.c b/arch/or1k/mmu.c
index f55f8668..a1810ecd 100644
--- a/arch/or1k/mmu.c
+++ b/arch/or1k/mmu.c
@@ -22,9 +22,9 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <trace.h>
-#include <debug.h>
-#include <err.h>
+#include <lk/trace.h>
+#include <lk/debug.h>
+#include <lk/err.h>
 #include <string.h>
 #include <arch/mmu.h>
 #include <arch/or1k.h>
diff --git a/arch/or1k/start.S b/arch/or1k/start.S
index 5af80faf..8254273a 100644
--- a/arch/or1k/start.S
+++ b/arch/or1k/start.S
@@ -20,7 +20,7 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <asm.h>
+#include <lk/asm.h>
 #include <arch/ops.h>
 #include <arch/or1k/mmu.h>
 #include <kernel/vm.h>
diff --git a/arch/or1k/thread.c b/arch/or1k/thread.c
index df776db3..2ef59c94 100644
--- a/arch/or1k/thread.c
+++ b/arch/or1k/thread.c
@@ -22,8 +22,8 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <debug.h>
-#include <trace.h>
+#include <lk/debug.h>
+#include <lk/trace.h>
 #include <sys/types.h>
 #include <string.h>
 #include <stdlib.h>
diff --git a/arch/riscv/arch.c b/arch/riscv/arch.c
index 6bd29743..7548b5da 100644
--- a/arch/riscv/arch.c
+++ b/arch/riscv/arch.c
@@ -21,8 +21,8 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 #include <assert.h>
-#include <trace.h>
-#include <debug.h>
+#include <lk/trace.h>
+#include <lk/debug.h>
 #include <stdint.h>
 #include <arch/riscv.h>
 #include <arch/ops.h>
diff --git a/arch/riscv/asm.S b/arch/riscv/asm.S
index 3f0dac3c..52ae7936 100644
--- a/arch/riscv/asm.S
+++ b/arch/riscv/asm.S
@@ -20,7 +20,7 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <asm.h>
+#include <lk/asm.h>
 
 /* void riscv32_context_switch(
     struct riscv32_context_switch_frame *oldcs,
diff --git a/arch/riscv/clint.c b/arch/riscv/clint.c
index df96d7cb..2311d039 100644
--- a/arch/riscv/clint.c
+++ b/arch/riscv/clint.c
@@ -20,14 +20,14 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <reg.h>
-#include <debug.h>
-#include <trace.h>
-#include <err.h>
+#include <lk/reg.h>
+#include <lk/debug.h>
+#include <lk/trace.h>
+#include <lk/err.h>
 #include <platform.h>
 #include <platform/timer.h>
 #include <arch/riscv.h>
-#include <trace.h>
+#include <lk/trace.h>
 
 #define LOCAL_TRACE 0
 
diff --git a/arch/riscv/exceptions.c b/arch/riscv/exceptions.c
index 736ba597..d0a0a59f 100644
--- a/arch/riscv/exceptions.c
+++ b/arch/riscv/exceptions.c
@@ -21,8 +21,8 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 #include <assert.h>
-#include <compiler.h>
-#include <trace.h>
+#include <lk/compiler.h>
+#include <lk/trace.h>
 #include <arch/riscv.h>
 #include <kernel/thread.h>
 
diff --git a/arch/riscv/include/arch/arch_ops.h b/arch/riscv/include/arch/arch_ops.h
index 89309890..51440108 100644
--- a/arch/riscv/include/arch/arch_ops.h
+++ b/arch/riscv/include/arch/arch_ops.h
@@ -22,8 +22,8 @@
  */
 #pragma once
 
-#include <compiler.h>
-#include <debug.h>
+#include <lk/compiler.h>
+#include <lk/debug.h>
 #include <arch/riscv.h>
 
 static inline void arch_enable_ints(void) {
diff --git a/arch/riscv/start.S b/arch/riscv/start.S
index 1af4ff13..a85b4926 100644
--- a/arch/riscv/start.S
+++ b/arch/riscv/start.S
@@ -20,7 +20,7 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <asm.h>
+#include <lk/asm.h>
 
 #if 0
 .section ".vectors", "ax"
diff --git a/arch/riscv/thread.c b/arch/riscv/thread.c
index 761fafc0..11d75a49 100644
--- a/arch/riscv/thread.c
+++ b/arch/riscv/thread.c
@@ -21,8 +21,8 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 #include <assert.h>
-#include <debug.h>
-#include <trace.h>
+#include <lk/debug.h>
+#include <lk/trace.h>
 #include <sys/types.h>
 #include <string.h>
 #include <stdlib.h>
diff --git a/arch/x86/32/asm.S b/arch/x86/32/asm.S
index 89162437..57773f73 100644
--- a/arch/x86/32/asm.S
+++ b/arch/x86/32/asm.S
@@ -20,5 +20,5 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <asm.h>
+#include <lk/asm.h>
 
diff --git a/arch/x86/32/exceptions.S b/arch/x86/32/exceptions.S
index 2018c21d..997cd08c 100644
--- a/arch/x86/32/exceptions.S
+++ b/arch/x86/32/exceptions.S
@@ -22,7 +22,7 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <asm.h>
+#include <lk/asm.h>
 #include <arch/x86/descriptor.h>
 
 #define NUM_INT 0x31
diff --git a/arch/x86/32/mmu.c b/arch/x86/32/mmu.c
index 93285591..588b9f0b 100644
--- a/arch/x86/32/mmu.c
+++ b/arch/x86/32/mmu.c
@@ -23,10 +23,10 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include <debug.h>
-#include <trace.h>
+#include <lk/debug.h>
+#include <lk/trace.h>
 #include <sys/types.h>
-#include <compiler.h>
+#include <lk/compiler.h>
 #include <arch.h>
 #include <arch/x86.h>
 #include <arch/x86/mmu.h>
@@ -34,7 +34,7 @@
 #include <string.h>
 #include <arch/mmu.h>
 #include <assert.h>
-#include <err.h>
+#include <lk/err.h>
 #include <arch/arch_ops.h>
 #include <kernel/vm.h>
 
diff --git a/arch/x86/32/ops.S b/arch/x86/32/ops.S
index 32a098c1..ec66543d 100644
--- a/arch/x86/32/ops.S
+++ b/arch/x86/32/ops.S
@@ -20,7 +20,7 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <asm.h>
+#include <lk/asm.h>
 
 .text
 
diff --git a/arch/x86/32/start.S b/arch/x86/32/start.S
index d844bce8..5c4af119 100644
--- a/arch/x86/32/start.S
+++ b/arch/x86/32/start.S
@@ -22,7 +22,7 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <asm.h>
+#include <lk/asm.h>
 #include <arch/x86/descriptor.h>
 #include <arch/x86/mmu.h>
 
diff --git a/arch/x86/64/asm.S b/arch/x86/64/asm.S
index 24430235..5f777918 100644
--- a/arch/x86/64/asm.S
+++ b/arch/x86/64/asm.S
@@ -20,7 +20,7 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <asm.h>
+#include <lk/asm.h>
 
 /* void x86_64_context_switch(uint64_t *oldsp, uint64_t newsp) */
 FUNCTION(x86_64_context_switch)
diff --git a/arch/x86/64/exceptions.S b/arch/x86/64/exceptions.S
index 867b9dd6..dc17cf9b 100644
--- a/arch/x86/64/exceptions.S
+++ b/arch/x86/64/exceptions.S
@@ -22,7 +22,7 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <asm.h>
+#include <lk/asm.h>
 #include <arch/x86/descriptor.h>
 
 #define NUM_INT 0x100
diff --git a/arch/x86/64/mmu.c b/arch/x86/64/mmu.c
index a1ee3453..1ef1f986 100644
--- a/arch/x86/64/mmu.c
+++ b/arch/x86/64/mmu.c
@@ -22,10 +22,10 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <debug.h>
-#include <trace.h>
+#include <lk/debug.h>
+#include <lk/trace.h>
 #include <sys/types.h>
-#include <compiler.h>
+#include <lk/compiler.h>
 #include <arch.h>
 #include <arch/x86.h>
 #include <arch/x86/mmu.h>
@@ -33,7 +33,7 @@
 #include <string.h>
 #include <arch/mmu.h>
 #include <assert.h>
-#include <err.h>
+#include <lk/err.h>
 #include <arch/arch_ops.h>
 #include <kernel/vm.h>
 
diff --git a/arch/x86/64/ops.S b/arch/x86/64/ops.S
index 10b55bd5..a4d2d9fc 100644
--- a/arch/x86/64/ops.S
+++ b/arch/x86/64/ops.S
@@ -20,7 +20,7 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <asm.h>
+#include <lk/asm.h>
 
 .text
 
diff --git a/arch/x86/64/start.S b/arch/x86/64/start.S
index edf4e113..a6613290 100644
--- a/arch/x86/64/start.S
+++ b/arch/x86/64/start.S
@@ -22,7 +22,7 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <asm.h>
+#include <lk/asm.h>
 #include <arch/x86/descriptor.h>
 #include <arch/x86/mmu.h>
 
diff --git a/arch/x86/arch.c b/arch/x86/arch.c
index f89ec3d6..ced37eca 100644
--- a/arch/x86/arch.c
+++ b/arch/x86/arch.c
@@ -22,7 +22,7 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include <debug.h>
+#include <lk/debug.h>
 #include <arch.h>
 #include <arch/ops.h>
 #include <arch/x86.h>
diff --git a/arch/x86/descriptor.c b/arch/x86/descriptor.c
index 53445cbb..01d93037 100644
--- a/arch/x86/descriptor.c
+++ b/arch/x86/descriptor.c
@@ -21,7 +21,7 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include <compiler.h>
+#include <lk/compiler.h>
 #include <arch/x86/descriptor.h>
 
 /* not the best way to do this, but easy for now */
diff --git a/arch/x86/faults.c b/arch/x86/faults.c
index b617eb56..8c8ae4f7 100644
--- a/arch/x86/faults.c
+++ b/arch/x86/faults.c
@@ -21,8 +21,8 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <debug.h>
-#include <trace.h>
+#include <lk/debug.h>
+#include <lk/trace.h>
 #include <arch/x86.h>
 #include <arch/fpu.h>
 #include <kernel/thread.h>
diff --git a/arch/x86/fpu.c b/arch/x86/fpu.c
index 414fbfa9..8786a40d 100644
--- a/arch/x86/fpu.c
+++ b/arch/x86/fpu.c
@@ -21,7 +21,7 @@
 * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
-#include <trace.h>
+#include <lk/trace.h>
 #include <arch/x86.h>
 #include <arch/fpu.h>
 #include <string.h>
diff --git a/arch/x86/gdt.S b/arch/x86/gdt.S
index b078dada..9641f4f8 100644
--- a/arch/x86/gdt.S
+++ b/arch/x86/gdt.S
@@ -22,7 +22,7 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <asm.h>
+#include <lk/asm.h>
 #include <arch/x86/descriptor.h>
 
 #define PHYS_LOAD_ADDRESS (MEMBASE + KERNEL_LOAD_OFFSET)
diff --git a/arch/x86/include/arch/arch_ops.h b/arch/x86/include/arch/arch_ops.h
index fd0644c3..6b0a0f90 100644
--- a/arch/x86/include/arch/arch_ops.h
+++ b/arch/x86/include/arch/arch_ops.h
@@ -23,7 +23,7 @@
  */
 #pragma once
 
-#include <compiler.h>
+#include <lk/compiler.h>
 
 #ifndef ASSEMBLY
 
diff --git a/arch/x86/include/arch/aspace.h b/arch/x86/include/arch/aspace.h
index 3c82778c..edf2f5b4 100644
--- a/arch/x86/include/arch/aspace.h
+++ b/arch/x86/include/arch/aspace.h
@@ -22,7 +22,7 @@
  */
 #pragma once
 
-#include <compiler.h>
+#include <lk/compiler.h>
 
 __BEGIN_CDECLS
 
diff --git a/arch/x86/include/arch/x86.h b/arch/x86/include/arch/x86.h
index 2e7087e9..57eb8e2a 100644
--- a/arch/x86/include/arch/x86.h
+++ b/arch/x86/include/arch/x86.h
@@ -24,7 +24,7 @@
  */
 #pragma once
 
-#include <compiler.h>
+#include <lk/compiler.h>
 #include <sys/types.h>
 #include <stdlib.h>
 #include <stdbool.h>
diff --git a/arch/x86/include/arch/x86/mmu.h b/arch/x86/include/arch/x86/mmu.h
index ccfa5221..caffc3e2 100644
--- a/arch/x86/include/arch/x86/mmu.h
+++ b/arch/x86/include/arch/x86/mmu.h
@@ -106,7 +106,7 @@
 #ifndef ASSEMBLY
 
 #include <sys/types.h>
-#include <compiler.h>
+#include <lk/compiler.h>
 
 __BEGIN_CDECLS
 
diff --git a/arch/x86/thread.c b/arch/x86/thread.c
index cc9cef5a..20864ebd 100644
--- a/arch/x86/thread.c
+++ b/arch/x86/thread.c
@@ -25,7 +25,7 @@
 #include <sys/types.h>
 #include <string.h>
 #include <stdlib.h>
-#include <debug.h>
+#include <lk/debug.h>
 #include <kernel/thread.h>
 #include <kernel/spinlock.h>
 #include <arch/x86.h>
diff --git a/dev/cache/pl310/pl310.c b/dev/cache/pl310/pl310.c
index 13c59163..90fcf174 100644
--- a/dev/cache/pl310/pl310.c
+++ b/dev/cache/pl310/pl310.c
@@ -23,9 +23,9 @@
 #include <dev/cache/pl310.h>
 
 #include <assert.h>
-#include <trace.h>
-#include <err.h>
-#include <reg.h>
+#include <lk/trace.h>
+#include <lk/err.h>
+#include <lk/reg.h>
 #include <stdlib.h>
 #include <arch.h>
 #include <arch/arm/mmu.h>
diff --git a/dev/class/block_api.c b/dev/class/block_api.c
index 12bf7737..7bd1d915 100644
--- a/dev/class/block_api.c
+++ b/dev/class/block_api.c
@@ -21,7 +21,7 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include <err.h>
+#include <lk/err.h>
 #include <dev/class/block.h>
 
 ssize_t class_block_get_size(struct device *dev)
diff --git a/dev/class/fb_api.c b/dev/class/fb_api.c
index 13629774..eabf9889 100644
--- a/dev/class/fb_api.c
+++ b/dev/class/fb_api.c
@@ -21,7 +21,7 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include <err.h>
+#include <lk/err.h>
 #include <dev/class/fb.h>
 
 status_t class_fb_set_mode(struct device *dev, size_t width, size_t height, size_t bpp)
diff --git a/dev/class/i2c_api.c b/dev/class/i2c_api.c
index d2b9d295..97dd4240 100644
--- a/dev/class/i2c_api.c
+++ b/dev/class/i2c_api.c
@@ -21,7 +21,7 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include <err.h>
+#include <lk/err.h>
 #include <dev/class/i2c.h>
 
 status_t class_i2c_write(struct device *dev, uint8_t addr, const void *buf, size_t len)
diff --git a/dev/class/netif_api.c b/dev/class/netif_api.c
index 51d14bee..04e7e1e6 100644
--- a/dev/class/netif_api.c
+++ b/dev/class/netif_api.c
@@ -21,7 +21,7 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include <err.h>
+#include <lk/err.h>
 #include <dev/class/netif.h>
 
 status_t class_netif_set_state(struct device *dev, struct netstack_state *state)
diff --git a/dev/class/spi_api.c b/dev/class/spi_api.c
index 217856c9..cbba8474 100644
--- a/dev/class/spi_api.c
+++ b/dev/class/spi_api.c
@@ -21,7 +21,7 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include <err.h>
+#include <lk/err.h>
 #include <dev/class/spi.h>
 
 ssize_t class_spi_transaction(struct device *dev, struct spi_transaction *txn, size_t count)
diff --git a/dev/class/uart_api.c b/dev/class/uart_api.c
index bef37d38..53d00df7 100644
--- a/dev/class/uart_api.c
+++ b/dev/class/uart_api.c
@@ -21,7 +21,7 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include <err.h>
+#include <lk/err.h>
 #include <dev/class/uart.h>
 
 ssize_t class_uart_read(struct device *dev, void *buf, size_t len)
diff --git a/dev/driver.c b/dev/driver.c
index 8175629a..efc3db0e 100644
--- a/dev/driver.c
+++ b/dev/driver.c
@@ -23,8 +23,8 @@
 
 #include <dev/driver.h>
 #include <assert.h>
-#include <err.h>
-#include <trace.h>
+#include <lk/err.h>
+#include <lk/trace.h>
 
 /* static list of devices constructed with DEVICE_INSTANCE macros */
 extern struct device __devices[];
diff --git a/dev/fbcon/fbcon.c b/dev/fbcon/fbcon.c
index bfd939c9..d0f5803c 100644
--- a/dev/fbcon/fbcon.c
+++ b/dev/fbcon/fbcon.c
@@ -26,8 +26,8 @@
  * SUCH DAMAGE.
  */
 
-#include <debug.h>
-#include <err.h>
+#include <lk/debug.h>
+#include <lk/err.h>
 #include <stdlib.h>
 #include <assert.h>
 #include <dev/fbcon.h>
diff --git a/dev/gpio_i2c/gpio_i2c.c b/dev/gpio_i2c/gpio_i2c.c
index bb11aba8..f5d4f2f1 100644
--- a/dev/gpio_i2c/gpio_i2c.c
+++ b/dev/gpio_i2c/gpio_i2c.c
@@ -22,10 +22,10 @@
  */
 
 #include <assert.h>
-#include <compiler.h>
-#include <debug.h>
+#include <lk/compiler.h>
+#include <lk/debug.h>
 #include <printf.h>
-#include <err.h>
+#include <lk/err.h>
 
 #include <dev/gpio.h>
 #include <dev/gpio_i2c.h>
diff --git a/dev/interrupt/arm_gic/arm_gic.c b/dev/interrupt/arm_gic/arm_gic.c
index e3a49554..8e664a85 100644
--- a/dev/interrupt/arm_gic/arm_gic.c
+++ b/dev/interrupt/arm_gic/arm_gic.c
@@ -21,19 +21,19 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 #include <assert.h>
-#include <bits.h>
-#include <err.h>
+#include <lk/bits.h>
+#include <lk/err.h>
 #include <sys/types.h>
-#include <debug.h>
+#include <lk/debug.h>
 #include <dev/interrupt/arm_gic.h>
-#include <reg.h>
+#include <lk/reg.h>
 #include <kernel/thread.h>
 #include <kernel/debug.h>
 #include <lk/init.h>
 #include <platform/interrupts.h>
 #include <arch/ops.h>
 #include <platform/gic.h>
-#include <trace.h>
+#include <lk/trace.h>
 #if WITH_LIB_SM
 #include <lib/sm.h>
 #include <lib/sm/sm_err.h>
diff --git a/dev/interrupt/or1k_pic/or1k_pic.c b/dev/interrupt/or1k_pic/or1k_pic.c
index 12fcadf1..cf346990 100644
--- a/dev/interrupt/or1k_pic/or1k_pic.c
+++ b/dev/interrupt/or1k_pic/or1k_pic.c
@@ -20,8 +20,8 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <err.h>
-#include <debug.h>
+#include <lk/err.h>
+#include <lk/debug.h>
 #include <kernel/thread.h>
 #include <platform/interrupts.h>
 #include <platform/pic.h>
diff --git a/dev/keys/gpio_keypad.c b/dev/keys/gpio_keypad.c
index 3d921260..35ae6eda 100644
--- a/dev/keys/gpio_keypad.c
+++ b/dev/keys/gpio_keypad.c
@@ -30,7 +30,7 @@
  */
 
 #include <assert.h>
-#include <bits.h>
+#include <lk/bits.h>
 #include <stdlib.h>
 #include <string.h>
 #include <dev/keys.h>
diff --git a/dev/keys/keys.c b/dev/keys/keys.c
index 81b075c6..8ca504bc 100644
--- a/dev/keys/keys.c
+++ b/dev/keys/keys.c
@@ -29,8 +29,8 @@
  * SUCH DAMAGE.
  */
 
-#include <bits.h>
-#include <debug.h>
+#include <lk/bits.h>
+#include <lk/debug.h>
 #include <string.h>
 #include <dev/keys.h>
 
diff --git a/dev/net/pcnet/pcnet.c b/dev/net/pcnet/pcnet.c
index a4d57f14..22e9546e 100644
--- a/dev/net/pcnet/pcnet.c
+++ b/dev/net/pcnet/pcnet.c
@@ -22,11 +22,11 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include <reg.h>
-#include <err.h>
+#include <lk/reg.h>
+#include <lk/err.h>
 #include <pcnet.h>
-#include <debug.h>
-#include <trace.h>
+#include <lk/debug.h>
+#include <lk/trace.h>
 #include <assert.h>
 #include <arch/x86.h>
 #include <platform/pc.h>
diff --git a/dev/net/smc91c96/smc91c96.c b/dev/net/smc91c96/smc91c96.c
index 6d2af470..9dade667 100644
--- a/dev/net/smc91c96/smc91c96.c
+++ b/dev/net/smc91c96/smc91c96.c
@@ -21,8 +21,8 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 #include <sys/types.h>
-#include <debug.h>
-#include <trace.h>
+#include <lk/debug.h>
+#include <lk/trace.h>
 #include <stdio.h>
 #include <dev/net/smc91c96.h>
 #include "smc91c96_p.h"
diff --git a/dev/timer/arm_cortex_a9/arm_cortex_a9_timer.c b/dev/timer/arm_cortex_a9/arm_cortex_a9_timer.c
index b0b5e584..30b7e0e6 100644
--- a/dev/timer/arm_cortex_a9/arm_cortex_a9_timer.c
+++ b/dev/timer/arm_cortex_a9/arm_cortex_a9_timer.c
@@ -22,12 +22,12 @@
  */
 #include <dev/timer/arm_cortex_a9.h>
 
-#include <debug.h>
+#include <lk/debug.h>
 #include <sys/types.h>
-#include <err.h>
+#include <lk/err.h>
 #include <stdio.h>
 #include <assert.h>
-#include <trace.h>
+#include <lk/trace.h>
 #include <lib/fixed_point.h>
 #include <kernel/thread.h>
 #include <kernel/spinlock.h>
diff --git a/dev/timer/arm_generic/arm_generic_timer.c b/dev/timer/arm_generic/arm_generic_timer.c
index db267e28..6d484026 100644
--- a/dev/timer/arm_generic/arm_generic_timer.c
+++ b/dev/timer/arm_generic/arm_generic_timer.c
@@ -27,7 +27,7 @@
 #include <platform.h>
 #include <platform/interrupts.h>
 #include <platform/timer.h>
-#include <trace.h>
+#include <lk/trace.h>
 
 #define LOCAL_TRACE 0
 
diff --git a/dev/timer/or1k_ticktimer/or1k_ticktimer.c b/dev/timer/or1k_ticktimer/or1k_ticktimer.c
index 1dc64e6a..db48716e 100644
--- a/dev/timer/or1k_ticktimer/or1k_ticktimer.c
+++ b/dev/timer/or1k_ticktimer/or1k_ticktimer.c
@@ -20,8 +20,8 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <trace.h>
-#include <err.h>
+#include <lk/trace.h>
+#include <lk/err.h>
 #include <kernel/thread.h>
 #include <platform/timer.h>
 #include <platform/debug.h>
diff --git a/dev/usb/class/bulktest/bulktest.c b/dev/usb/class/bulktest/bulktest.c
index 6a0991b0..3d6f251a 100644
--- a/dev/usb/class/bulktest/bulktest.c
+++ b/dev/usb/class/bulktest/bulktest.c
@@ -22,13 +22,13 @@
  */
 #include <dev/usb/class/bulktest.h>
 
-#include <debug.h>
-#include <trace.h>
-#include <err.h>
+#include <lk/debug.h>
+#include <lk/trace.h>
+#include <lk/err.h>
 #include <stdlib.h>
 #include <string.h>
 #include <assert.h>
-#include <list.h>
+#include <lk/list.h>
 #include <dev/usbc.h>
 #include <dev/usb.h>
 #include <lk/init.h>
diff --git a/dev/usb/class/cdcserial/cdcserial.c b/dev/usb/class/cdcserial/cdcserial.c
index 8157a99c..72258dc2 100644
--- a/dev/usb/class/cdcserial/cdcserial.c
+++ b/dev/usb/class/cdcserial/cdcserial.c
@@ -29,9 +29,9 @@
 #include <dev/usb.h>
 #include <dev/usbc.h>
 #include <dev/usbc.h>
-#include <err.h>
+#include <lk/err.h>
 #include <sys/types.h>
-#include <trace.h>
+#include <lk/trace.h>
 
 #define LOCAL_TRACE 0
 
diff --git a/dev/usb/usb.c b/dev/usb/usb.c
index 9c49a21a..32ce5e97 100644
--- a/dev/usb/usb.c
+++ b/dev/usb/usb.c
@@ -20,13 +20,13 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <debug.h>
-#include <trace.h>
-#include <err.h>
+#include <lk/debug.h>
+#include <lk/trace.h>
+#include <lk/err.h>
 #include <stdlib.h>
 #include <string.h>
 #include <assert.h>
-#include <list.h>
+#include <lk/list.h>
 #include <dev/usbc.h>
 #include <dev/usb.h>
 #include <lk/init.h>
diff --git a/dev/virtio/block/include/dev/virtio/block.h b/dev/virtio/block/include/dev/virtio/block.h
index 042121d7..89c30571 100644
--- a/dev/virtio/block/include/dev/virtio/block.h
+++ b/dev/virtio/block/include/dev/virtio/block.h
@@ -22,7 +22,7 @@
  */
 #pragma once
 
-#include <compiler.h>
+#include <lk/compiler.h>
 #include <sys/types.h>
 #include <dev/virtio.h>
 
diff --git a/dev/virtio/block/virtio-block.c b/dev/virtio/block/virtio-block.c
index 6e373b6d..2be9070f 100644
--- a/dev/virtio/block/virtio-block.c
+++ b/dev/virtio/block/virtio-block.c
@@ -22,12 +22,12 @@
  */
 #include <dev/virtio/block.h>
 
-#include <debug.h>
+#include <lk/debug.h>
 #include <assert.h>
-#include <trace.h>
-#include <compiler.h>
-#include <list.h>
-#include <err.h>
+#include <lk/trace.h>
+#include <lk/compiler.h>
+#include <lk/list.h>
+#include <lk/err.h>
 #include <kernel/thread.h>
 #include <kernel/event.h>
 #include <kernel/mutex.h>
diff --git a/dev/virtio/gpu/include/dev/virtio/gpu.h b/dev/virtio/gpu/include/dev/virtio/gpu.h
index 23006971..c35d63b1 100644
--- a/dev/virtio/gpu/include/dev/virtio/gpu.h
+++ b/dev/virtio/gpu/include/dev/virtio/gpu.h
@@ -22,7 +22,7 @@
  */
 #pragma once
 
-#include <compiler.h>
+#include <lk/compiler.h>
 #include <sys/types.h>
 #include <dev/virtio.h>
 
diff --git a/dev/virtio/gpu/virtio-gpu.c b/dev/virtio/gpu/virtio-gpu.c
index 93e1e06e..c6244f87 100644
--- a/dev/virtio/gpu/virtio-gpu.c
+++ b/dev/virtio/gpu/virtio-gpu.c
@@ -22,12 +22,12 @@
  */
 #include <dev/virtio/gpu.h>
 
-#include <debug.h>
+#include <lk/debug.h>
 #include <assert.h>
-#include <trace.h>
-#include <compiler.h>
-#include <list.h>
-#include <err.h>
+#include <lk/trace.h>
+#include <lk/compiler.h>
+#include <lk/list.h>
+#include <lk/err.h>
 #include <string.h>
 #include <kernel/thread.h>
 #include <kernel/event.h>
diff --git a/dev/virtio/include/dev/virtio.h b/dev/virtio/include/dev/virtio.h
index 3403602c..9255bf1f 100644
--- a/dev/virtio/include/dev/virtio.h
+++ b/dev/virtio/include/dev/virtio.h
@@ -22,9 +22,9 @@
  */
 #pragma once
 
-#include <compiler.h>
+#include <lk/compiler.h>
 #include <assert.h>
-#include <list.h>
+#include <lk/list.h>
 #include <sys/types.h>
 #include <dev/virtio/virtio_ring.h>
 
diff --git a/dev/virtio/include/dev/virtio/virtio_ring.h b/dev/virtio/include/dev/virtio/virtio_ring.h
index 525cb51c..602715e9 100644
--- a/dev/virtio/include/dev/virtio/virtio_ring.h
+++ b/dev/virtio/include/dev/virtio/virtio_ring.h
@@ -33,7 +33,7 @@
  *
  * Copyright Rusty Russell IBM Corporation 2007. */
 #include <stdint.h>
-#include <pow2.h>
+#include <lk/pow2.h>
 
 /* This marks a buffer as continuing via the next field. */
 #define VRING_DESC_F_NEXT   1
diff --git a/dev/virtio/net/include/dev/virtio/net.h b/dev/virtio/net/include/dev/virtio/net.h
index 48ac6a08..7448fb36 100644
--- a/dev/virtio/net/include/dev/virtio/net.h
+++ b/dev/virtio/net/include/dev/virtio/net.h
@@ -22,7 +22,7 @@
  */
 #pragma once
 
-#include <compiler.h>
+#include <lk/compiler.h>
 #include <sys/types.h>
 #include <dev/virtio.h>
 
diff --git a/dev/virtio/net/virtio-net.c b/dev/virtio/net/virtio-net.c
index 2d0102da..712280eb 100644
--- a/dev/virtio/net/virtio-net.c
+++ b/dev/virtio/net/virtio-net.c
@@ -22,13 +22,13 @@
  */
 #include <dev/virtio/net.h>
 
-#include <debug.h>
+#include <lk/debug.h>
 #include <assert.h>
-#include <trace.h>
-#include <compiler.h>
-#include <list.h>
+#include <lk/trace.h>
+#include <lk/compiler.h>
+#include <lk/list.h>
 #include <string.h>
-#include <err.h>
+#include <lk/err.h>
 #include <kernel/thread.h>
 #include <kernel/event.h>
 #include <kernel/spinlock.h>
diff --git a/dev/virtio/virtio.c b/dev/virtio/virtio.c
index 46e4c099..c7c89613 100644
--- a/dev/virtio/virtio.c
+++ b/dev/virtio/virtio.c
@@ -23,15 +23,15 @@
 #include <dev/virtio.h>
 #include <dev/virtio/virtio_ring.h>
 
-#include <debug.h>
+#include <lk/debug.h>
 #include <assert.h>
-#include <trace.h>
-#include <compiler.h>
-#include <list.h>
-#include <err.h>
+#include <lk/trace.h>
+#include <lk/compiler.h>
+#include <lk/list.h>
+#include <lk/err.h>
 #include <stdlib.h>
 #include <string.h>
-#include <pow2.h>
+#include <lk/pow2.h>
 #include <lk/init.h>
 #include <kernel/thread.h>
 #include <kernel/vm.h>
diff --git a/dev/virtio/virtio_priv.h b/dev/virtio/virtio_priv.h
index 5b2cd999..cac407c9 100644
--- a/dev/virtio/virtio_priv.h
+++ b/dev/virtio/virtio_priv.h
@@ -22,7 +22,7 @@
  */
 #pragma once
 
-#include <compiler.h>
+#include <lk/compiler.h>
 #include <stdint.h>
 
 struct virtio_mmio_config {
diff --git a/external/arch/arm/arm-m/CMSIS/Include/cmsis_gcc.h b/external/arch/arm/arm-m/CMSIS/Include/cmsis_gcc.h
index 27fcd29b..b3eb91c3 100644
--- a/external/arch/arm/arm-m/CMSIS/Include/cmsis_gcc.h
+++ b/external/arch/arm/arm-m/CMSIS/Include/cmsis_gcc.h
@@ -26,7 +26,7 @@
 #define __CMSIS_GCC_H
 
 /* LK: include lk's compiler.h first, which has some of the same #defines */
-#include <compiler.h>
+#include <lk/compiler.h>
 
 /* ignore some GCC warnings */
 #pragma GCC diagnostic push
diff --git a/external/lib/aes/test/aes_test.c b/external/lib/aes/test/aes_test.c
index 6fca2d6f..855aa41a 100644
--- a/external/lib/aes/test/aes_test.c
+++ b/external/lib/aes/test/aes_test.c
@@ -7,8 +7,8 @@
 #include <stdint.h>
 #include <string.h>
 #include <platform.h>
-#include <debug.h>
-#include <trace.h>
+#include <lk/debug.h>
+#include <lk/trace.h>
 #include <arch/ops.h>
 #include <lib/console.h>
 
diff --git a/external/lib/cksum/debug.c b/external/lib/cksum/debug.c
index aec43295..1089f8a6 100644
--- a/external/lib/cksum/debug.c
+++ b/external/lib/cksum/debug.c
@@ -23,7 +23,7 @@
 #if WITH_LIB_CONSOLE
 
 #include <ctype.h>
-#include <debug.h>
+#include <lk/debug.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <kernel/thread.h>
diff --git a/external/lib/cksum/include/lib/cksum.h b/external/lib/cksum/include/lib/cksum.h
index 67d43455..63cf6742 100644
--- a/external/lib/cksum/include/lib/cksum.h
+++ b/external/lib/cksum/include/lib/cksum.h
@@ -1,7 +1,7 @@
 #ifndef __CKSUM_H
 #define __CKSUM_H
 
-#include <compiler.h>
+#include <lk/compiler.h>
 
 __BEGIN_CDECLS
 
diff --git a/external/lib/heap/dlmalloc/dlmalloc.c b/external/lib/heap/dlmalloc/dlmalloc.c
index 7034ec37..5f4181f5 100644
--- a/external/lib/heap/dlmalloc/dlmalloc.c
+++ b/external/lib/heap/dlmalloc/dlmalloc.c
@@ -543,7 +543,7 @@ MAX_RELEASE_CHECK_RATE   default: 4095 unless not HAVE_MMAP
 #include <sys/types.h>
 #include <lib/page_alloc.h>
 #include <assert.h>
-#include <debug.h>
+#include <lk/debug.h>
 #define MMAP(s) mmap(s)
 #define DIRECT_MMAP(s) mmap(s)
 #define MUNMAP(b, s) munmap(b, s)
diff --git a/external/lib/lwip/include/arch/cc.h b/external/lib/lwip/include/arch/cc.h
index bcb3fe62..6b7efd8c 100644
--- a/external/lib/lwip/include/arch/cc.h
+++ b/external/lib/lwip/include/arch/cc.h
@@ -26,7 +26,7 @@
 #include <stdint.h>
 #include <endian.h>
 #include <stdio.h>
-#include <compiler.h>
+#include <lk/compiler.h>
 
 typedef uint8_t u8_t;
 typedef uint16_t u16_t;
diff --git a/external/lib/lwip/netif.c b/external/lib/lwip/netif.c
index 05aa63a4..b8e9f79b 100644
--- a/external/lib/lwip/netif.c
+++ b/external/lib/lwip/netif.c
@@ -4,11 +4,11 @@
 #include <netif/etharp.h>
 #include <lwip/netif.h>
 #include <lwip/dhcp.h>
-#include <debug.h>
-#include <trace.h>
+#include <lk/debug.h>
+#include <lk/trace.h>
 #include <assert.h>
-#include <list.h>
-#include <err.h>
+#include <lk/list.h>
+#include <lk/err.h>
 
 #define LOCAL_TRACE 0
 
diff --git a/external/lib/lwip/sys_arch.c b/external/lib/lwip/sys_arch.c
index 34a23af7..dbc41fe1 100644
--- a/external/lib/lwip/sys_arch.c
+++ b/external/lib/lwip/sys_arch.c
@@ -3,8 +3,8 @@
 #include <lwip/sys.h>
 #include <platform.h>
 #include <assert.h>
-#include <trace.h>
-#include <err.h>
+#include <lk/trace.h>
+#include <lk/err.h>
 #include <stdbool.h>
 #include <lk/init.h>
 
diff --git a/external/platform/stm32f7xx/STM32F7xx_HAL_Driver/Src/stm32f7xx_hal_qspi.c b/external/platform/stm32f7xx/STM32F7xx_HAL_Driver/Src/stm32f7xx_hal_qspi.c
index a25319a4..32de8bf5 100644
--- a/external/platform/stm32f7xx/STM32F7xx_HAL_Driver/Src/stm32f7xx_hal_qspi.c
+++ b/external/platform/stm32f7xx/STM32F7xx_HAL_Driver/Src/stm32f7xx_hal_qspi.c
@@ -155,7 +155,7 @@
 
 /* Includes ------------------------------------------------------------------*/
 #include "stm32f7xx_hal.h"
-#include <trace.h>
+#include <lk/trace.h>
 
 #define LOCAL_TRACE 0
 
diff --git a/external/platform/stm32f7xx/STM32F7xx_HAL_Driver/lk_hal.c b/external/platform/stm32f7xx/STM32F7xx_HAL_Driver/lk_hal.c
index 101286d0..43464b30 100644
--- a/external/platform/stm32f7xx/STM32F7xx_HAL_Driver/lk_hal.c
+++ b/external/platform/stm32f7xx/STM32F7xx_HAL_Driver/lk_hal.c
@@ -20,7 +20,7 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <debug.h>
+#include <lk/debug.h>
 #include <platform.h>
 #include <platform/stm32.h>
 
diff --git a/include/app.h b/include/app.h
index 88cca4eb..68a59b2c 100644
--- a/include/app.h
+++ b/include/app.h
@@ -24,7 +24,7 @@
 #define __APP_H
 
 #include <stddef.h>
-#include <compiler.h>
+#include <lk/compiler.h>
 
 __BEGIN_CDECLS
 
diff --git a/include/arch.h b/include/arch.h
index 43e27197..37da6cc7 100644
--- a/include/arch.h
+++ b/include/arch.h
@@ -23,7 +23,7 @@
 #ifndef __ARCH_H
 #define __ARCH_H
 
-#include <compiler.h>
+#include <lk/compiler.h>
 #include <sys/types.h>
 
 __BEGIN_CDECLS
diff --git a/include/arch/mmu.h b/include/arch/mmu.h
index e82f38a6..cde4c58c 100644
--- a/include/arch/mmu.h
+++ b/include/arch/mmu.h
@@ -24,7 +24,7 @@
 
 #include <arch.h>
 #include <sys/types.h>
-#include <compiler.h>
+#include <lk/compiler.h>
 
 /* to bring in definition of arch_aspace */
 #include <arch/aspace.h>
diff --git a/include/arch/ops.h b/include/arch/ops.h
index f0977519..29d1ed9b 100644
--- a/include/arch/ops.h
+++ b/include/arch/ops.h
@@ -28,7 +28,7 @@
 #include <sys/types.h>
 #include <stddef.h>
 #include <stdbool.h>
-#include <compiler.h>
+#include <lk/compiler.h>
 
 __BEGIN_CDECLS
 
diff --git a/include/dev/class/block.h b/include/dev/class/block.h
index 8d344b79..4e493a6b 100644
--- a/include/dev/class/block.h
+++ b/include/dev/class/block.h
@@ -23,7 +23,7 @@
 #ifndef __DEV_CLASS_BLOCK_H
 #define __DEV_CLASS_BLOCK_H
 
-#include <compiler.h>
+#include <lk/compiler.h>
 #include <dev/driver.h>
 
 /* block interface */
diff --git a/include/dev/class/fb.h b/include/dev/class/fb.h
index 4e5e9f08..7e58049d 100644
--- a/include/dev/class/fb.h
+++ b/include/dev/class/fb.h
@@ -23,7 +23,7 @@
 #ifndef __DEV_CLASS_FB_H
 #define __DEV_CLASS_FB_H
 
-#include <compiler.h>
+#include <lk/compiler.h>
 #include <dev/driver.h>
 
 struct fb_info {
diff --git a/include/dev/class/i2c.h b/include/dev/class/i2c.h
index d87c3f01..9b6286ec 100644
--- a/include/dev/class/i2c.h
+++ b/include/dev/class/i2c.h
@@ -23,7 +23,7 @@
 #ifndef __DEV_CLASS_I2C_H
 #define __DEV_CLASS_I2C_H
 
-#include <compiler.h>
+#include <lk/compiler.h>
 #include <dev/driver.h>
 
 /* i2c interface */
diff --git a/include/dev/class/netif.h b/include/dev/class/netif.h
index a33bea8c..1cfd26a3 100644
--- a/include/dev/class/netif.h
+++ b/include/dev/class/netif.h
@@ -23,8 +23,8 @@
 #ifndef __DEV_CLASS_NETIF_H
 #define __DEV_CLASS_NETIF_H
 
-#include <list.h>
-#include <compiler.h>
+#include <lk/list.h>
+#include <lk/compiler.h>
 #include <dev/driver.h>
 
 struct netstack_state;
diff --git a/include/dev/class/spi.h b/include/dev/class/spi.h
index 61ac733c..fb562afc 100644
--- a/include/dev/class/spi.h
+++ b/include/dev/class/spi.h
@@ -23,7 +23,7 @@
 #ifndef __DEV_CLASS_SPI_H
 #define __DEV_CLASS_SPI_H
 
-#include <compiler.h>
+#include <lk/compiler.h>
 #include <dev/driver.h>
 
 /* spi transaction flags */
diff --git a/include/dev/display.h b/include/dev/display.h
index 6337d981..fc0d6e2f 100644
--- a/include/dev/display.h
+++ b/include/dev/display.h
@@ -26,7 +26,7 @@
 #include <stdbool.h>
 #include <sys/types.h>
 #include <inttypes.h>
-#include <compiler.h>
+#include <lk/compiler.h>
 
 __BEGIN_CDECLS
 
diff --git a/include/dev/driver.h b/include/dev/driver.h
index 27ede995..a13fa566 100644
--- a/include/dev/driver.h
+++ b/include/dev/driver.h
@@ -24,8 +24,8 @@
 #define __DEV_DRIVER_H
 
 #include <sys/types.h>
-#include <list.h> // for containerof
-#include <compiler.h>
+#include <lk/list.h> // for containerof
+#include <lk/compiler.h>
 
 __BEGIN_CDECLS
 
diff --git a/include/dev/pci.h b/include/dev/pci.h
index d2485330..cea4ff07 100644
--- a/include/dev/pci.h
+++ b/include/dev/pci.h
@@ -24,7 +24,7 @@
 #define __PCI_H
 
 #include <sys/types.h>
-#include <compiler.h>
+#include <lk/compiler.h>
 
 /*
  * PCI access return codes
diff --git a/include/dev/usb.h b/include/dev/usb.h
index 5e39203b..88e20927 100644
--- a/include/dev/usb.h
+++ b/include/dev/usb.h
@@ -24,7 +24,7 @@
 #define __DEV_USB_H
 
 #include <sys/types.h>
-#include <compiler.h>
+#include <lk/compiler.h>
 
 __BEGIN_CDECLS
 
diff --git a/include/dev/usbc.h b/include/dev/usbc.h
index c31d259d..428b152c 100644
--- a/include/dev/usbc.h
+++ b/include/dev/usbc.h
@@ -23,7 +23,7 @@
 #ifndef __DEV_USBC_H
 #define __DEV_USBC_H
 
-#include <compiler.h>
+#include <lk/compiler.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <sys/types.h>
diff --git a/include/hw/usb.h b/include/hw/usb.h
index 8552fa63..6001612e 100644
--- a/include/hw/usb.h
+++ b/include/hw/usb.h
@@ -24,7 +24,7 @@
 #define __HW_USB_H
 
 #include <sys/types.h>
-#include <compiler.h>
+#include <lk/compiler.h>
 
 /* GLOBAL STATUS VALUES */
 #define STD_COMMAND                 0x00
diff --git a/include/kernel/debug.h b/include/kernel/debug.h
index 4c2b20d6..20ed2b9c 100644
--- a/include/kernel/debug.h
+++ b/include/kernel/debug.h
@@ -23,11 +23,11 @@
 #ifndef __KERNEL_DEBUG_H
 #define __KERNEL_DEBUG_H
 
-#include <compiler.h>
+#include <lk/compiler.h>
 
 __BEGIN_CDECLS
 
-#include <debug.h>
+#include <lk/debug.h>
 
 /* kernel event log */
 #if WITH_KERNEL_EVLOG
diff --git a/include/kernel/event.h b/include/kernel/event.h
index 3e214e79..72548f09 100644
--- a/include/kernel/event.h
+++ b/include/kernel/event.h
@@ -23,7 +23,7 @@
 #ifndef __KERNEL_EVENT_H
 #define __KERNEL_EVENT_H
 
-#include <compiler.h>
+#include <lk/compiler.h>
 #include <stdbool.h>
 #include <sys/types.h>
 #include <kernel/thread.h>
diff --git a/include/kernel/mp.h b/include/kernel/mp.h
index d4ae3d45..aa04fa13 100644
--- a/include/kernel/mp.h
+++ b/include/kernel/mp.h
@@ -22,7 +22,7 @@
  */
 #pragma once
 
-#include <compiler.h>
+#include <lk/compiler.h>
 #include <limits.h>
 #include <stdbool.h>
 #include <stdint.h>
diff --git a/include/kernel/mutex.h b/include/kernel/mutex.h
index 63273396..ce9ca100 100644
--- a/include/kernel/mutex.h
+++ b/include/kernel/mutex.h
@@ -24,8 +24,8 @@
 #ifndef __KERNEL_MUTEX_H
 #define __KERNEL_MUTEX_H
 
-#include <compiler.h>
-#include <debug.h>
+#include <lk/compiler.h>
+#include <lk/debug.h>
 #include <stdint.h>
 #include <kernel/thread.h>
 
diff --git a/include/kernel/port.h b/include/kernel/port.h
index 6f0d3c43..76572815 100644
--- a/include/kernel/port.h
+++ b/include/kernel/port.h
@@ -24,7 +24,7 @@
 #define __KERNEL_PORT_H
 
 #include <sys/types.h>
-#include <compiler.h>
+#include <lk/compiler.h>
 
 
 __BEGIN_CDECLS
diff --git a/include/kernel/semaphore.h b/include/kernel/semaphore.h
index 1f979545..17520484 100644
--- a/include/kernel/semaphore.h
+++ b/include/kernel/semaphore.h
@@ -17,7 +17,7 @@
 #ifndef __KERNEL_SEMAPHORE_H
 #define __KERNEL_SEMAPHORE_H
 
-#include <compiler.h>
+#include <lk/compiler.h>
 #include <kernel/thread.h>
 #include <kernel/mutex.h>
 
diff --git a/include/kernel/spinlock.h b/include/kernel/spinlock.h
index 66d0f1d9..fa202de0 100644
--- a/include/kernel/spinlock.h
+++ b/include/kernel/spinlock.h
@@ -22,7 +22,7 @@
  */
 #pragma once
 
-#include <compiler.h>
+#include <lk/compiler.h>
 #include <arch/spinlock.h>
 
 __BEGIN_CDECLS
diff --git a/include/kernel/thread.h b/include/kernel/thread.h
index 3f2c4d0d..6c41959e 100644
--- a/include/kernel/thread.h
+++ b/include/kernel/thread.h
@@ -24,14 +24,14 @@
 #define __KERNEL_THREAD_H
 
 #include <sys/types.h>
-#include <list.h>
-#include <compiler.h>
+#include <lk/list.h>
+#include <lk/compiler.h>
 #include <arch/defines.h>
 #include <arch/ops.h>
 #include <arch/thread.h>
 #include <kernel/wait.h>
 #include <kernel/spinlock.h>
-#include <debug.h>
+#include <lk/debug.h>
 
 #if WITH_KERNEL_VM
 /* forward declaration */
diff --git a/include/kernel/timer.h b/include/kernel/timer.h
index 48a73d93..fb7bccc9 100644
--- a/include/kernel/timer.h
+++ b/include/kernel/timer.h
@@ -23,8 +23,8 @@
 #ifndef __KERNEL_TIMER_H
 #define __KERNEL_TIMER_H
 
-#include <compiler.h>
-#include <list.h>
+#include <lk/compiler.h>
+#include <lk/list.h>
 #include <sys/types.h>
 
 __BEGIN_CDECLS
diff --git a/include/kernel/vm.h b/include/kernel/vm.h
index 9925d1e9..1b872a14 100644
--- a/include/kernel/vm.h
+++ b/include/kernel/vm.h
@@ -47,8 +47,8 @@
 
 #include <sys/types.h>
 #include <stdint.h>
-#include <compiler.h>
-#include <list.h>
+#include <lk/compiler.h>
+#include <lk/list.h>
 #include <stdlib.h>
 #include <arch.h>
 #include <arch/mmu.h>
diff --git a/include/kernel/wait.h b/include/kernel/wait.h
index 69cc65c5..adfbb587 100644
--- a/include/kernel/wait.h
+++ b/include/kernel/wait.h
@@ -24,8 +24,8 @@
 #define __KERNEL_WAIT_H
 
 #include <sys/types.h>
-#include <list.h>
-#include <compiler.h>
+#include <lk/list.h>
+#include <lk/compiler.h>
 #include <arch/defines.h>
 #include <arch/ops.h>
 #include <arch/thread.h>
diff --git a/include/lib/console.h b/include/lib/console.h
index 3ab1c9d9..6c5cfad4 100644
--- a/include/lib/console.h
+++ b/include/lib/console.h
@@ -26,7 +26,7 @@
 #include <stdbool.h>
 #include <stddef.h>
 #include <sys/types.h>
-#include <compiler.h>
+#include <lk/compiler.h>
 
 /* command args */
 typedef struct {
diff --git a/include/lib/dpc.h b/include/lib/dpc.h
index 36fcb53c..3996d222 100644
--- a/include/lib/dpc.h
+++ b/include/lib/dpc.h
@@ -23,7 +23,7 @@
 #ifndef __KERNEL_DPC_H
 #define __KERNEL_DPC_H
 
-#include <list.h>
+#include <lk/list.h>
 #include <sys/types.h>
 
 typedef void (*dpc_callback)(void *arg);
diff --git a/include/lib/font.h b/include/lib/font.h
index d6bac0b0..5fb0e828 100644
--- a/include/lib/font.h
+++ b/include/lib/font.h
@@ -24,7 +24,7 @@
 #define __LIB_FONT_H
 
 #include <lib/gfx.h>
-#include <compiler.h>
+#include <lk/compiler.h>
 
 #define FONT_X  6
 #define FONT_Y  12
diff --git a/include/lib/gfx.h b/include/lib/gfx.h
index 2e36fa73..a4487865 100644
--- a/include/lib/gfx.h
+++ b/include/lib/gfx.h
@@ -26,7 +26,7 @@
 #include <stdbool.h>
 #include <sys/types.h>
 #include <inttypes.h>
-#include <compiler.h>
+#include <lk/compiler.h>
 
 // gfx library
 
diff --git a/include/lib/page_alloc.h b/include/lib/page_alloc.h
index 1124a6bf..a5a8e8fe 100644
--- a/include/lib/page_alloc.h
+++ b/include/lib/page_alloc.h
@@ -25,7 +25,7 @@
 
 #include <stddef.h>
 #include <sys/types.h>
-#include <compiler.h>
+#include <lk/compiler.h>
 
 // to pick up PAGE_SIZE, PAGE_ALIGN, etc
 #if WITH_KERNEL_VM
diff --git a/include/lib/ptable.h b/include/lib/ptable.h
index 8112692d..37c409fe 100644
--- a/include/lib/ptable.h
+++ b/include/lib/ptable.h
@@ -23,7 +23,7 @@
  */
 #pragma once
 
-#include <compiler.h>
+#include <lk/compiler.h>
 #include <sys/types.h>
 #include <lib/bio.h>
 
diff --git a/include/platform.h b/include/platform.h
index 8e8f6777..b5be9c32 100644
--- a/include/platform.h
+++ b/include/platform.h
@@ -24,7 +24,7 @@
 #define __PLATFORM_H
 
 #include <sys/types.h>
-#include <compiler.h>
+#include <lk/compiler.h>
 
 __BEGIN_CDECLS
 
diff --git a/include/platform/debug.h b/include/platform/debug.h
index 8cbf024a..d78d8bd5 100644
--- a/include/platform/debug.h
+++ b/include/platform/debug.h
@@ -26,7 +26,7 @@
 #include <sys/types.h>
 #include <stdbool.h>
 #include <stdarg.h>
-#include <compiler.h>
+#include <lk/compiler.h>
 
 __BEGIN_CDECLS
 
diff --git a/include/target.h b/include/target.h
index 80726418..7e3b55f8 100644
--- a/include/target.h
+++ b/include/target.h
@@ -23,7 +23,7 @@
 #ifndef __TARGET_H
 #define __TARGET_H
 
-#include <compiler.h>
+#include <lk/compiler.h>
 #include <stdbool.h>
 
 __BEGIN_CDECLS
diff --git a/kernel/debug.c b/kernel/debug.c
index a121767c..ebd741cd 100644
--- a/kernel/debug.c
+++ b/kernel/debug.c
@@ -31,13 +31,13 @@
  * @brief  Debug console functions.
  */
 
-#include <debug.h>
+#include <lk/debug.h>
 #include <stdio.h>
 #include <kernel/thread.h>
 #include <kernel/timer.h>
 #include <kernel/debug.h>
 #include <kernel/mp.h>
-#include <err.h>
+#include <lk/err.h>
 #include <platform.h>
 
 #if WITH_LIB_CONSOLE
diff --git a/kernel/event.c b/kernel/event.c
index 593e7548..d61cbb3c 100644
--- a/kernel/event.c
+++ b/kernel/event.c
@@ -41,9 +41,9 @@
  */
 
 #include <kernel/event.h>
-#include <debug.h>
+#include <lk/debug.h>
 #include <assert.h>
-#include <err.h>
+#include <lk/err.h>
 #include <kernel/thread.h>
 
 /**
diff --git a/kernel/init.c b/kernel/init.c
index 0aefecda..69159339 100644
--- a/kernel/init.c
+++ b/kernel/init.c
@@ -20,8 +20,8 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <compiler.h>
-#include <debug.h>
+#include <lk/compiler.h>
+#include <lk/debug.h>
 #include <kernel/debug.h>
 #include <kernel/thread.h>
 #include <kernel/timer.h>
diff --git a/kernel/mp.c b/kernel/mp.c
index bb804ae7..a61311b3 100644
--- a/kernel/mp.c
+++ b/kernel/mp.c
@@ -24,9 +24,9 @@
 #include <kernel/mp.h>
 
 #include <stdlib.h>
-#include <debug.h>
+#include <lk/debug.h>
 #include <assert.h>
-#include <trace.h>
+#include <lk/trace.h>
 #include <arch/mp.h>
 #include <kernel/spinlock.h>
 
diff --git a/kernel/mutex.c b/kernel/mutex.c
index 575f7b9c..d6553b52 100644
--- a/kernel/mutex.c
+++ b/kernel/mutex.c
@@ -31,9 +31,9 @@
  */
 
 #include <kernel/mutex.h>
-#include <debug.h>
+#include <lk/debug.h>
 #include <assert.h>
-#include <err.h>
+#include <lk/err.h>
 #include <kernel/thread.h>
 
 /**
diff --git a/kernel/novm/novm.c b/kernel/novm/novm.c
index 46692b80..3af754fe 100644
--- a/kernel/novm/novm.c
+++ b/kernel/novm/novm.c
@@ -23,9 +23,9 @@
 
 #include "kernel/novm.h"
 
-#include <err.h>
+#include <lk/err.h>
 #include <assert.h>
-#include <trace.h>
+#include <lk/trace.h>
 #include <stdlib.h>
 #include <string.h>
 #include <lk/init.h>
diff --git a/kernel/port.c b/kernel/port.c
index 351ed0bf..676c46ff 100644
--- a/kernel/port.c
+++ b/kernel/port.c
@@ -28,12 +28,12 @@
  *
  */
 
-#include <debug.h>
-#include <list.h>
+#include <lk/debug.h>
+#include <lk/list.h>
 #include <malloc.h>
 #include <string.h>
-#include <pow2.h>
-#include <err.h>
+#include <lk/pow2.h>
+#include <lk/err.h>
 #include <kernel/thread.h>
 #include <kernel/port.h>
 
diff --git a/kernel/semaphore.c b/kernel/semaphore.c
index 51650e0a..ec298f85 100644
--- a/kernel/semaphore.c
+++ b/kernel/semaphore.c
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include <debug.h>
-#include <err.h>
+#include <lk/debug.h>
+#include <lk/err.h>
 #include <kernel/semaphore.h>
 #include <kernel/thread.h>
 
diff --git a/kernel/thread.c b/kernel/thread.c
index 08c05170..10939827 100644
--- a/kernel/thread.c
+++ b/kernel/thread.c
@@ -30,13 +30,13 @@
  * @defgroup thread Threads
  * @{
  */
-#include <debug.h>
+#include <lk/debug.h>
 #include <assert.h>
-#include <list.h>
+#include <lk/list.h>
 #include <malloc.h>
 #include <string.h>
 #include <printf.h>
-#include <err.h>
+#include <lk/err.h>
 #include <lib/dpc.h>
 #include <kernel/thread.h>
 #include <kernel/timer.h>
diff --git a/kernel/timer.c b/kernel/timer.c
index 840c8109..92b813cc 100644
--- a/kernel/timer.c
+++ b/kernel/timer.c
@@ -34,10 +34,10 @@
  *
  * @{
  */
-#include <debug.h>
-#include <trace.h>
+#include <lk/debug.h>
+#include <lk/trace.h>
 #include <assert.h>
-#include <list.h>
+#include <lk/list.h>
 #include <kernel/thread.h>
 #include <kernel/timer.h>
 #include <kernel/debug.h>
diff --git a/kernel/vm/bootalloc.c b/kernel/vm/bootalloc.c
index 429c5f40..cf6e86c9 100644
--- a/kernel/vm/bootalloc.c
+++ b/kernel/vm/bootalloc.c
@@ -26,7 +26,7 @@
 #include <stdint.h>
 #include <stdlib.h>
 #include <sys/types.h>
-#include <trace.h>
+#include <lk/trace.h>
 
 #define LOCAL_TRACE 0
 
diff --git a/kernel/vm/pmm.c b/kernel/vm/pmm.c
index ae791bc4..80127316 100644
--- a/kernel/vm/pmm.c
+++ b/kernel/vm/pmm.c
@@ -23,13 +23,13 @@
 #include <kernel/vm.h>
 #include "vm_priv.h"
 
-#include <trace.h>
+#include <lk/trace.h>
 #include <assert.h>
-#include <list.h>
+#include <lk/list.h>
 #include <stdlib.h>
-#include <err.h>
+#include <lk/err.h>
 #include <string.h>
-#include <pow2.h>
+#include <lk/pow2.h>
 #include <lib/console.h>
 #include <kernel/mutex.h>
 
diff --git a/kernel/vm/vm.c b/kernel/vm/vm.c
index 76cffb7c..d63762f1 100644
--- a/kernel/vm/vm.c
+++ b/kernel/vm/vm.c
@@ -23,14 +23,14 @@
 #include <kernel/vm.h>
 #include "vm_priv.h"
 
-#include <trace.h>
-#include <err.h>
+#include <lk/trace.h>
+#include <lk/err.h>
 #include <string.h>
 #include <lk/init.h>
 #include <lib/console.h>
 #include <arch/mmu.h>
 #include <kernel/thread.h>
-#include <debug.h>
+#include <lk/debug.h>
 
 #define LOCAL_TRACE 0
 
diff --git a/kernel/vm/vmm.c b/kernel/vm/vmm.c
index 24f9b143..b8005103 100644
--- a/kernel/vm/vmm.c
+++ b/kernel/vm/vmm.c
@@ -20,9 +20,9 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <trace.h>
+#include <lk/trace.h>
 #include <assert.h>
-#include <err.h>
+#include <lk/err.h>
 #include <string.h>
 #include <lib/console.h>
 #include <kernel/vm.h>
diff --git a/lib/bcache/bcache.c b/lib/bcache/bcache.c
index 0679aedd..6e5e8c47 100644
--- a/lib/bcache/bcache.c
+++ b/lib/bcache/bcache.c
@@ -20,13 +20,13 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <list.h>
+#include <lk/list.h>
 #include <stdlib.h>
 #include <assert.h>
 #include <string.h>
 #include <sys/types.h>
-#include <debug.h>
-#include <trace.h>
+#include <lk/debug.h>
+#include <lk/trace.h>
 #include <lib/bcache.h>
 #include <lib/bio.h>
 
diff --git a/lib/bio/bio.c b/lib/bio/bio.c
index 3108def6..802a2e40 100644
--- a/lib/bio/bio.c
+++ b/lib/bio/bio.c
@@ -21,13 +21,13 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 #include <stdlib.h>
-#include <debug.h>
-#include <trace.h>
-#include <err.h>
+#include <lk/debug.h>
+#include <lk/trace.h>
+#include <lk/err.h>
 #include <string.h>
 #include <assert.h>
-#include <list.h>
-#include <pow2.h>
+#include <lk/list.h>
+#include <lk/pow2.h>
 #include <lib/bio.h>
 #include <kernel/mutex.h>
 #include <lk/init.h>
diff --git a/lib/bio/debug.c b/lib/bio/debug.c
index e91e9126..f013f062 100644
--- a/lib/bio/debug.c
+++ b/lib/bio/debug.c
@@ -21,11 +21,11 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 #include <assert.h>
-#include <debug.h>
+#include <lk/debug.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <err.h>
+#include <lk/err.h>
 #include <lib/console.h>
 #include <lib/bio.h>
 #include <lib/partition.h>
diff --git a/lib/bio/include/lib/bio.h b/lib/bio/include/lib/bio.h
index c92ad140..cfeb02b5 100644
--- a/lib/bio/include/lib/bio.h
+++ b/lib/bio/include/lib/bio.h
@@ -24,7 +24,7 @@
 
 #include <assert.h>
 #include <sys/types.h>
-#include <list.h>
+#include <lk/list.h>
 
 __BEGIN_CDECLS
 
diff --git a/lib/bio/mem.c b/lib/bio/mem.c
index a22f4626..1a969942 100644
--- a/lib/bio/mem.c
+++ b/lib/bio/mem.c
@@ -20,8 +20,8 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <debug.h>
-#include <trace.h>
+#include <lk/debug.h>
+#include <lk/trace.h>
 #include <string.h>
 #include <stdlib.h>
 #include <lib/bio.h>
diff --git a/lib/bio/subdev.c b/lib/bio/subdev.c
index d53e3f5a..90db285f 100644
--- a/lib/bio/subdev.c
+++ b/lib/bio/subdev.c
@@ -20,9 +20,9 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <debug.h>
-#include <err.h>
-#include <trace.h>
+#include <lk/debug.h>
+#include <lk/err.h>
+#include <lk/trace.h>
 #include <stdlib.h>
 #include <lib/bio.h>
 
diff --git a/lib/bootargs/bootargs.c b/lib/bootargs/bootargs.c
index 9febf84c..05093e3a 100644
--- a/lib/bootargs/bootargs.c
+++ b/lib/bootargs/bootargs.c
@@ -22,10 +22,10 @@
  */
 #include <lib/bootargs.h>
 
-#include <trace.h>
+#include <lk/trace.h>
 #include <stdlib.h>
 #include <stdio.h>
-#include <err.h>
+#include <lk/err.h>
 #include <string.h>
 #include <lk/init.h>
 
diff --git a/lib/bootimage/bootimage.c b/lib/bootimage/bootimage.c
index 436d19c9..950da405 100644
--- a/lib/bootimage/bootimage.c
+++ b/lib/bootimage/bootimage.c
@@ -22,9 +22,9 @@
  */
 
 #include <lib/bootimage.h>
-#include <trace.h>
-#include <err.h>
-#include <debug.h>
+#include <lk/trace.h>
+#include <lk/err.h>
+#include <lk/debug.h>
 #include <stdlib.h>
 #include <string.h>
 
diff --git a/lib/bootimage/include/lib/bootimage.h b/lib/bootimage/include/lib/bootimage.h
index 2318048e..330d17e0 100644
--- a/lib/bootimage/include/lib/bootimage.h
+++ b/lib/bootimage/include/lib/bootimage.h
@@ -23,7 +23,7 @@
 #pragma once
 
 #include <sys/types.h>
-#include <compiler.h>
+#include <lk/compiler.h>
 #include <lib/bootimage_struct.h>
 
 typedef struct bootimage bootimage_t;
diff --git a/lib/buildsig/buildsig.c b/lib/buildsig/buildsig.c
index ea93cd73..8c4d6ec5 100644
--- a/lib/buildsig/buildsig.c
+++ b/lib/buildsig/buildsig.c
@@ -22,12 +22,12 @@
  */
 #include <lib/buildsig.h>
 
-#include <debug.h>
-#include <err.h>
+#include <lk/debug.h>
+#include <lk/err.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <string.h>
-#include <compiler.h>
+#include <lk/compiler.h>
 #include <lib/version.h>
 
 #define MAGIC  ((uint32_t)'BSIG')
diff --git a/lib/cbuf/cbuf.c b/lib/cbuf/cbuf.c
index 2148d633..a8118f6c 100644
--- a/lib/cbuf/cbuf.c
+++ b/lib/cbuf/cbuf.c
@@ -21,9 +21,9 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 #include <stdlib.h>
-#include <debug.h>
-#include <trace.h>
-#include <pow2.h>
+#include <lk/debug.h>
+#include <lk/trace.h>
+#include <lk/pow2.h>
 #include <string.h>
 #include <assert.h>
 #include <lib/cbuf.h>
diff --git a/lib/cbuf/include/lib/cbuf.h b/lib/cbuf/include/lib/cbuf.h
index d467f185..21ad2101 100644
--- a/lib/cbuf/include/lib/cbuf.h
+++ b/lib/cbuf/include/lib/cbuf.h
@@ -22,7 +22,7 @@
  */
 #pragma once
 
-#include <compiler.h>
+#include <lk/compiler.h>
 #include <sys/types.h>
 #include <kernel/event.h>
 #include <kernel/spinlock.h>
diff --git a/lib/cdcconsole/cdcconsole.c b/lib/cdcconsole/cdcconsole.c
index d0457166..0c87829d 100644
--- a/lib/cdcconsole/cdcconsole.c
+++ b/lib/cdcconsole/cdcconsole.c
@@ -23,8 +23,8 @@
 
 #include <lib/cdcconsole/cdcconsole.h>
 
-#include <compiler.h>
-#include <err.h>
+#include <lk/compiler.h>
+#include <lk/err.h>
 #include <string.h>
 
 #if !CONSOLE_HAS_INPUT_BUFFER
diff --git a/lib/console/console.c b/lib/console/console.c
index ad4e52c2..94fe7714 100644
--- a/lib/console/console.c
+++ b/lib/console/console.c
@@ -20,10 +20,10 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <debug.h>
-#include <trace.h>
+#include <lk/debug.h>
+#include <lk/trace.h>
 #include <assert.h>
-#include <err.h>
+#include <lk/err.h>
 #include <string.h>
 #include <ctype.h>
 #include <stdio.h>
diff --git a/lib/debug/debug.c b/lib/debug/debug.c
index 8aa6aa08..6eeec57e 100644
--- a/lib/debug/debug.c
+++ b/lib/debug/debug.c
@@ -22,11 +22,11 @@
  */
 
 #include <ctype.h>
-#include <debug.h>
+#include <lk/debug.h>
 #include <stdlib.h>
 #include <printf.h>
 #include <stdio.h>
-#include <list.h>
+#include <lk/list.h>
 #include <arch/ops.h>
 #include <platform.h>
 #include <platform/debug.h>
diff --git a/lib/debugcommands/debugcommands.c b/lib/debugcommands/debugcommands.c
index cb5f792b..5ea2b58c 100644
--- a/lib/debugcommands/debugcommands.c
+++ b/lib/debugcommands/debugcommands.c
@@ -22,10 +22,10 @@
  */
 
 #include <ctype.h>
-#include <debug.h>
+#include <lk/debug.h>
 #include <stdlib.h>
 #include <stdio.h>
-#include <list.h>
+#include <lk/list.h>
 #include <string.h>
 #include <arch/ops.h>
 #include <platform.h>
diff --git a/lib/dpc/dpc.c b/lib/dpc/dpc.c
index 7a219e32..30949362 100644
--- a/lib/dpc/dpc.c
+++ b/lib/dpc/dpc.c
@@ -20,11 +20,11 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <debug.h>
+#include <lk/debug.h>
 #include <stddef.h>
-#include <list.h>
+#include <lk/list.h>
 #include <malloc.h>
-#include <err.h>
+#include <lk/err.h>
 #include <lib/dpc.h>
 #include <kernel/thread.h>
 #include <kernel/event.h>
diff --git a/lib/elf/elf.c b/lib/elf/elf.c
index 0123a2c6..222d1d47 100644
--- a/lib/elf/elf.c
+++ b/lib/elf/elf.c
@@ -22,10 +22,10 @@
  */
 #include <lib/elf.h>
 #include <assert.h>
-#include <debug.h>
+#include <lk/debug.h>
 #include <endian.h>
-#include <err.h>
-#include <trace.h>
+#include <lk/err.h>
+#include <lk/trace.h>
 #include <stdlib.h>
 #include <string.h>
 #include <arch/ops.h>
diff --git a/lib/evlog/evlog.c b/lib/evlog/evlog.c
index e37e8a66..2a337448 100644
--- a/lib/evlog/evlog.c
+++ b/lib/evlog/evlog.c
@@ -20,10 +20,10 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <debug.h>
+#include <lk/debug.h>
 #include <assert.h>
-#include <err.h>
-#include <pow2.h>
+#include <lk/err.h>
+#include <lk/pow2.h>
 #include <stdlib.h>
 #include <lib/evlog.h>
 
diff --git a/lib/font/font.c b/lib/font/font.c
index 5cb994cc..2769e396 100644
--- a/lib/font/font.c
+++ b/lib/font/font.c
@@ -31,7 +31,7 @@
  * @ingroup graphics
  */
 
-#include <debug.h>
+#include <lk/debug.h>
 #include <lib/gfx.h>
 #include <lib/font.h>
 
diff --git a/lib/fs/debug.c b/lib/fs/debug.c
index e8edf0a7..22068fb5 100644
--- a/lib/fs/debug.c
+++ b/lib/fs/debug.c
@@ -20,14 +20,14 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <debug.h>
+#include <lk/debug.h>
 #include <string.h>
 #include <lib/console.h>
 #include <lib/fs.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <platform.h>
-#include <err.h>
+#include <lk/err.h>
 
 static void test_normalize(const char *in)
 {
diff --git a/lib/fs/ext2/dir.c b/lib/fs/ext2/dir.c
index 27ee8905..acc74d29 100644
--- a/lib/fs/ext2/dir.c
+++ b/lib/fs/ext2/dir.c
@@ -22,9 +22,9 @@
  */
 #include <string.h>
 #include <stdlib.h>
-#include <debug.h>
-#include <trace.h>
-#include <err.h>
+#include <lk/debug.h>
+#include <lk/trace.h>
+#include <lk/err.h>
 #include "ext2_priv.h"
 
 #define LOCAL_TRACE 0
diff --git a/lib/fs/ext2/ext2.c b/lib/fs/ext2/ext2.c
index 5c0261b2..6747357f 100644
--- a/lib/fs/ext2/ext2.c
+++ b/lib/fs/ext2/ext2.c
@@ -23,9 +23,9 @@
 
 #include <string.h>
 #include <stdlib.h>
-#include <debug.h>
-#include <err.h>
-#include <trace.h>
+#include <lk/debug.h>
+#include <lk/err.h>
+#include <lk/trace.h>
 #include <lk/init.h>
 #include <lib/fs.h>
 #include "ext2_priv.h"
diff --git a/lib/fs/ext2/file.c b/lib/fs/ext2/file.c
index f07e969c..ea4e1984 100644
--- a/lib/fs/ext2/file.c
+++ b/lib/fs/ext2/file.c
@@ -24,9 +24,9 @@
 #include <stdlib.h>
 #include <string.h>
 #include <stdlib.h>
-#include <err.h>
-#include <debug.h>
-#include <trace.h>
+#include <lk/err.h>
+#include <lk/debug.h>
+#include <lk/trace.h>
 #include "ext2_priv.h"
 
 #define LOCAL_TRACE 0
diff --git a/lib/fs/ext2/io.c b/lib/fs/ext2/io.c
index cd9f3679..b3a97a51 100644
--- a/lib/fs/ext2/io.c
+++ b/lib/fs/ext2/io.c
@@ -23,8 +23,8 @@
 
 #include <string.h>
 #include <stdlib.h>
-#include <debug.h>
-#include <trace.h>
+#include <lk/debug.h>
+#include <lk/trace.h>
 #include "ext2_priv.h"
 
 #define LOCAL_TRACE 0
diff --git a/lib/fs/fat32/fat.c b/lib/fs/fat32/fat.c
index 7c1a3d9c..0822d9ee 100644
--- a/lib/fs/fat32/fat.c
+++ b/lib/fs/fat32/fat.c
@@ -21,11 +21,11 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include <err.h>
+#include <lk/err.h>
 #include <lib/bio.h>
 #include <lib/fs.h>
-#include <trace.h>
-#include <debug.h>
+#include <lk/trace.h>
+#include <lk/debug.h>
 #include <malloc.h>
 #include <string.h>
 #include <endian.h>
diff --git a/lib/fs/fat32/file.c b/lib/fs/fat32/file.c
index a044956e..8a37dd17 100644
--- a/lib/fs/fat32/file.c
+++ b/lib/fs/fat32/file.c
@@ -21,14 +21,14 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include <err.h>
+#include <lk/err.h>
 #include <lib/bio.h>
 #include <lib/fs.h>
-#include <trace.h>
+#include <lk/trace.h>
 #include <malloc.h>
 #include <stdlib.h>
 #include <string.h>
-#include <debug.h>
+#include <lk/debug.h>
 
 #include "fat_fs.h"
 #include "fat32_priv.h"
diff --git a/lib/fs/fs.c b/lib/fs/fs.c
index 60464b6d..41fab26d 100644
--- a/lib/fs/fs.c
+++ b/lib/fs/fs.c
@@ -20,10 +20,10 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <debug.h>
-#include <trace.h>
-#include <list.h>
-#include <err.h>
+#include <lk/debug.h>
+#include <lk/trace.h>
+#include <lk/list.h>
+#include <lk/err.h>
 #include <string.h>
 #include <stdlib.h>
 #include <lib/fs.h>
diff --git a/lib/fs/include/lib/fs.h b/lib/fs/include/lib/fs.h
index f4f070ad..94bd4341 100644
--- a/lib/fs/include/lib/fs.h
+++ b/lib/fs/include/lib/fs.h
@@ -24,7 +24,7 @@
 
 #include <stdbool.h>
 #include <sys/types.h>
-#include <compiler.h>
+#include <lk/compiler.h>
 
 #define FS_MAX_PATH_LEN 128
 #define FS_MAX_FILE_LEN 64
diff --git a/lib/fs/memfs/memfs.c b/lib/fs/memfs/memfs.c
index 91f8d3f8..6af888fd 100644
--- a/lib/fs/memfs/memfs.c
+++ b/lib/fs/memfs/memfs.c
@@ -23,10 +23,10 @@
 
 #include <string.h>
 #include <stdlib.h>
-#include <debug.h>
-#include <err.h>
-#include <trace.h>
-#include <list.h>
+#include <lk/debug.h>
+#include <lk/err.h>
+#include <lk/trace.h>
+#include <lk/list.h>
 #include <lk/init.h>
 #include <lib/fs.h>
 #include <kernel/mutex.h>
diff --git a/lib/fs/shell.c b/lib/fs/shell.c
index 1dbd6de8..690c5572 100644
--- a/lib/fs/shell.c
+++ b/lib/fs/shell.c
@@ -21,11 +21,11 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include <err.h>
-#include <debug.h>
+#include <lk/err.h>
+#include <lk/debug.h>
 #include <string.h>
 #include <stdio.h>
-#include <trace.h>
+#include <lk/trace.h>
 #include <stdlib.h>
 #include <platform.h>
 #include <lib/console.h>
diff --git a/lib/fs/spifs/spifs.c b/lib/fs/spifs/spifs.c
index 2a0b1875..60a46266 100644
--- a/lib/fs/spifs/spifs.c
+++ b/lib/fs/spifs/spifs.c
@@ -21,14 +21,14 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include <debug.h>
-#include <err.h>
-#include <pow2.h>
+#include <lk/debug.h>
+#include <lk/err.h>
+#include <lk/pow2.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/types.h>
-#include <trace.h>
+#include <lk/trace.h>
 
 #include <kernel/mutex.h>
 #include <lib/bio.h>
@@ -36,7 +36,7 @@
 #include <lib/console.h>
 #include <lib/fs.h>
 #include <lib/fs/spifs.h>
-#include <list.h>
+#include <lk/list.h>
 #include <lk/init.h>
 
 #define LOCAL_TRACE 0
diff --git a/lib/fs/spifs/test/spifstest.c b/lib/fs/spifs/test/spifstest.c
index 1f8a1c6e..1f8c05bd 100644
--- a/lib/fs/spifs/test/spifstest.c
+++ b/lib/fs/spifs/test/spifstest.c
@@ -23,7 +23,7 @@
 
 #if LK_DEBUGLEVEL > 1
 
-#include <err.h>
+#include <lk/err.h>
 #include <math.h>
 #include <platform.h>
 #include <stdlib.h>
diff --git a/lib/gfx/gfx.c b/lib/gfx/gfx.c
index 242dd879..ee8ba969 100644
--- a/lib/gfx/gfx.c
+++ b/lib/gfx/gfx.c
@@ -32,8 +32,8 @@
  * @brief  Graphics drawing library
  */
 
-#include <debug.h>
-#include <trace.h>
+#include <lk/debug.h>
+#include <lk/trace.h>
 #include <string.h>
 #include <stdlib.h>
 #include <assert.h>
diff --git a/lib/gfxconsole/gfxconsole.c b/lib/gfxconsole/gfxconsole.c
index f874f650..4db10a9b 100644
--- a/lib/gfxconsole/gfxconsole.c
+++ b/lib/gfxconsole/gfxconsole.c
@@ -30,7 +30,7 @@
  * @ingroup graphics
  */
 
-#include <debug.h>
+#include <lk/debug.h>
 #include <assert.h>
 #include <lib/io.h>
 #include <lk/init.h>
diff --git a/lib/heap/cmpctmalloc/cmpctmalloc.c b/lib/heap/cmpctmalloc/cmpctmalloc.c
index a3d1f2c8..a17a5449 100644
--- a/lib/heap/cmpctmalloc/cmpctmalloc.c
+++ b/lib/heap/cmpctmalloc/cmpctmalloc.c
@@ -20,8 +20,8 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <debug.h>
-#include <trace.h>
+#include <lk/debug.h>
+#include <lk/trace.h>
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/lib/heap/cmpctmalloc/include/lib/cmpctmalloc.h b/lib/heap/cmpctmalloc/include/lib/cmpctmalloc.h
index 7026ca6f..398c8a3a 100644
--- a/lib/heap/cmpctmalloc/include/lib/cmpctmalloc.h
+++ b/lib/heap/cmpctmalloc/include/lib/cmpctmalloc.h
@@ -22,7 +22,7 @@
  */
 #pragma once
 
-#include <compiler.h>
+#include <lk/compiler.h>
 
 __BEGIN_CDECLS
 
diff --git a/lib/heap/heap_wrapper.c b/lib/heap/heap_wrapper.c
index f0892f8d..c8c9d27f 100644
--- a/lib/heap/heap_wrapper.c
+++ b/lib/heap/heap_wrapper.c
@@ -22,13 +22,13 @@
  */
 #include <lib/heap.h>
 
-#include <trace.h>
-#include <debug.h>
+#include <lk/trace.h>
+#include <lk/debug.h>
 #include <assert.h>
 #include <stdlib.h>
 #include <string.h>
-#include <err.h>
-#include <list.h>
+#include <lk/err.h>
+#include <lk/list.h>
 #include <kernel/spinlock.h>
 #include <lib/console.h>
 #include <lib/page_alloc.h>
diff --git a/lib/heap/include/lib/heap.h b/lib/heap/include/lib/heap.h
index 470dd879..28a530e3 100644
--- a/lib/heap/include/lib/heap.h
+++ b/lib/heap/include/lib/heap.h
@@ -24,7 +24,7 @@
 
 #include <stddef.h>
 #include <sys/types.h>
-#include <compiler.h>
+#include <lk/compiler.h>
 
 __BEGIN_CDECLS
 
diff --git a/lib/heap/miniheap/include/lib/miniheap.h b/lib/heap/miniheap/include/lib/miniheap.h
index d3950404..6c45ce4e 100644
--- a/lib/heap/miniheap/include/lib/miniheap.h
+++ b/lib/heap/miniheap/include/lib/miniheap.h
@@ -22,7 +22,7 @@
  */
 #pragma once
 
-#include <compiler.h>
+#include <lk/compiler.h>
 
 __BEGIN_CDECLS
 
diff --git a/lib/heap/miniheap/miniheap.c b/lib/heap/miniheap/miniheap.c
index c9645ee2..d309608f 100644
--- a/lib/heap/miniheap/miniheap.c
+++ b/lib/heap/miniheap/miniheap.c
@@ -21,11 +21,11 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <debug.h>
-#include <trace.h>
+#include <lk/debug.h>
+#include <lk/trace.h>
 #include <assert.h>
-#include <err.h>
-#include <list.h>
+#include <lk/err.h>
+#include <lk/list.h>
 #include <rand.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/lib/heap/new.cpp b/lib/heap/new.cpp
index 15c01840..2d68ba4d 100644
--- a/lib/heap/new.cpp
+++ b/lib/heap/new.cpp
@@ -21,7 +21,7 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 #include <new.h>
-#include <debug.h>
+#include <lk/debug.h>
 #include <lib/heap.h>
 
 void *operator new(size_t s)
diff --git a/lib/heap/page_alloc.c b/lib/heap/page_alloc.c
index c60b5547..70078217 100644
--- a/lib/heap/page_alloc.c
+++ b/lib/heap/page_alloc.c
@@ -23,10 +23,10 @@
 
 #include <lib/page_alloc.h>
 
-#include <debug.h>
+#include <lk/debug.h>
 #include <assert.h>
 #include <string.h>
-#include <trace.h>
+#include <lk/trace.h>
 #if WITH_KERNEL_VM
 #include <kernel/vm.h>
 #else
diff --git a/lib/io/console.c b/lib/io/console.c
index c1d9a650..56da6bac 100644
--- a/lib/io/console.c
+++ b/lib/io/console.c
@@ -22,11 +22,11 @@
  */
 #include <lib/io.h>
 
-#include <err.h>
+#include <lk/err.h>
 #include <ctype.h>
-#include <debug.h>
+#include <lk/debug.h>
 #include <assert.h>
-#include <list.h>
+#include <lk/list.h>
 #include <string.h>
 #include <lib/cbuf.h>
 #include <arch/ops.h>
diff --git a/lib/io/include/lib/io.h b/lib/io/include/lib/io.h
index 173aaa0d..14d0f015 100644
--- a/lib/io/include/lib/io.h
+++ b/lib/io/include/lib/io.h
@@ -22,8 +22,8 @@
  */
 #pragma once
 
-#include <compiler.h>
-#include <list.h>
+#include <lk/compiler.h>
+#include <lk/list.h>
 #include <sys/types.h>
 
 /* LK specific calls to register to get input/output of the main console */
diff --git a/lib/io/io.c b/lib/io/io.c
index 8ec2ad60..4e394fa9 100644
--- a/lib/io/io.c
+++ b/lib/io/io.c
@@ -22,9 +22,9 @@
  */
 #include <lib/io.h>
 
-#include <err.h>
+#include <lk/err.h>
 #include <ctype.h>
-#include <debug.h>
+#include <lk/debug.h>
 #include <assert.h>
 
 ssize_t io_write(io_handle_t *io, const char *buf, size_t len)
diff --git a/lib/iovec/iovec.c b/lib/iovec/iovec.c
index 47f89334..a192b4e1 100644
--- a/lib/iovec/iovec.c
+++ b/lib/iovec/iovec.c
@@ -20,8 +20,8 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <err.h>
-#include <debug.h>
+#include <lk/err.h>
+#include <lk/debug.h>
 #include <assert.h>
 #include <string.h>
 #include <sys/types.h>
diff --git a/lib/klog/include/lib/klog.h b/lib/klog/include/lib/klog.h
index 9d87e1f9..ca53f5da 100644
--- a/lib/klog/include/lib/klog.h
+++ b/lib/klog/include/lib/klog.h
@@ -26,7 +26,7 @@
 #include <stdbool.h>
 #include <sys/types.h>
 #include <iovec.h>
-#include <compiler.h>
+#include <lk/compiler.h>
 #include <stdarg.h>
 
 #if WITH_LIB_KLOG
diff --git a/lib/klog/klog.c b/lib/klog/klog.c
index a3304037..9ca04a02 100644
--- a/lib/klog/klog.c
+++ b/lib/klog/klog.c
@@ -22,10 +22,10 @@
  */
 #include <lib/klog.h>
 
-#include <err.h>
-#include <debug.h>
+#include <lk/err.h>
+#include <lk/debug.h>
 #include <assert.h>
-#include <trace.h>
+#include <lk/trace.h>
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/lib/libc/include/assert.h b/lib/libc/include/assert.h
index dec406e7..6c05a6a9 100644
--- a/lib/libc/include/assert.h
+++ b/lib/libc/include/assert.h
@@ -23,8 +23,8 @@
 #ifndef __ASSERT_H
 #define __ASSERT_H
 
-#include <compiler.h>
-#include <debug.h>
+#include <lk/compiler.h>
+#include <lk/debug.h>
 
 #define ASSERT(x) \
     do { if (unlikely(!(x))) { panic("ASSERT FAILED at (%s:%d): %s\n", __FILE__, __LINE__, #x); } } while (0)
diff --git a/lib/libc/include/ctype.h b/lib/libc/include/ctype.h
index b80f4cef..e2249b0d 100644
--- a/lib/libc/include/ctype.h
+++ b/lib/libc/include/ctype.h
@@ -23,7 +23,7 @@
 #ifndef __CTYPE_H
 #define __CTYPE_H
 
-#include <compiler.h>
+#include <lk/compiler.h>
 
 __BEGIN_CDECLS
 
diff --git a/lib/libc/include/errno.h b/lib/libc/include/errno.h
index 9cc81b03..00af9742 100644
--- a/lib/libc/include/errno.h
+++ b/lib/libc/include/errno.h
@@ -23,7 +23,7 @@
 #ifndef __ERRNO_H
 #define __ERRNO_H
 
-#include <compiler.h>
+#include <lk/compiler.h>
 
 __BEGIN_CDECLS
 
diff --git a/lib/libc/include/iovec.h b/lib/libc/include/iovec.h
index a2777859..80598f04 100644
--- a/lib/libc/include/iovec.h
+++ b/lib/libc/include/iovec.h
@@ -23,7 +23,7 @@
 #ifndef __IOVEC_H
 #define __IOVEC_H
 
-#include <compiler.h>
+#include <lk/compiler.h>
 #include <stddef.h>
 #include <sys/types.h>
 
diff --git a/lib/libc/include/malloc.h b/lib/libc/include/malloc.h
index abafbe95..396a7299 100644
--- a/lib/libc/include/malloc.h
+++ b/lib/libc/include/malloc.h
@@ -24,7 +24,7 @@
 #define __MALLOC_H
 
 #include <sys/types.h>
-#include <compiler.h>
+#include <lk/compiler.h>
 #include <stddef.h>
 
 /* lib/heap provides malloc/free definitions */
diff --git a/lib/libc/include/printf.h b/lib/libc/include/printf.h
index 68b30818..5eb2d132 100644
--- a/lib/libc/include/printf.h
+++ b/lib/libc/include/printf.h
@@ -24,7 +24,7 @@
 #define __LIB_PRINTF_H
 
 #include <stdarg.h>
-#include <compiler.h>
+#include <lk/compiler.h>
 #include <stddef.h>
 
 __BEGIN_CDECLS
diff --git a/lib/libc/include/rand.h b/lib/libc/include/rand.h
index 93c424d0..25ba827f 100644
--- a/lib/libc/include/rand.h
+++ b/lib/libc/include/rand.h
@@ -23,7 +23,7 @@
 #ifndef __RAND_H
 #define __RAND_H
 
-#include <compiler.h>
+#include <lk/compiler.h>
 #include <sys/types.h>
 
 __BEGIN_CDECLS
diff --git a/lib/libc/include/stdio.h b/lib/libc/include/stdio.h
index 5b2e6443..a58d9c1c 100644
--- a/lib/libc/include/stdio.h
+++ b/lib/libc/include/stdio.h
@@ -23,7 +23,7 @@
 #ifndef __STDIO_H
 #define __STDIO_H
 
-#include <compiler.h>
+#include <lk/compiler.h>
 #include <printf.h>
 #include <sys/types.h>
 #include <lib/io.h>
diff --git a/lib/libc/include/stdlib.h b/lib/libc/include/stdlib.h
index 1ff00b5d..7b8f58f8 100644
--- a/lib/libc/include/stdlib.h
+++ b/lib/libc/include/stdlib.h
@@ -23,7 +23,7 @@
 #ifndef __STDLIB_H
 #define __STDLIB_H
 
-#include <compiler.h>
+#include <lk/compiler.h>
 #include <sys/types.h>
 #include <stddef.h>
 #include <malloc.h>
diff --git a/lib/libc/include/string.h b/lib/libc/include/string.h
index 884f23c1..e331fae6 100644
--- a/lib/libc/include/string.h
+++ b/lib/libc/include/string.h
@@ -24,7 +24,7 @@
 #define __LIB_STRING_H
 
 #include <stddef.h>
-#include <compiler.h>
+#include <lk/compiler.h>
 
 __BEGIN_CDECLS
 
diff --git a/lib/libc/include/strings.h b/lib/libc/include/strings.h
index 1cc76044..4e9e490f 100644
--- a/lib/libc/include/strings.h
+++ b/lib/libc/include/strings.h
@@ -1,7 +1,7 @@
 #if !defined(__STRINGS_H)
 #define __STRINGS_H
 
-#include <compiler.h>
+#include <lk/compiler.h>
 
 __BEGIN_CDECLS
 
diff --git a/lib/libc/printf.c b/lib/libc/printf.c
index 0e38c29e..db6f9523 100644
--- a/lib/libc/printf.c
+++ b/lib/libc/printf.c
@@ -20,7 +20,7 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <debug.h>
+#include <lk/debug.h>
 #include <assert.h>
 #include <limits.h>
 #include <printf.h>
diff --git a/lib/libc/pure_virtual.cpp b/lib/libc/pure_virtual.cpp
index fe712197..490b717d 100644
--- a/lib/libc/pure_virtual.cpp
+++ b/lib/libc/pure_virtual.cpp
@@ -20,7 +20,7 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <debug.h>
+#include <lk/debug.h>
 
 extern "C" void __cxa_pure_virtual(void)
 {
diff --git a/lib/libc/stdio.c b/lib/libc/stdio.c
index edc4faaa..a74a71f1 100644
--- a/lib/libc/stdio.c
+++ b/lib/libc/stdio.c
@@ -20,7 +20,7 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <debug.h>
+#include <lk/debug.h>
 #include <stdio.h>
 #include <stdarg.h>
 #include <string.h>
diff --git a/lib/libc/string/arch/arm/arm-m/memcpy.S b/lib/libc/string/arch/arm/arm-m/memcpy.S
index 46ce8cbc..1aa7dd02 100644
--- a/lib/libc/string/arch/arm/arm-m/memcpy.S
+++ b/lib/libc/string/arch/arm/arm-m/memcpy.S
@@ -20,7 +20,7 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <asm.h>
+#include <lk/asm.h>
 #include <arch/arm/cores.h>
 
 .text
diff --git a/lib/libc/string/arch/arm/arm-m/memset.S b/lib/libc/string/arch/arm/arm-m/memset.S
index 0b54e3cc..84081ffd 100644
--- a/lib/libc/string/arch/arm/arm-m/memset.S
+++ b/lib/libc/string/arch/arm/arm-m/memset.S
@@ -20,7 +20,7 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <asm.h>
+#include <lk/asm.h>
 #include <arch/arm/cores.h>
 
 .text
diff --git a/lib/libc/string/arch/arm/arm/memcpy.S b/lib/libc/string/arch/arm/arm/memcpy.S
index efe46df4..f87f09d8 100644
--- a/lib/libc/string/arch/arm/arm/memcpy.S
+++ b/lib/libc/string/arch/arm/arm/memcpy.S
@@ -20,7 +20,7 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <asm.h>
+#include <lk/asm.h>
 #include <arch/arm/cores.h>
 
 .text
diff --git a/lib/libc/string/arch/arm/arm/memset.S b/lib/libc/string/arch/arm/arm/memset.S
index 1307e1c3..7fc02be8 100644
--- a/lib/libc/string/arch/arm/arm/memset.S
+++ b/lib/libc/string/arch/arm/arm/memset.S
@@ -20,7 +20,7 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <asm.h>
+#include <lk/asm.h>
 #include <arch/arm/cores.h>
 
 .text
diff --git a/lib/libc/string/arch/x86-64/memcpy.S b/lib/libc/string/arch/x86-64/memcpy.S
index 84aec44a..b36d7442 100644
--- a/lib/libc/string/arch/x86-64/memcpy.S
+++ b/lib/libc/string/arch/x86-64/memcpy.S
@@ -20,7 +20,7 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <asm.h>
+#include <lk/asm.h>
 
 /* TODO: */
 
diff --git a/lib/libc/string/arch/x86-64/memset.S b/lib/libc/string/arch/x86-64/memset.S
index 43367f6d..9f0e4938 100644
--- a/lib/libc/string/arch/x86-64/memset.S
+++ b/lib/libc/string/arch/x86-64/memset.S
@@ -20,7 +20,7 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <asm.h>
+#include <lk/asm.h>
 
 /* TODO: */
 
diff --git a/lib/libc/string/arch/x86/memcpy.S b/lib/libc/string/arch/x86/memcpy.S
index 84aec44a..b36d7442 100644
--- a/lib/libc/string/arch/x86/memcpy.S
+++ b/lib/libc/string/arch/x86/memcpy.S
@@ -20,7 +20,7 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <asm.h>
+#include <lk/asm.h>
 
 /* TODO: */
 
diff --git a/lib/libc/string/arch/x86/memset.S b/lib/libc/string/arch/x86/memset.S
index 43367f6d..9f0e4938 100644
--- a/lib/libc/string/arch/x86/memset.S
+++ b/lib/libc/string/arch/x86/memset.S
@@ -20,7 +20,7 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <asm.h>
+#include <lk/asm.h>
 
 /* TODO: */
 
diff --git a/lib/minip/arp.c b/lib/minip/arp.c
index be20caea..a041bfd1 100644
--- a/lib/minip/arp.c
+++ b/lib/minip/arp.c
@@ -23,13 +23,13 @@
 
 #include "minip-internal.h"
 
-#include <list.h>
+#include <lk/list.h>
 #include <string.h>
 #include <malloc.h>
 #include <stdio.h>
 #include <kernel/thread.h>
 #include <kernel/mutex.h>
-#include <trace.h>
+#include <lk/trace.h>
 
 typedef union {
     uint32_t u;
diff --git a/lib/minip/dhcp.c b/lib/minip/dhcp.c
index 95e311b9..60972de2 100644
--- a/lib/minip/dhcp.c
+++ b/lib/minip/dhcp.c
@@ -23,10 +23,10 @@
 
 #include "minip-internal.h"
 
-#include <err.h>
+#include <lk/err.h>
 #include <platform.h>
 #include <stdio.h>
-#include <debug.h>
+#include <lk/debug.h>
 #include <malloc.h>
 
 #include <kernel/thread.h>
diff --git a/lib/minip/include/lib/minip.h b/lib/minip/include/lib/minip.h
index 715f8c36..021b0333 100644
--- a/lib/minip/include/lib/minip.h
+++ b/lib/minip/include/lib/minip.h
@@ -24,7 +24,7 @@
 #pragma once
 
 #include <endian.h>
-#include <list.h>
+#include <lk/list.h>
 #include <stdint.h>
 #include <sys/types.h>
 
diff --git a/lib/minip/include/lib/pktbuf.h b/lib/minip/include/lib/pktbuf.h
index 99e36c50..21426adb 100644
--- a/lib/minip/include/lib/pktbuf.h
+++ b/lib/minip/include/lib/pktbuf.h
@@ -25,7 +25,7 @@
 #define _NET_PKTBUF_H_
 
 #include <sys/types.h>
-#include <list.h>
+#include <lk/list.h>
 
 /* PAGE_SIZE minus 16 bytes of metadata in pktbuf_buf */
 #ifndef PKTBUF_POOL_SIZE
diff --git a/lib/minip/lk_console.c b/lib/minip/lk_console.c
index 63896cfe..205af783 100644
--- a/lib/minip/lk_console.c
+++ b/lib/minip/lk_console.c
@@ -30,7 +30,7 @@
 #include <string.h>
 #include <platform.h>
 #include <kernel/timer.h>
-#include <err.h>
+#include <lk/err.h>
 
 #if WITH_LIB_CONSOLE
 
diff --git a/lib/minip/minip-internal.h b/lib/minip/minip-internal.h
index b7528dee..cee47b4b 100644
--- a/lib/minip/minip-internal.h
+++ b/lib/minip/minip-internal.h
@@ -25,9 +25,9 @@
 
 #include <lib/minip.h>
 
-#include <compiler.h>
+#include <lk/compiler.h>
 #include <endian.h>
-#include <list.h>
+#include <lk/list.h>
 #include <stdint.h>
 #include <string.h>
 
diff --git a/lib/minip/minip.c b/lib/minip/minip.c
index ffedef25..5f2dd7c5 100644
--- a/lib/minip/minip.c
+++ b/lib/minip/minip.c
@@ -24,17 +24,17 @@
 
 #include "minip-internal.h"
 
-#include <err.h>
+#include <lk/err.h>
 #include <stdio.h>
-#include <debug.h>
+#include <lk/debug.h>
 #include <endian.h>
 #include <errno.h>
 #include <iovec.h>
 #include <stdlib.h>
 #include <string.h>
-#include <trace.h>
+#include <lk/trace.h>
 #include <malloc.h>
-#include <list.h>
+#include <lk/list.h>
 #include <kernel/thread.h>
 
 static struct list_node arp_list = LIST_INITIAL_VALUE(arp_list);
diff --git a/lib/minip/net_timer.c b/lib/minip/net_timer.c
index f2fee7ff..50f1d20e 100644
--- a/lib/minip/net_timer.c
+++ b/lib/minip/net_timer.c
@@ -23,12 +23,12 @@
 
 #include "minip-internal.h"
 
-#include <trace.h>
-#include <debug.h>
-#include <compiler.h>
+#include <lk/trace.h>
+#include <lk/debug.h>
+#include <lk/compiler.h>
 #include <stdlib.h>
-#include <list.h>
-#include <err.h>
+#include <lk/list.h>
+#include <lk/err.h>
 #include <sys/types.h>
 #include <kernel/thread.h>
 #include <kernel/event.h>
diff --git a/lib/minip/pktbuf.c b/lib/minip/pktbuf.c
index 2c78e7a2..57e5b254 100644
--- a/lib/minip/pktbuf.c
+++ b/lib/minip/pktbuf.c
@@ -23,8 +23,8 @@
  */
 
 #include <assert.h>
-#include <debug.h>
-#include <trace.h>
+#include <lk/debug.h>
+#include <lk/trace.h>
 #include <printf.h>
 #include <string.h>
 #include <malloc.h>
diff --git a/lib/minip/tcp.c b/lib/minip/tcp.c
index 6f0ffbdf..ba7e9968 100644
--- a/lib/minip/tcp.c
+++ b/lib/minip/tcp.c
@@ -23,11 +23,11 @@
 
 #include "minip-internal.h"
 
-#include <trace.h>
+#include <lk/trace.h>
 #include <assert.h>
-#include <compiler.h>
+#include <lk/compiler.h>
 #include <stdlib.h>
-#include <err.h>
+#include <lk/err.h>
 #include <string.h>
 #include <sys/types.h>
 #include <lib/console.h>
diff --git a/lib/minip/udp.c b/lib/minip/udp.c
index 5483917b..000f4935 100644
--- a/lib/minip/udp.c
+++ b/lib/minip/udp.c
@@ -25,13 +25,13 @@
 
 #include "minip-internal.h"
 
-#include <err.h>
+#include <lk/err.h>
 #include <errno.h>
 #include <iovec.h>
-#include <list.h>
+#include <lk/list.h>
 #include <malloc.h>
 #include <stdint.h>
-#include <trace.h>
+#include <lk/trace.h>
 
 #define LOCAL_TRACE 0
 
diff --git a/lib/norfs/include/lib/norfs_inode.h b/lib/norfs/include/lib/norfs_inode.h
index 68bd7164..768a65e3 100644
--- a/lib/norfs/include/lib/norfs_inode.h
+++ b/lib/norfs/include/lib/norfs_inode.h
@@ -23,7 +23,7 @@
 #ifndef __NORFS_INODE_H
 #define __NORFS_INODE_H
 
-#include <list.h>
+#include <lk/list.h>
 #include <stdint.h>
 
 struct norfs_inode {
diff --git a/lib/norfs/norfs.c b/lib/norfs/norfs.c
index 7d69a658..ebe426f0 100644
--- a/lib/norfs/norfs.c
+++ b/lib/norfs/norfs.c
@@ -26,13 +26,13 @@
 #include <lib/norfs_config.h>
 #include <iovec.h>
 #include <stdlib.h>
-#include <err.h>
+#include <lk/err.h>
 #include <string.h>
 #include <platform.h>
 #include <lib/cksum.h>
 #include <platform/flash_nor_config.h>
-#include <list.h>
-#include <debug.h>
+#include <lk/list.h>
+#include <lk/debug.h>
 
 /* FRIEND_TEST non-static if unit testing, in order to
  * allow functions to be exposed by a test header file.
diff --git a/lib/norfs/test/norfs_test.c b/lib/norfs/test/norfs_test.c
index 3be2febc..b68d4725 100644
--- a/lib/norfs/test/norfs_test.c
+++ b/lib/norfs/test/norfs_test.c
@@ -28,7 +28,7 @@
 #include <dev/flash_nor.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <err.h>
+#include <lk/err.h>
 #include <platform/flash_nor_config.h>
 #include <platform.h>
 #include <rand.h>
diff --git a/lib/norfs/test/norfs_test_helper.c b/lib/norfs/test/norfs_test_helper.c
index d7d499e8..8916c501 100644
--- a/lib/norfs/test/norfs_test_helper.c
+++ b/lib/norfs/test/norfs_test_helper.c
@@ -24,7 +24,7 @@
 #include <lib/norfs.h>
 #include <dev/flash_nor.h>
 #include <platform/flash_nor_config.h>
-#include <debug.h>
+#include <lk/debug.h>
 
 void dump_bank(void)
 {
diff --git a/lib/partition/partition.c b/lib/partition/partition.c
index 0cde8dbf..6b4bf1f1 100644
--- a/lib/partition/partition.c
+++ b/lib/partition/partition.c
@@ -20,10 +20,10 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <debug.h>
+#include <lk/debug.h>
 #include <stdio.h>
 #include <string.h>
-#include <compiler.h>
+#include <lk/compiler.h>
 #include <stdlib.h>
 #include <arch.h>
 #include <lib/bio.h>
diff --git a/lib/pool/include/lib/pool.h b/lib/pool/include/lib/pool.h
index c9854a15..764a8fe4 100644
--- a/lib/pool/include/lib/pool.h
+++ b/lib/pool/include/lib/pool.h
@@ -46,7 +46,7 @@
  */
 #pragma once
 
-#include <compiler.h>
+#include <lk/compiler.h>
 #include <stddef.h>
 #include <stdint.h>
 
diff --git a/lib/ptable/ptable.c b/lib/ptable/ptable.c
index 54322fc7..899c71ed 100644
--- a/lib/ptable/ptable.c
+++ b/lib/ptable/ptable.c
@@ -22,14 +22,14 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 #include <lib/ptable.h>
-#include <debug.h>
-#include <trace.h>
+#include <lk/debug.h>
+#include <lk/trace.h>
 #include <assert.h>
-#include <err.h>
+#include <lk/err.h>
 #include <string.h>
 #include <malloc.h>
 #include <stdlib.h>
-#include <list.h>
+#include <lk/list.h>
 #include <lib/bio.h>
 #include <lib/cksum.h>
 #include <lk/init.h>
diff --git a/lib/sysparam/sysparam.c b/lib/sysparam/sysparam.c
index 0ac7edab..0b2f0cff 100644
--- a/lib/sysparam/sysparam.c
+++ b/lib/sysparam/sysparam.c
@@ -20,15 +20,15 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <debug.h>
-#include <trace.h>
+#include <lk/debug.h>
+#include <lk/trace.h>
 #include <assert.h>
-#include <err.h>
+#include <lk/err.h>
 #include <string.h>
 #include <malloc.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <list.h>
+#include <lk/list.h>
 #include <lib/bio.h>
 #include <lib/cksum.h>
 #include <lib/sysparam.h>
diff --git a/lib/text/text.c b/lib/text/text.c
index 349ac8d1..8da18eed 100644
--- a/lib/text/text.c
+++ b/lib/text/text.c
@@ -36,8 +36,8 @@
  * Output is to the default graphics display
  */
 
-#include <debug.h>
-#include <list.h>
+#include <lk/debug.h>
+#include <lk/list.h>
 #include <stdlib.h>
 #include <string.h>
 #include <dev/display.h>
diff --git a/lib/tftp/include/lib/tftp.h b/lib/tftp/include/lib/tftp.h
index b053ea32..cbd40577 100644
--- a/lib/tftp/include/lib/tftp.h
+++ b/lib/tftp/include/lib/tftp.h
@@ -23,7 +23,7 @@
 
 #pragma once
 
-#include <compiler.h>
+#include <lk/compiler.h>
 
 __BEGIN_CDECLS
 
diff --git a/lib/tftp/tftp.c b/lib/tftp/tftp.c
index e046282d..20f774f7 100644
--- a/lib/tftp/tftp.c
+++ b/lib/tftp/tftp.c
@@ -21,13 +21,13 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include <err.h>
-#include <trace.h>
+#include <lk/err.h>
+#include <lk/trace.h>
 #include <assert.h>
 #include <stdlib.h>
 #include <string.h>
-#include <list.h>
-#include <compiler.h>
+#include <lk/list.h>
+#include <lk/compiler.h>
 #include <endian.h>
 #include <stdbool.h>
 #include <lib/minip.h>
diff --git a/lib/tga/tga.c b/lib/tga/tga.c
index dd87262a..4f969e81 100644
--- a/lib/tga/tga.c
+++ b/lib/tga/tga.c
@@ -28,10 +28,10 @@
  * @ingroup graphics
  */
 
-#include <debug.h>
-#include <trace.h>
+#include <lk/debug.h>
+#include <lk/trace.h>
 #include <assert.h>
-#include <compiler.h>
+#include <lk/compiler.h>
 #include <lib/tga.h>
 
 #define LOCAL_TRACE 0
diff --git a/lib/unittest/include/unittest.h b/lib/unittest/include/unittest.h
index 8aef99b2..f35625ee 100644
--- a/lib/unittest/include/unittest.h
+++ b/lib/unittest/include/unittest.h
@@ -73,7 +73,7 @@
 #include <stddef.h>
 #include <stdint.h>
 #include <string.h>
-#include <trace.h>
+#include <lk/trace.h>
 #include <stdarg.h>
 
 #define PRINT_BUFFER_SIZE                                       (512)
diff --git a/lib/unittest/unittest.c b/lib/unittest/unittest.c
index 7ec983da..24ceae93 100644
--- a/lib/unittest/unittest.c
+++ b/lib/unittest/unittest.c
@@ -24,7 +24,7 @@
  * Functions for unit tests.  See lib/unittest/include/unittest.h for usage.
  */
 #include <unittest.h>
-#include <debug.h>
+#include <lk/debug.h>
 #include <stdbool.h>
 #include <string.h>
 #include <stdio.h>
diff --git a/lib/version/include/lib/version.h b/lib/version/include/lib/version.h
index 1c1ec05d..d0cca158 100644
--- a/lib/version/include/lib/version.h
+++ b/lib/version/include/lib/version.h
@@ -23,7 +23,7 @@
 #ifndef __LIB_VERSION_H
 #define __LIB_VERSION_H
 
-#include <compiler.h>
+#include <lk/compiler.h>
 
 __BEGIN_CDECLS
 
diff --git a/lib/version/version.c b/lib/version/version.c
index c56434c3..d7bc0335 100644
--- a/lib/version/version.c
+++ b/lib/version/version.c
@@ -22,7 +22,7 @@
  */
 #include <lib/version.h>
 
-#include <debug.h>
+#include <lk/debug.h>
 #include <stdio.h>
 #include <lk/init.h>
 
@@ -57,7 +57,7 @@ void print_version(void)
 
 #if WITH_LIB_CONSOLE
 
-#include <debug.h>
+#include <lk/debug.h>
 #include <lib/console.h>
 
 static int cmd_version(int argc, const cmd_args *argv)
diff --git a/lib/watchdog/watchdog.c b/lib/watchdog/watchdog.c
index 8d947f8e..5df70990 100644
--- a/lib/watchdog/watchdog.c
+++ b/lib/watchdog/watchdog.c
@@ -23,8 +23,8 @@
  */
 
 #include <assert.h>
-#include <compiler.h>
-#include <err.h>
+#include <lk/compiler.h>
+#include <lk/err.h>
 #include <platform.h>
 
 #include <kernel/thread.h>
diff --git a/platform/alterasoc/clocks.c b/platform/alterasoc/clocks.c
index 3aa27fea..f163ce04 100644
--- a/platform/alterasoc/clocks.c
+++ b/platform/alterasoc/clocks.c
@@ -20,9 +20,9 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <reg.h>
+#include <lk/reg.h>
 #include <stdio.h>
-#include <reg.h>
+#include <lk/reg.h>
 #include <kernel/thread.h>
 #include <platform/debug.h>
 #include <platform/alterasoc.h>
diff --git a/platform/alterasoc/debug.c b/platform/alterasoc/debug.c
index ff29b51b..fcac30d7 100644
--- a/platform/alterasoc/debug.c
+++ b/platform/alterasoc/debug.c
@@ -20,13 +20,13 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <reg.h>
+#include <lk/reg.h>
 #include <stdio.h>
 #include <kernel/thread.h>
 #include <dev/uart.h>
 #include <platform/debug.h>
 #include <target/debugconfig.h>
-#include <reg.h>
+#include <lk/reg.h>
 
 void platform_dputc(char c)
 {
diff --git a/platform/alterasoc/include/platform/alterasoc.h b/platform/alterasoc/include/platform/alterasoc.h
index 7f555547..21dfc40f 100644
--- a/platform/alterasoc/include/platform/alterasoc.h
+++ b/platform/alterasoc/include/platform/alterasoc.h
@@ -22,7 +22,7 @@
  */
 #pragma once
 
-#include <reg.h>
+#include <lk/reg.h>
 
 /* common address space regions */
 #define FPGASLAVES_BASE   (0xc0000000)
diff --git a/platform/alterasoc/platform.c b/platform/alterasoc/platform.c
index 13a78a47..658659d4 100644
--- a/platform/alterasoc/platform.c
+++ b/platform/alterasoc/platform.c
@@ -20,10 +20,10 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <err.h>
-#include <debug.h>
+#include <lk/err.h>
+#include <lk/debug.h>
 #include <assert.h>
-#include <trace.h>
+#include <lk/trace.h>
 #include <arch/arm/mmu.h>
 #include <dev/uart.h>
 #include <dev/interrupt/arm_gic.h>
diff --git a/platform/alterasoc/uart.c b/platform/alterasoc/uart.c
index cf131c45..80cb69e7 100644
--- a/platform/alterasoc/uart.c
+++ b/platform/alterasoc/uart.c
@@ -20,10 +20,10 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <reg.h>
-#include <bits.h>
+#include <lk/reg.h>
+#include <lk/bits.h>
 #include <stdio.h>
-#include <trace.h>
+#include <lk/trace.h>
 #include <lib/cbuf.h>
 #include <kernel/thread.h>
 #include <kernel/spinlock.h>
diff --git a/platform/amlogic-s912d/platform.c b/platform/amlogic-s912d/platform.c
index cb0e9792..cb5d4043 100644
--- a/platform/amlogic-s912d/platform.c
+++ b/platform/amlogic-s912d/platform.c
@@ -22,10 +22,10 @@
  */
 
 #include <arch/arm64.h>
-#include <trace.h>
+#include <lk/trace.h>
 #include <assert.h>
-#include <err.h>
-#include <bits.h>
+#include <lk/err.h>
+#include <lk/bits.h>
 #include <kernel/spinlock.h>
 #include <kernel/thread.h>
 #include <kernel/mp.h>
diff --git a/platform/amlogic-s912d/uart.c b/platform/amlogic-s912d/uart.c
index c37720a0..b6015dad 100644
--- a/platform/amlogic-s912d/uart.c
+++ b/platform/amlogic-s912d/uart.c
@@ -21,9 +21,9 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include <reg.h>
+#include <lk/reg.h>
 #include <stdio.h>
-#include <trace.h>
+#include <lk/trace.h>
 #include <lib/cbuf.h>
 #include <kernel/thread.h>
 #include <platform/interrupts.h>
diff --git a/platform/armemu/blkdev.c b/platform/armemu/blkdev.c
index bf733316..4b0d7c9b 100644
--- a/platform/armemu/blkdev.c
+++ b/platform/armemu/blkdev.c
@@ -20,14 +20,14 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <err.h>
-#include <debug.h>
-#include <trace.h>
+#include <lk/err.h>
+#include <lk/debug.h>
+#include <lk/trace.h>
 #include <platform.h>
 #include "platform_p.h"
 #include <platform/armemu.h>
 #include <lib/bio.h>
-#include <reg.h>
+#include <lk/reg.h>
 
 static bdev_t dev;
 
diff --git a/platform/armemu/debug.c b/platform/armemu/debug.c
index c47ec38e..32d9b1cf 100644
--- a/platform/armemu/debug.c
+++ b/platform/armemu/debug.c
@@ -21,7 +21,7 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 #include <stdarg.h>
-#include <reg.h>
+#include <lk/reg.h>
 #include <stdio.h>
 #include <kernel/thread.h>
 #include <platform/armemu/memmap.h>
diff --git a/platform/armemu/display.c b/platform/armemu/display.c
index fed1ccf6..e9ee36cc 100644
--- a/platform/armemu/display.c
+++ b/platform/armemu/display.c
@@ -20,15 +20,15 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <err.h>
-#include <debug.h>
-#include <trace.h>
+#include <lk/err.h>
+#include <lk/debug.h>
+#include <lk/trace.h>
 #include <platform.h>
 #include "platform_p.h"
 #include <platform/armemu.h>
 #include <dev/display.h>
 #include <lib/gfx.h>
-#include <reg.h>
+#include <lk/reg.h>
 #include <assert.h>
 
 #define DRAW_TEST_PATTERN 0
diff --git a/platform/armemu/interrupts.c b/platform/armemu/interrupts.c
index 6d2426b8..73ebfb47 100644
--- a/platform/armemu/interrupts.c
+++ b/platform/armemu/interrupts.c
@@ -20,10 +20,10 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <err.h>
+#include <lk/err.h>
 #include <sys/types.h>
-#include <debug.h>
-#include <reg.h>
+#include <lk/debug.h>
+#include <lk/reg.h>
 #include <kernel/thread.h>
 #include <kernel/debug.h>
 #include <platform/interrupts.h>
diff --git a/platform/armemu/net.c b/platform/armemu/net.c
index e2f1eedd..759495d4 100644
--- a/platform/armemu/net.c
+++ b/platform/armemu/net.c
@@ -63,8 +63,8 @@
 
 #include <malloc.h>
 #include <dev/ethernet.h>
-#include <err.h>
-#include <reg.h>
+#include <lk/err.h>
+#include <lk/reg.h>
 #include <string.h>
 #include <platform/interrupts.h>
 #include <platform/armemu/memmap.h>
diff --git a/platform/armemu/platform.c b/platform/armemu/platform.c
index ce93d021..209ddeb8 100644
--- a/platform/armemu/platform.c
+++ b/platform/armemu/platform.c
@@ -20,8 +20,8 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <err.h>
-#include <debug.h>
+#include <lk/err.h>
+#include <lk/debug.h>
 #include <platform.h>
 #include "platform_p.h"
 
diff --git a/platform/armemu/timer.c b/platform/armemu/timer.c
index b7b413a3..477e01a1 100644
--- a/platform/armemu/timer.c
+++ b/platform/armemu/timer.c
@@ -21,7 +21,7 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 #include <sys/types.h>
-#include <err.h>
+#include <lk/err.h>
 #include <kernel/thread.h>
 #include <platform.h>
 #include <platform/interrupts.h>
diff --git a/platform/bcm28xx/gpio.c b/platform/bcm28xx/gpio.c
index 49c31df9..60d422c4 100644
--- a/platform/bcm28xx/gpio.c
+++ b/platform/bcm28xx/gpio.c
@@ -23,7 +23,7 @@
 #include <dev/gpio.h>
 #include <errno.h>
 #include <platform/bcm28xx.h>
-#include <reg.h>
+#include <lk/reg.h>
 
 #define NUM_PINS     54
 #define BITS_PER_REG 32
diff --git a/platform/bcm28xx/intc.c b/platform/bcm28xx/intc.c
index c1273ceb..53bc2b9d 100644
--- a/platform/bcm28xx/intc.c
+++ b/platform/bcm28xx/intc.c
@@ -20,10 +20,10 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <trace.h>
+#include <lk/trace.h>
 #include <assert.h>
-#include <err.h>
-#include <bits.h>
+#include <lk/err.h>
+#include <lk/bits.h>
 #include <kernel/spinlock.h>
 #include <kernel/thread.h>
 #include <kernel/mp.h>
diff --git a/platform/bcm28xx/mailbox.c b/platform/bcm28xx/mailbox.c
index d0db1ba5..c848fd9b 100644
--- a/platform/bcm28xx/mailbox.c
+++ b/platform/bcm28xx/mailbox.c
@@ -20,10 +20,10 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include <reg.h>
-#include <err.h>
-#include <debug.h>
-#include <trace.h>
+#include <lk/reg.h>
+#include <lk/err.h>
+#include <lk/debug.h>
+#include <lk/trace.h>
 
 #include <arch.h>
 #include <platform.h>
diff --git a/platform/bcm28xx/miniuart.c b/platform/bcm28xx/miniuart.c
index b8f229be..c09ddd51 100644
--- a/platform/bcm28xx/miniuart.c
+++ b/platform/bcm28xx/miniuart.c
@@ -30,9 +30,9 @@
 #include <platform/bcm28xx.h>
 #include <platform/debug.h>
 #include <platform/interrupts.h>
-#include <reg.h>
+#include <lk/reg.h>
 #include <stdio.h>
-#include <trace.h>
+#include <lk/trace.h>
 
 #define RXBUF_SIZE 16
 
diff --git a/platform/bcm28xx/platform.c b/platform/bcm28xx/platform.c
index e2139077..1435deb2 100644
--- a/platform/bcm28xx/platform.c
+++ b/platform/bcm28xx/platform.c
@@ -20,10 +20,10 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <reg.h>
-#include <err.h>
-#include <debug.h>
-#include <trace.h>
+#include <lk/reg.h>
+#include <lk/err.h>
+#include <lk/debug.h>
+#include <lk/trace.h>
 
 #include <dev/uart.h>
 #include <arch.h>
diff --git a/platform/bcm28xx/uart.c b/platform/bcm28xx/uart.c
index 7ef0effb..d048a54c 100644
--- a/platform/bcm28xx/uart.c
+++ b/platform/bcm28xx/uart.c
@@ -20,9 +20,9 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <reg.h>
+#include <lk/reg.h>
 #include <stdio.h>
-#include <trace.h>
+#include <lk/trace.h>
 #include <lib/cbuf.h>
 #include <kernel/thread.h>
 #include <platform/interrupts.h>
diff --git a/platform/cc13xx/include/platform/ti-rf.h b/platform/cc13xx/include/platform/ti-rf.h
index d668aece..b72e2633 100644
--- a/platform/cc13xx/include/platform/ti-rf.h
+++ b/platform/cc13xx/include/platform/ti-rf.h
@@ -23,7 +23,7 @@
 
 #pragma once
 
-#include <compiler.h>
+#include <lk/compiler.h>
 
 // trigger control byte (TRM 23.3.2.5.1)
 
diff --git a/platform/cc13xx/init.c b/platform/cc13xx/init.c
index 03c1edcd..cc9d9d0d 100644
--- a/platform/cc13xx/init.c
+++ b/platform/cc13xx/init.c
@@ -21,7 +21,7 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include <debug.h>
+#include <lk/debug.h>
 #include <platform.h>
 #include <arch/arm/cm.h>
 
diff --git a/platform/cc13xx/radio.c b/platform/cc13xx/radio.c
index 1809d4b1..10d1c238 100644
--- a/platform/cc13xx/radio.c
+++ b/platform/cc13xx/radio.c
@@ -22,8 +22,8 @@
  */
 
 #include <app.h>
-#include <debug.h>
-#include <reg.h>
+#include <lk/debug.h>
+#include <lk/reg.h>
 #include <kernel/thread.h>
 #include <kernel/event.h>
 #include <arch/arm/cm.h>
diff --git a/platform/cc13xx/vectab.c b/platform/cc13xx/vectab.c
index 6e8ec48b..8533ccae 100644
--- a/platform/cc13xx/vectab.c
+++ b/platform/cc13xx/vectab.c
@@ -21,8 +21,8 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include <debug.h>
-#include <compiler.h>
+#include <lk/debug.h>
+#include <lk/compiler.h>
 #include <arch/arm/cm.h>
 
 static void ti_cc_dummy_irq(void) {
diff --git a/platform/debug.c b/platform/debug.c
index bc2212ac..a6ea74ca 100644
--- a/platform/debug.c
+++ b/platform/debug.c
@@ -21,9 +21,9 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include <compiler.h>
-#include <debug.h>
-#include <trace.h>
+#include <lk/compiler.h>
+#include <lk/debug.h>
+#include <lk/trace.h>
 
 /* Default implementation of panic time getc/putc.
  * Just calls through to the underlying dputc/dgetc implementation
diff --git a/platform/init.c b/platform/init.c
index 65bf9eb1..d16ef1d9 100644
--- a/platform/init.c
+++ b/platform/init.c
@@ -20,8 +20,8 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <err.h>
-#include <debug.h>
+#include <lk/err.h>
+#include <lk/debug.h>
 #include <platform.h>
 
 /*
diff --git a/platform/lpc15xx/debug.c b/platform/lpc15xx/debug.c
index cbf9a48f..3f4fe118 100644
--- a/platform/lpc15xx/debug.c
+++ b/platform/lpc15xx/debug.c
@@ -21,10 +21,10 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 #include <stdarg.h>
-#include <reg.h>
-#include <debug.h>
+#include <lk/reg.h>
+#include <lk/debug.h>
 #include <stdio.h>
-#include <compiler.h>
+#include <lk/compiler.h>
 #include <lib/cbuf.h>
 #include <kernel/thread.h>
 #include <platform/debug.h>
diff --git a/platform/lpc15xx/init.c b/platform/lpc15xx/init.c
index 31f212b4..0a0ff685 100644
--- a/platform/lpc15xx/init.c
+++ b/platform/lpc15xx/init.c
@@ -21,9 +21,9 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include <err.h>
+#include <lk/err.h>
 #include <stdio.h>
-#include <debug.h>
+#include <lk/debug.h>
 #include <platform.h>
 #include <platform/lpc.h>
 #include <arch/arm/cm.h>
diff --git a/platform/lpc15xx/vectab.c b/platform/lpc15xx/vectab.c
index c96dfbb1..0c11eb1c 100644
--- a/platform/lpc15xx/vectab.c
+++ b/platform/lpc15xx/vectab.c
@@ -21,8 +21,8 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include <debug.h>
-#include <compiler.h>
+#include <lk/debug.h>
+#include <lk/compiler.h>
 #include <arch/arm/cm.h>
 
 /* from cmsis.h */
diff --git a/platform/lpc43xx/debug.c b/platform/lpc43xx/debug.c
index f0c2f145..d1ce7d85 100644
--- a/platform/lpc43xx/debug.c
+++ b/platform/lpc43xx/debug.c
@@ -21,8 +21,8 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include <debug.h>
-#include <reg.h>
+#include <lk/debug.h>
+#include <lk/reg.h>
 #include <kernel/thread.h>
 #include <lib/cbuf.h>
 
diff --git a/platform/lpc43xx/gpio.c b/platform/lpc43xx/gpio.c
index f964a790..696a8af7 100644
--- a/platform/lpc43xx/gpio.c
+++ b/platform/lpc43xx/gpio.c
@@ -21,7 +21,7 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include <reg.h>
+#include <lk/reg.h>
 #include <platform/lpc43xx-gpio.h>
 
 inline int gpio_config(unsigned nr, unsigned flags)
diff --git a/platform/lpc43xx/init.c b/platform/lpc43xx/init.c
index 2877a031..d986490b 100644
--- a/platform/lpc43xx/init.c
+++ b/platform/lpc43xx/init.c
@@ -21,7 +21,7 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include <debug.h>
+#include <lk/debug.h>
 #include <arch/arm/cm.h>
 #include <kernel/thread.h>
 #include <platform.h>
diff --git a/platform/lpc43xx/udc.c b/platform/lpc43xx/udc.c
index fd3d9321..b292a727 100644
--- a/platform/lpc43xx/udc.c
+++ b/platform/lpc43xx/udc.c
@@ -26,8 +26,8 @@
 #include <stdlib.h>
 #include <printf.h>
 #include <assert.h>
-#include <debug.h>
-#include <reg.h>
+#include <lk/debug.h>
+#include <lk/reg.h>
 #include <arch/arm/cm.h>
 #include <kernel/thread.h>
 #include <kernel/spinlock.h>
diff --git a/platform/lpc43xx/vectab.c b/platform/lpc43xx/vectab.c
index a223420e..0fa792cc 100644
--- a/platform/lpc43xx/vectab.c
+++ b/platform/lpc43xx/vectab.c
@@ -21,8 +21,8 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include <debug.h>
-#include <compiler.h>
+#include <lk/debug.h>
+#include <lk/compiler.h>
 #include <arch/arm/cm.h>
 
 void lpc43xx_dummy_irq(void)
diff --git a/platform/mediatek/common/gic/mt_gic_v3.c b/platform/mediatek/common/gic/mt_gic_v3.c
index 522a8011..77c2b446 100644
--- a/platform/mediatek/common/gic/mt_gic_v3.c
+++ b/platform/mediatek/common/gic/mt_gic_v3.c
@@ -20,13 +20,13 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <reg.h>
+#include <lk/reg.h>
 #include <platform/mt_typedefs.h>
 #include <platform/mt_reg_base.h>
 #include <platform/mt_irq.h>
 #include <mt_gic.h>
 #include <sync_write.h>
-#include <debug.h>
+#include <lk/debug.h>
 
 #define GICD_CTLR_RWP       (1 << 31)
 #define GICD_CTLR_ARE       (1 << 4)
diff --git a/platform/mediatek/mt6735/debug.c b/platform/mediatek/mt6735/debug.c
index 280f1c24..06ac7eaa 100644
--- a/platform/mediatek/mt6735/debug.c
+++ b/platform/mediatek/mt6735/debug.c
@@ -20,7 +20,7 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <debug.h>
+#include <lk/debug.h>
 #include <arch/ops.h>
 #include <stdarg.h>
 #include <dev/uart.h>
diff --git a/platform/mediatek/mt6735/interrupts.c b/platform/mediatek/mt6735/interrupts.c
index a6b7b2e8..727bd915 100644
--- a/platform/mediatek/mt6735/interrupts.c
+++ b/platform/mediatek/mt6735/interrupts.c
@@ -30,7 +30,7 @@
  */
 
 #include <arch/arm.h>
-#include <reg.h>
+#include <lk/reg.h>
 #include <kernel/thread.h>
 #include <platform/interrupts.h>
 #include <sync_write.h>
@@ -39,7 +39,7 @@
 #include <platform/mt_gpt.h>
 #include <platform/mt_irq.h>
 
-#include <debug.h>
+#include <lk/debug.h>
 
 #define GIC_ICDISER0    (GIC_DIST_BASE + 0x100)
 #define GIC_ICDISER1    (GIC_DIST_BASE + 0x104)
diff --git a/platform/mediatek/mt6735/mt_gpt.c b/platform/mediatek/mt6735/mt_gpt.c
index c9101480..147cfb25 100644
--- a/platform/mediatek/mt6735/mt_gpt.c
+++ b/platform/mediatek/mt6735/mt_gpt.c
@@ -21,9 +21,9 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 #include <sys/types.h>
-#include <debug.h>
-#include <err.h>
-#include <reg.h>
+#include <lk/debug.h>
+#include <lk/err.h>
+#include <lk/reg.h>
 
 #include <platform/mt_typedefs.h>
 #include <platform/mt_reg_base.h>
diff --git a/platform/mediatek/mt6735/platform.c b/platform/mediatek/mt6735/platform.c
index d678dd09..5fe4b84a 100644
--- a/platform/mediatek/mt6735/platform.c
+++ b/platform/mediatek/mt6735/platform.c
@@ -20,11 +20,11 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <debug.h>
+#include <lk/debug.h>
 #include <stdlib.h>
 #include <string.h>
-#include <err.h>
-#include <reg.h>
+#include <lk/err.h>
+#include <lk/reg.h>
 #include <sys/types.h>
 #include <kernel/vm.h>
 #include <platform.h>
diff --git a/platform/mediatek/mt6735/timer.c b/platform/mediatek/mt6735/timer.c
index 25e6fb14..4bae25ae 100644
--- a/platform/mediatek/mt6735/timer.c
+++ b/platform/mediatek/mt6735/timer.c
@@ -21,9 +21,9 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 #include <sys/types.h>
-#include <debug.h>
-#include <err.h>
-#include <reg.h>
+#include <lk/debug.h>
+#include <lk/err.h>
+#include <lk/reg.h>
 #include <platform/timer.h>
 #include <platform/mt_typedefs.h>
 #include <platform/mt_reg_base.h>
diff --git a/platform/mediatek/mt6735/uart.c b/platform/mediatek/mt6735/uart.c
index 5c35f62a..29536731 100644
--- a/platform/mediatek/mt6735/uart.c
+++ b/platform/mediatek/mt6735/uart.c
@@ -20,8 +20,8 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <debug.h>
-#include <reg.h>
+#include <lk/debug.h>
+#include <lk/reg.h>
 #include <dev/uart.h>
 #include <string.h>
 
diff --git a/platform/mediatek/mt6797/debug.c b/platform/mediatek/mt6797/debug.c
index 8450c3ee..d96895d3 100644
--- a/platform/mediatek/mt6797/debug.c
+++ b/platform/mediatek/mt6797/debug.c
@@ -20,7 +20,7 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <debug.h>
+#include <lk/debug.h>
 #include <arch/ops.h>
 #include <stdarg.h>
 #include <dev/uart.h>
diff --git a/platform/mediatek/mt6797/interrupts.c b/platform/mediatek/mt6797/interrupts.c
index 0ea26ce7..05b84949 100644
--- a/platform/mediatek/mt6797/interrupts.c
+++ b/platform/mediatek/mt6797/interrupts.c
@@ -21,8 +21,8 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 #include <arch/arm.h>
-#include <reg.h>
-#include <debug.h>
+#include <lk/reg.h>
+#include <lk/debug.h>
 #include <kernel/thread.h>
 #include <mt_gic.h>
 #include <platform/mt_typedefs.h>
diff --git a/platform/mediatek/mt6797/mt_gpt.c b/platform/mediatek/mt6797/mt_gpt.c
index 84b95134..565611b8 100644
--- a/platform/mediatek/mt6797/mt_gpt.c
+++ b/platform/mediatek/mt6797/mt_gpt.c
@@ -21,9 +21,9 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 #include <sys/types.h>
-#include <debug.h>
-#include <err.h>
-#include <reg.h>
+#include <lk/debug.h>
+#include <lk/err.h>
+#include <lk/reg.h>
 
 #include <platform/mt_typedefs.h>
 #include <platform/mt_reg_base.h>
diff --git a/platform/mediatek/mt6797/platform.c b/platform/mediatek/mt6797/platform.c
index c9309c20..66ff702e 100644
--- a/platform/mediatek/mt6797/platform.c
+++ b/platform/mediatek/mt6797/platform.c
@@ -20,11 +20,11 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <debug.h>
+#include <lk/debug.h>
 #include <stdlib.h>
 #include <string.h>
-#include <err.h>
-#include <reg.h>
+#include <lk/err.h>
+#include <lk/reg.h>
 #include <sys/types.h>
 #include <kernel/vm.h>
 #include <platform.h>
diff --git a/platform/mediatek/mt6797/timer.c b/platform/mediatek/mt6797/timer.c
index 73d4d319..1e2f5b47 100644
--- a/platform/mediatek/mt6797/timer.c
+++ b/platform/mediatek/mt6797/timer.c
@@ -21,9 +21,9 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 #include <sys/types.h>
-#include <debug.h>
-#include <err.h>
-#include <reg.h>
+#include <lk/debug.h>
+#include <lk/err.h>
+#include <lk/reg.h>
 #include <kernel/thread.h>
 #include <mt_gic.h>
 #include <platform/timer.h>
diff --git a/platform/mediatek/mt6797/uart.c b/platform/mediatek/mt6797/uart.c
index 21fe0e87..fc7a4986 100644
--- a/platform/mediatek/mt6797/uart.c
+++ b/platform/mediatek/mt6797/uart.c
@@ -20,8 +20,8 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <debug.h>
-#include <reg.h>
+#include <lk/debug.h>
+#include <lk/reg.h>
 #include <dev/uart.h>
 #include <string.h>
 
diff --git a/platform/microblaze/intc.c b/platform/microblaze/intc.c
index f70b9a70..25e4e798 100644
--- a/platform/microblaze/intc.c
+++ b/platform/microblaze/intc.c
@@ -20,9 +20,9 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <reg.h>
-#include <err.h>
-#include <trace.h>
+#include <lk/reg.h>
+#include <lk/err.h>
+#include <lk/trace.h>
 #include <lk/init.h>
 #include <kernel/thread.h>
 #include <platform.h>
diff --git a/platform/microblaze/platform.c b/platform/microblaze/platform.c
index a4adb8fe..07fb694c 100644
--- a/platform/microblaze/platform.c
+++ b/platform/microblaze/platform.c
@@ -20,7 +20,7 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <reg.h>
+#include <lk/reg.h>
 #include <kernel/thread.h>
 #include <platform.h>
 #include <platform/interrupts.h>
diff --git a/platform/microblaze/timer.c b/platform/microblaze/timer.c
index c1ee0852..cd92136e 100644
--- a/platform/microblaze/timer.c
+++ b/platform/microblaze/timer.c
@@ -20,9 +20,9 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <reg.h>
-#include <trace.h>
-#include <err.h>
+#include <lk/reg.h>
+#include <lk/trace.h>
+#include <lk/err.h>
 #include <lk/init.h>
 #include <kernel/thread.h>
 #include <platform.h>
diff --git a/platform/microblaze/uartlite.c b/platform/microblaze/uartlite.c
index e63bb607..9825d4a5 100644
--- a/platform/microblaze/uartlite.c
+++ b/platform/microblaze/uartlite.c
@@ -20,8 +20,8 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <reg.h>
-#include <trace.h>
+#include <lk/reg.h>
+#include <lk/trace.h>
 #include <lib/cbuf.h>
 #include <lk/init.h>
 #include <kernel/thread.h>
diff --git a/platform/nrf51xxx/debug.c b/platform/nrf51xxx/debug.c
index 0e980a83..3e867d4d 100644
--- a/platform/nrf51xxx/debug.c
+++ b/platform/nrf51xxx/debug.c
@@ -21,8 +21,8 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 #include <stdarg.h>
-#include <reg.h>
-#include <debug.h>
+#include <lk/reg.h>
+#include <lk/debug.h>
 #include <stdio.h>
 #include <kernel/thread.h>
 #include <dev/uart.h>
diff --git a/platform/nrf51xxx/gpio.c b/platform/nrf51xxx/gpio.c
index dfe41a9b..742b34a6 100644
--- a/platform/nrf51xxx/gpio.c
+++ b/platform/nrf51xxx/gpio.c
@@ -20,7 +20,7 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <debug.h>
+#include <lk/debug.h>
 #include <assert.h>
 #include <dev/gpio.h>
 #include <platform/nrf51.h>
diff --git a/platform/nrf51xxx/init.c b/platform/nrf51xxx/init.c
index 7b53fbff..d070b208 100644
--- a/platform/nrf51xxx/init.c
+++ b/platform/nrf51xxx/init.c
@@ -20,8 +20,8 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <err.h>
-#include <debug.h>
+#include <lk/err.h>
+#include <lk/debug.h>
 #include <arch/arm/cm.h>
 #include <dev/uart.h>
 #include <platform.h>
diff --git a/platform/nrf51xxx/timer.c b/platform/nrf51xxx/timer.c
index 4946ebd3..79c98a8a 100644
--- a/platform/nrf51xxx/timer.c
+++ b/platform/nrf51xxx/timer.c
@@ -20,9 +20,9 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <err.h>
-#include <debug.h>
-#include <trace.h>
+#include <lk/err.h>
+#include <lk/debug.h>
+#include <lk/trace.h>
 #include <arch/arm/cm.h>
 #include <platform.h>
 #include <platform/nrf51.h>
diff --git a/platform/nrf51xxx/uart.c b/platform/nrf51xxx/uart.c
index 8c8953ba..b562be4a 100644
--- a/platform/nrf51xxx/uart.c
+++ b/platform/nrf51xxx/uart.c
@@ -21,11 +21,11 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 #include <stdarg.h>
-#include <reg.h>
-#include <debug.h>
+#include <lk/reg.h>
+#include <lk/debug.h>
 #include <stdio.h>
 #include <assert.h>
-#include <err.h>
+#include <lk/err.h>
 #include <lib/cbuf.h>
 #include <arch/arm/cm.h>
 #include <arch/ops.h>
diff --git a/platform/nrf51xxx/vectab.c b/platform/nrf51xxx/vectab.c
index b6d94e80..2a113a9b 100644
--- a/platform/nrf51xxx/vectab.c
+++ b/platform/nrf51xxx/vectab.c
@@ -20,8 +20,8 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <debug.h>
-#include <compiler.h>
+#include <lk/debug.h>
+#include <lk/compiler.h>
 #include <arch/arm/cm.h>
 #include <lib/cbuf.h>
 #include <platform/nrf51.h>
diff --git a/platform/nrf52xxx/debug.c b/platform/nrf52xxx/debug.c
index e8549046..08a86596 100644
--- a/platform/nrf52xxx/debug.c
+++ b/platform/nrf52xxx/debug.c
@@ -21,8 +21,8 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 #include <stdarg.h>
-#include <reg.h>
-#include <debug.h>
+#include <lk/reg.h>
+#include <lk/debug.h>
 #include <stdio.h>
 #include <kernel/thread.h>
 #include <dev/uart.h>
diff --git a/platform/nrf52xxx/gpio.c b/platform/nrf52xxx/gpio.c
index 55a6e2ee..a78aaf14 100644
--- a/platform/nrf52xxx/gpio.c
+++ b/platform/nrf52xxx/gpio.c
@@ -20,7 +20,7 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <debug.h>
+#include <lk/debug.h>
 #include <assert.h>
 #include <dev/gpio.h>
 #include <platform/nrf52.h>
diff --git a/platform/nrf52xxx/init.c b/platform/nrf52xxx/init.c
index c0a631e2..13274ef3 100644
--- a/platform/nrf52xxx/init.c
+++ b/platform/nrf52xxx/init.c
@@ -20,8 +20,8 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <err.h>
-#include <debug.h>
+#include <lk/err.h>
+#include <lk/debug.h>
 #include <arch/arm/cm.h>
 #include <dev/uart.h>
 #include <platform.h>
diff --git a/platform/nrf52xxx/timer.c b/platform/nrf52xxx/timer.c
index 97cc28df..f94c86a8 100644
--- a/platform/nrf52xxx/timer.c
+++ b/platform/nrf52xxx/timer.c
@@ -21,8 +21,8 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 #include <assert.h>
-#include <debug.h>
-#include <err.h>
+#include <lk/debug.h>
+#include <lk/err.h>
 #include <platform.h>
 #include <arch/arm/cm.h>
 #include <platform/nrf52.h>
diff --git a/platform/nrf52xxx/uart.c b/platform/nrf52xxx/uart.c
index 1bee6530..4391ed84 100644
--- a/platform/nrf52xxx/uart.c
+++ b/platform/nrf52xxx/uart.c
@@ -21,11 +21,11 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 #include <stdarg.h>
-#include <reg.h>
-#include <debug.h>
+#include <lk/reg.h>
+#include <lk/debug.h>
 #include <stdio.h>
 #include <assert.h>
-#include <err.h>
+#include <lk/err.h>
 #include <lib/cbuf.h>
 #include <arch/arm/cm.h>
 #include <arch/ops.h>
diff --git a/platform/nrf52xxx/vectab.c b/platform/nrf52xxx/vectab.c
index 4594b51b..c6f2e3f1 100644
--- a/platform/nrf52xxx/vectab.c
+++ b/platform/nrf52xxx/vectab.c
@@ -20,8 +20,8 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <debug.h>
-#include <compiler.h>
+#include <lk/debug.h>
+#include <lk/compiler.h>
 #include <arch/arm/cm.h>
 #include <lib/cbuf.h>
 #include <platform/nrf52.h>
diff --git a/platform/or1ksim/include/platform/or1ksim.h b/platform/or1ksim/include/platform/or1ksim.h
index ad65b507..257ee21f 100644
--- a/platform/or1ksim/include/platform/or1ksim.h
+++ b/platform/or1ksim/include/platform/or1ksim.h
@@ -22,7 +22,7 @@
  */
 #pragma once
 
-#include <reg.h>
+#include <lk/reg.h>
 
 /* timer */
 #define TIMER_CLOCK_FREQ    50000000
diff --git a/platform/or1ksim/platform.c b/platform/or1ksim/platform.c
index b4a16265..ef7511b4 100644
--- a/platform/or1ksim/platform.c
+++ b/platform/or1ksim/platform.c
@@ -20,7 +20,7 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <reg.h>
+#include <lk/reg.h>
 #include <kernel/thread.h>
 #include <kernel/vm.h>
 #include <dev/uart.h>
diff --git a/platform/or1ksim/uart.c b/platform/or1ksim/uart.c
index d7ebb3ed..e30684d6 100644
--- a/platform/or1ksim/uart.c
+++ b/platform/or1ksim/uart.c
@@ -20,8 +20,8 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <debug.h>
-#include <reg.h>
+#include <lk/debug.h>
+#include <lk/reg.h>
 #include <dev/uart.h>
 #include <target/debugconfig.h>
 #include <platform/or1ksim.h>
diff --git a/platform/pc/debug.c b/platform/pc/debug.c
index f5c6b08b..ffbffde9 100644
--- a/platform/pc/debug.c
+++ b/platform/pc/debug.c
@@ -21,7 +21,7 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 #include <stdarg.h>
-#include <reg.h>
+#include <lk/reg.h>
 #include <stdio.h>
 #include <kernel/thread.h>
 #include <arch/x86.h>
diff --git a/platform/pc/ide.c b/platform/pc/ide.c
index 8fb55d99..249cd9bb 100644
--- a/platform/pc/ide.c
+++ b/platform/pc/ide.c
@@ -21,11 +21,11 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include <reg.h>
-#include <debug.h>
-#include <trace.h>
+#include <lk/reg.h>
+#include <lk/debug.h>
+#include <lk/trace.h>
 #include <assert.h>
-#include <err.h>
+#include <lk/err.h>
 #include <malloc.h>
 #include <arch/x86.h>
 #include <sys/types.h>
diff --git a/platform/pc/include/pcnet.h b/platform/pc/include/pcnet.h
index 40f08e3b..01fc5be1 100644
--- a/platform/pc/include/pcnet.h
+++ b/platform/pc/include/pcnet.h
@@ -23,7 +23,7 @@
 #ifndef __PLATFORM_PC_PCNET_H
 #define __PLATFORM_PC_PCNET_H
 
-#include <compiler.h>
+#include <lk/compiler.h>
 #include <stdint.h>
 
 #define REG_APROM 0x00
diff --git a/platform/pc/include/platform/console.h b/platform/pc/include/platform/console.h
index c7870a50..4f94f781 100644
--- a/platform/pc/include/platform/console.h
+++ b/platform/pc/include/platform/console.h
@@ -23,7 +23,7 @@
 #ifndef __PLATFORM_CONSOLE_H
 #define __PLATFORM_CONSOLE_H
 
-#include <compiler.h>
+#include <lk/compiler.h>
 
 __BEGIN_CDECLS
 
diff --git a/platform/pc/interrupts.c b/platform/pc/interrupts.c
index 3981f2e7..4bc1ce4a 100644
--- a/platform/pc/interrupts.c
+++ b/platform/pc/interrupts.c
@@ -22,9 +22,9 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 #include <sys/types.h>
-#include <debug.h>
-#include <err.h>
-#include <reg.h>
+#include <lk/debug.h>
+#include <lk/err.h>
+#include <lk/reg.h>
 #include <assert.h>
 #include <kernel/thread.h>
 #include <platform/interrupts.h>
diff --git a/platform/pc/keyboard.c b/platform/pc/keyboard.c
index 13815ac9..fb7fff4a 100644
--- a/platform/pc/keyboard.c
+++ b/platform/pc/keyboard.c
@@ -23,10 +23,10 @@
 #include <platform/keyboard.h>
 
 #include <sys/types.h>
-#include <err.h>
-#include <reg.h>
-#include <trace.h>
-#include <debug.h>
+#include <lk/err.h>
+#include <lk/reg.h>
+#include <lk/trace.h>
+#include <lk/debug.h>
 #include <kernel/thread.h>
 #include <platform.h>
 #include <platform/interrupts.h>
diff --git a/platform/pc/pci.c b/platform/pc/pci.c
index d5d14149..3090544a 100644
--- a/platform/pc/pci.c
+++ b/platform/pc/pci.c
@@ -20,15 +20,15 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <debug.h>
-#include <err.h>
+#include <lk/debug.h>
+#include <lk/err.h>
 #include <stdlib.h>
 #include <string.h>
 #include <kernel/thread.h>
 #include <kernel/spinlock.h>
 #include <arch/x86/descriptor.h>
 #include <dev/pci.h>
-#include <trace.h>
+#include <lk/trace.h>
 
 #define LOCAL_TRACE 0
 
diff --git a/platform/pc/platform.c b/platform/pc/platform.c
index b82bc169..aea55bca 100644
--- a/platform/pc/platform.c
+++ b/platform/pc/platform.c
@@ -23,8 +23,8 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include <err.h>
-#include <trace.h>
+#include <lk/err.h>
+#include <lk/trace.h>
 #include <arch/x86/mmu.h>
 #include <platform.h>
 #include "platform_p.h"
diff --git a/platform/pc/timer.c b/platform/pc/timer.c
index fd263323..0f963c7b 100644
--- a/platform/pc/timer.c
+++ b/platform/pc/timer.c
@@ -21,9 +21,9 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 #include <sys/types.h>
-#include <err.h>
-#include <reg.h>
-#include <debug.h>
+#include <lk/err.h>
+#include <lk/reg.h>
+#include <lk/debug.h>
 #include <kernel/thread.h>
 #include <kernel/spinlock.h>
 #include <platform.h>
diff --git a/platform/pc/uart.c b/platform/pc/uart.c
index be94bf60..f884c117 100644
--- a/platform/pc/uart.c
+++ b/platform/pc/uart.c
@@ -23,10 +23,10 @@
 
 #include <dev/driver.h>
 #include <dev/class/uart.h>
-#include <debug.h>
+#include <lk/debug.h>
 #include <assert.h>
 #include <malloc.h>
-#include <err.h>
+#include <lk/err.h>
 #include <lib/cbuf.h>
 #include <platform/uart.h>
 #include <arch/x86.h>
diff --git a/platform/power.c b/platform/power.c
index 1acc7903..14ed42c1 100644
--- a/platform/power.c
+++ b/platform/power.c
@@ -20,9 +20,9 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <debug.h>
-#include <err.h>
-#include <compiler.h>
+#include <lk/debug.h>
+#include <lk/err.h>
+#include <lk/compiler.h>
 #include <platform.h>
 #include <platform/debug.h>
 #include <kernel/thread.h>
diff --git a/platform/qemu-mips/debug.c b/platform/qemu-mips/debug.c
index c69c5da3..8af6f0f8 100644
--- a/platform/qemu-mips/debug.c
+++ b/platform/qemu-mips/debug.c
@@ -22,8 +22,8 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 #include <stdarg.h>
-#include <reg.h>
-#include <trace.h>
+#include <lk/reg.h>
+#include <lk/trace.h>
 #include <stdio.h>
 #include <kernel/thread.h>
 #include <lib/cbuf.h>
diff --git a/platform/qemu-mips/intc.c b/platform/qemu-mips/intc.c
index de1f9527..9c1d8120 100644
--- a/platform/qemu-mips/intc.c
+++ b/platform/qemu-mips/intc.c
@@ -22,10 +22,10 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 #include <sys/types.h>
-#include <debug.h>
-#include <trace.h>
-#include <err.h>
-#include <reg.h>
+#include <lk/debug.h>
+#include <lk/trace.h>
+#include <lk/err.h>
+#include <lk/reg.h>
 #include <kernel/thread.h>
 #include <platform/interrupts.h>
 #include <arch/ops.h>
diff --git a/platform/qemu-mips/platform.c b/platform/qemu-mips/platform.c
index 6296325c..78f7e564 100644
--- a/platform/qemu-mips/platform.c
+++ b/platform/qemu-mips/platform.c
@@ -20,7 +20,7 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <reg.h>
+#include <lk/reg.h>
 #include <sys/types.h>
 #include <kernel/thread.h>
 #include <platform.h>
diff --git a/platform/qemu-virt-arm/debug.c b/platform/qemu-virt-arm/debug.c
index 8869a13e..bb37b1b3 100644
--- a/platform/qemu-virt-arm/debug.c
+++ b/platform/qemu-virt-arm/debug.c
@@ -21,14 +21,14 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 #include <stdarg.h>
-#include <reg.h>
+#include <lk/reg.h>
 #include <stdio.h>
 #include <kernel/thread.h>
 #include <dev/uart.h>
 #include <platform/debug.h>
 #include <platform/qemu-virt.h>
 #include <target/debugconfig.h>
-#include <reg.h>
+#include <lk/reg.h>
 
 /* DEBUG_UART must be defined to 0 or 1 */
 #if defined(DEBUG_UART) && DEBUG_UART == 0
diff --git a/platform/qemu-virt-arm/platform.c b/platform/qemu-virt-arm/platform.c
index 1820b820..afcc55ad 100644
--- a/platform/qemu-virt-arm/platform.c
+++ b/platform/qemu-virt-arm/platform.c
@@ -21,9 +21,9 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 #include <arch.h>
-#include <err.h>
-#include <debug.h>
-#include <trace.h>
+#include <lk/err.h>
+#include <lk/debug.h>
+#include <lk/trace.h>
 #include <dev/interrupt/arm_gic.h>
 #include <dev/timer/arm_generic.h>
 #include <dev/uart.h>
diff --git a/platform/qemu-virt-arm/secondary_boot.S b/platform/qemu-virt-arm/secondary_boot.S
index 51f16fdb..2e64ca3c 100644
--- a/platform/qemu-virt-arm/secondary_boot.S
+++ b/platform/qemu-virt-arm/secondary_boot.S
@@ -21,7 +21,7 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include <asm.h>
+#include <lk/asm.h>
 
 .section .text
 
diff --git a/platform/qemu-virt-arm/uart.c b/platform/qemu-virt-arm/uart.c
index 4eebe102..830bef6b 100644
--- a/platform/qemu-virt-arm/uart.c
+++ b/platform/qemu-virt-arm/uart.c
@@ -20,9 +20,9 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <reg.h>
+#include <lk/reg.h>
 #include <stdio.h>
-#include <trace.h>
+#include <lk/trace.h>
 #include <lib/cbuf.h>
 #include <kernel/thread.h>
 #include <platform/interrupts.h>
diff --git a/platform/sifive/platform.c b/platform/sifive/platform.c
index d2440569..13816085 100644
--- a/platform/sifive/platform.c
+++ b/platform/sifive/platform.c
@@ -20,7 +20,7 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <reg.h>
+#include <lk/reg.h>
 #include <kernel/thread.h>
 #include <platform.h>
 #include <platform/interrupts.h>
diff --git a/platform/sifive/plic.c b/platform/sifive/plic.c
index f98e951a..2730aed6 100644
--- a/platform/sifive/plic.c
+++ b/platform/sifive/plic.c
@@ -23,10 +23,10 @@
 #include "platform_p.h"
 
 #include <assert.h>
-#include <err.h>
-#include <debug.h>
-#include <reg.h>
-#include <trace.h>
+#include <lk/err.h>
+#include <lk/debug.h>
+#include <lk/reg.h>
+#include <lk/trace.h>
 #include <platform/interrupts.h>
 #include <platform/sifive.h>
 
diff --git a/platform/sifive/uart.c b/platform/sifive/uart.c
index f4ad352b..6e4fa68e 100644
--- a/platform/sifive/uart.c
+++ b/platform/sifive/uart.c
@@ -20,8 +20,8 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <reg.h>
-#include <trace.h>
+#include <lk/reg.h>
+#include <lk/trace.h>
 #include <lib/cbuf.h>
 #include <kernel/thread.h>
 #include <platform.h>
diff --git a/platform/stellaris/debug.c b/platform/stellaris/debug.c
index 6254e6b3..d3a77d18 100644
--- a/platform/stellaris/debug.c
+++ b/platform/stellaris/debug.c
@@ -21,8 +21,8 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 #include <stdarg.h>
-#include <reg.h>
-#include <debug.h>
+#include <lk/reg.h>
+#include <lk/debug.h>
 #include <stdio.h>
 #include <lib/cbuf.h>
 #include <kernel/thread.h>
diff --git a/platform/stellaris/gpio.c b/platform/stellaris/gpio.c
index 35fda3fb..8c5a326f 100644
--- a/platform/stellaris/gpio.c
+++ b/platform/stellaris/gpio.c
@@ -20,7 +20,7 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <debug.h>
+#include <lk/debug.h>
 #include <assert.h>
 #include <dev/gpio.h>
 #include <platform/gpio.h>
diff --git a/platform/stellaris/include/ti_driverlib.h b/platform/stellaris/include/ti_driverlib.h
index 88e492af..18dc73ee 100644
--- a/platform/stellaris/include/ti_driverlib.h
+++ b/platform/stellaris/include/ti_driverlib.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <compiler.h>
+#include <lk/compiler.h>
 
 __BEGIN_CDECLS
 
diff --git a/platform/stellaris/init.c b/platform/stellaris/init.c
index 0287be9d..c060a1bc 100644
--- a/platform/stellaris/init.c
+++ b/platform/stellaris/init.c
@@ -22,9 +22,9 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include <err.h>
+#include <lk/err.h>
 #include <stdio.h>
-#include <debug.h>
+#include <lk/debug.h>
 #include <platform.h>
 #include <dev/usb.h>
 #include <arch/arm/cm.h>
diff --git a/platform/stellaris/usbc.c b/platform/stellaris/usbc.c
index 9c0ab70d..3100ac42 100644
--- a/platform/stellaris/usbc.c
+++ b/platform/stellaris/usbc.c
@@ -20,13 +20,13 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <err.h>
+#include <lk/err.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <trace.h>
-#include <debug.h>
+#include <lk/trace.h>
+#include <lk/debug.h>
 #include <platform.h>
-#include <reg.h>
+#include <lk/reg.h>
 #include <dev/usb.h>
 #include <dev/usbc.h>
 #include <arch/arm/cm.h>
diff --git a/platform/stellaris/vectab.c b/platform/stellaris/vectab.c
index 06c8c7cd..ee265bf8 100644
--- a/platform/stellaris/vectab.c
+++ b/platform/stellaris/vectab.c
@@ -21,8 +21,8 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include <debug.h>
-#include <compiler.h>
+#include <lk/debug.h>
+#include <lk/compiler.h>
 #include <arch/arm/cm.h>
 
 /* un-overridden irq handler */
diff --git a/platform/stm32/power.c b/platform/stm32/power.c
index faee2ce8..a391d77f 100644
--- a/platform/stm32/power.c
+++ b/platform/stm32/power.c
@@ -20,9 +20,9 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <debug.h>
-#include <err.h>
-#include <compiler.h>
+#include <lk/debug.h>
+#include <lk/err.h>
+#include <lk/compiler.h>
 #include <stdio.h>
 #include <platform.h>
 #include <platform/debug.h>
diff --git a/platform/stm32f0xx/can.c b/platform/stm32f0xx/can.c
index c49d5a7b..52cc934a 100644
--- a/platform/stm32f0xx/can.c
+++ b/platform/stm32f0xx/can.c
@@ -4,7 +4,7 @@
 
 #include <assert.h>
 #include <errno.h>
-#include <pow2.h>
+#include <lk/pow2.h>
 #include <stdbool.h>
 
 #include <arch/arm/cm.h>
diff --git a/platform/stm32f0xx/debug.c b/platform/stm32f0xx/debug.c
index 81f9b92e..7937ab73 100644
--- a/platform/stm32f0xx/debug.c
+++ b/platform/stm32f0xx/debug.c
@@ -21,8 +21,8 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 #include <stdarg.h>
-#include <reg.h>
-#include <debug.h>
+#include <lk/reg.h>
+#include <lk/debug.h>
 #include <stdio.h>
 #include <kernel/thread.h>
 #include <platform/debug.h>
diff --git a/platform/stm32f0xx/dma.c b/platform/stm32f0xx/dma.c
index e235b2f4..cb9bcfb0 100644
--- a/platform/stm32f0xx/dma.c
+++ b/platform/stm32f0xx/dma.c
@@ -23,7 +23,7 @@
 #include <platform/dma.h>
 
 #include <assert.h>
-#include <compiler.h>
+#include <lk/compiler.h>
 
 #include <arch/arm/cm.h>
 #include <kernel/event.h>
diff --git a/platform/stm32f0xx/exti.c b/platform/stm32f0xx/exti.c
index d8a66910..09c5b290 100644
--- a/platform/stm32f0xx/exti.c
+++ b/platform/stm32f0xx/exti.c
@@ -25,7 +25,7 @@
 
 #include <arch/arm/cm.h>
 #include <assert.h>
-#include <compiler.h>
+#include <lk/compiler.h>
 #include <platform/rcc.h>
 #include <stdint.h>
 
diff --git a/platform/stm32f0xx/gpio.c b/platform/stm32f0xx/gpio.c
index b5148a34..f48bdc20 100644
--- a/platform/stm32f0xx/gpio.c
+++ b/platform/stm32f0xx/gpio.c
@@ -23,7 +23,7 @@
  */
 
 #include <assert.h>
-#include <debug.h>
+#include <lk/debug.h>
 #include <dev/gpio.h>
 #include <platform/gpio.h>
 #include <platform/rcc.h>
diff --git a/platform/stm32f0xx/i2c.c b/platform/stm32f0xx/i2c.c
index f373ffaf..987620e7 100644
--- a/platform/stm32f0xx/i2c.c
+++ b/platform/stm32f0xx/i2c.c
@@ -22,7 +22,7 @@
  */
 #include <arch/arm/cm.h>
 #include <dev/i2c.h>
-#include <err.h>
+#include <lk/err.h>
 #include <kernel/event.h>
 #include <kernel/mutex.h>
 #include <platform/rcc.h>
diff --git a/platform/stm32f0xx/include/platform/can.h b/platform/stm32f0xx/include/platform/can.h
index 20843c63..de3e3e6b 100644
--- a/platform/stm32f0xx/include/platform/can.h
+++ b/platform/stm32f0xx/include/platform/can.h
@@ -1,7 +1,7 @@
 #ifndef __PLATFORM_STM32_CAN_H
 #define __PLATFORM_STM32_CAN_H
 
-#include <compiler.h>
+#include <lk/compiler.h>
 #include <stdbool.h>
 #include <stdint.h>
 
diff --git a/platform/stm32f0xx/include/platform/timer_capture.h b/platform/stm32f0xx/include/platform/timer_capture.h
index ab30ee70..160fc620 100644
--- a/platform/stm32f0xx/include/platform/timer_capture.h
+++ b/platform/stm32f0xx/include/platform/timer_capture.h
@@ -24,7 +24,7 @@
 #ifndef __PLATFORM_STM32_TIMER_CAPTURE_H
 #define __PLATFORM_STM32_TIMER_CAPTURE_H
 
-#include <err.h>
+#include <lk/err.h>
 #include <kernel/spinlock.h>
 #include <stdbool.h>
 #include <stdint.h>
diff --git a/platform/stm32f0xx/init.c b/platform/stm32f0xx/init.c
index 95899344..f5340a6b 100644
--- a/platform/stm32f0xx/init.c
+++ b/platform/stm32f0xx/init.c
@@ -20,8 +20,8 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <err.h>
-#include <debug.h>
+#include <lk/err.h>
+#include <lk/debug.h>
 #include <dev/uart.h>
 #include <platform.h>
 #include <platform/stm32.h>
diff --git a/platform/stm32f0xx/usbc.c b/platform/stm32f0xx/usbc.c
index 8e0c041b..bc6e5eed 100644
--- a/platform/stm32f0xx/usbc.c
+++ b/platform/stm32f0xx/usbc.c
@@ -21,14 +21,14 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <reg.h>
-#include <trace.h>
-#include <debug.h>
+#include <lk/reg.h>
+#include <lk/trace.h>
+#include <lk/debug.h>
 #include <stdbool.h>
 #include <string.h>
 #include <stdlib.h>
 #include <assert.h>
-#include <err.h>
+#include <lk/err.h>
 #include <dev/usb.h>
 #include <dev/usbc.h>
 #include <arch/arm/cm.h>
diff --git a/platform/stm32f0xx/vectab.c b/platform/stm32f0xx/vectab.c
index 3615659b..8864117e 100644
--- a/platform/stm32f0xx/vectab.c
+++ b/platform/stm32f0xx/vectab.c
@@ -20,8 +20,8 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <debug.h>
-#include <compiler.h>
+#include <lk/debug.h>
+#include <lk/compiler.h>
 #include <stm32f0xx.h>
 #include <arch/arm/cm.h>
 #include <platform/stm32.h>
diff --git a/platform/stm32f1xx/debug.c b/platform/stm32f1xx/debug.c
index 796919e5..08896c1c 100644
--- a/platform/stm32f1xx/debug.c
+++ b/platform/stm32f1xx/debug.c
@@ -21,8 +21,8 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 #include <stdarg.h>
-#include <reg.h>
-#include <debug.h>
+#include <lk/reg.h>
+#include <lk/debug.h>
 #include <stdio.h>
 #include <kernel/thread.h>
 #include <platform/debug.h>
diff --git a/platform/stm32f1xx/flash_nor.c b/platform/stm32f1xx/flash_nor.c
index 0929e2b7..11b41193 100644
--- a/platform/stm32f1xx/flash_nor.c
+++ b/platform/stm32f1xx/flash_nor.c
@@ -20,9 +20,9 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <debug.h>
-#include <trace.h>
-#include <err.h>
+#include <lk/debug.h>
+#include <lk/trace.h>
+#include <lk/err.h>
 #include <sys/types.h>
 #include <kernel/thread.h>
 #include <platform.h>
diff --git a/platform/stm32f1xx/gpio.c b/platform/stm32f1xx/gpio.c
index afda51d6..d3338f12 100644
--- a/platform/stm32f1xx/gpio.c
+++ b/platform/stm32f1xx/gpio.c
@@ -20,7 +20,7 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <debug.h>
+#include <lk/debug.h>
 #include <assert.h>
 #include <dev/gpio.h>
 #include <platform/stm32.h>
diff --git a/platform/stm32f1xx/init.c b/platform/stm32f1xx/init.c
index 3f403300..a5eef23c 100644
--- a/platform/stm32f1xx/init.c
+++ b/platform/stm32f1xx/init.c
@@ -20,8 +20,8 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <err.h>
-#include <debug.h>
+#include <lk/err.h>
+#include <lk/debug.h>
 #include <dev/uart.h>
 #include <platform.h>
 #include <platform/stm32.h>
diff --git a/platform/stm32f1xx/timer.c b/platform/stm32f1xx/timer.c
index 7ac815eb..757ed396 100644
--- a/platform/stm32f1xx/timer.c
+++ b/platform/stm32f1xx/timer.c
@@ -20,9 +20,9 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <debug.h>
-#include <trace.h>
-#include <err.h>
+#include <lk/debug.h>
+#include <lk/trace.h>
+#include <lk/err.h>
 #include <sys/types.h>
 #include <kernel/thread.h>
 #include <platform.h>
diff --git a/platform/stm32f1xx/uart.c b/platform/stm32f1xx/uart.c
index db1d7fe0..5eb80a35 100644
--- a/platform/stm32f1xx/uart.c
+++ b/platform/stm32f1xx/uart.c
@@ -21,8 +21,8 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 #include <stdarg.h>
-#include <reg.h>
-#include <debug.h>
+#include <lk/reg.h>
+#include <lk/debug.h>
 #include <stdio.h>
 #include <assert.h>
 #include <lib/cbuf.h>
diff --git a/platform/stm32f1xx/vectab.c b/platform/stm32f1xx/vectab.c
index 02a335be..6e1619ac 100644
--- a/platform/stm32f1xx/vectab.c
+++ b/platform/stm32f1xx/vectab.c
@@ -20,8 +20,8 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <debug.h>
-#include <compiler.h>
+#include <lk/debug.h>
+#include <lk/compiler.h>
 #include <stm32f10x.h>
 #include <arch/arm/cm.h>
 #include <platform/stm32.h>
diff --git a/platform/stm32f2xx/debug.c b/platform/stm32f2xx/debug.c
index 766cd9ed..5a9280cc 100644
--- a/platform/stm32f2xx/debug.c
+++ b/platform/stm32f2xx/debug.c
@@ -21,8 +21,8 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 #include <stdarg.h>
-#include <reg.h>
-#include <debug.h>
+#include <lk/reg.h>
+#include <lk/debug.h>
 #include <stdio.h>
 #include <kernel/thread.h>
 #include <platform/debug.h>
diff --git a/platform/stm32f2xx/gpio.c b/platform/stm32f2xx/gpio.c
index fb4bf262..33cd58a5 100644
--- a/platform/stm32f2xx/gpio.c
+++ b/platform/stm32f2xx/gpio.c
@@ -20,7 +20,7 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <debug.h>
+#include <lk/debug.h>
 #include <assert.h>
 #include <dev/gpio.h>
 #include <platform/stm32.h>
diff --git a/platform/stm32f2xx/init.c b/platform/stm32f2xx/init.c
index 8ce41d7a..abab9702 100644
--- a/platform/stm32f2xx/init.c
+++ b/platform/stm32f2xx/init.c
@@ -20,8 +20,8 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <err.h>
-#include <debug.h>
+#include <lk/err.h>
+#include <lk/debug.h>
 #include <dev/uart.h>
 #include <platform.h>
 #include <platform/stm32.h>
diff --git a/platform/stm32f2xx/timer.c b/platform/stm32f2xx/timer.c
index ffe6d0f6..78347de5 100644
--- a/platform/stm32f2xx/timer.c
+++ b/platform/stm32f2xx/timer.c
@@ -20,9 +20,9 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <debug.h>
-#include <trace.h>
-#include <err.h>
+#include <lk/debug.h>
+#include <lk/trace.h>
+#include <lk/err.h>
 #include <sys/types.h>
 #include <kernel/thread.h>
 #include <platform.h>
diff --git a/platform/stm32f2xx/uart.c b/platform/stm32f2xx/uart.c
index 7aa4c945..ebbd588e 100644
--- a/platform/stm32f2xx/uart.c
+++ b/platform/stm32f2xx/uart.c
@@ -21,8 +21,8 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 #include <stdarg.h>
-#include <reg.h>
-#include <debug.h>
+#include <lk/reg.h>
+#include <lk/debug.h>
 #include <stdio.h>
 #include <assert.h>
 #include <lib/cbuf.h>
diff --git a/platform/stm32f2xx/vectab.c b/platform/stm32f2xx/vectab.c
index 899f3802..5077d126 100644
--- a/platform/stm32f2xx/vectab.c
+++ b/platform/stm32f2xx/vectab.c
@@ -20,8 +20,8 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <debug.h>
-#include <compiler.h>
+#include <lk/debug.h>
+#include <lk/compiler.h>
 #include <stm32f2xx.h>
 #include <arch/arm/cm.h>
 #include <platform/stm32.h>
diff --git a/platform/stm32f4xx/debug.c b/platform/stm32f4xx/debug.c
index c7b74a0d..3fb6619f 100644
--- a/platform/stm32f4xx/debug.c
+++ b/platform/stm32f4xx/debug.c
@@ -21,8 +21,8 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 #include <stdarg.h>
-#include <reg.h>
-#include <debug.h>
+#include <lk/reg.h>
+#include <lk/debug.h>
 #include <stdio.h>
 #include <kernel/thread.h>
 #include <platform/debug.h>
diff --git a/platform/stm32f4xx/flash.c b/platform/stm32f4xx/flash.c
index 60fbd80f..477b7a48 100644
--- a/platform/stm32f4xx/flash.c
+++ b/platform/stm32f4xx/flash.c
@@ -1,14 +1,14 @@
 // Copyright (C) 2015 Playground Global LLC.  All rights reserved.
 
-#include <debug.h>
+#include <lk/debug.h>
 #include <assert.h>
-#include <trace.h>
-#include <compiler.h>
+#include <lk/trace.h>
+#include <lk/compiler.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <err.h>
+#include <lk/err.h>
 #include <string.h>
-#include <reg.h>
+#include <lk/reg.h>
 #include <lib/bio.h>
 #include <lib/console.h>
 #include <kernel/thread.h>
diff --git a/platform/stm32f4xx/gpio.c b/platform/stm32f4xx/gpio.c
index cdad97ed..0db776e2 100644
--- a/platform/stm32f4xx/gpio.c
+++ b/platform/stm32f4xx/gpio.c
@@ -20,7 +20,7 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <debug.h>
+#include <lk/debug.h>
 #include <assert.h>
 #include <dev/gpio.h>
 #include <platform/stm32.h>
diff --git a/platform/stm32f4xx/init.c b/platform/stm32f4xx/init.c
index 3fa7c7b9..6ad18d29 100644
--- a/platform/stm32f4xx/init.c
+++ b/platform/stm32f4xx/init.c
@@ -20,8 +20,8 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <err.h>
-#include <debug.h>
+#include <lk/err.h>
+#include <lk/debug.h>
 #include <dev/uart.h>
 #include <platform.h>
 #include <platform/stm32.h>
diff --git a/platform/stm32f4xx/timer.c b/platform/stm32f4xx/timer.c
index 813ffc3c..3cfce762 100644
--- a/platform/stm32f4xx/timer.c
+++ b/platform/stm32f4xx/timer.c
@@ -20,9 +20,9 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <debug.h>
-#include <trace.h>
-#include <err.h>
+#include <lk/debug.h>
+#include <lk/trace.h>
+#include <lk/err.h>
 #include <sys/types.h>
 #include <kernel/thread.h>
 #include <platform.h>
diff --git a/platform/stm32f4xx/uart.c b/platform/stm32f4xx/uart.c
index d26fa470..add3e36f 100644
--- a/platform/stm32f4xx/uart.c
+++ b/platform/stm32f4xx/uart.c
@@ -21,8 +21,8 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 #include <stdarg.h>
-#include <reg.h>
-#include <debug.h>
+#include <lk/reg.h>
+#include <lk/debug.h>
 #include <stdio.h>
 #include <assert.h>
 #include <lib/cbuf.h>
diff --git a/platform/stm32f4xx/vectab.c b/platform/stm32f4xx/vectab.c
index 38690aad..f564ebf5 100644
--- a/platform/stm32f4xx/vectab.c
+++ b/platform/stm32f4xx/vectab.c
@@ -20,8 +20,8 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <debug.h>
-#include <compiler.h>
+#include <lk/debug.h>
+#include <lk/compiler.h>
 #include <stm32f4xx.h>
 #include <arch/arm/cm.h>
 #include <platform/stm32.h>
diff --git a/platform/stm32f7xx/debug.c b/platform/stm32f7xx/debug.c
index 1a091875..11228669 100644
--- a/platform/stm32f7xx/debug.c
+++ b/platform/stm32f7xx/debug.c
@@ -21,8 +21,8 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 #include <stdarg.h>
-#include <reg.h>
-#include <debug.h>
+#include <lk/reg.h>
+#include <lk/debug.h>
 #include <stdio.h>
 #include <kernel/thread.h>
 #include <platform/debug.h>
diff --git a/platform/stm32f7xx/eth.c b/platform/stm32f7xx/eth.c
index 22437636..b539f440 100644
--- a/platform/stm32f7xx/eth.c
+++ b/platform/stm32f7xx/eth.c
@@ -48,12 +48,12 @@
  ******************************************************************************
  */
 
-#include <err.h>
-#include <debug.h>
+#include <lk/err.h>
+#include <lk/debug.h>
 #include <assert.h>
-#include <trace.h>
+#include <lk/trace.h>
 #include <target.h>
-#include <compiler.h>
+#include <lk/compiler.h>
 #include <stdlib.h>
 #include <string.h>
 #include <lib/gfx.h>
diff --git a/platform/stm32f7xx/flash.c b/platform/stm32f7xx/flash.c
index 7ffa9938..ebd1c215 100644
--- a/platform/stm32f7xx/flash.c
+++ b/platform/stm32f7xx/flash.c
@@ -20,11 +20,11 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <err.h>
+#include <lk/err.h>
 #include <string.h>
 #include <stdlib.h>
-#include <trace.h>
-#include <pow2.h>
+#include <lk/trace.h>
+#include <lk/pow2.h>
 #include <arch/ops.h>
 #include <lib/bio.h>
 #include <platform/stm32.h>
diff --git a/platform/stm32f7xx/gpio.c b/platform/stm32f7xx/gpio.c
index ac2a8a3e..1c243492 100644
--- a/platform/stm32f7xx/gpio.c
+++ b/platform/stm32f7xx/gpio.c
@@ -20,8 +20,8 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <debug.h>
-#include <err.h>
+#include <lk/debug.h>
+#include <lk/err.h>
 #include <assert.h>
 #include <dev/gpio.h>
 #include <platform/stm32.h>
diff --git a/platform/stm32f7xx/init.c b/platform/stm32f7xx/init.c
index e8ef5649..6b1f8914 100644
--- a/platform/stm32f7xx/init.c
+++ b/platform/stm32f7xx/init.c
@@ -20,10 +20,10 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <err.h>
-#include <debug.h>
+#include <lk/err.h>
+#include <lk/debug.h>
 #include <stdlib.h>
-#include <reg.h>
+#include <lk/reg.h>
 #include <dev/uart.h>
 #include <platform.h>
 #include <platform/stm32.h>
diff --git a/platform/stm32f7xx/qspi.c b/platform/stm32f7xx/qspi.c
index 1b20df3b..8208a688 100644
--- a/platform/stm32f7xx/qspi.c
+++ b/platform/stm32f7xx/qspi.c
@@ -20,8 +20,8 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <err.h>
-#include <pow2.h>
+#include <lk/err.h>
+#include <lk/pow2.h>
 #include <stdlib.h>
 #include <string.h>
 
@@ -34,7 +34,7 @@
 #include <platform/n25q128a.h>
 #include <platform/n25q512a.h>
 #include <platform/qspi.h>
-#include <trace.h>
+#include <lk/trace.h>
 
 #define LOCAL_TRACE 0
 
diff --git a/platform/stm32f7xx/sdram.c b/platform/stm32f7xx/sdram.c
index 521a4a3b..b0f1dfed 100644
--- a/platform/stm32f7xx/sdram.c
+++ b/platform/stm32f7xx/sdram.c
@@ -48,11 +48,11 @@
  ******************************************************************************
  */
 
-#include <err.h>
-#include <debug.h>
-#include <trace.h>
+#include <lk/err.h>
+#include <lk/debug.h>
+#include <lk/trace.h>
 #include <target.h>
-#include <compiler.h>
+#include <lk/compiler.h>
 #include <dev/gpio.h>
 #include <platform/stm32.h>
 #include <platform/sdram.h>
diff --git a/platform/stm32f7xx/timer.c b/platform/stm32f7xx/timer.c
index 027bb14a..3d8a3f64 100644
--- a/platform/stm32f7xx/timer.c
+++ b/platform/stm32f7xx/timer.c
@@ -20,9 +20,9 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <debug.h>
-#include <trace.h>
-#include <err.h>
+#include <lk/debug.h>
+#include <lk/trace.h>
+#include <lk/err.h>
 #include <sys/types.h>
 #include <kernel/thread.h>
 #include <platform.h>
diff --git a/platform/stm32f7xx/uart.c b/platform/stm32f7xx/uart.c
index 257cc3ec..658f02af 100644
--- a/platform/stm32f7xx/uart.c
+++ b/platform/stm32f7xx/uart.c
@@ -22,11 +22,11 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 #include <stdarg.h>
-#include <reg.h>
-#include <debug.h>
+#include <lk/reg.h>
+#include <lk/debug.h>
 #include <stdio.h>
 #include <assert.h>
-#include <err.h>
+#include <lk/err.h>
 #include <lib/cbuf.h>
 #include <kernel/thread.h>
 #include <platform/debug.h>
diff --git a/platform/stm32f7xx/usbc.c b/platform/stm32f7xx/usbc.c
index fd705ed7..3e60dcfd 100644
--- a/platform/stm32f7xx/usbc.c
+++ b/platform/stm32f7xx/usbc.c
@@ -20,14 +20,14 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <reg.h>
-#include <trace.h>
-#include <debug.h>
+#include <lk/reg.h>
+#include <lk/trace.h>
+#include <lk/debug.h>
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
 #include <assert.h>
-#include <err.h>
+#include <lk/err.h>
 #include <dev/usb.h>
 #include <dev/usbc.h>
 #include <arch/arm/cm.h>
diff --git a/platform/stm32f7xx/vectab.c b/platform/stm32f7xx/vectab.c
index 5ef68987..b9daf107 100644
--- a/platform/stm32f7xx/vectab.c
+++ b/platform/stm32f7xx/vectab.c
@@ -20,8 +20,8 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <debug.h>
-#include <compiler.h>
+#include <lk/debug.h>
+#include <lk/compiler.h>
 #include <arch/arm/cm.h>
 #include <platform/stm32.h>
 #include <target/debugconfig.h>
diff --git a/platform/zynq/clocks.c b/platform/zynq/clocks.c
index 8ed1dea5..852c64cf 100644
--- a/platform/zynq/clocks.c
+++ b/platform/zynq/clocks.c
@@ -20,17 +20,17 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <reg.h>
-#include <bits.h>
+#include <lk/reg.h>
+#include <lk/bits.h>
 #include <stdio.h>
 #include <assert.h>
-#include <trace.h>
-#include <err.h>
+#include <lk/trace.h>
+#include <lk/err.h>
 #include <kernel/thread.h>
 #include <platform/debug.h>
 #include <platform/zynq.h>
 #include <target/debugconfig.h>
-#include <reg.h>
+#include <lk/reg.h>
 
 #define LOCAL_TRACE 0
 
diff --git a/platform/zynq/debug.c b/platform/zynq/debug.c
index d9dbd857..d845ac3c 100644
--- a/platform/zynq/debug.c
+++ b/platform/zynq/debug.c
@@ -20,7 +20,7 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <reg.h>
+#include <lk/reg.h>
 #include <stdio.h>
 #include <kernel/thread.h>
 #include <dev/uart.h>
@@ -28,7 +28,7 @@
 #include <platform/debug.h>
 #include <platform/zynq.h>
 #include <target/debugconfig.h>
-#include <reg.h>
+#include <lk/reg.h>
 
 /* DEBUG_UART must be defined to 0 or 1 */
 #if defined(DEBUG_UART) && DEBUG_UART == 0
diff --git a/platform/zynq/fpga.c b/platform/zynq/fpga.c
index 3bddba1f..6af58367 100644
--- a/platform/zynq/fpga.c
+++ b/platform/zynq/fpga.c
@@ -22,9 +22,9 @@
  */
 
 #include <platform/fpga.h>
-#include <trace.h>
-#include <reg.h>
-#include <err.h>
+#include <lk/trace.h>
+#include <lk/reg.h>
+#include <lk/err.h>
 #include <platform.h>
 #include <kernel/thread.h>
 
diff --git a/platform/zynq/gem.c b/platform/zynq/gem.c
index 86ac7402..23c80c84 100644
--- a/platform/zynq/gem.c
+++ b/platform/zynq/gem.c
@@ -22,18 +22,18 @@
  */
 #include <assert.h>
 #include <lib/console.h>
-#include <debug.h>
-#include <list.h>
-#include <err.h>
+#include <lk/debug.h>
+#include <lk/list.h>
+#include <lk/err.h>
 #include <errno.h>
-#include <reg.h>
+#include <lk/reg.h>
 #include <endian.h>
 #include <stdio.h>
 #include <string.h>
 #include <malloc.h>
-#include <trace.h>
-#include <bits.h>
-#include <pow2.h>
+#include <lk/trace.h>
+#include <lk/bits.h>
+#include <lk/pow2.h>
 #include <sys/types.h>
 #include <lib/cbuf.h>
 #include <kernel/timer.h>
diff --git a/platform/zynq/gpio.c b/platform/zynq/gpio.c
index a942f212..94d55ce2 100644
--- a/platform/zynq/gpio.c
+++ b/platform/zynq/gpio.c
@@ -22,8 +22,8 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 #include <assert.h>
-#include <debug.h>
-#include <reg.h>
+#include <lk/debug.h>
+#include <lk/reg.h>
 #include <stdio.h>
 #include <string.h>
 #include <dev/gpio.h>
diff --git a/platform/zynq/include/platform/zynq.h b/platform/zynq/include/platform/zynq.h
index bd434333..a4f01bc2 100644
--- a/platform/zynq/include/platform/zynq.h
+++ b/platform/zynq/include/platform/zynq.h
@@ -112,9 +112,9 @@
 
 #ifndef ASSEMBLY
 
-#include <reg.h>
-#include <compiler.h>
-#include <bits.h>
+#include <lk/reg.h>
+#include <lk/compiler.h>
+#include <lk/bits.h>
 #include <stdbool.h>
 #include <sys/types.h>
 
diff --git a/platform/zynq/platform.c b/platform/zynq/platform.c
index 8166641f..1208e6b3 100644
--- a/platform/zynq/platform.c
+++ b/platform/zynq/platform.c
@@ -20,8 +20,8 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <err.h>
-#include <debug.h>
+#include <lk/err.h>
+#include <lk/debug.h>
 #include <stdio.h>
 #include <string.h>
 #include <arch/arm/mmu.h>
diff --git a/platform/zynq/qspi.c b/platform/zynq/qspi.c
index 77010526..e9364416 100644
--- a/platform/zynq/qspi.c
+++ b/platform/zynq/qspi.c
@@ -23,12 +23,12 @@
  */
 #include <dev/qspi.h>
 
-#include <debug.h>
+#include <lk/debug.h>
 #include <assert.h>
-#include <compiler.h>
+#include <lk/compiler.h>
 #include <printf.h>
 #include <string.h>
-#include <reg.h>
+#include <lk/reg.h>
 
 #include <lib/console.h>
 
diff --git a/platform/zynq/spiflash.c b/platform/zynq/spiflash.c
index ffcec663..15d98853 100644
--- a/platform/zynq/spiflash.c
+++ b/platform/zynq/spiflash.c
@@ -21,17 +21,17 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <debug.h>
+#include <lk/debug.h>
 #include <assert.h>
-#include <trace.h>
-#include <compiler.h>
+#include <lk/trace.h>
+#include <lk/compiler.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <err.h>
+#include <lk/err.h>
 #include <string.h>
 #include <rand.h>
-#include <reg.h>
-#include <pow2.h>
+#include <lk/reg.h>
+#include <lk/pow2.h>
 
 #include <lib/bio.h>
 #include <lib/console.h>
diff --git a/platform/zynq/start.S b/platform/zynq/start.S
index c97c5241..53e19a80 100644
--- a/platform/zynq/start.S
+++ b/platform/zynq/start.S
@@ -20,7 +20,7 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <asm.h>
+#include <lk/asm.h>
 #include <platform/zynq.h>
 
 /* code run at the very beginning of the system, attempting to trap the 2nd cpu */
diff --git a/platform/zynq/swdt.c b/platform/zynq/swdt.c
index 830c13f8..c89d89f2 100644
--- a/platform/zynq/swdt.c
+++ b/platform/zynq/swdt.c
@@ -20,9 +20,9 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <err.h>
-#include <debug.h>
-#include <trace.h>
+#include <lk/err.h>
+#include <lk/debug.h>
+#include <lk/trace.h>
 #include <stdio.h>
 #include <string.h>
 #include <lib/watchdog.h>
diff --git a/platform/zynq/timer.c b/platform/zynq/timer.c
index 17c1359f..0100b3d0 100644
--- a/platform/zynq/timer.c
+++ b/platform/zynq/timer.c
@@ -20,12 +20,12 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <debug.h>
+#include <lk/debug.h>
 #include <sys/types.h>
-#include <err.h>
+#include <lk/err.h>
 #include <stdio.h>
 #include <assert.h>
-#include <trace.h>
+#include <lk/trace.h>
 #include <kernel/thread.h>
 #include <platform.h>
 #include <platform/interrupts.h>
diff --git a/platform/zynq/uart.c b/platform/zynq/uart.c
index 531c051e..83746700 100644
--- a/platform/zynq/uart.c
+++ b/platform/zynq/uart.c
@@ -20,9 +20,9 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <reg.h>
+#include <lk/reg.h>
 #include <stdio.h>
-#include <trace.h>
+#include <lk/trace.h>
 #include <assert.h>
 #include <lib/cbuf.h>
 #include <kernel/thread.h>
diff --git a/target/dartuinoP0/init.c b/target/dartuinoP0/init.c
index 222eaffc..582762f2 100644
--- a/target/dartuinoP0/init.c
+++ b/target/dartuinoP0/init.c
@@ -20,12 +20,12 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <err.h>
+#include <lk/err.h>
 #include <stdlib.h>
-#include <debug.h>
-#include <trace.h>
+#include <lk/debug.h>
+#include <lk/trace.h>
 #include <target.h>
-#include <compiler.h>
+#include <lk/compiler.h>
 #include <dev/gpio.h>
 #include <dev/usb.h>
 #include <dev/accelerometer.h>
@@ -38,7 +38,7 @@
 #include <target/bmi055.h>
 #include <target/debugconfig.h>
 #include <target/gpioconfig.h>
-#include <reg.h>
+#include <lk/reg.h>
 
 #if ENABLE_LCD
 #include <target/memory_lcd.h>
diff --git a/target/dartuinoP0/memory_lcd.c b/target/dartuinoP0/memory_lcd.c
index b6f46986..eb0db869 100644
--- a/target/dartuinoP0/memory_lcd.c
+++ b/target/dartuinoP0/memory_lcd.c
@@ -21,9 +21,9 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include <err.h>
-#include <debug.h>
-#include <trace.h>
+#include <lk/err.h>
+#include <lk/debug.h>
+#include <lk/trace.h>
 #include <rand.h>
 #include <stdlib.h>
 #include <assert.h>
diff --git a/target/dartuinoP0/projects/bootloader/bootloader_stubs.c b/target/dartuinoP0/projects/bootloader/bootloader_stubs.c
index 117d9b15..4f3b63a8 100644
--- a/target/dartuinoP0/projects/bootloader/bootloader_stubs.c
+++ b/target/dartuinoP0/projects/bootloader/bootloader_stubs.c
@@ -27,7 +27,7 @@ static char bootloader_secondary_flash_name[] = "qspi-flash";
 static char bootloader_mount_point[] = "/spifs";
 
 #include <lib/fs.h>
-#include <err.h>
+#include <lk/err.h>
 #include <app/moot/stubs.h>
 #include <stdio.h>
 
diff --git a/target/dartuinoP0/sensor_bus.c b/target/dartuinoP0/sensor_bus.c
index 0e8060d5..d6651836 100644
--- a/target/dartuinoP0/sensor_bus.c
+++ b/target/dartuinoP0/sensor_bus.c
@@ -20,7 +20,7 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <err.h>
+#include <lk/err.h>
 #include <kernel/mutex.h>
 #include <platform/gpio.h>
 #include <target/gpioconfig.h>
diff --git a/target/dartuinoP0/usb.c b/target/dartuinoP0/usb.c
index bf340d88..3e35b08a 100644
--- a/target/dartuinoP0/usb.c
+++ b/target/dartuinoP0/usb.c
@@ -20,16 +20,16 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <compiler.h>
-#include <debug.h>
+#include <lk/compiler.h>
+#include <lk/debug.h>
 #include <dev/usb.h>
 #include <dev/usbc.h>
-#include <err.h>
+#include <lk/err.h>
 #include <hw/usb.h>
 #include <lk/init.h>
 #include <stdio.h>
 #include <target.h>
-#include <trace.h>
+#include <lk/trace.h>
 
 #define LOCAL_TRACE 0
 
diff --git a/target/init.c b/target/init.c
index 80470b63..72435199 100644
--- a/target/init.c
+++ b/target/init.c
@@ -20,10 +20,10 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <err.h>
-#include <debug.h>
+#include <lk/err.h>
+#include <lk/debug.h>
 #include <target.h>
-#include <compiler.h>
+#include <lk/compiler.h>
 
 /*
  * default implementations of these routines, if the target code
diff --git a/target/lm3s6965evb/init.c b/target/lm3s6965evb/init.c
index 39fd43f2..2ed995d9 100644
--- a/target/lm3s6965evb/init.c
+++ b/target/lm3s6965evb/init.c
@@ -20,10 +20,10 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <err.h>
-#include <debug.h>
+#include <lk/err.h>
+#include <lk/debug.h>
 #include <target.h>
-#include <compiler.h>
+#include <lk/compiler.h>
 #include <dev/gpio.h>
 #include <platform/gpio.h>
 
diff --git a/target/lpcexpresso1549/init.c b/target/lpcexpresso1549/init.c
index 79994cd3..badf4d93 100644
--- a/target/lpcexpresso1549/init.c
+++ b/target/lpcexpresso1549/init.c
@@ -20,10 +20,10 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <err.h>
-#include <debug.h>
+#include <lk/err.h>
+#include <lk/debug.h>
 #include <target.h>
-#include <compiler.h>
+#include <lk/compiler.h>
 #include <dev/gpio.h>
 #include <platform/gpio.h>
 
diff --git a/target/lpclink2/init.c b/target/lpclink2/init.c
index 063a9b18..a65a3edf 100644
--- a/target/lpclink2/init.c
+++ b/target/lpclink2/init.c
@@ -21,8 +21,8 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include <reg.h>
-#include <debug.h>
+#include <lk/reg.h>
+#include <lk/debug.h>
 #include <printf.h>
 #include <kernel/thread.h>
 
diff --git a/target/lpcxpresso4337/init.c b/target/lpcxpresso4337/init.c
index 8cd1a279..6cbbdc3c 100644
--- a/target/lpcxpresso4337/init.c
+++ b/target/lpcxpresso4337/init.c
@@ -21,8 +21,8 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include <reg.h>
-#include <debug.h>
+#include <lk/reg.h>
+#include <lk/debug.h>
 
 #include <platform/lpc43xx-gpio.h>
 
diff --git a/target/mt6735/init.c b/target/mt6735/init.c
index 19850e68..d2853044 100644
--- a/target/mt6735/init.c
+++ b/target/mt6735/init.c
@@ -20,8 +20,8 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <debug.h>
-#include <reg.h>
+#include <lk/debug.h>
+#include <lk/reg.h>
 #include <target.h>
 
 void target_early_init(void)
diff --git a/target/mt6797/init.c b/target/mt6797/init.c
index c8a5535e..0451172f 100644
--- a/target/mt6797/init.c
+++ b/target/mt6797/init.c
@@ -20,8 +20,8 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <debug.h>
-#include <reg.h>
+#include <lk/debug.h>
+#include <lk/reg.h>
 #include <target.h>
 
 void target_early_init(void)
diff --git a/target/nrf-pca10000/init.c b/target/nrf-pca10000/init.c
index e3497576..0780ff81 100644
--- a/target/nrf-pca10000/init.c
+++ b/target/nrf-pca10000/init.c
@@ -20,10 +20,10 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <err.h>
-#include <debug.h>
+#include <lk/err.h>
+#include <lk/debug.h>
 #include <target.h>
-#include <compiler.h>
+#include <lk/compiler.h>
 #include <dev/gpio.h>
 #include <kernel/timer.h>
 #include <platform/gpio.h>
diff --git a/target/nrf-pca10028/init.c b/target/nrf-pca10028/init.c
index 6ad61347..ac2a7ec2 100644
--- a/target/nrf-pca10028/init.c
+++ b/target/nrf-pca10028/init.c
@@ -20,10 +20,10 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <err.h>
-#include <debug.h>
+#include <lk/err.h>
+#include <lk/debug.h>
 #include <target.h>
-#include <compiler.h>
+#include <lk/compiler.h>
 #include <dev/gpio.h>
 #include <platform/gpio.h>
 #include <platform/nrf51.h>
diff --git a/target/nrf-pca10040/init.c b/target/nrf-pca10040/init.c
index 98d1b4ee..51dec542 100644
--- a/target/nrf-pca10040/init.c
+++ b/target/nrf-pca10040/init.c
@@ -20,10 +20,10 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <err.h>
-#include <debug.h>
+#include <lk/err.h>
+#include <lk/debug.h>
 #include <target.h>
-#include <compiler.h>
+#include <lk/compiler.h>
 #include <dev/gpio.h>
 #include <platform/gpio.h>
 #include <platform/nrf52.h>
diff --git a/target/nrf-pca10056/init.c b/target/nrf-pca10056/init.c
index f328f556..9ba3f447 100644
--- a/target/nrf-pca10056/init.c
+++ b/target/nrf-pca10056/init.c
@@ -20,10 +20,10 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <err.h>
-#include <debug.h>
+#include <lk/err.h>
+#include <lk/debug.h>
 #include <target.h>
-#include <compiler.h>
+#include <lk/compiler.h>
 #include <dev/gpio.h>
 #include <platform/gpio.h>
 #include <platform/nrf52.h>
diff --git a/target/nucleo-f072rb/init.c b/target/nucleo-f072rb/init.c
index 1544a1f2..fb2f6b6f 100644
--- a/target/nucleo-f072rb/init.c
+++ b/target/nucleo-f072rb/init.c
@@ -20,10 +20,10 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <err.h>
-#include <debug.h>
+#include <lk/err.h>
+#include <lk/debug.h>
 #include <target.h>
-#include <compiler.h>
+#include <lk/compiler.h>
 #include <dev/gpio.h>
 #include <dev/i2c.h>
 #include <lib/console.h>
diff --git a/target/nucleo-f072rb/usb.c b/target/nucleo-f072rb/usb.c
index 400824f0..9b3f4232 100644
--- a/target/nucleo-f072rb/usb.c
+++ b/target/nucleo-f072rb/usb.c
@@ -21,12 +21,12 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 #include <app/cdcserialtest/cdcserialtest.h>
-#include <err.h>
-#include <debug.h>
+#include <lk/err.h>
+#include <lk/debug.h>
 #include <stdio.h>
-#include <trace.h>
+#include <lk/trace.h>
 #include <target.h>
-#include <compiler.h>
+#include <lk/compiler.h>
 #include <dev/usb.h>
 #include <dev/usbc.h>
 #include <dev/usb/class/cdcserial.h>
diff --git a/target/pc-x86/config.c b/target/pc-x86/config.c
index 92b3998f..7107ddac 100644
--- a/target/pc-x86/config.c
+++ b/target/pc-x86/config.c
@@ -30,7 +30,7 @@
 #include <platform.h>
 #include <malloc.h>
 #include <string.h>
-#include <debug.h>
+#include <lk/debug.h>
 
 #if 0
 static const struct platform_uart_config uart0_config = {
diff --git a/target/qemu-m4/init.c b/target/qemu-m4/init.c
index c0bb36f7..081bcf5c 100644
--- a/target/qemu-m4/init.c
+++ b/target/qemu-m4/init.c
@@ -20,11 +20,11 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <err.h>
-#include <debug.h>
-#include <trace.h>
+#include <lk/err.h>
+#include <lk/debug.h>
+#include <lk/trace.h>
 #include <target.h>
-#include <compiler.h>
+#include <lk/compiler.h>
 #include <dev/gpio.h>
 #include <stm32f4xx_usart.h>
 #include <stm32f4xx_rcc.h>
diff --git a/target/qemu-m4/m4display.c b/target/qemu-m4/m4display.c
index ce60634b..d6c5ce23 100644
--- a/target/qemu-m4/m4display.c
+++ b/target/qemu-m4/m4display.c
@@ -24,8 +24,8 @@
 #include <target/m4display.h>
 
 #include <stdio.h>
-#include <trace.h>
-#include <err.h>
+#include <lk/trace.h>
+#include <lk/err.h>
 
 #include <stm32f4xx.h>
 #include <stm32f4xx_spi.h>
diff --git a/target/stellaris-launchpad/init.c b/target/stellaris-launchpad/init.c
index 9b29b3e9..03970d2f 100644
--- a/target/stellaris-launchpad/init.c
+++ b/target/stellaris-launchpad/init.c
@@ -20,10 +20,10 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <err.h>
-#include <debug.h>
+#include <lk/err.h>
+#include <lk/debug.h>
 #include <target.h>
-#include <compiler.h>
+#include <lk/compiler.h>
 #include <dev/gpio.h>
 #include <platform/gpio.h>
 
diff --git a/target/stellaris-launchpad/usb.c b/target/stellaris-launchpad/usb.c
index 78362e81..11ba2445 100644
--- a/target/stellaris-launchpad/usb.c
+++ b/target/stellaris-launchpad/usb.c
@@ -20,11 +20,11 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <err.h>
-#include <debug.h>
+#include <lk/err.h>
+#include <lk/debug.h>
 #include <stdio.h>
 #include <target.h>
-#include <compiler.h>
+#include <lk/compiler.h>
 #include <dev/usb.h>
 #include <hw/usb.h>
 #include <lk/init.h>
diff --git a/target/stm32-h103/init.c b/target/stm32-h103/init.c
index c62658d2..d178afce 100644
--- a/target/stm32-h103/init.c
+++ b/target/stm32-h103/init.c
@@ -20,10 +20,10 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <err.h>
-#include <debug.h>
+#include <lk/err.h>
+#include <lk/debug.h>
 #include <target.h>
-#include <compiler.h>
+#include <lk/compiler.h>
 #include <dev/gpio.h>
 #include <platform/gpio.h>
 #include <stm32f10x_usart.h>
diff --git a/target/stm32-p107/init.c b/target/stm32-p107/init.c
index 918c6478..fbcc11c8 100644
--- a/target/stm32-p107/init.c
+++ b/target/stm32-p107/init.c
@@ -20,11 +20,11 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <err.h>
-#include <debug.h>
-#include <trace.h>
+#include <lk/err.h>
+#include <lk/debug.h>
+#include <lk/trace.h>
 #include <target.h>
-#include <compiler.h>
+#include <lk/compiler.h>
 #include <dev/gpio.h>
 #include <stm32f10x_usart.h>
 #include <stm32f10x_rcc.h>
diff --git a/target/stm32-p407/init.c b/target/stm32-p407/init.c
index bdfdfa45..95e49edf 100644
--- a/target/stm32-p407/init.c
+++ b/target/stm32-p407/init.c
@@ -20,11 +20,11 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <err.h>
-#include <debug.h>
-#include <trace.h>
+#include <lk/err.h>
+#include <lk/debug.h>
+#include <lk/trace.h>
 #include <target.h>
-#include <compiler.h>
+#include <lk/compiler.h>
 #include <dev/gpio.h>
 #include <stm32f2xx_usart.h>
 #include <stm32f2xx_rcc.h>
diff --git a/target/stm3220g/init.c b/target/stm3220g/init.c
index aba36a2f..5680f07a 100644
--- a/target/stm3220g/init.c
+++ b/target/stm3220g/init.c
@@ -20,11 +20,11 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <err.h>
-#include <debug.h>
-#include <trace.h>
+#include <lk/err.h>
+#include <lk/debug.h>
+#include <lk/trace.h>
 #include <target.h>
-#include <compiler.h>
+#include <lk/compiler.h>
 #include <dev/gpio.h>
 #include <stm32f2xx_usart.h>
 #include <stm32f2xx_rcc.h>
diff --git a/target/stm32746g-eval2/init.c b/target/stm32746g-eval2/init.c
index 8c34e85c..bd1c23e4 100644
--- a/target/stm32746g-eval2/init.c
+++ b/target/stm32746g-eval2/init.c
@@ -20,12 +20,12 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <err.h>
+#include <lk/err.h>
 #include <stdlib.h>
-#include <debug.h>
-#include <trace.h>
+#include <lk/debug.h>
+#include <lk/trace.h>
 #include <target.h>
-#include <compiler.h>
+#include <lk/compiler.h>
 #include <lib/gfx.h>
 #include <dev/gpio.h>
 #include <platform/stm32.h>
@@ -36,7 +36,7 @@
 #include <platform/n25q512a.h>
 #include <target/debugconfig.h>
 #include <target/gpioconfig.h>
-#include <reg.h>
+#include <lk/reg.h>
 
 #if WITH_LIB_MINIP
 #include <lib/minip.h>
diff --git a/target/stm32746g-eval2/lcd.c b/target/stm32746g-eval2/lcd.c
index 940520fb..80727cfa 100644
--- a/target/stm32746g-eval2/lcd.c
+++ b/target/stm32746g-eval2/lcd.c
@@ -49,11 +49,11 @@
  */
 
 #include <assert.h>
-#include <err.h>
-#include <debug.h>
-#include <trace.h>
+#include <lk/err.h>
+#include <lk/debug.h>
+#include <lk/trace.h>
 #include <target.h>
-#include <compiler.h>
+#include <lk/compiler.h>
 #include <string.h>
 #include <dev/gpio.h>
 #include <dev/display.h>
diff --git a/target/stm32746g-eval2/sram.c b/target/stm32746g-eval2/sram.c
index fb52cfdd..c54f16b7 100644
--- a/target/stm32746g-eval2/sram.c
+++ b/target/stm32746g-eval2/sram.c
@@ -48,11 +48,11 @@
  ******************************************************************************
  */
 
-#include <err.h>
-#include <debug.h>
-#include <trace.h>
+#include <lk/err.h>
+#include <lk/debug.h>
+#include <lk/trace.h>
 #include <target.h>
-#include <compiler.h>
+#include <lk/compiler.h>
 #include <dev/gpio.h>
 #include <platform/stm32.h>
 
diff --git a/target/stm32f4-discovery/init.c b/target/stm32f4-discovery/init.c
index cd5d24b1..54dc06a2 100644
--- a/target/stm32f4-discovery/init.c
+++ b/target/stm32f4-discovery/init.c
@@ -20,11 +20,11 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <err.h>
-#include <debug.h>
-#include <trace.h>
+#include <lk/err.h>
+#include <lk/debug.h>
+#include <lk/trace.h>
 #include <target.h>
-#include <compiler.h>
+#include <lk/compiler.h>
 #include <dev/gpio.h>
 #include <stm32f4xx_usart.h>
 #include <stm32f4xx_rcc.h>
diff --git a/target/stm32f429i-disco/init.c b/target/stm32f429i-disco/init.c
index fa19d8b0..bc90052c 100644
--- a/target/stm32f429i-disco/init.c
+++ b/target/stm32f429i-disco/init.c
@@ -20,17 +20,17 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <err.h>
-#include <debug.h>
-#include <trace.h>
-#include <target.h>
-#include <compiler.h>
+#include <lk/err.h>
+#include <lk/debug.h>
+#include <lk/trace.h>
+#include <lk/compiler.h>
 #include <dev/gpio.h>
 #include <stm32f4xx_usart.h>
 #include <stm32f4xx_rcc.h>
 #include <stm32f4xx_gpio.h>
 #include <platform/stm32.h>
 #include <platform/gpio.h>
+#include <target.h>
 #include <target/debugconfig.h>
 #include <target/gpioconfig.h>
 
diff --git a/target/stm32f746g-disco/init.c b/target/stm32f746g-disco/init.c
index f311a262..039561b8 100644
--- a/target/stm32f746g-disco/init.c
+++ b/target/stm32f746g-disco/init.c
@@ -20,13 +20,13 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <err.h>
+#include <lk/err.h>
 #include <stdlib.h>
-#include <debug.h>
-#include <trace.h>
+#include <lk/debug.h>
+#include <lk/trace.h>
 #include <target.h>
-#include <compiler.h>
-#include <reg.h>
+#include <lk/compiler.h>
+#include <lk/reg.h>
 #include <dev/gpio.h>
 #include <dev/usb.h>
 #include <platform/stm32.h>
diff --git a/target/stm32f746g-disco/lcd.c b/target/stm32f746g-disco/lcd.c
index 780e75b6..2d0458ab 100644
--- a/target/stm32f746g-disco/lcd.c
+++ b/target/stm32f746g-disco/lcd.c
@@ -49,11 +49,11 @@
  */
 
 #include <assert.h>
-#include <err.h>
-#include <debug.h>
-#include <trace.h>
+#include <lk/err.h>
+#include <lk/debug.h>
+#include <lk/trace.h>
 #include <target.h>
-#include <compiler.h>
+#include <lk/compiler.h>
 #include <string.h>
 #include <dev/gpio.h>
 #include <dev/display.h>
diff --git a/target/stm32f746g-disco/usb.c b/target/stm32f746g-disco/usb.c
index d8d00b33..93dbe791 100644
--- a/target/stm32f746g-disco/usb.c
+++ b/target/stm32f746g-disco/usb.c
@@ -20,12 +20,12 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <err.h>
-#include <debug.h>
+#include <lk/err.h>
+#include <lk/debug.h>
 #include <stdio.h>
-#include <trace.h>
+#include <lk/trace.h>
 #include <target.h>
-#include <compiler.h>
+#include <lk/compiler.h>
 #include <dev/usb.h>
 #include <dev/usbc.h>
 #include <dev/usb/class/bulktest.h>
diff --git a/top/init.c b/top/init.c
index 72d33cea..728c88f6 100644
--- a/top/init.c
+++ b/top/init.c
@@ -30,9 +30,9 @@
 #include <lk/init.h>
 
 #include <assert.h>
-#include <compiler.h>
-#include <debug.h>
-#include <trace.h>
+#include <lk/compiler.h>
+#include <lk/debug.h>
+#include <lk/trace.h>
 
 #define LOCAL_TRACE 0
 #define TRACE_INIT (LK_DEBUGLEVEL >= 2)
diff --git a/top/main.c b/top/main.c
index 497853c4..79fed032 100644
--- a/top/main.c
+++ b/top/main.c
@@ -25,8 +25,8 @@
  * Main entry point to the OS. Initializes modules in order and creates
  * the default thread.
  */
-#include <compiler.h>
-#include <debug.h>
+#include <lk/compiler.h>
+#include <lk/debug.h>
 #include <string.h>
 #include <app.h>
 #include <arch.h>