diff --git a/templates/module.mk.in b/templates/module.mk.in
index 67b3db4fb..107b3f5d9 100644
--- a/templates/module.mk.in
+++ b/templates/module.mk.in
@@ -58,9 +58,13 @@ LL@CLASSNAME@_MMA  := \
 
 LIB@CLASSNAME@_HDR := \
 		$(DIR)/@CLASSNAME@_a_muon.hpp \
+		$(DIR)/@CLASSNAME@_convergence_tester.hpp \
 		$(DIR)/@CLASSNAME@_effective_couplings.hpp \
+		$(DIR)/@CLASSNAME@_high_scale_constraint.hpp \
 		$(DIR)/@CLASSNAME@_info.hpp \
+		$(DIR)/@CLASSNAME@_initial_guesser.hpp \
 		$(DIR)/@CLASSNAME@_input_parameters.hpp \
+		$(DIR)/@CLASSNAME@_low_scale_constraint.hpp \
 		$(DIR)/@CLASSNAME@_mass_eigenstates.hpp \
 		$(DIR)/@CLASSNAME@_model.hpp \
 		$(DIR)/@CLASSNAME@_model_slha.hpp \
@@ -72,6 +76,7 @@ LIB@CLASSNAME@_HDR := \
 		$(DIR)/@CLASSNAME@_soft_parameters.hpp \
 		$(DIR)/@CLASSNAME@_standard_model_matching.hpp \
 		$(DIR)/@CLASSNAME@_susy_parameters.hpp \
+		$(DIR)/@CLASSNAME@_susy_scale_constraint.hpp \
 		$(DIR)/@CLASSNAME@_utilities.hpp
 
 ifneq ($(findstring two_scale,$(SOLVERS)),)
diff --git a/templates/two_scale.mk.in b/templates/two_scale.mk.in
index 29b227caa..600a784fa 100644
--- a/templates/two_scale.mk.in
+++ b/templates/two_scale.mk.in
@@ -28,12 +28,7 @@ LIB@ModelName@_SRC += \
 		$(DIR)/@ModelName@_two_scale_spectrum_generator.cpp \
 		$(DIR)/@ModelName@_two_scale_susy_scale_constraint.cpp
 LIB@ModelName@_HDR += \
-		$(DIR)/@ModelName@_convergence_tester.hpp \
-		$(DIR)/@ModelName@_high_scale_constraint.hpp \
-		$(DIR)/@ModelName@_initial_guesser.hpp \
-		$(DIR)/@ModelName@_low_scale_constraint.hpp \
 		$(DIR)/@ModelName@_standard_model_two_scale_matching.hpp \
-		$(DIR)/@ModelName@_susy_scale_constraint.hpp \
 		$(DIR)/@ModelName@_two_scale_convergence_tester.hpp \
 		$(DIR)/@ModelName@_two_scale_high_scale_constraint.hpp \
 		$(DIR)/@ModelName@_two_scale_initial_guesser.hpp \