Index: src/ControlStruct/LabelGeneratorNew.cpp
===================================================================
--- src/ControlStruct/LabelGeneratorNew.cpp	(revision 25793dac197117f7b67da5a2775cb26fd04cf354)
+++ src/ControlStruct/LabelGeneratorNew.cpp	(revision 0bd46fdf0880513efbef382cb2e926954f5c6001)
@@ -14,6 +14,4 @@
 //
 
-using namespace std;
-
 #include "LabelGeneratorNew.hpp"
 
@@ -21,4 +19,6 @@
 #include "AST/Label.hpp"
 #include "AST/Stmt.hpp"
+
+using namespace std;
 using namespace ast;
 
Index: src/ControlStruct/MultiLevelExit.cpp
===================================================================
--- src/ControlStruct/MultiLevelExit.cpp	(revision 25793dac197117f7b67da5a2775cb26fd04cf354)
+++ src/ControlStruct/MultiLevelExit.cpp	(revision 0bd46fdf0880513efbef382cb2e926954f5c6001)
@@ -356,5 +356,5 @@
 	vec.emplace_back( nullptr );
 	for ( size_t i = vec.size() - 1 ; 0 < i ; --i ) {
-		vec[ i ] = move( vec[ i - 1 ] );
+		vec[ i ] = std::move( vec[ i - 1 ] );
 	}
 	vec[ 0 ] = element;
@@ -511,5 +511,5 @@
 
 void MultiLevelExitCore::previsit( const FinallyClause * ) {
-	GuardAction([this, old = move( enclosing_control_structures)](){ enclosing_control_structures = move(old); });
+	GuardAction([this, old = std::move( enclosing_control_structures)](){ enclosing_control_structures = std::move(old); });
 	enclosing_control_structures = vector<Entry>();
 	GuardValue( inFinally ) = true;