Index: uspace/Makefile.common
===================================================================
--- uspace/Makefile.common	(revision 9a5ae815b43ebe562be9124064e24c56f08f6b1e)
+++ uspace/Makefile.common	(revision cbc3587f1c1b12b55c63438c17c73b8c48edf6d6)
@@ -181,5 +181,4 @@
 	-Wextra \
 	-Wno-unused-parameter \
-	-Wno-nonnull-compare \
 	-Wmissing-prototypes \
 	-Wwrite-strings \
@@ -200,4 +199,5 @@
 ifeq ($(COMPILER),clang)
 	DEFAULT_CFLAGS += \
+		-Wno-missing-braces \
 		-Wno-missing-field-initializers \
 		-Wno-typedef-redefinition \
@@ -205,4 +205,5 @@
 else
 	DEFAULT_CFLAGS += \
+		-Wno-nonnull-compare \
 		-Wno-clobbered
 endif
Index: uspace/app/tester/print/print3.c
===================================================================
--- uspace/app/tester/print/print3.c	(revision 9a5ae815b43ebe562be9124064e24c56f08f6b1e)
+++ uspace/app/tester/print/print3.c	(revision cbc3587f1c1b12b55c63438c17c73b8c48edf6d6)
@@ -34,5 +34,7 @@
 #define BUFFER_SIZE  32
 
+#ifndef __clang__
 #pragma GCC diagnostic ignored "-Wformat-truncation"
+#endif
 
 const char *test_print3(void)
Index: uspace/lib/c/generic/private/futex.h
===================================================================
--- uspace/lib/c/generic/private/futex.h	(revision 9a5ae815b43ebe562be9124064e24c56f08f6b1e)
+++ uspace/lib/c/generic/private/futex.h	(revision cbc3587f1c1b12b55c63438c17c73b8c48edf6d6)
@@ -41,9 +41,11 @@
 #include <libc.h>
 #include <time.h>
+#include <fibril.h>
 
 typedef struct futex {
 	volatile atomic_int val;
 #ifdef CONFIG_DEBUG_FUTEX
-	void *owner;
+	// FIXME: Should be _Atomic(fibril_t *)
+	fibril_t *owner;
 #endif
 } futex_t;
Index: uspace/lib/c/test/string.c
===================================================================
--- uspace/lib/c/test/string.c	(revision 9a5ae815b43ebe562be9124064e24c56f08f6b1e)
+++ uspace/lib/c/test/string.c	(revision cbc3587f1c1b12b55c63438c17c73b8c48edf6d6)
@@ -33,6 +33,8 @@
 #include <pcut/pcut.h>
 
+#ifndef __clang__
 #pragma GCC diagnostic ignored "-Wstringop-truncation"
 #pragma GCC diagnostic ignored "-Wstringop-overflow"
+#endif
 
 PCUT_INIT;
Index: uspace/lib/virtio/virtio.c
===================================================================
--- uspace/lib/virtio/virtio.c	(revision 9a5ae815b43ebe562be9124064e24c56f08f6b1e)
+++ uspace/lib/virtio/virtio.c	(revision cbc3587f1c1b12b55c63438c17c73b8c48edf6d6)
@@ -127,5 +127,5 @@
 	for (unsigned i = 0; i < size; i++) {
 		virtio_virtq_desc_set(vdev, num, i, 0, 0,
-		    VIRTQ_DESC_F_NEXT, (i + 1 == size) ? -1U : i + 1);
+		    VIRTQ_DESC_F_NEXT, (i + 1 == size) ? 0xffffu : i + 1);
 	}
 	*head = 0;