diff --git a/src/clocks.h b/src/clocks.h
index 3800938e3effa837fdec3c094414c259b133562c..ce08167bd504d47a76542870791057881c6d2f17 100644
--- a/src/clocks.h
+++ b/src/clocks.h
@@ -19,8 +19,13 @@
 #ifndef SWIFT_CLOCKS_H
 #define SWIFT_CLOCKS_H
 
+/* Config parameters. */
+#include "../config.h"
+
+/* System includes. */
 #include <sys/times.h>
-#include <time.h>
+
+/* Local includes */
 #include "cycle.h"
 
 /* Struct to record a time for the clocks functions. */
diff --git a/tests/testInteractions.c b/tests/testInteractions.c
index cdaa03733edff7bef6acdc6ee0a8c8398d33d0a4..19eb44fa79759f50da2611cd764a1b59bd1dc579 100644
--- a/tests/testInteractions.c
+++ b/tests/testInteractions.c
@@ -16,12 +16,16 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  ******************************************************************************/
+#include "../config.h"
 
+/* Some standard headers. */
 #include <fenv.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
+
+/* Local includes */
 #include "swift.h"
 
 /* Other schemes need to be added here if they are not vectorized, otherwise
diff --git a/tests/testMatrixInversion.c b/tests/testMatrixInversion.c
index a15e0dab7ec793cf4a914b6eb89c63863ab24fb0..8cd0f4e272a6b7e587619117e1aa143409976c51 100644
--- a/tests/testMatrixInversion.c
+++ b/tests/testMatrixInversion.c
@@ -16,9 +16,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  ******************************************************************************/
+#include "../config.h"
 
+/* Some standard headers. */
 #include <stdlib.h>
 #include <string.h>
+
+/* Local headers */
 #include "const.h"
 #include "dimension.h"
 #include "error.h"
diff --git a/tests/testReading.c b/tests/testReading.c
index 6e21ec7ff0fd805680297424ffa0198a42030eb3..d7d3fcbdae2f3ab744f338bb74e105644a5d88be 100644
--- a/tests/testReading.c
+++ b/tests/testReading.c
@@ -17,6 +17,9 @@
  *
  ******************************************************************************/
 
+/* Some standard headers. */
+#include "../config.h"
+
 /* Some standard headers. */
 #include <stdlib.h>
 
diff --git a/tests/testRiemannTRRS.c b/tests/testRiemannTRRS.c
index 2c7098367a1ca8db84f097ad01aa2e1e411c433d..e975230c61cd58ad1a077e9b66949044cb7708da 100644
--- a/tests/testRiemannTRRS.c
+++ b/tests/testRiemannTRRS.c
@@ -16,8 +16,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  ******************************************************************************/
+#include "../config.h"
 
+/* Local headers. */
 #include <string.h>
+
+/* Local includes */
 #include "error.h"
 #include "riemann/riemann_trrs.h"
 #include "tools.h"
diff --git a/tests/testVoronoi2D.c b/tests/testVoronoi2D.c
index 60a71624904c11a3cdb3b90906189df60bfc6956..5057278efaa3ba0e1ccec2ba6b032cd12b029ff9 100644
--- a/tests/testVoronoi2D.c
+++ b/tests/testVoronoi2D.c
@@ -16,6 +16,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  ******************************************************************************/
+#include "../config.h"
+
+/* Local headers. */
 #include "hydro/Shadowswift/voronoi2d_algorithm.h"
 #include "tools.h"
 
diff --git a/tests/testVoronoi3D.c b/tests/testVoronoi3D.c
index db5c33aa6e4ef0792373febd5d773a6d1198db29..5e0288fa9b3e13e0c6a6fb13db202e0f73f29a5b 100644
--- a/tests/testVoronoi3D.c
+++ b/tests/testVoronoi3D.c
@@ -16,8 +16,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  ******************************************************************************/
+#include "../config.h"
 
+/* Some standard headers. */
 #include <stdlib.h>
+
+/* Local headers. */
 #include "error.h"
 #include "hydro/Shadowswift/voronoi3d_algorithm.h"
 #include "part.h"