another batch of include fixes.

Former-commit-id: f6115445747ec20c72c754c53ee79590b76cbafa

src/cell.h

@@ -20,6 +20,7 @@
 #define SWIFT_CELL_H
 
 /* Includes. */
+#include "lock.h"
 #include "part.h"
 #include "multipole.h"
 

src/engine.c

@@ -25,7 +25,6 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
-#include <pthread.h>
 #include <math.h>
 #include <float.h>
 #include <limits.h>
@@ -43,23 +42,16 @@
 #endif
 
 /* Local headers. */
+#include "engine.h"
 #include "const.h"
 #include "cycle.h"
 #include "atomic.h"
 #include "timers.h"
 #include "const.h"
 #include "vector.h"
-#include "lock.h"
-#include "task.h"
 #include "debug.h"
-#include "space.h"
-#include "multipole.h"
 #include "cell.h"
 #include "queue.h"
-#include "scheduler.h"
-#include "engine.h"
-#include "runner.h"
-#include "proxy.h"
 #include "error.h"
 
 #ifdef LEGACY_GADGET2_SPH

src/engine.h

@@ -19,6 +19,17 @@
 #ifndef SWIFT_ENGINE_H
 #define SWIFT_ENGINE_H
 
+/* Some standard headers. */
+#include <pthread.h>
+
+/* Includes. */
+#include "proxy.h"
+#include "space.h"
+#include "task.h"
+#include "lock.h"
+#include "scheduler.h"
+#include "runner.h"
+
 /* Some constants. */
 #define engine_policy_none 0
 #define engine_policy_rand 1

src/kernel.h

@@ -20,14 +20,16 @@
 #ifndef SWIFT_KERNEL_H
 #define SWIFT_KERNEL_H
 
+/* Includes. */
+#include "vector.h"
+#include "const.h"
+
 /**
  * @file kernel.h
  * @brief SPH kernel functions. Compute W(x,h) and the gradient of W(x,h),
  *        as well as the blending function used for gravity.
  */
 
-#include "vector.h"
-
 /* Gravity kernel stuff
  * -----------------------------------------------------------------------------------------------
  */

src/multipole.h

@@ -19,7 +19,12 @@
 #ifndef SWIFT_MULTIPOLE_H
 #define SWIFT_MULTIPOLE_H
 
+/* Some standard headers. */
+#include <math.h>
+
 /* Includes. */
+#include "inline.h"
+#include "kernel.h"
 #include "part.h"
 
 /* Some constants. */
@@ -47,9 +52,6 @@ void multipole_addparts(struct multipole *m, struct gpart *p, int N);
 void multipole_init(struct multipole *m, struct gpart *parts, int N);
 void multipole_reset(struct multipole *m);
 
-#include <math.h>
-#include "kernel.h"
-
 /**
  * @brief Compute the pairwise interaction between two multipoles.
  *

src/task.h

@@ -20,6 +20,7 @@
 #define SWIFT_TASK_H
 
 /* Includes. */
+#include "cycle.h"
 #include "cell.h"
 
 /* Some constants. */