Index: src/CodeGen/CodeGenerator.h
===================================================================
--- src/CodeGen/CodeGenerator.h	(revision a1edafa4cdaef39b89d777ace0514d4622c8c81b)
+++ src/CodeGen/CodeGenerator.h	(revision 6b0b624129f6017f7706b516a24a52e382e3a334)
@@ -9,11 +9,10 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Andrew Beach
-// Last Modified On : Thu Jun  8 15:48:00 2017
-// Update Count     : 52
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Fri Jul 21 22:16:21 2017
+// Update Count     : 53
 //
 
-#ifndef CODEGENV_H
-#define CODEGENV_H
+#pragma once
 
 #include <list>                   // for list
@@ -166,6 +165,4 @@
 } // namespace CodeGen
 
-#endif // CODEGENV_H
-
 // Local Variables: //
 // tab-width: 4 //
Index: src/CodeGen/FixMain.h
===================================================================
--- src/CodeGen/FixMain.h	(revision a1edafa4cdaef39b89d777ace0514d4622c8c81b)
+++ src/CodeGen/FixMain.h	(revision 6b0b624129f6017f7706b516a24a52e382e3a334)
@@ -9,11 +9,10 @@
 // Author           : Thierry Delisle
 // Created On       : Thr Jan 12 14:11:09 2017
-// Last Modified By : 
-// Last Modified On : 
-// Update Count     : 0
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Fri Jul 21 22:16:59 2017
+// Update Count     : 1
 //
 
-#ifndef FIXMAIN_H
-#define FIXMAIN_H
+#pragma once
 
 #include <iosfwd>
@@ -44,4 +43,2 @@
 	};
 };
-
-#endif //FIXMAIN_H
Index: src/CodeGen/FixNames.h
===================================================================
--- src/CodeGen/FixNames.h	(revision a1edafa4cdaef39b89d777ace0514d4622c8c81b)
+++ src/CodeGen/FixNames.h	(revision 6b0b624129f6017f7706b516a24a52e382e3a334)
@@ -10,10 +10,9 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon May 18 23:37:32 2015
-// Update Count     : 2
+// Last Modified On : Fri Jul 21 22:17:33 2017
+// Update Count     : 3
 //
 
-#ifndef FIXNAMES_H
-#define FIXNAMES_H
+#pragma once
 
 #include <list>  // for list
@@ -26,6 +25,4 @@
 } // namespace CodeGen
 
-#endif // FIXNAMES_H
-
 // Local Variables: //
 // tab-width: 4 //
Index: src/CodeGen/GenType.h
===================================================================
--- src/CodeGen/GenType.h	(revision a1edafa4cdaef39b89d777ace0514d4622c8c81b)
+++ src/CodeGen/GenType.h	(revision 6b0b624129f6017f7706b516a24a52e382e3a334)
@@ -10,10 +10,9 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon May 18 23:38:53 2015
-// Update Count     : 1
+// Last Modified On : Fri Jul 21 22:17:23 2017
+// Update Count     : 2
 //
 
-#ifndef _GENTYPE_H
-#define _GENTYPE_H
+#pragma once
 
 #include <string>  // for string
@@ -26,6 +25,4 @@
 } // namespace CodeGen
 
-#endif // _GENTYPE_H
-
 // Local Variables: //
 // tab-width: 4 //
Index: src/CodeGen/Generate.h
===================================================================
--- src/CodeGen/Generate.h	(revision a1edafa4cdaef39b89d777ace0514d4622c8c81b)
+++ src/CodeGen/Generate.h	(revision 6b0b624129f6017f7706b516a24a52e382e3a334)
@@ -10,10 +10,9 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon May 18 23:39:51 2015
-// Update Count     : 1
+// Last Modified On : Fri Jul 21 22:16:35 2017
+// Update Count     : 2
 //
 
-#ifndef GENERATE_H
-#define GENERATE_H
+#pragma once
 
 #include <iostream>  // for ostream
@@ -31,6 +30,4 @@
 } // namespace CodeGen
 
-#endif // GENERATE_H
-
 // Local Variables: //
 // tab-width: 4 //
Index: src/CodeGen/OperatorTable.h
===================================================================
--- src/CodeGen/OperatorTable.h	(revision a1edafa4cdaef39b89d777ace0514d4622c8c81b)
+++ src/CodeGen/OperatorTable.h	(revision 6b0b624129f6017f7706b516a24a52e382e3a334)
@@ -9,11 +9,10 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Rob Schluntz
-// Last Modified On : Wed Jun 24 16:17:57 2015
-// Update Count     : 5
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Fri Jul 21 22:17:11 2017
+// Update Count     : 6
 //
 
-#ifndef _OPERATORTABLE_H
-#define _OPERATORTABLE_H
+#pragma once
 
 #include <string>
@@ -45,6 +44,4 @@
 } // namespace CodeGen
 
-#endif // _OPERATORTABLE_H
-
 // Local Variables: //
 // tab-width: 4 //
Index: src/CodeTools/DeclStats.h
===================================================================
--- src/CodeTools/DeclStats.h	(revision a1edafa4cdaef39b89d777ace0514d4622c8c81b)
+++ src/CodeTools/DeclStats.h	(revision 6b0b624129f6017f7706b516a24a52e382e3a334)
@@ -9,11 +9,10 @@
 // Author           : Aaron Moss
 // Created On       : Wed Jan 31 16:40:00 2016
-// Last Modified By : Aaron Moss
-// Last Modified On : Wed Jan 31 16:40:00 2016
-// Update Count     : 1
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Fri Jul 21 22:17:56 2017
+// Update Count     : 2
 //
 
-#ifndef DECLSTATS_H
-#define DECLSTATS_H
+#pragma once
 
 #include <list>  // for list
@@ -28,6 +27,4 @@
 }  // namespace CodeTools
 
-#endif // DECLSTATS_H
-
 // Local Variables: //
 // tab-width: 4 //
Index: src/CodeTools/TrackLoc.h
===================================================================
--- src/CodeTools/TrackLoc.h	(revision a1edafa4cdaef39b89d777ace0514d4622c8c81b)
+++ src/CodeTools/TrackLoc.h	(revision 6b0b624129f6017f7706b516a24a52e382e3a334)
@@ -9,11 +9,10 @@
 // Author           : Andrew Beach
 // Created On       : Tues May 2 15:40:00 2017
-// Last Modified By : Andrew Beach
-// Last Modified On : Wed May 3 14:42:00 2017
-// Update Count     : 0
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Fri Jul 21 22:17:44 2017
+// Update Count     : 1
 //
 
-#ifndef TRACKLOC_H
-#define TRACKLOC_H
+#pragma once
 
 #include <cstddef>   // for size_t
@@ -31,6 +30,4 @@
 }  // namespace CodeTools
 
-#endif // TRACKLOC_H
-
 // Local Variables: //
 // tab-width: 4 //
Index: src/Common/CompilerError.h
===================================================================
--- src/Common/CompilerError.h	(revision a1edafa4cdaef39b89d777ace0514d4622c8c81b)
+++ src/Common/CompilerError.h	(revision 6b0b624129f6017f7706b516a24a52e382e3a334)
@@ -10,10 +10,9 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Aug 18 23:41:30 2016
-// Update Count     : 3
+// Last Modified On : Fri Jul 21 22:18:07 2017
+// Update Count     : 4
 //
 
-#ifndef COMPILER_ERROR_H
-#define COMPILER_ERROR_H
+#pragma once
 
 #include <string>
@@ -31,6 +30,4 @@
 };
 
-#endif // COMPILER_ERROR_H
-
 // Local Variables: //
 // tab-width: 4 //
Index: src/Common/ScopedMap.h
===================================================================
--- src/Common/ScopedMap.h	(revision a1edafa4cdaef39b89d777ace0514d4622c8c81b)
+++ src/Common/ScopedMap.h	(revision 6b0b624129f6017f7706b516a24a52e382e3a334)
@@ -9,11 +9,10 @@
 // Author           : Aaron B. Moss
 // Created On       : Wed Dec 2 11:37:00 2015
-// Last Modified By : Aaron B. Moss
-// Last Modified On : Wed Dec 2 11:37:00 2015
-// Update Count     : 1
-//
-
-#ifndef _SCOPEDMAP_H
-#define _SCOPEDMAP_H
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Fri Jul 21 22:18:24 2017
+// Update Count     : 2
+//
+
+#pragma once
 
 #include <cassert>
@@ -305,6 +304,4 @@
 };
 
-#endif // _SCOPEDMAP_H
-
 // Local Variables: //
 // tab-width: 4 //
Index: src/Common/SemanticError.h
===================================================================
--- src/Common/SemanticError.h	(revision a1edafa4cdaef39b89d777ace0514d4622c8c81b)
+++ src/Common/SemanticError.h	(revision 6b0b624129f6017f7706b516a24a52e382e3a334)
@@ -10,10 +10,9 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Sep 24 15:13:42 2016
-// Update Count     : 5
+// Last Modified On : Fri Jul 21 22:18:59 2017
+// Update Count     : 6
 //
 
-#ifndef SEMANTICERROR_H
-#define SEMANTICERROR_H
+#pragma once
 
 #include <exception>  // for exception
@@ -62,6 +61,4 @@
 }
 
-#endif // SEMANTICERROR_H
-
 // Local Variables: //
 // tab-width: 4 //
Index: src/Common/UnimplementedError.h
===================================================================
--- src/Common/UnimplementedError.h	(revision a1edafa4cdaef39b89d777ace0514d4622c8c81b)
+++ src/Common/UnimplementedError.h	(revision 6b0b624129f6017f7706b516a24a52e382e3a334)
@@ -10,10 +10,9 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue May 19 07:23:08 2015
-// Update Count     : 1
+// Last Modified On : Fri Jul 21 22:18:35 2017
+// Update Count     : 2
 //
 
-#ifndef _UNIMPLEMENTEDERROR_H
-#define _UNIMPLEMENTEDERROR_H
+#pragma once
 
 #include <string>
@@ -31,6 +30,4 @@
 };
 
-#endif // _UNIMPLEMENTEDERROR_H
-
 // Local Variables: //
 // tab-width: 4 //
Index: src/Common/UniqueName.h
===================================================================
--- src/Common/UniqueName.h	(revision a1edafa4cdaef39b89d777ace0514d4622c8c81b)
+++ src/Common/UniqueName.h	(revision 6b0b624129f6017f7706b516a24a52e382e3a334)
@@ -10,10 +10,9 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue May 19 07:24:20 2015
-// Update Count     : 1
+// Last Modified On : Fri Jul 21 22:18:45 2017
+// Update Count     : 2
 //
 
-#ifndef UNIQUENAME_H
-#define UNIQUENAME_H
+#pragma once
 
 #include <string>
@@ -28,6 +27,4 @@
 };
 
-#endif // UNIQUENAME_H
-
 // Local Variables: //
 // tab-width: 4 //
Index: src/Common/VectorMap.h
===================================================================
--- src/Common/VectorMap.h	(revision a1edafa4cdaef39b89d777ace0514d4622c8c81b)
+++ src/Common/VectorMap.h	(revision 6b0b624129f6017f7706b516a24a52e382e3a334)
@@ -9,11 +9,10 @@
 // Author           : Aaron B. Moss
 // Created On       : Wed Feb  1 16:55:00 2017
-// Last Modified By : Aaron B. Moss
-// Last Modified On : Wed Feb  1 16:55:00 2017
-// Update Count     : 1
-//
-
-#ifndef _VECTORMAP_H
-#define _VECTORMAP_H
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Fri Jul 21 22:19:29 2017
+// Update Count     : 2
+//
+
+#pragma once
 
 #include <iterator>
@@ -245,6 +244,4 @@
 }
 
-#endif // _VECTORMAP_H
-
 // Local Variables: //
 // tab-width: 4 //
Index: src/Common/utility.h
===================================================================
--- src/Common/utility.h	(revision a1edafa4cdaef39b89d777ace0514d4622c8c81b)
+++ src/Common/utility.h	(revision 6b0b624129f6017f7706b516a24a52e382e3a334)
@@ -9,11 +9,10 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Andrew Beach
-// Last Modified On : Fri May 5 11:03:00 2017
-// Update Count     : 32
-//
-
-#ifndef _UTILITY_H
-#define _UTILITY_H
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Fri Jul 21 22:19:13 2017
+// Update Count     : 33
+//
+
+#pragma once
 
 #include <cctype>
@@ -376,6 +375,4 @@
 }
 
-#endif // _UTILITY_H
-
 // Local Variables: //
 // tab-width: 4 //
Index: src/Concurrency/Keywords.cc
===================================================================
--- src/Concurrency/Keywords.cc	(revision a1edafa4cdaef39b89d777ace0514d4622c8c81b)
+++ src/Concurrency/Keywords.cc	(revision 6b0b624129f6017f7706b516a24a52e382e3a334)
@@ -1,3 +1,2 @@
-//                              -*- Mode: CPP -*-
 //
 // Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo
@@ -12,5 +11,5 @@
 // Last Modified By :
 // Last Modified On :
-// Update Count     : 3
+// Update Count     : 5
 //
 
@@ -549,2 +548,7 @@
 	}
 };
