Index: uspace/lib/drv/generic/remote_usb.c
===================================================================
--- uspace/lib/drv/generic/remote_usb.c	(revision e4c8e3cfcadb1f6ee5b030c72036429781a36a0b)
+++ uspace/lib/drv/generic/remote_usb.c	(revision 90c340fbb6e99eb264eb9d03d1501acb54b1f097)
@@ -35,4 +35,5 @@
 
 #include <async.h>
+#include <assert.h>
 #include <macros.h>
 #include <errno.h>
@@ -169,5 +170,6 @@
 }
 
-int static_assert[sizeof(sysarg_t) >= 4 ? 1 : -1];
+static_assert(sizeof(sysarg_t) >= 4);
+
 typedef union {
 	uint8_t arr[sizeof(sysarg_t)];
Index: uspace/lib/usb/include/usb/request.h
===================================================================
--- uspace/lib/usb/include/usb/request.h	(revision e4c8e3cfcadb1f6ee5b030c72036429781a36a0b)
+++ uspace/lib/usb/include/usb/request.h	(revision 90c340fbb6e99eb264eb9d03d1501acb54b1f097)
@@ -37,4 +37,5 @@
 
 #include <stdint.h>
+#include <assert.h>
 
 /** Standard device request. */
@@ -107,5 +108,5 @@
 } __attribute__ ((packed)) usb_device_request_setup_packet_t;
 
-int assert[(sizeof(usb_device_request_setup_packet_t) == 8) ? 1: -1];
+static_assert(sizeof(usb_device_request_setup_packet_t) == 8);
 
 int usb_request_needs_toggle_reset(