Index: abi/include/abi/cap.h
===================================================================
--- abi/include/abi/cap.h	(revision 98c4c168f21bd704c0707125768f528e37cc8187)
+++ abi/include/abi/cap.h	(revision 9675296fe33ff287a6d2d86321c97dbd34619703)
@@ -39,8 +39,4 @@
 #include <stdint.h>
 
-enum {
-	CAP_NIL = 0,
-};
-
 typedef void *cap_handle_t;
 
@@ -56,4 +52,6 @@
 typedef struct {
 } *cap_waitq_handle_t;
+
+static cap_handle_t const CAP_NIL = 0;
 
 static inline bool cap_handle_valid(cap_handle_t handle)
Index: kernel/generic/src/cap/cap.c
===================================================================
--- kernel/generic/src/cap/cap.c	(revision 98c4c168f21bd704c0707125768f528e37cc8187)
+++ kernel/generic/src/cap/cap.c	(revision 9675296fe33ff287a6d2d86321c97dbd34619703)
@@ -88,6 +88,6 @@
 #include <stdlib.h>
 
-#define CAPS_START	(CAP_NIL + 1)
-#define CAPS_SIZE	(INT_MAX - CAPS_START)
+#define CAPS_START	((intptr_t) CAP_NIL + 1)
+#define CAPS_SIZE	(INT_MAX - (int) CAPS_START)
 #define CAPS_LAST	(CAPS_SIZE - 1)
 
Index: kernel/generic/src/lib/strtol.c
===================================================================
--- kernel/generic/src/lib/strtol.c	(revision 98c4c168f21bd704c0707125768f528e37cc8187)
+++ kernel/generic/src/lib/strtol.c	(revision 9675296fe33ff287a6d2d86321c97dbd34619703)
@@ -245,22 +245,4 @@
 }
 
-static inline intmax_t _strtosigned(const char *nptr, char **endptr, int base,
-    intmax_t min, intmax_t max, errno_t *err, bool nonstd)
-{
-	bool sgn = false;
-	uintmax_t number = _strtoumax(nptr, endptr, base, &sgn, err, nonstd);
-
-	if (number > (uintmax_t) max) {
-		if (sgn && (number - 1 == (uintmax_t) max)) {
-			return min;
-		}
-
-		*err = nonstd ? EOVERFLOW : ERANGE;
-		return (sgn ? min : max);
-	}
-
-	return (sgn ? -number : number);
-}
-
 static inline uintmax_t _strtounsigned(const char *nptr, char **endptr, int base,
     uintmax_t max, errno_t *err, bool nonstd)
Index: uspace/lib/cpp/include/cstddef
===================================================================
--- uspace/lib/cpp/include/cstddef	(revision 98c4c168f21bd704c0707125768f528e37cc8187)
+++ uspace/lib/cpp/include/cstddef	(revision 9675296fe33ff287a6d2d86321c97dbd34619703)
@@ -32,4 +32,8 @@
 #include <stddef.h>
 
+#ifdef __clang__
+typedef decltype(nullptr) nullptr_t;
+#endif
+
 namespace std
 {