diff --git a/arch/arc/core/fatal.c b/arch/arc/core/fatal.c
index 15bf65dce8b..46afcd6c179 100644
--- a/arch/arc/core/fatal.c
+++ b/arch/arc/core/fatal.c
@@ -16,7 +16,7 @@
 #include <offsets_short.h>
 #include <toolchain.h>
 #include <arch/cpu.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <logging/log_ctrl.h>
 
 /**
diff --git a/arch/arc/core/fault.c b/arch/arc/core/fault.c
index db08f48d03c..96eb1f463bb 100644
--- a/arch/arc/core/fault.c
+++ b/arch/arc/core/fault.c
@@ -17,7 +17,7 @@
 
 #include <kernel.h>
 #include <kernel_structs.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <exc_handle.h>
 #include <logging/log_ctrl.h>
 
diff --git a/arch/arc/core/irq_manage.c b/arch/arc/core/irq_manage.c
index 604d70898c9..23532f815dd 100644
--- a/arch/arc/core/irq_manage.c
+++ b/arch/arc/core/irq_manage.c
@@ -24,7 +24,7 @@
 #include <linker/sections.h>
 #include <sw_isr_table.h>
 #include <irq.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 
 /*
  * @brief Enable an interrupt line
diff --git a/arch/arc/core/sys_fatal_error_handler.c b/arch/arc/core/sys_fatal_error_handler.c
index cae259e91a3..d6ef108986d 100644
--- a/arch/arc/core/sys_fatal_error_handler.c
+++ b/arch/arc/core/sys_fatal_error_handler.c
@@ -15,7 +15,7 @@
 #include <toolchain.h>
 #include <linker/sections.h>
 #include <kernel_structs.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 
 /**
  *
diff --git a/arch/arm/core/cortex_m/exc_manage.c b/arch/arm/core/cortex_m/exc_manage.c
index 7e2c2a13402..69fec16b43f 100644
--- a/arch/arm/core/cortex_m/exc_manage.c
+++ b/arch/arm/core/cortex_m/exc_manage.c
@@ -12,7 +12,7 @@
 #include <arch/cpu.h>
 #include <inttypes.h>
 
-#include <misc/printk.h>
+#include <sys/printk.h>
 void sys_exc_esf_dump(NANO_ESF *esf)
 {
 	printk("r0/a1:  0x%08x  ", esf->basic.a1);
diff --git a/arch/arm/core/cortex_m/nmi.c b/arch/arm/core/cortex_m/nmi.c
index 42a9f4c4bc6..4066d84d976 100644
--- a/arch/arm/core/cortex_m/nmi.c
+++ b/arch/arm/core/cortex_m/nmi.c
@@ -15,7 +15,7 @@
 
 #include <kernel.h>
 #include <arch/cpu.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <misc/reboot.h>
 #include <toolchain.h>
 #include <linker/sections.h>
diff --git a/arch/arm/core/fatal.c b/arch/arm/core/fatal.c
index 64ce0e4a934..f9a0ba2f6b5 100644
--- a/arch/arm/core/fatal.c
+++ b/arch/arm/core/fatal.c
@@ -17,7 +17,7 @@
 
 #include <kernel.h>
 #include <kernel_structs.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <logging/log_ctrl.h>
 
 /**
diff --git a/arch/arm/core/fault.c b/arch/arm/core/fault.c
index 3a151510b9f..22f1ed19aac 100644
--- a/arch/arm/core/fault.c
+++ b/arch/arm/core/fault.c
@@ -21,7 +21,7 @@
 #include <logging/log_ctrl.h>
 
 #ifdef CONFIG_PRINTK
-#include <misc/printk.h>
+#include <sys/printk.h>
 #define PR_EXC(...) printk(__VA_ARGS__)
 #define STORE_xFAR(reg_var, reg) u32_t reg_var = (u32_t)reg
 #else
diff --git a/arch/arm/core/sys_fatal_error_handler.c b/arch/arm/core/sys_fatal_error_handler.c
index 9873eb1e066..b0678281017 100644
--- a/arch/arm/core/sys_fatal_error_handler.c
+++ b/arch/arm/core/sys_fatal_error_handler.c
@@ -16,7 +16,7 @@
 #include <toolchain.h>
 #include <linker/sections.h>
 #include <kernel_structs.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 
 /**
  *
diff --git a/arch/nios2/core/fatal.c b/arch/nios2/core/fatal.c
index 58eb2b17d2b..7ed330142d4 100644
--- a/arch/nios2/core/fatal.c
+++ b/arch/nios2/core/fatal.c
@@ -7,7 +7,7 @@
 #include <kernel.h>
 #include <arch/cpu.h>
 #include <kernel_structs.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <inttypes.h>
 #include <logging/log_ctrl.h>
 
diff --git a/arch/nios2/core/irq_manage.c b/arch/nios2/core/irq_manage.c
index 2b764db2cf6..c142ebb4a24 100644
--- a/arch/nios2/core/irq_manage.c
+++ b/arch/nios2/core/irq_manage.c
@@ -15,7 +15,7 @@
 #include <kernel_structs.h>
 #include <arch/cpu.h>
 #include <irq.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <sw_isr_table.h>
 #include <ksched.h>
 #include <kswap.h>
diff --git a/arch/posix/core/fatal.c b/arch/posix/core/fatal.c
index c13ae627e2a..f04ece148cd 100644
--- a/arch/posix/core/fatal.c
+++ b/arch/posix/core/fatal.c
@@ -8,7 +8,7 @@
 #include <kernel.h>
 #include <arch/cpu.h>
 #include <kernel_structs.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <inttypes.h>
 #include <logging/log_ctrl.h>
 #include "posix_soc_if.h"
diff --git a/arch/riscv32/core/fatal.c b/arch/riscv32/core/fatal.c
index fd78b09276b..b37ae29f0db 100644
--- a/arch/riscv32/core/fatal.c
+++ b/arch/riscv32/core/fatal.c
@@ -7,7 +7,7 @@
 #include <kernel.h>
 #include <kernel_structs.h>
 #include <inttypes.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <logging/log_ctrl.h>
 
 const NANO_ESF _default_esf = {
diff --git a/arch/riscv32/core/irq_manage.c b/arch/riscv32/core/irq_manage.c
index 3006e1f2e2c..6157b73b600 100644
--- a/arch/riscv32/core/irq_manage.c
+++ b/arch/riscv32/core/irq_manage.c
@@ -6,7 +6,7 @@
 
 #include <toolchain.h>
 #include <kernel_structs.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 
 void z_irq_spurious(void *unused)
 {
diff --git a/arch/riscv32/core/irq_offload.c b/arch/riscv32/core/irq_offload.c
index b85d172a1d3..9e44cd9ec59 100644
--- a/arch/riscv32/core/irq_offload.c
+++ b/arch/riscv32/core/irq_offload.c
@@ -6,7 +6,7 @@
 
 #include <irq.h>
 #include <irq_offload.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 
 volatile irq_offload_routine_t _offload_routine;
 static volatile void *offload_param;
diff --git a/arch/x86/core/ia32/fatal.c b/arch/x86/core/ia32/fatal.c
index 3862f481308..1ca700c9035 100644
--- a/arch/x86/core/ia32/fatal.c
+++ b/arch/x86/core/ia32/fatal.c
@@ -16,7 +16,7 @@
 
 #include <kernel.h>
 #include <kernel_structs.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <arch/x86/irq_controller.h>
 #include <arch/x86/segmentation.h>
 #include <exception.h>
diff --git a/arch/x86/core/ia32/irq_manage.c b/arch/x86/core/ia32/irq_manage.c
index b8965495aab..5bb0f34a312 100644
--- a/arch/x86/core/ia32/irq_manage.c
+++ b/arch/x86/core/ia32/irq_manage.c
@@ -18,7 +18,7 @@
 #include <arch/cpu.h>
 #include <kernel_structs.h>
 #include <sys/__assert.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <irq.h>
 #include <debug/tracing.h>
 #include <kswap.h>
diff --git a/arch/x86/core/ia32/sys_fatal_error_handler.c b/arch/x86/core/ia32/sys_fatal_error_handler.c
index e78a98c9b4b..93bd510be30 100644
--- a/arch/x86/core/ia32/sys_fatal_error_handler.c
+++ b/arch/x86/core/ia32/sys_fatal_error_handler.c
@@ -16,7 +16,7 @@
 #include <toolchain.h>
 #include <linker/sections.h>
 #include <kernel_structs.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <logging/log_ctrl.h>
 
 /**
diff --git a/arch/x86/core/ia32/thread.c b/arch/x86/core/ia32/thread.c
index 2dc1683cc42..d5d92d9f9c5 100644
--- a/arch/x86/core/ia32/thread.c
+++ b/arch/x86/core/ia32/thread.c
@@ -21,7 +21,7 @@
 #include <kernel_structs.h>
 #include <wait_q.h>
 #include <mmustructs.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 
 /* forward declaration */
 
diff --git a/arch/xtensa/core/fatal.c b/arch/xtensa/core/fatal.c
index 57845a4e0f5..2469c157d8e 100644
--- a/arch/xtensa/core/fatal.c
+++ b/arch/xtensa/core/fatal.c
@@ -8,7 +8,7 @@
 #include <kernel_structs.h>
 #include <inttypes.h>
 #include <kernel_arch_data.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <xtensa/specreg.h>
 #include <logging/log_ctrl.h>
 
diff --git a/arch/xtensa/core/thread.c b/arch/xtensa/core/thread.c
index f62aecdc9d5..06ee316a354 100644
--- a/arch/xtensa/core/thread.c
+++ b/arch/xtensa/core/thread.c
@@ -7,7 +7,7 @@
 #include <string.h>
 #endif /* CONFIG_INIT_STACKS */
 #ifdef CONFIG_DEBUG
-#include <misc/printk.h>
+#include <sys/printk.h>
 #endif
 #include <kernel_structs.h>
 #include <wait_q.h>
diff --git a/arch/xtensa/core/xtensa-asm2.c b/arch/xtensa/core/xtensa-asm2.c
index c60acdba9e5..447694038ff 100644
--- a/arch/xtensa/core/xtensa-asm2.c
+++ b/arch/xtensa/core/xtensa-asm2.c
@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <string.h>
 #include <xtensa-asm2.h>
 #include <kernel.h>
