diff --git a/src/cell.c b/src/cell.c
index 2df3608b0315deb6e1843359bfad1e21897511e0..87b51ac82cade8a7e4302e52b7a4e55e5d612aa2 100644
--- a/src/cell.c
+++ b/src/cell.c
@@ -21,13 +21,13 @@
 #include "../config.h"
 
 /* Some standard headers. */
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <pthread.h>
 #include <float.h>
 #include <limits.h>
 #include <math.h>
+#include <pthread.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 
 /* MPI headers. */
 #ifdef WITH_MPI
@@ -44,9 +44,9 @@
 
 /* Local headers. */
 #include "atomic.h"
-#include "timers.h"
-#include "space.h"
 #include "error.h"
+#include "space.h"
+#include "timers.h"
 
 /* Global variables. */
 int cell_next_tag = 0;
diff --git a/src/cell.h b/src/cell.h
index ee3a1b65b25491c2cb6eee9f7b2f226a0ca07367..7a5353bcae8cbb7ab4d50a546665a1a774a46aea 100644
--- a/src/cell.h
+++ b/src/cell.h
@@ -21,8 +21,8 @@
 
 /* Includes. */
 #include "lock.h"
-#include "part.h"
 #include "multipole.h"
+#include "part.h"
 
 /* Forward declaration of space, needed for cell_unpack. */
 struct space;
diff --git a/src/common_io.c b/src/common_io.c
index c200a2deb1dea9b8e5cdcb2ab2afaaa81d7ecc9b..64194e5829658a0c3f0f1aa7d9951d73f3eed377 100644
--- a/src/common_io.c
+++ b/src/common_io.c
@@ -24,12 +24,12 @@
 #if defined(HAVE_HDF5)
 
 /* Some standard headers. */
+#include <hdf5.h>
+#include <math.h>
+#include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <stddef.h>
-#include <hdf5.h>
-#include <math.h>
 
 /* MPI headers. */
 #ifdef WITH_MPI
diff --git a/src/debug.h b/src/debug.h
index 36d0967a1c88aabc2bb5ec2d98f9a14b4e0e180e..42269fc267e6d5721990b992c92c515a5764f6a9 100644
--- a/src/debug.h
+++ b/src/debug.h
@@ -20,8 +20,8 @@
 #define SWIFT_DEBUG_H
 
 /* Includes. */
-#include "part.h"
 #include "cell.h"
+#include "part.h"
 
 void print_cell(struct cell *c);
 void printParticle(struct part *parts, long long int i, int N);
diff --git a/src/engine.c b/src/engine.c
index 542035213f30f61666206478ed6bbe9b8fed2289..f730f0fe4784ecaf830f088886bf25c7d335c873 100644
--- a/src/engine.c
+++ b/src/engine.c
@@ -21,15 +21,15 @@
 #include "../config.h"
 
 /* Some standard headers. */
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <math.h>
 #include <float.h>
 #include <limits.h>
+#include <math.h>
 #include <omp.h>
 #include <sched.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
 
 /* MPI headers. */
 #ifdef WITH_MPI
@@ -45,12 +45,12 @@
 #include "engine.h"
 
 /* Local headers. */
-#include "cycle.h"
 #include "atomic.h"
-#include "timers.h"
-#include "debug.h"
 #include "cell.h"
+#include "cycle.h"
+#include "debug.h"
 #include "error.h"
+#include "timers.h"
 
 #ifdef LEGACY_GADGET2_SPH
 #include "runner_iact_legacy.h"
diff --git a/src/engine.h b/src/engine.h
index 149bb434d910a06d8f7705719a8e90abb9d41a94..caa286e7d3c518c0aba84fd9da1b6ff9ef6a78f4 100644
--- a/src/engine.h
+++ b/src/engine.h
@@ -23,12 +23,12 @@
 #include <pthread.h>
 
 /* Includes. */
+#include "lock.h"
 #include "proxy.h"
+#include "runner.h"
+#include "scheduler.h"
 #include "space.h"
 #include "task.h"
-#include "lock.h"
-#include "scheduler.h"
-#include "runner.h"
 
 /* Some constants. */
 #define engine_policy_none 0
