diff --git a/drivers/adc/adc_dw.c b/drivers/adc/adc_dw.c
index cc36332b567..9186e68ced1 100644
--- a/drivers/adc/adc_dw.c
+++ b/drivers/adc/adc_dw.c
@@ -19,7 +19,7 @@
 #include <errno.h>
 
 #include <init.h>
-#include <nanokernel.h>
+#include <kernel.h>
 #include <string.h>
 #include <stdlib.h>
 #include <board.h>
diff --git a/drivers/clock_control/quark_se_clock_control.c b/drivers/clock_control/quark_se_clock_control.c
index 8eceba38283..e9fe613dae8 100644
--- a/drivers/clock_control/quark_se_clock_control.c
+++ b/drivers/clock_control/quark_se_clock_control.c
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include <arch/cpu.h>
 
 #include <misc/__assert.h>
diff --git a/drivers/console/ram_console.c b/drivers/console/ram_console.c
index ca6e36ef490..83db8d1a24a 100644
--- a/drivers/console/ram_console.c
+++ b/drivers/console/ram_console.c
@@ -17,7 +17,7 @@
  */
 
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include <misc/printk.h>
 #include <device.h>
 #include <init.h>
diff --git a/drivers/console/uart_pipe.c b/drivers/console/uart_pipe.c
index 4b6b2bdc17a..d8a48b647a5 100644
--- a/drivers/console/uart_pipe.c
+++ b/drivers/console/uart_pipe.c
@@ -21,7 +21,7 @@
  * limitations under the License.
  */
 
-#include <nanokernel.h>
+#include <kernel.h>
 
 #include <board.h>
 #include <uart.h>
diff --git a/drivers/flash/soc_flash_ksdk.c b/drivers/flash/soc_flash_ksdk.c
index b7a642d81bc..0e42b7f1bae 100644
--- a/drivers/flash/soc_flash_ksdk.c
+++ b/drivers/flash/soc_flash_ksdk.c
@@ -15,7 +15,7 @@
  */
 
 #include <misc/sys_log.h>
-#include <nanokernel.h>
+#include <kernel.h>
 #include <device.h>
 #include <string.h>
 #include <flash.h>
diff --git a/drivers/flash/soc_flash_nrf5.c b/drivers/flash/soc_flash_nrf5.c
index 71c89b6886a..143b20fc7f4 100644
--- a/drivers/flash/soc_flash_nrf5.c
+++ b/drivers/flash/soc_flash_nrf5.c
@@ -17,7 +17,7 @@
 
 #include <errno.h>
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include <device.h>
 #include <init.h>
 #include <soc.h>
diff --git a/drivers/gpio/gpio_atmel_sam3.c b/drivers/gpio/gpio_atmel_sam3.c
index cb16171e539..50f2c5914ad 100644
--- a/drivers/gpio/gpio_atmel_sam3.c
+++ b/drivers/gpio/gpio_atmel_sam3.c
@@ -20,7 +20,7 @@
 
 #include <errno.h>
 
-#include <nanokernel.h>
+#include <kernel.h>
 
 #include <device.h>
 #include <init.h>
diff --git a/drivers/gpio/gpio_cmsdk_ahb.c b/drivers/gpio/gpio_cmsdk_ahb.c
index 084ed57a7d6..95f7429a4d4 100644
--- a/drivers/gpio/gpio_cmsdk_ahb.c
+++ b/drivers/gpio/gpio_cmsdk_ahb.c
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <nanokernel.h>
+#include <kernel.h>
 
 #include <device.h>
 #include <errno.h>
diff --git a/drivers/gpio/gpio_dw.c b/drivers/gpio/gpio_dw.c
index 617ab635c1e..a3c55f25eaf 100644
--- a/drivers/gpio/gpio_dw.c
+++ b/drivers/gpio/gpio_dw.c
@@ -16,7 +16,7 @@
 
 #include <errno.h>
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include <gpio.h>
 #include "gpio_dw.h"
 #include "gpio_utils.h"
