diff --git a/argparse/argparse.c b/argparse/argparse.c
index 8372f45bc688bd99393693ffd8df4cb29dc52bef..483a8a84605c043b1f4082599e0378a072d34f20 100644
--- a/argparse/argparse.c
+++ b/argparse/argparse.c
@@ -9,6 +9,7 @@
 
 #include <config.h>
 
+/* System includes */
 #include <assert.h>
 #include <errno.h>
 #include <stdio.h>
diff --git a/src/black_holes_struct.h b/src/black_holes_struct.h
index f6d06443a14d94e0711b3c2ca72c82f73ce10e6a..09027e83f7a3339130a1c6cd6a92070b1715edb2 100644
--- a/src/black_holes_struct.h
+++ b/src/black_holes_struct.h
@@ -26,6 +26,8 @@
 
 /* Config parameters. */
 #include <config.h>
+
+/* Local includes */
 #include "inline.h"
 
 /* Import the right black holes definition */
diff --git a/src/chemistry.h b/src/chemistry.h
index 6c93049e32d737b791ec2106cf6fbcbbef314017..ba303b4d4d90f6d6822a68285ac84eeb3bb9f96b 100644
--- a/src/chemistry.h
+++ b/src/chemistry.h
@@ -26,6 +26,8 @@
 
 /* Config parameters. */
 #include <config.h>
+
+/* Local includes. */
 #include "chemistry_struct.h"
 
 /* Import the right chemistry definition */
diff --git a/src/cooling/EAGLE/cooling_tables.c b/src/cooling/EAGLE/cooling_tables.c
index 06cc2d91d717ca6dfb92803d2cc7c81d794e5ba4..0b32ce20d9b557f0b9873fbe52850a45dd3f200f 100644
--- a/src/cooling/EAGLE/cooling_tables.c
+++ b/src/cooling/EAGLE/cooling_tables.c
@@ -25,6 +25,7 @@
 /* Config parameters. */
 #include <config.h>
 
+/* System includes. */
 #include <hdf5.h>
 #include <math.h>
 #include <stdlib.h>
diff --git a/src/cooling/EAGLE/cooling_tables.h b/src/cooling/EAGLE/cooling_tables.h
index b8f41fba51d7adb05c0dbc23dcd79d370f01fec1..c492fa962d4401c06a5be19496559323e3a68691 100644
--- a/src/cooling/EAGLE/cooling_tables.h
+++ b/src/cooling/EAGLE/cooling_tables.h
@@ -26,6 +26,8 @@
 
 /* Config parameters. */
 #include <config.h>
+
+/* Local includes. */
 #include "cooling_struct.h"
 
 /*! Number of different bins along the redhsift axis of the tables */
diff --git a/src/cooling/QLA_EAGLE/cooling_tables.c b/src/cooling/QLA_EAGLE/cooling_tables.c
index 657b910e388eeb2efde628c11ee6763786a99190..5ee735a0f2d4d7dd6177ce6fab0b41875a8386bc 100644
--- a/src/cooling/QLA_EAGLE/cooling_tables.c
+++ b/src/cooling/QLA_EAGLE/cooling_tables.c
@@ -25,6 +25,7 @@
 /* Config parameters. */
 #include <config.h>
 
+/* System includes. */
 #include <hdf5.h>
 #include <math.h>
 #include <stdlib.h>
diff --git a/src/cosmology.h b/src/cosmology.h
index ad141944ed017e4c3e92205eaccd4cc1ad76e186..cb7e96bfcdaf050e1919667e0fa26f9323999acb 100644
--- a/src/cosmology.h
+++ b/src/cosmology.h
@@ -21,6 +21,8 @@
 
 /* Config parameters. */
 #include <config.h>
+
+/* Local includes. */
 #include "parser.h"
 #include "physical_constants.h"
 #include "timeline.h"
diff --git a/src/engine_config.c b/src/engine_config.c
index 5ecaa5341ced74371021742032eadac2d126640b..26df9d07fa032d62caf72c11b268c4c559a09caf 100644
--- a/src/engine_config.c
+++ b/src/engine_config.c
@@ -22,6 +22,7 @@
 /* Config parameters. */
 #include <config.h>
 
+/* System includes. */
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
diff --git a/src/line_of_sight.h b/src/line_of_sight.h
index 8c7966c464e1def780a3314b7c2592206b044126..158c0fce6cb348f9dde95da0302b170d3091de79 100644
--- a/src/line_of_sight.h
+++ b/src/line_of_sight.h
@@ -23,6 +23,8 @@
 
 /* Config parameters. */
 #include <config.h>
+
+/* Local includes. */
 #include "engine.h"
 #include "io_properties.h"
 
