Index: src/ControlStruct/LabelFixer.cc
===================================================================
--- src/ControlStruct/LabelFixer.cc	(revision d3b7937ae7ab8afece0824b5729b7e86a9f0bd63)
+++ src/ControlStruct/LabelFixer.cc	(revision 25296a3a57041d5dfede45ddd1a3133cf58517bb)
@@ -5,5 +5,5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// LabelFixer.cc -- 
+// LabelFixer.cc --
 //
 // Author           : Rodolfo G. Esteves
@@ -86,5 +86,5 @@
 
 
-	// sets the definition of the labelTable entry to be the provided 
+	// sets the definition of the labelTable entry to be the provided
 	// statement for every label in the list parameter. Happens for every kind of statement
 	Label LabelFixer::setLabelsDef( std::list< Label > &llabel, Statement *definition ) {
@@ -101,5 +101,5 @@
 			} else if ( labelTable[ *i ]->defined() ) {
 				// defined twice, error
-				throw SemanticError( "Duplicate definition of label: " + *i );
+				throw SemanticError( "Duplicate definition of label: " + (*i).get_name() );
 			}	else {
 				// used previously, but undefined until now -> link with this entry
@@ -109,5 +109,5 @@
 		} // for
 
-		// produce one of the labels attached to this statement to be 
+		// produce one of the labels attached to this statement to be
 		// temporarily used as the canonical label
 		return labelTable[ llabel.front() ]->get_label();
@@ -130,5 +130,5 @@
 		for ( std::map< Label, Entry * >::iterator i = labelTable.begin(); i != labelTable.end(); ++i ) {
 			if ( ! i->second->defined() ) {
-				throw SemanticError( "Use of undefined label: " + i->first );
+				throw SemanticError( "Use of undefined label: " + i->first.get_name() );
 			}
 			(*ret)[ i->first ] = i->second->get_definition();
Index: src/ControlStruct/LabelFixer.h
===================================================================
--- src/ControlStruct/LabelFixer.h	(revision d3b7937ae7ab8afece0824b5729b7e86a9f0bd63)
+++ src/ControlStruct/LabelFixer.h	(revision 25296a3a57041d5dfede45ddd1a3133cf58517bb)
@@ -5,5 +5,5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// LabelFixer.h -- 
+// LabelFixer.h --
 //
 // Author           : Rodolfo G. Esteves
@@ -20,6 +20,6 @@
 #include "SynTree/SynTree.h"
 #include "SynTree/Visitor.h"
+#include "SynTree/Label.h"
 #include "LabelGenerator.h"
-
 #include <map>
 
@@ -74,8 +74,8 @@
 
 		  private:
-			Label label;  
+			Label label;
 			Statement *definition;
 		};
-	          
+
 		std::map < Label, Entry *> labelTable;
 		LabelGenerator *generator;
Index: src/ControlStruct/LabelGenerator.cc
===================================================================
--- src/ControlStruct/LabelGenerator.cc	(revision d3b7937ae7ab8afece0824b5729b7e86a9f0bd63)
+++ src/ControlStruct/LabelGenerator.cc	(revision 25296a3a57041d5dfede45ddd1a3133cf58517bb)
@@ -5,5 +5,5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// LabelGenerator.cc -- 
+// LabelGenerator.cc --
 //
 // Author           : Rodolfo G. Esteves
@@ -18,4 +18,5 @@
 
 #include "LabelGenerator.h"
+#include "SynTree/Label.h"
 
 namespace ControlStruct {
Index: src/ControlStruct/MLEMutator.h
===================================================================
--- src/ControlStruct/MLEMutator.h	(revision d3b7937ae7ab8afece0824b5729b7e86a9f0bd63)
+++ src/ControlStruct/MLEMutator.h	(revision 25296a3a57041d5dfede45ddd1a3133cf58517bb)
@@ -5,5 +5,5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// MLEMutator.h -- 
+// MLEMutator.h --
 //
 // Author           : Rodolfo G. Esteves
@@ -23,4 +23,5 @@
 #include "SynTree/SynTree.h"
 #include "SynTree/Mutator.h"
+#include "SynTree/Label.h"
 
 #include "LabelGenerator.h"
@@ -38,5 +39,5 @@
 		Statement *mutate( BranchStmt *branchStmt ) throw ( SemanticError );
 
-		Statement *mutate( CaseStmt *caseStmt ); 
+		Statement *mutate( CaseStmt *caseStmt );
 		Statement *mutate( SwitchStmt *switchStmt );
 		Statement *mutate( ChooseStmt *switchStmt );
@@ -79,5 +80,5 @@
 		Statement *handleLoopStmt( LoopClass *loopStmt );
 
-		template< typename SwitchClass > 
+		template< typename SwitchClass >
 		Statement *handleSwitchStmt( SwitchClass *switchStmt );