Index: src/Concurrency/Keywords.cc
===================================================================
--- src/Concurrency/Keywords.cc	(revision 88d955ffe43ce28d89e470e34dbccad5239619ac)
+++ src/Concurrency/Keywords.cc	(revision 73abe950d807eab747c9e14353b158fcca827308)
@@ -97,5 +97,5 @@
 			"__thrd",
 			"get_thread",
-			"thread keyword requires threads to be in scope, add #include <thread>",
+			"thread keyword requires threads to be in scope, add #include <thread.hfa>",
 			true,
 			KeywordCastExpr::Thread
@@ -129,5 +129,5 @@
 			"__cor",
 			"get_coroutine",
-			"coroutine keyword requires coroutines to be in scope, add #include <coroutine>",
+			"coroutine keyword requires coroutines to be in scope, add #include <coroutine.hfa>",
 			true,
 			KeywordCastExpr::Coroutine
@@ -161,5 +161,5 @@
 			"__mon",
 			"get_monitor",
-			"monitor keyword requires monitors to be in scope, add #include <monitor>",
+			"monitor keyword requires monitors to be in scope, add #include <monitor.hfa>",
 			false,
 			KeywordCastExpr::Monitor
@@ -488,5 +488,5 @@
 		// Do we have the required headers
 		if( !monitor_decl || !guard_decl || !dtor_guard_decl )
-			SemanticError( decl, "mutex keyword requires monitors to be in scope, add #include <monitor>\n" );
+			SemanticError( decl, "mutex keyword requires monitors to be in scope, add #include <monitor.hfa>\n" );
 
 		// Instrument the body
@@ -685,5 +685,5 @@
 		if( type && type->get_baseStruct()->is_thread() ) {
 			if( !thread_decl || !thread_ctor_seen ) {
-				SemanticError( type->get_baseStruct()->location, "thread keyword requires threads to be in scope, add #include <thread>");
+				SemanticError( type->get_baseStruct()->location, "thread keyword requires threads to be in scope, add #include <thread.hfa>");
 			}
 
Index: src/Concurrency/Waitfor.cc
===================================================================
--- src/Concurrency/Waitfor.cc	(revision 88d955ffe43ce28d89e470e34dbccad5239619ac)
+++ src/Concurrency/Waitfor.cc	(revision 73abe950d807eab747c9e14353b158fcca827308)
@@ -250,5 +250,5 @@
 	Statement * GenerateWaitForPass::postmutate( WaitForStmt * waitfor ) {
 		if( !decl_monitor || !decl_acceptable || !decl_mask )
-			SemanticError( waitfor, "waitfor keyword requires monitors to be in scope, add #include <monitor>" );
+			SemanticError( waitfor, "waitfor keyword requires monitors to be in scope, add #include <monitor.hfa>" );
 
 		CompoundStmt * stmt = new CompoundStmt();