diff --git a/src/memswap.h b/src/memswap.h
index 8a0404a930c13bb9ed511725a35cf3d042fc7bcf..12de6d08830bdddee0b2ee0a17635763488a3560 100644
--- a/src/memswap.h
+++ b/src/memswap.h
@@ -22,6 +22,7 @@
 /* Config parameters. */
 #include <config.h>
 
+/* System includes. */
 #include <stdint.h>
 
 #ifdef HAVE_IMMINTRIN_H
diff --git a/src/mesh_gravity_patch.c b/src/mesh_gravity_patch.c
index a0f3b976520f6ad6cdd0927953f9452e27432a7d..bce169f9901c026ea48994e3c5ecaa51ce8e896e 100644
--- a/src/mesh_gravity_patch.c
+++ b/src/mesh_gravity_patch.c
@@ -20,6 +20,7 @@
 /* Config parameters. */
 #include <config.h>
 
+/* System includes. */
 #include <math.h>
 
 /* This object's header. */
diff --git a/src/neutrino/Default/neutrino_response.c b/src/neutrino/Default/neutrino_response.c
index 26e3286e5e9582f1eb2442d8ad64b941b3fd5441..4d841a633c7efb598349652ee33bc05279e4c5ee 100644
--- a/src/neutrino/Default/neutrino_response.c
+++ b/src/neutrino/Default/neutrino_response.c
@@ -19,6 +19,8 @@
 
 /* Config parameters. */
 #include <config.h>
+
+/* Local includes. */
 #include "parser.h"
 
 #ifdef HAVE_LIBGSL
diff --git a/src/sink_struct.h b/src/sink_struct.h
index d0c94cc612680d1953ea9a4b99e1d415d19936b8..00e6380298182149d8666663c977c5be665ac11d 100644
--- a/src/sink_struct.h
+++ b/src/sink_struct.h
@@ -26,6 +26,8 @@
 
 /* Config parameters. */
 #include <config.h>
+
+/*  Local includes. */
 #include "inline.h"
 
 /* Import the right black holes definition */
diff --git a/tests/testAdiabaticIndex.c b/tests/testAdiabaticIndex.c
index dd6e28d9e26f43739ad1e287c4c11aba79f0d7d4..2255d11fea0ecc74a7a4d7c2c17ee0ed3cadb659 100644
--- a/tests/testAdiabaticIndex.c
+++ b/tests/testAdiabaticIndex.c
@@ -17,8 +17,11 @@
  *
  ******************************************************************************/
 #include <config.h>
+
+/* Local includes. */
 #include "swift.h"
 
+/* System includes. */
 #include <fenv.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/tests/testDistance.c b/tests/testDistance.c
index fcf16bf65dd1d67e83375d3cca5f68f2d6426c5b..91b2985a0a8121538a6b92015366766ac5301f93 100644
--- a/tests/testDistance.c
+++ b/tests/testDistance.c
@@ -17,8 +17,11 @@
  *
  ******************************************************************************/
 #include <config.h>
+
+/* Local includes. */
 #include "swift.h"
 
+/* System includes. */
 #include <fenv.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/tests/testErfc.c b/tests/testErfc.c
index f4067988b77838a32381596725629a371707e2cb..548558eaa4fe480e6190d7dd772feaf9f590c95d 100644
--- a/tests/testErfc.c
+++ b/tests/testErfc.c
@@ -18,6 +18,8 @@
  ******************************************************************************/
 
 #include <config.h>
+
+/* Local includes. */
 #include "swift.h"
 
 /* Standard includes */
diff --git a/tests/testExp.c b/tests/testExp.c
index d4a3194a929221b77b3356408ab7f3a2bd4098eb..7362eff2c9fbb05bdf00fbc92ec553ecf80a20eb 100644
--- a/tests/testExp.c
+++ b/tests/testExp.c
@@ -18,6 +18,8 @@
  ******************************************************************************/
 
 #include <config.h>
+
+/* Local includes. */
 #include "swift.h"
 
 /* Standard includes */
diff --git a/tests/testHashmap.c b/tests/testHashmap.c
index a7ebf5288c03f30c3d1785a7c2d6d952c6444d23..4feff1e63121567d7faea70a4265f36e066f9a30 100644
--- a/tests/testHashmap.c
+++ b/tests/testHashmap.c
@@ -20,6 +20,7 @@
 /* Config parameters. */
 #include <config.h>
 
+/* System includes. */
 #include <fenv.h>
 
 /* Local headers. */
diff --git a/tests/testHydroMPIrules.c b/tests/testHydroMPIrules.c
index 4401cc8be83e4dd27531312e87de523b8b21592a..799d86adeec763af781c1316a1771224a31629ba 100644
--- a/tests/testHydroMPIrules.c
+++ b/tests/testHydroMPIrules.c
@@ -17,8 +17,11 @@
  *
  ******************************************************************************/
 #include <config.h>
