diff --git a/src/Makefile.am b/src/Makefile.am
index f405e613293ca40214006f3268bd011e60f5cef0..47fe6ad1e00af2639d2caf0e26bd870b228d915b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -135,6 +135,8 @@ nobase_noinst_HEADERS = align.h approx_math.h atomic.h barrier.h cycle.h error.h
 	 	 stars.h stars_io.h \
 		 stars/Default/stars.h stars/Default/stars_iact.h stars/Default/stars_io.h \
 		 stars/Default/stars_debug.h stars/Default/stars_part.h  \
+		 stars/EAGLE/stars.h stars/EAGLE/stars_iact.h stars/EAGLE/stars_io.h \
+		 stars/EAGLE/stars_debug.h stars/EAGLE/stars_part.h \
 	         potential/none/potential.h potential/point_mass/potential.h \
                  potential/isothermal/potential.h potential/disc_patch/potential.h \
                  potential/sine_wave/potential.h \
diff --git a/src/part.h b/src/part.h
index 64babf4a37696d7cb49b4804ee77773b4e1981fc..744bf6edf1e6fda3ff64e6f9f3e666d5d51b5c84 100644
--- a/src/part.h
+++ b/src/part.h
@@ -89,7 +89,15 @@
 #endif
 
 /* Import the right star particle definition */
+#if defined(STARS_NONE)
 #include "./stars/Default/stars_part.h"
+#elif defined(STARS_EAGLE)
+#include "./stars/EAGLE/stars_part.h"
+#elif defined(STARS_GEAR)
+#include "./stars/GEAR/stars_part.h"
+#else 
+#error "Invalid choice of star particle"
+#endif
 
 void part_relink_gparts_to_parts(struct part *parts, size_t N,
                                  ptrdiff_t offset);
diff --git a/src/starformation/schaye08/starformation.h b/src/starformation/schaye08/starformation.h
index c4d305c1e1b127dfa143252a88aa07d2ded5d1ad..8c4e017944c55d5f2ef380b70b6618f0a8c807ac 100644
--- a/src/starformation/schaye08/starformation.h
+++ b/src/starformation/schaye08/starformation.h
@@ -34,6 +34,7 @@
 #include "cooling.h"
 #include "adiabatic_index.h"
 #include "cell.h" 
+#include "stars.h"
 
 /* Starformation struct */
 struct star_formation {
@@ -221,6 +222,7 @@ INLINE static void star_formation_copy_properties(
   struct spart *sp = cell_convert_part_to_spart(e, c, p, xp);
   sp->mass = p->mass;
   sp->mass_init = p->mass;
+  sp->age = cosmo->a;
   message("Copy Properties");
 
 }
diff --git a/src/stars.h b/src/stars.h
index b8edd6edd5d11fc1e90c45b62751fa654b6ce096..f1cd965c95c708bcdbb5068e32abd339a670034d 100644
--- a/src/stars.h
+++ b/src/stars.h
@@ -28,7 +28,7 @@
 #include "./stars/Default/stars_iact.h"
 #elif defined(STARS_EAGLE)
 #include "./stars/EAGLE/stars.h"
-#include "./stars/EAGLE/stars_iact.h" 
+#include "./stars/EAGLE/stars_iact.h"
 #elif defined(STARS_GEAR)
 #include "./stars/GEAR/stars.h" 
 #include "./stars/GEAR/stars_iact.h"
diff --git a/src/stars_io.h b/src/stars_io.h
index 046e90ee7570430ea25632539bc2cd642d4b52c0..3f6610522fc6a20582e0b34dc824833c73d4b59e 100644
--- a/src/stars_io.h
+++ b/src/stars_io.h
@@ -20,7 +20,17 @@
 #define SWIFT_STARS_IO_H
 
 #include "./const.h"
+#include "../config.h"
 
+/* Load the correct star type */
+#if defined(STARS_NONE)
 #include "./stars/Default/stars_io.h"
+#elif defined(STARS_EAGLE)
+#include "./stars/EAGLE/stars_io.h"
+#elif defined(STARS_GEAR)
+#include "./stars/GEAR/stars_io.h"
+#else 
+#error "Invalid choice of star model"
+#endif
 
 #endif /* SWIFT_STARS_IO_H */