diff --git a/src/kernel.h b/src/kernel.h
index da1d006e68e6272206eb047afe46e58566960910..0fc232597e1e9917d17f068407acc85b37659d42 100644
--- a/src/kernel.h
+++ b/src/kernel.h
@@ -21,9 +21,9 @@
 #define SWIFT_KERNEL_H
 
 /* Includes. */
-#include "vector.h"
 #include "const.h"
 #include "inline.h"
+#include "vector.h"
 
 /**
  * @file kernel.h
diff --git a/src/multipole.c b/src/multipole.c
index d76d7c14e415d2a2792ffa4da32966b1a5cd79c6..439e9cd5f0218bddf28d228de6eb3bb14a2d6735 100644
--- a/src/multipole.c
+++ b/src/multipole.c
@@ -21,12 +21,12 @@
 #include "../config.h"
 
 /* Some standard headers. */
+#include <float.h>
+#include <limits.h>
+#include <math.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <math.h>
-#include <float.h>
-#include <limits.h>
 
 /* MPI headers. */
 #ifdef WITH_MPI
diff --git a/src/multipole.h b/src/multipole.h
index 690d997a74841593d7c765cbd08c6b7332ae8ca6..ffa5d713f507b85f6ae9216cfe81d4fc49316345 100644
--- a/src/multipole.h
+++ b/src/multipole.h
@@ -23,10 +23,10 @@
 #include <math.h>
 
 /* Includes. */
+#include "const.h"
 #include "inline.h"
 #include "kernel.h"
 #include "part.h"
-#include "const.h"
 
 /* Some constants. */
 #define multipole_order 1
diff --git a/src/parallel_io.c b/src/parallel_io.c
index f119fc0ebf895250024487f2201e8e5ec87b43e7..ccd35fe06ef4bed6bd183c6a28648d19c184b4f4 100644
--- a/src/parallel_io.c
+++ b/src/parallel_io.c
@@ -27,20 +27,20 @@
 #define H5_HAVE_PARALLEL
 
 /* Some standard headers. */
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stddef.h>
 #include <hdf5.h>
 #include <math.h>
 #include <mpi.h>
+#include <stddef.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 
 /* This object's header. */
 #include "parallel_io.h"
 
 /* Local includes. */
-#include "error.h"
 #include "common_io.h"
+#include "error.h"
 
 /**
  * @brief Reads a data array from a given HDF5 group.
diff --git a/src/parallel_io.h b/src/parallel_io.h
index b6f2929e4e27df6cf26c65c0052c85cc36de663a..fa46a230ab73e52a3b471dc0b157f5cf0f99ef73 100644
--- a/src/parallel_io.h
+++ b/src/parallel_io.h
@@ -25,8 +25,8 @@
 #endif
 
 /* Includes. */
-#include "part.h"
 #include "engine.h"
+#include "part.h"
 #include "units.h"
 
 #if defined(HAVE_HDF5) && defined(WITH_MPI) && defined(HAVE_PARALLEL_HDF5)
diff --git a/src/proxy.c b/src/proxy.c
index f8015575121df59dcabbad7aaaa47e67f05f34ad..447a7a90be24d8dcb196d73ed62611464d5f3c2d 100644
--- a/src/proxy.c
+++ b/src/proxy.c
@@ -21,16 +21,16 @@
 #include "../config.h"
 
 /* Some standard headers. */
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <pthread.h>
-#include <math.h>
 #include <float.h>
 #include <limits.h>
+#include <math.h>
 #include <omp.h>
+#include <pthread.h>
 #include <sched.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
 
 /* MPI headers. */
 #ifdef WITH_MPI
diff --git a/src/proxy.h b/src/proxy.h
index 256a4027269c6f94b69d7640496204fb8133d1d2..8cb08d0a66095597227b52b317f3808190cdc45f 100644
--- a/src/proxy.h
+++ b/src/proxy.h
@@ -20,8 +20,8 @@
 #define SWIFT_PROXY_H
 
 /* Includes. */
-#include "part.h"
 #include "cell.h"