+
+/* Local includes. */
 #include "swift.h"
 
+/* System includes. */
 #include <fenv.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/tests/testKernel.c b/tests/testKernel.c
index 6567b76b2d4f2ff639042b4bd92caca4598c0211..3de191598d898cc6c0df53c38b25daa6bb4bfa76 100644
--- a/tests/testKernel.c
+++ b/tests/testKernel.c
@@ -18,10 +18,13 @@
  *
  ******************************************************************************/
 #include <config.h>
+
+/* Local includes. */
 #include "align.h"
 #include "kernel_hydro.h"
 #include "vector.h"
 
+/* System includes. */
 #include <fenv.h>
 #include <stdlib.h>
 #include <strings.h>
diff --git a/tests/testKernelLongGrav.c b/tests/testKernelLongGrav.c
index bea26bbf114ae3023f9c83307ae03b45117d9e0b..3b8c3d2711e209f7f0553fead74330b67e433afd 100644
--- a/tests/testKernelLongGrav.c
+++ b/tests/testKernelLongGrav.c
@@ -18,6 +18,8 @@
  ******************************************************************************/
 
 #include <config.h>
+
+/* Local includes. */
 #include "exp10.h"
 #include "swift.h"
 
diff --git a/tests/testLog.c b/tests/testLog.c
index 5d434d256a30bf04682a0e086c8f6dc3d81b0ecd..6dc1c12eb9cc09fd954d9b6819d11ad54272f472 100644
--- a/tests/testLog.c
+++ b/tests/testLog.c
@@ -18,6 +18,8 @@
  ******************************************************************************/
 
 #include <config.h>
+
+/* Local includes. */
 #include "exp10.h"
 #include "log.h"
 #include "swift.h"
diff --git a/tests/testMaths.c b/tests/testMaths.c
index 717e632ac981a4c5275a3e203e592b683bd7ae86..cc3432ec26761c8d766a0dee3b85664330a68e95 100644
--- a/tests/testMaths.c
+++ b/tests/testMaths.c
@@ -18,9 +18,12 @@
  ******************************************************************************/
 
 #include <config.h>
+
+/* Local includes. */
 #include "approx_math.h"
 #include "vector.h"
 
+/* System includes. */
 #include <math.h>
 #include <stdio.h>
 
diff --git a/tests/testRandom.c b/tests/testRandom.c
index b40d43f943809a4398c94c36121b46363a92a070..1cc7fb151ac8f35bd2dd49c349f2a086e760fcb2 100644
--- a/tests/testRandom.c
+++ b/tests/testRandom.c
@@ -21,6 +21,7 @@
 /* Config parameters. */
 #include <config.h>
 
+/* System includes. */
 #include <fenv.h>
 
 /* Local headers. */
diff --git a/tests/testRandomPoisson.c b/tests/testRandomPoisson.c
index d1547043b5bd8420a2e5035bca5fb88b8895dd6c..afd84304ef543e75991eb7d33b9b6183ea388931 100644
--- a/tests/testRandomPoisson.c
+++ b/tests/testRandomPoisson.c
@@ -20,6 +20,7 @@
 /* Config parameters. */
 #include <config.h>
 
+/* System includes. */
 #include <fenv.h>
 
 /* Local headers. */
diff --git a/tests/testRandomSpacing.c b/tests/testRandomSpacing.c
index a4766d971c75be5bed45d5c0ca2ea8ed642f58f8..cb4dac9a60ef8dec7d5226242555017e96b8ea84 100644
--- a/tests/testRandomSpacing.c
+++ b/tests/testRandomSpacing.c
@@ -20,6 +20,7 @@
 /* Config parameters. */
 #include <config.h>
 
+/* System includes. */
 #include <fenv.h>
 
 /* Local headers. */
diff --git a/tests/testSymmetry.c b/tests/testSymmetry.c
index 0f3fdf693cedb22c4dc8e872595600eb4a371565..a1fa8ed7bca97bb91d027fb52fd90920fcd78536 100644
--- a/tests/testSymmetry.c
+++ b/tests/testSymmetry.c
@@ -17,9 +17,12 @@
  *
  ******************************************************************************/
 #include <config.h>
+
+/* Local includes. */
 #include "swift.h"
 #include "timestep_limiter_iact.h"
 
+/* System includes. */
 #include <fenv.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/tests/testTimeline.c b/tests/testTimeline.c
index 97a5e5931f3d6941fea41f3eb5c2415fc96ee2e9..51b8d2b51ae49a99e204e89b254d738f48a33f59 100644
--- a/tests/testTimeline.c
+++ b/tests/testTimeline.c
@@ -17,6 +17,8 @@
  *
  ******************************************************************************/
 #include <config.h>
+
+/* Local includes. */
 #include "timeline.h"
 #include "tools.h"