Index: kernel/arch/abs32le/include/types.h
===================================================================
--- kernel/arch/abs32le/include/types.h	(revision 855e0d811a98ab099ac72bbad3f412912d809f2c)
+++ kernel/arch/abs32le/include/types.h	(revision 5587cf734004dfd2d781ebd8e5af563d93e1bf23)
@@ -53,9 +53,11 @@
 } fncptr_t;
 
-#define PRIp   PRIx32  /**< Format for uintptr_t. */
-#define PRIs   PRIu32  /**< Format for size_t. */
+#define INTN_C(c)   INT32_C(c)
+#define UINTN_C(c)  UINT32_C(c)
+
 #define PRIdn  PRId32  /**< Format for native_t. */
 #define PRIun  PRIu32  /**< Format for unative_t. */
 #define PRIxn  PRIx32  /**< Format for hexadecimal unative_t. */
+#define PRIua  PRIu32  /**< Format for atomic_count_t. */
 
 #endif
Index: kernel/arch/amd64/include/types.h
===================================================================
--- kernel/arch/amd64/include/types.h	(revision 855e0d811a98ab099ac72bbad3f412912d809f2c)
+++ kernel/arch/amd64/include/types.h	(revision 5587cf734004dfd2d781ebd8e5af563d93e1bf23)
@@ -50,9 +50,11 @@
 } fncptr_t;
 
-#define PRIp   PRIx64  /**< Format for uintptr_t. */
-#define PRIs   PRIu64  /**< Format for size_t. */
+#define INTN_C(c)   INT64_C(c)
+#define UINTN_C(c)  UINT64_C(c)
+
 #define PRIdn  PRId64  /**< Format for native_t. */
 #define PRIun  PRIu64  /**< Format for unative_t. */
 #define PRIxn  PRIx64  /**< Format for hexadecimal unative_t. */
+#define PRIua  PRIu64  /**< Format for atomic_count_t. */
 
 #endif
Index: kernel/arch/arm32/include/types.h
===================================================================
--- kernel/arch/arm32/include/types.h	(revision 855e0d811a98ab099ac72bbad3f412912d809f2c)
+++ kernel/arch/arm32/include/types.h	(revision 5587cf734004dfd2d781ebd8e5af563d93e1bf23)
@@ -57,9 +57,11 @@
 } fncptr_t;
 
-#define PRIp   PRIx32  /**< Format for uintptr_t. */
-#define PRIs   PRIu32  /**< Format for size_t. */
+#define INTN_C(c)   INT32_C(c)
+#define UINTN_C(c)  UINT32_C(c)
+
 #define PRIdn  PRId32  /**< Format for native_t. */
 #define PRIun  PRIu32  /**< Format for unative_t. */
 #define PRIxn  PRIx32  /**< Format for hexadecimal unative_t. */
+#define PRIua  PRIu32  /**< Format for atomic_count_t. */
 
 #endif
Index: kernel/arch/ia32/include/types.h
===================================================================
--- kernel/arch/ia32/include/types.h	(revision 855e0d811a98ab099ac72bbad3f412912d809f2c)
+++ kernel/arch/ia32/include/types.h	(revision 5587cf734004dfd2d781ebd8e5af563d93e1bf23)
@@ -50,9 +50,11 @@
 } fncptr_t;
 
-#define PRIp   PRIx32  /**< Format for uintptr_t. */
-#define PRIs   PRIu32  /**< Format for size_t. */
+#define INTN_C(c)   INT32_C(c)
+#define UINTN_C(c)  UINT32_C(c)
+
 #define PRIdn  PRId32  /**< Format for native_t. */
 #define PRIun  PRIu32  /**< Format for unative_t. */
 #define PRIxn  PRIx32  /**< Format for hexadecimal unative_t. */
+#define PRIua  PRIu32  /**< Format for atomic_count_t. */
 
 #endif
Index: kernel/arch/ia64/include/types.h
===================================================================
--- kernel/arch/ia64/include/types.h	(revision 855e0d811a98ab099ac72bbad3f412912d809f2c)
+++ kernel/arch/ia64/include/types.h	(revision 5587cf734004dfd2d781ebd8e5af563d93e1bf23)
@@ -52,9 +52,11 @@
 } __attribute__((may_alias)) fncptr_t;
 
