Index: libcfa/src/concurrency/clib/cfathread.h
===================================================================
--- libcfa/src/concurrency/clib/cfathread.h	(revision 386af65c6493ff7fe27640b1710bec50523aaf1b)
+++ libcfa/src/concurrency/clib/cfathread.h	(revision e0c072c3bbbe8115f3120141f3503d077cada4be)
@@ -13,7 +13,4 @@
 // Update Count     :
 //
-
-#include "stddef.h"
-#include "invoke.h"
 
 #if defined(__cforall) || defined(__cplusplus)
Index: tests/concurrent/clib.c
===================================================================
--- tests/concurrent/clib.c	(revision 386af65c6493ff7fe27640b1710bec50523aaf1b)
+++ tests/concurrent/clib.c	(revision e0c072c3bbbe8115f3120141f3503d077cada4be)
@@ -2,4 +2,5 @@
 #include <stdlib.h>
 #include <clib/cfathread.h>
+#include <bits/defs.hfa>
 
 extern "C" {