+
+// Local Variables: //
+// mode: c //
+// tab-width: 4 //
+// End: //
Index: src/Concurrency/Keywords.h
===================================================================
--- src/Concurrency/Keywords.h	(revision a1edafa4cdaef39b89d777ace0514d4622c8c81b)
+++ src/Concurrency/Keywords.h	(revision 6b0b624129f6017f7706b516a24a52e382e3a334)
@@ -1,3 +1,2 @@
-//                              -*- Mode: CPP -*-
 //
 // Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo
@@ -12,9 +11,8 @@
 // Last Modified By :
 // Last Modified On :
-// Update Count     : 0
+// Update Count     : 1
 //
 
-#ifndef KEYWORDS_H
-#define KEYWORDS_H
+#pragma once
 
 #include <list>  // for list
@@ -28,3 +26,7 @@
 };
 
-#endif //KEYWORDS_H
+// Local Variables: //
+// tab-width: 4 //
+// mode: c++ //
+// compile-command: "make install" //
+// End: //
Index: src/ControlStruct/ExceptTranslate.h
===================================================================
--- src/ControlStruct/ExceptTranslate.h	(revision a1edafa4cdaef39b89d777ace0514d4622c8c81b)
+++ src/ControlStruct/ExceptTranslate.h	(revision 6b0b624129f6017f7706b516a24a52e382e3a334)
@@ -9,11 +9,10 @@
 // Author           : Andrew Beach
 // Created On       : Tus Jun 06 10:13:00 2017
-// Last Modified By : Andrew Beach
-// Last Modified On : Fri Jun 30 10:20:00 2017
-// Update Count     : 2
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Sat Jul 22 09:19:23 2017
+// Update Count     : 4
 //
 
-#ifndef EXCEPT_TRANSLATE_H
-#define EXCEPT_TRANSLATE_H
+#pragma once
 
 #include <list>
@@ -22,9 +21,11 @@
 namespace ControlStruct {
 	void translateEHM( std::list< Declaration *> & translationUnit );
-	/* Converts exception handling structures into their underlying C code.
-	 * Translation does use the exception handling header, make sure it is
-	 * visible wherever translation occurs.
-	 */
+	// Converts exception handling structures into their underlying C code.  Translation does use the exception
+	// handling header, make sure it is visible wherever translation occurs.
 }
 
-#endif // EXCEPT_TRANSLATE_H
+// Local Variables: //
+// tab-width: 4 //
+// mode: c++ //
+// compile-command: "make install" //
+// End: //
Index: src/ControlStruct/ForExprMutator.h
===================================================================
--- src/ControlStruct/ForExprMutator.h	(revision a1edafa4cdaef39b89d777ace0514d4622c8c81b)
+++ src/ControlStruct/ForExprMutator.h	(revision 6b0b624129f6017f7706b516a24a52e382e3a334)
@@ -10,10 +10,9 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Jan 25 21:22:13 2016
-// Update Count     : 3
+// Last Modified On : Sat Jul 22 09:17:08 2017
+// Update Count     : 4
 //
 
-#ifndef FOR_MUTATOR_H
-#define FOR_MUTATOR_H
+#pragma once
 
 #include "SynTree/Mutator.h"
@@ -27,6 +26,4 @@
 } // namespace ControlStruct
 
-#endif // CHOOSE_MUTATOR_H
-
 // Local Variables: //
 // tab-width: 4 //
Index: src/ControlStruct/LabelFixer.h
===================================================================
--- src/ControlStruct/LabelFixer.h	(revision a1edafa4cdaef39b89d777ace0514d4622c8c81b)
+++ src/ControlStruct/LabelFixer.h	(revision 6b0b624129f6017f7706b516a24a52e382e3a334)
@@ -10,10 +10,9 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Jul 12 17:36:16 2016
-// Update Count     : 33
+// Last Modified On : Sat Jul 22 09:17:24 2017
+// Update Count     : 34
 //
 
-#ifndef LABEL_FIXER_H
-#define LABEL_FIXER_H
+#pragma once
 
 #include "Common/utility.h"
@@ -83,6 +82,4 @@
 } // namespace ControlStruct
 
-#endif // LABEL_FIXER_H
-
 // Local Variables: //
 // tab-width: 4 //
Index: src/ControlStruct/LabelGenerator.h
===================================================================
--- src/ControlStruct/LabelGenerator.h	(revision a1edafa4cdaef39b89d777ace0514d4622c8c81b)
+++ src/ControlStruct/LabelGenerator.h	(revision 6b0b624129f6017f7706b516a24a52e382e3a334)
@@ -9,11 +9,10 @@
 // Author           : Rodolfo G. Esteves
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Rob Schluntz
-// Last Modified On : Wed Jun 03 14:16:26 2015
-// Update Count     : 5
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Sat Jul 22 09:20:14 2017
+// Update Count     : 6
 //
 
-#ifndef LABEL_GENERATOR_H
-#define LABEL_GENERATOR_H
+#pragma once
 
 #include "SynTree/SynTree.h"
@@ -35,6 +34,4 @@
 } // namespace ControlStruct
 
-#endif // LABEL_GENERATOR_H
-
 // Local Variables: //
 // tab-width: 4 //
Index: src/ControlStruct/MLEMutator.h
===================================================================
--- src/ControlStruct/MLEMutator.h	(revision a1edafa4cdaef39b89d777ace0514d4622c8c81b)
+++ src/ControlStruct/MLEMutator.h	(revision 6b0b624129f6017f7706b516a24a52e382e3a334)
@@ -10,10 +10,9 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Jul 12 17:37:01 2016
-// Update Count     : 34
+// Last Modified On : Sat Jul 22 09:19:59 2017
+// Update Count     : 35
 //
 
-#ifndef MLE_MUTATOR_H
-#define MLE_MUTATOR_H
+#pragma once
 
 #include <map>
@@ -89,6 +88,4 @@
 } // namespace ControlStruct
 
-#endif // MLE_MUTATOR_H
-
 // Local Variables: //
 // tab-width: 4 //
Index: src/ControlStruct/Mutate.h
===================================================================
--- src/ControlStruct/Mutate.h	(revision a1edafa4cdaef39b89d777ace0514d4622c8c81b)
+++ src/ControlStruct/Mutate.h	(revision 6b0b624129f6017f7706b516a24a52e382e3a334)
@@ -10,10 +10,9 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue May 19 15:31:20 2015
-// Update Count     : 2
+// Last Modified On : Sat Jul 22 09:17:59 2017
+// Update Count     : 3
 //
 
-#ifndef CTRLS_MUTATE_H
-#define CTRLS_MUTATE_H
+#pragma once
 
 #include <list>
@@ -27,6 +26,4 @@
 } // namespace ControlStruct
 
-#endif // CTRLS_MUTATE_H
-
 // Local Variables: //
 // tab-width: 4 //
Index: src/GenPoly/Box.h
===================================================================
--- src/GenPoly/Box.h	(revision a1edafa4cdaef39b89d777ace0514d4622c8c81b)
+++ src/GenPoly/Box.h	(revision 6b0b624129f6017f7706b516a24a52e382e3a334)
@@ -10,10 +10,9 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Nov 19 17:24:01 2015
-// Update Count     : 5
+// Last Modified On : Sat Jul 22 09:23:52 2017
+// Update Count     : 6
 //
 
-#ifndef _BOX_H
-#define _BOX_H
+#pragma once
 
 #include <list>
@@ -25,6 +24,4 @@
 } // namespace GenPoly
 
-#endif // _BOX_H
-
 // Local Variables: //
 // tab-width: 4 //
Index: src/GenPoly/CopyParams.h
===================================================================
--- src/GenPoly/CopyParams.h	(revision a1edafa4cdaef39b89d777ace0514d4622c8c81b)
+++ src/GenPoly/CopyParams.h	(revision 6b0b624129f6017f7706b516a24a52e382e3a334)
@@ -10,10 +10,9 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue May 19 07:34:25 2015
-// Update Count     : 1
+// Last Modified On : Sat Jul 22 09:23:09 2017
+// Update Count     : 2
 //
 
-#ifndef _COPYPARAMS_H
-#define _COPYPARAMS_H
+#pragma once
 
 #include "SynTree/SynTree.h"
@@ -24,6 +23,4 @@
 } // namespace GenPoly
 
-#endif // _COPYPARAMS_H
-
 // Local Variables: //
 // tab-width: 4 //
Index: src/GenPoly/DeclMutator.h
===================================================================
--- src/GenPoly/DeclMutator.h	(revision a1edafa4cdaef39b89d777ace0514d4622c8c81b)
+++ src/GenPoly/DeclMutator.h	(revision 6b0b624129f6017f7706b516a24a52e382e3a334)
@@ -10,10 +10,9 @@
 // Created On       : Fri Nov 27 14:44:00 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Jul 12 17:39:01 2016
-// Update Count     : 2
+// Last Modified On : Sat Jul 22 09:21:12 2017
+// Update Count     : 4
 //
 
-#ifndef _DECLMUTATOR_H
-#define _DECLMUTATOR_H
+#pragma once
 
 #include <list>
@@ -27,5 +26,5 @@
 	/// Mutates a list of declarations, providing a means of adding new declarations into the list
 	class DeclMutator : public Mutator {
-	public:
+	  public:
 		typedef Mutator Parent;
 
@@ -50,5 +49,5 @@
 		/// Called on exit from a scope; overriders should call this as a super-class call
 		virtual void doEndScope();
-	protected:
+	  protected:
 		/// Mutate a statement that forms its own scope
 		Statement* mutateStatement( Statement *stmt );
@@ -59,5 +58,5 @@
 		/// Add a declaration to the list to be added after the current position
 		void addDeclarationAfter( Declaration* decl );
-	private:
+	  private:
 		/// A stack of declarations to add before the current declaration or statement
 		std::vector< std::list< Declaration* > > declsToAdd;
@@ -67,6 +66,4 @@
 } // namespace
 
-#endif // _DECLMUTATOR_H
-
 // Local Variables: //
 // tab-width: 4 //
Index: src/GenPoly/ErasableScopedMap.h
===================================================================
--- src/GenPoly/ErasableScopedMap.h	(revision a1edafa4cdaef39b89d777ace0514d4622c8c81b)
+++ src/GenPoly/ErasableScopedMap.h	(revision 6b0b624129f6017f7706b516a24a52e382e3a334)
@@ -9,11 +9,10 @@
 // Author           : Aaron B. Moss
 // Created On       : Wed Dec 2 11:37:00 2015
-// Last Modified By : Aaron B. Moss
-// Last Modified On : Wed Dec 2 11:37:00 2015
-// Update Count     : 1
-//
-
-#ifndef _ERASABLESCOPEDMAP_H
-#define _ERASABLESCOPEDMAP_H
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Sat Jul 22 09:23:24 2017
+// Update Count     : 2
+//
+
+#pragma once
 
 #include <cassert>
@@ -278,6 +277,4 @@
 } // namespace GenPoly
 
-#endif // _ERASABLESCOPEDMAP_H
-
 // Local Variables: //
 // tab-width: 4 //
Index: src/GenPoly/FindFunction.h
===================================================================
--- src/GenPoly/FindFunction.h	(revision a1edafa4cdaef39b89d777ace0514d4622c8c81b)
+++ src/GenPoly/FindFunction.h	(revision 6b0b624129f6017f7706b516a24a52e382e3a334)
@@ -10,10 +10,9 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue May 19 07:36:35 2015
-// Update Count     : 1
+// Last Modified On : Sat Jul 22 09:23:36 2017
+// Update Count     : 2
 //
 
-#ifndef FINDFUNCTION_H
-#define FINDFUNCTION_H
+#pragma once
 
 #include "SynTree/SynTree.h"
@@ -29,6 +28,4 @@
 } // namespace GenPoly
 
-#endif // FINDFUNCTION_H
-
 // Local Variables: //
 // tab-width: 4 //
Index: src/GenPoly/GenPoly.h
===================================================================
--- src/GenPoly/GenPoly.h	(revision a1edafa4cdaef39b89d777ace0514d4622c8c81b)
+++ src/GenPoly/GenPoly.h	(revision 6b0b624129f6017f7706b516a24a52e382e3a334)
@@ -9,11 +9,10 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Rob Schluntz
-// Last Modified On : Tue Nov 24 15:24:38 2015
-// Update Count     : 6
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Sat Jul 22 09:22:57 2017
+// Update Count     : 7
 //
 
-#ifndef GENPOLY_H
-#define GENPOLY_H
+#pragma once
 
 #include <string>
@@ -111,6 +110,4 @@
 } // namespace GenPoly
 
-#endif // GENPOLY_H
-
 // Local Variables: //
 // tab-width: 4 //
Index: src/GenPoly/InstantiateGeneric.h
===================================================================
--- src/GenPoly/InstantiateGeneric.h	(revision a1edafa4cdaef39b89d777ace0514d4622c8c81b)
+++ src/GenPoly/InstantiateGeneric.h	(revision 6b0b624129f6017f7706b516a24a52e382e3a334)
@@ -9,11 +9,10 @@
 // Author           : Aaron B. Moss
 // Created On       : Thu Aug 04 18:33:00 2016
