Index: src/Concurrency/Corun.cpp
===================================================================
--- src/Concurrency/Corun.cpp	(revision fc1a3e283512526d1ddc12898c7c5fa33f0ddeaf)
+++ src/Concurrency/Corun.cpp	(revision c778ef1fa5b161d07ea4e5f42e20a63d926fc1ca)
@@ -19,5 +19,5 @@
 #include "AST/Stmt.hpp"
 #include "AST/TranslationUnit.hpp"
-#include "Common/UniqueName.h"
+#include "Common/UniqueName.hpp"
 using namespace ast;
 using namespace std;
Index: src/Concurrency/Keywords.cpp
===================================================================
--- src/Concurrency/Keywords.cpp	(revision fc1a3e283512526d1ddc12898c7c5fa33f0ddeaf)
+++ src/Concurrency/Keywords.cpp	(revision c778ef1fa5b161d07ea4e5f42e20a63d926fc1ca)
@@ -14,5 +14,5 @@
 //
 
-#include "Concurrency/Keywords.h"
+#include "Concurrency/Keywords.hpp"
 
 #include <iostream>
@@ -26,11 +26,11 @@
 #include "AST/DeclReplacer.hpp"
 #include "AST/TranslationUnit.hpp"
-#include "CodeGen/OperatorTable.h"
-#include "Common/Examine.h"
-#include "Common/utility.h"
-#include "Common/UniqueName.h"
+#include "CodeGen/OperatorTable.hpp"
+#include "Common/Examine.hpp"
+#include "Common/Utility.hpp"
+#include "Common/UniqueName.hpp"
 #include "ControlStruct/LabelGenerator.hpp"
