Index: abi/include/abi/cap.h
===================================================================
--- abi/include/abi/cap.h	(revision d3e938c65a5927cb5851ec4118dd05109bba3ada)
+++ abi/include/abi/cap.h	(revision bb9711836ee2378ff4d687181e9bf5bed89b1cbe)
@@ -36,8 +36,8 @@
 #define ABI_CAP_H_
 
+#include <stdbool.h>
+#include <stdint.h>
+
 #define CAP_NIL  0
-
-#define CAP_HANDLE_VALID(handle)  ((handle) != CAP_NIL)
-#define CAP_HANDLE_RAW(handle)    ((intptr_t) (handle))
 
 typedef void *cap_handle_t;
@@ -55,4 +55,14 @@
 } *cap_waitq_handle_t;
 
+static inline bool cap_handle_valid(cap_handle_t handle)
+{
+	return handle != CAP_NIL;
+}
+
+static inline intptr_t cap_handle_raw(cap_handle_t handle)
+{
+	return (intptr_t) handle;
+}
+
 #endif