-// Last Modified By : Aaron B. Moss
-// Last Modified On : Thu Aug 04 18:33:00 2016
-// Update Count     : 1
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Sat Jul 22 09:22:42 2017
+// Update Count     : 2
 //
 
-#ifndef _INSTANTIATEGENERIC_H
-#define _INSTANTIATEGENERIC_H
+#pragma once
 
 #include "SynTree/SynTree.h"
@@ -26,6 +25,4 @@
 } // namespace GenPoly
 
-#endif // _INSTANTIATEGENERIC_H
-
 // Local Variables: //
 // tab-width: 4 //
Index: src/GenPoly/Lvalue.h
===================================================================
--- src/GenPoly/Lvalue.h	(revision a1edafa4cdaef39b89d777ace0514d4622c8c81b)
+++ src/GenPoly/Lvalue.h	(revision 6b0b624129f6017f7706b516a24a52e382e3a334)
@@ -10,10 +10,9 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue May 19 07:42:09 2015
-// Update Count     : 1
+// Last Modified On : Sat Jul 22 09:21:59 2017
+// Update Count     : 2
 //
 
-#ifndef _LVALUE_H
-#define _LVALUE_H
+#pragma once
 
 #include <list>
@@ -26,6 +25,4 @@
 } // namespace GenPoly
 
-#endif // _LVALUE_H
-
 // Local Variables: //
 // tab-width: 4 //
Index: src/GenPoly/PolyMutator.h
===================================================================
--- src/GenPoly/PolyMutator.h	(revision a1edafa4cdaef39b89d777ace0514d4622c8c81b)
+++ src/GenPoly/PolyMutator.h	(revision 6b0b624129f6017f7706b516a24a52e382e3a334)
@@ -10,10 +10,9 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Jul 12 17:39:41 2016
-// Update Count     : 6
+// Last Modified On : Sat Jul 22 09:20:31 2017
+// Update Count     : 7
 //
 
-#ifndef _POLYMUTATOR_H
-#define _POLYMUTATOR_H
+#pragma once
 
 #include <map>
@@ -66,6 +65,4 @@
 } // namespace
 
-#endif // _POLYMUTATOR_H
-
 // Local Variables: //
 // tab-width: 4 //
Index: src/GenPoly/ScopedSet.h
===================================================================
--- src/GenPoly/ScopedSet.h	(revision a1edafa4cdaef39b89d777ace0514d4622c8c81b)
+++ src/GenPoly/ScopedSet.h	(revision 6b0b624129f6017f7706b516a24a52e382e3a334)
@@ -9,11 +9,10 @@
 // Author           : Aaron B. Moss
 // Created On       : Thu Dec 3 11:51:00 2015
-// Last Modified By : Aaron B. Moss
-// Last Modified On : Thu Dec 3 11:51:00 2015
-// Update Count     : 1
-//
-
-#ifndef _SCOPEDSET_H
-#define _SCOPEDSET_H
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Sat Jul 22 09:22:17 2017
+// Update Count     : 2
+//
+
+#pragma once
 
 #include <iterator>
@@ -247,6 +246,4 @@
 } // namespace GenPoly
 
-#endif // _SCOPEDSET_H
-
 // Local Variables: //
 // tab-width: 4 //
Index: src/GenPoly/ScrubTyVars.h
===================================================================
--- src/GenPoly/ScrubTyVars.h	(revision a1edafa4cdaef39b89d777ace0514d4622c8c81b)
+++ src/GenPoly/ScrubTyVars.h	(revision 6b0b624129f6017f7706b516a24a52e382e3a334)
@@ -10,10 +10,9 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue May 19 07:48:14 2015
-// Update Count     : 1
+// Last Modified On : Sat Jul 22 09:21:47 2017
+// Update Count     : 2
 //
 
-#ifndef _SCRUBTYVARS_H
-#define _SCRUBTYVARS_H
+#pragma once
 
 #include <string>
@@ -95,6 +94,4 @@
 } // namespace GenPoly
 
-#endif // _SCRUBTYVARS_H
-
 // Local Variables: //
 // tab-width: 4 //
Index: src/GenPoly/Specialize.h
===================================================================
--- src/GenPoly/Specialize.h	(revision a1edafa4cdaef39b89d777ace0514d4622c8c81b)
+++ src/GenPoly/Specialize.h	(revision 6b0b624129f6017f7706b516a24a52e382e3a334)
@@ -10,10 +10,9 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue May 19 07:53:58 2015
-// Update Count     : 1
+// Last Modified On : Sat Jul 22 09:22:31 2017
+// Update Count     : 2
 //
 
-#ifndef _SPECIALIZE_H
-#define _SPECIALIZE_H
+#pragma once
 
 #include <list>
@@ -26,6 +25,4 @@
 } // namespace GenPoly
 
-#endif // _SPECIALIZE_H
-
 // Local Variables: //
 // tab-width: 4 //
Index: src/InitTweak/FixGlobalInit.h
===================================================================
--- src/InitTweak/FixGlobalInit.h	(revision a1edafa4cdaef39b89d777ace0514d4622c8c81b)
+++ src/InitTweak/FixGlobalInit.h	(revision 6b0b624129f6017f7706b516a24a52e382e3a334)
@@ -9,11 +9,10 @@
 // Author           : Rob Schluntz
 // Created On       : Mon May 04 15:14:56 2016
-// Last Modified By : Rob Schluntz
-// Last Modified On : Fri May 06 16:07:47 2016
-// Update Count     : 2
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Sat Jul 22 09:30:54 2017
+// Update Count     : 3
 //
 
-#ifndef FIX_GLOBAL_INIT_H
-#define FIX_GLOBAL_INIT_H
+#pragma once
 
 #include <string>
@@ -34,6 +33,4 @@
 } // namespace
 
-#endif // GENPOLY_POLYMUTATOR_H
-
 // Local Variables: //
 // tab-width: 4 //
Index: src/InitTweak/FixInit.h
===================================================================
--- src/InitTweak/FixInit.h	(revision a1edafa4cdaef39b89d777ace0514d4622c8c81b)
+++ src/InitTweak/FixInit.h	(revision 6b0b624129f6017f7706b516a24a52e382e3a334)
@@ -9,11 +9,10 @@
 // Author           : Rob Schluntz
 // Created On       : Wed Jan 13 16:29:30 2016
-// Last Modified By : Rob Schluntz
-// Last Modified On : Fri May 13 11:27:52 2016
-// Update Count     : 5
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Sat Jul 22 09:31:06 2017
+// Update Count     : 6
 //
 
-#ifndef FIX_INIT_H
-#define FIX_INIT_H
+#pragma once
 
 #include <string>
@@ -30,6 +29,4 @@
 } // namespace
 
-#endif // GENPOLY_POLYMUTATOR_H
-
 // Local Variables: //
 // tab-width: 4 //
Index: src/InitTweak/GenInit.h
===================================================================
--- src/InitTweak/GenInit.h	(revision a1edafa4cdaef39b89d777ace0514d4622c8c81b)
+++ src/InitTweak/GenInit.h	(revision 6b0b624129f6017f7706b516a24a52e382e3a334)
@@ -9,11 +9,10 @@
 // Author           : Rodolfo G. Esteves
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Rob Schluntz
-// Last Modified On : Fri May 13 11:27:19 2016
-// Update Count     : 3
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Sat Jul 22 09:31:19 2017
+// Update Count     : 4
 //
 
-#ifndef GEN_INIT_H
-#define GEN_INIT_H
+#pragma once
 
 #include <string>
@@ -35,6 +34,4 @@
 } // namespace
 
-#endif // INITTWEAK_GENINIT_H
-
 // Local Variables: //
 // tab-width: 4 //
Index: src/InitTweak/InitTweak.h
===================================================================
--- src/InitTweak/InitTweak.h	(revision a1edafa4cdaef39b89d777ace0514d4622c8c81b)
+++ src/InitTweak/InitTweak.h	(revision 6b0b624129f6017f7706b516a24a52e382e3a334)
@@ -9,11 +9,10 @@
 // Author           : Rob Schluntz
 // Created On       : Fri May 13 11:26:36 2016
-// Last Modified By : Rob Schluntz
-// Last Modified On : Fri May 13 11:35:36 2016
-// Update Count     : 3
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Sat Jul 22 09:30:33 2017
+// Update Count     : 4
 //
 
-#ifndef INIT_TWEAK_H
-#define INIT_TWEAK_H
+#pragma once
 
 #include <string>
@@ -116,6 +115,4 @@
 } // namespace
 
-#endif // INITTWEAK_GENINIT_H
-
 // Local Variables: //
 // tab-width: 4 //
Index: src/MakeLibCfa.h
===================================================================
--- src/MakeLibCfa.h	(revision a1edafa4cdaef39b89d777ace0514d4622c8c81b)
+++ src/MakeLibCfa.h	(revision 6b0b624129f6017f7706b516a24a52e382e3a334)
@@ -10,10 +10,9 @@
 // Created On       : Sat May 16 10:42:14 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat May 16 10:43:29 2015
-// Update Count     : 1
+// Last Modified On : Sat Jul 22 09:31:35 2017
+// Update Count     : 2
 //
 
-#ifndef LIBCFA_MAKELIBCFA_H
-#define LIBCFA_MAKELIBCFA_H
+#pragma once
 
 #include <list>  // for list
@@ -25,6 +24,4 @@
 } // namespace LibCfa
 
-#endif // LIBCFA_MAKELIBCFA_H
-
 // Local Variables: //
 // tab-width: 4 //
Index: src/Parser/LinkageSpec.h
===================================================================
--- src/Parser/LinkageSpec.h	(revision a1edafa4cdaef39b89d777ace0514d4622c8c81b)
+++ src/Parser/LinkageSpec.h	(revision 6b0b624129f6017f7706b516a24a52e382e3a334)
@@ -9,11 +9,10 @@
 // Author           : Rodolfo G. Esteves
 // Created On       : Sat May 16 13:24:28 2015
-// Last Modified By : Andrew Beach
-// Last Modified On : Fri Jul  7 11:03:00 2017
-// Update Count     : 13
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Sat Jul 22 09:32:16 2017
+// Update Count     : 14
 //
 
-#ifndef LINKAGESPEC_H
-#define LINKAGESPEC_H
+#pragma once
 
 #include <string>
@@ -78,6 +77,4 @@
 };
 
-#endif // LINKAGESPEC_H
-
 // Local Variables: //
 // tab-width: 4 //
Index: src/Parser/ParseNode.h
===================================================================
--- src/Parser/ParseNode.h	(revision a1edafa4cdaef39b89d777ace0514d4622c8c81b)
+++ src/Parser/ParseNode.h	(revision 6b0b624129f6017f7706b516a24a52e382e3a334)
@@ -10,10 +10,9 @@
 // Created On       : Sat May 16 13:28:16 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Jul 15 16:00:48 2017
-// Update Count     : 785
+// Last Modified On : Sat Jul 22 09:32:30 2017
+// Update Count     : 786
 //
 
-#ifndef PARSENODE_H
-#define PARSENODE_H
+#pragma once
 
 #include <string>
@@ -450,6 +449,4 @@
 std::ostream & operator<<( std::ostream & out, const ParseNode * node );
 
-#endif // PARSENODE_H
-
 // Local Variables: //
 // tab-width: 4 //
Index: src/Parser/ParserTypes.h
===================================================================
--- src/Parser/ParserTypes.h	(revision a1edafa4cdaef39b89d777ace0514d4622c8c81b)
+++ src/Parser/ParserTypes.h	(revision 6b0b624129f6017f7706b516a24a52e382e3a334)
@@ -10,10 +10,9 @@
 // Created On       : Sat Sep 22 08:58:10 2001
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Jun 28 22:10:17 2017
-// Update Count     : 349
+// Last Modified On : Sat Jul 22 09:33:28 2017
+// Update Count     : 350
 //
 
-#ifndef PARSER_HH
-#define PARSER_HH
+#pragma once
 
 int yylex();
@@ -42,6 +41,4 @@
 }; // Token
 
-#endif // PARSER_HH
-
 // Local Variables: //
 // tab-width: 4 //
Index: src/Parser/TypeData.h
===================================================================
--- src/Parser/TypeData.h	(revision a1edafa4cdaef39b89d777ace0514d4622c8c81b)
+++ src/Parser/TypeData.h	(revision 6b0b624129f6017f7706b516a24a52e382e3a334)
@@ -9,11 +9,10 @@
 // Author           : Rodolfo G. Esteves
 // Created On       : Sat May 16 15:18:36 2015
-// Last Modified By : Andrew Beach
-// Last Modified On : Fri Jul 14 16:57:00 2017
-// Update Count     : 187
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Sat Jul 22 09:32:47 2017
+// Update Count     : 188
 //
 
-#ifndef TYPEDATA_H
-#define TYPEDATA_H
+#pragma once
 
 #include "ParseNode.h"
@@ -116,6 +115,4 @@
 void buildKRFunction( const TypeData::Function_t & function );
 
-#endif // TYPEDATA_H
-
 // Local Variables: //
 // tab-width: 4 //
Index: src/Parser/TypedefTable.h
===================================================================
--- src/Parser/TypedefTable.h	(revision a1edafa4cdaef39b89d777ace0514d4622c8c81b)
+++ src/Parser/TypedefTable.h	(revision 6b0b624129f6017f7706b516a24a52e382e3a334)
@@ -10,10 +10,9 @@
 // Created On       : Sat May 16 15:24:36 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Jun 28 21:56:34 2017
