diff --git a/arch/arc/core/prep_c.c b/arch/arc/core/prep_c.c
index 52f88516795..4e9fa2c641c 100644
--- a/arch/arc/core/prep_c.c
+++ b/arch/arc/core/prep_c.c
@@ -16,7 +16,7 @@
  * initialization is performed.
  */
 
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <toolchain.h>
 #include <linker-defs.h>
 #include <arch/arc/v2/aux_regs.h>
diff --git a/arch/arc/core/vector_table.c b/arch/arc/core/vector_table.c
index 7b754407c22..3b60b2d10bb 100644
--- a/arch/arc/core/vector_table.c
+++ b/arch/arc/core/vector_table.c
@@ -23,7 +23,7 @@
  * swapped.
  */
 
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <toolchain.h>
 #include "vector_table.h"
 
diff --git a/arch/arc/include/kernel_arch_data.h b/arch/arc/include/kernel_arch_data.h
index dd34fa1f217..4cd74760db1 100644
--- a/arch/arc/include/kernel_arch_data.h
+++ b/arch/arc/include/kernel_arch_data.h
@@ -32,7 +32,7 @@ extern "C" {
 #ifndef _ASMLANGUAGE
 #include <kernel.h>
 #include <nano_internal.h>
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <misc/util.h>
 #include <misc/dlist.h>
 #endif
diff --git a/arch/arm/core/cortex_m/prep_c.c b/arch/arm/core/cortex_m/prep_c.c
index ee910cfb358..f6fbbce984f 100644
--- a/arch/arm/core/cortex_m/prep_c.c
+++ b/arch/arm/core/cortex_m/prep_c.c
@@ -17,7 +17,7 @@
  */
 
 #include <kernel.h>
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <toolchain.h>
 #include <linker-defs.h>
 #include <nano_internal.h>
diff --git a/arch/arm/include/kernel_arch_data.h b/arch/arm/include/kernel_arch_data.h
index 763d03c4121..2fd5a0540ba 100644
--- a/arch/arm/include/kernel_arch_data.h
+++ b/arch/arm/include/kernel_arch_data.h
@@ -31,7 +31,7 @@ extern "C" {
 #ifndef _ASMLANGUAGE
 #include <kernel.h>
 #include <nano_internal.h>
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <misc/dlist.h>
 #include <atomic.h>
 #endif
diff --git a/arch/arm/soc/arm/mps2/soc_registers.h b/arch/arm/soc/arm/mps2/soc_registers.h
index 2ee96737733..1e0d043271b 100644
--- a/arch/arm/soc/arm/mps2/soc_registers.h
+++ b/arch/arm/soc/arm/mps2/soc_registers.h
@@ -13,7 +13,7 @@
 #define _ARM_MPS2_REGS_H_
 
 #include <misc/util.h>
-#include <stdint.h>
+#include <zephyr/types.h>
 
 /* System Control Register (SYSCON) */
 struct mps2_syscon {
diff --git a/arch/arm/soc/atmel_sam/common/soc_gpio.h b/arch/arm/soc/atmel_sam/common/soc_gpio.h
index be5ba8cb2ab..1239fa91ace 100644
--- a/arch/arm/soc/atmel_sam/common/soc_gpio.h
+++ b/arch/arm/soc/atmel_sam/common/soc_gpio.h
@@ -11,7 +11,7 @@
 #ifndef _ATMEL_SAM_SOC_GPIO_H_
 #define _ATMEL_SAM_SOC_GPIO_H_
 
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <soc.h>
 #include <gpio.h>
 
diff --git a/arch/arm/soc/atmel_sam/common/soc_pmc.h b/arch/arm/soc/atmel_sam/common/soc_pmc.h
index 8db6f53f584..8f31e24dbbe 100644
--- a/arch/arm/soc/atmel_sam/common/soc_pmc.h
+++ b/arch/arm/soc/atmel_sam/common/soc_pmc.h
@@ -11,7 +11,7 @@
 #ifndef _ATMEL_SAM_SOC_PMC_H_
 #define _ATMEL_SAM_SOC_PMC_H_
 
-#include <stdint.h>
+#include <zephyr/types.h>
 
 /**
  * @brief Enable the clock of specified peripheral module.
diff --git a/arch/arm/soc/st_stm32/stm32f3/flash_registers.h b/arch/arm/soc/st_stm32/stm32f3/flash_registers.h
index b61502fb4b0..9de7ee9a768 100644
--- a/arch/arm/soc/st_stm32/stm32f3/flash_registers.h
+++ b/arch/arm/soc/st_stm32/stm32f3/flash_registers.h
@@ -7,7 +7,7 @@
 #ifndef _STM32F3X_FLASH_REGISTERS_H_
 #define _STM32F3X_FLASH_REGISTERS_H_
 
-#include <stdint.h>
+#include <zephyr/types.h>
 
 /**
  * @brief
diff --git a/arch/arm/soc/ti_lm3s6965/scp.c b/arch/arm/soc/ti_lm3s6965/scp.c
index 291b3acf18e..73c7aba9b05 100644
--- a/arch/arm/soc/ti_lm3s6965/scp.c
+++ b/arch/arm/soc/ti_lm3s6965/scp.c
@@ -15,7 +15,7 @@
  * Currently, only enabling the main OSC with default value is implemented.
  */
 
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <toolchain.h>
 #include <sections.h>
 
diff --git a/arch/arm/soc/ti_lm3s6965/scp.h b/arch/arm/soc/ti_lm3s6965/scp.h
index f35c657f124..933f341159a 100644
--- a/arch/arm/soc/ti_lm3s6965/scp.h
+++ b/arch/arm/soc/ti_lm3s6965/scp.h
@@ -27,7 +27,7 @@
 #ifndef _SCP_H_
 #define _SCP_H_
 
-#include <stdint.h>
+#include <zephyr/types.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/arch/nios2/core/prep_c.c b/arch/nios2/core/prep_c.c
index 8c9cb4c65e8..1f016c1b1f3 100644
--- a/arch/nios2/core/prep_c.c
+++ b/arch/nios2/core/prep_c.c
@@ -16,7 +16,7 @@
  * initialization is performed.
  */
 
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <toolchain.h>
 #include <linker-defs.h>
 #include <kernel_structs.h>
diff --git a/arch/nios2/include/kernel_arch_data.h b/arch/nios2/include/kernel_arch_data.h
index db7a7c49a0c..80c749fc6a9 100644
--- a/arch/nios2/include/kernel_arch_data.h
+++ b/arch/nios2/include/kernel_arch_data.h
@@ -32,7 +32,7 @@ extern "C" {
 #ifndef _ASMLANGUAGE
 #include <kernel.h>
 #include <nano_internal.h>
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <misc/util.h>
 #include <misc/dlist.h>
 #endif
diff --git a/arch/riscv32/include/kernel_arch_data.h b/arch/riscv32/include/kernel_arch_data.h
index afbce15a93c..a2a12e5ec67 100644
--- a/arch/riscv32/include/kernel_arch_data.h
+++ b/arch/riscv32/include/kernel_arch_data.h
@@ -25,7 +25,7 @@ extern "C" {
 
 #ifndef _ASMLANGUAGE
 #include <kernel.h>
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <misc/util.h>
 #include <misc/dlist.h>
 #include <nano_internal.h>
diff --git a/arch/x86/include/kernel_arch_data.h b/arch/x86/include/kernel_arch_data.h
index 98fff9063d3..13106936282 100644
--- a/arch/x86/include/kernel_arch_data.h
+++ b/arch/x86/include/kernel_arch_data.h
@@ -34,7 +34,7 @@
 #ifndef _ASMLANGUAGE
 #include <kernel.h>
 #include <nano_internal.h>
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <misc/dlist.h>
 #endif
 
diff --git a/arch/x86/soc/intel_quark/quark_d2000/soc.h b/arch/x86/soc/intel_quark/quark_d2000/soc.h
index c8fef60cb42..a6dea6d5b94 100644
--- a/arch/x86/soc/intel_quark/quark_d2000/soc.h
+++ b/arch/x86/soc/intel_quark/quark_d2000/soc.h
@@ -13,7 +13,7 @@
 #ifndef __SOC_H_
 #define __SOC_H_
 
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <misc/util.h>
 #include <uart.h>
 #include <drivers/ioapic.h>
diff --git a/arch/x86/soc/intel_quark/quark_se/soc.h b/arch/x86/soc/intel_quark/quark_se/soc.h
index eb53059904a..7fc4689389f 100644
--- a/arch/x86/soc/intel_quark/quark_se/soc.h
+++ b/arch/x86/soc/intel_quark/quark_se/soc.h
@@ -13,7 +13,7 @@
 #ifndef __SOC_H_
 #define __SOC_H_
 
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <misc/util.h>
 #include <uart.h>
 
diff --git a/arch/x86/soc/intel_quark/quark_se/soc_config.c b/arch/x86/soc/intel_quark/quark_se/soc_config.c
index a85b2c548fb..70bc9a0986b 100644
--- a/arch/x86/soc/intel_quark/quark_se/soc_config.c
+++ b/arch/x86/soc/intel_quark/quark_se/soc_config.c
@@ -5,7 +5,7 @@
  */
 
 #include <stdio.h>
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <device.h>
 #include <init.h>
 
diff --git a/arch/xtensa/core/irq_manage.c b/arch/xtensa/core/irq_manage.c
index 58a92f1dc9d..4f037be32cd 100644
--- a/arch/xtensa/core/irq_manage.c
+++ b/arch/xtensa/core/irq_manage.c
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <stdio.h>
 #include <xtensa_api.h>
 #include <kernel_arch_data.h>
diff --git a/arch/xtensa/include/kernel_arch_data.h b/arch/xtensa/include/kernel_arch_data.h
index 4c2eb884ac9..7d600936dc9 100644
--- a/arch/xtensa/include/kernel_arch_data.h
+++ b/arch/xtensa/include/kernel_arch_data.h
@@ -32,7 +32,7 @@ extern "C" {
 #if !defined(_ASMLANGUAGE) && !defined(__ASSEMBLER__)
 #include <kernel.h>            /* public kernel API */
 #include <nano_internal.h>
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <misc/dlist.h>
 #include <misc/util.h>
 
diff --git a/drivers/adc/adc_dw.h b/drivers/adc/adc_dw.h
index 1dc15252351..c31f5e105f6 100644
--- a/drivers/adc/adc_dw.h
+++ b/drivers/adc/adc_dw.h
@@ -36,7 +36,7 @@
 #ifndef DW_ADC_H_
 #define DW_ADC_H_
 
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <adc.h>
 
 #ifdef __cplusplus
diff --git a/drivers/bluetooth/nble/rpc.h b/drivers/bluetooth/nble/rpc.h
index c879bd26190..34524de6628 100644
--- a/drivers/bluetooth/nble/rpc.h
+++ b/drivers/bluetooth/nble/rpc.h
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <net/buf.h>
 
 /** Identifiers of the signature supported by the RPC */
diff --git a/drivers/console/uart_console.c b/drivers/console/uart_console.c
index 73b11a4304a..3dbc453b761 100644
--- a/drivers/console/uart_console.c
+++ b/drivers/console/uart_console.c
@@ -17,7 +17,7 @@
 #include <arch/cpu.h>
 
 #include <stdio.h>
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <errno.h>
 #include <ctype.h>
 
diff --git a/drivers/ethernet/eth_sam_gmac_priv.h b/drivers/ethernet/eth_sam_gmac_priv.h
index 78ef9fe9c82..e4f6f99cb9e 100644
--- a/drivers/ethernet/eth_sam_gmac_priv.h
+++ b/drivers/ethernet/eth_sam_gmac_priv.h
@@ -10,7 +10,7 @@
 #ifndef _ETH_SAM_GMAC_PRIV_H_
 #define _ETH_SAM_GMAC_PRIV_H_
 
-#include <stdint.h>
+#include <zephyr/types.h>
 
 #define GMAC_MTU 1500
 #define GMAC_FRAME_SIZE_MAX (GMAC_MTU + 18)
diff --git a/drivers/ethernet/phy_sam_gmac.h b/drivers/ethernet/phy_sam_gmac.h
index 6d9d32ceb21..5c2178e9ae1 100644
--- a/drivers/ethernet/phy_sam_gmac.h
+++ b/drivers/ethernet/phy_sam_gmac.h
@@ -10,7 +10,7 @@
 #ifndef _PHY_SAM_GMAC_H_
 #define _PHY_SAM_GMAC_H_
 
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <soc.h>
 
 #ifdef __cplusplus
diff --git a/drivers/gpio/gpio_dw.h b/drivers/gpio/gpio_dw.h
index c9f6efc1bc2..fecc7905f95 100644
--- a/drivers/gpio/gpio_dw.h
+++ b/drivers/gpio/gpio_dw.h
@@ -7,7 +7,7 @@
 #ifndef _GPIO_DW_H_
 #define _GPIO_DW_H_
 
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <gpio.h>
 #include "gpio_dw_registers.h"
 
diff --git a/drivers/gpio/gpio_sch.h b/drivers/gpio/gpio_sch.h
index 06cd568c4d4..853aeff8ff9 100644
--- a/drivers/gpio/gpio_sch.h
+++ b/drivers/gpio/gpio_sch.h
@@ -10,7 +10,7 @@
 #ifndef __GPIO_SCH_H__
 #define __GPIO_SCH_H__
 
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <kernel.h>
 #include <gpio.h>
 
diff --git a/drivers/i2c/i2c_dw.c b/drivers/i2c/i2c_dw.c
index cdb2ffd7a74..68350eda33c 100644
--- a/drivers/i2c/i2c_dw.c
+++ b/drivers/i2c/i2c_dw.c
@@ -6,7 +6,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 #include <stddef.h>
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <stdlib.h>
 #include <stdbool.h>
 
diff --git a/drivers/interrupt_controller/exti_stm32.h b/drivers/interrupt_controller/exti_stm32.h
index 5ef77481ae8..c8bbbad50cb 100644
--- a/drivers/interrupt_controller/exti_stm32.h
+++ b/drivers/interrupt_controller/exti_stm32.h
@@ -21,7 +21,7 @@
 #ifndef _STM32_EXTI_H_
 #define _STM32_EXTI_H_
 
-#include <stdint.h>
+#include <zephyr/types.h>
 
 /* device name */
 #define STM32_EXTI_NAME "stm32-exti"
diff --git a/drivers/interrupt_controller/loapic_intr.c b/drivers/interrupt_controller/loapic_intr.c
index 602ab6e309e..d2bf8414874 100644
--- a/drivers/interrupt_controller/loapic_intr.c
+++ b/drivers/interrupt_controller/loapic_intr.c
@@ -79,7 +79,7 @@
 
 #include <kernel.h>
 #include <arch/cpu.h>
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <string.h>
 #include <misc/__assert.h>
 
diff --git a/drivers/ipm/ipm_quark_se.c b/drivers/ipm/ipm_quark_se.c
index 2ff8704165b..7a5faa69b8a 100644
--- a/drivers/ipm/ipm_quark_se.c
+++ b/drivers/ipm/ipm_quark_se.c
@@ -7,7 +7,7 @@
  */
 
 #include <kernel.h>
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <string.h>
 #include <device.h>
 #include <init.h>
diff --git a/drivers/pinmux/pinmux.h b/drivers/pinmux/pinmux.h
index 85f60a5bad5..a55f41d7e1d 100644
--- a/drivers/pinmux/pinmux.h
+++ b/drivers/pinmux/pinmux.h
@@ -8,7 +8,7 @@
 #ifndef __DRIVERS_PINMUX_H
 #define __DRIVERS_PINMUX_H
 
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <device.h>
 
 #ifdef __cplusplus
diff --git a/drivers/pinmux/stm32/pinmux_stm32.h b/drivers/pinmux/stm32/pinmux_stm32.h
index afdbcd27e9a..d6e481565ac 100644
--- a/drivers/pinmux/stm32/pinmux_stm32.h
+++ b/drivers/pinmux/stm32/pinmux_stm32.h
@@ -11,7 +11,7 @@
 #ifndef _STM32_PINMUX_H_
 #define _STM32_PINMUX_H_
 
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <stddef.h>
 #include <clock_control.h>
 #include "pinmux/pinmux.h"
diff --git a/drivers/sensor/adxl362/adxl362.h b/drivers/sensor/adxl362/adxl362.h
index b6874e8a47f..6b544bc3fca 100644
--- a/drivers/sensor/adxl362/adxl362.h
+++ b/drivers/sensor/adxl362/adxl362.h
@@ -7,7 +7,7 @@
 #ifndef __SENSOR_ADXL362_H__
 #define __SENSOR_ADXL362_H__
 
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <device.h>
 
 #define ADXL362_SLAVE_ID    1
diff --git a/drivers/sensor/bma280/bma280.h b/drivers/sensor/bma280/bma280.h
index 7aa6a2d8db3..c09e9b926e8 100644
--- a/drivers/sensor/bma280/bma280.h
+++ b/drivers/sensor/bma280/bma280.h
@@ -9,7 +9,7 @@
 
 #include <device.h>
 #include <misc/util.h>
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <gpio.h>
 
 #define BMA280_I2C_ADDRESS		CONFIG_BMA280_I2C_ADDR
diff --git a/drivers/sensor/bmc150_magn/bmc150_magn.h b/drivers/sensor/bmc150_magn/bmc150_magn.h
index 0cb3b4c2a43..43ece836ada 100644
--- a/drivers/sensor/bmc150_magn/bmc150_magn.h
+++ b/drivers/sensor/bmc150_magn/bmc150_magn.h
@@ -9,7 +9,7 @@
 #ifndef __SENSOR_BMC150_MAGN_H__
 #define __SENSOR_BMC150_MAGN_H__
 
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <i2c.h>
 #include <misc/util.h>
 
diff --git a/drivers/sensor/bme280/bme280.h b/drivers/sensor/bme280/bme280.h
index 805f8adaa2d..369ed908292 100644
--- a/drivers/sensor/bme280/bme280.h
+++ b/drivers/sensor/bme280/bme280.h
@@ -8,7 +8,7 @@
 #ifndef __SENSOR_BME280_H__
 #define __SENSOR_BME280_H__
 
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <device.h>
 
 #define BME280_REG_PRESS_MSB            0xF7
diff --git a/drivers/sensor/hmc5883l/hmc5883l.h b/drivers/sensor/hmc5883l/hmc5883l.h
index a070fc27b00..feb5f6b803c 100644
--- a/drivers/sensor/hmc5883l/hmc5883l.h
+++ b/drivers/sensor/hmc5883l/hmc5883l.h
@@ -9,7 +9,7 @@
 
 #include <device.h>
 #include <misc/util.h>
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <gpio.h>
 
 #define SYS_LOG_DOMAIN "HMC5883L"
diff --git a/drivers/sensor/hts221/hts221.h b/drivers/sensor/hts221/hts221.h
index 1a1ecb25b81..ab418db7af4 100644
--- a/drivers/sensor/hts221/hts221.h
+++ b/drivers/sensor/hts221/hts221.h
@@ -9,7 +9,7 @@
 
 #include <device.h>
 #include <misc/util.h>
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <gpio.h>
 
 #define SYS_LOG_DOMAIN "HTS221"
diff --git a/drivers/sensor/lis3dh/lis3dh.h b/drivers/sensor/lis3dh/lis3dh.h
index ebe8a866ac3..7aad91ab07f 100644
--- a/drivers/sensor/lis3dh/lis3dh.h
+++ b/drivers/sensor/lis3dh/lis3dh.h
@@ -9,7 +9,7 @@
 
 #include <device.h>
 #include <misc/util.h>
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <gpio.h>
 
 #define LIS3DH_I2C_ADDRESS		CONFIG_LIS3DH_I2C_ADDR
diff --git a/drivers/sensor/lis3mdl/lis3mdl.h b/drivers/sensor/lis3mdl/lis3mdl.h
index d03ab4f669c..667414ee51f 100644
--- a/drivers/sensor/lis3mdl/lis3mdl.h
+++ b/drivers/sensor/lis3mdl/lis3mdl.h
@@ -9,7 +9,7 @@
 
 #include <device.h>
 #include <misc/util.h>
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <gpio.h>
 
 #define SYS_LOG_DOMAIN "LIS3MDL"
diff --git a/drivers/sensor/lps25hb/lps25hb.h b/drivers/sensor/lps25hb/lps25hb.h
index cfd7a6ffd63..215b499e80e 100644
--- a/drivers/sensor/lps25hb/lps25hb.h
+++ b/drivers/sensor/lps25hb/lps25hb.h
@@ -11,7 +11,7 @@
 #ifndef __SENSOR_LPS25HB_H__
 #define __SENSOR_LPS25HB_H__
 
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <i2c.h>
 #include <misc/util.h>
 
diff --git a/drivers/sensor/lsm6ds0/lsm6ds0.h b/drivers/sensor/lsm6ds0/lsm6ds0.h
index 0963833d6f0..788533c5132 100644
--- a/drivers/sensor/lsm6ds0/lsm6ds0.h
+++ b/drivers/sensor/lsm6ds0/lsm6ds0.h
@@ -11,7 +11,7 @@
 #ifndef __SENSOR_LSM6DS0_H__
 #define __SENSOR_LSM6DS0_H__
 
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <i2c.h>
 #include <misc/util.h>
 
diff --git a/drivers/sensor/lsm9ds0_gyro/lsm9ds0_gyro.h b/drivers/sensor/lsm9ds0_gyro/lsm9ds0_gyro.h
index 5de4909f7c5..7cb86c70879 100644
--- a/drivers/sensor/lsm9ds0_gyro/lsm9ds0_gyro.h
+++ b/drivers/sensor/lsm9ds0_gyro/lsm9ds0_gyro.h
@@ -9,7 +9,7 @@
 #ifndef __SENSOR_LSM9DS0_GYRO_H__
 #define __SENSOR_LSM9DS0_GYRO_H__
 
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <i2c.h>
 #include <misc/util.h>
 
diff --git a/drivers/sensor/lsm9ds0_mfd/lsm9ds0_mfd.h b/drivers/sensor/lsm9ds0_mfd/lsm9ds0_mfd.h
index 244a1c36de6..7a022a2918b 100644
--- a/drivers/sensor/lsm9ds0_mfd/lsm9ds0_mfd.h
+++ b/drivers/sensor/lsm9ds0_mfd/lsm9ds0_mfd.h
@@ -11,7 +11,7 @@
 #ifndef __SENSOR_LSM9DS0_MFD_H__
 #define __SENSOR_LSM9DS0_MFD_H__
 
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <misc/util.h>
 
 #define LSM9DS0_MFD_REG_OUT_TEMP_L_XM		0x05
diff --git a/drivers/sensor/mcp9808/mcp9808.h b/drivers/sensor/mcp9808/mcp9808.h
index 7eec462cc5e..3e9a25240e6 100644
--- a/drivers/sensor/mcp9808/mcp9808.h
+++ b/drivers/sensor/mcp9808/mcp9808.h
@@ -9,7 +9,7 @@
 
 #include <errno.h>
 
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <device.h>
 #include <sensor.h>
 #include <misc/util.h>
diff --git a/drivers/sensor/mpu6050/mpu6050.h b/drivers/sensor/mpu6050/mpu6050.h
index 2838f7788c0..c4f6ad7837a 100644
--- a/drivers/sensor/mpu6050/mpu6050.h
+++ b/drivers/sensor/mpu6050/mpu6050.h
@@ -10,7 +10,7 @@
 #include <device.h>
 #include <gpio.h>
 #include <misc/util.h>
-#include <stdint.h>
+#include <zephyr/types.h>
 
 #define SYS_LOG_DOMAIN "MPU6050"
 #define SYS_LOG_LEVEL CONFIG_SYS_LOG_SENSOR_LEVEL
diff --git a/drivers/sensor/sx9500/sx9500.h b/drivers/sensor/sx9500/sx9500.h
index e5c3e44c321..d66f14bb646 100644
--- a/drivers/sensor/sx9500/sx9500.h
+++ b/drivers/sensor/sx9500/sx9500.h
@@ -7,7 +7,7 @@
 #ifndef __SENSOR_SX9500_H__
 #define __SENSOR_SX9500_H__
 
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <device.h>
 
 #define SX9500_REG_IRQ_SRC		0x00
diff --git a/drivers/serial/uart_ns16550.c b/drivers/serial/uart_ns16550.c
index c2a3c192a62..25a1f870028 100644
--- a/drivers/serial/uart_ns16550.c
+++ b/drivers/serial/uart_ns16550.c
@@ -24,7 +24,7 @@
 
 #include <kernel.h>
 #include <arch/cpu.h>
-#include <stdint.h>
+#include <zephyr/types.h>
 
 #include <board.h>
 #include <init.h>
diff --git a/drivers/serial/uart_nsim.c b/drivers/serial/uart_nsim.c
index f3636077b38..4f8c0a32085 100644
--- a/drivers/serial/uart_nsim.c
+++ b/drivers/serial/uart_nsim.c
@@ -10,7 +10,7 @@
 #include <arch/cpu.h>
 #include <sections.h>
 #include <misc/__assert.h>
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <misc/util.h>
 #include <string.h>
 #include <board.h>
diff --git a/drivers/timer/xtensa_sys_timer.c b/drivers/timer/xtensa_sys_timer.c
index 80e04fa7776..8f53dd0817a 100644
--- a/drivers/timer/xtensa_sys_timer.c
+++ b/drivers/timer/xtensa_sys_timer.c
@@ -4,7 +4,7 @@
  */
 
 #include <kernel.h>
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <system_timer.h>
 #include <xtensa_rtos.h>
 
diff --git a/drivers/watchdog/iwdg_stm32.h b/drivers/watchdog/iwdg_stm32.h
index ffd48ef0c60..b826314a625 100644
--- a/drivers/watchdog/iwdg_stm32.h
+++ b/drivers/watchdog/iwdg_stm32.h
@@ -7,7 +7,7 @@
 #ifndef _STM32_IWDG_H_
 #define _STM32_IWDG_H_
 
-#include <stdint.h>
+#include <zephyr/types.h>
 
 /**
  * @brief Driver for Independent Watchdog (IWDG) for STM32 MCUs
diff --git a/include/adc.h b/include/adc.h
index 9ad567eff5d..44aeeaeb2c0 100644
--- a/include/adc.h
+++ b/include/adc.h
@@ -12,7 +12,7 @@
 #ifndef __INCLUDE_ADC_H__
 #define __INCLUDE_ADC_H__
 
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <device.h>
 
 #ifdef __cplusplus
diff --git a/include/arch/arc/v2/asm_inline_gcc.h b/include/arch/arc/v2/asm_inline_gcc.h
index 73e906bd4f0..4945b7ff992 100644
--- a/include/arch/arc/v2/asm_inline_gcc.h
+++ b/include/arch/arc/v2/asm_inline_gcc.h
@@ -18,7 +18,7 @@ extern "C" {
 #include <sys_io.h>
 #include <arch/arc/v2/aux_regs.h>
 
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <stddef.h>
 
 /**
diff --git a/include/arch/arc/v2/aux_regs.h b/include/arch/arc/v2/aux_regs.h
index 7343c868051..a2491103309 100644
--- a/include/arch/arc/v2/aux_regs.h
+++ b/include/arch/arc/v2/aux_regs.h
@@ -112,7 +112,7 @@ extern "C" {
 #ifndef _ASMLANGUAGE
 #if defined(__GNUC__)
 
-#include <stdint.h>
+#include <zephyr/types.h>
 #define _arc_v2_aux_reg_read(reg) __builtin_arc_lr((volatile uint32_t)reg)
 #define _arc_v2_aux_reg_write(reg, val) __builtin_arc_sr((unsigned int)val, (volatile uint32_t)reg)
 
diff --git a/include/arch/arc/v2/ffs.h b/include/arch/arc/v2/ffs.h
index fc75f67c693..8f40eb29fbc 100644
--- a/include/arch/arc/v2/ffs.h
+++ b/include/arch/arc/v2/ffs.h
@@ -20,7 +20,7 @@ extern "C" {
 
 #ifndef _ASMLANGUAGE
 
-#include <stdint.h>
+#include <zephyr/types.h>
 
 /**
  *
diff --git a/include/arch/arm/cortex_m/asm_inline_gcc.h b/include/arch/arm/cortex_m/asm_inline_gcc.h
index 71790bd0fb5..69ee8833c61 100644
--- a/include/arch/arm/cortex_m/asm_inline_gcc.h
+++ b/include/arch/arm/cortex_m/asm_inline_gcc.h
@@ -29,7 +29,7 @@ extern "C" {
 #define _SCS_ICSR_RETTOBASE (1 << 11)
 
 #else /* !_ASMLANGUAGE */
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <arch/arm/cortex_m/exc.h>
 #include <irq.h>
 
diff --git a/include/arch/arm/cortex_m/exc.h b/include/arch/arm/cortex_m/exc.h
index 00642fc2d05..5dabb177740 100644
--- a/include/arch/arm/cortex_m/exc.h
+++ b/include/arch/arm/cortex_m/exc.h
@@ -43,7 +43,7 @@ extern "C" {
 #ifdef _ASMLANGUAGE
 GTEXT(_ExcExit);
 #else
-#include <stdint.h>
+#include <zephyr/types.h>
 
 struct __esf {
 	sys_define_gpr_with_alias(a1, r0);
diff --git a/include/arch/nios2/arch.h b/include/arch/nios2/arch.h
index 7a1e55e7d1f..fd148a54b69 100644
--- a/include/arch/nios2/arch.h
+++ b/include/arch/nios2/arch.h
@@ -36,7 +36,7 @@ extern "C" {
 #define SIZEOFUNIT_TO_OCTET(X) (X)
 
 #ifndef _ASMLANGUAGE
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <irq.h>
 #include <sw_isr_table.h>
 
diff --git a/include/arch/nios2/nios2.h b/include/arch/nios2/nios2.h
index a71cf3214ee..ae8f3208acc 100644
--- a/include/arch/nios2/nios2.h
+++ b/include/arch/nios2/nios2.h
@@ -51,7 +51,7 @@ extern "C"
 
 #ifndef _ASMLANGUAGE
 
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <arch/cpu.h>
 #include <sys_io.h>
 
diff --git a/include/arch/riscv32/exp.h b/include/arch/riscv32/exp.h
index de1afd2aa39..649c2441f68 100644
--- a/include/arch/riscv32/exp.h
+++ b/include/arch/riscv32/exp.h
@@ -19,7 +19,7 @@ extern "C" {
 #endif
 
 #ifndef _ASMLANGUAGE
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <toolchain.h>
 
 struct __esf {
diff --git a/include/arch/x86/asm_inline_gcc.h b/include/arch/x86/asm_inline_gcc.h
index bc8856457c9..b170835ccf4 100644
--- a/include/arch/x86/asm_inline_gcc.h
+++ b/include/arch/x86/asm_inline_gcc.h
@@ -23,7 +23,7 @@ extern "C" {
 #endif
 
 #ifndef _ASMLANGUAGE
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <stddef.h>
 
 /**
diff --git a/include/arch/x86/segmentation.h b/include/arch/x86/segmentation.h
index b67d3274d12..e348c6fdd0c 100644
--- a/include/arch/x86/segmentation.h
+++ b/include/arch/x86/segmentation.h
@@ -7,7 +7,7 @@
 #ifndef _SEGMENTATION_H
 #define _SEGMENTATION_H
 
-#include <stdint.h>
+#include <zephyr/types.h>
 
 /* Host gen_idt uses this header as well, don't depend on toolchain.h */
 #ifndef __packed
diff --git a/include/arch/xtensa/arch.h b/include/arch/xtensa/arch.h
index 6a60fe02a57..8ff69f20662 100644
--- a/include/arch/xtensa/arch.h
+++ b/include/arch/xtensa/arch.h
@@ -21,7 +21,7 @@ extern "C" {
 
 #if !defined(_ASMLANGUAGE) && !defined(__ASSEMBLER__)
 #include "sys_io.h" /* Include from the very same folder of this file */
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <sw_isr_table.h>
 #include <arch/xtensa/xtensa_irq.h>
 #include <xtensa/config/core.h>
diff --git a/include/bluetooth/buf.h b/include/bluetooth/buf.h
index 899c3a6c816..1485b87ac4b 100644
--- a/include/bluetooth/buf.h
+++ b/include/bluetooth/buf.h
@@ -18,7 +18,7 @@
  * @{
  */
 
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <net/buf.h>
 #include <bluetooth/hci.h>
 
diff --git a/include/bluetooth/hci.h b/include/bluetooth/hci.h
index 304d99f07f9..ff8828a4c51 100644
--- a/include/bluetooth/hci.h
+++ b/include/bluetooth/hci.h
@@ -9,7 +9,7 @@
 #define __BT_HCI_H
 
 #include <toolchain.h>
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <stdbool.h>
 #include <string.h>
 #include <misc/util.h>
diff --git a/include/clock_control.h b/include/clock_control.h
index 5c78f30d4ce..af9e9c72e74 100644
--- a/include/clock_control.h
+++ b/include/clock_control.h
@@ -9,7 +9,7 @@
 #ifndef __CLOCK_CONTROL_H__
 #define __CLOCK_CONTROL_H__
 
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <stddef.h>
 #include <device.h>
 #include <misc/__assert.h>
diff --git a/include/counter.h b/include/counter.h
index 818b46fd776..2b486ea0e4e 100644
--- a/include/counter.h
+++ b/include/counter.h
@@ -19,7 +19,7 @@
  * @{
  */
 
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <stddef.h>
 #include <device.h>
 
diff --git a/include/crc16.h b/include/crc16.h
index cd29b130aa7..860a292d1ea 100644
--- a/include/crc16.h
+++ b/include/crc16.h
@@ -11,7 +11,7 @@
 #ifndef __CRC16_H
 #define __CRC16_H
 
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <stddef.h>
 
 /**
diff --git a/include/device.h b/include/device.h
index 6881c9eea92..0bc4b7e8b43 100644
--- a/include/device.h
+++ b/include/device.h
@@ -22,7 +22,7 @@
  * @{
  */
 
-#include <stdint.h>
+#include <zephyr/types.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/disk_access.h b/include/disk_access.h
index 92a3408c3bb..6a4029fb906 100644
--- a/include/disk_access.h
+++ b/include/disk_access.h
@@ -17,7 +17,7 @@
 #ifndef _DISK_ACCESS_H_
 #define _DISK_ACCESS_H_
 
-#include <stdint.h>
+#include <zephyr/types.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/display/mb_display.h b/include/display/mb_display.h
index f6cc1bc440f..f82ce8c9159 100644
--- a/include/display/mb_display.h
+++ b/include/display/mb_display.h
@@ -18,7 +18,7 @@
  */
 
 #include <stdio.h>
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <stdbool.h>
 #include <misc/util.h>
 #include <toolchain.h>
diff --git a/include/drivers/gpio/gpio_mmio32.h b/include/drivers/gpio/gpio_mmio32.h
index c2f40279da1..332315886a6 100644
--- a/include/drivers/gpio/gpio_mmio32.h
+++ b/include/drivers/gpio/gpio_mmio32.h
@@ -9,7 +9,7 @@
 
 #include <device.h>
 #include <gpio.h>
-#include <stdint.h>
+#include <zephyr/types.h>
 
 struct gpio_mmio32_config {
 	volatile uint32_t *reg;
diff --git a/include/drivers/k20_sim.h b/include/drivers/k20_sim.h
index c7520d79f4f..8bf7f0a7471 100644
--- a/include/drivers/k20_sim.h
+++ b/include/drivers/k20_sim.h
@@ -16,7 +16,7 @@
 #ifndef _K20SIM_H_
 #define _K20SIM_H_
 
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <misc/__assert.h>
 
 #ifdef __cplusplus
diff --git a/include/drivers/mvic.h b/include/drivers/mvic.h
index 313b484ec9b..41fded0633c 100644
--- a/include/drivers/mvic.h
+++ b/include/drivers/mvic.h
@@ -47,7 +47,7 @@
  */
 
 #ifndef _ASMLANGUAGE
-#include <stdint.h>
+#include <zephyr/types.h>
 
 /* Implementation of irq_controller.h interface */
 
diff --git a/include/drivers/rand32.h b/include/drivers/rand32.h
index 99afe162401..d9b29b967b8 100644
--- a/include/drivers/rand32.h
+++ b/include/drivers/rand32.h
@@ -20,7 +20,7 @@
 #ifndef __INCrand32h
 #define __INCrand32h
 
-#include <stdint.h>
+#include <zephyr/types.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/flash.h b/include/flash.h
index 1d90a22fd2f..3e89f415f79 100644
--- a/include/flash.h
+++ b/include/flash.h
@@ -19,7 +19,7 @@
  * @{
  */
 
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <stddef.h>
 #include <sys/types.h>
 #include <device.h>
diff --git a/include/gpio.h b/include/gpio.h
index eb26849a20e..052146e178a 100644
--- a/include/gpio.h
+++ b/include/gpio.h
@@ -16,7 +16,7 @@
 #include <misc/__assert.h>
 #include <misc/slist.h>
 
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <stddef.h>
 #include <device.h>
 
diff --git a/include/i2c.h b/include/i2c.h
index 58240e5ef56..3acda7a8128 100644
--- a/include/i2c.h
+++ b/include/i2c.h
@@ -23,7 +23,7 @@
 extern "C" {
 #endif
 
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <device.h>
 
 /*
diff --git a/include/kernel.h b/include/kernel.h
index a263d0a6aa1..dbee429c0aa 100644
--- a/include/kernel.h
+++ b/include/kernel.h
@@ -15,8 +15,7 @@
 
 #if !defined(_ASMLANGUAGE)
 #include <stddef.h>
-#include <stdint.h>
-#include <inttypes.h>
+#include <zephyr/types.h>
 #include <limits.h>
 #include <toolchain.h>
 #include <sections.h>
diff --git a/include/linker-defs.h b/include/linker-defs.h
index 418025fccac..7acf308fed0 100644
--- a/include/linker-defs.h
+++ b/include/linker-defs.h
@@ -135,7 +135,7 @@ GDATA(__data_num_words)
 
 #else /* ! _ASMLANGUAGE */
 
-#include <stdint.h>
+#include <zephyr/types.h>
 extern char __bss_start[];
 extern char __bss_end[];
 #ifdef CONFIG_XIP
diff --git a/include/misc/byteorder.h b/include/misc/byteorder.h
index a8531466d99..848dc9d872b 100644
--- a/include/misc/byteorder.h
+++ b/include/misc/byteorder.h
@@ -11,7 +11,7 @@
 #ifndef __BYTEORDER_H__
 #define __BYTEORDER_H__
 
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <stddef.h>
 #include <misc/__assert.h>
 
diff --git a/include/misc/util.h b/include/misc/util.h
index 6d35bbad76c..1f788597c05 100644
--- a/include/misc/util.h
+++ b/include/misc/util.h
@@ -20,7 +20,7 @@ extern "C" {
 
 #ifndef _ASMLANGUAGE
 
-#include <stdint.h>
+#include <zephyr/types.h>
 
 /* Helper to pass a int as a pointer or vice-versa.
  * Those are available for 32 bits architectures:
diff --git a/include/net/buf.h b/include/net/buf.h
index 14a6b35da15..8a15e6fa3a0 100644
--- a/include/net/buf.h
+++ b/include/net/buf.h
@@ -11,7 +11,7 @@
 #define __NET_BUF_H
 
 #include <stddef.h>
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <misc/util.h>
 #include <zephyr.h>
 
diff --git a/include/net/dhcpv4.h b/include/net/dhcpv4.h
index 0f4b150e3f6..900283b1196 100644
--- a/include/net/dhcpv4.h
+++ b/include/net/dhcpv4.h
@@ -18,7 +18,7 @@
  */
 
 #include <misc/slist.h>
-#include <stdint.h>
+#include <zephyr/types.h>
 
 /** Current state of DHCPv4 client address negotiation.
  *
diff --git a/include/net/ethernet.h b/include/net/ethernet.h
index fcddd9703e7..82b990c26f7 100644
--- a/include/net/ethernet.h
+++ b/include/net/ethernet.h
@@ -13,7 +13,7 @@
 #ifndef __ETHERNET_H
 #define __ETHERNET_H
 
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <stdbool.h>
 
 #include <net/net_ip.h>
diff --git a/include/net/http_parser.h b/include/net/http_parser.h
index 7c921b6687e..b53c241841a 100644
--- a/include/net/http_parser.h
+++ b/include/net/http_parser.h
@@ -43,7 +43,7 @@ typedef unsigned __int32 uint32_t;
 typedef __int64 int64_t;
 typedef unsigned __int64 uint64_t;
 #else
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <stddef.h>
 #endif
 
diff --git a/include/net/mqtt_types.h b/include/net/mqtt_types.h
index adc98856312..0de0300887c 100644
--- a/include/net/mqtt_types.h
+++ b/include/net/mqtt_types.h
@@ -7,7 +7,7 @@
 #ifndef _MQTT_TYPES_H_
 #define _MQTT_TYPES_H_
 
-#include <stdint.h>
+#include <zephyr/types.h>
 
 /**
  * @brief MQTT library
diff --git a/include/net/nbuf.h b/include/net/nbuf.h
index c4792761dfd..b3c3303b5f1 100644
--- a/include/net/nbuf.h
+++ b/include/net/nbuf.h
@@ -16,7 +16,7 @@
 #ifndef __NBUF_H
 #define __NBUF_H
 
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <stdbool.h>
 
 #include <net/buf.h>
diff --git a/include/net/net_ip.h b/include/net/net_ip.h
index 295eff1c9f8..e78e12f1680 100644
--- a/include/net/net_ip.h
+++ b/include/net/net_ip.h
@@ -20,7 +20,7 @@
  */
 
 #include <string.h>
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <stdbool.h>
 #include <misc/byteorder.h>
 #include <toolchain.h>
diff --git a/include/net/net_linkaddr.h b/include/net/net_linkaddr.h
index 70af69b7373..9ea76aac7fb 100644
--- a/include/net/net_linkaddr.h
+++ b/include/net/net_linkaddr.h
@@ -12,7 +12,7 @@
 #ifndef __NET_LINKADDR_H__
 #define __NET_LINKADDR_H__
 
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <stdbool.h>
 #include <errno.h>
 
diff --git a/include/net/net_stats.h b/include/net/net_stats.h
index f8a16bd1fbc..ca26a914e25 100644
--- a/include/net/net_stats.h
+++ b/include/net/net_stats.h
@@ -14,7 +14,7 @@
 #ifndef __NET_STATS_H
 #define __NET_STATS_H
 
-#include <stdint.h>
+#include <zephyr/types.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/net/trickle.h b/include/net/trickle.h
index 27b6e8d937f..d72bf5ce67b 100644
--- a/include/net/trickle.h
+++ b/include/net/trickle.h
@@ -14,7 +14,7 @@
 #define __TRICKLE_H
 
 #include <stdbool.h>
-#include <stdint.h>
+#include <zephyr/types.h>
 
 #include <kernel.h>
 #include <net/net_core.h>
diff --git a/include/net/zoap.h b/include/net/zoap.h
index 6084ab5bb3f..8ccba5bc097 100644
--- a/include/net/zoap.h
+++ b/include/net/zoap.h
@@ -13,7 +13,7 @@
 #ifndef __ZOAP_H__
 #define __ZOAP_H__
 
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <stddef.h>
 #include <stdbool.h>
 
diff --git a/include/pinmux.h b/include/pinmux.h
index 80fb5674050..1bc69552fcc 100644
--- a/include/pinmux.h
+++ b/include/pinmux.h
@@ -19,7 +19,7 @@
  * @{
  */
 
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <device.h>
 
 #ifdef __cplusplus
diff --git a/include/pwm.h b/include/pwm.h
index 84b4494fb00..b4dfdb9bb87 100644
--- a/include/pwm.h
+++ b/include/pwm.h
@@ -27,7 +27,7 @@ extern "C" {
 #define PWM_ACCESS_ALL		1
 
 #include <errno.h>
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <stddef.h>
 #include <device.h>
 
diff --git a/include/random.h b/include/random.h
index f354d2ef742..62f17bf520e 100644
--- a/include/random.h
+++ b/include/random.h
@@ -23,7 +23,7 @@
 extern "C" {
 #endif
 
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <device.h>
 
 /**
diff --git a/include/rtc.h b/include/rtc.h
index 40c24c5cb81..74ef2146042 100644
--- a/include/rtc.h
+++ b/include/rtc.h
@@ -6,7 +6,7 @@
 
 #ifndef _RTC_H_
 #define _RTC_H_
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <device.h>
 #include <misc/util.h>
 
diff --git a/include/sensor.h b/include/sensor.h
index bbc1830bba2..32d3c4b70c8 100644
--- a/include/sensor.h
+++ b/include/sensor.h
@@ -23,7 +23,7 @@
 extern "C" {
 #endif
 
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <device.h>
 #include <errno.h>
 
diff --git a/include/spi.h b/include/spi.h
index c068bf429be..3a154239ed2 100644
--- a/include/spi.h
+++ b/include/spi.h
@@ -19,7 +19,7 @@
  * @{
  */
 
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <stddef.h>
 #include <device.h>
 
diff --git a/include/sw_isr_table.h b/include/sw_isr_table.h
index 174033918c1..bf91db8d50a 100644
--- a/include/sw_isr_table.h
+++ b/include/sw_isr_table.h
@@ -21,7 +21,7 @@ extern "C" {
 #endif
 
 #if !defined(_ASMLANGUAGE)
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <toolchain.h>
 
 /*
diff --git a/include/sys_clock.h b/include/sys_clock.h
index a83a657c57d..2e15e9a8eaf 100644
--- a/include/sys_clock.h
+++ b/include/sys_clock.h
@@ -21,7 +21,7 @@ extern "C" {
 #endif
 
 #ifndef _ASMLANGUAGE
-#include <stdint.h>
+#include <zephyr/types.h>
 
 #if defined(CONFIG_SYS_CLOCK_EXISTS) && \
 	(CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC == 0)
diff --git a/include/sys_io.h b/include/sys_io.h
index 96685d01fb0..bfb6f3680fd 100644
--- a/include/sys_io.h
+++ b/include/sys_io.h
@@ -14,7 +14,7 @@ extern "C" {
 #endif
 
 #include <kernel.h>
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <stddef.h>
 
 typedef uint32_t io_port_t;
diff --git a/include/watchdog.h b/include/watchdog.h
index e62753c50de..8cc717e5b67 100644
--- a/include/watchdog.h
+++ b/include/watchdog.h
@@ -7,7 +7,7 @@
 #ifndef _WDT_H_
 #define _WDT_H_
 
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <device.h>
 #include <misc/util.h>
 
diff --git a/include/zephyr/types.h b/include/zephyr/types.h
new file mode 100644
index 00000000000..5ae80b0fa51
--- /dev/null
+++ b/include/zephyr/types.h
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2017 Linaro Limited
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef __Z_TYPES_H__
+#define __Z_TYPES_H__
+
+#include <stdint.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef signed char         s8_t;
+typedef signed short        s16_t;
+typedef signed int          s32_t;
+typedef signed long long    s64_t;
+
+typedef unsigned char       u8_t;
+typedef unsigned short      u16_t;
+typedef unsigned int        u32_t;
+typedef unsigned long long  u64_t;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __Z_TYPES_H__ */
diff --git a/kernel/int_latency_bench.c b/kernel/int_latency_bench.c
index 0a09d9bb98a..eeb83246fd6 100644
--- a/kernel/int_latency_bench.c
+++ b/kernel/int_latency_bench.c
@@ -8,7 +8,7 @@
 
 #include "toolchain.h"
 #include "sections.h"
-#include <stdint.h>	    /* uint32_t */
+#include <zephyr/types.h>	    /* uint32_t */
 #include <limits.h>	    /* ULONG_MAX */
 #include <misc/printk.h> /* printk */
 #include <sys_clock.h>
diff --git a/kernel/version.c b/kernel/version.c
index 5d8b978c22e..954b91640cc 100644
--- a/kernel/version.c
+++ b/kernel/version.c
@@ -6,7 +6,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <stdint.h>
+#include <zephyr/types.h>
 #include "version.h" /* generated by MAKE, at compile time */
 
 static uint32_t kernel_version = KERNELVERSION;
diff --git a/lib/json/json.c b/lib/json/json.c
index ac891b74d27..3547002d068 100644
--- a/lib/json/json.c
+++ b/lib/json/json.c
@@ -10,7 +10,7 @@
 #include <limits.h>
 #include <misc/printk.h>
 #include <stdbool.h>
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <stdlib.h>
 #include <string.h>
 
diff --git a/lib/json/json.h b/lib/json/json.h
index 35e380199a8..5f6a963f113 100644
--- a/lib/json/json.h
+++ b/lib/json/json.h
@@ -9,7 +9,7 @@
 
 #include <misc/util.h>
 #include <stddef.h>
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <sys/types.h>
 
 enum json_tokens {
diff --git a/samples/bluetooth/beacon/src/main.c b/samples/bluetooth/beacon/src/main.c
index dfdd4e19c53..f8fdce8067e 100644
--- a/samples/bluetooth/beacon/src/main.c
+++ b/samples/bluetooth/beacon/src/main.c
@@ -6,7 +6,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <stddef.h>
 #include <misc/printk.h>
 #include <misc/util.h>
diff --git a/samples/bluetooth/central/src/main.c b/samples/bluetooth/central/src/main.c
index 30246eb770f..be541a9130c 100644
--- a/samples/bluetooth/central/src/main.c
+++ b/samples/bluetooth/central/src/main.c
@@ -6,7 +6,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <stddef.h>
 #include <errno.h>
 #include <zephyr.h>
diff --git a/samples/bluetooth/central_hr/src/main.c b/samples/bluetooth/central_hr/src/main.c
index 2710b2534a6..11985cbb268 100644
--- a/samples/bluetooth/central_hr/src/main.c
+++ b/samples/bluetooth/central_hr/src/main.c
@@ -6,7 +6,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <stddef.h>
 #include <errno.h>
 #include <zephyr.h>
diff --git a/samples/bluetooth/eddystone/src/main.c b/samples/bluetooth/eddystone/src/main.c
index de846469c76..3c07103af26 100644
--- a/samples/bluetooth/eddystone/src/main.c
+++ b/samples/bluetooth/eddystone/src/main.c
@@ -6,7 +6,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <stddef.h>
 #include <string.h>
 #include <errno.h>
diff --git a/samples/bluetooth/gatt/bas.c b/samples/bluetooth/gatt/bas.c
index 054fd1e1bc2..c76340eff2c 100644
--- a/samples/bluetooth/gatt/bas.c
+++ b/samples/bluetooth/gatt/bas.c
@@ -8,7 +8,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <stddef.h>
 #include <string.h>
 #include <errno.h>
diff --git a/samples/bluetooth/gatt/cts.c b/samples/bluetooth/gatt/cts.c
index a0a74afefae..7e75106b7e4 100644
--- a/samples/bluetooth/gatt/cts.c
+++ b/samples/bluetooth/gatt/cts.c
@@ -8,7 +8,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <stddef.h>
 #include <string.h>
 #include <errno.h>
diff --git a/samples/bluetooth/gatt/dis.c b/samples/bluetooth/gatt/dis.c
index 42be06ea49f..1d692d6b11f 100644
--- a/samples/bluetooth/gatt/dis.c
+++ b/samples/bluetooth/gatt/dis.c
@@ -8,7 +8,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <stddef.h>
 #include <string.h>
 #include <errno.h>
diff --git a/samples/bluetooth/gatt/gap.c b/samples/bluetooth/gatt/gap.c
index 5f508686cf3..7d285835693 100644
--- a/samples/bluetooth/gatt/gap.c
+++ b/samples/bluetooth/gatt/gap.c
@@ -8,7 +8,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <stddef.h>
 #include <string.h>
 #include <errno.h>
diff --git a/samples/bluetooth/gatt/hog.c b/samples/bluetooth/gatt/hog.c
index f811afff470..01279ad3104 100644
--- a/samples/bluetooth/gatt/hog.c
+++ b/samples/bluetooth/gatt/hog.c
@@ -8,7 +8,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <stddef.h>
 #include <string.h>
 #include <errno.h>
diff --git a/samples/bluetooth/gatt/hrs.c b/samples/bluetooth/gatt/hrs.c
index 653198a4989..84d44eb0814 100644
--- a/samples/bluetooth/gatt/hrs.c
+++ b/samples/bluetooth/gatt/hrs.c
@@ -8,7 +8,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <stddef.h>
 #include <string.h>
 #include <errno.h>
diff --git a/samples/bluetooth/gatt/ipss.c b/samples/bluetooth/gatt/ipss.c
index 9299d88da12..d8060bfb045 100644
--- a/samples/bluetooth/gatt/ipss.c
+++ b/samples/bluetooth/gatt/ipss.c
@@ -8,7 +8,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <stddef.h>
 #include <string.h>
 #include <errno.h>
diff --git a/samples/bluetooth/handsfree/src/main.c b/samples/bluetooth/handsfree/src/main.c
index d0a8abcbc3a..289e489d62b 100644
--- a/samples/bluetooth/handsfree/src/main.c
+++ b/samples/bluetooth/handsfree/src/main.c
@@ -6,7 +6,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <stddef.h>
 #include <string.h>
 #include <errno.h>
diff --git a/samples/bluetooth/peripheral/src/main.c b/samples/bluetooth/peripheral/src/main.c
index 019505b63a1..1e2d257d397 100644
--- a/samples/bluetooth/peripheral/src/main.c
+++ b/samples/bluetooth/peripheral/src/main.c
@@ -6,7 +6,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <stddef.h>
 #include <string.h>
 #include <errno.h>
diff --git a/samples/bluetooth/peripheral_csc/src/main.c b/samples/bluetooth/peripheral_csc/src/main.c
index 45ccc6045ff..d9834fbf1e2 100644
--- a/samples/bluetooth/peripheral_csc/src/main.c
+++ b/samples/bluetooth/peripheral_csc/src/main.c
@@ -7,7 +7,7 @@
  */
 
 #include <stdbool.h>
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <stddef.h>
 #include <string.h>
 #include <errno.h>
diff --git a/samples/bluetooth/peripheral_dis/src/main.c b/samples/bluetooth/peripheral_dis/src/main.c
index 9cafd06211e..2f1c62324c3 100644
--- a/samples/bluetooth/peripheral_dis/src/main.c
+++ b/samples/bluetooth/peripheral_dis/src/main.c
@@ -6,7 +6,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <stddef.h>
 #include <string.h>
 #include <errno.h>
diff --git a/samples/bluetooth/peripheral_esp/src/main.c b/samples/bluetooth/peripheral_esp/src/main.c
index 4893182d7de..6476f0837c2 100644
--- a/samples/bluetooth/peripheral_esp/src/main.c
+++ b/samples/bluetooth/peripheral_esp/src/main.c
@@ -7,7 +7,7 @@
  */
 
 #include <stdbool.h>
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <stddef.h>
 #include <string.h>
 #include <errno.h>
diff --git a/samples/bluetooth/peripheral_hids/src/main.c b/samples/bluetooth/peripheral_hids/src/main.c
index 015c584291f..76224f3e2cc 100644
--- a/samples/bluetooth/peripheral_hids/src/main.c
+++ b/samples/bluetooth/peripheral_hids/src/main.c
@@ -6,7 +6,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <stddef.h>
 #include <string.h>
 #include <errno.h>
diff --git a/samples/bluetooth/peripheral_hr/src/main.c b/samples/bluetooth/peripheral_hr/src/main.c
index f003b202983..3964588f048 100644
--- a/samples/bluetooth/peripheral_hr/src/main.c
+++ b/samples/bluetooth/peripheral_hr/src/main.c
@@ -6,7 +6,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <stddef.h>
 #include <string.h>
 #include <errno.h>
diff --git a/samples/bluetooth/peripheral_sc_only/src/main.c b/samples/bluetooth/peripheral_sc_only/src/main.c
index f1e172a5335..f5c76ee5d22 100644
--- a/samples/bluetooth/peripheral_sc_only/src/main.c
+++ b/samples/bluetooth/peripheral_sc_only/src/main.c
@@ -6,7 +6,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <stddef.h>
 #include <string.h>
 #include <errno.h>
diff --git a/samples/bluetooth/scan_adv/src/main.c b/samples/bluetooth/scan_adv/src/main.c
index 2a126a2fbac..37bef29f121 100644
--- a/samples/bluetooth/scan_adv/src/main.c
+++ b/samples/bluetooth/scan_adv/src/main.c
@@ -6,7 +6,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <stddef.h>
 #include <misc/printk.h>
 #include <misc/util.h>
diff --git a/samples/drivers/aio_comparator/src/main.c b/samples/drivers/aio_comparator/src/main.c
index 204dc1262ef..4b02b4d996e 100644
--- a/samples/drivers/aio_comparator/src/main.c
+++ b/samples/drivers/aio_comparator/src/main.c
@@ -25,7 +25,7 @@
  */
 
 #include <zephyr.h>
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <stdio.h>
 #include <device.h>
 #include <aio_comparator.h>
diff --git a/samples/net/nats/src/nats.c b/samples/net/nats/src/nats.c
index 29da669c018..ed0cfcade4b 100644
--- a/samples/net/nats/src/nats.c
+++ b/samples/net/nats/src/nats.c
@@ -14,7 +14,7 @@
 #include <net/net_core.h>
 #include <net/net_if.h>
 #include <stdbool.h>
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/samples/net/nats/src/nats.h b/samples/net/nats/src/nats.h
index fe373449c47..9bc860132ea 100644
--- a/samples/net/nats/src/nats.h
+++ b/samples/net/nats/src/nats.h
@@ -7,7 +7,7 @@
 #ifndef __NATS_H
 #define __NATS_H
 
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <net/net_context.h>
 
 struct nats_msg {
diff --git a/samples/nfc/nfc_hello/src/main.c b/samples/nfc/nfc_hello/src/main.c
index 1f42727d884..e8a310c374e 100644
--- a/samples/nfc/nfc_hello/src/main.c
+++ b/samples/nfc/nfc_hello/src/main.c
@@ -6,7 +6,7 @@
 
 #include <zephyr.h>
 #include <stdio.h>
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <string.h>
 #include <board.h>
 #include <uart.h>
diff --git a/scripts/gen_idt/Makefile b/scripts/gen_idt/Makefile
index 59b98db2d06..82cf5a790c2 100644
--- a/scripts/gen_idt/Makefile
+++ b/scripts/gen_idt/Makefile
@@ -1,4 +1,4 @@
-HOSTCFLAGS_gen_idt.o += -I$(srctree)/include/arch/x86
+HOSTCFLAGS_gen_idt.o += -I$(srctree)/include/arch/x86 -I$(srctree)/include
 HOSTCFLAGS_gen_idt.o += -DKERNEL_VERSION=0 -Wall -Werror -g
 HOSTCFLAGS_version.o += -DKERNEL_VERSION=0 -Wall -Werror -g
 HOSTCFLAGS_gen_idt.o += -Wno-unused-result
diff --git a/subsys/bluetooth/controller/hci/hci.c b/subsys/bluetooth/controller/hci/hci.c
index 1b30aab9c01..05c4ed29815 100644
--- a/subsys/bluetooth/controller/hci/hci.c
+++ b/subsys/bluetooth/controller/hci/hci.c
@@ -6,7 +6,7 @@
  */
 
 #include <stddef.h>
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <string.h>
 
 #include <soc.h>
diff --git a/subsys/bluetooth/controller/ll_sw/ctrl.c b/subsys/bluetooth/controller/ll_sw/ctrl.c
index 655982e8d1b..a6dd1bed308 100644
--- a/subsys/bluetooth/controller/ll_sw/ctrl.c
+++ b/subsys/bluetooth/controller/ll_sw/ctrl.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <stddef.h>
 #include <string.h>
 
diff --git a/subsys/bluetooth/controller/ll_sw/ll.c b/subsys/bluetooth/controller/ll_sw/ll.c
index 821863b1dca..df4a4488fb5 100644
--- a/subsys/bluetooth/controller/ll_sw/ll.c
+++ b/subsys/bluetooth/controller/ll_sw/ll.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <string.h>
 
 #include <soc.h>
diff --git a/subsys/bluetooth/controller/ticker/ticker.c b/subsys/bluetooth/controller/ticker/ticker.c
index 5e8ee857e72..6165a19189e 100644
--- a/subsys/bluetooth/controller/ticker/ticker.c
+++ b/subsys/bluetooth/controller/ticker/ticker.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <soc.h>
 
 #include "hal/cntr.h"
diff --git a/subsys/bluetooth/controller/util/mayfly.c b/subsys/bluetooth/controller/util/mayfly.c
index d8bcee5b1c6..0fdf9f2dca8 100644
--- a/subsys/bluetooth/controller/util/mayfly.c
+++ b/subsys/bluetooth/controller/util/mayfly.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <stdint.h>
+#include <zephyr/types.h>
 #include "memq.h"
 #include "mayfly.h"
 
diff --git a/subsys/bluetooth/controller/util/mem.c b/subsys/bluetooth/controller/util/mem.c
index 67c99c4e820..759bb55a154 100644
--- a/subsys/bluetooth/controller/util/mem.c
+++ b/subsys/bluetooth/controller/util/mem.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <string.h>
 
 #include "util.h"
diff --git a/subsys/bluetooth/controller/util/memq.c b/subsys/bluetooth/controller/util/memq.c
index 76be770b57c..8cbd7b13c10 100644
--- a/subsys/bluetooth/controller/util/memq.c
+++ b/subsys/bluetooth/controller/util/memq.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <stddef.h>
 
 inline void *memq_peek(void *tail, void *head, void **mem);
diff --git a/subsys/bluetooth/controller/util/util.c b/subsys/bluetooth/controller/util/util.c
index 1aeef532177..6f5f061e034 100644
--- a/subsys/bluetooth/controller/util/util.c
+++ b/subsys/bluetooth/controller/util/util.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <stdint.h>
+#include <zephyr/types.h>
 #include "util.h"
 
 uint8_t util_ones_count_get(uint8_t *octets, uint8_t octets_len)
diff --git a/subsys/bluetooth/host/log.c b/subsys/bluetooth/host/log.c
index db3a50e552e..d20928f7cf8 100644
--- a/subsys/bluetooth/host/log.c
+++ b/subsys/bluetooth/host/log.c
@@ -12,7 +12,7 @@
  */
 
 #include <stddef.h>
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <zephyr.h>
 #include <misc/util.h>
 
diff --git a/subsys/bluetooth/host/monitor.c b/subsys/bluetooth/host/monitor.c
index ee075756b3b..014b4bc42c3 100644
--- a/subsys/bluetooth/host/monitor.c
+++ b/subsys/bluetooth/host/monitor.c
@@ -8,7 +8,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <stdbool.h>
 
 #include <zephyr.h>
diff --git a/subsys/debug/gdb_server.c b/subsys/debug/gdb_server.c
index 0a63f28f3ec..3180000398f 100644
--- a/subsys/debug/gdb_server.c
+++ b/subsys/debug/gdb_server.c
@@ -315,7 +315,7 @@
  */
 
 #include <kernel.h>
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <stdio.h>
 #include <string.h>
 #include <kernel_structs.h>
diff --git a/subsys/disk/disk_access_flash.c b/subsys/disk/disk_access_flash.c
index 0c1912a1002..2156ef6b5be 100644
--- a/subsys/disk/disk_access_flash.c
+++ b/subsys/disk/disk_access_flash.c
@@ -5,7 +5,7 @@
  */
 
 #include <string.h>
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <misc/__assert.h>
 #include <misc/util.h>
 #include <disk_access.h>
diff --git a/subsys/disk/disk_access_ram.c b/subsys/disk/disk_access_ram.c
index ceb5af3997d..00733b3cf52 100644
--- a/subsys/disk/disk_access_ram.c
+++ b/subsys/disk/disk_access_ram.c
@@ -5,7 +5,7 @@
  */
 
 #include <string.h>
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <misc/__assert.h>
 #include <disk_access.h>
 #include <errno.h>
diff --git a/subsys/fs/fat_fs.c b/subsys/fs/fat_fs.c
index 3ae208d43fa..a460e6881a8 100644
--- a/subsys/fs/fat_fs.c
+++ b/subsys/fs/fat_fs.c
@@ -6,7 +6,7 @@
 
 #include <stdio.h>
 #include <string.h>
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <errno.h>
 #include <init.h>
 #include <ff.h>
diff --git a/subsys/net/ip/6lo.h b/subsys/net/ip/6lo.h
index 06a3641d501..5808e5ceaa9 100644
--- a/subsys/net/ip/6lo.h
+++ b/subsys/net/ip/6lo.h
@@ -14,7 +14,7 @@
 #define __NET_6LO_H
 
 #include <misc/slist.h>
-#include <stdint.h>
+#include <zephyr/types.h>
 
 #include <net/nbuf.h>
 #include "icmpv6.h"
diff --git a/subsys/net/ip/connection.h b/subsys/net/ip/connection.h
index c37b205e7a6..b470d9f68e2 100644
--- a/subsys/net/ip/connection.h
+++ b/subsys/net/ip/connection.h
@@ -13,7 +13,7 @@
 #ifndef __CONNECTION_H
 #define __CONNECTION_H
 
-#include <stdint.h>
+#include <zephyr/types.h>
 
 #include <misc/util.h>
 
diff --git a/subsys/net/ip/icmpv4.h b/subsys/net/ip/icmpv4.h
index 7b3c2ed1eac..b26703af119 100644
--- a/subsys/net/ip/icmpv4.h
+++ b/subsys/net/ip/icmpv4.h
@@ -13,7 +13,7 @@
 #ifndef __ICMPV4_H
 #define __ICMPV4_H
 
-#include <stdint.h>
+#include <zephyr/types.h>
 
 #include <net/net_ip.h>
 #include <net/nbuf.h>
diff --git a/subsys/net/ip/icmpv6.h b/subsys/net/ip/icmpv6.h
index b3e0e8b22d5..4e64898884a 100644
--- a/subsys/net/ip/icmpv6.h
+++ b/subsys/net/ip/icmpv6.h
@@ -14,7 +14,7 @@
 #define __ICMPV6_H
 
 #include <misc/slist.h>
-#include <stdint.h>
+#include <zephyr/types.h>
 
 #include <net/net_ip.h>
 #include <net/nbuf.h>
diff --git a/subsys/net/ip/ipv4.h b/subsys/net/ip/ipv4.h
index b33dbb5598e..a46a5a77707 100644
--- a/subsys/net/ip/ipv4.h
+++ b/subsys/net/ip/ipv4.h
@@ -13,7 +13,7 @@
 #ifndef __IPV4_H
 #define __IPV4_H
 
-#include <stdint.h>
+#include <zephyr/types.h>
 
 #include <net/net_ip.h>
 #include <net/nbuf.h>
diff --git a/subsys/net/ip/ipv6.h b/subsys/net/ip/ipv6.h
index 3cd1a6c4cab..d25c9c042f5 100644
--- a/subsys/net/ip/ipv6.h
+++ b/subsys/net/ip/ipv6.h
@@ -13,7 +13,7 @@
 #ifndef __IPV6_H
 #define __IPV6_H
 
-#include <stdint.h>
+#include <zephyr/types.h>
 
 #include <net/net_ip.h>
 #include <net/nbuf.h>
diff --git a/subsys/net/ip/l2/ieee802154/ieee802154_fragment.h b/subsys/net/ip/l2/ieee802154/ieee802154_fragment.h
index 803d111b10e..251d88844d5 100644
--- a/subsys/net/ip/l2/ieee802154/ieee802154_fragment.h
+++ b/subsys/net/ip/l2/ieee802154/ieee802154_fragment.h
@@ -14,7 +14,7 @@
 #define __NET_IEEE802154_FRAGMENT_H__
 
 #include <misc/slist.h>
-#include <stdint.h>
+#include <zephyr/types.h>
 
 #include <net/nbuf.h>
 
diff --git a/subsys/net/ip/nbr.h b/subsys/net/ip/nbr.h
index cb391a4eea9..830726c28df 100644
--- a/subsys/net/ip/nbr.h
+++ b/subsys/net/ip/nbr.h
@@ -11,7 +11,7 @@
 #define __NET_NBR_H
 
 #include <stddef.h>
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <stdbool.h>
 
 #include <net/net_if.h>
diff --git a/subsys/net/ip/nbuf.c b/subsys/net/ip/nbuf.c
index b3a0fc96754..9c14dbb2afb 100644
--- a/subsys/net/ip/nbuf.c
+++ b/subsys/net/ip/nbuf.c
@@ -18,7 +18,7 @@
 #include <kernel.h>
 #include <toolchain.h>
 #include <string.h>
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <sys/types.h>
 
 #include <misc/util.h>
diff --git a/subsys/net/ip/route.c b/subsys/net/ip/route.c
index 25f9742971b..c86d4ee279a 100644
--- a/subsys/net/ip/route.c
+++ b/subsys/net/ip/route.c
@@ -16,7 +16,7 @@
 
 #include <kernel.h>
 #include <limits.h>
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <misc/slist.h>
 
 #include <net/nbuf.h>
diff --git a/subsys/net/ip/rpl-mrhof.c b/subsys/net/ip/rpl-mrhof.c
index 6577d7da4cc..a1b1c11dbe4 100644
--- a/subsys/net/ip/rpl-mrhof.c
+++ b/subsys/net/ip/rpl-mrhof.c
@@ -45,7 +45,7 @@
 
 #include <kernel.h>
 #include <limits.h>
-#include <stdint.h>
+#include <zephyr/types.h>
 
 #include <net/nbuf.h>
 #include <net/net_core.h>
diff --git a/subsys/net/ip/rpl-of0.c b/subsys/net/ip/rpl-of0.c
index 07545849672..9a87a001483 100644
--- a/subsys/net/ip/rpl-of0.c
+++ b/subsys/net/ip/rpl-of0.c
@@ -45,7 +45,7 @@
 
 #include <kernel.h>
 #include <limits.h>
-#include <stdint.h>
+#include <zephyr/types.h>
 
 #include <net/nbuf.h>
 #include <net/net_core.h>
diff --git a/subsys/net/ip/rpl.c b/subsys/net/ip/rpl.c
index a2c3caa495f..4421f121e1d 100644
--- a/subsys/net/ip/rpl.c
+++ b/subsys/net/ip/rpl.c
@@ -45,7 +45,7 @@
 
 #include <kernel.h>
 #include <limits.h>
-#include <stdint.h>
+#include <zephyr/types.h>
 
 #include <net/nbuf.h>
 #include <net/net_core.h>
diff --git a/subsys/net/ip/tcp.h b/subsys/net/ip/tcp.h
index 9fc8702ddd1..fb7baa6d2df 100644
--- a/subsys/net/ip/tcp.h
+++ b/subsys/net/ip/tcp.h
@@ -13,7 +13,7 @@
 #ifndef __TCP_H
 #define __TCP_H
 
-#include <stdint.h>
+#include <zephyr/types.h>
 
 #include <net/net_core.h>
 #include <net/net_ip.h>
diff --git a/subsys/net/ip/udp.h b/subsys/net/ip/udp.h
index fb1efebf6c6..63a573686af 100644
--- a/subsys/net/ip/udp.h
+++ b/subsys/net/ip/udp.h
@@ -13,7 +13,7 @@
 #ifndef __UDP_H
 #define __UDP_H
 
-#include <stdint.h>
+#include <zephyr/types.h>
 
 #include <net/net_core.h>
 #include <net/net_ip.h>
diff --git a/subsys/net/ip/utils.c b/subsys/net/ip/utils.c
index e06f08384d3..85c75c395eb 100644
--- a/subsys/net/ip/utils.c
+++ b/subsys/net/ip/utils.c
@@ -15,7 +15,7 @@
 #endif
 
 #include <stdlib.h>
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <stdbool.h>
 #include <string.h>
 #include <errno.h>
diff --git a/subsys/net/lib/dns/dns_pack.h b/subsys/net/lib/dns/dns_pack.h
index 1cfcf75bf05..3d41a7d6ff1 100644
--- a/subsys/net/lib/dns/dns_pack.h
+++ b/subsys/net/lib/dns/dns_pack.h
@@ -9,7 +9,7 @@
 
 #include <net/net_ip.h>
 
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <stddef.h>
 #include <errno.h>
 
diff --git a/subsys/net/lib/dns/resolve.c b/subsys/net/lib/dns/resolve.c
index 7cfeae55bd8..3a13428a205 100644
--- a/subsys/net/lib/dns/resolve.c
+++ b/subsys/net/lib/dns/resolve.c
@@ -15,7 +15,7 @@
 #define NET_LOG_ENABLED 1
 #endif
 
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <string.h>
 #include <errno.h>
 #include <stdlib.h>
diff --git a/subsys/net/lib/mqtt/mqtt_pkt.h b/subsys/net/lib/mqtt/mqtt_pkt.h
index 87db2bab137..0987c2ccc9c 100644
--- a/subsys/net/lib/mqtt/mqtt_pkt.h
+++ b/subsys/net/lib/mqtt/mqtt_pkt.h
@@ -17,7 +17,7 @@
 #ifndef _MQTT_PKT_H_
 #define _MQTT_PKT_H_
 
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <stddef.h>
 
 #include <net/mqtt_types.h>
diff --git a/subsys/net/lib/zoap/zoap.c b/subsys/net/lib/zoap/zoap.c
index fefcca8c680..0836c3aa8bf 100644
--- a/subsys/net/lib/zoap/zoap.c
+++ b/subsys/net/lib/zoap/zoap.c
@@ -6,7 +6,7 @@
 
 #include <stdlib.h>
 #include <stddef.h>
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <string.h>
 #include <stdbool.h>
 #include <errno.h>
diff --git a/subsys/net/lib/zoap/zoap_link_format.c b/subsys/net/lib/zoap/zoap_link_format.c
index 52b4efb2c74..92bfe2627d5 100644
--- a/subsys/net/lib/zoap/zoap_link_format.c
+++ b/subsys/net/lib/zoap/zoap_link_format.c
@@ -6,7 +6,7 @@
 
 #include <stdlib.h>
 #include <stddef.h>
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <string.h>
 #include <stdbool.h>
 #include <errno.h>
diff --git a/tests/bluetooth/init/src/main.c b/tests/bluetooth/init/src/main.c
index 2d7e3766cf1..ade34216232 100644
--- a/tests/bluetooth/init/src/main.c
+++ b/tests/bluetooth/init/src/main.c
@@ -6,7 +6,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <stddef.h>
 #include <misc/printk.h>
 
diff --git a/tests/bluetooth/shell/src/main.c b/tests/bluetooth/shell/src/main.c
index b5a00a6aae6..4e16e16a155 100644
--- a/tests/bluetooth/shell/src/main.c
+++ b/tests/bluetooth/shell/src/main.c
@@ -12,7 +12,7 @@
  */
 
 #include <errno.h>
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <stddef.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/tests/bluetooth/tester/src/bttester.c b/tests/bluetooth/tester/src/bttester.c
index 4eb36b29cfb..faee4cbae1d 100644
--- a/tests/bluetooth/tester/src/bttester.c
+++ b/tests/bluetooth/tester/src/bttester.c
@@ -9,7 +9,7 @@
 #include <zephyr.h>
 #include <stdio.h>
 #include <string.h>
-#include <stdint.h>
+#include <zephyr/types.h>
 
 #include <toolchain.h>
 #include <bluetooth/bluetooth.h>
diff --git a/tests/bluetooth/tester/src/gap.c b/tests/bluetooth/tester/src/gap.c
index 4b935f0b870..64ebbe96727 100644
--- a/tests/bluetooth/tester/src/gap.c
+++ b/tests/bluetooth/tester/src/gap.c
@@ -7,7 +7,7 @@
  */
 
 #include <atomic.h>
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <string.h>
 
 #include <toolchain.h>
diff --git a/tests/bluetooth/tester/src/gatt.c b/tests/bluetooth/tester/src/gatt.c
index e4e3f351c12..aeb67a55e60 100644
--- a/tests/bluetooth/tester/src/gatt.c
+++ b/tests/bluetooth/tester/src/gatt.c
@@ -6,7 +6,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <string.h>
 #include <errno.h>
 
diff --git a/tests/bluetooth/tester/src/main.c b/tests/bluetooth/tester/src/main.c
index 5375be8a5c2..c0ef54204f3 100644
--- a/tests/bluetooth/tester/src/main.c
+++ b/tests/bluetooth/tester/src/main.c
@@ -7,7 +7,7 @@
  */
 
 #include <zephyr.h>
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <toolchain.h>
 
 #include "bttester.h"
diff --git a/tests/crypto/test_aes/src/test_aes.c b/tests/crypto/test_aes/src/test_aes.c
index 79e93bfb486..4bfa7dc9919 100644
--- a/tests/crypto/test_aes/src/test_aes.c
+++ b/tests/crypto/test_aes/src/test_aes.c
@@ -51,7 +51,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <stddef.h>
 #include <misc/printk.h>
 
diff --git a/tests/crypto/test_sha256/src/test_sha256.c b/tests/crypto/test_sha256/src/test_sha256.c
index a04e3771602..be259c05cbf 100644
--- a/tests/crypto/test_sha256/src/test_sha256.c
+++ b/tests/crypto/test_sha256/src/test_sha256.c
@@ -45,7 +45,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <stdint.h>
+#include <zephyr/types.h>
 
 /*
  * NIST SHA256 test vector 1.
diff --git a/tests/kernel/libs/src/libraries.c b/tests/kernel/libs/src/libraries.c
index da8f7d8130a..2fd7bcc6684 100644
--- a/tests/kernel/libs/src/libraries.c
+++ b/tests/kernel/libs/src/libraries.c
@@ -22,7 +22,7 @@
 #include <limits.h>
 #include <stdbool.h>
 #include <stddef.h>
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <string.h>
 
 /*
diff --git a/tests/kernel/timer/timer_api/src/test_timer.h b/tests/kernel/timer/timer_api/src/test_timer.h
index baf7d20d725..48ecc503361 100644
--- a/tests/kernel/timer/timer_api/src/test_timer.h
+++ b/tests/kernel/timer/timer_api/src/test_timer.h
@@ -6,7 +6,7 @@
 
 #ifndef __TEST_TIMER_H__
 #define __TEST_TIMER_H__
-#include <stdint.h>
+#include <zephyr/types.h>
 
 struct timer_data {
 	int expire_cnt;
diff --git a/tests/lib/json/src/main.c b/tests/lib/json/src/main.c
index 259895cd4d7..6100c622f07 100644
--- a/tests/lib/json/src/main.c
+++ b/tests/lib/json/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 #include <string.h>
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <stdbool.h>
 #include <ztest.h>
 #include <json.h>
diff --git a/tests/net/6lo/src/main.c b/tests/net/6lo/src/main.c
index 5e86b4d29b3..57d2875537b 100644
--- a/tests/net/6lo/src/main.c
+++ b/tests/net/6lo/src/main.c
@@ -9,7 +9,7 @@
 #include <zephyr.h>
 #include <sections.h>
 
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <stddef.h>
 #include <string.h>
 #include <stdio.h>
diff --git a/tests/net/arp/src/main.c b/tests/net/arp/src/main.c
index 71ce2381c2f..e19b7c52d36 100644
--- a/tests/net/arp/src/main.c
+++ b/tests/net/arp/src/main.c
@@ -11,7 +11,7 @@
 
 #include <tc_util.h>
 
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <stddef.h>
 #include <string.h>
 #include <errno.h>
diff --git a/tests/net/buf/src/main.c b/tests/net/buf/src/main.c
index a60b6acd7b3..4404862e925 100644
--- a/tests/net/buf/src/main.c
+++ b/tests/net/buf/src/main.c
@@ -6,7 +6,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <stddef.h>
 #include <string.h>
 #include <misc/printk.h>
diff --git a/tests/net/context/src/main.c b/tests/net/context/src/main.c
index 16c891f90d6..90aaa9eced0 100644
--- a/tests/net/context/src/main.c
+++ b/tests/net/context/src/main.c
@@ -6,7 +6,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <stdbool.h>
 #include <stddef.h>
 #include <string.h>
diff --git a/tests/net/dhcpv4/src/main.c b/tests/net/dhcpv4/src/main.c
index cda498f3c79..b2d893a515d 100644
--- a/tests/net/dhcpv4/src/main.c
+++ b/tests/net/dhcpv4/src/main.c
@@ -9,7 +9,7 @@
 #include <zephyr.h>
 #include <sections.h>
 
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <stddef.h>
 #include <string.h>
 #include <stdio.h>
diff --git a/tests/net/icmpv6/src/main.c b/tests/net/icmpv6/src/main.c
index 07da17c4ccd..4d0289ba6b1 100644
--- a/tests/net/icmpv6/src/main.c
+++ b/tests/net/icmpv6/src/main.c
@@ -7,7 +7,7 @@
  */
 
 #include <errno.h>
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <stddef.h>
 #include <string.h>
 #include <misc/printk.h>
diff --git a/tests/net/ieee802154/fragment/src/main.c b/tests/net/ieee802154/fragment/src/main.c
index e6b9ccee088..783aac7dd47 100644
--- a/tests/net/ieee802154/fragment/src/main.c
+++ b/tests/net/ieee802154/fragment/src/main.c
@@ -9,7 +9,7 @@
 #include <zephyr.h>
 #include <sections.h>
 
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <stddef.h>
 #include <string.h>
 #include <stdio.h>
diff --git a/tests/net/iface/src/main.c b/tests/net/iface/src/main.c
index 959e01cb84d..88f171b2f38 100644
--- a/tests/net/iface/src/main.c
+++ b/tests/net/iface/src/main.c
@@ -6,7 +6,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <stdbool.h>
 #include <stddef.h>
 #include <string.h>
diff --git a/tests/net/ip-addr/src/main.c b/tests/net/ip-addr/src/main.c
index 447e52d376c..1a855084917 100644
--- a/tests/net/ip-addr/src/main.c
+++ b/tests/net/ip-addr/src/main.c
@@ -6,7 +6,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <stddef.h>
 #include <string.h>
 #include <errno.h>
diff --git a/tests/net/ipv6/src/main.c b/tests/net/ipv6/src/main.c
index 39066df7bae..f3a4fe6bcd9 100644
--- a/tests/net/ipv6/src/main.c
+++ b/tests/net/ipv6/src/main.c
@@ -6,7 +6,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <stdbool.h>
 #include <stddef.h>
 #include <string.h>
diff --git a/tests/net/lib/dns_resolve/src/main.c b/tests/net/lib/dns_resolve/src/main.c
index 00094d29ef7..0127822ab50 100644
--- a/tests/net/lib/dns_resolve/src/main.c
+++ b/tests/net/lib/dns_resolve/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <stdbool.h>
 #include <stddef.h>
 #include <string.h>
diff --git a/tests/net/lib/zoap/src/main.c b/tests/net/lib/zoap/src/main.c
index ea538d4157d..19f85f2e16c 100644
--- a/tests/net/lib/zoap/src/main.c
+++ b/tests/net/lib/zoap/src/main.c
@@ -5,7 +5,7 @@
  */
 
 #include <errno.h>
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <stdbool.h>
 #include <stddef.h>
 #include <stdio.h>
diff --git a/tests/net/mld/src/main.c b/tests/net/mld/src/main.c
index 5ea6835e978..94486568ad0 100644
--- a/tests/net/mld/src/main.c
+++ b/tests/net/mld/src/main.c
@@ -6,7 +6,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <stdbool.h>
 #include <stddef.h>
 #include <string.h>
diff --git a/tests/net/nbuf/src/main.c b/tests/net/nbuf/src/main.c
index f2741476f34..c5cac1ce9ee 100644
--- a/tests/net/nbuf/src/main.c
+++ b/tests/net/nbuf/src/main.c
@@ -6,7 +6,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <stddef.h>
 #include <string.h>
 #include <errno.h>
diff --git a/tests/net/neighbor/src/main.c b/tests/net/neighbor/src/main.c
index 7f8a53f95f6..d953ba62df3 100644
--- a/tests/net/neighbor/src/main.c
+++ b/tests/net/neighbor/src/main.c
@@ -6,7 +6,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <stddef.h>
 #include <string.h>
 #include <stdio.h>
diff --git a/tests/net/route/src/main.c b/tests/net/route/src/main.c
index 6a30bfef57d..f558f78cc2d 100644
--- a/tests/net/route/src/main.c
+++ b/tests/net/route/src/main.c
@@ -6,7 +6,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <stdbool.h>
 #include <stddef.h>
 #include <string.h>
diff --git a/tests/net/rpl/src/main.c b/tests/net/rpl/src/main.c
index 99890eeda6b..edc0bc778ef 100644
--- a/tests/net/rpl/src/main.c
+++ b/tests/net/rpl/src/main.c
@@ -6,7 +6,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <stdbool.h>
 #include <stddef.h>
 #include <string.h>
diff --git a/tests/net/tcp/src/main.c b/tests/net/tcp/src/main.c
index 6348290c8c4..dc003942357 100644
--- a/tests/net/tcp/src/main.c
+++ b/tests/net/tcp/src/main.c
@@ -9,7 +9,7 @@
 #include <zephyr.h>
 #include <sections.h>
 
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <stddef.h>
 #include <string.h>
 #include <stdio.h>
diff --git a/tests/net/trickle/src/main.c b/tests/net/trickle/src/main.c
index 33adfbe64fa..68aed4592b7 100644
--- a/tests/net/trickle/src/main.c
+++ b/tests/net/trickle/src/main.c
@@ -6,7 +6,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <stdbool.h>
 #include <stddef.h>
 #include <string.h>
diff --git a/tests/net/udp/src/main.c b/tests/net/udp/src/main.c
index 5c721e01da7..28ae7fba8bf 100644
--- a/tests/net/udp/src/main.c
+++ b/tests/net/udp/src/main.c
@@ -9,7 +9,7 @@
 #include <zephyr.h>
 #include <sections.h>
 
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <stddef.h>
 #include <string.h>
 #include <stdio.h>
diff --git a/tests/net/utils/src/main.c b/tests/net/utils/src/main.c
index 4ac5a7c3dc0..b28f8e72eb0 100644
--- a/tests/net/utils/src/main.c
+++ b/tests/net/utils/src/main.c
@@ -6,7 +6,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <stddef.h>
 #include <string.h>
 #include <stdio.h>
diff --git a/tests/unit/bluetooth/at/src/main.c b/tests/unit/bluetooth/at/src/main.c
index 6e975f3a5d9..f257f8fcc3d 100644
--- a/tests/unit/bluetooth/at/src/main.c
+++ b/tests/unit/bluetooth/at/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <stddef.h>
 #include <string.h>
 
diff --git a/tests/ztest/include/ztest_mock.h b/tests/ztest/include/ztest_mock.h
index 04d81950241..b55bad1bb10 100644
--- a/tests/ztest/include/ztest_mock.h
+++ b/tests/ztest/include/ztest_mock.h
@@ -89,7 +89,7 @@
 
 #ifdef CONFIG_ZTEST_MOCKING
 
-#include <stdint.h>
+#include <zephyr/types.h>
 
 void _init_mock(void);
 int _cleanup_mock(void);
diff --git a/tests/ztest/src/ztest_mock.c b/tests/ztest/src/ztest_mock.c
index 26a9731d8ac..0afba2bf59e 100644
--- a/tests/ztest/src/ztest_mock.c
+++ b/tests/ztest/src/ztest_mock.c
@@ -5,7 +5,7 @@
  */
 
 #include <ztest.h>
-#include <stdint.h>
+#include <zephyr/types.h>
 #include <string.h>
 #include <stdio.h>