relax yet more header inclusions

src/common/thread.c

@@ -18,7 +18,11 @@
 
 #include <starpu.h>
 #include <core/simgrid.h>
+#ifdef STARPU_DEBUG
 #include <core/workers.h>
+#endif
+#include <common/thread.h>
+#include <common/fxt.h>
 
 #include <errno.h>
 #include <limits.h>

src/common/thread.h

@@ -18,7 +18,6 @@
 #ifndef __COMMON_THREAD_H__
 #define __COMMON_THREAD_H__
 
-#include <starpu.h>
 #include <common/utils.h>
 
 #if defined(STARPU_LINUX_SYS) && defined(STARPU_HAVE_XCHG)

src/core/simgrid.h

@@ -25,7 +25,6 @@
 #include <msg/msg.h>
 #endif
 
-#include <datawizard/data_request.h>
 #include <xbt/xbt_os_time.h>
 
 struct _starpu_pthread_args
@@ -43,8 +42,11 @@ void _starpu_simgrid_init_early(int *argc, char ***argv);
 void _starpu_simgrid_init(void);
 void _starpu_simgrid_deinit(void);
 void _starpu_simgrid_wait_tasks(int workerid);
+struct _starpu_job;
 void _starpu_simgrid_submit_job(int workerid, struct _starpu_job *job, struct starpu_perfmodel_arch* perf_arch, double length, unsigned *finished);
+struct _starpu_data_request;
 int _starpu_simgrid_transfer(size_t size, unsigned src_node, unsigned dst_node, struct _starpu_data_request *req);
+union _starpu_async_channel_event;
 int _starpu_simgrid_wait_transfer_event(union _starpu_async_channel_event *event);
 int _starpu_simgrid_test_transfer_event(union _starpu_async_channel_event *event);
 void _starpu_simgrid_sync_gpus(void);