diff --git a/src/hydro/Default/hydro_part.h b/src/hydro/Default/hydro_part.h
index 042fa2aee4e972c245a8390759f9765a71b20279..6290ee5ba37a567b3819a06b8b824d83071ee4c2 100644
--- a/src/hydro/Default/hydro_part.h
+++ b/src/hydro/Default/hydro_part.h
@@ -19,6 +19,7 @@
 #ifndef SWIFT_DEFAULT_HYDRO_PART_H
 #define SWIFT_DEFAULT_HYDRO_PART_H
 
+#include "chemistry_struct.h"
 #include "cooling_struct.h"
 
 /* Extra particle data not needed during the SPH loops over neighbours. */
diff --git a/src/hydro/Gadget2/hydro_io.h b/src/hydro/Gadget2/hydro_io.h
index 1d633f3da14562bc25790b3ec263331da4dff8d5..72f2e33ff9ab7cbd78772b3b24ee898d8c486688 100644
--- a/src/hydro/Gadget2/hydro_io.h
+++ b/src/hydro/Gadget2/hydro_io.h
@@ -20,8 +20,6 @@
 #define SWIFT_GADGET2_HYDRO_IO_H
 
 #include "adiabatic_index.h"
-#include "chemistry_io.h"
-#include "cooling.h"
 #include "hydro.h"
 #include "io_properties.h"
 #include "kernel_hydro.h"
diff --git a/src/hydro/Gizmo/hydro_part.h b/src/hydro/Gizmo/hydro_part.h
index 76527f47b2a549d0cdac2f589adfff26cbb589c2..fdd73dd196465d7257555dcb2529935eec3fe3df 100644
--- a/src/hydro/Gizmo/hydro_part.h
+++ b/src/hydro/Gizmo/hydro_part.h
@@ -19,6 +19,7 @@
 #ifndef SWIFT_GIZMO_HYDRO_PART_H
 #define SWIFT_GIZMO_HYDRO_PART_H
 
+#include "chemistry_struct.h"
 #include "cooling_struct.h"
 
 /* Extra particle data not needed during the computation. */
diff --git a/src/hydro/Minimal/hydro_part.h b/src/hydro/Minimal/hydro_part.h
index 3ecf97e9246c60a223743ce54d4dc45b33e4250c..7556f415b9a3fb03923c98352322a9922f078f9a 100644
--- a/src/hydro/Minimal/hydro_part.h
+++ b/src/hydro/Minimal/hydro_part.h
@@ -32,6 +32,7 @@
  * Physics, 2012, Volume 231, Issue 3, pp. 759-794.
  */
 
+#include "chemistry_struct.h"
 #include "cooling_struct.h"
 
 /**
diff --git a/src/hydro/PressureEntropy/hydro_part.h b/src/hydro/PressureEntropy/hydro_part.h
index 4f7f85e28fc94cb31ab4b3089f1f93a513aff97f..c9482cd1ace7c53863885155cbca1afc6dddeb5f 100644
--- a/src/hydro/PressureEntropy/hydro_part.h
+++ b/src/hydro/PressureEntropy/hydro_part.h
@@ -30,6 +30,7 @@
  * Volume 428, Issue 4, pp. 2840-2856 with a simple Balsara viscosity term.
  */
 
+#include "chemistry_struct.h"
 #include "cooling_struct.h"
 
 /* Extra particle data not needed during the SPH loops over neighbours. */
diff --git a/src/hydro/Shadowswift/hydro_part.h b/src/hydro/Shadowswift/hydro_part.h
index ae30ecca74cebe7df3057f7508d6d6aa04ddbfa6..4f28d7bdc1c4779a9e6f15c3fb789c3f65f32890 100644
--- a/src/hydro/Shadowswift/hydro_part.h
+++ b/src/hydro/Shadowswift/hydro_part.h
@@ -19,6 +19,7 @@
  *
  ******************************************************************************/
 
+#include "chemistry_struct.h"
 #include "cooling_struct.h"
 #include "voronoi_cell.h"
 
diff --git a/src/parallel_io.c b/src/parallel_io.c
index 89246f1c7a1f5c370d52a7fb47fe117eb0153f6e..9d1d638047daf3d28faa2b3e4056e2db8a244309 100644
--- a/src/parallel_io.c
+++ b/src/parallel_io.c
@@ -36,7 +36,9 @@
 #include "parallel_io.h"
 
 /* Local includes. */
+#include "chemistry_io.h"
 #include "common_io.h"
+#include "cooling.h"
 #include "dimension.h"
 #include "engine.h"
 #include "error.h"
diff --git a/src/serial_io.c b/src/serial_io.c
index cbc09641c01b3ec07842ed96fe8d303eff32005e..d4705f7d09a50cf29fbe91ced221c287aa63ec40 100644
--- a/src/serial_io.c
+++ b/src/serial_io.c
@@ -36,7 +36,9 @@
 #include "serial_io.h"
 
 /* Local includes. */
+#include "chemistry_io.h"
 #include "common_io.h"
+#include "cooling.h"
 #include "dimension.h"
 #include "engine.h"
 #include "error.h"
@@ -812,7 +814,7 @@ void write_output_serial(struct engine* e, const char* baseName,
                         H5P_DEFAULT);
       if (h_grp < 0) error("Error while creating SPH group");
       hydro_props_print_snapshot(h_grp, e->hydro_properties);
-      writeChemistryFlavor(h_grp);
+      writeSPHflavour(h_grp);
       H5Gclose(h_grp);
     }
 
diff --git a/src/single_io.c b/src/single_io.c
index f3e4473f06dd4825ba02f69cef68a4db8998fb18..0e000ab4e6186d585281b5b44d5733ef0aec56de 100644
--- a/src/single_io.c
+++ b/src/single_io.c
@@ -35,7 +35,9 @@
 #include "single_io.h"
 
 /* Local includes. */
+#include "chemistry_io.h"
 #include "common_io.h"
+#include "cooling.h"
 #include "dimension.h"
 #include "engine.h"
 #include "error.h"