Index: src/ControlStruct/ExceptDecl.cpp
===================================================================
--- src/ControlStruct/ExceptDecl.cpp	(revision 7a780ad23506507b6a1feccc46d18e12da183ceb)
+++ src/ControlStruct/ExceptDecl.cpp	(revision c92bdcc6ef9bc5c1b005f67d1c9f428bb8bd2b4c)
@@ -14,5 +14,5 @@
 //
 
-#include "ExceptDecl.h"
+#include "ExceptDecl.hpp"
 
 #include <sstream>
@@ -23,5 +23,5 @@
 #include "AST/Print.hpp"
 #include "AST/Type.hpp"
-#include "Virtual/Tables.h"
+#include "Virtual/Tables.hpp"
 
 namespace ControlStruct {
Index: src/ControlStruct/ExceptDecl.h
===================================================================
--- src/ControlStruct/ExceptDecl.h	(revision 7a780ad23506507b6a1feccc46d18e12da183ceb)
+++ 	(revision )
@@ -1,28 +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.
-//
-// ExceptDecl.h -- Handles declarations of exception types.
-//
-// Author           : Henry Xue
-// Created On       : Tue Jul 20 04:10:50 2021
-// Last Modified By : Andrew Beach
-// Last Modified On : Tue Jul 12 15:49:00 2022
-// Update Count     : 2
-//
-
-#pragma once
-
-namespace ast {
-	class TranslationUnit;
-}
-
-namespace ControlStruct {
-
-/// Unfold exception declarations into raw structure declarations.
-/// Also builds vtable declarations and converts vtable types.
-void translateExcept( ast::TranslationUnit & translationUnit );
-
-}
Index: src/ControlStruct/ExceptDecl.hpp
===================================================================
--- src/ControlStruct/ExceptDecl.hpp	(revision c92bdcc6ef9bc5c1b005f67d1c9f428bb8bd2b4c)
+++ src/ControlStruct/ExceptDecl.hpp	(revision c92bdcc6ef9bc5c1b005f67d1c9f428bb8bd2b4c)
@@ -0,0 +1,28 @@
+//
+// 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.
+//
+// ExceptDecl.hpp -- Handles declarations of exception types.
+//
+// Author           : Henry Xue
+// Created On       : Tue Jul 20 04:10:50 2021
+// Last Modified By : Andrew Beach
+// Last Modified On : Tue Jul 12 15:49:00 2022
+// Update Count     : 2
+//
+
+#pragma once
+
+namespace ast {
+	class TranslationUnit;
+}
+
+namespace ControlStruct {
+
+/// Unfold exception declarations into raw structure declarations.
+/// Also builds vtable declarations and converts vtable types.
+void translateExcept( ast::TranslationUnit & translationUnit );
+
+}
Index: src/ControlStruct/ExceptTranslate.cpp
===================================================================
--- src/ControlStruct/ExceptTranslate.cpp	(revision 7a780ad23506507b6a1feccc46d18e12da183ceb)
+++ src/ControlStruct/ExceptTranslate.cpp	(revision c92bdcc6ef9bc5c1b005f67d1c9f428bb8bd2b4c)
@@ -14,5 +14,5 @@
 //
 
-#include "ExceptTranslate.h"
+#include "ExceptTranslate.hpp"
 
 #include "AST/Expr.hpp"
Index: src/ControlStruct/ExceptTranslate.h
===================================================================
--- src/ControlStruct/ExceptTranslate.h	(revision 7a780ad23506507b6a1feccc46d18e12da183ceb)
+++ 	(revision )
@@ -1,41 +1,0 @@
-//
-// Cforall Version 1.0.0 Copyright (C) 2015 University of Waterloo
-//
-// The contents of this file are covered under the licence agreement in the
-// file "LICENCE" distributed with Cforall.
-//
-// ExceptTranslate.h -- Conversion of exception control flow structures.
-//
-// Author           : Andrew Beach
-// Created On       : Tus Jun 06 10:13:00 2017
-// Last Modified By : Andrew Beach
-// Last Modified On : Mon Nov  8 11:43:00 2020
-// Update Count     : 6
-//
-
-#pragma once
-
-namespace ast {
-	class TranslationUnit;
-}
-
-namespace ControlStruct {
-
-void translateThrows( ast::TranslationUnit & transUnit );
-/* Replaces all throw & throwResume statements with function calls.
- * These still need to be resolved, so call this before the reslover.
- */
-
-void translateTries( ast::TranslationUnit & transUnit );
-/* Replaces all try blocks (and their many clauses) with function definitions and calls.
- * This uses the exception built-ins to produce typed output and should take place after
- * the resolver. It also produces virtual casts and should happen before they are expanded.
- */
-
-}
-
-// Local Variables: //
-// tab-width: 4 //
-// mode: c++ //
-// compile-command: "make install" //
-// End: //
Index: src/ControlStruct/ExceptTranslate.hpp
===================================================================
--- src/ControlStruct/ExceptTranslate.hpp	(revision c92bdcc6ef9bc5c1b005f67d1c9f428bb8bd2b4c)
+++ src/ControlStruct/ExceptTranslate.hpp	(revision c92bdcc6ef9bc5c1b005f67d1c9f428bb8bd2b4c)
@@ -0,0 +1,41 @@
+//
+// Cforall Version 1.0.0 Copyright (C) 2015 University of Waterloo
+//
+// The contents of this file are covered under the licence agreement in the
+// file "LICENCE" distributed with Cforall.
+//
+// ExceptTranslate.h -- Conversion of exception control flow structures.
+//
+// Author           : Andrew Beach
+// Created On       : Tus Jun 06 10:13:00 2017
+// Last Modified By : Andrew Beach
+// Last Modified On : Mon Nov  8 11:43:00 2020
+// Update Count     : 6
+//
+
+#pragma once
+
+namespace ast {
+	class TranslationUnit;
+}
+
+namespace ControlStruct {
+
+void translateThrows( ast::TranslationUnit & transUnit );
+/* Replaces all throw & throwResume statements with function calls.
+ * These still need to be resolved, so call this before the reslover.
+ */
+
+void translateTries( ast::TranslationUnit & transUnit );
+/* Replaces all try blocks (and their many clauses) with function definitions and calls.
+ * This uses the exception built-ins to produce typed output and should take place after
+ * the resolver. It also produces virtual casts and should happen before they are expanded.
+ */
+
+}
+
+// Local Variables: //
+// tab-width: 4 //
+// mode: c++ //
+// compile-command: "make install" //
+// End: //