Index: abi/include/_bits/inttypes.h
===================================================================
--- abi/include/_bits/inttypes.h	(revision 1c95fd07977aa8fc9d973a9da5ec68433a5c67c4)
+++ abi/include/_bits/inttypes.h	(revision e4c8e3cfcadb1f6ee5b030c72036429781a36a0b)
@@ -44,9 +44,4 @@
 #include <_bits/wchar_t.h>
 
-typedef struct {
-	intmax_t quot;
-	intmax_t rem;
-} imaxdiv_t;
-
 #define PRId8       __PRId8__
 #define PRIdLEAST8  __PRId8__
@@ -237,4 +232,6 @@
 #define SCNxPTR  __SCNxPTR__
 
+#ifndef __HELENOS_DISABLE_INTMAX__
+
 #define PRIdMAX  __PRIdMAX__
 #define PRIiMAX  __PRIiMAX__
@@ -249,4 +246,11 @@
 #define SCNxMAX  __SCNxMAX__
 
+typedef struct {
+	intmax_t quot;
+	intmax_t rem;
+} imaxdiv_t;
+
+#endif  /* __HELENOS_DISABLE_INTMAX__ */
+
 #endif
 
Index: abi/include/_bits/macros.h
===================================================================
--- abi/include/_bits/macros.h	(revision 1c95fd07977aa8fc9d973a9da5ec68433a5c67c4)
+++ abi/include/_bits/macros.h	(revision e4c8e3cfcadb1f6ee5b030c72036429781a36a0b)
@@ -578,4 +578,6 @@
 #endif
 
+#ifndef __HELENOS_DISABLE_INTMAX__
+
 #if !defined(__INTMAX_TYPE__) || !defined(__INTMAX_MAX__)
 #error HelenOS expects __INTMAX_TYPE__ and __INTMAX_MAX__ \
@@ -640,4 +642,6 @@
 #define __SCNxMAX__  "jx"
 
+#endif  /* __HELENOS_DISABLE_INTMAX__ */
+
 #ifndef __SIZEOF_FLOAT__
 #error HelenOS expects __SIZEOF_FLOAT__ to be defined.
Index: abi/include/_bits/stdint.h
===================================================================
--- abi/include/_bits/stdint.h	(revision 1c95fd07977aa8fc9d973a9da5ec68433a5c67c4)
+++ abi/include/_bits/stdint.h	(revision e4c8e3cfcadb1f6ee5b030c72036429781a36a0b)
@@ -155,4 +155,6 @@
 #define UINTPTR_MAX  __UINTPTR_MAX__
 
+#ifndef __HELENOS_DISABLE_INTMAX__
+
 typedef __INTMAX_TYPE__  intmax_t;
 typedef __UINTMAX_TYPE__ uintmax_t;
@@ -165,4 +167,6 @@
 #define INTMAX_C(x)   __INTMAX_C(x)
 #define UINTMAX_C(x)  __UINTMAX_C(x)
+
+#endif  /* __HELENOS_DISABLE_INTMAX__ */
 
 #define PTRDIFF_MIN  __PTRDIFF_MIN__