-// Update Count     : 33
+// Last Modified On : Sat Jul 22 09:33:14 2017
+// Update Count     : 34
 //
 
-#ifndef TYPEDEFTABLE_H
-#define TYPEDEFTABLE_H
+#pragma once
 
 #include <map>
@@ -91,6 +90,4 @@
 };
 
-#endif // TYPEDEFTABLE_H
-
 // Local Variables: //
 // tab-width: 4 //
Index: src/Parser/parserutility.h
===================================================================
--- src/Parser/parserutility.h	(revision a1edafa4cdaef39b89d777ace0514d4622c8c81b)
+++ src/Parser/parserutility.h	(revision 6b0b624129f6017f7706b516a24a52e382e3a334)
@@ -10,16 +10,13 @@
 // Created On       : Sat May 16 15:31:46 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Jun 28 22:11:40 2017
-// Update Count     : 3
+// Last Modified On : Sat Jul 22 09:32:58 2017
+// Update Count     : 4
 //
 
-#ifndef PARSEUTILITY_H
-#define PARSEUTILITY_H
+#pragma once
 
 #include "SynTree/SynTree.h"
 
 Expression *notZeroExpr( Expression *orig );
-
-#endif // PARSEUTILITY_H
 
 // Local Variables: //
Index: src/ResolvExpr/Alternative.h
===================================================================
--- src/ResolvExpr/Alternative.h	(revision a1edafa4cdaef39b89d777ace0514d4622c8c81b)
+++ src/ResolvExpr/Alternative.h	(revision 6b0b624129f6017f7706b516a24a52e382e3a334)
@@ -10,10 +10,9 @@
 // Created On       : Sat May 16 23:45:43 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat May 16 23:54:39 2015
-// Update Count     : 2
+// Last Modified On : Sat Jul 22 09:36:36 2017
+// Update Count     : 3
 //
 
-#ifndef ALTERNATIVE_H
-#define ALTERNATIVE_H
+#pragma once
 
 #include <list>
@@ -47,6 +46,4 @@
 } // namespace ResolvExpr
 
-#endif // ALTERNATIVE_H
-
 // Local Variables: //
 // tab-width: 4 //
Index: src/ResolvExpr/AlternativeFinder.h
===================================================================
--- src/ResolvExpr/AlternativeFinder.h	(revision a1edafa4cdaef39b89d777ace0514d4622c8c81b)
+++ src/ResolvExpr/AlternativeFinder.h	(revision 6b0b624129f6017f7706b516a24a52e382e3a334)
@@ -9,11 +9,10 @@
 // Author           : Richard C. Bilson
 // Created On       : Sat May 16 23:56:12 2015
-// Last Modified By : Rob Schluntz
-// Last Modified On : Tue Apr 19 11:44:53 2016
-// Update Count     : 2
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Sat Jul 22 09:35:32 2017
+// Update Count     : 3
 //
 
-#ifndef ALTERNATIVEFINDER_H
-#define ALTERNATIVEFINDER_H
+#pragma once
 
 #include <set>
@@ -132,6 +131,4 @@
 } // namespace ResolvExpr
 
-#endif // ALTERNATIVEFINDER_H
-
 // Local Variables: //
 // tab-width: 4 //
Index: src/ResolvExpr/AlternativePrinter.h
===================================================================
--- src/ResolvExpr/AlternativePrinter.h	(revision a1edafa4cdaef39b89d777ace0514d4622c8c81b)
+++ src/ResolvExpr/AlternativePrinter.h	(revision 6b0b624129f6017f7706b516a24a52e382e3a334)
@@ -10,10 +10,9 @@
 // Created On       : Sun May 17 06:55:43 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun May 17 06:57:12 2015
-// Update Count     : 3
+// Last Modified On : Sat Jul 22 09:37:09 2017
+// Update Count     : 4
 //
 
-#ifndef ALTERNATIVEPRINTER_H
-#define ALTERNATIVEPRINTER_H
+#pragma once
 
 #include <iostream>
@@ -34,6 +33,4 @@
 } // namespace ResolvExpr
 
-#endif // ALTERNATIVEPRINTER_H
-
 // Local Variables: //
 // tab-width: 4 //
Index: src/ResolvExpr/ConversionCost.h
===================================================================
--- src/ResolvExpr/ConversionCost.h	(revision a1edafa4cdaef39b89d777ace0514d4622c8c81b)
+++ src/ResolvExpr/ConversionCost.h	(revision 6b0b624129f6017f7706b516a24a52e382e3a334)
@@ -10,10 +10,9 @@
 // Created On       : Sun May 17 09:37:28 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Mar  2 17:35:56 2016
-// Update Count     : 3
+// Last Modified On : Sat Jul 22 09:38:24 2017
+// Update Count     : 4
 //
 
-#ifndef CONVERSIONCOST_H
-#define CONVERSIONCOST_H
+#pragma once
 
 #include "SynTree/Visitor.h"
@@ -51,6 +50,4 @@
 } // namespace ResolvExpr
 
-#endif // CONVERSIONCOST_H */
-
 // Local Variables: //
 // tab-width: 4 //
Index: src/ResolvExpr/Cost.h
===================================================================
--- src/ResolvExpr/Cost.h	(revision a1edafa4cdaef39b89d777ace0514d4622c8c81b)
+++ src/ResolvExpr/Cost.h	(revision 6b0b624129f6017f7706b516a24a52e382e3a334)
@@ -9,11 +9,10 @@
 // Author           : Richard C. Bilson
 // Created On       : Sun May 17 09:39:50 2015
-// Last Modified By : Rob Schluntz
-// Last Modified On : Wed Jul 22 16:43:10 2015
-// Update Count     : 4
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Sat Jul 22 09:35:55 2017
+// Update Count     : 5
 //
 
-#ifndef COST_H
-#define COST_H
+#pragma once
 
 #include <iostream>
@@ -114,6 +113,4 @@
 } // namespace ResolvExpr
 
-#endif // COST_H
-
 // Local Variables: //
 // tab-width: 4 //
Index: src/ResolvExpr/CurrentObject.h
===================================================================
--- src/ResolvExpr/CurrentObject.h	(revision a1edafa4cdaef39b89d777ace0514d4622c8c81b)
+++ src/ResolvExpr/CurrentObject.h	(revision 6b0b624129f6017f7706b516a24a52e382e3a334)
@@ -9,11 +9,10 @@
 // Author           : Rob Schluntz
 // Created On       : Thu Jun  8 11:07:25 2017
-// Last Modified By : Rob Schluntz
-// Last Modified On : Thu Jun  8 11:07:41 2017
-// Update Count     : 2
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Sat Jul 22 09:36:48 2017
+// Update Count     : 3
 //
 
-#ifndef CURRENT_OBJECT_H
-#define CURRENT_OBJECT_H
+#pragma once
 
 #include <stack>
@@ -50,6 +49,4 @@
 } // namespace ResolvExpr
 
-#endif // CURRENT_OBJECT_H
-
 // Local Variables: //
 // tab-width: 4 //
Index: src/ResolvExpr/FindOpenVars.h
===================================================================
--- src/ResolvExpr/FindOpenVars.h	(revision a1edafa4cdaef39b89d777ace0514d4622c8c81b)
+++ src/ResolvExpr/FindOpenVars.h	(revision 6b0b624129f6017f7706b516a24a52e382e3a334)
@@ -10,10 +10,9 @@
 // Created On       : Sun May 17 09:46:04 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun May 17 09:47:20 2015
-// Update Count     : 2
+// Last Modified On : Sat Jul 22 09:35:18 2017
+// Update Count     : 3
 //
 
-#ifndef FINDOPENVARS_H
-#define FINDOPENVARS_H
+#pragma once
 
 #include "Unify.h"
@@ -25,6 +24,4 @@
 } // namespace ResolvExpr
 
-#endif // FINDOPENVARS_H
-
 // Local Variables: //
 // tab-width: 4 //
Index: src/ResolvExpr/RenameVars.h
===================================================================
--- src/ResolvExpr/RenameVars.h	(revision a1edafa4cdaef39b89d777ace0514d4622c8c81b)
+++ src/ResolvExpr/RenameVars.h	(revision 6b0b624129f6017f7706b516a24a52e382e3a334)
@@ -10,10 +10,9 @@
 // Created On       : Sun May 17 12:10:28 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Mar  2 17:36:39 2016
-// Update Count     : 3
+// Last Modified On : Sat Jul 22 09:33:54 2017
+// Update Count     : 4
 //
 
-#ifndef RESOLVEXPR_RENAMEVARS_H
-#define RESOLVEXPR_RENAMEVARS_H
+#pragma once
 
 #include <list>
@@ -56,6 +55,4 @@
 } // namespace ResolvExpr
 
-#endif // RENAMEVARS_H
-
 // Local Variables: //
 // tab-width: 4 //
Index: src/ResolvExpr/ResolveTypeof.h
===================================================================
--- src/ResolvExpr/ResolveTypeof.h	(revision a1edafa4cdaef39b89d777ace0514d4622c8c81b)
+++ src/ResolvExpr/ResolveTypeof.h	(revision 6b0b624129f6017f7706b516a24a52e382e3a334)
@@ -10,10 +10,9 @@
 // Created On       : Sun May 17 12:14:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun May 17 12:16:29 2015
-// Update Count     : 2
+// Last Modified On : Sat Jul 22 09:38:35 2017
+// Update Count     : 3
 //
 
-#ifndef RESOLVETYPEOF_H
-#define RESOLVETYPEOF_H
+#pragma once
 
 #include "SynTree/SynTree.h"
@@ -24,6 +23,4 @@
 } // namespace ResolvExpr
 
-#endif // RESOLVETYPEOF_H
-
 // Local Variables: //
 // tab-width: 4 //
Index: src/ResolvExpr/Resolver.h
===================================================================
--- src/ResolvExpr/Resolver.h	(revision a1edafa4cdaef39b89d777ace0514d4622c8c81b)
+++ src/ResolvExpr/Resolver.h	(revision 6b0b624129f6017f7706b516a24a52e382e3a334)
@@ -9,11 +9,10 @@
 // Author           : Richard C. Bilson
 // Created On       : Sun May 17 12:18:34 2015
-// Last Modified By : Rob Schluntz
-// Last Modified On : Thu Apr 14 15:06:53 2016
-// Update Count     : 2
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Sat Jul 22 09:36:57 2017
+// Update Count     : 3
 //
 
-#ifndef RESOLVER_H
-#define RESOLVER_H
+#pragma once
 
 #include "SynTree/SynTree.h"
@@ -29,6 +28,4 @@
 } // namespace ResolvExpr
 
-#endif // RESOLVER_H
-
 // Local Variables: //
 // tab-width: 4 //
Index: src/ResolvExpr/TypeEnvironment.h
===================================================================
--- src/ResolvExpr/TypeEnvironment.h	(revision a1edafa4cdaef39b89d777ace0514d4622c8c81b)
+++ src/ResolvExpr/TypeEnvironment.h	(revision 6b0b624129f6017f7706b516a24a52e382e3a334)
@@ -10,10 +10,9 @@
 // Created On       : Sun May 17 12:24:58 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun May 17 12:26:52 2015
-// Update Count     : 2
+// Last Modified On : Sat Jul 22 09:35:45 2017
+// Update Count     : 3
 //
 
-#ifndef TYPEENVIRONMENT_H
-#define TYPEENVIRONMENT_H
+#pragma once
 
 #include <string>
@@ -99,6 +98,4 @@
 } // namespace ResolvExpr
 
-#endif // TYPEENVIRONMENT_H */
-
 // Local Variables: //
 // tab-width: 4 //
Index: src/ResolvExpr/TypeMap.h
===================================================================
--- src/ResolvExpr/TypeMap.h	(revision a1edafa4cdaef39b89d777ace0514d4622c8c81b)
+++ src/ResolvExpr/TypeMap.h	(revision 6b0b624129f6017f7706b516a24a52e382e3a334)
@@ -9,11 +9,10 @@
 // Author           : Aaron B. Moss
 // Created On       : Fri Feb 19 13:55:00 2016
-// Last Modified By : Aaron B. Moss
-// Last Modified On : Fri Feb 19 13:55:00 2016
-// Update Count     : 1
-//
-
-#ifndef _TYPEMAP_H
-#define _TYPEMAP_H
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Sat Jul 22 09:37:19 2017
+// Update Count     : 2
+//
+
+#pragma once
 
 #include <map>
@@ -204,6 +203,4 @@
 }  // namespace ResolvExpr
 
-#endif // _TYPEMAP_H
-
 // Local Variables: //
 // tab-width: 4 //
Index: src/ResolvExpr/Unify.h
===================================================================
--- src/ResolvExpr/Unify.h	(revision a1edafa4cdaef39b89d777ace0514d4622c8c81b)
+++ src/ResolvExpr/Unify.h	(revision 6b0b624129f6017f7706b516a24a52e382e3a334)
@@ -10,10 +10,9 @@
 // Created On       : Sun May 17 13:09:04 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun May 17 13:10:34 2015
