diff --git a/include/zephyr/toolchain/zephyr_stdint.h b/include/zephyr/toolchain/zephyr_stdint.h
index 3cd4defbf6f9e..880c73d8e31cc 100644
--- a/include/zephyr/toolchain/zephyr_stdint.h
+++ b/include/zephyr/toolchain/zephyr_stdint.h
@@ -7,6 +7,8 @@
 #ifndef ZEPHYR_INCLUDE_TOOLCHAIN_STDINT_H_
 #define ZEPHYR_INCLUDE_TOOLCHAIN_STDINT_H_
 
+#ifndef ZEPHYR_USE_TOOLCHAIN_STDINT
+
 /*
  * Some gcc versions and/or configurations as found in the Zephyr SDK
  * (questionably) define __INT32_TYPE__ and derivatives as a long int
@@ -103,4 +105,5 @@
 #define __INT64_C(c) c ## LL
 #define __UINT64_C(c) c ## ULL
 
+#endif /* ZEPHYR_USE_TOOLCHAIN_STDINT */
 #endif /* ZEPHYR_INCLUDE_TOOLCHAIN_STDINT_H_ */
diff --git a/modules/cmsis-dsp/CMakeLists.txt b/modules/cmsis-dsp/CMakeLists.txt
index 2a0924cc25cc4..27a68b6788115 100644
--- a/modules/cmsis-dsp/CMakeLists.txt
+++ b/modules/cmsis-dsp/CMakeLists.txt
@@ -19,6 +19,8 @@ if(CONFIG_CMSIS_DSP)
     ${cmsis_glue_path}/CMSIS/Core/Include
   )
 
+  zephyr_library_compile_definitions(ZEPHYR_USE_TOOLCHAIN_STDINT)
+
   # Global Feature Definitions
   zephyr_library_compile_definitions_ifdef(CONFIG_CMSIS_DSP_NEON                  ARM_MATH_NEON)
   zephyr_library_compile_definitions_ifdef(CONFIG_CMSIS_DSP_NEON_EXPERIMENTAL     ARM_MATH_NEON_EXPERIMENTAL)