diff --git a/drivers/gpio/gpio_k64.c b/drivers/gpio/gpio_k64.c
index 4c836723c24..f964af28d4f 100644
--- a/drivers/gpio/gpio_k64.c
+++ b/drivers/gpio/gpio_k64.c
@@ -20,7 +20,7 @@
 
 #include <errno.h>
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include <device.h>
 #include <init.h>
 #include <gpio.h>
diff --git a/drivers/gpio/gpio_k64.h b/drivers/gpio/gpio_k64.h
index 9d41a4a5483..dab7f0ba3f4 100644
--- a/drivers/gpio/gpio_k64.h
+++ b/drivers/gpio/gpio_k64.h
@@ -21,7 +21,7 @@
 #ifndef _GPIO_K64_H_
 #define _GPIO_K64_H_
 
-#include <nanokernel.h>
+#include <kernel.h>
 
 #include <gpio.h>
 
diff --git a/drivers/gpio/gpio_nrf5.c b/drivers/gpio/gpio_nrf5.c
index 45660a01305..6bda91bee2a 100644
--- a/drivers/gpio/gpio_nrf5.c
+++ b/drivers/gpio/gpio_nrf5.c
@@ -20,7 +20,7 @@
 
 #include <errno.h>
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include <device.h>
 #include <init.h>
 #include <gpio.h>
diff --git a/drivers/gpio/gpio_stm32.c b/drivers/gpio/gpio_stm32.c
index 1437c2f30e1..afe4b79aa74 100644
--- a/drivers/gpio/gpio_stm32.c
+++ b/drivers/gpio/gpio_stm32.c
@@ -16,7 +16,7 @@
 
 #include <errno.h>
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include <device.h>
 #include <soc.h>
 #include <gpio.h>
diff --git a/drivers/grove/lcd_rgb.c b/drivers/grove/lcd_rgb.c
index 6938931cbe2..9bdf420c0ba 100644
--- a/drivers/grove/lcd_rgb.c
+++ b/drivers/grove/lcd_rgb.c
@@ -15,7 +15,7 @@
  */
 
 #include <errno.h>
-#include <nanokernel.h>
+#include <kernel.h>
 #include <init.h>
 #include <stdbool.h>
 
diff --git a/drivers/i2c/i2c_atmel_sam3.c b/drivers/i2c/i2c_atmel_sam3.c
index 35693251363..199d1513fd4 100644
--- a/drivers/i2c/i2c_atmel_sam3.c
+++ b/drivers/i2c/i2c_atmel_sam3.c
@@ -34,7 +34,7 @@
 
 #include <errno.h>
 
-#include <nanokernel.h>
+#include <kernel.h>
 
 #include <board.h>
 #include <i2c.h>
diff --git a/drivers/i2c/i2c_dw.c b/drivers/i2c/i2c_dw.c
index 70497a702f7..5bd83810b3a 100644
--- a/drivers/i2c/i2c_dw.c
+++ b/drivers/i2c/i2c_dw.c
@@ -21,7 +21,7 @@
 #include <stdbool.h>
 
 #include <i2c.h>
-#include <nanokernel.h>
+#include <kernel.h>
 #include <init.h>
 #include <arch/cpu.h>
 #include <string.h>
diff --git a/drivers/interrupt_controller/arcv2_irq_unit.c b/drivers/interrupt_controller/arcv2_irq_unit.c
index e68593910ea..5608c168141 100644
--- a/drivers/interrupt_controller/arcv2_irq_unit.c
+++ b/drivers/interrupt_controller/arcv2_irq_unit.c
@@ -25,9 +25,10 @@
  * interrupt unit. The ARCv2 interrupt unit is highly programmable.
  */
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include <arch/cpu.h>
 #include <board.h>
+
 extern void *_VectorTable;
 
 void _arc_v2_irq_unit_init(void)