-// Update Count     : 2
+// Last Modified On : Fri Jul 21 23:09:34 2017
+// Update Count     : 3
 //
 
-#ifndef UNIFY_H
-#define UNIFY_H
+#pragma once
 
 #include <map>
@@ -72,6 +71,4 @@
 } // namespace ResolvExpr
 
-#endif // UNIFY_H
-
 // Local Variables: //
 // tab-width: 4 //
Index: src/ResolvExpr/typeops.h
===================================================================
--- src/ResolvExpr/typeops.h	(revision a1edafa4cdaef39b89d777ace0514d4622c8c81b)
+++ src/ResolvExpr/typeops.h	(revision 6b0b624129f6017f7706b516a24a52e382e3a334)
@@ -10,10 +10,9 @@
 // Created On       : Sun May 17 07:28:22 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun May 17 07:33:11 2015
-// Update Count     : 2
+// Last Modified On : Sat Jul 22 09:36:18 2017
+// Update Count     : 3
 //
 
-#ifndef TYPEOPS_H
-#define TYPEOPS_H
+#pragma once
 
 #include "SynTree/SynTree.h"
@@ -157,6 +156,4 @@
 } // namespace ResolvExpr
 
-#endif // TYPEOPS_H
-
 // Local Variables: //
 // tab-width: 4 //
Index: src/SymTab/Autogen.h
===================================================================
--- src/SymTab/Autogen.h	(revision a1edafa4cdaef39b89d777ace0514d4622c8c81b)
+++ src/SymTab/Autogen.h	(revision 6b0b624129f6017f7706b516a24a52e382e3a334)
@@ -10,10 +10,9 @@
 // Created On       : Sun May 17 21:53:34 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Jun 21 17:25:26 2017
-// Update Count     : 14
+// Last Modified On : Sat Jul 22 09:50:25 2017
+// Update Count     : 15
 //
 
-#ifndef AUTOGEN_H
-#define AUTOGEN_H
+#pragma once
 
 #include <string>
@@ -174,3 +173,9 @@
 	}
 } // namespace SymTab
-#endif // AUTOGEN_H
+
+// Local Variables: //
+// tab-width: 4 //
+// mode: c++ //
+// compile-command: "make install" //
+// End: //
+
Index: src/SymTab/FixFunction.h
===================================================================
--- src/SymTab/FixFunction.h	(revision a1edafa4cdaef39b89d777ace0514d4622c8c81b)
+++ src/SymTab/FixFunction.h	(revision 6b0b624129f6017f7706b516a24a52e382e3a334)
@@ -10,10 +10,9 @@
 // Created On       : Sun May 17 17:02:08 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Mar  2 17:34:06 2016
-// Update Count     : 3
+// Last Modified On : Sat Jul 22 09:45:55 2017
+// Update Count     : 4
 //
 
-#ifndef FIXFUNCTION_H
-#define FIXFUNCTION_H
+#pragma once
 
 #include "SynTree/Mutator.h"
@@ -49,6 +48,4 @@
 } // namespace SymTab
 
-#endif // FIXFUNCTION_H
-
 // Local Variables: //
 // tab-width: 4 //
Index: src/SymTab/ImplementationType.h
===================================================================
--- src/SymTab/ImplementationType.h	(revision a1edafa4cdaef39b89d777ace0514d4622c8c81b)
+++ src/SymTab/ImplementationType.h	(revision 6b0b624129f6017f7706b516a24a52e382e3a334)
@@ -10,10 +10,9 @@
 // Created On       : Sun May 17 21:35:41 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun May 17 21:37:15 2015
-// Update Count     : 2
+// Last Modified On : Sat Jul 22 09:46:19 2017
+// Update Count     : 3
 //
 
-#ifndef IMPLEMENTATIONTYPE_H
-#define IMPLEMENTATIONTYPE_H
+#pragma once
 
 #include "SynTree/SynTree.h"
@@ -31,6 +30,4 @@
 } // namespace SymTab
 
-#endif // IMPLEMENTATIONTYPE_H
-
 // Local Variables: //
 // tab-width: 4 //
Index: src/SymTab/Indexer.h
===================================================================
--- src/SymTab/Indexer.h	(revision a1edafa4cdaef39b89d777ace0514d4622c8c81b)
+++ src/SymTab/Indexer.h	(revision 6b0b624129f6017f7706b516a24a52e382e3a334)
@@ -10,10 +10,9 @@
 // Created On       : Sun May 17 21:38:55 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Mar  2 17:34:14 2016
-// Update Count     : 6
+// Last Modified On : Sat Jul 22 09:46:34 2017
+// Update Count     : 7
 //
 
-#ifndef INDEXER_H
-#define INDEXER_H
+#pragma once
 
 #include <list>
@@ -145,6 +144,4 @@
 } // namespace SymTab
 
-#endif // INDEXER_H
-
 // Local Variables: //
 // tab-width: 4 //
Index: src/SymTab/Mangler.h
===================================================================
--- src/SymTab/Mangler.h	(revision a1edafa4cdaef39b89d777ace0514d4622c8c81b)
+++ src/SymTab/Mangler.h	(revision 6b0b624129f6017f7706b516a24a52e382e3a334)
@@ -9,11 +9,10 @@
 // Author           : Richard C. Bilson
 // Created On       : Sun May 17 21:44:03 2015
-// Last Modified By : Rob Schluntz
-// Last Modified On : Wed Aug 19 15:48:46 2015
-// Update Count     : 14
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Sat Jul 22 09:45:30 2017
+// Update Count     : 15
 //
 
-#ifndef MANGLER_H
-#define MANGLER_H
+#pragma once
 
 #include <sstream>
@@ -77,6 +76,4 @@
 } // SymTab
 
-#endif // MANGLER_H
-
 // Local Variables: //
 // tab-width: 4 //
Index: src/SymTab/Validate.h
===================================================================
--- src/SymTab/Validate.h	(revision a1edafa4cdaef39b89d777ace0514d4622c8c81b)
+++ src/SymTab/Validate.h	(revision 6b0b624129f6017f7706b516a24a52e382e3a334)
@@ -11,10 +11,9 @@
 // Created On       : Sun May 17 21:53:34 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue May 19 16:49:43 2015
-// Update Count     : 3
+// Last Modified On : Sat Jul 22 09:46:07 2017
+// Update Count     : 4
 //
 
-#ifndef VALIDATE_H
-#define VALIDATE_H
+#pragma once
 
 #include "SynTree/SynTree.h"
@@ -28,6 +27,4 @@
 } // namespace SymTab
 
-#endif // VALIDATE_H
-
 // Local Variables: //
 // tab-width: 4 //
Index: src/SynTree/AddStmtVisitor.h
===================================================================
--- src/SynTree/AddStmtVisitor.h	(revision a1edafa4cdaef39b89d777ace0514d4622c8c81b)
+++ src/SynTree/AddStmtVisitor.h	(revision 6b0b624129f6017f7706b516a24a52e382e3a334)
@@ -10,10 +10,9 @@
 // Created On       : Wed Jun 22 12:05:48 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Jul 12 17:50:32 2016
-// Update Count     : 8
+// Last Modified On : Sat Jul 22 09:51:08 2017
+// Update Count     : 9
 //
 
-#ifndef ADD_STATEMENT_VISITOR_H
-#define ADD_STATEMENT_VISITOR_H
+#pragma once
 
 #include <list>
@@ -42,3 +41,7 @@
 };
 
-#endif // ADD_STATEMENT_VISITOR_H
+// Local Variables: //
+// tab-width: 4 //
+// mode: c++ //
+// compile-command: "make install" //
+// End: //
Index: src/SynTree/Attribute.h
===================================================================
--- src/SynTree/Attribute.h	(revision a1edafa4cdaef39b89d777ace0514d4622c8c81b)
+++ src/SynTree/Attribute.h	(revision 6b0b624129f6017f7706b516a24a52e382e3a334)
@@ -10,10 +10,9 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Jan 18 16:27:11 2017
-// Update Count     : 38
+// Last Modified On : Sat Jul 22 09:54:14 2017
+// Update Count     : 39
 //
 
-#ifndef GCC_ATTRIBUTE_H
-#define GCC_ATTRIBUTE_H
+#pragma once
 
 #include "SynTree.h"
@@ -42,6 +41,4 @@
 const std::list< Attribute * > noAttributes;
 
-#endif
-
 // Local Variables: //
 // tab-width: 4 //
Index: src/SynTree/BaseSyntaxNode.h
===================================================================
--- src/SynTree/BaseSyntaxNode.h	(revision a1edafa4cdaef39b89d777ace0514d4622c8c81b)
+++ src/SynTree/BaseSyntaxNode.h	(revision 6b0b624129f6017f7706b516a24a52e382e3a334)
@@ -14,6 +14,5 @@
 //
 
-#ifndef BASE_SYNTAX_NODE_H
-#define BASE_SYNTAX_NODE_H
+#pragma once
 
 #include "Common/utility.h"
@@ -29,6 +28,4 @@
 };
 
-#endif // BASE_SYNTAX_NODE_H
-
 // Local Variables: //
 // tab-width: 4 //
Index: src/SynTree/Constant.h
===================================================================
--- src/SynTree/Constant.h	(revision a1edafa4cdaef39b89d777ace0514d4622c8c81b)
+++ src/SynTree/Constant.h	(revision 6b0b624129f6017f7706b516a24a52e382e3a334)
@@ -9,11 +9,10 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Andrew Beach
-// Last Modified On : Fri Jul 14 13:33:00 2017
-// Update Count     : 16
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Sat Jul 22 09:54:46 2017
+// Update Count     : 17
 //
 
-#ifndef CONSTANT_H
-#define CONSTANT_H
+#pragma once
 
 #include "SynTree.h"
@@ -61,6 +60,4 @@
 };
 
-#endif // CONSTANT_H
-
 // Local Variables: //
 // tab-width: 4 //
Index: src/SynTree/Declaration.h
===================================================================
--- src/SynTree/Declaration.h	(revision a1edafa4cdaef39b89d777ace0514d4622c8c81b)
+++ src/SynTree/Declaration.h	(revision 6b0b624129f6017f7706b516a24a52e382e3a334)
@@ -9,11 +9,10 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Andrew Beach
-// Last Modified On : Fri Jul 14 16:59:00 2017
-// Update Count     : 123
-//
-
-#ifndef DECLARATION_H
-#define DECLARATION_H
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Sat Jul 22 09:52:59 2017
+// Update Count     : 124
+//
+
+#pragma once
 
 #include <string>
@@ -353,6 +352,4 @@
 std::ostream & operator<<( std::ostream & os, const TypeDecl::Data & data );
 
-#endif // DECLARATION_H
-
 // Local Variables: //
 // tab-width: 4 //
Index: src/SynTree/Expression.h
===================================================================
--- src/SynTree/Expression.h	(revision a1edafa4cdaef39b89d777ace0514d4622c8c81b)
+++ src/SynTree/Expression.h	(revision 6b0b624129f6017f7706b516a24a52e382e3a334)
@@ -10,10 +10,9 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Mar 30 16:44:00 2017
-// Update Count     : 41
+// Last Modified On : Sat Jul 22 09:53:16 2017
+// Update Count     : 42
 //
 
-#ifndef EXPRESSION_H
-#define EXPRESSION_H
+#pragma once
 
 #include <map>
@@ -798,6 +797,4 @@
 std::ostream & operator<<( std::ostream & out, const Expression * expr );
 
-#endif // EXPRESSION_H
-
 // Local Variables: //
 // tab-width: 4 //
Index: src/SynTree/Initializer.h
===================================================================
--- src/SynTree/Initializer.h	(revision a1edafa4cdaef39b89d777ace0514d4622c8c81b)
+++ src/SynTree/Initializer.h	(revision 6b0b624129f6017f7706b516a24a52e382e3a334)
@@ -10,10 +10,9 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Mar 23 16:12:42 2017
-// Update Count     : 20
+// Last Modified On : Sat Jul 22 09:52:02 2017
+// Update Count     : 21
 //
 
-#ifndef INITIALIZER_H
-#define INITIALIZER_H
+#pragma once
 
 #include <cassert>
@@ -141,6 +140,4 @@
 std::ostream & operator<<( std::ostream & out, const Designation * des );
 
-#endif // INITIALIZER_H
-
 // Local Variables: //
 // tab-width: 4 //
Index: src/SynTree/Label.h
===================================================================
--- src/SynTree/Label.h	(revision a1edafa4cdaef39b89d777ace0514d4622c8c81b)
+++ src/SynTree/Label.h	(revision 6b0b624129f6017f7706b516a24a52e382e3a334)
@@ -10,10 +10,9 @@
 // Created On       : Wed Jun 8 12:53:12 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun Aug  7 14:44:29 2016
-// Update Count     : 2
+// Last Modified On : Sat Jul 22 09:52:44 2017
+// Update Count     : 3
 //
 
-#ifndef LABEL_H
-#define LABEL_H
+#pragma once
 
 #include <string>
@@ -51,6 +50,4 @@
 static const std::list< Label > noLabels;
 
-#endif // LABEL_H
-
 // Local Variables: //
 // tab-width: 4 //