+#include "part.h"
 
 /* Some constants. */
 #define proxy_buffgrow 1.5
diff --git a/src/runner.c b/src/runner.c
index a1bfb53c77da389198c5c4f9860834587bc011f4..173215a6a53a0627408f3b5b61d0805fee597e2d 100644
--- a/src/runner.c
+++ b/src/runner.c
@@ -21,14 +21,14 @@
 #include "../config.h"
 
 /* Some standard headers. */
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <pthread.h>
-#include <math.h>
 #include <float.h>
 #include <limits.h>
+#include <math.h>
 #include <omp.h>
+#include <pthread.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 
 /* MPI headers. */
 #ifdef WITH_MPI
@@ -40,12 +40,12 @@
 
 /* Local headers. */
 #include "const.h"
-#include "timers.h"
-#include "task.h"
-#include "space.h"
-#include "scheduler.h"
 #include "engine.h"
 #include "error.h"
+#include "scheduler.h"
+#include "space.h"
+#include "task.h"
+#include "timers.h"
 
 /* Include the right variant of the SPH interactions */
 #ifdef LEGACY_GADGET2_SPH
diff --git a/src/runner_doiact.h b/src/runner_doiact.h
index 17a02321c31750b5d64845ca3e817fdbd7e17f8d..017529cc94021ee9ea38ce543ac8a3c4dea2e1db 100644
--- a/src/runner_doiact.h
+++ b/src/runner_doiact.h
@@ -18,8 +18,8 @@
  ******************************************************************************/
 
 /* Includes. */
-#include "part.h"
 #include "cell.h"
+#include "part.h"
 
 /* Before including this file, define FUNCTION, which is the
    name of the interaction function. This creates the interaction functions
diff --git a/src/runner_iact.h b/src/runner_iact.h
index 2ed6ce836a91cf67151ac40118be8c77c41e60b0..e1561132af3fff847989af34c268dfb1069ed40d 100644
--- a/src/runner_iact.h
+++ b/src/runner_iact.h
@@ -21,9 +21,9 @@
 #define SWIFT_RUNNER_IACT_H
 
 /* Includes. */
-#include "part.h"
 #include "const.h"
 #include "kernel.h"
+#include "part.h"
 #include "vector.h"
 
 /**
diff --git a/src/runner_iact_legacy.h b/src/runner_iact_legacy.h
index 8678093483f6540804ccc2c2f45d8059826ca6ba..3f5df4cd40668862a2e2c0a01c5b28069f184377 100644
--- a/src/runner_iact_legacy.h
+++ b/src/runner_iact_legacy.h
@@ -21,9 +21,9 @@
 #define SWIFT_RUNNER_IACT_LECAGY_H
 
 /* Includes. */
-#include "part.h"
 #include "const.h"
 #include "kernel.h"
+#include "part.h"
 #include "vector.h"
 
 /**
diff --git a/src/scheduler.c b/src/scheduler.c
index 87c5414a3a5d86f8cac88e162d50e3acaf07b20d..bbcac93be24066e05878446eba7c60a5d80f4bf8 100644
--- a/src/scheduler.c
+++ b/src/scheduler.c
@@ -21,13 +21,13 @@
 #include "../config.h"
 
 /* Some standard headers. */
+#include <limits.h>
+#include <math.h>
+#include <omp.h>
+#include <pthread.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <math.h>
-#include <pthread.h>
-#include <limits.h>
-#include <omp.h>
 
 /* MPI headers. */
 #ifdef WITH_MPI
@@ -38,12 +38,12 @@
 #include "scheduler.h"
 
 /* Local headers. */
-#include "error.h"
-#include "cycle.h"
 #include "atomic.h"
-#include "timers.h"
 #include "const.h"
+#include "cycle.h"
+#include "error.h"
 #include "kernel.h"
+#include "timers.h"
 
 /**
  * @brief Add an unlock_task to the given task.
diff --git a/src/scheduler.h b/src/scheduler.h
index b693c6f1bab1c463419c47497f5868113f850801..620b712885a1653397b3e9fd0e632cc0e562cf19 100644
--- a/src/scheduler.h
+++ b/src/scheduler.h
@@ -24,10 +24,10 @@
 
 /* Includes. */
 #include "cell.h"