diff --git a/drivers/interrupt_controller/i8259.c b/drivers/interrupt_controller/i8259.c
index 175d6ed9e6b..eb0613f8348 100644
--- a/drivers/interrupt_controller/i8259.c
+++ b/drivers/interrupt_controller/i8259.c
@@ -23,7 +23,7 @@
  */
 
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include <arch/cpu.h>
 #include <toolchain.h>
 #include <sections.h>
diff --git a/drivers/interrupt_controller/ioapic_intr.c b/drivers/interrupt_controller/ioapic_intr.c
index d7d11d2a578..44f32ec0f2d 100644
--- a/drivers/interrupt_controller/ioapic_intr.c
+++ b/drivers/interrupt_controller/ioapic_intr.c
@@ -60,7 +60,7 @@
  *
  */
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include <arch/cpu.h>
 
 #include "board.h"
diff --git a/drivers/interrupt_controller/loapic_intr.c b/drivers/interrupt_controller/loapic_intr.c
index 2d552a06ae4..7830fc4e403 100644
--- a/drivers/interrupt_controller/loapic_intr.c
+++ b/drivers/interrupt_controller/loapic_intr.c
@@ -87,7 +87,7 @@
  * INCLUDE FILES: loapic.h
  */
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include <arch/cpu.h>
 #include <stdint.h>
 #include <string.h>
diff --git a/drivers/interrupt_controller/mvic.c b/drivers/interrupt_controller/mvic.c
index e0628b6d063..ff23168c83b 100644
--- a/drivers/interrupt_controller/mvic.c
+++ b/drivers/interrupt_controller/mvic.c
@@ -42,7 +42,7 @@
 
 /* includes */
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include <arch/cpu.h>
 #include <misc/__assert.h>
 #include <misc/util.h>
diff --git a/drivers/interrupt_controller/system_apic.c b/drivers/interrupt_controller/system_apic.c
index 6c9921e1835..fc06f8e5536 100644
--- a/drivers/interrupt_controller/system_apic.c
+++ b/drivers/interrupt_controller/system_apic.c
@@ -22,7 +22,7 @@
 
 #include <misc/__assert.h>
 #include "board.h"
-#include <nanokernel.h>
+#include <kernel.h>
 #include <arch/cpu.h>
 #include <drivers/ioapic.h>
 #include <drivers/loapic.h>
diff --git a/drivers/ipm/ipm_quark_se.c b/drivers/ipm/ipm_quark_se.c
index 8d90bd61e5a..26e140f7826 100644
--- a/drivers/ipm/ipm_quark_se.c
+++ b/drivers/ipm/ipm_quark_se.c
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include <stdint.h>
 #include <string.h>
 #include <device.h>
diff --git a/drivers/ipm/ipm_quark_se.h b/drivers/ipm/ipm_quark_se.h
index f73433a3f1c..5c324066fda 100644
--- a/drivers/ipm/ipm_quark_se.h
+++ b/drivers/ipm/ipm_quark_se.h
@@ -20,7 +20,7 @@
 #ifndef __INCquark_se_mailboxh
 #define __INCquark_se_mailboxh
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include <board.h> /* for SCSS_REGISTER_BASE */
 #include <ipm.h>
 #include <device.h>
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 585d32e395c..9dace10fbff 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -79,7 +79,7 @@
  * That will work as long as there are relevant results found.
  */
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include <arch/cpu.h>
 #include <misc/printk.h>
 #include <toolchain.h>
diff --git a/drivers/pci/pci_config.c b/drivers/pci/pci_config.c
index 3a452e6e1ee..266cd0b0a46 100644
--- a/drivers/pci/pci_config.c
+++ b/drivers/pci/pci_config.c
@@ -23,7 +23,7 @@
  *
  */
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include <arch/cpu.h>
 
 #include <pci/pci_mgr.h>