Index: src/SynTree/Mutator.h
===================================================================
--- src/SynTree/Mutator.h	(revision a1edafa4cdaef39b89d777ace0514d4622c8c81b)
+++ src/SynTree/Mutator.h	(revision 6b0b624129f6017f7706b516a24a52e382e3a334)
@@ -9,7 +9,7 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Andrew Beach
-// Last Modified On : Thu Jun  8 15:45:00 2017
-// Update Count     : 14
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Sat Jul 22 09:51:30 2017
+// Update Count     : 15
 //
 #include <cassert>
@@ -18,6 +18,5 @@
 #include "Common/SemanticError.h"
 
-#ifndef MUTATOR_H
-#define MUTATOR_H
+#pragma once
 
 class Mutator {
@@ -150,6 +149,4 @@
 }
 
-#endif // MUTATOR_H
-
 // Local Variables: //
 // tab-width: 4 //
Index: src/SynTree/Statement.h
===================================================================
--- src/SynTree/Statement.h	(revision a1edafa4cdaef39b89d777ace0514d4622c8c81b)
+++ src/SynTree/Statement.h	(revision 6b0b624129f6017f7706b516a24a52e382e3a334)
@@ -9,11 +9,10 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Andrew Beach
-// Last Modified On : Mon Jun 12 13:35:00 2017
-// Update Count     : 67
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Sat Jul 22 09:54:32 2017
+// Update Count     : 68
 //
 
-#ifndef STATEMENT_H
-#define STATEMENT_H
+#pragma once
 
 #include "BaseSyntaxNode.h"
@@ -428,6 +427,4 @@
 std::ostream & operator<<( std::ostream & out, const Statement * statement );
 
-#endif // STATEMENT_H
-
 // Local Variables: //
 // tab-width: 4 //
Index: src/SynTree/SynTree.h
===================================================================
--- src/SynTree/SynTree.h	(revision a1edafa4cdaef39b89d777ace0514d4622c8c81b)
+++ src/SynTree/SynTree.h	(revision 6b0b624129f6017f7706b516a24a52e382e3a334)
@@ -9,11 +9,10 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Andrew Beach
-// Last Modified On : Thu Jun  8 17:00:00 2017
-// Update Count     : 9
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Sat Jul 22 09:51:46 2017
+// Update Count     : 10
 //
 
-#ifndef SYNTREE_H
-#define SYNTREE_H
+#pragma once
 
 #include <string>
@@ -135,6 +134,4 @@
 class Attribute;
 
-#endif // SYNTREE_H
-
 // Local Variables: //
 // tab-width: 4 //
Index: src/SynTree/Type.h
===================================================================
--- src/SynTree/Type.h	(revision a1edafa4cdaef39b89d777ace0514d4622c8c81b)
+++ src/SynTree/Type.h	(revision 6b0b624129f6017f7706b516a24a52e382e3a334)
@@ -9,11 +9,10 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Andrew Beach
-// Last Modified On : Tus Jul 18 10:06:00 2017
-// Update Count     : 150
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Sat Jul 22 09:53:29 2017
+// Update Count     : 151
 //
 
-#ifndef TYPE_H
-#define TYPE_H
+#pragma once
 
 #include "BaseSyntaxNode.h"
@@ -602,6 +601,4 @@
 std::ostream & operator<<( std::ostream & out, const Type * type );
 
-#endif // TYPE_H
-
 // Local Variables: //
 // tab-width: 4 //
Index: src/SynTree/TypeSubstitution.h
===================================================================
--- src/SynTree/TypeSubstitution.h	(revision a1edafa4cdaef39b89d777ace0514d4622c8c81b)
+++ src/SynTree/TypeSubstitution.h	(revision 6b0b624129f6017f7706b516a24a52e382e3a334)
@@ -9,11 +9,10 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Rob Schluntz
-// Last Modified On : Fri Apr 29 15:00:20 2016
-// Update Count     : 2
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Sat Jul 22 09:52:24 2017
+// Update Count     : 3
 //
 
-#ifndef TYPESUBSTITUTION_H
-#define TYPESUBSTITUTION_H
+#pragma once
 
 #include <map>
@@ -180,6 +179,4 @@
 std::ostream & operator<<( std::ostream & out, const TypeSubstitution & sub );
 
-#endif // TYPESUBSTITUTION_H
-
 // Local Variables: //
 // tab-width: 4 //
Index: src/SynTree/VarExprReplacer.h
===================================================================
--- src/SynTree/VarExprReplacer.h	(revision a1edafa4cdaef39b89d777ace0514d4622c8c81b)
+++ src/SynTree/VarExprReplacer.h	(revision 6b0b624129f6017f7706b516a24a52e382e3a334)
@@ -9,11 +9,10 @@
 // Author           : Rob Schluntz
 // Created On       : Wed Jan 13 16:29:30 2016
-// Last Modified By : Rob Schluntz
-// Last Modified On : Fri May 13 11:27:52 2016
-// Update Count     : 5
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Sat Jul 22 09:53:41 2017
+// Update Count     : 6
 //
 
-#ifndef VAR_EXPR_REPLACER_H
-#define VAR_EXPR_REPLACER_H
+#pragma once
 
 #include <map>
@@ -35,6 +34,4 @@
 };
 
-#endif // VAR_EXPR_REPLACER_H
-
 // Local Variables: //
 // tab-width: 4 //
Index: src/SynTree/Visitor.h
===================================================================
--- src/SynTree/Visitor.h	(revision a1edafa4cdaef39b89d777ace0514d4622c8c81b)
+++ src/SynTree/Visitor.h	(revision 6b0b624129f6017f7706b516a24a52e382e3a334)
@@ -9,11 +9,10 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Andrew Beach
-// Last Modified On : Thr Jun 08 15:45:00 2017
-// Update Count     : 11
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Sat Jul 22 09:54:04 2017
+// Update Count     : 12
 //
 
-#ifndef VISITOR_H
-#define VISITOR_H
+#pragma once
 
 #include "SynTree.h"
@@ -174,6 +173,4 @@
 }
 
-#endif // VISITOR_H
-
 // Local Variables: //
 // tab-width: 4 //
Index: src/Tuples/Explode.h
===================================================================
--- src/Tuples/Explode.h	(revision a1edafa4cdaef39b89d777ace0514d4622c8c81b)
+++ src/Tuples/Explode.h	(revision 6b0b624129f6017f7706b516a24a52e382e3a334)
@@ -9,11 +9,10 @@
 // Author           : Rob Schluntz
 // Created On       : Wed Nov 9 13:12:24 2016
-// Last Modified By : Rob Schluntz
-// Last Modified On : Wed Nov 9 13:20:24 2016
-// Update Count     : 2
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Sat Jul 22 09:55:16 2017
+// Update Count     : 3
 //
 
-#ifndef _EXPLODE_H_
-#define _EXPLODE_H_
+#pragma once
 
 #include "ResolvExpr/AlternativeFinder.h"
@@ -95,6 +94,4 @@
 } // namespace Tuples
 
-#endif // _TUPLE_ASSIGNMENT_H_
-
 // Local Variables: //
 // tab-width: 4 //
Index: src/Tuples/Tuples.h
===================================================================
--- src/Tuples/Tuples.h	(revision a1edafa4cdaef39b89d777ace0514d4622c8c81b)
+++ src/Tuples/Tuples.h	(revision 6b0b624129f6017f7706b516a24a52e382e3a334)
@@ -9,11 +9,10 @@
 // Author           : Rodolfo G. Esteves
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Rob Schluntz
-// Last Modified On : Wed Nov 9 13:17:58 2016
-// Update Count     : 15
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Sat Jul 22 09:55:00 2017
+// Update Count     : 16
 //
 
-#ifndef _TUPLES_H_
-#define _TUPLES_H_
+#pragma once
 
 #include <string>
@@ -49,6 +48,4 @@
 } // namespace Tuples
 
-#endif // _TUPLE_ASSIGNMENT_H_
-
 // Local Variables: //
 // tab-width: 4 //
Index: src/libcfa/concurrency/CtxSwitch-i386.S
===================================================================
--- src/libcfa/concurrency/CtxSwitch-i386.S	(revision a1edafa4cdaef39b89d777ace0514d4622c8c81b)
+++ src/libcfa/concurrency/CtxSwitch-i386.S	(revision 6b0b624129f6017f7706b516a24a52e382e3a334)
@@ -1,3 +1,2 @@
-//                               -*- Mode: Asm -*-
 //
 // Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo
@@ -10,7 +9,7 @@
 // Author           : Thierry Delisle
 // Created On       : Tue Dec 6 12:27:26 2016
-// Last Modified By : Thierry Delisle
-// Last Modified On : Tue Dec 6 12:27:26 2016
-// Update Count     : 0
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Fri Jul 21 22:29:25 2017
+// Update Count     : 1
 //
 // This  library is free  software; you  can redistribute  it and/or  modify it
@@ -99,4 +98,5 @@
 
 // Local Variables: //
-// compile-command: "make install" //
+// mode: c //
+// tab-width: 4 //
 // End: //
Index: src/libcfa/concurrency/CtxSwitch-x86_64.S
===================================================================
--- src/libcfa/concurrency/CtxSwitch-x86_64.S	(revision a1edafa4cdaef39b89d777ace0514d4622c8c81b)
+++ src/libcfa/concurrency/CtxSwitch-x86_64.S	(revision 6b0b624129f6017f7706b516a24a52e382e3a334)
@@ -1,3 +1,2 @@
-//                               -*- Mode: Asm -*-
 //
 // Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo
@@ -10,7 +9,7 @@
 // Author           : Thierry Delisle
 // Created On       : Mon Nov 28 12:27:26 2016
-// Last Modified By : Thierry Delisle
-// Last Modified On : Mon Nov 28 12:27:26 2016
-// Update Count     : 0
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Fri Jul 21 22:28:11 2017
+// Update Count     : 1
 //
 // This  library is free  software; you  can redistribute  it and/or  modify it
Index: src/libcfa/concurrency/alarm.c
===================================================================
--- src/libcfa/concurrency/alarm.c	(revision a1edafa4cdaef39b89d777ace0514d4622c8c81b)
+++ src/libcfa/concurrency/alarm.c	(revision 6b0b624129f6017f7706b516a24a52e382e3a334)
@@ -1,3 +1,2 @@
-//                              -*- Mode: CFA -*-
 //
 // Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo
@@ -10,7 +9,7 @@
 // Author           : Thierry Delisle
 // Created On       : Fri Jun 2 11:31:25 2017
-// Last Modified By : Thierry Delisle
-// Last Modified On : --
-// Update Count     : 0
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Fri Jul 21 22:35:18 2017
+// Update Count     : 1
 //
 
@@ -213,2 +212,7 @@
 	this->set = false;
 }
+
+// Local Variables: //
+// mode: c //
+// tab-width: 4 //
+// End: //
Index: src/libcfa/concurrency/alarm.h
===================================================================
--- src/libcfa/concurrency/alarm.h	(revision a1edafa4cdaef39b89d777ace0514d4622c8c81b)
+++ src/libcfa/concurrency/alarm.h	(revision 6b0b624129f6017f7706b516a24a52e382e3a334)
@@ -1,3 +1,2 @@
-//                              -*- Mode: CFA -*-
 //
 // Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo
@@ -11,10 +10,9 @@
 // Created On       : Fri Jun 2 11:31:25 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Jul 20 15:22:15 2017
-// Update Count     : 1
+// Last Modified On : Sat Jul 22 09:59:27 2017
+// Update Count     : 3
 //
 
-#ifndef ALARM_H
-#define ALARM_H
+#pragma once
 
 #include <stdbool.h>
@@ -127,8 +125,6 @@
 void unregister_self( alarm_node_t * this );
 
-#endif
-
 // Local Variables: //
-// mode: CFA //
+// mode: c //
 // tab-width: 6 //
 // End: //
Index: src/libcfa/concurrency/coroutine
===================================================================
--- src/libcfa/concurrency/coroutine	(revision a1edafa4cdaef39b89d777ace0514d4622c8c81b)
+++ src/libcfa/concurrency/coroutine	(revision 6b0b624129f6017f7706b516a24a52e382e3a334)
@@ -11,10 +11,9 @@
 // Created On       : Mon Nov 28 12:27:26 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Jul 20 15:21:53 2017
-// Update Count     : 1
+// Last Modified On : Sat Jul 22 09:57:17 2017
+// Update Count     : 2
 //
 
-#ifndef COROUTINES_H
-#define COROUTINES_H
+#pragma once
 
 #include <assert.h>
@@ -129,6 +128,4 @@
 }
 
-#endif //COROUTINES_H
-
 // Local Variables: //
 // mode: c //
Index: src/libcfa/concurrency/coroutine.c
===================================================================
--- src/libcfa/concurrency/coroutine.c	(revision a1edafa4cdaef39b89d777ace0514d4622c8c81b)
+++ src/libcfa/concurrency/coroutine.c	(revision 6b0b624129f6017f7706b516a24a52e382e3a334)
@@ -1,3 +1,2 @@
-//                              -*- Mode: CFA -*-
 //
 // Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo
@@ -10,7 +9,7 @@
 // Author           : Thierry Delisle
 // Created On       : Mon Nov 28 12:27:26 2016
