Index: src/ControlStruct/module.mk
===================================================================
--- src/ControlStruct/module.mk	(revision e15853c01fea9920d1adec991c801c4361669db7)
+++ src/ControlStruct/module.mk	(revision 972540e714dedc02bc563d19e713b0a42b7e3abd)
@@ -15,8 +15,12 @@
 ###############################################################################
 
-SRC +=  ControlStruct/LabelGenerator.cc \
+SRC_CONTROLSTRUCT = \
+	ControlStruct/ForExprMutator.cc \
 	ControlStruct/LabelFixer.cc \
+	ControlStruct/LabelGenerator.cc \
 	ControlStruct/MLEMutator.cc \
-	ControlStruct/Mutate.cc \
-	ControlStruct/ForExprMutator.cc \
-	ControlStruct/ExceptTranslate.cc
+	ControlStruct/Mutate.cc
+
+SRC += $(SRC_CONTROLSTRUCT) ControlStruct/ExceptTranslate.cc
+SRCDEMANGLE += $(SRC_CONTROLSTRUCT)
+