diff --git a/src/cats/configuration/check_configuration.c b/src/cats/configuration/check_configuration.c
index 4eaae98ecaf30719d2db216b7da409c5473269d9..fb5445585a447ca2e7eeda0e451f22e146c89898 100644
--- a/src/cats/configuration/check_configuration.c
+++ b/src/cats/configuration/check_configuration.c
@@ -32,6 +32,7 @@
 #include "inline_vital_rates.h"
 #include "dispersal/dispersal.h"
 #include "data/simulation_geometry.h"
+#include "inline_vital_ages.h"
 
 
 int check_string(char *value, char *name)
diff --git a/src/cats/configuration/configuration.c b/src/cats/configuration/configuration.c
index 6d6fb2af6824235e861c56bdd6f93df2d5b257e6..c6cc5a61b9f0241d6c9b4076cddfd66e7c530262 100644
--- a/src/cats/configuration/configuration.c
+++ b/src/cats/configuration/configuration.c
@@ -48,6 +48,7 @@
 #include "inline_vital_rates.h"
 #include "dispersal/dispersal.h"
 #include "stats/grid_stats.h"
+#include "inline_vital_ages.h"
 
 #ifdef CATS_ON_WINDOWS
 #include <windows.h>
diff --git a/src/cats/configuration/preset.c b/src/cats/configuration/preset.c
index 562e3cfca9ca1f55ecf4348c38599efc244fb9aa..fef6c8a57e64756a6b57a4240261063187d0e64f 100644
--- a/src/cats/configuration/preset.c
+++ b/src/cats/configuration/preset.c
@@ -21,11 +21,14 @@
  *
  */
 
+#include <string.h>
 #include "cats_global.h"
 #include "preset.h"
 #include "vital_ages/default_vital_ages.h"
 #include "vital_rates/default_vital_rates.h"
 #include "inline_vital_rates.h"
+#include "inline_vital_ages.h"
+#include "misc/cats_maths_inline.h"
 
 
 enum cats_species_preset get_species_preset_from_from_string(const char *string)
diff --git a/src/cats/configuration/print_configuration.c b/src/cats/configuration/print_configuration.c
index 8265fe845b4b8d30efb164dc770ade3b11a814a0..13bb981936a3e8004d5aa5dce601aa421f5c51c4 100644
--- a/src/cats/configuration/print_configuration.c
+++ b/src/cats/configuration/print_configuration.c
@@ -33,6 +33,7 @@
 #include "inline_vital_rates.h"
 #include "dispersal/dispersal.h"
 #include "modules/load_module.h"
+#include "inline_vital_ages.h"
 
 const char *get_dispersal_name(enum dispersal_type type);
 
diff --git a/src/cats/grids/grid_converters.c b/src/cats/grids/grid_converters.c
index b09dd2c32afda8bdbccf6599b83942e91f9db761..b75b043378c205d975f8269befe77cb0e4f80b10 100644
--- a/src/cats/grids/grid_converters.c
+++ b/src/cats/grids/grid_converters.c
@@ -33,6 +33,7 @@
 #include "populations/population.h"
 #include "inline_population.h"
 #include "dispersal/dispersal.h"
+#include "misc/cats_maths_inline.h"
 
 
 cats_dt_environment **convert_double_to_environment(const struct cats_2d_array_double *in_grid)
diff --git a/src/cats/inline_carrying_capacity.h b/src/cats/inline_carrying_capacity.h
index 9b4c42ceeed868d41220383216ec2fd98e1c70e0..c598758133c5d65cdfd8c5229bbe885ef724e512 100644
--- a/src/cats/inline_carrying_capacity.h
+++ b/src/cats/inline_carrying_capacity.h
@@ -36,6 +36,7 @@
 #include "configuration/configuration.h"
 #include "plants/juveniles.h"
 #include "inline_vital_ages.h"
+#include "inline_carrying_capacity.h"
 
 
 static inline cats_dt_rates juvenile_cc_multiplier(const struct cats_species_param *param, int32_t stage)
diff --git a/src/cats/inline_vital_rates.h b/src/cats/inline_vital_rates.h
index 65b7194198802dea774ea8fa429ac19e70888a20..38de70314b495f0347900c03817c55cf843e6f78 100644
--- a/src/cats/inline_vital_rates.h
+++ b/src/cats/inline_vital_rates.h
@@ -29,6 +29,7 @@
 #include "data/cats_grid.h"
 #include "vital_rates/glm_functions.h"
 #include "vital_rates/direct_functions.h"
+#include "inline.h"
 
 
 static inline cats_dt_rates get_vital_rate_maximum(const struct cats_vital_rate *vr)
diff --git a/src/cats/plants/plant_rates.c b/src/cats/plants/plant_rates.c
index 4c4275395650d1410f9fdba9c37eed3708af74d5..16c881ea4f5d59aa207db297e161bf0669f0b600 100644
--- a/src/cats/plants/plant_rates.c
+++ b/src/cats/plants/plant_rates.c
@@ -29,6 +29,7 @@
 #include "data/cats_grid.h"
 #include "inline_population.h"
 #include "populations/population.h"
+#include "misc/cats_maths_inline.h"
 
 
 cats_dt_rates get_pollination_probability(const struct cats_grid *grid, cats_dt_coord row, cats_dt_coord col,
diff --git a/src/cats/plants/plant_structures.c b/src/cats/plants/plant_structures.c
index d75d8f482c6ce09d617fcd346c464115bb2f1865..8d1378ca3c3c90ef6bbf2f90f63835cb725572c5 100644
--- a/src/cats/plants/plant_structures.c
+++ b/src/cats/plants/plant_structures.c
@@ -29,6 +29,7 @@
 #include "seeds.h"
 #include "inline_population.h"
 #include "populations/population.h"
+#include "inline_vital_ages.h"
 #include <memory/cats_memory.h>
 
 
diff --git a/src/cats/plants/seeds.c b/src/cats/plants/seeds.c
index 797e98fc5733883ff0b8a98f14a3b288d012d36f..c4cb44d42cced74ba0bc8418fd9bd5a2c7f1ce03 100644
--- a/src/cats/plants/seeds.c
+++ b/src/cats/plants/seeds.c
@@ -33,6 +33,8 @@
 #include "inline_overlays.h"
 #include "inline_population.h"
 #include "populations/population.h"
+#include "misc/cats_maths_inline.h"
+#include "inline_vital_ages.h"
 
 #ifdef USEMPI
 #include "mpi/mpi_cats.h"
diff --git a/src/cats/populations/plant_juveniles.c b/src/cats/populations/plant_juveniles.c
index fd9e70975c8f4174b70fd27627fd40bc6c803922..e80a9a7c9efadfe6c2e200451d7bdb32ae0f5208 100644
--- a/src/cats/populations/plant_juveniles.c
+++ b/src/cats/populations/plant_juveniles.c
@@ -29,6 +29,8 @@
 #include "data/cats_grid.h"
 #include "inline_vital_rates.h"
 #include "memory/cats_memory.h"
+#include "inline_vital_ages.h"
+#include "inline_carrying_capacity.h"
 
 
 void setup_plant_juvenile_weights(struct cats_species_param *param)