Index: src/SymTab/Demangle.cc
===================================================================
--- src/SymTab/Demangle.cc	(revision 24ceace338f4f1639e2ade17a788415b9ff66184)
+++ src/SymTab/Demangle.cc	(revision 8108ba8a8f4d28b94bec400ffa195c7e3ecb16b5)
@@ -5,5 +5,5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// Demangler.cc --
+// Demangle.cc -- Convert a mangled name into a human readable name.
 //
 // Author           : Rob Schluntz
Index: src/SymTab/Demangle.h
===================================================================
--- src/SymTab/Demangle.h	(revision 8108ba8a8f4d28b94bec400ffa195c7e3ecb16b5)
+++ src/SymTab/Demangle.h	(revision 8108ba8a8f4d28b94bec400ffa195c7e3ecb16b5)
@@ -0,0 +1,26 @@
+//
+// Cforall Version 1.0.0 Copyright (C) 2018 University of Waterloo
+//
+// The contents of this file are covered under the licence agreement in the
+// file "LICENCE" distributed with Cforall.
+//
+// Demangle.h -- Convert a mangled name into a human readable name.
+//
+// Author           : Andrew Beach
+// Created On       : Fri May 13 10:11:00 2022
+// Last Modified By : Andrew Beach
+// Last Modified On : Fri May 13 10:30:00 2022
+// Update Count     : 0
+//
+
+#pragma once
+
+extern "C" {
+	char * cforall_demangle(const char *, int);
+}
+
+// Local Variables: //
+// tab-width: 4 //
+// mode: c++ //
+// compile-command: "make install" //
+// End: //
Index: src/SymTab/Mangler.h
===================================================================
--- src/SymTab/Mangler.h	(revision 24ceace338f4f1639e2ade17a788415b9ff66184)
+++ src/SymTab/Mangler.h	(revision 8108ba8a8f4d28b94bec400ffa195c7e3ecb16b5)
@@ -111,8 +111,4 @@
 }
 
-extern "C" {
-	char * cforall_demangle(const char *, int);
-}
-
 // Local Variables: //
 // tab-width: 4 //
Index: src/SymTab/demangler.cc
===================================================================
--- src/SymTab/demangler.cc	(revision 24ceace338f4f1639e2ade17a788415b9ff66184)
+++ src/SymTab/demangler.cc	(revision 8108ba8a8f4d28b94bec400ffa195c7e3ecb16b5)
@@ -1,3 +1,3 @@
-#include "Mangler.h"
+#include "Demangle.h"
 #include <iostream>
 #include <fstream>
Index: src/SymTab/module.mk
===================================================================
--- src/SymTab/module.mk	(revision 24ceace338f4f1639e2ade17a788415b9ff66184)
+++ src/SymTab/module.mk	(revision 8108ba8a8f4d28b94bec400ffa195c7e3ecb16b5)
@@ -29,3 +29,5 @@
 
 SRC += $(SRC_SYMTAB)
-SRCDEMANGLE += $(SRC_SYMTAB) SymTab/Demangle.cc
+SRCDEMANGLE += $(SRC_SYMTAB) \
+	SymTab/Demangle.cc \
+	SymTab/Demangle.h