-#define PRIp   PRIx64  /**< Format for uintptr_t. */
-#define PRIs   PRIu64  /**< Format for size_t. */
+#define INTN_C(c)   INT64_C(c)
+#define UINTN_C(c)  UINT64_C(c)
+
 #define PRIdn  PRId64  /**< Format for native_t. */
 #define PRIun  PRIu64  /**< Format for unative_t. */
 #define PRIxn  PRIx64  /**< Format for hexadecimal unative_t. */
+#define PRIua  PRIu64  /**< Format for atomic_count_t. */
 
 #endif
Index: kernel/arch/mips32/include/types.h
===================================================================
--- kernel/arch/mips32/include/types.h	(revision 855e0d811a98ab099ac72bbad3f412912d809f2c)
+++ kernel/arch/mips32/include/types.h	(revision 5587cf734004dfd2d781ebd8e5af563d93e1bf23)
@@ -50,9 +50,11 @@
 } fncptr_t;
 
-#define PRIp   PRIx32  /**< Format for uintptr_t. */
-#define PRIs   PRIu32  /**< Format for size_t. */
+#define INTN_C(c)   INT32_C(c)
+#define UINTN_C(c)  UINT32_C(c)
+
 #define PRIdn  PRId32  /**< Format for native_t. */
 #define PRIun  PRIu32  /**< Format for unative_t. */
 #define PRIxn  PRIx32  /**< Format for hexadecimal unative_t. */
+#define PRIua  PRIu32  /**< Format for atomic_count_t. */
 
 #endif
Index: kernel/arch/ppc32/include/types.h
===================================================================
--- kernel/arch/ppc32/include/types.h	(revision 855e0d811a98ab099ac72bbad3f412912d809f2c)
+++ kernel/arch/ppc32/include/types.h	(revision 5587cf734004dfd2d781ebd8e5af563d93e1bf23)
@@ -50,9 +50,11 @@
 } fncptr_t;
 
-#define PRIp   PRIx32  /**< Format for uintptr_t. */
-#define PRIs   PRIu32  /**< Format for size_t. */
+#define INTN_C(c)   INT32_C(c)
+#define UINTN_C(c)  UINT32_C(c)
+
 #define PRIdn  PRId32  /**< Format for native_t. */
 #define PRIun  PRIu32  /**< Format for unative_t. */
 #define PRIxn  PRIx32  /**< Format for hexadecimal unative_t. */
+#define PRIua  PRIu32  /**< Format for atomic_count_t. */
 
 #endif
Index: kernel/arch/sparc64/include/types.h
===================================================================
--- kernel/arch/sparc64/include/types.h	(revision 855e0d811a98ab099ac72bbad3f412912d809f2c)
+++ kernel/arch/sparc64/include/types.h	(revision 5587cf734004dfd2d781ebd8e5af563d93e1bf23)
@@ -52,9 +52,11 @@
 typedef uint8_t asi_t;
 
-#define PRIp   PRIx64  /**< Format for uintptr_t. */
-#define PRIs   PRIu64  /**< Format for size_t. */
+#define INTN_C(c)   INT64_C(c)
+#define UINTN_C(c)  UINT64_C(c)
+
 #define PRIdn  PRId64  /**< Format for native_t. */
 #define PRIun  PRIu64  /**< Format for unative_t. */
 #define PRIxn  PRIx64  /**< Format for hexadecimal unative_t. */
+#define PRIua  PRIu64  /**< Format for atomic_count_t. */
 
 #endif
Index: kernel/generic/include/typedefs.h
===================================================================
--- kernel/generic/include/typedefs.h	(revision 855e0d811a98ab099ac72bbad3f412912d809f2c)
+++ kernel/generic/include/typedefs.h	(revision 5587cf734004dfd2d781ebd8e5af563d93e1bf23)
@@ -40,5 +40,5 @@
 #include <arch/types.h>
 
-#define NULL	((void *) 0)
+#define NULL  ((void *) 0)
 
 #define false  0
@@ -69,6 +69,4 @@
 typedef int32_t devno_t;
 
-typedef int32_t wchar_t;
-
 typedef volatile uint8_t ioport8_t;
 typedef volatile uint16_t ioport16_t;