Index: src/Concurrency/Keywords.cc
===================================================================
--- src/Concurrency/Keywords.cc	(revision c36814a10414e8846cf2d03be08ada58aafc93a7)
+++ src/Concurrency/Keywords.cc	(revision 4407b7ee22a177cb0cd564fd7ea6335606b27dc3)
@@ -508,5 +508,5 @@
 		ObjectDecl * vtable_object = Virtual::makeVtableForward(
 			"_default_vtable_object_declaration",
-			vtable_decl->makeInst( move( poly_args ) ) );
+			vtable_decl->makeInst( std::move( poly_args ) ) );
 		declsToAddBefore.push_back( vtable_object );
 		declsToAddBefore.push_back(
@@ -681,5 +681,5 @@
 			void lock (monitor_t & this) {
 				lock(get_monitor(this));
-			}	
+			}
 		*/
 		FunctionDecl * lock_decl = new FunctionDecl(
@@ -700,5 +700,5 @@
 		CompoundStmt * lock_statement = new CompoundStmt();
 		lock_statement->push_back(
-			new ExprStmt( 
+			new ExprStmt(
 				new UntypedExpr (
 					new NameExpr( "lock" ),
@@ -716,5 +716,5 @@
 			void unlock (monitor_t & this) {
 				unlock(get_monitor(this));
-			}	
+			}
 		*/
 		FunctionDecl * unlock_decl = new FunctionDecl(
@@ -736,5 +736,5 @@
 
 		unlock_statement->push_back(
-			new ExprStmt( 
+			new ExprStmt(
 				new UntypedExpr(
 					new NameExpr( "unlock" ),
@@ -746,5 +746,5 @@
 		);
 		unlock_decl->set_statements( unlock_statement );
-		
+
 		// pushes routines to declsToAddAfter to add at a later time
 		declsToAddAfter.push_back( lock_decl );
@@ -1054,5 +1054,5 @@
 			assert( !thread_guard_decl );
 			thread_guard_decl = decl;
-		} 
+		}
 		else if ( decl->name == "__mutex_stmt_lock_guard" && decl->body ) {
 			assert( !lock_guard_decl );
@@ -1206,5 +1206,5 @@
 							new NameExpr( "__get_mutexstmt_lock_type" ),
 							{ args.front()->clone() }
-						) 
+						)
 					)
 				),
@@ -1225,10 +1225,10 @@
 
 		StructInstType * lock_guard_struct = new StructInstType( noQualifiers, lock_guard_decl );
-		TypeExpr * lock_type_expr = new TypeExpr( 
+		TypeExpr * lock_type_expr = new TypeExpr(
 			new TypeofType( noQualifiers, new UntypedExpr(
 				new NameExpr( "__get_mutexstmt_lock_type" ),
 				{ args.front()->clone() }
-				) 
-			) 
+				)
+			)
 		);