Index: src/ResolvExpr/CommonType.cc
===================================================================
--- src/ResolvExpr/CommonType.cc	(revision fd9ae1d407fed0d7679bdcbba50a7cc3f3694386)
+++ src/ResolvExpr/CommonType.cc	(revision 351c5199cc1bf4bce6dc7b8e2ca3a9ecc12da186)
@@ -177,5 +177,5 @@
 
 	// GENERATED START, DO NOT EDIT
-	// GENERATED BY BasicTypes-gen.cc
+	// GENERATED BY ../../main/src/BasicTypes-gen.cc
 	#define BT BasicType::
 	static const BasicType::Kind commonTypes[BasicType::NUMBER_OF_BASIC_TYPES][BasicType::NUMBER_OF_BASIC_TYPES] = { // nearest common ancestor
Index: src/ResolvExpr/ConversionCost.cc
===================================================================
--- src/ResolvExpr/ConversionCost.cc	(revision fd9ae1d407fed0d7679bdcbba50a7cc3f3694386)
+++ src/ResolvExpr/ConversionCost.cc	(revision 351c5199cc1bf4bce6dc7b8e2ca3a9ecc12da186)
@@ -182,5 +182,5 @@
 
 	// GENERATED START, DO NOT EDIT
-	// GENERATED BY BasicTypes-gen.cc
+	// GENERATED BY ../../main/src/BasicTypes-gen.cc
 	/* EXTENDED INTEGRAL RANK HIERARCHY (root to leaves)
 	                         _Bool
@@ -207,5 +207,5 @@
 
 	// GENERATED START, DO NOT EDIT
-	// GENERATED BY BasicTypes-gen.cc
+	// GENERATED BY ../../main/src/BasicTypes-gen.cc
 	static const int costMatrix[BasicType::NUMBER_OF_BASIC_TYPES][BasicType::NUMBER_OF_BASIC_TYPES] = { // path length from root to node
 		/*             B    C   SC   UC   SI  SUI    I   UI   LI  LUI  LLI LLUI   IB  UIB  _FH  _FH   _F  _FC    F   FC  _FX _FXC   FD _FDC    D   DC F80X_FDXC  F80  _FB_FLDC   FB   LD  LDC _FBX_FLDXC */
@@ -254,5 +254,5 @@
 
 	// GENERATED START, DO NOT EDIT
-	// GENERATED BY BasicTypes-gen.cc
+	// GENERATED BY ../../main/src/BasicTypes-gen.cc
 	static const int signMatrix[BasicType::NUMBER_OF_BASIC_TYPES][BasicType::NUMBER_OF_BASIC_TYPES] = { // number of sign changes in safe conversion
 		/*             B    C   SC   UC   SI  SUI    I   UI   LI  LUI  LLI LLUI   IB  UIB  _FH  _FH   _F  _FC    F   FC  _FX _FXC   FD _FDC    D   DC F80X_FDXC  F80  _FB_FLDC   FB   LD  LDC _FBX_FLDXC */
Index: src/ResolvExpr/module.mk
===================================================================
--- src/ResolvExpr/module.mk	(revision fd9ae1d407fed0d7679bdcbba50a7cc3f3694386)
+++ src/ResolvExpr/module.mk	(revision 351c5199cc1bf4bce6dc7b8e2ca3a9ecc12da186)
@@ -15,23 +15,26 @@
 ###############################################################################
 
-SRC += ResolvExpr/AlternativeFinder.cc \
-       ResolvExpr/Alternative.cc \
-       ResolvExpr/Unify.cc \
-       ResolvExpr/PtrsAssignable.cc \
-       ResolvExpr/CommonType.cc \
-       ResolvExpr/ConversionCost.cc \
-       ResolvExpr/CastCost.cc \
-       ResolvExpr/PtrsCastable.cc \
-       ResolvExpr/AdjustExprType.cc \
-       ResolvExpr/AlternativePrinter.cc \
-       ResolvExpr/Resolver.cc \
-       ResolvExpr/ResolveTypeof.cc \
-       ResolvExpr/RenameVars.cc \
-       ResolvExpr/FindOpenVars.cc \
-       ResolvExpr/PolyCost.cc \
-       ResolvExpr/Occurs.cc \
-       ResolvExpr/TypeEnvironment.cc \
-       ResolvExpr/CurrentObject.cc \
-       ResolvExpr/ExplodedActual.cc \
-       ResolvExpr/SpecCost.cc \
-       ResolvExpr/ResolveAssertions.cc
+SRC_RESOLVEXPR = \
+      ResolvExpr/AdjustExprType.cc \
+      ResolvExpr/Alternative.cc \
+      ResolvExpr/AlternativeFinder.cc \
+      ResolvExpr/CastCost.cc \
+      ResolvExpr/CommonType.cc \
+      ResolvExpr/ConversionCost.cc \
+      ResolvExpr/CurrentObject.cc \
+      ResolvExpr/ExplodedActual.cc \
+      ResolvExpr/FindOpenVars.cc \
+      ResolvExpr/Occurs.cc \
+      ResolvExpr/PolyCost.cc \
+      ResolvExpr/PtrsAssignable.cc \
+      ResolvExpr/PtrsCastable.cc \
+      ResolvExpr/RenameVars.cc \
+      ResolvExpr/ResolveAssertions.cc \
+      ResolvExpr/Resolver.cc \
+      ResolvExpr/ResolveTypeof.cc \
+      ResolvExpr/SpecCost.cc \
+      ResolvExpr/TypeEnvironment.cc \
+      ResolvExpr/Unify.cc
+
+SRC += $(SRC_RESOLVEXPR) ResolvExpr/AlternativePrinter.cc
+SRCDEMANGLE += $(SRC_RESOLVEXPR)