diff --git a/drivers/pci/pci_interface.c b/drivers/pci/pci_interface.c
index 7ed0c168a71..6ae9679f498 100644
--- a/drivers/pci/pci_interface.c
+++ b/drivers/pci/pci_interface.c
@@ -22,7 +22,7 @@
  * This module implements the PCI H/W access functions.
  */
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include <arch/cpu.h>
 
 #include <pci/pci_mgr.h>
diff --git a/drivers/pci/pci_legacy_bridge.c b/drivers/pci/pci_legacy_bridge.c
index 2781178fc93..78cf81c344a 100644
--- a/drivers/pci/pci_legacy_bridge.c
+++ b/drivers/pci/pci_legacy_bridge.c
@@ -22,7 +22,7 @@
  * detection of the bridge and using the bridge to configure the routing between
  * PCI interrupt pins and IRQs.
  */
-#include <nanokernel.h>
+#include <kernel.h>
 #include <arch/cpu.h>
 
 #include <drivers/pci/pci_mgr.h>
diff --git a/drivers/pinmux/beetle/pinmux_board_v2m_beetle.c b/drivers/pinmux/beetle/pinmux_board_v2m_beetle.c
index d2a8d051403..fd236f28e0a 100644
--- a/drivers/pinmux/beetle/pinmux_board_v2m_beetle.c
+++ b/drivers/pinmux/beetle/pinmux_board_v2m_beetle.c
@@ -16,7 +16,7 @@
 
 #include <device.h>
 #include <init.h>
-#include <nanokernel.h>
+#include <kernel.h>
 #include <pinmux.h>
 #include <soc.h>
 #include <sys_io.h>
diff --git a/drivers/pinmux/dev/pinmux_dev_arm_beetle.c b/drivers/pinmux/dev/pinmux_dev_arm_beetle.c
index 2e58448e0d3..26bc1db3ddf 100644
--- a/drivers/pinmux/dev/pinmux_dev_arm_beetle.c
+++ b/drivers/pinmux/dev/pinmux_dev_arm_beetle.c
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include <nanokernel.h>
+#include <kernel.h>
 #include <board.h>
 
 #include <device.h>
diff --git a/drivers/pinmux/dev/pinmux_dev_atmel_sam3x.c b/drivers/pinmux/dev/pinmux_dev_atmel_sam3x.c
index d1442f07e35..dc4ca185dbe 100644
--- a/drivers/pinmux/dev/pinmux_dev_atmel_sam3x.c
+++ b/drivers/pinmux/dev/pinmux_dev_atmel_sam3x.c
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include <nanokernel.h>
+#include <kernel.h>
 #include <board.h>
 
 #include <device.h>
diff --git a/drivers/pinmux/dev/pinmux_dev_k64.c b/drivers/pinmux/dev/pinmux_dev_k64.c
index b8054400a1d..45334650931 100644
--- a/drivers/pinmux/dev/pinmux_dev_k64.c
+++ b/drivers/pinmux/dev/pinmux_dev_k64.c
@@ -18,7 +18,7 @@
 
 #include <device.h>
 #include <init.h>
-#include <nanokernel.h>
+#include <kernel.h>
 #include <pinmux.h>
 #include <soc.h>
 #include <sys_io.h>
diff --git a/drivers/pinmux/dev/pinmux_dev_stm32.c b/drivers/pinmux/dev/pinmux_dev_stm32.c
index e87325df159..3077d15c177 100644
--- a/drivers/pinmux/dev/pinmux_dev_stm32.c
+++ b/drivers/pinmux/dev/pinmux_dev_stm32.c
@@ -23,7 +23,7 @@
 
 #include <errno.h>
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include <device.h>
 #include <soc.h>
 #include "pinmux.h"
