diff --git a/configure.ac b/configure.ac
index dbdbed4cbdc99ccb155020e5695b7b107717cef4..37b23d631f662b4d52f1715e911e9d1b738efff6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1603,10 +1603,10 @@ fi
 
 case "$with_sftracers" in
    none)
-      AC_DEFINE([TRACERS_NONE], [1], [No star formation tracers function])
+      AC_DEFINE([SFTRACERS_NONE], [1], [No star formation tracers function])
    ;;
    EAGLE)
-      AC_DEFINE([TRACERS_EAGLE], [1], [Star Formation tracers taken from the EAGLE model])
+      AC_DEFINE([SFTRACERS_EAGLE], [1], [Star Formation tracers taken from the EAGLE model])
    ;;
    *)
       AC_MSG_ERROR([Unknown star formation tracers choice: $with_tracers])
diff --git a/src/Makefile.am b/src/Makefile.am
index 47fe6ad1e00af2639d2caf0e26bd870b228d915b..7ab262d5d8ab8ab4109066cd661cf96ac7c1125f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -49,7 +49,8 @@ include_HEADERS = space.h runner.h queue.h task.h lock.h cell.h part.h const.h \
     gravity_softened_derivatives.h vector_power.h collectgroup.h hydro_space.h sort_part.h \
     chemistry.h chemistry_io.h chemistry_struct.h cosmology.h restart.h space_getsid.h utilities.h \
     mesh_gravity.h cbrt.h exp10.h velociraptor_interface.h swift_velociraptor_part.h outputlist.h \
-    logger_io.h tracers_io.h tracers.h tracers_struct.h
+    logger_io.h tracers_io.h tracers.h tracers_struct.h sftracers_io.h sftracers.h \ 
+		sftracers_struct.h
 
 # source files for EAGLE cooling
 EAGLE_COOLING_SOURCES =
@@ -168,7 +169,9 @@ nobase_noinst_HEADERS = align.h approx_math.h atomic.h barrier.h cycle.h error.h
 		 tracers/none/tracers.h tracers/none/tracers_struct.h \
                  tracers/none/tracers_io.h \
 		 tracers/EAGLE/tracers.h tracers/EAGLE/tracers_struct.h \
-                 tracers/EAGLE/tracers_io.h 
+                 tracers/EAGLE/tracers_io.h \  
+		 sftracers/none/sftracers.h sftracers/none/sftracers_struct.h \
+                 sftracers/none/sftracers_io.h 
 
 
 # Sources and flags for regular library
diff --git a/src/hydro/Gadget2/hydro_part.h b/src/hydro/Gadget2/hydro_part.h
index 2b049062ddc0560fb9f941c2afe8aa43f4649cef..9d5aed8275a2a88f0f152de1cab850e52d3e0858 100644
--- a/src/hydro/Gadget2/hydro_part.h
+++ b/src/hydro/Gadget2/hydro_part.h
@@ -35,6 +35,7 @@
 #include "cooling_struct.h"
 #include "logger.h"
 #include "tracers_struct.h"
+#include "sftracers_struct.h"
 
 /* Extra particle data not needed during the SPH loops over neighbours. */
 struct xpart {
@@ -60,6 +61,9 @@ struct xpart {
   /* Additional data used by the tracers */
   struct tracers_xpart_data tracers_data;
 
+  /* Additional data used by the tracers */
+  struct sftracers_xpart_data sftracers_data;
+
   /* SFR label */
   float SFR;