-// Last Modified By : Thierry Delisle
-// Last Modified On : Mon Nov 28 12:27:26 2016
-// Update Count     : 0
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Fri Jul 21 22:34:57 2017
+// Update Count     : 1
 //
 
Index: src/libcfa/concurrency/invoke.c
===================================================================
--- src/libcfa/concurrency/invoke.c	(revision a1edafa4cdaef39b89d777ace0514d4622c8c81b)
+++ src/libcfa/concurrency/invoke.c	(revision 6b0b624129f6017f7706b516a24a52e382e3a334)
@@ -1,3 +1,2 @@
-//                              -*- Mode: C -*-
 //
 // Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo
@@ -10,7 +9,7 @@
 // Author           : Thierry Delisle
 // Created On       : Tue Jan 17 12:27:26 2016
-// Last Modified By : Thierry Delisle
-// Last Modified On : --
-// Update Count     : 0
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Fri Jul 21 22:28:33 2017
+// Update Count     : 1
 //
 
@@ -142,2 +141,7 @@
 #endif
 }
+
+// Local Variables: //
+// mode: c //
+// tab-width: 4 //
+// End: //
Index: src/libcfa/concurrency/invoke.h
===================================================================
--- src/libcfa/concurrency/invoke.h	(revision a1edafa4cdaef39b89d777ace0514d4622c8c81b)
+++ src/libcfa/concurrency/invoke.h	(revision 6b0b624129f6017f7706b516a24a52e382e3a334)
@@ -1,3 +1,2 @@
-//                              -*- Mode: C -*-
 //
 // Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo
@@ -10,7 +9,7 @@
 // Author           : Thierry Delisle
 // Created On       : Tue Jan 17 12:27:26 2016
-// Last Modified By : Thierry Delisle
-// Last Modified On : --
-// Update Count     : 0
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Fri Jul 21 22:28:56 2017
+// Update Count     : 1
 //
 
@@ -130,2 +129,7 @@
 }
 #endif
+
+// Local Variables: //
+// mode: c //
+// tab-width: 4 //
+// End: //
Index: src/libcfa/concurrency/kernel
===================================================================
--- src/libcfa/concurrency/kernel	(revision a1edafa4cdaef39b89d777ace0514d4622c8c81b)
+++ src/libcfa/concurrency/kernel	(revision 6b0b624129f6017f7706b516a24a52e382e3a334)
@@ -1,3 +1,2 @@
-//                              -*- Mode: CFA -*-
 //
 // Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo
@@ -10,11 +9,10 @@
 // Author           : Thierry Delisle
 // Created On       : Tue Jan 17 12:27:26 2017
-// Last Modified By : Thierry Delisle
-// Last Modified On : --
-// Update Count     : 0
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Sat Jul 22 09:58:39 2017
+// Update Count     : 2
 //
 
-#ifndef KERNEL_H
-#define KERNEL_H
+#pragma once
 
 #include <stdbool.h>
@@ -105,8 +103,6 @@
 void ^?{}(processor * this);
 
-#endif //KERNEL_H
-
 // Local Variables: //
-// mode: CFA //
-// tab-width: 6 //
+// mode: c //
+// tab-width: 4 //
 // End: //
Index: src/libcfa/concurrency/kernel.c
===================================================================
--- src/libcfa/concurrency/kernel.c	(revision a1edafa4cdaef39b89d777ace0514d4622c8c81b)
+++ src/libcfa/concurrency/kernel.c	(revision 6b0b624129f6017f7706b516a24a52e382e3a334)
@@ -1,3 +1,2 @@
-//                              -*- Mode: CFA -*-
 //
 // Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo
@@ -10,7 +9,7 @@
 // Author           : Thierry Delisle
 // Created On       : Tue Jan 17 12:27:26 2017
-// Last Modified By : Thierry Delisle
-// Last Modified On : --
-// Update Count     : 0
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Fri Jul 21 22:33:18 2017
+// Update Count     : 2
 //
 
@@ -685,4 +684,5 @@
 	return top;
 }
+
 // Local Variables: //
 // mode: c //
Index: src/libcfa/concurrency/kernel_private.h
===================================================================
--- src/libcfa/concurrency/kernel_private.h	(revision a1edafa4cdaef39b89d777ace0514d4622c8c81b)
+++ src/libcfa/concurrency/kernel_private.h	(revision 6b0b624129f6017f7706b516a24a52e382e3a334)
@@ -1,3 +1,2 @@
-//                              -*- Mode: CFA -*-
 //
 // Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo
@@ -10,11 +9,10 @@
 // Author           : Thierry Delisle
 // Created On       : Mon Feb 13 12:27:26 2017
-// Last Modified By : Thierry Delisle
-// Last Modified On : --
-// Update Count     : 0
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Sat Jul 22 09:58:09 2017
+// Update Count     : 2
 //
 
-#ifndef KERNEL_PRIVATE_H
-#define KERNEL_PRIVATE_H
+#pragma once
 
 #include "libhdr.h"
@@ -93,6 +91,4 @@
 #define KERNEL_STORAGE(T,X) static char storage_##X[sizeof(T)]
 
-#endif //KERNEL_PRIVATE_H
-
 // Local Variables: //
 // mode: c //
Index: src/libcfa/concurrency/monitor
===================================================================
--- src/libcfa/concurrency/monitor	(revision a1edafa4cdaef39b89d777ace0514d4622c8c81b)
+++ src/libcfa/concurrency/monitor	(revision 6b0b624129f6017f7706b516a24a52e382e3a334)
@@ -1,3 +1,2 @@
-//                              -*- Mode: CFA -*-
 //
 // Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo
@@ -11,10 +10,9 @@
 // Created On       : Thd Feb 23 12:27:26 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Jul 20 15:22:07 2017
-// Update Count     : 1
+// Last Modified On : Sat Jul 22 09:59:01 2017
+// Update Count     : 3
 //
 
-#ifndef MONITOR_H
-#define MONITOR_H
+#pragma once
 
 #include <stddef.h>
@@ -99,3 +97,6 @@
 void __accept_internal( unsigned short count, __acceptable_t * acceptables, void (*func)(void) );
 
-#endif //MONITOR_H
+// Local Variables: //
+// mode: c //
+// tab-width: 4 //
+// End: //
Index: src/libcfa/concurrency/monitor.c
===================================================================
--- src/libcfa/concurrency/monitor.c	(revision a1edafa4cdaef39b89d777ace0514d4622c8c81b)
+++ src/libcfa/concurrency/monitor.c	(revision 6b0b624129f6017f7706b516a24a52e382e3a334)
@@ -1,3 +1,2 @@
-//                              -*- Mode: CFA -*-
 //
 // Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo
@@ -10,7 +9,7 @@
 // Author           : Thierry Delisle
 // Created On       : Thd Feb 23 12:27:26 2017
-// Last Modified By : Thierry Delisle
-// Last Modified On : --
-// Update Count     : 0
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Fri Jul 21 22:37:11 2017
+// Update Count     : 1
 //
 
@@ -528,2 +527,7 @@
 	return head;
 }
+
+// Local Variables: //
+// mode: c //
+// tab-width: 4 //
+// End: //
Index: src/libcfa/concurrency/preemption.c
===================================================================
--- src/libcfa/concurrency/preemption.c	(revision a1edafa4cdaef39b89d777ace0514d4622c8c81b)
+++ src/libcfa/concurrency/preemption.c	(revision 6b0b624129f6017f7706b516a24a52e382e3a334)
@@ -1,3 +1,2 @@
-//                              -*- Mode: CFA -*-
 //
 // Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo
@@ -10,7 +9,7 @@
 // Author           : Thierry Delisle
 // Created On       : Mon Jun 5 14:20:42 2017
-// Last Modified By : Thierry Delisle
-// Last Modified On : --
-// Update Count     : 0
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Fri Jul 21 22:36:05 2017
+// Update Count     : 2
 //
 
@@ -487,2 +486,7 @@
 // 	raise( SIGABRT );
 // }
+
+// Local Variables: //
+// mode: c //
+// tab-width: 4 //
+// End: //
Index: src/libcfa/concurrency/preemption.h
===================================================================
--- src/libcfa/concurrency/preemption.h	(revision a1edafa4cdaef39b89d777ace0514d4622c8c81b)
+++ src/libcfa/concurrency/preemption.h	(revision 6b0b624129f6017f7706b516a24a52e382e3a334)
@@ -1,3 +1,2 @@
-//                              -*- Mode: CFA -*-
 //
 // Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo
@@ -10,11 +9,10 @@
 // Author           : Thierry Delisle
 // Created On       : Mon Jun 5 14:20:42 2017
-// Last Modified By : Thierry Delisle
-// Last Modified On : --
-// Update Count     : 0
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Fri Jul 21 22:34:25 2017
+// Update Count     : 1
 //
 
-#ifndef PREEMPTION_H
-#define PREEMPTION_H
+#pragma once
 
 #include "alarm.h"
@@ -35,3 +33,6 @@
 void ^?{}( preemption_scope * this );
 
-#endif //PREEMPTION_H
+// Local Variables: //
+// mode: c //
+// tab-width: 4 //
+// End: //
Index: src/libcfa/concurrency/thread
===================================================================
--- src/libcfa/concurrency/thread	(revision a1edafa4cdaef39b89d777ace0514d4622c8c81b)
+++ src/libcfa/concurrency/thread	(revision 6b0b624129f6017f7706b516a24a52e382e3a334)
@@ -1,3 +1,2 @@
-//                              -*- Mode: CFA -*-
 //
 // Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo
@@ -11,10 +10,9 @@
 // Created On       : Tue Jan 17 12:27:26 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Jul 20 15:22:24 2017
-// Update Count     : 1
+// Last Modified On : Sat Jul 22 09:59:40 2017
+// Update Count     : 3
 //
 
-#ifndef THREADS_H
-#define THREADS_H
+#pragma once
 
 #include <assert.h>
@@ -84,6 +82,4 @@
 void yield( unsigned times );
 
-#endif //THREADS_H
-
 // Local Variables: //
 // mode: c //
Index: src/libcfa/concurrency/thread.c
===================================================================
--- src/libcfa/concurrency/thread.c	(revision a1edafa4cdaef39b89d777ace0514d4622c8c81b)
+++ src/libcfa/concurrency/thread.c	(revision 6b0b624129f6017f7706b516a24a52e382e3a334)
@@ -1,3 +1,2 @@
-//                              -*- Mode: CFA -*-
 //
 // Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo
@@ -10,7 +9,7 @@
 // Author           : Thierry Delisle
 // Created On       : Tue Jan 17 12:27:26 2017
-// Last Modified By : Thierry Delisle
-// Last Modified On : --
-// Update Count     : 0
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Fri Jul 21 22:34:46 2017
+// Update Count     : 1
 //
 
Index: src/libcfa/containers/maybe
===================================================================
--- src/libcfa/containers/maybe	(revision a1edafa4cdaef39b89d777ace0514d4622c8c81b)
+++ src/libcfa/containers/maybe	(revision 6b0b624129f6017f7706b516a24a52e382e3a334)
@@ -9,12 +9,10 @@
 // Author           : Andrew Beach
 // Created On       : Wed May 24 14:43:00 2017
-// Last Modified By : Andrew Beach
-// Last Modified On : Fri Jun 16 15:42:00 2017
-// Update Count     : 2
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Sat Jul 22 10:00:52 2017
+// Update Count     : 4
 //
 
-
-#ifndef MAYBE_H
-#define MAYBE_H
+#pragma once
 
 #include <stdbool.h>
@@ -66,3 +64,6 @@
 void set_none(maybe(T) * this);
 
-#endif // MAYBE_H
+// Local Variables: //
+// mode: c //
+// tab-width: 4 //
+// End: //
Index: src/libcfa/containers/pair
===================================================================
--- src/libcfa/containers/pair	(revision a1edafa4cdaef39b89d777ace0514d4622c8c81b)
+++ src/libcfa/containers/pair	(revision 6b0b624129f6017f7706b516a24a52e382e3a334)
@@ -9,11 +9,10 @@
 // Author           : Aaron Moss
 // Created On       : Wed Apr 12 15:32:00 2017
-// Last Modified By : Aaron Moss
-// Last Modified On : Wed Apr 12 15:32:00 2017
-// Update Count     : 1
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Sat Jul 22 09:59:53 2017
+// Update Count     : 2
 //
 