diff --git a/drivers/pinmux/k64/pinmux.c b/drivers/pinmux/k64/pinmux.c
index d56811b7201..01b86943193 100644
--- a/drivers/pinmux/k64/pinmux.c
+++ b/drivers/pinmux/k64/pinmux.c
@@ -18,7 +18,7 @@
 
 #include <errno.h>
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include <device.h>
 #include <init.h>
 #include <soc.h>
diff --git a/drivers/pinmux/k64/pinmux_board_frdm_k64f.c b/drivers/pinmux/k64/pinmux_board_frdm_k64f.c
index 5a219b522a5..1707f4e31c3 100644
--- a/drivers/pinmux/k64/pinmux_board_frdm_k64f.c
+++ b/drivers/pinmux/k64/pinmux_board_frdm_k64f.c
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include <device.h>
 #include <init.h>
 #include <sys_io.h>
diff --git a/drivers/pinmux/k64/pinmux_board_hexiwear.c b/drivers/pinmux/k64/pinmux_board_hexiwear.c
index 6de6ad681a5..6b0c9c61dcd 100644
--- a/drivers/pinmux/k64/pinmux_board_hexiwear.c
+++ b/drivers/pinmux/k64/pinmux_board_hexiwear.c
@@ -17,7 +17,7 @@
  * limitations under the License.
  */
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include <device.h>
 #include <init.h>
 #include <sys_io.h>
diff --git a/drivers/pinmux/stm32/pinmux_board_carbon.c b/drivers/pinmux/stm32/pinmux_board_carbon.c
index 5b901ceb52e..9da3fa130cb 100644
--- a/drivers/pinmux/stm32/pinmux_board_carbon.c
+++ b/drivers/pinmux/stm32/pinmux_board_carbon.c
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include <device.h>
 #include <init.h>
 #include <pinmux.h>
diff --git a/drivers/pinmux/stm32/pinmux_board_nucleo_f103rb.c b/drivers/pinmux/stm32/pinmux_board_nucleo_f103rb.c
index 694cd33d869..de38084549a 100644
--- a/drivers/pinmux/stm32/pinmux_board_nucleo_f103rb.c
+++ b/drivers/pinmux/stm32/pinmux_board_nucleo_f103rb.c
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include <device.h>
 #include <init.h>
 #include <pinmux.h>
diff --git a/drivers/pinmux/stm32/pinmux_board_nucleo_f401re.c b/drivers/pinmux/stm32/pinmux_board_nucleo_f401re.c
index 084101a9675..b87ae5d0082 100644
--- a/drivers/pinmux/stm32/pinmux_board_nucleo_f401re.c
+++ b/drivers/pinmux/stm32/pinmux_board_nucleo_f401re.c
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include <device.h>
 #include <init.h>
 #include <pinmux.h>
diff --git a/drivers/pinmux/stm32/pinmux_board_olimexino_stm32.c b/drivers/pinmux/stm32/pinmux_board_olimexino_stm32.c
index 79091d8adbe..447ab43a50a 100644
--- a/drivers/pinmux/stm32/pinmux_board_olimexino_stm32.c
+++ b/drivers/pinmux/stm32/pinmux_board_olimexino_stm32.c
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include <device.h>
 #include <init.h>
 #include <pinmux.h>
diff --git a/drivers/pinmux/stm32/pinmux_board_stm32_mini_a15.c b/drivers/pinmux/stm32/pinmux_board_stm32_mini_a15.c
index 58fc1ed2186..e0595cab79a 100644
--- a/drivers/pinmux/stm32/pinmux_board_stm32_mini_a15.c
+++ b/drivers/pinmux/stm32/pinmux_board_stm32_mini_a15.c
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include <device.h>
 #include <init.h>
 #include <pinmux.h>
diff --git a/drivers/pinmux/stm32/pinmux_stm32.c b/drivers/pinmux/stm32/pinmux_stm32.c
index 724c49bed2e..335920dd4ae 100644
--- a/drivers/pinmux/stm32/pinmux_stm32.c
+++ b/drivers/pinmux/stm32/pinmux_stm32.c
@@ -23,7 +23,7 @@
 
 #include <errno.h>
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include <device.h>
 #include <soc.h>
 #include "pinmux.h"