-#include "queue.h"
-#include "task.h"
 #include "lock.h"
+#include "queue.h"
 #include "space.h"
+#include "task.h"
 
 /* Some constants. */
 #define scheduler_maxwait 3
diff --git a/src/serial_io.c b/src/serial_io.c
index 9d39695b19a3688950696fcf589904212158ea09..f771f3d4f1b0ed5b94ff27e9e54fea484e02f381 100644
--- a/src/serial_io.c
+++ b/src/serial_io.c
@@ -24,12 +24,12 @@
 #if defined(HAVE_HDF5) && defined(WITH_MPI) && !defined(HAVE_PARALLEL_HDF5)
 
 /* Some standard headers. */
+#include <hdf5.h>
+#include <math.h>
+#include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <stddef.h>
-#include <hdf5.h>
-#include <math.h>
 
 /* MPI headers. */
 #ifdef WITH_MPI
@@ -40,8 +40,8 @@
 #include "serial_io.h"
 
 /* Local includes. */
-#include "error.h"
 #include "common_io.h"
+#include "error.h"
 
 /*-----------------------------------------------------------------------------
  * Routines reading an IC file
diff --git a/src/serial_io.h b/src/serial_io.h
index e963184d428489785c7806b597ac14ef142facee..bb05fc61bdca1b0db36386e6773a034cc17ea6b9 100644
--- a/src/serial_io.h
+++ b/src/serial_io.h
@@ -25,8 +25,8 @@
 #endif
 
 /* Includes. */
-#include "part.h"
 #include "engine.h"
+#include "part.h"
 #include "units.h"
 
 #if defined(HAVE_HDF5) && defined(WITH_MPI) && !defined(HAVE_PARALLEL_HDF5)
diff --git a/src/single_io.c b/src/single_io.c
index 0edab319e142404e774d17e89dd5956368d285c8..0874442982df747ed0eff38bf060e50e0d205034 100644
--- a/src/single_io.c
+++ b/src/single_io.c
@@ -24,19 +24,19 @@
 #if defined(HAVE_HDF5) && !defined(WITH_MPI)
 
 /* Some standard headers. */
+#include <hdf5.h>
+#include <math.h>
+#include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <stddef.h>
-#include <hdf5.h>
-#include <math.h>
 
 /* This object's header. */
 #include "single_io.h"
 
 /* Local includes. */
-#include "error.h"
 #include "common_io.h"
+#include "error.h"
 
 /*-----------------------------------------------------------------------------
  * Routines reading an IC file
diff --git a/src/single_io.h b/src/single_io.h
index 61e9a7e6aaa4c816e37545fd004faaf54d00be10..91d229178bbd45df3ba358172d1f52c70008adb7 100644
--- a/src/single_io.h
+++ b/src/single_io.h
@@ -20,8 +20,8 @@
 #define SWIFT_SINGLE_IO_H
 
 /* Includes. */
-#include "part.h"
 #include "engine.h"
+#include "part.h"
 #include "units.h"
 
 #if defined(HAVE_HDF5) && !defined(WITH_MPI)
diff --git a/src/space.c b/src/space.c
index e36e9547e5610133ce76966aefb322892313db4d..f99f59329212a574ccacdb934133be1b3348ea61 100644
--- a/src/space.c
+++ b/src/space.c
@@ -21,14 +21,14 @@
 #include "../config.h"
 
 /* Some standard headers. */
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <pthread.h>
 #include <float.h>
 #include <limits.h>
 #include <math.h>
 #include <omp.h>
+#include <pthread.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 
 /* MPI headers. */
 #ifdef WITH_MPI
@@ -40,11 +40,11 @@
 
 /* Local headers. */
 #include "atomic.h"
-#include "lock.h"
-#include "kernel.h"
 #include "engine.h"
-#include "runner.h"
 #include "error.h"
+#include "kernel.h"
+#include "lock.h"
+#include "runner.h"
 
 /* Split size. */
 int space_splitsize = space_splitsize_default;
