diff --git a/include/stddef.h b/include/stddef.h
index 85d5da51bd4..afe88c6d7f1 100644
--- a/include/stddef.h
+++ b/include/stddef.h
@@ -37,6 +37,8 @@
  * Type Definitions
  ****************************************************************************/
 
+#ifndef __ASSEMBLY__
+
 /* The <stddef.h> header shall define the following types:
  *
  * ptrdiff_t
@@ -84,4 +86,6 @@ typedef struct
 #endif
 } max_align_t;
 
+#endif /* __ASSEMBLY__ */
+
 #endif /* __INCLUDE_STDDEF_H */
diff --git a/include/stdint.h b/include/stdint.h
index e14610ea146..0feaf403da6 100644
--- a/include/stdint.h
+++ b/include/stdint.h
@@ -156,6 +156,8 @@
  * Public Types
  ****************************************************************************/
 
+#ifndef __ASSEMBLY__
+
 /* Exact-width integer types.  NOTE that these types are defined in
  * architecture-specific logic with leading underscore character. This file
  * typedef's these to the final name without the underscore character.  This
@@ -254,5 +256,7 @@ typedef _uint_farptr_t      uint_farptr_t;
 typedef _intmax_t           intmax_t;
 typedef _uintmax_t          uintmax_t;
 
+#endif /* __ASSEMBLY__ */
+
 #endif /* CONFIG_ARCH_STDINT_H */
 #endif /* __INCLUDE_STDINT_H */