diff --git a/drivers/pwm/pwm_dw.c b/drivers/pwm/pwm_dw.c
index e67d2d9fad5..092150351f9 100644
--- a/drivers/pwm/pwm_dw.c
+++ b/drivers/pwm/pwm_dw.c
@@ -29,7 +29,7 @@
 
 #include <errno.h>
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include <board.h>
 #include <pwm.h>
 
diff --git a/drivers/pwm/pwm_k64_ftm.c b/drivers/pwm/pwm_k64_ftm.c
index 54f288649b0..d322deb28f5 100644
--- a/drivers/pwm/pwm_k64_ftm.c
+++ b/drivers/pwm/pwm_k64_ftm.c
@@ -47,7 +47,7 @@
 
 #include <errno.h>
 
-#include <nanokernel.h>
+#include <kernel.h>
 
 #include <board.h>
 #include <k20_sim.h>
diff --git a/drivers/pwm/pwm_pca9685.c b/drivers/pwm/pwm_pca9685.c
index e80bea02c5b..b586020e502 100644
--- a/drivers/pwm/pwm_pca9685.c
+++ b/drivers/pwm/pwm_pca9685.c
@@ -20,7 +20,7 @@
 
 #include <errno.h>
 
-#include <nanokernel.h>
+#include <kernel.h>
 
 #include <i2c.h>
 #include <pwm.h>
diff --git a/drivers/random/rand32_timer.c b/drivers/random/rand32_timer.c
index 635fe2c97f4..07b2a3a246e 100644
--- a/drivers/random/rand32_timer.c
+++ b/drivers/random/rand32_timer.c
@@ -26,7 +26,7 @@
 
 #include <drivers/rand32.h>
 #include <drivers/system_timer.h>
-#include <nanokernel.h>
+#include <kernel.h>
 #include <atomic.h>
 
 #if defined(__GNUC__)
diff --git a/drivers/random/rand32_timestamp.c b/drivers/random/rand32_timestamp.c
index f872d53f23c..2477f9a3991 100644
--- a/drivers/random/rand32_timestamp.c
+++ b/drivers/random/rand32_timestamp.c
@@ -24,7 +24,7 @@
  * provide a random number generator.
  */
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include <arch/cpu.h>
 #include <drivers/rand32.h>
 
diff --git a/drivers/sensor/bmi160/bmi160.c b/drivers/sensor/bmi160/bmi160.c
index 86ea1d6d9c0..99ea5197aaa 100644
--- a/drivers/sensor/bmi160/bmi160.c
+++ b/drivers/sensor/bmi160/bmi160.c
@@ -150,7 +150,7 @@ static int bmi160_pmu_set(struct device *dev, union bmi160_pmu_status *pmu_sts)
 		}
 
 		/*
-		 * Cannot use a nano timer here since this is called from the
+		 * Cannot use a timer here since this is called from the
 		 * init function and the timeouts were not initialized yet.
 		 */
 		k_busy_wait(cmds[i].delay_us);
diff --git a/drivers/serial/uart_altera_jtag.c b/drivers/serial/uart_altera_jtag.c
index c16956d85d8..75960586aac 100644
--- a/drivers/serial/uart_altera_jtag.c
+++ b/drivers/serial/uart_altera_jtag.c
@@ -15,7 +15,7 @@
  */
 
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include <arch/cpu.h>
 #include <uart.h>
 #include <sys_io.h>
diff --git a/drivers/serial/uart_atmel_sam3.c b/drivers/serial/uart_atmel_sam3.c
index 9616b310203..301a945c332 100644
--- a/drivers/serial/uart_atmel_sam3.c
+++ b/drivers/serial/uart_atmel_sam3.c
@@ -28,7 +28,7 @@
  * (used uart_stellaris.c as template)
  */
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include <arch/cpu.h>
 #include <misc/__assert.h>
 #include <board.h>