diff --git a/boards/arm/efm32hg_slstk3400a/board.c b/boards/arm/efm32hg_slstk3400a/board.c
index d4c6f95391e..24f102c2cb3 100644
--- a/boards/arm/efm32hg_slstk3400a/board.c
+++ b/boards/arm/efm32hg_slstk3400a/board.c
@@ -7,7 +7,7 @@
 #include <init.h>
 #include "board.h"
 #include <drivers/gpio.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 
 static int efm32hg_slstk3400a_init(struct device *dev)
 {
diff --git a/boards/arm/efm32pg_stk3402a/board.c b/boards/arm/efm32pg_stk3402a/board.c
index e4bc5ba6268..c3b0518ee74 100644
--- a/boards/arm/efm32pg_stk3402a/board.c
+++ b/boards/arm/efm32pg_stk3402a/board.c
@@ -7,7 +7,7 @@
 #include <init.h>
 #include "board.h"
 #include <drivers/gpio.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 
 static int efm32pg_stk3402a_init(struct device *dev)
 {
diff --git a/boards/arm/efm32wg_stk3800/board.c b/boards/arm/efm32wg_stk3800/board.c
index 79deb059d22..16915fb345c 100644
--- a/boards/arm/efm32wg_stk3800/board.c
+++ b/boards/arm/efm32wg_stk3800/board.c
@@ -7,7 +7,7 @@
 #include <init.h>
 #include "board.h"
 #include <drivers/gpio.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 
 static int efm32wg_stk3800_init(struct device *dev)
 {
diff --git a/boards/arm/efr32_slwstk6061a/board.c b/boards/arm/efr32_slwstk6061a/board.c
index ebc89373b01..aa723c1960c 100644
--- a/boards/arm/efr32_slwstk6061a/board.c
+++ b/boards/arm/efr32_slwstk6061a/board.c
@@ -7,7 +7,7 @@
 #include <init.h>
 #include "board.h"
 #include <drivers/gpio.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 
 static int efr32_slwstk6061a_init(struct device *dev)
 {
diff --git a/boards/arm/nrf52_pca20020/board.c b/boards/arm/nrf52_pca20020/board.c
index 10b58b2364f..4de76762c50 100644
--- a/boards/arm/nrf52_pca20020/board.c
+++ b/boards/arm/nrf52_pca20020/board.c
@@ -6,7 +6,7 @@
 
 #include <init.h>
 #include <drivers/gpio.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 
 #define VDD_PWR_CTRL_GPIO_PIN 30
 #define CCS_VDD_PWR_CTRL_GPIO_PIN 10
diff --git a/drivers/bluetooth/hci/h5.c b/drivers/bluetooth/hci/h5.c
index 9f293424d85..4b6f0c61f34 100644
--- a/drivers/bluetooth/hci/h5.c
+++ b/drivers/bluetooth/hci/h5.c
@@ -16,7 +16,7 @@
 #include <misc/util.h>
 #include <sys/byteorder.h>
 #include <misc/stack.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <string.h>
 
 #include <bluetooth/bluetooth.h>
diff --git a/drivers/bluetooth/hci/spi.c b/drivers/bluetooth/hci/spi.c
index c598b33e824..a04d776a18f 100644
--- a/drivers/bluetooth/hci/spi.c
+++ b/drivers/bluetooth/hci/spi.c
@@ -76,7 +76,7 @@ static K_THREAD_STACK_DEFINE(spi_rx_stack, 256);
 static struct k_thread spi_rx_thread_data;
 
 #if defined(CONFIG_BT_DEBUG_HCI_DRIVER)
-#include <misc/printk.h>
+#include <sys/printk.h>
 static inline void spi_dump_message(const u8_t *pre, u8_t *buf,
 				    u8_t size)
 {
diff --git a/drivers/console/ipm_console_receiver.c b/drivers/console/ipm_console_receiver.c
index aea4a81f3b3..c584fa971a0 100644
--- a/drivers/console/ipm_console_receiver.c
+++ b/drivers/console/ipm_console_receiver.c
@@ -10,7 +10,7 @@
 
 #include <kernel.h>
 #include <sys/ring_buffer.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <stdio.h>
 #include <drivers/ipm.h>
 #include <console/ipm_console.h>
diff --git a/drivers/console/ipm_console_sender.c b/drivers/console/ipm_console_sender.c
index 1b24a23265c..49a196e7380 100644
--- a/drivers/console/ipm_console_sender.c
+++ b/drivers/console/ipm_console_sender.c
@@ -9,7 +9,7 @@
 #include <errno.h>
 
 #include <kernel.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <drivers/ipm.h>
 #include <console/ipm_console.h>
 
diff --git a/drivers/console/ram_console.c b/drivers/console/ram_console.c
index 308df468b07..d568f50f18a 100644
--- a/drivers/console/ram_console.c
+++ b/drivers/console/ram_console.c
@@ -8,7 +8,7 @@
 
 
 #include <kernel.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <device.h>
 #include <init.h>
 
diff --git a/drivers/console/rtt_console.c b/drivers/console/rtt_console.c
index 764b0a287f0..fe2d57ac749 100644
--- a/drivers/console/rtt_console.c
+++ b/drivers/console/rtt_console.c
@@ -10,7 +10,7 @@
 
 
 #include <kernel.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <device.h>
 #include <init.h>
 #include <SEGGER_RTT.h>
diff --git a/drivers/console/uart_console.c b/drivers/console/uart_console.c
index 35c37ba7e95..aa21f33b587 100644
--- a/drivers/console/uart_console.c
+++ b/drivers/console/uart_console.c
@@ -29,7 +29,7 @@
 #include <toolchain.h>
 #include <linker/sections.h>
 #include <sys/atomic.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #ifdef CONFIG_UART_CONSOLE_MCUMGR
 #include "mgmt/serial.h"
 #endif
diff --git a/drivers/console/uart_pipe.c b/drivers/console/uart_pipe.c
index cdd90514140..1c0522d88ed 100644
--- a/drivers/console/uart_pipe.c
+++ b/drivers/console/uart_pipe.c
@@ -19,7 +19,7 @@ LOG_MODULE_REGISTER(uart_pipe, CONFIG_UART_CONSOLE_LOG_LEVEL);
 #include <drivers/uart.h>
 
 #include <console/uart_pipe.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 
 static struct device *uart_pipe_dev;
 
diff --git a/drivers/display/mb_display.c b/drivers/display/mb_display.c
index 6cf25d75b5a..81bd160a9bf 100644
--- a/drivers/display/mb_display.c
+++ b/drivers/display/mb_display.c
@@ -16,7 +16,7 @@
 #include <drivers/gpio.h>
 #include <device.h>
 #include <string.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 
 #include <display/mb_display.h>
 
diff --git a/drivers/entropy/entropy_stm32.c b/drivers/entropy/entropy_stm32.c
index c13859dcb33..a6f0eef75b3 100644
--- a/drivers/entropy/entropy_stm32.c
+++ b/drivers/entropy/entropy_stm32.c
@@ -13,7 +13,7 @@
 #include <misc/util.h>
 #include <errno.h>
 #include <soc.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <drivers/clock_control.h>
 #include <clock_control/stm32_clock_control.h>
 
diff --git a/drivers/ethernet/eth_stm32_hal.c b/drivers/ethernet/eth_stm32_hal.c
index f7dc1448eec..124f518a3d6 100644
--- a/drivers/ethernet/eth_stm32_hal.c
+++ b/drivers/ethernet/eth_stm32_hal.c
@@ -20,7 +20,7 @@ LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 #include <net/ethernet.h>
 #include <ethernet/eth_stats.h>
 #include <soc.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <drivers/clock_control.h>
 #include <clock_control/stm32_clock_control.h>
 
diff --git a/drivers/gpio/gpio_shell.c b/drivers/gpio/gpio_shell.c
index c3ca66ffa43..e1fa551a85c 100644
--- a/drivers/gpio/gpio_shell.c
+++ b/drivers/gpio/gpio_shell.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <shell/shell.h>
 #include <init.h>
 #include <string.h>
diff --git a/drivers/hwinfo/hwinfo_shell.c b/drivers/hwinfo/hwinfo_shell.c
index 5b3daba9bf7..7ac7e2b3781 100644
--- a/drivers/hwinfo/hwinfo_shell.c
+++ b/drivers/hwinfo/hwinfo_shell.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <shell/shell.h>
 #include <drivers/hwinfo.h>
 #include <zephyr/types.h>
diff --git a/drivers/ipm/ipm_quark_se.c b/drivers/ipm/ipm_quark_se.c
index 59bd9c3ecdb..0c0c9a53ca0 100644
--- a/drivers/ipm/ipm_quark_se.c
+++ b/drivers/ipm/ipm_quark_se.c
@@ -13,7 +13,7 @@
 #include <init.h>
 #include <drivers/ipm.h>
 #include <arch/cpu.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <sys/__assert.h>
 #include <errno.h>
 #include "ipm_quark_se.h"
diff --git a/drivers/modem/modem_shell.c b/drivers/modem/modem_shell.c
index 1337b201f3d..0a20351c93f 100644
--- a/drivers/modem/modem_shell.c
+++ b/drivers/modem/modem_shell.c
@@ -18,7 +18,7 @@
 #include <device.h>
 #include <shell/shell.h>
 
-#include <misc/printk.h>
+#include <sys/printk.h>
 
 #include "modem_receiver.h"
 
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 0ea3d14fd98..21b07474539 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -73,7 +73,7 @@
 
 #include <kernel.h>
 #include <arch/cpu.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <toolchain.h>
 #include <linker/sections.h>
 
diff --git a/drivers/sensor/adxl372/adxl372.c b/drivers/sensor/adxl372/adxl372.c
index 1dc502bdc1a..171c26f8cbd 100644
--- a/drivers/sensor/adxl372/adxl372.c
+++ b/drivers/sensor/adxl372/adxl372.c
@@ -9,7 +9,7 @@
 #include <drivers/sensor.h>
 #include <init.h>
 #include <drivers/gpio.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <sys/__assert.h>
 #include <stdlib.h>
 #include <drivers/spi.h>
diff --git a/drivers/watchdog/wdt_cmsdk_apb.c b/drivers/watchdog/wdt_cmsdk_apb.c
index 69b60264de8..99863a53c1f 100644
--- a/drivers/watchdog/wdt_cmsdk_apb.c
+++ b/drivers/watchdog/wdt_cmsdk_apb.c
@@ -11,7 +11,7 @@
 #include <errno.h>
 #include <soc.h>
 #include <drivers/watchdog.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <misc/reboot.h>
 
 struct wdog_cmsdk_apb {
diff --git a/drivers/wifi/eswifi/eswifi_core.c b/drivers/wifi/eswifi/eswifi_core.c
index 459f272dbd9..13c9fb5e5ca 100644
--- a/drivers/wifi/eswifi/eswifi_core.c
+++ b/drivers/wifi/eswifi/eswifi_core.c
@@ -27,7 +27,7 @@ LOG_MODULE_REGISTER(wifi_eswifi_core);
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <misc/printk.h>
+#include <sys/printk.h>
 
 #include "eswifi.h"
 
diff --git a/drivers/wifi/winc1500/wifi_winc1500.c b/drivers/wifi/winc1500/wifi_winc1500.c
index 9cf60800443..87ecf7d5b00 100644
--- a/drivers/wifi/winc1500/wifi_winc1500.c
+++ b/drivers/wifi/winc1500/wifi_winc1500.c
@@ -22,7 +22,7 @@ LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 #include <net/net_offload.h>
 #include <net/wifi_mgmt.h>
 
-#include <misc/printk.h>
+#include <sys/printk.h>
 
 /* We do not need <socket/include/socket.h>
  * It seems there is a bug in ASF side: if OS is already defining sockaddr
diff --git a/include/bluetooth/bluetooth.h b/include/bluetooth/bluetooth.h
index 02b2119de74..2de2eeaf3ea 100644
--- a/include/bluetooth/bluetooth.h
+++ b/include/bluetooth/bluetooth.h
@@ -19,7 +19,7 @@
 
 #include <stdbool.h>
 #include <string.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <misc/util.h>
 #include <net/buf.h>
 #include <bluetooth/hci.h>
diff --git a/include/kernel_includes.h b/include/kernel_includes.h
index 5829b6b2812..2a68322fef0 100644
--- a/include/kernel_includes.h
+++ b/include/kernel_includes.h
@@ -30,7 +30,7 @@
 #include <random/rand32.h>
 #include <kernel_arch_thread.h>
 #include <syscall.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <arch/cpu.h>
 #include <misc/rb.h>
 #include <sys_clock.h>
diff --git a/include/misc/printk.h b/include/misc/printk.h
index 947a608c6a4..c4a9516926a 100644
--- a/include/misc/printk.h
+++ b/include/misc/printk.h
@@ -1,94 +1,15 @@
-/* printk.h - low-level debug output */
-
 /*
- * Copyright (c) 2010-2012, 2014 Wind River Systems, Inc.
+ * Copyright (c) 2019 Intel Corporation
  *
  * SPDX-License-Identifier: Apache-2.0
  */
 #ifndef ZEPHYR_INCLUDE_MISC_PRINTK_H_
 #define ZEPHYR_INCLUDE_MISC_PRINTK_H_
 
-#include <toolchain.h>
-#include <stddef.h>
-#include <stdarg.h>
-#include <inttypes.h>
-
-#ifdef __cplusplus
-extern "C" {
+#ifndef CONFIG_COMPAT_INCLUDES
+#warning "This header file has moved, include <sys/printk.h> instead."
 #endif
 
-/**
- *
- * @brief Print kernel debugging message.
- *
- * This routine prints a kernel debugging message to the system console.
- * Output is send immediately, without any mutual exclusion or buffering.
- *
- * A basic set of conversion specifier characters are supported:
- *   - signed decimal: \%d, \%i
- *   - unsigned decimal: \%u
- *   - unsigned hexadecimal: \%x (\%X is treated as \%x)
- *   - pointer: \%p
- *   - string: \%s
- *   - character: \%c
- *   - percent: \%\%
- *
- * Field width (with or without leading zeroes) is supported.
- * Length attributes h, hh, l, ll and z are supported. However, integral
- * values with %lld and %lli are only printed if they fit in a long
- * otherwise 'ERR' is printed. Full 64-bit values may be printed with %llx.
- * Flags and precision attributes are not supported.
- *
- * @param fmt Format string.
- * @param ... Optional list of format arguments.
- *
- * @return N/A
- */
-#ifdef CONFIG_PRINTK
-extern __printf_like(1, 2) void printk(const char *fmt, ...);
-extern __printf_like(1, 0) void vprintk(const char *fmt, va_list ap);
-extern __printf_like(3, 4) int snprintk(char *str, size_t size,
-					const char *fmt, ...);
-extern __printf_like(3, 0) int vsnprintk(char *str, size_t size,
-					  const char *fmt, va_list ap);
+#include <sys/printk.h>
 
-extern __printf_like(3, 0) void z_vprintk(int (*out)(int f, void *c), void *ctx,
-					 const char *fmt, va_list ap);
-#else
-static inline __printf_like(1, 2) void printk(const char *fmt, ...)
-{
-	ARG_UNUSED(fmt);
-}
-
-static inline __printf_like(1, 0) void vprintk(const char *fmt, va_list ap)
-{
-	ARG_UNUSED(fmt);
-	ARG_UNUSED(ap);
-}
-
-static inline __printf_like(3, 4) int snprintk(char *str, size_t size,
-					       const char *fmt, ...)
-{
-	ARG_UNUSED(str);
-	ARG_UNUSED(size);
-	ARG_UNUSED(fmt);
-	return 0;
-}
-
-static inline __printf_like(3, 0) int vsnprintk(char *str, size_t size,
-						const char *fmt, va_list ap)
-{
-	ARG_UNUSED(str);
-	ARG_UNUSED(size);
-	ARG_UNUSED(fmt);
-	ARG_UNUSED(ap);
-
-	return 0;
-}
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
+#endif /* ZEPHYR_INCLUDE_MISC_PRINTK_H_ */
diff --git a/include/sys/__assert.h b/include/sys/__assert.h
index 0a4810612e1..a8fc93961cd 100644
--- a/include/sys/__assert.h
+++ b/include/sys/__assert.h
@@ -80,7 +80,7 @@
 #endif
 
 #if __ASSERT_ON
-#include <misc/printk.h>
+#include <sys/printk.h>
 void assert_post_action(const char *file, unsigned int line);
 
 #define __ASSERT_LOC(test)                               \
diff --git a/include/sys/printk.h b/include/sys/printk.h
new file mode 100644
index 00000000000..7ce40d740c0
--- /dev/null
+++ b/include/sys/printk.h
@@ -0,0 +1,94 @@
+/* printk.h - low-level debug output */
+
+/*
+ * Copyright (c) 2010-2012, 2014 Wind River Systems, Inc.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+#ifndef ZEPHYR_INCLUDE_SYS_PRINTK_H_
+#define ZEPHYR_INCLUDE_SYS_PRINTK_H_
+
+#include <toolchain.h>
+#include <stddef.h>
+#include <stdarg.h>
+#include <inttypes.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ *
+ * @brief Print kernel debugging message.
+ *
+ * This routine prints a kernel debugging message to the system console.
+ * Output is send immediately, without any mutual exclusion or buffering.
+ *
+ * A basic set of conversion specifier characters are supported:
+ *   - signed decimal: \%d, \%i
+ *   - unsigned decimal: \%u
+ *   - unsigned hexadecimal: \%x (\%X is treated as \%x)
+ *   - pointer: \%p
+ *   - string: \%s
+ *   - character: \%c
+ *   - percent: \%\%
+ *
+ * Field width (with or without leading zeroes) is supported.
+ * Length attributes h, hh, l, ll and z are supported. However, integral
+ * values with %lld and %lli are only printed if they fit in a long
+ * otherwise 'ERR' is printed. Full 64-bit values may be printed with %llx.
+ * Flags and precision attributes are not supported.
+ *
+ * @param fmt Format string.
+ * @param ... Optional list of format arguments.
+ *
+ * @return N/A
+ */
+#ifdef CONFIG_PRINTK
+extern __printf_like(1, 2) void printk(const char *fmt, ...);
+extern __printf_like(1, 0) void vprintk(const char *fmt, va_list ap);
+extern __printf_like(3, 4) int snprintk(char *str, size_t size,
+					const char *fmt, ...);
+extern __printf_like(3, 0) int vsnprintk(char *str, size_t size,
+					  const char *fmt, va_list ap);
+
+extern __printf_like(3, 0) void z_vprintk(int (*out)(int f, void *c), void *ctx,
+					 const char *fmt, va_list ap);
+#else
+static inline __printf_like(1, 2) void printk(const char *fmt, ...)
+{
+	ARG_UNUSED(fmt);
+}
+
+static inline __printf_like(1, 0) void vprintk(const char *fmt, va_list ap)
+{
+	ARG_UNUSED(fmt);
+	ARG_UNUSED(ap);
+}
+
+static inline __printf_like(3, 4) int snprintk(char *str, size_t size,
+					       const char *fmt, ...)
+{
+	ARG_UNUSED(str);
+	ARG_UNUSED(size);
+	ARG_UNUSED(fmt);
+	return 0;
+}
+
+static inline __printf_like(3, 0) int vsnprintk(char *str, size_t size,
+						const char *fmt, va_list ap)
+{
+	ARG_UNUSED(str);
+	ARG_UNUSED(size);
+	ARG_UNUSED(fmt);
+	ARG_UNUSED(ap);
+
+	return 0;
+}
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/kernel/include/syscall_handler.h b/kernel/include/syscall_handler.h
index 13fb35206d6..a477c9e7874 100644
--- a/kernel/include/syscall_handler.h
+++ b/kernel/include/syscall_handler.h
@@ -12,7 +12,7 @@
 
 #ifndef _ASMLANGUAGE
 #include <kernel.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <sys/math_extras.h>
 #include <kernel_internal.h>
 #include <stdbool.h>
diff --git a/kernel/init.c b/kernel/init.c
index 28a118baf02..b90445ada33 100644
--- a/kernel/init.c
+++ b/kernel/init.c
@@ -14,7 +14,7 @@
 #include <zephyr.h>
 #include <offsets_short.h>
 #include <kernel.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <misc/stack.h>
 #include <random/rand32.h>
 #include <linker/sections.h>
diff --git a/kernel/thread.c b/kernel/thread.c
index a3605114e39..9fa8adcb9aa 100644
--- a/kernel/thread.c
+++ b/kernel/thread.c
@@ -18,7 +18,7 @@
 
 #include <spinlock.h>
 #include <kernel_structs.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <sys/math_extras.h>
 #include <sys_clock.h>
 #include <drivers/timer/system_timer.h>
diff --git a/kernel/userspace.c b/kernel/userspace.c
index 1aaf787e171..a9f2bbeb493 100644
--- a/kernel/userspace.c
+++ b/kernel/userspace.c
@@ -8,7 +8,7 @@
 #include <kernel.h>
 #include <string.h>
 #include <sys/math_extras.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <misc/rb.h>
 #include <kernel_structs.h>
 #include <sys/sys_io.h>
diff --git a/lib/os/json.c b/lib/os/json.c
index 8860b607762..f6dcb6ed8bf 100644
--- a/lib/os/json.c
+++ b/lib/os/json.c
@@ -8,7 +8,7 @@
 #include <ctype.h>
 #include <errno.h>
 #include <limits.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <misc/util.h>
 #include <stdbool.h>
 #include <stdlib.h>
diff --git a/lib/os/printk.c b/lib/os/printk.c
index 867cd7f74db..183763c5ab0 100644
--- a/lib/os/printk.c
+++ b/lib/os/printk.c
@@ -13,7 +13,7 @@
  */
 
 #include <kernel.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <stdarg.h>
 #include <toolchain.h>
 #include <linker/sections.h>
diff --git a/lib/posix/timer.c b/lib/posix/timer.c
index e0a52b870ad..e6d5c506322 100644
--- a/lib/posix/timer.c
+++ b/lib/posix/timer.c
@@ -6,7 +6,7 @@
 #include <kernel.h>
 #include <errno.h>
 #include <string.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <posix/time.h>
 
 #define ACTIVE 1
diff --git a/samples/application_development/code_relocation/src/main.c b/samples/application_development/code_relocation/src/main.c
index ec0dfeee74c..a167a8240e8 100644
--- a/samples/application_development/code_relocation/src/main.c
+++ b/samples/application_development/code_relocation/src/main.c
@@ -6,7 +6,7 @@
 
 #include <zephyr.h>
 #include <kernel.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 
 
 /* This function will allow execute from sram region.
diff --git a/samples/application_development/code_relocation/src/test_file1.c b/samples/application_development/code_relocation/src/test_file1.c
index e7e867fc2e1..9184beaddad 100644
--- a/samples/application_development/code_relocation/src/test_file1.c
+++ b/samples/application_development/code_relocation/src/test_file1.c
@@ -5,7 +5,7 @@
  */
 
 #include <zephyr.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 
 u32_t var_sram2_data = 10U;
 u32_t var_sram2_bss;
diff --git a/samples/application_development/code_relocation/src/test_file2.c b/samples/application_development/code_relocation/src/test_file2.c
index 78ef063bb6d..d2a55b6fac7 100644
--- a/samples/application_development/code_relocation/src/test_file2.c
+++ b/samples/application_development/code_relocation/src/test_file2.c
@@ -5,7 +5,7 @@
  */
 
 #include <zephyr.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 
 void function_in_sram(s32_t value)
 {
diff --git a/samples/application_development/code_relocation/src/test_file3.c b/samples/application_development/code_relocation/src/test_file3.c
index 75edffa5039..688ddd5df44 100644
--- a/samples/application_development/code_relocation/src/test_file3.c
+++ b/samples/application_development/code_relocation/src/test_file3.c
@@ -5,7 +5,7 @@
  */
 
 #include <zephyr.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 
 u32_t var_file3_sram_data = 10U;
 u32_t var_file3_sram2_bss;
diff --git a/samples/application_development/out_of_tree_board/src/main.c b/samples/application_development/out_of_tree_board/src/main.c
index 04bd688f5f3..30cf683391a 100644
--- a/samples/application_development/out_of_tree_board/src/main.c
+++ b/samples/application_development/out_of_tree_board/src/main.c
@@ -5,7 +5,7 @@
  */
 
 #include <zephyr.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 
 void main(void)
 {
diff --git a/samples/basic/blink_led/src/main.c b/samples/basic/blink_led/src/main.c
index 11bf493c5ec..92a14597e3c 100644
--- a/samples/basic/blink_led/src/main.c
+++ b/samples/basic/blink_led/src/main.c
@@ -11,7 +11,7 @@
  */
 
 #include <zephyr.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <device.h>
 #include <drivers/pwm.h>
 
diff --git a/samples/basic/button/src/main.c b/samples/basic/button/src/main.c
index 900c7204c63..d443571f0a7 100644
--- a/samples/basic/button/src/main.c
+++ b/samples/basic/button/src/main.c
@@ -8,7 +8,7 @@
 #include <device.h>
 #include <drivers/gpio.h>
 #include <misc/util.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 
 /* change this to use another GPIO port */
 #ifndef SW0_GPIO_CONTROLLER
diff --git a/samples/basic/fade_led/src/main.c b/samples/basic/fade_led/src/main.c
index f0254dbcba8..2bcc1878851 100644
--- a/samples/basic/fade_led/src/main.c
+++ b/samples/basic/fade_led/src/main.c
@@ -11,7 +11,7 @@
  */
 
 #include <zephyr.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <device.h>
 #include <drivers/pwm.h>
 
diff --git a/samples/basic/rgb_led/src/main.c b/samples/basic/rgb_led/src/main.c
index baeba2223af..58cd9d9e97c 100644
--- a/samples/basic/rgb_led/src/main.c
+++ b/samples/basic/rgb_led/src/main.c
@@ -11,7 +11,7 @@
  */
 
 #include <zephyr.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <device.h>
 #include <drivers/pwm.h>
 
diff --git a/samples/basic/servo_motor/src/main.c b/samples/basic/servo_motor/src/main.c
index b013a6442d4..ab309f8f87b 100644
--- a/samples/basic/servo_motor/src/main.c
+++ b/samples/basic/servo_motor/src/main.c
@@ -11,7 +11,7 @@
  */
 
 #include <zephyr.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <device.h>
 #include <drivers/pwm.h>
 
diff --git a/samples/basic/threads/src/main.c b/samples/basic/threads/src/main.c
index b0d2c2b86e1..816b60402fe 100644
--- a/samples/basic/threads/src/main.c
+++ b/samples/basic/threads/src/main.c
@@ -7,7 +7,7 @@
 #include <zephyr.h>
 #include <device.h>
 #include <drivers/gpio.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <sys/__assert.h>
 #include <string.h>
 
diff --git a/samples/bluetooth/beacon/src/main.c b/samples/bluetooth/beacon/src/main.c
index e1d25c82944..feb19728aea 100644
--- a/samples/bluetooth/beacon/src/main.c
+++ b/samples/bluetooth/beacon/src/main.c
@@ -8,7 +8,7 @@
 
 #include <zephyr/types.h>
 #include <stddef.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <misc/util.h>
 
 #include <bluetooth/bluetooth.h>
diff --git a/samples/bluetooth/central/src/main.c b/samples/bluetooth/central/src/main.c
index c93bcb9e229..ec5a703ce4d 100644
--- a/samples/bluetooth/central/src/main.c
+++ b/samples/bluetooth/central/src/main.c
@@ -10,7 +10,7 @@
 #include <stddef.h>
 #include <errno.h>
 #include <zephyr.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 
 #include <bluetooth/bluetooth.h>
 #include <bluetooth/hci.h>
diff --git a/samples/bluetooth/central_hr/src/main.c b/samples/bluetooth/central_hr/src/main.c
index 7231f40c76b..db503167b11 100644
--- a/samples/bluetooth/central_hr/src/main.c
+++ b/samples/bluetooth/central_hr/src/main.c
@@ -10,7 +10,7 @@
 #include <stddef.h>
 #include <errno.h>
 #include <zephyr.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 
 #include <bluetooth/bluetooth.h>
 #include <bluetooth/hci.h>
diff --git a/samples/bluetooth/eddystone/src/main.c b/samples/bluetooth/eddystone/src/main.c
index a65971a64b2..a19ef286c06 100644
--- a/samples/bluetooth/eddystone/src/main.c
+++ b/samples/bluetooth/eddystone/src/main.c
@@ -10,7 +10,7 @@
 #include <stddef.h>
 #include <string.h>
 #include <errno.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <misc/util.h>
 #include <sys/byteorder.h>
 #include <zephyr.h>
diff --git a/samples/bluetooth/gatt/bas.c b/samples/bluetooth/gatt/bas.c
index 6cf02796249..b1cd9810b3e 100644
--- a/samples/bluetooth/gatt/bas.c
+++ b/samples/bluetooth/gatt/bas.c
@@ -12,7 +12,7 @@
 #include <stddef.h>
 #include <string.h>
 #include <errno.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <sys/byteorder.h>
 #include <zephyr.h>
 
diff --git a/samples/bluetooth/gatt/cts.c b/samples/bluetooth/gatt/cts.c
index 1404b456173..3cc40ba52b8 100644
--- a/samples/bluetooth/gatt/cts.c
+++ b/samples/bluetooth/gatt/cts.c
@@ -12,7 +12,7 @@
 #include <stddef.h>
 #include <string.h>
 #include <errno.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <sys/byteorder.h>
 #include <zephyr.h>
 
diff --git a/samples/bluetooth/gatt/hog.c b/samples/bluetooth/gatt/hog.c
index 793dabcd5f8..4f40bfe619f 100644
--- a/samples/bluetooth/gatt/hog.c
+++ b/samples/bluetooth/gatt/hog.c
@@ -12,7 +12,7 @@
 #include <stddef.h>
 #include <string.h>
 #include <errno.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <sys/byteorder.h>
 #include <zephyr.h>
 
diff --git a/samples/bluetooth/gatt/hrs.c b/samples/bluetooth/gatt/hrs.c
index 4baca1c3af4..2a4b1907c83 100644
--- a/samples/bluetooth/gatt/hrs.c
+++ b/samples/bluetooth/gatt/hrs.c
@@ -12,7 +12,7 @@
 #include <stddef.h>
 #include <string.h>
 #include <errno.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <sys/byteorder.h>
 #include <zephyr.h>
 
diff --git a/samples/bluetooth/gatt/ipss.c b/samples/bluetooth/gatt/ipss.c
index 36f08c139e7..bb48dee390f 100644
--- a/samples/bluetooth/gatt/ipss.c
+++ b/samples/bluetooth/gatt/ipss.c
@@ -12,7 +12,7 @@
 #include <stddef.h>
 #include <string.h>
 #include <errno.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <sys/byteorder.h>
 #include <zephyr.h>
 
diff --git a/samples/bluetooth/handsfree/src/main.c b/samples/bluetooth/handsfree/src/main.c
index 897800af219..ff92be2e7bb 100644
--- a/samples/bluetooth/handsfree/src/main.c
+++ b/samples/bluetooth/handsfree/src/main.c
@@ -10,7 +10,7 @@
 #include <stddef.h>
 #include <string.h>
 #include <errno.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <sys/byteorder.h>
 #include <zephyr.h>
 
diff --git a/samples/bluetooth/hci_usb/src/main.c b/samples/bluetooth/hci_usb/src/main.c
index 90fd79b9aa4..35aabdcd488 100644
--- a/samples/bluetooth/hci_usb/src/main.c
+++ b/samples/bluetooth/hci_usb/src/main.c
@@ -5,7 +5,7 @@
  */
 
 #include <zephyr.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 
 void main(void)
 {
diff --git a/samples/bluetooth/ibeacon/src/main.c b/samples/bluetooth/ibeacon/src/main.c
index 8872bec1cc7..008ea73881e 100644
--- a/samples/bluetooth/ibeacon/src/main.c
+++ b/samples/bluetooth/ibeacon/src/main.c
@@ -6,7 +6,7 @@
 
 #include <zephyr/types.h>
 #include <stddef.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <misc/util.h>
 
 #include <bluetooth/bluetooth.h>
diff --git a/samples/bluetooth/mesh/src/main.c b/samples/bluetooth/mesh/src/main.c
index 86ebe2300ae..ee8fbe33422 100644
--- a/samples/bluetooth/mesh/src/main.c
+++ b/samples/bluetooth/mesh/src/main.c
@@ -6,7 +6,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <misc/printk.h>
+#include <sys/printk.h>
 
 #include <settings/settings.h>
 
diff --git a/samples/bluetooth/mesh_demo/src/main.c b/samples/bluetooth/mesh_demo/src/main.c
index 7c0e82e21be..f1e169761e9 100644
--- a/samples/bluetooth/mesh_demo/src/main.c
+++ b/samples/bluetooth/mesh_demo/src/main.c
@@ -6,7 +6,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <misc/printk.h>
+#include <sys/printk.h>
 
 #include <settings/settings.h>
 
diff --git a/samples/bluetooth/mesh_demo/src/microbit.c b/samples/bluetooth/mesh_demo/src/microbit.c
index a717ac6a566..164ea340600 100644
--- a/samples/bluetooth/mesh_demo/src/microbit.c
+++ b/samples/bluetooth/mesh_demo/src/microbit.c
@@ -9,7 +9,7 @@
 #include <drivers/gpio.h>
 #include <board.h>
 #include <soc.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <ctype.h>
 #include <drivers/gpio.h>
 #include <drivers/pwm.h>
diff --git a/samples/bluetooth/peripheral/src/main.c b/samples/bluetooth/peripheral/src/main.c
index 02368defba5..108d4533a77 100644
--- a/samples/bluetooth/peripheral/src/main.c
+++ b/samples/bluetooth/peripheral/src/main.c
@@ -10,7 +10,7 @@
 #include <stddef.h>
 #include <string.h>
 #include <errno.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <sys/byteorder.h>
 #include <zephyr.h>
 
diff --git a/samples/bluetooth/peripheral_csc/src/main.c b/samples/bluetooth/peripheral_csc/src/main.c
index ee42be752db..66270a226f1 100644
--- a/samples/bluetooth/peripheral_csc/src/main.c
+++ b/samples/bluetooth/peripheral_csc/src/main.c
@@ -11,7 +11,7 @@
 #include <stddef.h>
 #include <string.h>
 #include <errno.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <sys/byteorder.h>
 #include <zephyr.h>
 
diff --git a/samples/bluetooth/peripheral_dis/src/main.c b/samples/bluetooth/peripheral_dis/src/main.c
index 511d34caa8a..b84e985d920 100644
--- a/samples/bluetooth/peripheral_dis/src/main.c
+++ b/samples/bluetooth/peripheral_dis/src/main.c
@@ -10,7 +10,7 @@
 #include <stddef.h>
 #include <string.h>
 #include <errno.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <sys/byteorder.h>
 #include <zephyr.h>
 
diff --git a/samples/bluetooth/peripheral_esp/src/main.c b/samples/bluetooth/peripheral_esp/src/main.c
index 3a44949927e..5b008abfc5c 100644
--- a/samples/bluetooth/peripheral_esp/src/main.c
+++ b/samples/bluetooth/peripheral_esp/src/main.c
@@ -11,7 +11,7 @@
 #include <stddef.h>
 #include <string.h>
 #include <errno.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <sys/byteorder.h>
 #include <zephyr.h>
 
diff --git a/samples/bluetooth/peripheral_hids/src/main.c b/samples/bluetooth/peripheral_hids/src/main.c
index f38d7f6516d..b997828b6a0 100644
--- a/samples/bluetooth/peripheral_hids/src/main.c
+++ b/samples/bluetooth/peripheral_hids/src/main.c
@@ -10,7 +10,7 @@
 #include <stddef.h>
 #include <string.h>
 #include <errno.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <sys/byteorder.h>
 #include <zephyr.h>
 
diff --git a/samples/bluetooth/peripheral_hr/src/main.c b/samples/bluetooth/peripheral_hr/src/main.c
index 733dd04e803..76f7759b637 100644
--- a/samples/bluetooth/peripheral_hr/src/main.c
+++ b/samples/bluetooth/peripheral_hr/src/main.c
@@ -10,7 +10,7 @@
 #include <stddef.h>
 #include <string.h>
 #include <errno.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <sys/byteorder.h>
 #include <zephyr.h>
 
diff --git a/samples/bluetooth/peripheral_sc_only/src/main.c b/samples/bluetooth/peripheral_sc_only/src/main.c
index 78e177545d2..2c13b23856a 100644
--- a/samples/bluetooth/peripheral_sc_only/src/main.c
+++ b/samples/bluetooth/peripheral_sc_only/src/main.c
@@ -10,7 +10,7 @@
 #include <stddef.h>
 #include <string.h>
 #include <errno.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <sys/byteorder.h>
 #include <zephyr.h>
 
diff --git a/samples/bluetooth/scan_adv/src/main.c b/samples/bluetooth/scan_adv/src/main.c
index f752d43618d..66c3bf866ab 100644
--- a/samples/bluetooth/scan_adv/src/main.c
+++ b/samples/bluetooth/scan_adv/src/main.c
@@ -8,7 +8,7 @@
 
 #include <zephyr/types.h>
 #include <stddef.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <misc/util.h>
 
 #include <bluetooth/bluetooth.h>
diff --git a/samples/boards/96b_argonkey/microphone/src/main.c b/samples/boards/96b_argonkey/microphone/src/main.c
index 763acf00117..1f2dca1dc96 100644
--- a/samples/boards/96b_argonkey/microphone/src/main.c
+++ b/samples/boards/96b_argonkey/microphone/src/main.c
@@ -6,7 +6,7 @@
 
 #include <string.h>
 #include <zephyr.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 
 #include <drivers/gpio.h>
 #include <drivers/led.h>
diff --git a/samples/boards/96b_argonkey/sensors/src/main.c b/samples/boards/96b_argonkey/sensors/src/main.c
index 8d4f8a1fc06..b0051a299f9 100644
--- a/samples/boards/96b_argonkey/sensors/src/main.c
+++ b/samples/boards/96b_argonkey/sensors/src/main.c
@@ -5,7 +5,7 @@
  */
 
 #include <zephyr.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 
 #include <drivers/gpio.h>
 #include <drivers/led.h>
diff --git a/samples/boards/altera_max10/pio/src/main.c b/samples/boards/altera_max10/pio/src/main.c
index 865645c7b5d..4fc456ab18d 100644
--- a/samples/boards/altera_max10/pio/src/main.c
+++ b/samples/boards/altera_max10/pio/src/main.c
@@ -7,7 +7,7 @@
 #include <zephyr.h>
 #include <device.h>
 #include <drivers/gpio.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <misc/util.h>
 
 /* GPIO driver name */
diff --git a/samples/boards/arduino_101/environmental_sensing/ap/src/main.c b/samples/boards/arduino_101/environmental_sensing/ap/src/main.c
index ffc2f3e69b2..3c370ff4802 100644
--- a/samples/boards/arduino_101/environmental_sensing/ap/src/main.c
+++ b/samples/boards/arduino_101/environmental_sensing/ap/src/main.c
@@ -12,7 +12,7 @@
 #include <drivers/ipm.h>
 #include <ipm/ipm_quark_se.h>
 #include <sys/byteorder.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <drivers/sensor.h>
 #include <zephyr.h>
 
diff --git a/samples/boards/arduino_101/environmental_sensing/sensor/src/main.c b/samples/boards/arduino_101/environmental_sensing/sensor/src/main.c
index f78f173900f..6776b48e35b 100644
--- a/samples/boards/arduino_101/environmental_sensing/sensor/src/main.c
+++ b/samples/boards/arduino_101/environmental_sensing/sensor/src/main.c
@@ -7,7 +7,7 @@
 #include <device.h>
 #include <drivers/ipm.h>
 #include <ipm/ipm_quark_se.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <misc/util.h>
 #include <drivers/sensor.h>
 #include <zephyr.h>
diff --git a/samples/boards/bbc_microbit/display/src/main.c b/samples/boards/bbc_microbit/display/src/main.c
index 162268b60d5..2258e8f450d 100644
--- a/samples/boards/bbc_microbit/display/src/main.c
+++ b/samples/boards/bbc_microbit/display/src/main.c
@@ -5,7 +5,7 @@
  */
 
 #include <zephyr.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <drivers/gpio.h>
 #include <device.h>
 
diff --git a/samples/boards/bbc_microbit/pong/src/ble.c b/samples/boards/bbc_microbit/pong/src/ble.c
index 3e769379a52..2f9afcca889 100644
--- a/samples/boards/bbc_microbit/pong/src/ble.c
+++ b/samples/boards/bbc_microbit/pong/src/ble.c
@@ -5,7 +5,7 @@
  */
 
 #include <zephyr.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <drivers/gpio.h>
 #include <device.h>
 #include <string.h>
diff --git a/samples/boards/bbc_microbit/pong/src/main.c b/samples/boards/bbc_microbit/pong/src/main.c
index bc9a15593ae..b7e7722727a 100644
--- a/samples/boards/bbc_microbit/pong/src/main.c
+++ b/samples/boards/bbc_microbit/pong/src/main.c
@@ -5,7 +5,7 @@
  */
 
 #include <zephyr.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <board.h>
 #include <drivers/gpio.h>
 #include <device.h>
diff --git a/samples/boards/bbc_microbit/sound/src/main.c b/samples/boards/bbc_microbit/sound/src/main.c
index 5af4a9c4e28..14417602cc3 100644
--- a/samples/boards/bbc_microbit/sound/src/main.c
+++ b/samples/boards/bbc_microbit/sound/src/main.c
@@ -5,7 +5,7 @@
  */
 
 #include <zephyr.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <board.h>
 #include <drivers/gpio.h>
 #include <drivers/pwm.h>
diff --git a/samples/boards/nrf52/mesh/onoff-app/src/main.c b/samples/boards/nrf52/mesh/onoff-app/src/main.c
index ebd273d9b69..fafd1078cb4 100644
--- a/samples/boards/nrf52/mesh/onoff-app/src/main.c
+++ b/samples/boards/nrf52/mesh/onoff-app/src/main.c
@@ -36,7 +36,7 @@
  *
  */
 
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <settings/settings.h>
 #include <sys/byteorder.h>
 #include <nrf.h>
diff --git a/samples/boards/nrf52/power_mgr/src/sample.h b/samples/boards/nrf52/power_mgr/src/sample.h
index 6bce3d3566b..07227e44fd5 100644
--- a/samples/boards/nrf52/power_mgr/src/sample.h
+++ b/samples/boards/nrf52/power_mgr/src/sample.h
@@ -10,7 +10,7 @@
 #include <soc.h>
 #include <device.h>
 #include <drivers/gpio.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 
 #define GPIO_CFG_SENSE_LOW (GPIO_PIN_CNF_SENSE_Low << GPIO_PIN_CNF_SENSE_Pos)
 
diff --git a/samples/boards/reel_board/mesh_badge/src/main.c b/samples/boards/reel_board/mesh_badge/src/main.c
index c21255f7434..7f52a54510d 100644
--- a/samples/boards/reel_board/mesh_badge/src/main.c
+++ b/samples/boards/reel_board/mesh_badge/src/main.c
@@ -5,7 +5,7 @@
  */
 
 #include <zephyr.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 
 #include <string.h>
 
diff --git a/samples/boards/reel_board/mesh_badge/src/mesh.c b/samples/boards/reel_board/mesh_badge/src/mesh.c
index 1748c2e646d..328a71fcfa7 100644
--- a/samples/boards/reel_board/mesh_badge/src/mesh.c
+++ b/samples/boards/reel_board/mesh_badge/src/mesh.c
@@ -6,7 +6,7 @@
 
 #include <zephyr.h>
 #include <string.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 
 #include <bluetooth/bluetooth.h>
 #include <bluetooth/mesh.h>
diff --git a/samples/boards/reel_board/mesh_badge/src/reel_board.c b/samples/boards/reel_board/mesh_badge/src/reel_board.c
index aaa90b39a30..8487b6f3258 100644
--- a/samples/boards/reel_board/mesh_badge/src/reel_board.c
+++ b/samples/boards/reel_board/mesh_badge/src/reel_board.c
@@ -9,7 +9,7 @@
 #include <device.h>
 #include <drivers/gpio.h>
 #include <display/cfb.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <drivers/flash.h>
 #include <drivers/sensor.h>
 
diff --git a/samples/boards/up_squared/gpio_counter/src/main.c b/samples/boards/up_squared/gpio_counter/src/main.c
index f9ca56592f6..c0d1b638998 100644
--- a/samples/boards/up_squared/gpio_counter/src/main.c
+++ b/samples/boards/up_squared/gpio_counter/src/main.c
@@ -10,7 +10,7 @@
 #include <soc.h>
 #include <drivers/gpio.h>
 
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <misc/util.h>
 
 /**
diff --git a/samples/cpp_synchronization/src/main.cpp b/samples/cpp_synchronization/src/main.cpp
index 40826d4a481..3a6338f650a 100644
--- a/samples/cpp_synchronization/src/main.cpp
+++ b/samples/cpp_synchronization/src/main.cpp
@@ -21,7 +21,7 @@
 #include <stdio.h>
 #include <zephyr.h>
 #include <arch/cpu.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 
 /**
  * @class semaphore the basic pure virtual semaphore class
diff --git a/samples/display/cfb_custom_font/src/main.c b/samples/display/cfb_custom_font/src/main.c
index e2fe4202b50..1490d913d88 100644
--- a/samples/display/cfb_custom_font/src/main.c
+++ b/samples/display/cfb_custom_font/src/main.c
@@ -7,7 +7,7 @@
 #include <zephyr.h>
 #include <device.h>
 #include <display/cfb.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 
 #include "cfb_font_dice.h"
 
diff --git a/samples/display/grove_display/src/main.c b/samples/display/grove_display/src/main.c
index 78195cdebc4..518e412b872 100644
--- a/samples/display/grove_display/src/main.c
+++ b/samples/display/grove_display/src/main.c
@@ -6,7 +6,7 @@
 
 #include <zephyr.h>
 
-#include <misc/printk.h>
+#include <sys/printk.h>
 
 #include <device.h>
 #include <drivers/i2c.h>
diff --git a/samples/drivers/CAN/src/main.c b/samples/drivers/CAN/src/main.c
index 3f2b1ac5bc9..956d4bcf162 100644
--- a/samples/drivers/CAN/src/main.c
+++ b/samples/drivers/CAN/src/main.c
@@ -6,7 +6,7 @@
 
 #include <zephyr.h>
 #include <kernel.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <device.h>
 #include <drivers/can.h>
 #include <drivers/gpio.h>
diff --git a/samples/drivers/counter/alarm/src/main.c b/samples/drivers/counter/alarm/src/main.c
index 898a9eef265..deca3f47809 100644
--- a/samples/drivers/counter/alarm/src/main.c
+++ b/samples/drivers/counter/alarm/src/main.c
@@ -8,7 +8,7 @@
 
 #include <device.h>
 #include <drivers/counter.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 
 #define DELAY 2000000
 #define ALARM_CHANNEL_ID 0
diff --git a/samples/drivers/current_sensing/src/main.c b/samples/drivers/current_sensing/src/main.c
index 71a99ec165b..3f27d3f3ad5 100644
--- a/samples/drivers/current_sensing/src/main.c
+++ b/samples/drivers/current_sensing/src/main.c
@@ -6,7 +6,7 @@
 
 #include <zephyr.h>
 
-#include <misc/printk.h>
+#include <sys/printk.h>
 
 #include <device.h>
 #include <drivers/i2c.h>
diff --git a/samples/drivers/flash_shell/src/main.c b/samples/drivers/flash_shell/src/main.c
index 77efba157a1..396259608b5 100644
--- a/samples/drivers/flash_shell/src/main.c
+++ b/samples/drivers/flash_shell/src/main.c
@@ -7,7 +7,7 @@
 #include <string.h>
 
 #include <zephyr.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <logging/log.h>
 #include <shell/shell.h>
 #include <shell/shell_uart.h>
diff --git a/samples/drivers/gpio/src/main.c b/samples/drivers/gpio/src/main.c
index 0fb3faad073..4646cccb9fd 100644
--- a/samples/drivers/gpio/src/main.c
+++ b/samples/drivers/gpio/src/main.c
@@ -14,7 +14,7 @@
  */
 #include <zephyr.h>
 
-#include <misc/printk.h>
+#include <sys/printk.h>
 
 #include <device.h>
 #include <drivers/gpio.h>
diff --git a/samples/drivers/i2c_fujitsu_fram/src/main.c b/samples/drivers/i2c_fujitsu_fram/src/main.c
index 90e66524f56..faf16468415 100644
--- a/samples/drivers/i2c_fujitsu_fram/src/main.c
+++ b/samples/drivers/i2c_fujitsu_fram/src/main.c
@@ -6,7 +6,7 @@
 
 #include <errno.h>
 #include <zephyr.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <device.h>
 #include <drivers/i2c.h>
 
diff --git a/samples/drivers/i2c_scanner/src/main.c b/samples/drivers/i2c_scanner/src/main.c
index f5c94cfdd45..44c1724377d 100644
--- a/samples/drivers/i2c_scanner/src/main.c
+++ b/samples/drivers/i2c_scanner/src/main.c
@@ -6,7 +6,7 @@
 
 #include <errno.h>
 #include <zephyr.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <device.h>
 #include <drivers/i2c.h>
 
diff --git a/samples/drivers/lcd_hd44780/src/main.c b/samples/drivers/lcd_hd44780/src/main.c
index f3849251702..5bc73d9bde4 100644
--- a/samples/drivers/lcd_hd44780/src/main.c
+++ b/samples/drivers/lcd_hd44780/src/main.c
@@ -66,7 +66,7 @@
 
 #include <zephyr.h>
 
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <drivers/gpio.h>
 #include <string.h>
 
diff --git a/samples/drivers/led_apa102c_bitbang/src/main.c b/samples/drivers/led_apa102c_bitbang/src/main.c
index 1648119485b..caf2fbdb9e9 100644
--- a/samples/drivers/led_apa102c_bitbang/src/main.c
+++ b/samples/drivers/led_apa102c_bitbang/src/main.c
@@ -24,7 +24,7 @@
 
 #include <zephyr.h>
 
-#include <misc/printk.h>
+#include <sys/printk.h>
 
 #include <device.h>
 #include <drivers/gpio.h>
diff --git a/samples/drivers/rtc/src/main.c b/samples/drivers/rtc/src/main.c
index 5d341579d93..b8095363b43 100644
--- a/samples/drivers/rtc/src/main.c
+++ b/samples/drivers/rtc/src/main.c
@@ -8,7 +8,7 @@
 
 #include <device.h>
 #include <drivers/rtc.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 
 #define ALARM (RTC_ALARM_SECOND)
 
diff --git a/samples/drivers/spi_fujitsu_fram/src/main.c b/samples/drivers/spi_fujitsu_fram/src/main.c
index 0609ea86ece..fecbd83ec0c 100644
--- a/samples/drivers/spi_fujitsu_fram/src/main.c
+++ b/samples/drivers/spi_fujitsu_fram/src/main.c
@@ -6,7 +6,7 @@
 
 #include <errno.h>
 #include <zephyr.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <device.h>
 #include <drivers/spi.h>
 
diff --git a/samples/drivers/watchdog/src/main.c b/samples/drivers/watchdog/src/main.c
index 605fdd0819b..dc46ab859e3 100644
--- a/samples/drivers/watchdog/src/main.c
+++ b/samples/drivers/watchdog/src/main.c
@@ -8,7 +8,7 @@
 #include <zephyr.h>
 #include <device.h>
 #include <drivers/watchdog.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 
 #define WDT_FEED_TRIES 5
 
diff --git a/samples/hello_world/src/main.c b/samples/hello_world/src/main.c
index 2d4a7f0d5fe..6c5c8a27dc6 100644
--- a/samples/hello_world/src/main.c
+++ b/samples/hello_world/src/main.c
@@ -5,7 +5,7 @@
  */
 
 #include <zephyr.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 
 void main(void)
 {
diff --git a/samples/net/mqtt_publisher/src/main.c b/samples/net/mqtt_publisher/src/main.c
index 84ce653ec8b..1acd545579c 100644
--- a/samples/net/mqtt_publisher/src/main.c
+++ b/samples/net/mqtt_publisher/src/main.c
@@ -11,7 +11,7 @@ LOG_MODULE_REGISTER(net_mqtt_publisher_sample, LOG_LEVEL_DBG);
 #include <net/socket.h>
 #include <net/mqtt.h>
 
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <string.h>
 #include <errno.h>
 
diff --git a/samples/net/nats/src/nats.c b/samples/net/nats/src/nats.c
index d700cb037d7..fca9e192210 100644
--- a/samples/net/nats/src/nats.c
+++ b/samples/net/nats/src/nats.c
@@ -10,7 +10,7 @@ LOG_MODULE_DECLARE(net_nats_sample, LOG_LEVEL_DBG);
 #include <ctype.h>
 #include <errno.h>
 #include <data/json.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <misc/util.h>
 #include <net/net_pkt.h>
 #include <net/net_context.h>
diff --git a/samples/net/sockets/coap_client/src/coap-client.c b/samples/net/sockets/coap_client/src/coap-client.c
index 9667e71e506..85e0b18e6d0 100644
--- a/samples/net/sockets/coap_client/src/coap-client.c
+++ b/samples/net/sockets/coap_client/src/coap-client.c
@@ -8,7 +8,7 @@
 LOG_MODULE_REGISTER(net_coap_client_sample, LOG_LEVEL_DBG);
 
 #include <errno.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <sys/byteorder.h>
 #include <zephyr.h>
 
diff --git a/samples/net/sockets/coap_server/src/coap-server.c b/samples/net/sockets/coap_server/src/coap-server.c
index b0997c69886..d0845ee8eb8 100644
--- a/samples/net/sockets/coap_server/src/coap-server.c
+++ b/samples/net/sockets/coap_server/src/coap-server.c
@@ -8,7 +8,7 @@
 LOG_MODULE_REGISTER(net_coap_server_sample, LOG_LEVEL_DBG);
 
 #include <errno.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <sys/byteorder.h>
 #include <zephyr.h>
 
diff --git a/samples/net/updatehub/src/main.c b/samples/net/updatehub/src/main.c
index c70557da18d..d0d53036804 100644
--- a/samples/net/updatehub/src/main.c
+++ b/samples/net/updatehub/src/main.c
@@ -7,7 +7,7 @@
 #include <zephyr.h>
 #include <updatehub.h>
 #include <dfu/mcuboot.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <logging/log.h>
 
 #if defined(CONFIG_UPDATEHUB_DTLS)
diff --git a/samples/net/wpan_serial/src/main.c b/samples/net/wpan_serial/src/main.c
index 1379884ad7f..af6ecb2096b 100644
--- a/samples/net/wpan_serial/src/main.c
+++ b/samples/net/wpan_serial/src/main.c
@@ -21,7 +21,7 @@ LOG_MODULE_REGISTER(net_wpan_serial_sample, LOG_LEVEL_DBG);
 #include <zephyr.h>
 #include <stdio.h>
 
-#include <misc/printk.h>
+#include <sys/printk.h>
 
 #include <net/buf.h>
 
diff --git a/samples/net/zperf/src/shell_utils.c b/samples/net/zperf/src/shell_utils.c
index 7942b99b242..3773f0bfa4a 100644
--- a/samples/net/zperf/src/shell_utils.c
+++ b/samples/net/zperf/src/shell_utils.c
@@ -5,7 +5,7 @@
  */
 
 #include <ctype.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/samples/net/zperf/src/zperf_session.h b/samples/net/zperf/src/zperf_session.h
index cf2b54376a3..d7413350ada 100644
--- a/samples/net/zperf/src/zperf_session.h
+++ b/samples/net/zperf/src/zperf_session.h
@@ -10,7 +10,7 @@
 #include <toolchain.h>
 
 #include <zephyr.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 
 #include <net/net_ip.h>
 #include <net/net_core.h>
diff --git a/samples/net/zperf/src/zperf_shell.c b/samples/net/zperf/src/zperf_shell.c
index f8eaff8edb1..1e95c8de51c 100644
--- a/samples/net/zperf/src/zperf_shell.c
+++ b/samples/net/zperf/src/zperf_shell.c
@@ -12,7 +12,7 @@ LOG_MODULE_REGISTER(net_zperf_sample, LOG_LEVEL_DBG);
 #include <stdlib.h>
 
 #include <zephyr.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <shell/shell.h>
 #include <shell/shell_uart.h>
 
diff --git a/samples/net/zperf/src/zperf_tcp_receiver.c b/samples/net/zperf/src/zperf_tcp_receiver.c
index 3ae5d92f271..9e382a053fe 100644
--- a/samples/net/zperf/src/zperf_tcp_receiver.c
+++ b/samples/net/zperf/src/zperf_tcp_receiver.c
@@ -12,7 +12,7 @@ LOG_MODULE_DECLARE(net_zperf_sample, LOG_LEVEL_DBG);
 #include <linker/sections.h>
 #include <toolchain.h>
 
-#include <misc/printk.h>
+#include <sys/printk.h>
 
 #include <net/net_core.h>
 #include <net/net_ip.h>
diff --git a/samples/net/zperf/src/zperf_tcp_uploader.c b/samples/net/zperf/src/zperf_tcp_uploader.c
index c77782a6e26..f70cd43d2a0 100644
--- a/samples/net/zperf/src/zperf_tcp_uploader.c
+++ b/samples/net/zperf/src/zperf_tcp_uploader.c
@@ -10,7 +10,7 @@ LOG_MODULE_DECLARE(net_zperf_sample, LOG_LEVEL_DBG);
 #include <zephyr.h>
 
 #include <errno.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 
 #include <net/net_pkt.h>
 #include <net/net_ip.h>
diff --git a/samples/net/zperf/src/zperf_udp_receiver.c b/samples/net/zperf/src/zperf_udp_receiver.c
index 4f546bd3327..0617966fa6c 100644
--- a/samples/net/zperf/src/zperf_udp_receiver.c
+++ b/samples/net/zperf/src/zperf_udp_receiver.c
@@ -11,7 +11,7 @@ LOG_MODULE_DECLARE(net_zperf_sample, LOG_LEVEL_DBG);
 #include <toolchain.h>
 
 #include <zephyr.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 
 #include <net/net_core.h>
 #include <net/net_pkt.h>
diff --git a/samples/net/zperf/src/zperf_udp_uploader.c b/samples/net/zperf/src/zperf_udp_uploader.c
index 9d7c0337e85..56315393d72 100644
--- a/samples/net/zperf/src/zperf_udp_uploader.c
+++ b/samples/net/zperf/src/zperf_udp_uploader.c
@@ -9,7 +9,7 @@ LOG_MODULE_DECLARE(net_zperf_sample, LOG_LEVEL_DBG);
 
 #include <zephyr.h>
 
-#include <misc/printk.h>
+#include <sys/printk.h>
 
 #include <net/net_core.h>
 #include <net/net_ip.h>
diff --git a/samples/philosophers/src/main.c b/samples/philosophers/src/main.c
index c57586bb990..d6161cd23e5 100644
--- a/samples/philosophers/src/main.c
+++ b/samples/philosophers/src/main.c
@@ -40,7 +40,7 @@
 #if defined(CONFIG_STDOUT_CONSOLE)
 #include <stdio.h>
 #else
-#include <misc/printk.h>
+#include <sys/printk.h>
 #endif
 
 #include <sys/__assert.h>
diff --git a/samples/portability/cmsis_rtos_v1/philosophers/src/main.c b/samples/portability/cmsis_rtos_v1/philosophers/src/main.c
index 83497439ba7..e5d83c1dcf0 100644
--- a/samples/portability/cmsis_rtos_v1/philosophers/src/main.c
+++ b/samples/portability/cmsis_rtos_v1/philosophers/src/main.c
@@ -34,7 +34,7 @@
 #if defined(CONFIG_STDOUT_CONSOLE)
 #include <stdio.h>
 #else
-#include <misc/printk.h>
+#include <sys/printk.h>
 #endif
 
 #include <sys/__assert.h>
diff --git a/samples/portability/cmsis_rtos_v2/philosophers/src/main.c b/samples/portability/cmsis_rtos_v2/philosophers/src/main.c
index a0bdbdc0c1d..8c3031e2f12 100644
--- a/samples/portability/cmsis_rtos_v2/philosophers/src/main.c
+++ b/samples/portability/cmsis_rtos_v2/philosophers/src/main.c
@@ -31,7 +31,7 @@
 #include <zephyr.h>
 #include <kernel.h>
 #include <cmsis_os2.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 
 #include <sys/__assert.h>
 
diff --git a/samples/sensor/amg88xx/src/main.c b/samples/sensor/amg88xx/src/main.c
index 58814f34085..8566cfe9458 100644
--- a/samples/sensor/amg88xx/src/main.c
+++ b/samples/sensor/amg88xx/src/main.c
@@ -7,7 +7,7 @@
 #include <zephyr.h>
 #include <device.h>
 #include <drivers/sensor.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 
 static struct sensor_value temp_value[64];
 
diff --git a/samples/sensor/ams_iAQcore/src/main.c b/samples/sensor/ams_iAQcore/src/main.c
index 278a02d3fa7..b0fcc749718 100644
--- a/samples/sensor/ams_iAQcore/src/main.c
+++ b/samples/sensor/ams_iAQcore/src/main.c
@@ -7,7 +7,7 @@
 #include <zephyr.h>
 #include <device.h>
 #include <drivers/sensor.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 
 void main(void)
 {
diff --git a/samples/sensor/apds9960/src/main.c b/samples/sensor/apds9960/src/main.c
index 98e9beb0a71..a8aae0c9317 100644
--- a/samples/sensor/apds9960/src/main.c
+++ b/samples/sensor/apds9960/src/main.c
@@ -9,7 +9,7 @@
 #include <drivers/sensor.h>
 #include <device.h>
 #include <stdio.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 
 #ifdef CONFIG_APDS9960_TRIGGER
 K_SEM_DEFINE(sem, 0, 1);
diff --git a/samples/sensor/bmg160/src/main.c b/samples/sensor/bmg160/src/main.c
index ba1113462c1..d1a460327cf 100644
--- a/samples/sensor/bmg160/src/main.c
+++ b/samples/sensor/bmg160/src/main.c
@@ -6,7 +6,7 @@
 
 #include <zephyr.h>
 
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <sys_clock.h>
 #include <stdio.h>
 
diff --git a/samples/sensor/bmi160/src/bmi160.c b/samples/sensor/bmi160/src/bmi160.c
index edda35ebf04..e92d7b22053 100644
--- a/samples/sensor/bmi160/src/bmi160.c
+++ b/samples/sensor/bmi160/src/bmi160.c
@@ -8,7 +8,7 @@
 #include <stdio.h>
 #include <device.h>
 #include <drivers/sensor.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 
 #define MAX_TEST_TIME	15000
 #define SLEEPTIME	300
diff --git a/samples/sensor/bmm150/src/main.c b/samples/sensor/bmm150/src/main.c
index 20e5ce6a2a5..b18b94f8eb9 100644
--- a/samples/sensor/bmm150/src/main.c
+++ b/samples/sensor/bmm150/src/main.c
@@ -6,7 +6,7 @@
 
 #include <zephyr.h>
 #include <device.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <drivers/sensor.h>
 #include <stdio.h>
 
diff --git a/samples/sensor/ccs811/src/main.c b/samples/sensor/ccs811/src/main.c
index ad0e04c4887..0ff19b924fe 100644
--- a/samples/sensor/ccs811/src/main.c
+++ b/samples/sensor/ccs811/src/main.c
@@ -7,7 +7,7 @@
 #include <zephyr.h>
 #include <device.h>
 #include <drivers/sensor.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 
 static void do_main(struct device *dev)
 {
diff --git a/samples/sensor/ens210/src/main.c b/samples/sensor/ens210/src/main.c
index e180ce3db70..4a9fb1a4a24 100644
--- a/samples/sensor/ens210/src/main.c
+++ b/samples/sensor/ens210/src/main.c
@@ -7,7 +7,7 @@
 #include <zephyr.h>
 #include <device.h>
 #include <drivers/sensor.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 
 void main(void)
 {
diff --git a/samples/sensor/grove_light/src/main.c b/samples/sensor/grove_light/src/main.c
index d572e7c7540..94ca31e4dea 100644
--- a/samples/sensor/grove_light/src/main.c
+++ b/samples/sensor/grove_light/src/main.c
@@ -6,7 +6,7 @@
 
 #include <zephyr.h>
 #include <init.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <stdio.h>
 #include <drivers/sensor.h>
 
diff --git a/samples/sensor/magn_polling/src/main.c b/samples/sensor/magn_polling/src/main.c
index 2af2cc9ca90..a4f3b7ceb85 100644
--- a/samples/sensor/magn_polling/src/main.c
+++ b/samples/sensor/magn_polling/src/main.c
@@ -7,7 +7,7 @@
 #include <zephyr.h>
 #include <device.h>
 #include <drivers/sensor.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <stdio.h>
 
 static void do_main(struct device *dev)
diff --git a/samples/sensor/max44009/src/main.c b/samples/sensor/max44009/src/main.c
index 57f27671b2d..483bb301fad 100644
--- a/samples/sensor/max44009/src/main.c
+++ b/samples/sensor/max44009/src/main.c
@@ -5,7 +5,7 @@
  */
 
 #include <zephyr.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <drivers/sensor.h>
 
 /**
diff --git a/samples/sensor/sx9500/src/main.c b/samples/sensor/sx9500/src/main.c
index dec70cee151..090f3f4d196 100644
--- a/samples/sensor/sx9500/src/main.c
+++ b/samples/sensor/sx9500/src/main.c
@@ -8,7 +8,7 @@
 #include <device.h>
 #include <drivers/sensor.h>
 #include <stdio.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #ifdef CONFIG_SX9500_TRIGGER
 
 static void sensor_trigger_handler(struct device *dev, struct sensor_trigger *trig)
diff --git a/samples/sensor/th02/src/main.c b/samples/sensor/th02/src/main.c
index 40aa99e181b..1db018fc71e 100644
--- a/samples/sensor/th02/src/main.c
+++ b/samples/sensor/th02/src/main.c
@@ -7,7 +7,7 @@
 #include <zephyr.h>
 #include <device.h>
 #include <drivers/sensor.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <misc/util.h>
 
 #ifdef CONFIG_GROVE_LCD_RGB
diff --git a/samples/sensor/ti_hdc/src/main.c b/samples/sensor/ti_hdc/src/main.c
index 5ebd7f8aa10..24d3830ee33 100644
--- a/samples/sensor/ti_hdc/src/main.c
+++ b/samples/sensor/ti_hdc/src/main.c
@@ -7,7 +7,7 @@
 #include <zephyr.h>
 #include <device.h>
 #include <drivers/sensor.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <sys/__assert.h>
 #include <logging/log.h>
 #include <drivers/gpio.h>
diff --git a/samples/sensor/tmp112/src/main.c b/samples/sensor/tmp112/src/main.c
index 1fbd936dc7e..6c1bbb8425b 100644
--- a/samples/sensor/tmp112/src/main.c
+++ b/samples/sensor/tmp112/src/main.c
@@ -7,7 +7,7 @@
 #include <zephyr.h>
 #include <device.h>
 #include <drivers/sensor.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <sys/__assert.h>
 
 static void do_main(struct device *dev)
diff --git a/samples/sensor/vl53l0x/src/main.c b/samples/sensor/vl53l0x/src/main.c
index 5c6f30a2717..586efd74799 100644
--- a/samples/sensor/vl53l0x/src/main.c
+++ b/samples/sensor/vl53l0x/src/main.c
@@ -8,7 +8,7 @@
 #include <device.h>
 #include <drivers/sensor.h>
 #include <stdio.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 
 void main(void)
 {
diff --git a/samples/subsys/console/getchar/src/main.c b/samples/subsys/console/getchar/src/main.c
index dac3709c081..809d92b51b5 100644
--- a/samples/subsys/console/getchar/src/main.c
+++ b/samples/subsys/console/getchar/src/main.c
@@ -5,7 +5,7 @@
  */
 
 #include <zephyr.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <console/console.h>
 
 void main(void)
diff --git a/samples/subsys/console/getline/src/main.c b/samples/subsys/console/getline/src/main.c
index 25cfb95b287..1622654ca15 100644
--- a/samples/subsys/console/getline/src/main.c
+++ b/samples/subsys/console/getline/src/main.c
@@ -6,7 +6,7 @@
 
 #include <string.h>
 #include <zephyr.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <console/console.h>
 
 void main(void)
diff --git a/samples/subsys/ipc/ipm_imx/src/main.c b/samples/subsys/ipc/ipm_imx/src/main.c
index 3c775ba3ad7..7afbb124e11 100644
--- a/samples/subsys/ipc/ipm_imx/src/main.c
+++ b/samples/subsys/ipc/ipm_imx/src/main.c
@@ -5,7 +5,7 @@
  */
 
 #include <zephyr.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <device.h>
 #include <drivers/ipm.h>
 
diff --git a/samples/subsys/ipc/ipm_mailbox/ap/src/hello.c b/samples/subsys/ipc/ipm_mailbox/ap/src/hello.c
index 145d4d7aa73..1a24bec926b 100644
--- a/samples/subsys/ipc/ipm_mailbox/ap/src/hello.c
+++ b/samples/subsys/ipc/ipm_mailbox/ap/src/hello.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <zephyr.h>
 #include <drivers/ipm.h>
 #include <ipm/ipm_quark_se.h>
diff --git a/samples/subsys/ipc/ipm_mailbox/sensor/src/hello.c b/samples/subsys/ipc/ipm_mailbox/sensor/src/hello.c
index 47af95ce761..d841e19bf04 100644
--- a/samples/subsys/ipc/ipm_mailbox/sensor/src/hello.c
+++ b/samples/subsys/ipc/ipm_mailbox/sensor/src/hello.c
@@ -10,7 +10,7 @@
 #include <ipm/ipm_quark_se.h>
 #include <device.h>
 #include <init.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <string.h>
 
 QUARK_SE_IPM_DEFINE(ping_ipm, 0, QUARK_SE_IPM_INBOUND);
diff --git a/samples/subsys/ipc/ipm_mcux/remote/src/main_remote.c b/samples/subsys/ipc/ipm_mcux/remote/src/main_remote.c
index df9e3139f89..1c4b07038d7 100644
--- a/samples/subsys/ipc/ipm_mcux/remote/src/main_remote.c
+++ b/samples/subsys/ipc/ipm_mcux/remote/src/main_remote.c
@@ -5,7 +5,7 @@
  */
 
 #include <zephyr.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <device.h>
 #include <drivers/ipm.h>
 
diff --git a/samples/subsys/ipc/ipm_mcux/src/main_master.c b/samples/subsys/ipc/ipm_mcux/src/main_master.c
index 8db88723b9d..846005a5b16 100644
--- a/samples/subsys/ipc/ipm_mcux/src/main_master.c
+++ b/samples/subsys/ipc/ipm_mcux/src/main_master.c
@@ -5,7 +5,7 @@
  */
 
 #include <zephyr.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <device.h>
 #include <drivers/ipm.h>
 
diff --git a/samples/subsys/ipc/ipm_mhu_dual_core/src/main.c b/samples/subsys/ipc/ipm_mhu_dual_core/src/main.c
index c53a0463430..aedbdaa88b8 100644
--- a/samples/subsys/ipc/ipm_mhu_dual_core/src/main.c
+++ b/samples/subsys/ipc/ipm_mhu_dual_core/src/main.c
@@ -5,7 +5,7 @@
  */
 
 #include <zephyr.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <drivers/ipm.h>
 
 enum cpu_id_t {
diff --git a/samples/subsys/ipc/openamp/remote/src/main.c b/samples/subsys/ipc/openamp/remote/src/main.c
index 4870565077c..95139a43f83 100644
--- a/samples/subsys/ipc/openamp/remote/src/main.c
+++ b/samples/subsys/ipc/openamp/remote/src/main.c
@@ -8,7 +8,7 @@
 
 #include <zephyr.h>
 #include <drivers/ipm.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <device.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/samples/subsys/ipc/openamp/src/main.c b/samples/subsys/ipc/openamp/src/main.c
index 73b9b04df5b..1f99347c0c2 100644
--- a/samples/subsys/ipc/openamp/src/main.c
+++ b/samples/subsys/ipc/openamp/src/main.c
@@ -8,7 +8,7 @@
 
 #include <zephyr.h>
 #include <drivers/ipm.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <device.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/samples/subsys/logging/logger/src/main.c b/samples/subsys/logging/logger/src/main.c
index 82ffa2c6540..eaa6f8ba81b 100644
--- a/samples/subsys/logging/logger/src/main.c
+++ b/samples/subsys/logging/logger/src/main.c
@@ -6,7 +6,7 @@
 
 #include <zephyr.h>
 #include <string.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <logging/log_ctrl.h>
 #include "sample_instance.h"
 #include "sample_module.h"
diff --git a/samples/subsys/power/device_pm/src/dummy_driver.c b/samples/subsys/power/device_pm/src/dummy_driver.c
index 6d648295288..5f231dda6b7 100644
--- a/samples/subsys/power/device_pm/src/dummy_driver.c
+++ b/samples/subsys/power/device_pm/src/dummy_driver.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include "dummy_parent.h"
 #include "dummy_driver.h"
 
diff --git a/samples/subsys/power/device_pm/src/dummy_parent.c b/samples/subsys/power/device_pm/src/dummy_parent.c
index a47fdcef39c..89c07182226 100644
--- a/samples/subsys/power/device_pm/src/dummy_parent.c
+++ b/samples/subsys/power/device_pm/src/dummy_parent.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include "dummy_parent.h"
 
 static u32_t store_value;
diff --git a/samples/subsys/power/device_pm/src/main.c b/samples/subsys/power/device_pm/src/main.c
index c30057bf3ff..a0ea6ec3011 100644
--- a/samples/subsys/power/device_pm/src/main.c
+++ b/samples/subsys/power/device_pm/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include "dummy_driver.h"
 
 /* Application main Thread */
diff --git a/samples/subsys/shell/shell_module/src/main.c b/samples/subsys/shell/shell_module/src/main.c
index 7f253fec157..5bbba2a8709 100644
--- a/samples/subsys/shell/shell_module/src/main.c
+++ b/samples/subsys/shell/shell_module/src/main.c
@@ -5,7 +5,7 @@
  */
 
 #include <zephyr.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <shell/shell.h>
 #include <shell/shell_uart.h>
 #include <version.h>
diff --git a/samples/subsys/usb/console/src/main.c b/samples/subsys/usb/console/src/main.c
index 4321637f4e9..e3f79b159bd 100644
--- a/samples/subsys/usb/console/src/main.c
+++ b/samples/subsys/usb/console/src/main.c
@@ -5,7 +5,7 @@
  */
 
 #include <zephyr.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <misc/util.h>
 #include <string.h>
 
diff --git a/samples/synchronization/src/main.c b/samples/synchronization/src/main.c
index 3618a2b9344..3c86b618239 100644
--- a/samples/synchronization/src/main.c
+++ b/samples/synchronization/src/main.c
@@ -7,7 +7,7 @@
  */
 
 #include <zephyr.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 
 /*
  * The hello world demo has two threads that utilize semaphores and sleeping
diff --git a/samples/userspace/shared_mem/src/enc.h b/samples/userspace/shared_mem/src/enc.h
index 2ef47c27d85..8ca342767af 100644
--- a/samples/userspace/shared_mem/src/enc.h
+++ b/samples/userspace/shared_mem/src/enc.h
@@ -8,7 +8,7 @@
 #ifndef ENC_H
 #define ENC_H
 
-#include <misc/printk.h>
+#include <sys/printk.h>
 
 #define WHEEL_SIZE 26
 #define IMOD(a, b) ((a + b) % WHEEL_SIZE)
diff --git a/samples/userspace/shared_mem/src/main.h b/samples/userspace/shared_mem/src/main.h
index 51bca05e246..471d1bb3e25 100644
--- a/samples/userspace/shared_mem/src/main.h
+++ b/samples/userspace/shared_mem/src/main.h
@@ -8,7 +8,7 @@
 #define MAIN_H
 
 #include <zephyr.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <kernel_structs.h>
 #include <string.h>
 #include <stdlib.h>
diff --git a/samples/xtensa_asm2/src/main.c b/samples/xtensa_asm2/src/main.c
index 1e26dcbe785..d30fcb68ce4 100644
--- a/samples/xtensa_asm2/src/main.c
+++ b/samples/xtensa_asm2/src/main.c
@@ -6,7 +6,7 @@
 
 #include <zephyr.h>
 #include <string.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <xtensa-asm2.h>
 
 #ifdef CONFIG_MULTITHREADING
diff --git a/soc/x86/intel_quark/quark_se/soc.c b/soc/x86/intel_quark/quark_se/soc.c
index f8186ce441e..ff61ad61bc6 100644
--- a/soc/x86/intel_quark/quark_se/soc.c
+++ b/soc/x86/intel_quark/quark_se/soc.c
@@ -15,7 +15,7 @@
 #include <errno.h>
 
 #include <kernel.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <sys/__assert.h>
 #include "soc.h"
 #include <drivers/uart.h>
diff --git a/soc/x86/intel_quark/quark_x1000/soc.c b/soc/x86/intel_quark/quark_x1000/soc.c
index 34e451551f2..21b57a711da 100644
--- a/soc/x86/intel_quark/quark_x1000/soc.c
+++ b/soc/x86/intel_quark/quark_x1000/soc.c
@@ -18,7 +18,7 @@
 #include <kernel.h>
 #include <init.h>
 #include <device.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <sys/__assert.h>
 #include "soc.h"
 #include <drivers/uart.h>
diff --git a/subsys/bluetooth/controller/util/mayfly.c b/subsys/bluetooth/controller/util/mayfly.c
index 141b6f42ddb..68f331afd2e 100644
--- a/subsys/bluetooth/controller/util/mayfly.c
+++ b/subsys/bluetooth/controller/util/mayfly.c
@@ -7,7 +7,7 @@
 
 #include <stddef.h>
 #include <zephyr/types.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include "memq.h"
 #include "mayfly.h"
 
diff --git a/subsys/bluetooth/host/a2dp.c b/subsys/bluetooth/host/a2dp.c
index 1c18faf1390..6345622a56a 100644
--- a/subsys/bluetooth/host/a2dp.c
+++ b/subsys/bluetooth/host/a2dp.c
@@ -14,7 +14,7 @@
 #include <sys/atomic.h>
 #include <sys/byteorder.h>
 #include <misc/util.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <assert.h>
 
 #include <bluetooth/bluetooth.h>
diff --git a/subsys/bluetooth/host/hfp_hf.c b/subsys/bluetooth/host/hfp_hf.c
index 5ca98562368..1cdf8be9951 100644
--- a/subsys/bluetooth/host/hfp_hf.c
+++ b/subsys/bluetooth/host/hfp_hf.c
@@ -10,7 +10,7 @@
 #include <sys/atomic.h>
 #include <sys/byteorder.h>
 #include <misc/util.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 
 #include <bluetooth/conn.h>
 
diff --git a/subsys/bluetooth/host/mesh/shell.c b/subsys/bluetooth/host/mesh/shell.c
index 986c699b5cf..7d486a10a3e 100644
--- a/subsys/bluetooth/host/mesh/shell.c
+++ b/subsys/bluetooth/host/mesh/shell.c
@@ -12,7 +12,7 @@
 #include <stdlib.h>
 #include <ctype.h>
 #include <zephyr.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 
 #include <shell/shell.h>
 #include <settings/settings.h>
diff --git a/subsys/bluetooth/host/uuid.c b/subsys/bluetooth/host/uuid.c
index 9b58bb5bf05..c971553a37a 100644
--- a/subsys/bluetooth/host/uuid.c
+++ b/subsys/bluetooth/host/uuid.c
@@ -9,7 +9,7 @@
 #include <string.h>
 #include <errno.h>
 #include <sys/byteorder.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 
 #include <bluetooth/uuid.h>
 
diff --git a/subsys/bluetooth/shell/bt.c b/subsys/bluetooth/shell/bt.c
index ff860f3978a..6f6332fbc75 100644
--- a/subsys/bluetooth/shell/bt.c
+++ b/subsys/bluetooth/shell/bt.c
@@ -16,7 +16,7 @@
 #include <stddef.h>
 #include <stdlib.h>
 #include <string.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <sys/byteorder.h>
 #include <zephyr.h>
 
diff --git a/subsys/bluetooth/shell/hci.c b/subsys/bluetooth/shell/hci.c
index f0e1e734257..4c391e98772 100644
--- a/subsys/bluetooth/shell/hci.c
+++ b/subsys/bluetooth/shell/hci.c
@@ -8,7 +8,7 @@
 #include <string.h>
 #include <zephyr.h>
 #include <shell/shell.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <sys/byteorder.h>
 
 #include <bluetooth/hci.h>
diff --git a/subsys/console/tty.c b/subsys/console/tty.c
index 2f33732ca3e..a73d255e801 100644
--- a/subsys/console/tty.c
+++ b/subsys/console/tty.c
@@ -6,7 +6,7 @@
 
 #include <zephyr.h>
 #include <drivers/uart.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <console/tty.h>
 
 static int tty_irq_input_hook(struct tty_serial *tty, u8_t c);
diff --git a/subsys/debug/tracing/cpu_stats.c b/subsys/debug/tracing/cpu_stats.c
index bb493cd584d..4a73c776288 100644
--- a/subsys/debug/tracing/cpu_stats.c
+++ b/subsys/debug/tracing/cpu_stats.c
@@ -5,7 +5,7 @@
  */
 
 #include <tracing_cpu_stats.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 
 enum cpu_state {
 	CPU_STATE_IDLE,
diff --git a/subsys/fs/nffs_fs.c b/subsys/fs/nffs_fs.c
index 0a5c3801c6f..ac5f760b90d 100644
--- a/subsys/fs/nffs_fs.c
+++ b/subsys/fs/nffs_fs.c
@@ -13,7 +13,7 @@
 #include <fs/fs.h>
 #include <sys/crc.h>
 #include <sys/__assert.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <nffs/os.h>
 #include <nffs/nffs.h>
 
diff --git a/subsys/logging/log_core.c b/subsys/logging/log_core.c
index d694731991e..2bb3c11b1df 100644
--- a/subsys/logging/log_core.c
+++ b/subsys/logging/log_core.c
@@ -9,7 +9,7 @@
 #include <logging/log_backend.h>
 #include <logging/log_ctrl.h>
 #include <logging/log_output.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <init.h>
 #include <assert.h>
 #include <sys/atomic.h>
diff --git a/subsys/net/ip/net_private.h b/subsys/net/ip/net_private.h
index 65483f0f10c..2e81837c0d7 100644
--- a/subsys/net/ip/net_private.h
+++ b/subsys/net/ip/net_private.h
@@ -11,7 +11,7 @@
  */
 
 #include <errno.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <net/net_context.h>
 #include <net/net_pkt.h>
 
diff --git a/subsys/net/ip/net_shell.c b/subsys/net/ip/net_shell.c
index f4caa5c2e94..34f5ef72e19 100644
--- a/subsys/net/ip/net_shell.c
+++ b/subsys/net/ip/net_shell.c
@@ -21,7 +21,7 @@ LOG_MODULE_REGISTER(net_shell, LOG_LEVEL_DBG);
 
 #include <net/net_if.h>
 #include <net/dns_resolve.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 
 #include "route.h"
 #include "icmpv6.h"
diff --git a/subsys/net/l2/bluetooth/bluetooth_shell.c b/subsys/net/l2/bluetooth/bluetooth_shell.c
index b9e959f5687..5c89c7d3108 100644
--- a/subsys/net/l2/bluetooth/bluetooth_shell.c
+++ b/subsys/net/l2/bluetooth/bluetooth_shell.c
@@ -15,7 +15,7 @@ LOG_MODULE_REGISTER(net_bt_shell, CONFIG_NET_L2_BT_LOG_LEVEL);
 
 #include <shell/shell.h>
 #include <shell/shell_uart.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 
 #include <net/net_core.h>
 #include <net/net_l2.h>
diff --git a/subsys/net/l2/ieee802154/ieee802154_shell.c b/subsys/net/l2/ieee802154/ieee802154_shell.c
index 301e39924ac..68b66f772ac 100644
--- a/subsys/net/l2/ieee802154/ieee802154_shell.c
+++ b/subsys/net/l2/ieee802154/ieee802154_shell.c
@@ -16,7 +16,7 @@ LOG_MODULE_REGISTER(net_ieee802154_shell, CONFIG_NET_L2_IEEE802154_LOG_LEVEL);
 #include <stdlib.h>
 #include <shell/shell.h>
 #include <shell/shell_uart.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 
 #include <net/net_if.h>
 #include <net/ieee802154_mgmt.h>
diff --git a/subsys/net/l2/wifi/wifi_shell.c b/subsys/net/l2/wifi/wifi_shell.c
index 43afc19829f..321c4701bc2 100644
--- a/subsys/net/l2/wifi/wifi_shell.c
+++ b/subsys/net/l2/wifi/wifi_shell.c
@@ -16,7 +16,7 @@ LOG_MODULE_REGISTER(net_wifi_shell, LOG_LEVEL_INF);
 #include <stdlib.h>
 #include <shell/shell.h>
 #include <shell/shell_uart.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <init.h>
 
 #include <net/net_if.h>
diff --git a/subsys/net/lib/coap/coap_link_format.c b/subsys/net/lib/coap/coap_link_format.c
index 91d563f704d..b62c93afc82 100644
--- a/subsys/net/lib/coap/coap_link_format.c
+++ b/subsys/net/lib/coap/coap_link_format.c
@@ -16,7 +16,7 @@ LOG_MODULE_DECLARE(net_coap, CONFIG_COAP_LOG_LEVEL);
 
 #include <sys/byteorder.h>
 
-#include <misc/printk.h>
+#include <sys/printk.h>
 
 #include <net/coap.h>
 #include <net/coap_link_format.h>
diff --git a/subsys/net/lib/lwm2m/lwm2m_engine.c b/subsys/net/lib/lwm2m/lwm2m_engine.c
index 3eab945b2fc..10e369b3548 100644
--- a/subsys/net/lib/lwm2m/lwm2m_engine.c
+++ b/subsys/net/lib/lwm2m/lwm2m_engine.c
@@ -31,7 +31,7 @@ LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 #include <ctype.h>
 #include <errno.h>
 #include <init.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <net/net_ip.h>
 #include <net/http_parser_url.h>
 #include <net/socket.h>
diff --git a/subsys/net/lib/lwm2m/lwm2m_object.h b/subsys/net/lib/lwm2m/lwm2m_object.h
index ef46c755ebd..5d01c40d773 100644
--- a/subsys/net/lib/lwm2m/lwm2m_object.h
+++ b/subsys/net/lib/lwm2m/lwm2m_object.h
@@ -50,7 +50,7 @@
 #include <kernel.h>
 
 #include <net/net_ip.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <misc/util.h>
 
 #include <net/coap.h>
diff --git a/subsys/net/lib/lwm2m/lwm2m_rd_client.c b/subsys/net/lib/lwm2m/lwm2m_rd_client.c
index 12818678691..47fdd04e2a4 100644
--- a/subsys/net/lib/lwm2m/lwm2m_rd_client.c
+++ b/subsys/net/lib/lwm2m/lwm2m_rd_client.c
@@ -54,7 +54,7 @@ LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 #include <string.h>
 #include <errno.h>
 #include <init.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 
 #include "lwm2m_object.h"
 #include "lwm2m_engine.h"
diff --git a/subsys/net/lib/openthread/platform/shell.c b/subsys/net/lib/openthread/platform/shell.c
index 2d87581fb4e..ffb45169005 100644
--- a/subsys/net/lib/openthread/platform/shell.c
+++ b/subsys/net/lib/openthread/platform/shell.c
@@ -6,7 +6,7 @@
 
 #include <kernel.h>
 #include <stdio.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <shell/shell.h>
 #include <shell/shell_uart.h>
 
diff --git a/subsys/power/reboot.c b/subsys/power/reboot.c
index 212089c4beb..fbe647bd381 100644
--- a/subsys/power/reboot.c
+++ b/subsys/power/reboot.c
@@ -12,7 +12,7 @@
 
 #include <kernel.h>
 #include <drivers/timer/system_timer.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <misc/reboot.h>
 
 extern void sys_arch_reboot(int type);
diff --git a/subsys/shell/modules/kernel_service.c b/subsys/shell/modules/kernel_service.c
index 49f095b7ec6..00f2ae126c8 100644
--- a/subsys/shell/modules/kernel_service.c
+++ b/subsys/shell/modules/kernel_service.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <shell/shell.h>
 #include <init.h>
 #include <debug/object_tracing.h>
diff --git a/subsys/testsuite/include/tc_util.h b/subsys/testsuite/include/tc_util.h
index 087b840a187..77731d1c050 100644
--- a/subsys/testsuite/include/tc_util.h
+++ b/subsys/testsuite/include/tc_util.h
@@ -13,7 +13,7 @@
 
 #include <string.h>
 #include <shell/shell.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 
 #define PRINT_DATA(fmt, ...) printk(fmt, ##__VA_ARGS__)
 
diff --git a/subsys/testsuite/ztest/include/ztest.h b/subsys/testsuite/ztest/include/ztest.h
index 4d0dacaa171..993629c7494 100644
--- a/subsys/testsuite/ztest/include/ztest.h
+++ b/subsys/testsuite/ztest/include/ztest.h
@@ -46,7 +46,7 @@ extern "C" {
 #define CONFIG_PRINTK 1
 #endif
 
-#include <misc/printk.h>
+#include <sys/printk.h>
 #define PRINT printk
 
 #include <zephyr.h>
diff --git a/tests/benchmarks/latency_measure/src/utils.h b/tests/benchmarks/latency_measure/src/utils.h
index faec442240c..c3e08145970 100644
--- a/tests/benchmarks/latency_measure/src/utils.h
+++ b/tests/benchmarks/latency_measure/src/utils.h
@@ -16,7 +16,7 @@
 #define IRQ_PRIORITY      3
 
 #ifdef CONFIG_PRINTK
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <stdio.h>
 #include "timestamp.h"
 extern char tmp_string[];
diff --git a/tests/benchmarks/mbedtls/src/benchmark.c b/tests/benchmarks/mbedtls/src/benchmark.c
index 0715d84afd9..56a63bc7a38 100644
--- a/tests/benchmarks/mbedtls/src/benchmark.c
+++ b/tests/benchmarks/mbedtls/src/benchmark.c
@@ -72,7 +72,7 @@
 
 #include "kernel.h"
 
-#include <misc/printk.h>
+#include <sys/printk.h>
 #define  MBEDTLS_PRINT ((int(*)(const char *, ...)) printk)
 
 static void my_debug(void *ctx, int level,
diff --git a/tests/benchmarks/sched/src/main.c b/tests/benchmarks/sched/src/main.c
index 501aad81b54..b9684f7c221 100644
--- a/tests/benchmarks/sched/src/main.c
+++ b/tests/benchmarks/sched/src/main.c
@@ -5,7 +5,7 @@
  */
 
 #include <zephyr.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <wait_q.h>
 #include <ksched.h>
 
diff --git a/tests/bluetooth/bsim_bt/bsim_test_app/src/test_connect1.c b/tests/bluetooth/bsim_bt/bsim_test_app/src/test_connect1.c
index cbf029ddfa4..f260e914709 100644
--- a/tests/bluetooth/bsim_bt/bsim_test_app/src/test_connect1.c
+++ b/tests/bluetooth/bsim_bt/bsim_test_app/src/test_connect1.c
@@ -15,7 +15,7 @@
 #include <stddef.h>
 #include <errno.h>
 #include <zephyr.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 
 #include <bluetooth/bluetooth.h>
 #include <bluetooth/hci.h>
diff --git a/tests/bluetooth/bsim_bt/bsim_test_app/src/test_connect2.c b/tests/bluetooth/bsim_bt/bsim_test_app/src/test_connect2.c
index c6298d09594..9321dc59a4a 100644
--- a/tests/bluetooth/bsim_bt/bsim_test_app/src/test_connect2.c
+++ b/tests/bluetooth/bsim_bt/bsim_test_app/src/test_connect2.c
@@ -15,7 +15,7 @@
 #include <stddef.h>
 #include <errno.h>
 #include <zephyr.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 
 #include <bluetooth/bluetooth.h>
 #include <bluetooth/hci.h>
diff --git a/tests/bluetooth/ctrl_user_ext/src/main.c b/tests/bluetooth/ctrl_user_ext/src/main.c
index a611195817d..6b474934409 100644
--- a/tests/bluetooth/ctrl_user_ext/src/main.c
+++ b/tests/bluetooth/ctrl_user_ext/src/main.c
@@ -8,7 +8,7 @@
 
 #include <zephyr/types.h>
 #include <stddef.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <ztest.h>
 
 #include <bluetooth/bluetooth.h>
diff --git a/tests/bluetooth/init/src/main.c b/tests/bluetooth/init/src/main.c
index 99c863bc45e..6597e7632cb 100644
--- a/tests/bluetooth/init/src/main.c
+++ b/tests/bluetooth/init/src/main.c
@@ -8,7 +8,7 @@
 
 #include <zephyr/types.h>
 #include <stddef.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <ztest.h>
 
 #include <bluetooth/bluetooth.h>
diff --git a/tests/bluetooth/mesh/src/main.c b/tests/bluetooth/mesh/src/main.c
index c7840ff7d52..c7caa795c10 100644
--- a/tests/bluetooth/mesh/src/main.c
+++ b/tests/bluetooth/mesh/src/main.c
@@ -6,7 +6,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <misc/printk.h>
+#include <sys/printk.h>
 
 #include <bluetooth/bluetooth.h>
 #include <bluetooth/mesh.h>
diff --git a/tests/bluetooth/mesh_shell/src/main.c b/tests/bluetooth/mesh_shell/src/main.c
index 8021da8122e..820a35d1097 100644
--- a/tests/bluetooth/mesh_shell/src/main.c
+++ b/tests/bluetooth/mesh_shell/src/main.c
@@ -8,7 +8,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <zephyr.h>
 
 #include <shell/shell.h>
diff --git a/tests/bluetooth/shell/src/main.c b/tests/bluetooth/shell/src/main.c
index 612034eae83..aeaae9c36c2 100644
--- a/tests/bluetooth/shell/src/main.c
+++ b/tests/bluetooth/shell/src/main.c
@@ -17,7 +17,7 @@
 #include <stddef.h>
 #include <stdlib.h>
 #include <string.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <sys/byteorder.h>
 #include <zephyr.h>
 
diff --git a/tests/bluetooth/tester/src/gatt.c b/tests/bluetooth/tester/src/gatt.c
index 7d33b6686a9..dde78c1ffac 100644
--- a/tests/bluetooth/tester/src/gatt.c
+++ b/tests/bluetooth/tester/src/gatt.c
@@ -17,7 +17,7 @@
 #include <bluetooth/gatt.h>
 #include <bluetooth/uuid.h>
 #include <sys/byteorder.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <net/buf.h>
 
 #include <logging/log.h>
diff --git a/tests/boards/board_shell/src/main.c b/tests/boards/board_shell/src/main.c
index 7adad59e074..c97275ef434 100644
--- a/tests/boards/board_shell/src/main.c
+++ b/tests/boards/board_shell/src/main.c
@@ -5,7 +5,7 @@
  */
 
 #include <zephyr.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <shell/shell.h>
 #include <shell/shell_uart.h>
 #include <version.h>
diff --git a/tests/boards/intel_s1000_crb/src/dma_test.c b/tests/boards/intel_s1000_crb/src/dma_test.c
index 9cf2f09a2ed..036124d7f33 100644
--- a/tests/boards/intel_s1000_crb/src/dma_test.c
+++ b/tests/boards/intel_s1000_crb/src/dma_test.c
@@ -27,7 +27,7 @@
  */
 
 #include <zephyr.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 
 #include <device.h>
 #include <drivers/dma.h>
diff --git a/tests/boards/intel_s1000_crb/src/gpio_test.c b/tests/boards/intel_s1000_crb/src/gpio_test.c
index a43a65e273b..73337c22ac5 100644
--- a/tests/boards/intel_s1000_crb/src/gpio_test.c
+++ b/tests/boards/intel_s1000_crb/src/gpio_test.c
@@ -28,7 +28,7 @@
  */
 
 #include <zephyr.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 
 #include <device.h>
 #include <drivers/gpio.h>
diff --git a/tests/boards/intel_s1000_crb/src/i2c_test.c b/tests/boards/intel_s1000_crb/src/i2c_test.c
index 790efe06b05..d2962d987f1 100644
--- a/tests/boards/intel_s1000_crb/src/i2c_test.c
+++ b/tests/boards/intel_s1000_crb/src/i2c_test.c
@@ -28,7 +28,7 @@
  */
 
 #include <zephyr.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 
 #include <device.h>
 #include <drivers/i2c.h>
diff --git a/tests/boards/intel_s1000_crb/src/i2s_test.c b/tests/boards/intel_s1000_crb/src/i2s_test.c
index 8d306e58185..077b1bb2465 100644
--- a/tests/boards/intel_s1000_crb/src/i2s_test.c
+++ b/tests/boards/intel_s1000_crb/src/i2s_test.c
@@ -21,7 +21,7 @@
  */
 
 #include <zephyr.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 
 #include <device.h>
 #include <drivers/i2s.h>
diff --git a/tests/boards/intel_s1000_crb/src/main.c b/tests/boards/intel_s1000_crb/src/main.c
index 5e15e214f9b..e60fa47fdcd 100644
--- a/tests/boards/intel_s1000_crb/src/main.c
+++ b/tests/boards/intel_s1000_crb/src/main.c
@@ -5,7 +5,7 @@
  */
 
 #include <zephyr.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #define LOG_LEVEL CONFIG_LOG_DEFAULT_LEVEL
 #include <logging/log.h>
 
diff --git a/tests/boards/native_posix/rtc/src/main.c b/tests/boards/native_posix/rtc/src/main.c
index 924f84997ba..4153a311705 100644
--- a/tests/boards/native_posix/rtc/src/main.c
+++ b/tests/boards/native_posix/rtc/src/main.c
@@ -6,7 +6,7 @@
 
 #include <ztest.h>
 #include <zephyr.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/tests/crypto/mbedtls/src/mbedtls.c b/tests/crypto/mbedtls/src/mbedtls.c
index a5e835264ef..04cc61ad110 100644
--- a/tests/crypto/mbedtls/src/mbedtls.c
+++ b/tests/crypto/mbedtls/src/mbedtls.c
@@ -7,7 +7,7 @@
  *  This file is part of mbed TLS (https://tls.mbed.org)
  */
 
-#include <misc/printk.h>
+#include <sys/printk.h>
 #define  MBEDTLS_PRINT (int(*)(const char *, ...)) printk
 
 #include <string.h>
diff --git a/tests/crypto/tinycrypt/src/aes.c b/tests/crypto/tinycrypt/src/aes.c
index 46684c89515..6dd8c13116a 100644
--- a/tests/crypto/tinycrypt/src/aes.c
+++ b/tests/crypto/tinycrypt/src/aes.c
@@ -53,7 +53,7 @@
 
 #include <zephyr/types.h>
 #include <stddef.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <ztest.h>
 
 #define NUM_OF_NIST_KEYS 16
diff --git a/tests/drivers/build_all/src/main.c b/tests/drivers/build_all/src/main.c
index 08ae38e32d2..17c097ec577 100644
--- a/tests/drivers/build_all/src/main.c
+++ b/tests/drivers/build_all/src/main.c
@@ -5,7 +5,7 @@
  */
 
 #include <zephyr.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 
 
 /*
diff --git a/tests/drivers/dma/loop_transfer/src/dma.c b/tests/drivers/dma/loop_transfer/src/dma.c
index 6693632ebd7..dc5e9787773 100644
--- a/tests/drivers/dma/loop_transfer/src/dma.c
+++ b/tests/drivers/dma/loop_transfer/src/dma.c
@@ -10,7 +10,7 @@
 
 #include <device.h>
 #include <drivers/dma.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <string.h>
 
 /* in millisecond */
diff --git a/tests/drivers/ipm/src/ipm_dummy.c b/tests/drivers/ipm/src/ipm_dummy.c
index e7a5f6ea3e7..149957481d5 100644
--- a/tests/drivers/ipm/src/ipm_dummy.c
+++ b/tests/drivers/ipm/src/ipm_dummy.c
@@ -11,7 +11,7 @@
 #include <errno.h>
 #include <device.h>
 #include <init.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <irq_offload.h>
 
 #include "ipm_dummy.h"
diff --git a/tests/drivers/spi/spi_loopback/src/spi.c b/tests/drivers/spi/spi_loopback/src/spi.c
index 41b0b09de0b..887d4df3081 100644
--- a/tests/drivers/spi/spi_loopback/src/spi.c
+++ b/tests/drivers/spi/spi_loopback/src/spi.c
@@ -9,7 +9,7 @@
 LOG_MODULE_REGISTER(main);
 
 #include <zephyr.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <string.h>
 #include <stdio.h>
 #include <ztest.h>
diff --git a/tests/kernel/arm_runtime_nmi/src/arm_runtime_nmi.c b/tests/kernel/arm_runtime_nmi/src/arm_runtime_nmi.c
index f5449504112..981d2eeaf29 100644
--- a/tests/kernel/arm_runtime_nmi/src/arm_runtime_nmi.c
+++ b/tests/kernel/arm_runtime_nmi/src/arm_runtime_nmi.c
@@ -5,7 +5,7 @@
  */
 
 #include <zephyr.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <misc/reboot.h>
 #include <arch/arm/cortex_m/cmsis.h>
 #include <ztest.h>
diff --git a/tests/kernel/boot_page_table/src/boot_page_table.c b/tests/kernel/boot_page_table/src/boot_page_table.c
index f3302a455ff..00082b2d279 100644
--- a/tests/kernel/boot_page_table/src/boot_page_table.c
+++ b/tests/kernel/boot_page_table/src/boot_page_table.c
@@ -5,7 +5,7 @@
  */
 
 #include <zephyr.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <mmustructs.h>
 #include <ztest.h>
 #include "boot_page_table.h"
diff --git a/tests/kernel/common/src/timeout_order.c b/tests/kernel/common/src/timeout_order.c
index d043abde484..d5ac467dfd1 100644
--- a/tests/kernel/common/src/timeout_order.c
+++ b/tests/kernel/common/src/timeout_order.c
@@ -5,7 +5,7 @@
  */
 
 #include <kernel.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <ztest.h>
 
 #define NUM_TIMEOUTS 3
diff --git a/tests/kernel/device/src/main.c b/tests/kernel/device/src/main.c
index d9efa5b003c..4c092c0f4e7 100644
--- a/tests/kernel/device/src/main.c
+++ b/tests/kernel/device/src/main.c
@@ -7,7 +7,7 @@
 #include <zephyr.h>
 #include <device.h>
 #include <ztest.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 
 
 #define DUMMY_PORT_1    "dummy"
diff --git a/tests/kernel/mem_protect/protection/src/targets.c b/tests/kernel/mem_protect/protection/src/targets.c
index 9182e2e8028..42814de9bd0 100644
--- a/tests/kernel/mem_protect/protection/src/targets.c
+++ b/tests/kernel/mem_protect/protection/src/targets.c
@@ -5,7 +5,7 @@
  */
 
 #include <zephyr.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 
 #include "targets.h"
 
diff --git a/tests/kernel/mem_protect/x86_mmu_api/src/userbuffer_validate.c b/tests/kernel/mem_protect/x86_mmu_api/src/userbuffer_validate.c
index e732a2ca036..36e2d27f282 100644
--- a/tests/kernel/mem_protect/x86_mmu_api/src/userbuffer_validate.c
+++ b/tests/kernel/mem_protect/x86_mmu_api/src/userbuffer_validate.c
@@ -5,7 +5,7 @@
  */
 
 #include <zephyr.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <mmustructs.h>
 #include <arch/x86/arch.h>
 #include <linker/linker-defs.h>
diff --git a/tests/kernel/tickless/tickless/src/main.c b/tests/kernel/tickless/tickless/src/main.c
index 88598346b23..4378be014e8 100644
--- a/tests/kernel/tickless/tickless/src/main.c
+++ b/tests/kernel/tickless/tickless/src/main.c
@@ -11,7 +11,7 @@
 #include <zephyr.h>
 #include <ztest.h>
 
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <arch/cpu.h>
 #include <tc_util.h>
 #if defined(CONFIG_ARCH_POSIX)
diff --git a/tests/misc/test_build/src/main.c b/tests/misc/test_build/src/main.c
index 3117175377e..1d28987b92e 100644
--- a/tests/misc/test_build/src/main.c
+++ b/tests/misc/test_build/src/main.c
@@ -7,7 +7,7 @@
  */
 
 #include <zephyr.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 
 /*
  * The hello world demo has two threads that utilize semaphores and sleeping
diff --git a/tests/net/buf/src/main.c b/tests/net/buf/src/main.c
index cb6145b2854..400b821bf3e 100644
--- a/tests/net/buf/src/main.c
+++ b/tests/net/buf/src/main.c
@@ -9,7 +9,7 @@
 #include <zephyr/types.h>
 #include <stddef.h>
 #include <string.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 
 #include <net/buf.h>
 
diff --git a/tests/net/checksum_offload/src/main.c b/tests/net/checksum_offload/src/main.c
index 1a0eedf42b6..478410aad6c 100644
--- a/tests/net/checksum_offload/src/main.c
+++ b/tests/net/checksum_offload/src/main.c
@@ -16,7 +16,7 @@ LOG_MODULE_REGISTER(net_test, NET_LOG_LEVEL);
 #include <stddef.h>
 #include <string.h>
 #include <errno.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <linker/sections.h>
 
 #include <ztest.h>
diff --git a/tests/net/context/src/main.c b/tests/net/context/src/main.c
index 6f1358eedec..1e0584c5766 100644
--- a/tests/net/context/src/main.c
+++ b/tests/net/context/src/main.c
@@ -15,7 +15,7 @@ LOG_MODULE_REGISTER(net_test, CONFIG_NET_CONTEXT_LOG_LEVEL);
 #include <stddef.h>
 #include <string.h>
 #include <errno.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <linker/sections.h>
 
 #include <tc_util.h>
diff --git a/tests/net/icmpv6/src/main.c b/tests/net/icmpv6/src/main.c
index cae662698e6..c1e4819cd44 100644
--- a/tests/net/icmpv6/src/main.c
+++ b/tests/net/icmpv6/src/main.c
@@ -13,7 +13,7 @@ LOG_MODULE_REGISTER(net_test, CONFIG_NET_ICMPV6_LOG_LEVEL);
 #include <zephyr/types.h>
 #include <stddef.h>
 #include <string.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <linker/sections.h>
 
 #include <tc_util.h>
diff --git a/tests/net/ieee802154/fragment/src/main.c b/tests/net/ieee802154/fragment/src/main.c
index e21411e9f83..14c1d4f7ec1 100644
--- a/tests/net/ieee802154/fragment/src/main.c
+++ b/tests/net/ieee802154/fragment/src/main.c
@@ -20,7 +20,7 @@ LOG_MODULE_REGISTER(net_test, CONFIG_NET_L2_IEEE802154_LOG_LEVEL);
 #include <errno.h>
 #include <device.h>
 #include <init.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <net/net_core.h>
 #include <net/net_pkt.h>
 #include <net/net_ip.h>
diff --git a/tests/net/iface/src/main.c b/tests/net/iface/src/main.c
index e465486dcf7..d94bb36e1d3 100644
--- a/tests/net/iface/src/main.c
+++ b/tests/net/iface/src/main.c
@@ -16,7 +16,7 @@ LOG_MODULE_REGISTER(net_test, NET_LOG_LEVEL);
 #include <stddef.h>
 #include <string.h>
 #include <errno.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <linker/sections.h>
 
 #include <ztest.h>
diff --git a/tests/net/ipv6_fragment/src/main.c b/tests/net/ipv6_fragment/src/main.c
index 1c2c3038964..e4766b91d06 100644
--- a/tests/net/ipv6_fragment/src/main.c
+++ b/tests/net/ipv6_fragment/src/main.c
@@ -14,7 +14,7 @@ LOG_MODULE_REGISTER(net_test, CONFIG_NET_IPV6_LOG_LEVEL);
 #include <stddef.h>
 #include <string.h>
 #include <errno.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <linker/sections.h>
 
 #include <ztest.h>
diff --git a/tests/net/lib/coap/src/main.c b/tests/net/lib/coap/src/main.c
index 52184ad8fc1..4b5618e056f 100644
--- a/tests/net/lib/coap/src/main.c
+++ b/tests/net/lib/coap/src/main.c
@@ -13,7 +13,7 @@ LOG_MODULE_REGISTER(net_test, LOG_LEVEL_DBG);
 #include <stddef.h>
 #include <stdio.h>
 #include <string.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <kernel.h>
 
 #include <net/coap.h>
diff --git a/tests/net/lib/dns_resolve/src/main.c b/tests/net/lib/dns_resolve/src/main.c
index b42be10a76b..76dedfaa837 100644
--- a/tests/net/lib/dns_resolve/src/main.c
+++ b/tests/net/lib/dns_resolve/src/main.c
@@ -12,7 +12,7 @@ LOG_MODULE_REGISTER(net_test, CONFIG_DNS_RESOLVER_LOG_LEVEL);
 #include <stddef.h>
 #include <string.h>
 #include <errno.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 
 #include <ztest.h>
 
diff --git a/tests/net/lib/http_header_fields/src/main.c b/tests/net/lib/http_header_fields/src/main.c
index 2bbf4ab19a7..080ef6b9493 100644
--- a/tests/net/lib/http_header_fields/src/main.c
+++ b/tests/net/lib/http_header_fields/src/main.c
@@ -23,7 +23,7 @@
 #include <string.h>
 #include <errno.h>
 
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <tc_util.h>
 #include <ztest.h>
 
diff --git a/tests/net/neighbor/src/main.c b/tests/net/neighbor/src/main.c
index 7f1c1f1a52a..ea5cfa19d50 100644
--- a/tests/net/neighbor/src/main.c
+++ b/tests/net/neighbor/src/main.c
@@ -17,7 +17,7 @@ LOG_MODULE_REGISTER(net_test, CONFIG_NET_IPV6_NBR_CACHE_LOG_LEVEL);
 #include <errno.h>
 #include <device.h>
 #include <init.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <net/net_core.h>
 #include <net/net_ip.h>
 #include <net/ethernet.h>
diff --git a/tests/net/promiscuous/src/main.c b/tests/net/promiscuous/src/main.c
index 360dc7b7ee7..da2f9cf4c58 100644
--- a/tests/net/promiscuous/src/main.c
+++ b/tests/net/promiscuous/src/main.c
@@ -16,7 +16,7 @@ LOG_MODULE_REGISTER(net_test, NET_LOG_LEVEL);
 #include <stddef.h>
 #include <string.h>
 #include <errno.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 
 #include <ztest.h>
 
diff --git a/tests/net/ptp/clock/src/main.c b/tests/net/ptp/clock/src/main.c
index 88e45d3a78c..61814646502 100644
--- a/tests/net/ptp/clock/src/main.c
+++ b/tests/net/ptp/clock/src/main.c
@@ -16,7 +16,7 @@ LOG_MODULE_REGISTER(net_test, NET_LOG_LEVEL);
 #include <stddef.h>
 #include <string.h>
 #include <errno.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <linker/sections.h>
 
 #include <ztest.h>
diff --git a/tests/net/route/src/main.c b/tests/net/route/src/main.c
index 1dea94b8b64..7709ea4fc6b 100644
--- a/tests/net/route/src/main.c
+++ b/tests/net/route/src/main.c
@@ -15,7 +15,7 @@ LOG_MODULE_REGISTER(net_test, CONFIG_NET_ROUTE_LOG_LEVEL);
 #include <stddef.h>
 #include <string.h>
 #include <errno.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <linker/sections.h>
 
 #include <tc_util.h>
diff --git a/tests/net/tcp/src/main.c b/tests/net/tcp/src/main.c
index 6ec751c258a..4a3f1fec895 100644
--- a/tests/net/tcp/src/main.c
+++ b/tests/net/tcp/src/main.c
@@ -18,7 +18,7 @@ LOG_MODULE_REGISTER(net_test, CONFIG_NET_TCP_LOG_LEVEL);
 #include <errno.h>
 #include <device.h>
 #include <init.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <net/buf.h>
 #include <net/net_core.h>
 #include <net/net_pkt.h>
diff --git a/tests/net/traffic_class/src/main.c b/tests/net/traffic_class/src/main.c
index 4515d1c5db4..0594a6fc1dd 100644
--- a/tests/net/traffic_class/src/main.c
+++ b/tests/net/traffic_class/src/main.c
@@ -16,7 +16,7 @@ LOG_MODULE_REGISTER(net_test, NET_LOG_LEVEL);
 #include <stddef.h>
 #include <string.h>
 #include <errno.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <linker/sections.h>
 
 #include <ztest.h>
diff --git a/tests/net/trickle/src/main.c b/tests/net/trickle/src/main.c
index 8f160624b81..50ed00736f2 100644
--- a/tests/net/trickle/src/main.c
+++ b/tests/net/trickle/src/main.c
@@ -15,7 +15,7 @@ LOG_MODULE_REGISTER(net_test, CONFIG_NET_TRICKLE_LOG_LEVEL);
 #include <stddef.h>
 #include <string.h>
 #include <errno.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <linker/sections.h>
 
 #include <tc_util.h>
diff --git a/tests/net/tx_timestamp/src/main.c b/tests/net/tx_timestamp/src/main.c
index dae6d6847ed..bfc8039bfe6 100644
--- a/tests/net/tx_timestamp/src/main.c
+++ b/tests/net/tx_timestamp/src/main.c
@@ -16,7 +16,7 @@ LOG_MODULE_REGISTER(net_test, NET_LOG_LEVEL);
 #include <stddef.h>
 #include <string.h>
 #include <errno.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <linker/sections.h>
 
 #include <ztest.h>
diff --git a/tests/net/udp/src/main.c b/tests/net/udp/src/main.c
index 20f708e58c6..55a26b459ea 100644
--- a/tests/net/udp/src/main.c
+++ b/tests/net/udp/src/main.c
@@ -21,7 +21,7 @@ LOG_MODULE_REGISTER(net_test, NET_LOG_LEVEL);
 #include <errno.h>
 #include <device.h>
 #include <init.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <net/buf.h>
 #include <net/net_core.h>
 #include <net/net_pkt.h>
diff --git a/tests/net/utils/src/main.c b/tests/net/utils/src/main.c
index 657d499bcb0..74620385871 100644
--- a/tests/net/utils/src/main.c
+++ b/tests/net/utils/src/main.c
@@ -16,7 +16,7 @@ LOG_MODULE_REGISTER(net_test, CONFIG_NET_UTILS_LOG_LEVEL);
 #include <errno.h>
 #include <device.h>
 #include <init.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <net/net_core.h>
 #include <net/net_ip.h>
 #include <net/ethernet.h>
diff --git a/tests/net/vlan/src/main.c b/tests/net/vlan/src/main.c
index e8af0e24c1f..4b03bd3e7bd 100644
--- a/tests/net/vlan/src/main.c
+++ b/tests/net/vlan/src/main.c
@@ -16,7 +16,7 @@ LOG_MODULE_REGISTER(net_test, NET_LOG_LEVEL);
 #include <stddef.h>
 #include <string.h>
 #include <errno.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <linker/sections.h>
 
 #include <ztest.h>
diff --git a/tests/posix/common/src/mqueue.c b/tests/posix/common/src/mqueue.c
index 9f376a604bf..d7123ea64e6 100644
--- a/tests/posix/common/src/mqueue.c
+++ b/tests/posix/common/src/mqueue.c
@@ -6,7 +6,7 @@
 
 #include <ztest.h>
 #include <zephyr.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include <mqueue.h>
 #include <pthread.h>
 
diff --git a/tests/subsys/settings/fcb/src/settings_test_compress_deleted.c b/tests/subsys/settings/fcb/src/settings_test_compress_deleted.c
index 8e11e297ee0..5786484b07e 100644
--- a/tests/subsys/settings/fcb/src/settings_test_compress_deleted.c
+++ b/tests/subsys/settings/fcb/src/settings_test_compress_deleted.c
@@ -6,7 +6,7 @@
 
 #include "settings_test.h"
 #include "settings/settings_fcb.h"
-#include <misc/printk.h>
+#include <sys/printk.h>
 
 #define NAME_DELETABLE "4/deletable"