Index: boot/generic/include/stdint.h
===================================================================
--- boot/generic/include/stdint.h	(revision 855e0d811a98ab099ac72bbad3f412912d809f2c)
+++ boot/generic/include/stdint.h	(revision 5587cf734004dfd2d781ebd8e5af563d93e1bf23)
@@ -33,27 +33,27 @@
 #define BOOT_STDINT_H_
 
-#define INT8_MIN  (0x80)
-#define INT8_MAX  (0x7F)
+#define INT8_MIN  INT8_C(0x80)
+#define INT8_MAX  INT8_C(0x7F)
 
-#define UINT8_MIN  (0u)
-#define UINT8_MAX  (0xFFu)
+#define UINT8_MIN  UINT8_C(0)
+#define UINT8_MAX  UINT8_C(0xFF)
 
-#define INT16_MIN  (0x8000)
-#define INT16_MAX  (0x7FFF)
+#define INT16_MIN  INT16_C(0x8000)
+#define INT16_MAX  INT16_C(0x7FFF)
 
-#define UINT16_MIN  (0u)
-#define UINT16_MAX  (0xFFFFu)
+#define UINT16_MIN  UINT16_C(0)
+#define UINT16_MAX  UINT16_C(0xFFFF)
 
-#define INT32_MIN  (0x80000000l)
-#define INT32_MAX  (0x7FFFFFFFl)
+#define INT32_MIN  INT32_C(0x80000000)
+#define INT32_MAX  INT32_C(0x7FFFFFFF)
 
-#define UINT32_MIN  (0ul)
-#define UINT32_MAX  (0xFFFFFFFFul)
+#define UINT32_MIN  UINT32_C(0)
+#define UINT32_MAX  UINT32_C(0xFFFFFFFF)
 
-#define INT64_MIN  (0x8000000000000000ll)
-#define INT64_MAX  (0x7FFFFFFFFFFFFFFFll)
+#define INT64_MIN  INT64_C(0x8000000000000000)
+#define INT64_MAX  INT64_C(0x7FFFFFFFFFFFFFFF)
 
-#define UINT64_MIN  (0ull)
-#define UINT64_MAX  (0xFFFFFFFFFFFFFFFFull)
+#define UINT64_MIN  UINT64_C(0)
+#define UINT64_MAX  UINT64_C(0xFFFFFFFFFFFFFFFF)
 
 #endif
Index: boot/generic/include/typedefs.h
===================================================================
--- boot/generic/include/typedefs.h	(revision 855e0d811a98ab099ac72bbad3f412912d809f2c)
+++ boot/generic/include/typedefs.h	(revision 5587cf734004dfd2d781ebd8e5af563d93e1bf23)
@@ -37,5 +37,5 @@
 #include <arch/types.h>
 
-#define NULL	((void *) 0)
+#define NULL  ((void *) 0)
 
 #define false  0
@@ -43,5 +43,4 @@
 
 typedef uint8_t bool;
-typedef int32_t wchar_t;
 
 #endif
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;
Index: uspace/lib/c/arch/abs32le/include/inttypes.h
===================================================================
--- uspace/lib/c/arch/abs32le/include/inttypes.h	(revision 855e0d811a98ab099ac72bbad3f412912d809f2c)
+++ uspace/lib/c/arch/abs32le/include/inttypes.h	(revision 5587cf734004dfd2d781ebd8e5af563d93e1bf23)
@@ -34,9 +34,8 @@
 #define LIBC_abs32le_INTTYPES_H_
 
-#define PRIdPTR  PRId32
-#define PRIoPTR  PRIo32
-#define PRIuPTR  PRIu32
-#define PRIxPTR  PRIx32
-#define PRIXPTR  PRIX32
+#define PRIdn  PRId32  /**< Format for sysarg_t, ipcarg_t, etc. */
+#define PRIun  PRIu32  /**< Format for sysarg_t, ipcarg_t, etc. */
+#define PRIxn  PRIx32  /**< Format for hexadecimal sysarg_t, ipcarg_t, etc. */
+#define PRIua  PRIu32  /**< Format for atomic_count_t. */
 
 #endif