diff --git a/drivers/serial/uart_cc32xx.c b/drivers/serial/uart_cc32xx.c
index bcb14d52b1b..2b906eef7ac 100644
--- a/drivers/serial/uart_cc32xx.c
+++ b/drivers/serial/uart_cc32xx.c
@@ -16,7 +16,7 @@
 
 /* See www.ti.com/lit/pdf/swru367, section 6, for CC3200 UART info. */
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include <arch/cpu.h>
 #include <uart.h>
 
diff --git a/drivers/serial/uart_cmsdk_apb.c b/drivers/serial/uart_cmsdk_apb.c
index 5502951aac4..fdf6d3cdc99 100644
--- a/drivers/serial/uart_cmsdk_apb.c
+++ b/drivers/serial/uart_cmsdk_apb.c
@@ -20,7 +20,7 @@
  * UART has two wires for RX and TX, and does not provide CTS or RTS.
  */
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include <arch/cpu.h>
 #include <misc/__assert.h>
 #include <board.h>
diff --git a/drivers/serial/uart_k20.c b/drivers/serial/uart_k20.c
index 15caf3f6f0a..d2c1605da57 100644
--- a/drivers/serial/uart_k20.c
+++ b/drivers/serial/uart_k20.c
@@ -21,7 +21,7 @@
  * called to setup the port.
  */
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include <arch/cpu.h>
 #include <stdint.h>
 
diff --git a/drivers/serial/uart_nrf5.c b/drivers/serial/uart_nrf5.c
index 43562fe64dc..86dc856b65c 100644
--- a/drivers/serial/uart_nrf5.c
+++ b/drivers/serial/uart_nrf5.c
@@ -18,7 +18,7 @@
  * @brief Driver for Nordic Semiconductor nRF5X UART
  */
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include <arch/cpu.h>
 #include <misc/__assert.h>
 #include <board.h>
diff --git a/drivers/serial/uart_ns16550.c b/drivers/serial/uart_ns16550.c
index 937c047cf34..8469d4969fa 100644
--- a/drivers/serial/uart_ns16550.c
+++ b/drivers/serial/uart_ns16550.c
@@ -32,7 +32,7 @@
 
 #include <errno.h>
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include <arch/cpu.h>
 #include <stdint.h>
 
diff --git a/drivers/serial/uart_nsim.c b/drivers/serial/uart_nsim.c
index dcd99921566..f0f1a4369a3 100644
--- a/drivers/serial/uart_nsim.c
+++ b/drivers/serial/uart_nsim.c
@@ -16,7 +16,7 @@
 
 #include <errno.h>
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include <arch/cpu.h>
 #include <sections.h>
 #include <misc/__assert.h>
diff --git a/drivers/serial/uart_stellaris.c b/drivers/serial/uart_stellaris.c
index 2441e618dbc..99224a8ab51 100644
--- a/drivers/serial/uart_stellaris.c
+++ b/drivers/serial/uart_stellaris.c
@@ -26,7 +26,7 @@
  * and STDOUT_CONSOLE APIs.
  */
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include <arch/cpu.h>
 #include <misc/__assert.h>
 #include <board.h>
diff --git a/drivers/serial/uart_stm32.c b/drivers/serial/uart_stm32.c
index cde74d14fad..4ce5a15fecf 100644
--- a/drivers/serial/uart_stm32.c
+++ b/drivers/serial/uart_stm32.c
@@ -25,7 +25,7 @@
  *             transmitter (USART)
  */
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include <arch/cpu.h>
 #include <misc/__assert.h>
 #include <board.h>