diff --git a/src/space.h b/src/space.h
index 32c991637adc88b4a18b8b843ae17fa58548fb05..e0bad6773547f813d70943c2ca2703529a0306a8 100644
--- a/src/space.h
+++ b/src/space.h
@@ -20,8 +20,8 @@
 #define SWIFT_SPACE_H
 
 /* Includes. */
-#include "part.h"
 #include "cell.h"
+#include "part.h"
 
 /* Forward-declare the engine to avoid cyclic includes. */
 struct engine;
diff --git a/src/swift.h b/src/swift.h
index edb87b16a806d34d5d1444f3ee0952aadba7d411..b302bca9b007cec47c96e1ab07770a3a3dc84966 100644
--- a/src/swift.h
+++ b/src/swift.h
@@ -23,27 +23,27 @@
 #include "../config.h"
 
 /* Local headers. */
+#include "atomic.h"
+#include "cell.h"
 #include "const.h"
-#include "error.h"
-#include "cycle.h"
-#include "timers.h"
 #include "const.h"
-#include "atomic.h"
+#include "cycle.h"
+#include "debug.h"
+#include "engine.h"
+#include "error.h"
 #include "lock.h"
-#include "task.h"
-#include "scheduler.h"
-#include "part.h"
 #include "multipole.h"
-#include "cell.h"
-#include "space.h"
+#include "parallel_io.h"
+#include "part.h"
 #include "queue.h"
 #include "runner.h"
-#include "engine.h"
-#include "units.h"
-#include "single_io.h"
+#include "scheduler.h"
 #include "serial_io.h"
-#include "parallel_io.h"
-#include "debug.h"
+#include "single_io.h"
+#include "space.h"
+#include "task.h"
+#include "timers.h"
+#include "units.h"
 #include "version.h"
 
 #ifdef LEGACY_GADGET2_SPH
diff --git a/src/task.c b/src/task.c
index 4a068d5a79e25ca132635c6234a23b1f98c23589..19b96799c7eb2e139457e8ed9202d005228b82e0 100644
--- a/src/task.c
+++ b/src/task.c
@@ -21,15 +21,15 @@
 #include "../config.h"
 
 /* Some standard headers. */
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <pthread.h>
-#include <math.h>
 #include <float.h>
 #include <limits.h>
+#include <math.h>
 #include <omp.h>
+#include <pthread.h>
 #include <sched.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 
 /* MPI headers. */
 #ifdef WITH_MPI
@@ -41,8 +41,8 @@
 
 /* Local headers. */
 #include "atomic.h"
-#include "lock.h"
 #include "error.h"
+#include "lock.h"
 
 /* Task type names. */
 const char *taskID_names[task_type_count] = {
diff --git a/src/task.h b/src/task.h
index 27193f6ec9fdef022031173447dca14035780ca6..0d3a68e1e8a892d554f8fb83f8f16d7030d5a54c 100644
--- a/src/task.h
+++ b/src/task.h
@@ -20,8 +20,8 @@
 #define SWIFT_TASK_H
 
 /* Includes. */
-#include "cycle.h"
 #include "cell.h"
+#include "cycle.h"
 
 /* Some constants. */
 #define task_maxwait 3
diff --git a/src/units.c b/src/units.c
index 60cdbe6caef3bd0e3b3c36c06536ebe3a293076d..af705323bdd8089c5ae22f11c49975bfe01c5f83 100644
--- a/src/units.c
+++ b/src/units.c
@@ -22,11 +22,11 @@
 #include "../config.h"
 
 /* Some standard headers. */
+#include <math.h>
+#include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <stddef.h>
-#include <math.h>
 
 /* MPI headers. */
 #ifdef WITH_MPI
diff --git a/src/version.c b/src/version.c
index 940444f76f072e9689a57582ca6d9323545897d7..eb622b85571786c6827dcdff0a869e9dc833b4e5 100644
--- a/src/version.c
+++ b/src/version.c
@@ -18,7 +18,10 @@
  *
  ******************************************************************************/
 
+/* Some standard headers. */
 #include <stdio.h>
+
+/* This object's header. */
 #include "version.h"
 
 /**