Index: abi/include/abi/ddi/arg.h
===================================================================
--- abi/include/abi/ddi/arg.h	(revision fb864d653f08c9c94bf26673eb5d1efd0c3e6f25)
+++ abi/include/abi/ddi/arg.h	(revision aca642c01e1dd4f0528a1c47cbf0f2c426164564)
@@ -36,4 +36,6 @@
 #define ABI_DDI_ARG_H_
 
+#include <stdint.h>
+
 #define DMAMEM_FLAGS_ANONYMOUS  0x01
 
Index: abi/include/abi/ddi/irq.h
===================================================================
--- abi/include/abi/ddi/irq.h	(revision fb864d653f08c9c94bf26673eb5d1efd0c3e6f25)
+++ abi/include/abi/ddi/irq.h	(revision aca642c01e1dd4f0528a1c47cbf0f2c426164564)
@@ -35,4 +35,6 @@
 #ifndef ABI_DDI_IRQ_H_
 #define ABI_DDI_IRQ_H_
+
+#include <stdint.h>
 
 typedef struct {
Index: abi/include/abi/fourcc.h
===================================================================
--- abi/include/abi/fourcc.h	(revision fb864d653f08c9c94bf26673eb5d1efd0c3e6f25)
+++ abi/include/abi/fourcc.h	(revision aca642c01e1dd4f0528a1c47cbf0f2c426164564)
@@ -36,12 +36,12 @@
 #define ABI_FOURCC_H_
 
-#include "../../../common.h"
+#include <stdint.h>
 
 #define FOURCC(a, b, c, d) \
-	(((UINT32_T) (a)) | (((UINT32_T) (b)) << 8) | \
-	    (((UINT32_T) (c)) << 16) | (((UINT32_T) (d)) << 24))
+	(((uint32_t) (a)) | (((uint32_t) (b)) << 8) | \
+	    (((uint32_t) (c)) << 16) | (((uint32_t) (d)) << 24))
 
 #define CC_COMPACT(a) \
-	((UINT32_T) (a) & 0x7f)
+	((uint32_t) (a) & 0x7f)
 
 #define FOURCC_COMPACT(a, b, c, d) \
Index: abi/include/abi/proc/task.h
===================================================================
--- abi/include/abi/proc/task.h	(revision fb864d653f08c9c94bf26673eb5d1efd0c3e6f25)
+++ abi/include/abi/proc/task.h	(revision aca642c01e1dd4f0528a1c47cbf0f2c426164564)
@@ -36,4 +36,6 @@
 #define ABI_PROC_TASK_H_
 
+#include <stdint.h>
+
 typedef uint64_t task_id_t;
 
Index: abi/include/abi/proc/thread.h
===================================================================
--- abi/include/abi/proc/thread.h	(revision fb864d653f08c9c94bf26673eb5d1efd0c3e6f25)
+++ abi/include/abi/proc/thread.h	(revision aca642c01e1dd4f0528a1c47cbf0f2c426164564)
@@ -36,4 +36,6 @@
 #define ABI_PROC_THREAD_H_
 
+#include <stdint.h>
+
 typedef uint64_t thread_id_t;
 
Index: abi/include/abi/sysinfo.h
===================================================================
--- abi/include/abi/sysinfo.h	(revision fb864d653f08c9c94bf26673eb5d1efd0c3e6f25)
+++ abi/include/abi/sysinfo.h	(revision aca642c01e1dd4f0528a1c47cbf0f2c426164564)
@@ -40,4 +40,5 @@
 #include <abi/proc/task.h>
 #include <abi/proc/thread.h>
+#include <stdint.h>
 
 /** Number of load components */