diff --git a/drivers/shared_irq/shared_irq.c b/drivers/shared_irq/shared_irq.c
index b9ca77b5c15..e5de83936c7 100644
--- a/drivers/shared_irq/shared_irq.c
+++ b/drivers/shared_irq/shared_irq.c
@@ -16,7 +16,7 @@
 
 #include <errno.h>
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include <device.h>
 #include <shared_irq.h>
 #include <init.h>
diff --git a/drivers/spi/spi_dw.c b/drivers/spi/spi_dw.c
index 9110028e762..bebef9deaa6 100644
--- a/drivers/spi/spi_dw.c
+++ b/drivers/spi/spi_dw.c
@@ -18,7 +18,7 @@
 
 #include <errno.h>
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include <arch/cpu.h>
 
 #include <misc/__assert.h>
diff --git a/drivers/spi/spi_intel.c b/drivers/spi/spi_intel.c
index 77daecb6c9a..7629ce4a37c 100644
--- a/drivers/spi/spi_intel.c
+++ b/drivers/spi/spi_intel.c
@@ -18,7 +18,7 @@
 
 #include <errno.h>
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include <arch/cpu.h>
 
 #include <misc/__assert.h>
diff --git a/drivers/spi/spi_k64.c b/drivers/spi/spi_k64.c
index 7fb10ddafc5..a4223bbe40b 100644
--- a/drivers/spi/spi_k64.c
+++ b/drivers/spi/spi_k64.c
@@ -48,7 +48,7 @@
 
 #include <errno.h>
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include <arch/cpu.h>
 
 #include <misc/util.h>
diff --git a/drivers/timer/altera_avalon_timer.c b/drivers/timer/altera_avalon_timer.c
index 8062df953d9..cbf5c1500b1 100644
--- a/drivers/timer/altera_avalon_timer.c
+++ b/drivers/timer/altera_avalon_timer.c
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include <arch/cpu.h>
 #include <device.h>
 #include <system_timer.h>
diff --git a/drivers/timer/arcv2_timer0.c b/drivers/timer/arcv2_timer0.c
index 087d244bc58..ac527915877 100644
--- a/drivers/timer/arcv2_timer0.c
+++ b/drivers/timer/arcv2_timer0.c
@@ -51,7 +51,7 @@
  * @endinternal
  */
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include <arch/cpu.h>
 #include <toolchain.h>
 #include <sections.h>
diff --git a/drivers/timer/cortex_m_systick.c b/drivers/timer/cortex_m_systick.c
index 7de901a4af3..887b2a19d52 100644
--- a/drivers/timer/cortex_m_systick.c
+++ b/drivers/timer/cortex_m_systick.c
@@ -37,7 +37,7 @@
  * conjunction with a microkernel.
  */
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include <toolchain.h>
 #include <sections.h>
 #include <misc/__assert.h>
diff --git a/drivers/timer/hpet.c b/drivers/timer/hpet.c
index bd615940787..32297aeb74a 100644
--- a/drivers/timer/hpet.c
+++ b/drivers/timer/hpet.c
@@ -54,7 +54,7 @@
  * microkernel.
  */
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include <toolchain.h>
 #include <sections.h>
 #include <sys_clock.h>
diff --git a/drivers/timer/loapic_timer.c b/drivers/timer/loapic_timer.c
index d1884f16d5c..43336029c18 100644
--- a/drivers/timer/loapic_timer.c
+++ b/drivers/timer/loapic_timer.c
@@ -75,7 +75,7 @@
  * @endinternal
  */
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include <toolchain.h>
 #include <sections.h>
 #include <sys_clock.h>
diff --git a/drivers/timer/sys_clock_init.c b/drivers/timer/sys_clock_init.c
index 5b08ff689dc..83a9273ed64 100644
--- a/drivers/timer/sys_clock_init.c
+++ b/drivers/timer/sys_clock_init.c
@@ -28,7 +28,7 @@
  * processing any queued ticks.
  */
 
-#include <nanokernel.h>
+#include <kernel.h>
 #include <init.h>
 #include <drivers/system_timer.h>