diff --git a/src/chemistry/gear/chemistry.h b/src/chemistry/gear/chemistry.h
index 9653e7eb05005977c39bca20eab961af83f40b5f..5321a5a963e36a59dedf3abeeea7506f4e92e1ee 100644
--- a/src/chemistry/gear/chemistry.h
+++ b/src/chemistry/gear/chemistry.h
@@ -29,7 +29,6 @@
 #include <math.h>
 
 /* Local includes. */
-#include "chemistry_io.h"
 #include "chemistry_struct.h"
 #include "error.h"
 #include "hydro.h"
@@ -51,6 +50,18 @@ chemistry_metal_mass_fraction(const struct part* restrict p,
   return p->chemistry_data.Z;
 }
 
+/**
+ * @brief Prints the properties of the chemistry model to stdout.
+ *
+ * @brief The #chemistry_global_data containing information about the current
+ * model.
+ */
+static INLINE void chemistry_print_backend(
+    const struct chemistry_global_data* data) {
+
+  message("Chemistry function is 'Gear'.");
+}
+
 /**
  * @brief Initialises the chemistry properties.
  *
@@ -66,7 +77,8 @@ static INLINE void chemistry_init_backend(
     const struct phys_const* phys_const, struct chemistry_global_data* data) {
 
   /* read parameters */
-  chemistry_read_parameters(parameter_file, us, phys_const, data);
+  data->initial_metallicity = parser_get_opt_param_float(
+      parameter_file, "GearChemistry:InitialMetallicity", -1);
 }
 
 /**
diff --git a/src/chemistry/gear/chemistry_io.h b/src/chemistry/gear/chemistry_io.h
index 2343b6ba18ada5d04825a12d53a6f9cc7e984ef2..0557d5c520dfc7ad5eaff2b92e6588751c072df5 100644
--- a/src/chemistry/gear/chemistry_io.h
+++ b/src/chemistry/gear/chemistry_io.h
@@ -40,18 +40,6 @@ chemistry_get_element_name(enum chemistry_element elem) {
   return chemistry_element_names[elem];
 }
 
-/**
- * @brief Prints the properties of the chemistry model to stdout.
- *
- * @brief The #chemistry_global_data containing information about the current
- * model.
- */
-static INLINE void chemistry_print_backend(
-    const struct chemistry_global_data* data) {
-
-  message("Chemistry function is 'Gear'.");
-}
-
 /**
  * @brief Specifies which particle fields to read from a dataset
  *
@@ -73,14 +61,6 @@ __attribute__((always_inline)) INLINE static int chemistry_read_particles(
   return 2;
 }
 
-__attribute__((always_inline)) INLINE static void chemistry_read_parameters(
-    const struct swift_params* parameter_file, const struct unit_system* us,
-    const struct phys_const* phys_const, struct chemistry_global_data* data) {
-
-  data->initial_metallicity = parser_get_opt_param_float(
-      parameter_file, "GearChemistry:InitialMetallicity", -1);
-}
-
 /**
  * @brief Specifies which particle fields to write to a dataset
  *
diff --git a/src/hydro/Gizmo/hydro_slope_limiters_face.h b/src/hydro/Gizmo/hydro_slope_limiters_face.h
index 9defb123389040e59bb51e1129ed9fd49fe4ffd5..39a453b3d21383fbf075a3c1985dfb182d9a2dcc 100644
--- a/src/hydro/Gizmo/hydro_slope_limiters_face.h
+++ b/src/hydro/Gizmo/hydro_slope_limiters_face.h
@@ -36,8 +36,8 @@
 #include <float.h>
 
 /* Local headers. */
-#include "sign.h"
 #include "minmax.h"
+#include "sign.h"
 
 __attribute__((always_inline)) INLINE static float
 hydro_slope_limit_face_quantity(float phi_i, float phi_j, float phi_mid0,
diff --git a/src/hydro_properties.c b/src/hydro_properties.c
index 5e3c9f3f461e56f7b91efc7ded48ba1414d3bfcd..fb0e6263259d97b41104b86a5337363dbc0e601c 100644
--- a/src/hydro_properties.c
+++ b/src/hydro_properties.c
@@ -26,9 +26,9 @@
 
 /* Local headers. */
 #include "adiabatic_index.h"
-#include "equation_of_state.h"
 #include "common_io.h"
 #include "dimension.h"
+#include "equation_of_state.h"
 #include "error.h"
 #include "hydro.h"
 #include "kernel_hydro.h"
diff --git a/src/io_properties.h b/src/io_properties.h
index d0005531afa3a0cf4de0302e86dd362e0abc11ab..037d32338f015975489f6cbca4f7dfafac413e5f 100644
--- a/src/io_properties.h
+++ b/src/io_properties.h
@@ -25,6 +25,7 @@
 /* Local includes. */
 #include "common_io.h"
 #include "inline.h"
+#include "part.h"
 
 /* Standard includes. */
 #include <string.h>