Index: src/GenPoly/Box.h
===================================================================
--- src/GenPoly/Box.h	(revision b826e6b7674b1614df5016529521f2926b812835)
+++ src/GenPoly/Box.h	(revision fe97a7d8c39190462e63a923c254d1ba68347436)
@@ -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 b826e6b7674b1614df5016529521f2926b812835)
+++ src/GenPoly/CopyParams.h	(revision fe97a7d8c39190462e63a923c254d1ba68347436)
@@ -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 b826e6b7674b1614df5016529521f2926b812835)
+++ src/GenPoly/DeclMutator.h	(revision fe97a7d8c39190462e63a923c254d1ba68347436)
@@ -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 b826e6b7674b1614df5016529521f2926b812835)
+++ src/GenPoly/ErasableScopedMap.h	(revision fe97a7d8c39190462e63a923c254d1ba68347436)
@@ -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 b826e6b7674b1614df5016529521f2926b812835)
+++ src/GenPoly/FindFunction.h	(revision fe97a7d8c39190462e63a923c254d1ba68347436)
@@ -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 b826e6b7674b1614df5016529521f2926b812835)
+++ src/GenPoly/GenPoly.h	(revision fe97a7d8c39190462e63a923c254d1ba68347436)
@@ -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 b826e6b7674b1614df5016529521f2926b812835)
+++ src/GenPoly/InstantiateGeneric.h	(revision fe97a7d8c39190462e63a923c254d1ba68347436)
@@ -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 b826e6b7674b1614df5016529521f2926b812835)
+++ src/GenPoly/Lvalue.h	(revision fe97a7d8c39190462e63a923c254d1ba68347436)
@@ -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 b826e6b7674b1614df5016529521f2926b812835)
+++ src/GenPoly/PolyMutator.h	(revision fe97a7d8c39190462e63a923c254d1ba68347436)
@@ -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 b826e6b7674b1614df5016529521f2926b812835)
+++ src/GenPoly/ScopedSet.h	(revision fe97a7d8c39190462e63a923c254d1ba68347436)
@@ -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 b826e6b7674b1614df5016529521f2926b812835)
+++ src/GenPoly/ScrubTyVars.h	(revision fe97a7d8c39190462e63a923c254d1ba68347436)
@@ -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 b826e6b7674b1614df5016529521f2926b812835)
+++ src/GenPoly/Specialize.h	(revision fe97a7d8c39190462e63a923c254d1ba68347436)
@@ -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 //