-#include "InitTweak/InitTweak.h"
-#include "Virtual/Tables.h"
+#include "InitTweak/InitTweak.hpp"
+#include "Virtual/Tables.hpp"
 
 namespace Concurrency {
Index: src/Concurrency/Keywords.h
===================================================================
--- src/Concurrency/Keywords.h	(revision fc1a3e283512526d1ddc12898c7c5fa33f0ddeaf)
+++ 	(revision )
@@ -1,37 +1,0 @@
-//
-// Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo
-//
-// The contents of this file are covered under the licence agreement in the
-// file "LICENCE" distributed with Cforall.
-//
-// Keywords.h -- Implement concurrency constructs from their keywords.
-//
-// Author           : Thierry Delisle
-// Created On       : Fri Mar 10 15:16:42 2017
-// Last Modified By :
-// Last Modified On :
-// Update Count     : 1
-//
-
-#pragma once
-
-namespace ast {
-	class TranslationUnit;
-}
-
-namespace Concurrency {
-
-/// Implement the sue-like keywords and the suspend keyword. Pre-Autogen
-void implementKeywords( ast::TranslationUnit & translationUnit );
-/// Implement the mutex parameters and mutex statement. Post-Autogen
-void implementMutex( ast::TranslationUnit & translationUnit );
-/// Add the thread starter code to constructors. Post-Autogen
-void implementThreadStarter( ast::TranslationUnit & translationUnit );
-
-};
-
-// Local Variables: //
-// tab-width: 4 //
-// mode: c++ //
-// compile-command: "make install" //
-// End: //
Index: src/Concurrency/Keywords.hpp
===================================================================
--- src/Concurrency/Keywords.hpp	(revision c778ef1fa5b161d07ea4e5f42e20a63d926fc1ca)
+++ src/Concurrency/Keywords.hpp	(revision c778ef1fa5b161d07ea4e5f42e20a63d926fc1ca)
@@ -0,0 +1,37 @@
+//
+// Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo
+//
+// The contents of this file are covered under the licence agreement in the
+// file "LICENCE" distributed with Cforall.
+//
+// Keywords.hpp -- Implement concurrency constructs from their keywords.
+//
+// Author           : Thierry Delisle
+// Created On       : Fri Mar 10 15:16:42 2017
+// Last Modified By :
+// Last Modified On :
+// Update Count     : 1
+//
+
+#pragma once
+
+namespace ast {
+	class TranslationUnit;
+}
+
+namespace Concurrency {
+
+/// Implement the sue-like keywords and the suspend keyword. Pre-Autogen
+void implementKeywords( ast::TranslationUnit & translationUnit );
+/// Implement the mutex parameters and mutex statement. Post-Autogen
+void implementMutex( ast::TranslationUnit & translationUnit );
+/// Add the thread starter code to constructors. Post-Autogen
+void implementThreadStarter( ast::TranslationUnit & translationUnit );
+
+};
+
+// Local Variables: //
+// tab-width: 4 //
+// mode: c++ //
+// compile-command: "make install" //
+// End: //
Index: src/Concurrency/Waitfor.cpp
===================================================================
--- src/Concurrency/Waitfor.cpp	(revision fc1a3e283512526d1ddc12898c7c5fa33f0ddeaf)
+++ src/Concurrency/Waitfor.cpp	(revision c778ef1fa5b161d07ea4e5f42e20a63d926fc1ca)
@@ -14,12 +14,12 @@
 //
 
-#include "Waitfor.h"
+#include "Waitfor.hpp"
 
 #include <string>
 
 #include "AST/Pass.hpp"
-#include "Common/UniqueName.h"
-#include "InitTweak/InitTweak.h"
-#include "ResolvExpr/Resolver.h"
+#include "Common/UniqueName.hpp"
+#include "InitTweak/InitTweak.hpp"
+#include "ResolvExpr/Resolver.hpp"
 
 #include "AST/Print.hpp"
Index: src/Concurrency/Waitfor.h
===================================================================
--- src/Concurrency/Waitfor.h	(revision fc1a3e283512526d1ddc12898c7c5fa33f0ddeaf)
+++ 	(revision )
@@ -1,32 +1,0 @@
-//
-// Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo
-//
-// The contents of this file are covered under the licence agreement in the
-// file "LICENCE" distributed with Cforall.
-//
-// Waitfor.h --
-//
-// Author           : Thierry Delisle
-// Created On       : Mon Aug 28 11:03:31 2017
-// Last Modified By :
-// Last Modified On :
-// Update Count     : 1
-//
-
-#pragma once
-
-namespace ast {
-	class TranslationUnit;
-}
-
-namespace Concurrency {
-
-void generateWaitFor( ast::TranslationUnit & translationUnit );
-
-};
-
-// Local Variables: //
-// tab-width: 4 //
-// mode: c++ //
-// compile-command: "make install" //
-// End: //
Index: src/Concurrency/Waitfor.hpp
===================================================================
--- src/Concurrency/Waitfor.hpp	(revision c778ef1fa5b161d07ea4e5f42e20a63d926fc1ca)
+++ src/Concurrency/Waitfor.hpp	(revision c778ef1fa5b161d07ea4e5f42e20a63d926fc1ca)
@@ -0,0 +1,32 @@
+//
+// Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo
+//
+// The contents of this file are covered under the licence agreement in the
+// file "LICENCE" distributed with Cforall.
+//
+// Waitfor.hpp --
+//
+// Author           : Thierry Delisle
+// Created On       : Mon Aug 28 11:03:31 2017
+// Last Modified By :
+// Last Modified On :
+// Update Count     : 1
+//
+
+#pragma once
+
+namespace ast {
+	class TranslationUnit;
+}
+
+namespace Concurrency {
+
+void generateWaitFor( ast::TranslationUnit & translationUnit );
+
+};
+
+// Local Variables: //
+// tab-width: 4 //
+// mode: c++ //
+// compile-command: "make install" //
+// End: //
Index: src/Concurrency/Waituntil.cpp
===================================================================
--- src/Concurrency/Waituntil.cpp	(revision fc1a3e283512526d1ddc12898c7c5fa33f0ddeaf)
+++ src/Concurrency/Waituntil.cpp	(revision c778ef1fa5b161d07ea4e5f42e20a63d926fc1ca)
@@ -24,5 +24,5 @@
 #include "AST/Stmt.hpp"
 #include "AST/Type.hpp"
-#include "Common/UniqueName.h"
+#include "Common/UniqueName.hpp"
 
 using namespace ast;
Index: src/Concurrency/module.mk
===================================================================
--- src/Concurrency/module.mk	(revision fc1a3e283512526d1ddc12898c7c5fa33f0ddeaf)
+++ src/Concurrency/module.mk	(revision c778ef1fa5b161d07ea4e5f42e20a63d926fc1ca)
@@ -21,7 +21,7 @@
 	Concurrency/Corun.hpp \
 	Concurrency/Keywords.cpp \
-	Concurrency/Keywords.h \
+	Concurrency/Keywords.hpp \
 	Concurrency/Waitfor.cpp \
-	Concurrency/Waitfor.h \
+	Concurrency/Waitfor.hpp \
 	Concurrency/Waituntil.cpp \
 	Concurrency/Waituntil.hpp