Index: uspace/lib/c/arch/amd64/include/inttypes.h
===================================================================
--- uspace/lib/c/arch/amd64/include/inttypes.h	(revision 855e0d811a98ab099ac72bbad3f412912d809f2c)
+++ uspace/lib/c/arch/amd64/include/inttypes.h	(revision 5587cf734004dfd2d781ebd8e5af563d93e1bf23)
@@ -30,20 +30,12 @@
  * @{
  */
-/** @file Macros for format specifiers.
- *
- * Macros for formatting stdint types as specified in section
- * 7.8.1 Macros for format specifiers of the C99 draft specification
- * (ISO/IEC 9899:201x). Only some macros from the specification are
- * implemented.
- */
 
 #ifndef LIBC_amd64_INTTYPES_H_
 #define LIBC_amd64_INTTYPES_H_
 
-#define PRIdPTR  PRId64
-#define PRIoPTR  PRIo64
-#define PRIuPTR  PRIu64
-#define PRIxPTR  PRIx64
-#define PRIXPTR  PRIX64
+#define PRIdn  PRId64  /**< Format for sysarg_t, ipcarg_t, etc. */
+#define PRIun  PRIu64  /**< Format for sysarg_t, ipcarg_t, etc. */
+#define PRIxn  PRIx64  /**< Format for hexadecimal sysarg_t, ipcarg_t, etc. */
+#define PRIua  PRIu64  /**< Format for atomic_count_t. */
 
 #endif
Index: uspace/lib/c/arch/arm32/include/inttypes.h
===================================================================
--- uspace/lib/c/arch/arm32/include/inttypes.h	(revision 855e0d811a98ab099ac72bbad3f412912d809f2c)
+++ uspace/lib/c/arch/arm32/include/inttypes.h	(revision 5587cf734004dfd2d781ebd8e5af563d93e1bf23)
@@ -30,20 +30,12 @@
  * @{
  */
-/** @file Macros for format specifiers.
- *
- * Macros for formatting stdint types as specified in section
- * 7.8.1 Macros for format specifiers of the C99 draft specification
- * (ISO/IEC 9899:201x). Only some macros from the specification are
- * implemented.
- */
 
 #ifndef LIBC_arm32_INTTYPES_H_
 #define LIBC_arm32_INTTYPES_H_
 
-#define PRIdPTR  PRId32
-#define PRIoPTR  PRIo32
-#define PRIuPTR  PRIu32
-#define PRIxPTR  PRIx32
-#define PRIXPTR  PRIX32
+#define PRIdn  PRId32  /**< Format for sysarg_t, ipcarg_t, etc. */
+#define PRIun  PRIu32  /**< Format for sysarg_t, ipcarg_t, etc. */
+#define PRIxn  PRIx32  /**< Format for hexadecimal sysarg_t, ipcarg_t, etc. */
+#define PRIua  PRIu32  /**< Format for atomic_count_t. */
 
 #endif
Index: uspace/lib/c/arch/ia32/include/inttypes.h
===================================================================
--- uspace/lib/c/arch/ia32/include/inttypes.h	(revision 855e0d811a98ab099ac72bbad3f412912d809f2c)
+++ uspace/lib/c/arch/ia32/include/inttypes.h	(revision 5587cf734004dfd2d781ebd8e5af563d93e1bf23)
@@ -30,20 +30,12 @@
  * @{
  */
-/** @file Macros for format specifiers.
- *
- * Macros for formatting stdint types as specified in section
- * 7.8.1 Macros for format specifiers of the C99 draft specification
- * (ISO/IEC 9899:201x). Only some macros from the specification are
- * implemented.
- */
 
 #ifndef LIBC_ia32_INTTYPES_H_
 #define LIBC_ia32_INTTYPES_H_
 
-#define PRIdPTR  PRId32
-#define PRIoPTR  PRIo32
-#define PRIuPTR  PRIu32
-#define PRIxPTR  PRIx32
-#define PRIXPTR  PRIX32
+#define PRIdn  PRId32  /**< Format for sysarg_t, ipcarg_t, etc. */
+#define PRIun  PRIu32  /**< Format for sysarg_t, ipcarg_t, etc. */
+#define PRIxn  PRIx32  /**< Format for hexadecimal sysarg_t, ipcarg_t, etc. */
+#define PRIua  PRIu32  /**< Format for atomic_count_t. */
 
 #endif
Index: uspace/lib/c/arch/ia64/include/inttypes.h
===================================================================
--- uspace/lib/c/arch/ia64/include/inttypes.h	(revision 855e0d811a98ab099ac72bbad3f412912d809f2c)
+++ uspace/lib/c/arch/ia64/include/inttypes.h	(revision 5587cf734004dfd2d781ebd8e5af563d93e1bf23)
@@ -30,20 +30,12 @@
  * @{
  */
-/** @file Macros for format specifiers.
- *
- * Macros for formatting stdint types as specified in section
- * 7.8.1 Macros for format specifiers of the C99 draft specification
- * (ISO/IEC 9899:201x). Only some macros from the specification are
- * implemented.
- */
 
 #ifndef LIBC_ia64_INTTYPES_H_
 #define LIBC_ia64_INTTYPES_H_
 
-#define PRIdPTR  PRId64
-#define PRIoPTR  PRIo64
-#define PRIuPTR  PRIu64
-#define PRIxPTR  PRIx64
-#define PRIXPTR  PRIX64
+#define PRIdn  PRId64  /**< Format for sysarg_t, ipcarg_t, etc. */
+#define PRIun  PRIu64  /**< Format for sysarg_t, ipcarg_t, etc. */
+#define PRIxn  PRIx64  /**< Format for hexadecimal sysarg_t, ipcarg_t, etc. */
+#define PRIua  PRIu64  /**< Format for atomic_count_t. */
 
 #endif
Index: uspace/lib/c/arch/mips32/include/inttypes.h
===================================================================
--- uspace/lib/c/arch/mips32/include/inttypes.h	(revision 855e0d811a98ab099ac72bbad3f412912d809f2c)
+++ uspace/lib/c/arch/mips32/include/inttypes.h	(revision 5587cf734004dfd2d781ebd8e5af563d93e1bf23)
@@ -30,20 +30,12 @@
  * @{
  */
-/** @file Macros for format specifiers.
- *
- * Macros for formatting stdint types as specified in section
- * 7.8.1 Macros for format specifiers of the C99 draft specification
- * (ISO/IEC 9899:201x). Only some macros from the specification are
- * implemented.
- */
 
 #ifndef LIBC_mips32_INTTYPES_H_
 #define LIBC_mips32_INTTYPES_H_
 
-#define PRIdPTR  PRId32
-#define PRIoPTR  PRIo32
-#define PRIuPTR  PRIu32
-#define PRIxPTR  PRIx32
-#define PRIXPTR  PRIX32
+#define PRIdn  PRId32  /**< Format for sysarg_t, ipcarg_t, etc. */
+#define PRIun  PRIu32  /**< Format for sysarg_t, ipcarg_t, etc. */
+#define PRIxn  PRIx32  /**< Format for hexadecimal sysarg_t, ipcarg_t, etc. */
+#define PRIua  PRIu32  /**< Format for atomic_count_t. */
 
 #endif
Index: uspace/lib/c/arch/ppc32/include/inttypes.h
===================================================================
--- uspace/lib/c/arch/ppc32/include/inttypes.h	(revision 855e0d811a98ab099ac72bbad3f412912d809f2c)
+++ uspace/lib/c/arch/ppc32/include/inttypes.h	(revision 5587cf734004dfd2d781ebd8e5af563d93e1bf23)
@@ -30,20 +30,12 @@
  * @{
  */
-/** @file Macros for format specifiers.
- *
- * Macros for formatting stdint types as specified in section
- * 7.8.1 Macros for format specifiers of the C99 draft specification
- * (ISO/IEC 9899:201x). Only some macros from the specification are
- * implemented.
- */
 
 #ifndef LIBC_ppc32_INTTYPES_H_
 #define LIBC_ppc32_INTTYPES_H_
 
-#define PRIdPTR  PRId32
-#define PRIoPTR  PRIo32
-#define PRIuPTR  PRIu32
-#define PRIxPTR  PRIx32
-#define PRIXPTR  PRIX32
+#define PRIdn  PRId32  /**< Format for sysarg_t, ipcarg_t, etc. */
+#define PRIun  PRIu32  /**< Format for sysarg_t, ipcarg_t, etc. */
+#define PRIxn  PRIx32  /**< Format for hexadecimal sysarg_t, ipcarg_t, etc. */
+#define PRIua  PRIu32  /**< Format for atomic_count_t. */
 
 #endif
Index: uspace/lib/c/arch/sparc64/include/inttypes.h
===================================================================
--- uspace/lib/c/arch/sparc64/include/inttypes.h	(revision 855e0d811a98ab099ac72bbad3f412912d809f2c)
+++ uspace/lib/c/arch/sparc64/include/inttypes.h	(revision 5587cf734004dfd2d781ebd8e5af563d93e1bf23)
@@ -30,20 +30,12 @@
  * @{
  */
-/** @file Macros for format specifiers.
- *
- * Macros for formatting stdint types as specified in section
- * 7.8.1 Macros for format specifiers of the C99 draft specification
- * (ISO/IEC 9899:201x). Only some macros from the specification are
- * implemented.
- */
 
 #ifndef LIBC_sparc64_INTTYPES_H_
 #define LIBC_sparc64_INTTYPES_H_
 
-#define PRIdPTR  PRId64
-#define PRIoPTR  PRIo64
-#define PRIuPTR  PRIu64
-#define PRIxPTR  PRIx64
-#define PRIXPTR  PRIX64
+#define PRIdn  PRId64  /**< Format for sysarg_t, ipcarg_t, etc. */
+#define PRIun  PRIu64  /**< Format for sysarg_t, ipcarg_t, etc. */
+#define PRIxn  PRIx64  /**< Format for hexadecimal sysarg_t, ipcarg_t, etc. */
+#define PRIua  PRIu64  /**< Format for atomic_count_t. */
 
 #endif
Index: uspace/lib/c/include/sys/typefmt.h
===================================================================
--- uspace/lib/c/include/sys/typefmt.h	(revision 855e0d811a98ab099ac72bbad3f412912d809f2c)
+++ uspace/lib/c/include/sys/typefmt.h	(revision 5587cf734004dfd2d781ebd8e5af563d93e1bf23)
@@ -39,5 +39,5 @@
 #include <inttypes.h>
 
-/* off64_t */
+/* off64_t, aoff64_t */
 #define PRIdOFF64 PRId64
 #define PRIuOFF64 PRIu64
@@ -45,28 +45,4 @@
 #define PRIXOFF64 PRIX64
 
-/* (s)size_t */
-#define PRIdSIZE PRIdPTR
-#define PRIuSIZE PRIuPTR
-#define PRIxSIZE PRIxPTR
-#define PRIXSIZE PRIXPTR
-
-/* sysarg_t */
-#define PRIdSYSARG PRIdPTR
-#define PRIuSYSARG PRIuPTR
-#define PRIxSYSARG PRIxPTR
-#define PRIXSYSARG PRIxPTR
-
-/* ipcarg_t */
-#define PRIdIPCARG PRIdPTR
-#define PRIuIPCARG PRIuPTR
-#define PRIxIPCARG PRIxPTR
-#define PRIXIPCARG PRIXPTR
-
-/* taskid_t */
-#define PRIdTASKID PRId64
-#define PRIuTASKID PRIu64
-#define PRIxTASKID PRIx64
-#define PRIXTASKID PRIx64
-
 #endif