Roll-back the introducion of forward declaration where unnecessary

src/cell.h

@@ -26,8 +26,10 @@
 /* Includes. */
 #include "lock.h"
 #include "multipole.h"
+#include "part.h"
+#include "task.h"
 
-/* Forward declaration of space, needed for cell_unpack. */
+/* Avoid cyclic inclusions */
 struct space;
 
 /* Max tag size set to 2^29 to take into account some MPI implementations

src/common_io.h

@@ -25,10 +25,8 @@
 
 #if defined(HAVE_HDF5)
 
-/* Forward-declare stuff to avoid cyclic includes. */
-struct UnitSystem;
-struct part;
-struct gpart;
+#include "part.h"
+#include "units.h"
 
 /**
  * @brief The different types of data used in the GADGET IC files.
@@ -107,6 +105,6 @@ void writeXMFline(FILE* xmfFile, char* fileName, char* partTypeGroupName,
 void writeCodeDescription(hid_t h_file);
 void writeUnitSystem(hid_t h_file, struct UnitSystem* us);
 
-#endif
+#endif /* defined HDF5 */
 
 #endif /* SWIFT_COMMON_IO_H */

src/parallel_io.h

@@ -27,11 +27,10 @@
 #include <mpi.h>
 #endif
 
-/* Forward-declare stuff to avoid cyclic includes. */
-struct engine;
-struct gpart;
-struct part;
-struct UnitSystem;
+/* Includes. */
+#include "engine.h"
+#include "part.h"
+#include "units.h"
 
 #if defined(HAVE_HDF5) && defined(WITH_MPI) && defined(HAVE_PARALLEL_HDF5)
 

src/scheduler.h

@@ -32,13 +32,10 @@
 #include <pthread.h>
 
 /* Includes. */
+#include "cell.h"
 #include "lock.h"
-
-/* Forward-declare stuff to avoid cyclic includes. */
-struct cell;
-struct queue;
-struct space;
-struct task;
+#include "queue.h"
+#include "task.h"
 
 /* Some constants. */
 #define scheduler_maxwait 3

src/serial_io.h

@@ -27,11 +27,10 @@
 #include <mpi.h>
 #endif
 
-/* Forward-declare stuff to avoid cyclic includes. */
-struct engine;
-struct gpart;
-struct part;
-struct UnitSystem;
+/* Includes. */
+#include "engine.h"
+#include "part.h"
+#include "units.h"
 
 #if defined(HAVE_HDF5) && defined(WITH_MPI) && !defined(HAVE_PARALLEL_HDF5)
 

src/single_io.h

@@ -22,11 +22,10 @@
 /* Config parameters. */
 #include "../config.h"
 
-/* Forward-declare stuff to avoid cyclic includes. */
-struct engine;
-struct gpart;
-struct part;
-struct UnitSystem;
+/* Includes. */
+#include "engine.h"
+#include "part.h"
+#include "units.h"
 
 #if defined(HAVE_HDF5) && !defined(WITH_MPI)
 

src/space.h

@@ -23,13 +23,18 @@
 #ifndef SWIFT_SPACE_H
 #define SWIFT_SPACE_H
 
-/* Includes. */
+/* Config parameters. */
+#include "../config.h"
+
+/* Some standard headers. */
 #include <stddef.h>
 
+/* Includes. */
+#include "cell.h"
 #include "lock.h"
-
-/* Forward-declare stuff to avoid cyclic includes. */
-struct swift_params;
+#include "parser.h"
+#include "part.h"
+#include "space.h"
 
 /* Some constants. */
 #define space_maxdepth 10

src/tools.h

@@ -22,11 +22,13 @@
 #ifndef SWIFT_TOOL_H
 #define SWIFT_TOOL_H
 
-/* Forward-declare stuff to avoid cyclic includes. */
-struct cell;
-struct gpart;
-struct part;
-struct runner;
+/* Config parameters. */
+#include "../config.h"
+
+/* Includes. */
+#include "cell.h"
+#include "part.h"
+#include "runner.h"
 
 void factor(int value, int *f1, int *f2);
 void density_dump(int N);