Index: uspace/drv/bus/usb/ohci/hw_struct/hcca.h
===================================================================
--- uspace/drv/bus/usb/ohci/hw_struct/hcca.h	(revision 395df5297112547cc75484be4d30344933b1b413)
+++ uspace/drv/bus/usb/ohci/hw_struct/hcca.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
@@ -40,4 +40,5 @@
 #include <sys/types.h>
 #include <macros.h>
+#include <assert.h>
 
 #include "mem_access.h"
@@ -60,5 +61,5 @@
 } hcca_t;
 
-STATIC_ASSERT(sizeof(hcca_t) == 256);
+static_assert(sizeof(hcca_t) == 256);
 
 /** Allocate properly aligned structure.
Index: uspace/lib/c/arch/abs32le/include/libarch/tls.h
===================================================================
--- uspace/lib/c/arch/abs32le/include/libarch/tls.h	(revision 395df5297112547cc75484be4d30344933b1b413)
+++ uspace/lib/c/arch/abs32le/include/libarch/tls.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
@@ -39,4 +39,5 @@
 
 #include <libc.h>
+#include <stddef.h>
 
 typedef struct {
Index: uspace/lib/c/arch/abs32le/src/entry.c
===================================================================
--- uspace/lib/c/arch/abs32le/src/entry.c	(revision 395df5297112547cc75484be4d30344933b1b413)
+++ uspace/lib/c/arch/abs32le/src/entry.c	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
@@ -32,4 +32,5 @@
 #include <libarch/entry.h>
 #include "../../../generic/private/libc.h"
+#include <stddef.h>
 
 void __entry(void)
Index: uspace/lib/c/arch/abs32le/src/stacktrace.c
===================================================================
--- uspace/lib/c/arch/abs32le/src/stacktrace.c	(revision 395df5297112547cc75484be4d30344933b1b413)
+++ uspace/lib/c/arch/abs32le/src/stacktrace.c	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
@@ -32,4 +32,5 @@
 #include <sys/types.h>
 #include <stdbool.h>
+#include <stddef.h>
 #include <stacktrace.h>
 
Index: uspace/lib/c/arch/abs32le/src/thread_entry.c
===================================================================
--- uspace/lib/c/arch/abs32le/src/thread_entry.c	(revision 395df5297112547cc75484be4d30344933b1b413)
+++ uspace/lib/c/arch/abs32le/src/thread_entry.c	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
@@ -30,4 +30,5 @@
  */
 
+#include <stddef.h>
 #include "../../../generic/private/thread.h"
 
Index: uspace/lib/c/include/macros.h
===================================================================
--- uspace/lib/c/include/macros.h	(revision 395df5297112547cc75484be4d30344933b1b413)
+++ uspace/lib/c/include/macros.h	(revision e48947e50a7052fa90231d75f84e7481c8c7d201)
@@ -69,6 +69,4 @@
 #define PADD8 _padd(8, __LINE__)
 
-#define STATIC_ASSERT(cond) int sassert[(cond) ? 1 : -1]
-
 /** @}
  */