-#ifndef PAIR_H
-#define PAIR_H
+#pragma once
 
 forall(otype R, otype S) struct pair {
@@ -44,6 +43,4 @@
 int ?>=?(pair(R, S) p, pair(R, S) q);
 
-#endif // PAIR_H
-
 // Local Variables: //
 // mode: c //
Index: src/libcfa/containers/result
===================================================================
--- src/libcfa/containers/result	(revision a1edafa4cdaef39b89d777ace0514d4622c8c81b)
+++ src/libcfa/containers/result	(revision 6b0b624129f6017f7706b516a24a52e382e3a334)
@@ -9,12 +9,10 @@
 // Author           : Andrew Beach
 // Created On       : Wed May 24 14:45:00 2017
-// Last Modified By : Andrew Beach
-// Last Modified On : Fri Jun 16 15:41:00 2017
-// Update Count     : 2
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Sat Jul 22 10:00:44 2017
+// Update Count     : 3
 //
 
-
-#ifndef RESULT_H
-#define RESULT_H
+#pragma once
 
 #include <stdbool.h>
@@ -78,3 +76,6 @@
 void set_error(result(T, E) * this, E error);
 
-#endif // RESULT_H
+// Local Variables: //
+// mode: c //
+// tab-width: 4 //
+// End: //
Index: src/libcfa/containers/vector
===================================================================
--- src/libcfa/containers/vector	(revision a1edafa4cdaef39b89d777ace0514d4622c8c81b)
+++ src/libcfa/containers/vector	(revision 6b0b624129f6017f7706b516a24a52e382e3a334)
@@ -10,10 +10,9 @@
 // Created On       : Tue Jul  5 18:00:07 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Jul  5 18:01:35 2016
-// Update Count     : 2
+// Last Modified On : Sat Jul 22 10:01:18 2017
+// Update Count     : 3
 //
 
-#ifndef VECTOR_H
-#define VECTOR_H
+#pragma once
 
 extern "C" {
@@ -166,6 +165,4 @@
 // }
 
-#endif // VECTOR_H
-
 // Local Variables: //
 // mode: c //
Index: src/libcfa/exception.h
===================================================================
--- src/libcfa/exception.h	(revision a1edafa4cdaef39b89d777ace0514d4622c8c81b)
+++ src/libcfa/exception.h	(revision 6b0b624129f6017f7706b516a24a52e382e3a334)
@@ -9,12 +9,10 @@
 // Author           : Andrew Beach
 // Created On       : Mon Jun 26 15:11:00 2017
-// Last Modified By : Andrew Beach
-// Last Modified On : Tus Jul 11 16:31:00 2017
-// Update Count     : 2
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Sat Jul 22 09:57:02 2017
+// Update Count     : 3
 //
 
-#ifndef EXCEPTION_H
-#define EXCEPTION_H
-
+#pragma once
 
 // Later to be a special structure type.
@@ -55,4 +53,2 @@
 }
 #endif
-
-#endif //EXCEPTION_H
Index: src/libcfa/interpose.c
===================================================================
--- src/libcfa/interpose.c	(revision a1edafa4cdaef39b89d777ace0514d4622c8c81b)
+++ src/libcfa/interpose.c	(revision 6b0b624129f6017f7706b516a24a52e382e3a334)
@@ -1,3 +1,2 @@
-//                              -*- Mode: CFA -*-
 //
 // Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo
@@ -10,7 +9,7 @@
 // Author           : Thierry Delisle
 // Created On       : Wed Mar 29 16:10:31 2017
-// Last Modified By : 
-// Last Modified On : 
-// Update Count     : 0
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Fri Jul 21 22:27:33 2017
+// Update Count     : 1
 //
 
@@ -141,2 +140,7 @@
 	}
 }
+
+// Local Variables: //
+// mode: c //
+// tab-width: 4 //
+// End: //
Index: src/libcfa/interpose.h
===================================================================
--- src/libcfa/interpose.h	(revision a1edafa4cdaef39b89d777ace0514d4622c8c81b)
+++ src/libcfa/interpose.h	(revision 6b0b624129f6017f7706b516a24a52e382e3a334)
@@ -1,3 +1,2 @@
-//                              -*- Mode: CFA -*-
 //
 // Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo
@@ -11,6 +10,6 @@
 // Created On       : Wed Mar 29 15:56:41 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Jul 20 21:46:46 2017
-// Update Count     : 1
+// Last Modified On : Fri Jul 21 22:33:02 2017
+// Update Count     : 2
 //
 
@@ -21,2 +20,7 @@
 extern __typeof__( abort ) libc_abort __attribute__(( noreturn ));
 extern __typeof__( exit ) libc_abort __attribute__(( noreturn ));
+
+// Local Variables: //
+// mode: c //
+// tab-width: 4 //
+// End: //
Index: src/libcfa/libhdr.h
===================================================================
--- src/libcfa/libhdr.h	(revision a1edafa4cdaef39b89d777ace0514d4622c8c81b)
+++ src/libcfa/libhdr.h	(revision 6b0b624129f6017f7706b516a24a52e382e3a334)
@@ -9,11 +9,10 @@
 // Author           : Thierry Delisle
 // Created On       : Mon Nov 28 12:27:26 2016
-// Last Modified By : Thierry Delisle
-// Last Modified On : Mon Nov 28 12:27:26 2016
-// Update Count     : 0
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Sat Jul 22 09:56:32 2017
+// Update Count     : 1
 //
 
-#ifndef __LIB_HDR_H__
-#define __LIB_HDR_H__
+#pragma once
 
 #include "libalign.h"
@@ -21,6 +20,4 @@
 #include "libtools.h"
 
-#endif //__LIB_HDR_H__
-
 // Local Variables: //
 // mode: c //
Index: src/libcfa/libhdr/libalign.h
===================================================================
--- src/libcfa/libhdr/libalign.h	(revision a1edafa4cdaef39b89d777ace0514d4622c8c81b)
+++ src/libcfa/libhdr/libalign.h	(revision 6b0b624129f6017f7706b516a24a52e382e3a334)
@@ -1,3 +1,2 @@
-//                              -*- Mode: C++ -*-
 //
 // Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo
@@ -11,6 +10,6 @@
 // Created On       : Mon Nov 28 12:27:26 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Jul 20 15:22:45 2017
-// Update Count     : 1
+// Last Modified On : Fri Jul 21 23:05:35 2017
+// Update Count     : 2
 //
 // This  library is free  software; you  can redistribute  it and/or  modify it
@@ -28,7 +27,5 @@
 //
 
-
-#ifndef __LIB_ALIGN_H__
-#define __LIB_ALIGN_H__
+#pragma once
 
 #include <assert.h>
@@ -61,8 +58,4 @@
 } // uCeiling
 
-
-#endif // __LIB_ALIGN_H__
-
-
 // Local Variables: //
 // compile-command: "make install" //
Index: src/libcfa/libhdr/libdebug.h
===================================================================
--- src/libcfa/libhdr/libdebug.h	(revision a1edafa4cdaef39b89d777ace0514d4622c8c81b)
+++ src/libcfa/libhdr/libdebug.h	(revision 6b0b624129f6017f7706b516a24a52e382e3a334)
@@ -9,11 +9,10 @@
 // Author           : Thierry Delisle
 // Created On       : Mon Nov 28 12:27:26 2016
-// Last Modified By : Thierry Delisle
-// Last Modified On : Mon Nov 28 12:27:26 2016
-// Update Count     : 0
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Sat Jul 22 10:02:24 2017
+// Update Count     : 1
 //
 
-#ifndef __LIB_DEBUG_H__
-#define __LIB_DEBUG_H__
+#pragma once
 
 #ifdef __CFA_DEBUG__
@@ -78,6 +77,4 @@
 #endif
 
-#endif //__LIB_DEBUG_H__
-
 // Local Variables: //
 // mode: c //
Index: src/libcfa/libhdr/libtools.h
===================================================================
--- src/libcfa/libhdr/libtools.h	(revision a1edafa4cdaef39b89d777ace0514d4622c8c81b)
+++ src/libcfa/libhdr/libtools.h	(revision 6b0b624129f6017f7706b516a24a52e382e3a334)
@@ -9,11 +9,10 @@
 // Author           : Thierry Delisle
 // Created On       : Mon Nov 28 12:27:26 2016
-// Last Modified By : Thierry Delisle
-// Last Modified On : Mon Nov 28 12:27:26 2016
-// Update Count     : 0
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Sat Jul 22 10:02:10 2017
+// Update Count     : 1
 //
 
-#ifndef __LIB_TOOLS_H__
-#define __LIB_TOOLS_H__
+#pragma once
 
 // void abortf( const char *fmt, ... ) {
@@ -30,6 +29,4 @@
 #endif
 
-#endif //__LIB_TOOLS_H__
-
 // Local Variables: //
 // mode: c //
Index: src/libcfa/typeobject.h
===================================================================
--- src/libcfa/typeobject.h	(revision a1edafa4cdaef39b89d777ace0514d4622c8c81b)
+++ src/libcfa/typeobject.h	(revision 6b0b624129f6017f7706b516a24a52e382e3a334)
@@ -9,12 +9,10 @@
 // Author           : Andrew Beach
 // Created On       : Tus Jul 11 15:08:00 2017
-// Last Modified By : Andrew Beach
-// Last Modified On : Tus Jul 11 16:18:00 2017
-// Update Count     : 0
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Sat Jul 22 10:01:48 2017
+// Update Count     : 1
 //
 
 #pragma once
-#ifndef TYPEOBJECT_H
-#define TYPEOBJECT_H
 
 struct __cfa__type_object {
@@ -26,3 +24,6 @@
                struct __cfa__type_object const * child );
 
-#endif // TYPEOBJECT_H
+// Local Variables: //
+// mode: c //
+// tab-width: 4 //
+// End: //
Index: src/tests/attributes.c
===================================================================
--- src/tests/attributes.c	(revision a1edafa4cdaef39b89d777ace0514d4622c8c81b)
+++ src/tests/attributes.c	(revision 6b0b624129f6017f7706b516a24a52e382e3a334)
@@ -1,3 +1,2 @@
-//                               -*- Mode: C -*- 
 // 
 // Cforall Version 1.0.0 Copyright (C) 2017 University of Waterloo
@@ -11,6 +10,6 @@
 // Created On       : Mon Feb  6 16:07:02 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Feb  6 16:08:21 2017
-// Update Count     : 2
+// Last Modified On : Fri Jul 21 23:05:52 2017
+// Update Count     : 3
 // 
 
Index: src/tests/avltree/avl-private.h
===================================================================
--- src/tests/avltree/avl-private.h	(revision a1edafa4cdaef39b89d777ace0514d4622c8c81b)
+++ src/tests/avltree/avl-private.h	(revision 6b0b624129f6017f7706b516a24a52e382e3a334)
@@ -1,3 +1,3 @@
-#ifndef AVL_PRIVATE_H
+#pragma once
 #include "avl.h"
 
@@ -14,4 +14,2 @@
 forall(otype K | Comparable(K), otype V)
 int height(tree(K, V) * t);
-
-#endif
Index: src/tests/avltree/avl.h
===================================================================
--- src/tests/avltree/avl.h	(revision a1edafa4cdaef39b89d777ace0514d4622c8c81b)
+++ src/tests/avltree/avl.h	(revision 6b0b624129f6017f7706b516a24a52e382e3a334)
@@ -1,4 +1,3 @@
-#ifndef AVL_TREE_H
-#define AVL_TREE_H
+#pragma once
 
 extern "C" {
@@ -104,5 +103,2 @@
 //     printTree(t, 0);
 // }
-
-
-#endif
Index: src/tests/vector/array.h
===================================================================
--- src/tests/vector/array.h	(revision a1edafa4cdaef39b89d777ace0514d4622c8c81b)
+++ src/tests/vector/array.h	(revision 6b0b624129f6017f7706b516a24a52e382e3a334)
@@ -9,11 +9,10 @@
 // Author           : Richard C. Bilson
 // Created On       : Wed May 27 17:56:53 2015
-// Last Modified By : Rob Schluntz
-// Last Modified On : Wed Apr 27 17:26:04 2016
-// Update Count     : 5
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Sat Jul 22 10:04:20 2017
+// Update Count     : 6
 //
 
-#ifndef ARRAY_H
-#define ARRAY_H
+#pragma once
 
 //#include <iterator>
@@ -45,6 +44,4 @@
 elt_type * end( array_type * array );
 
-#endif // ARRAY_H
-
 // Local Variables: //
 // tab-width: 4 //
Index: src/tests/vector/vector_int.h
===================================================================
--- src/tests/vector/vector_int.h	(revision a1edafa4cdaef39b89d777ace0514d4622c8c81b)
+++ src/tests/vector/vector_int.h	(revision 6b0b624129f6017f7706b516a24a52e382e3a334)
@@ -9,11 +9,10 @@
 // Author           : Richard C. Bilson
 // Created On       : Wed May 27 17:56:53 2015
-// Last Modified By : Rob Schluntz
-// Last Modified On : Wed Apr 27 17:26:59 2016
-// Update Count     : 2
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Sat Jul 22 10:04:02 2017
+// Update Count     : 4
 //
 
-#ifndef VECTOR_INT_H
-#define VECTOR_INT_H
+#pragma once
 
 // A flexible array, similar to a C++ vector, that holds integers and can be resized dynamically
@@ -26,6 +25,6 @@
 
 void ?{}( vector_int * );								// allocate vector with default capacity
-void ?{}( vector_int *, int reserve );          // allocate vector with specified capacity
-void ?{}( vector_int * vec, vector_int other ); // copy constructor
+void ?{}( vector_int *, int reserve );					// allocate vector with specified capacity
+void ?{}( vector_int * vec, vector_int other );			// copy constructor
 void ^?{}( vector_int * );								// deallocate vector's storage
 
@@ -36,7 +35,5 @@
 
 lvalue int ?[?]( vector_int * vec, int index );			// access to arbitrary element (does not resize)
-int last( vector_int * vec );								// return last element
-
-#endif // VECTOR_INT_H
+int last( vector_int * vec );							// return last element
 
 // Local Variables: //
