diff --git a/src/map.c b/src/map.c
index 1ebc01265cf5b135c7ab788799440fdc7a3abdee..dcaa53465767d414cc54fe05940069ae5ff06d77 100644
--- a/src/map.c
+++ b/src/map.c
@@ -18,11 +18,10 @@
  *
  ******************************************************************************/
 
-#include "map.h"
-#include "error.h"
 #include <stdio.h>
 #include <stdlib.h>
-
+#include "error.h"
+#include "map.h"
 
 /**
  * @brief Mapping function to draw a specific cell (gnuplot).
diff --git a/src/map.h b/src/map.h
index ac3fdb2c9cc00270862eca0673fedf043f4f2470..0fe04ad0158499626a16a0b18637ff190cf59c97 100644
--- a/src/map.h
+++ b/src/map.h
@@ -20,8 +20,11 @@
 
 
 /* Includes. */
-#include "cell.h"
+#ifndef SWIFT_MAP_H
+#define SWIFT_MAP_H
+
 #include "part.h"
+#include "cell.h"
 
 void map_cells_plot(struct cell *c, void *data);
 void map_check(struct part *p, struct cell *c, void *data);
@@ -34,3 +37,5 @@ void map_h_min(struct part *p, struct cell *c, void *data);
 void map_h_max(struct part *p, struct cell *c, void *data);
 void map_icount(struct part *p, struct cell *c, void *data);
 void map_dump(struct part *p, struct cell *c, void *data);
+
+#endif /* SWIFT_MAP_H */
diff --git a/src/swift.h b/src/swift.h
index 2dc8b1d6bd8483d194259303a904870a418c5f23..1b7d86c769bb33f2677d81a25c286d88cbc2782c 100644
--- a/src/swift.h
+++ b/src/swift.h
@@ -1,6 +1,6 @@
 /*******************************************************************************
  * This file is part of SWIFT.
- * Coypright (c) 2012 Pedro Gonnet (pedro.gonnet@durham.ac.uk)
+ * Copyright (c) 2012 Pedro Gonnet (pedro.gonnet@durham.ac.uk)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published
@@ -45,6 +45,7 @@
 #include "task.h"
 #include "timers.h"
 #include "units.h"
+#include "tools.h"
 #include "version.h"
 
 #ifdef LEGACY_GADGET2_SPH
diff --git a/src/tools.c b/src/tools.c
index 9570faf7a1e013ae53b208d95bca7b6368267c6e..5f8abcbeb6d339bedc3df71e5ccf651535b8bc0c 100644
--- a/src/tools.c
+++ b/src/tools.c
@@ -1,5 +1,7 @@
 /*******************************************************************************
  * This file is part of SWIFT.
+ * Copyright (c) 2012 Pedro Gonnet (pedro.gonnet@durham.ac.uk),
+ *                    Matthieu Schaller (matthieu.schaller@durham.ac.uk)
  * Copyright (c) 2015 Peter W. Draper (p.w.draper@durham.ac.uk)
  *
  * This program is free software: you can redistribute it and/or modify
@@ -23,6 +25,7 @@
 #include <stddef.h>
 #include <stdio.h>
 
+#include "error.h"
 #include "part.h"
 #include "cell.h"
 #include "tools.h"