Index: src/tests/declarationErrors.c
===================================================================
--- src/tests/declarationErrors.c	(revision cbaee0da9351cb4132c3c4b8bce4a1112819e565)
+++ src/tests/declarationErrors.c	(revision 5ead9f95cb4d5f1df7e1139c0f0dc62a52639a7c)
@@ -1,18 +1,33 @@
+// 
+// Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo
+//
+// The contents of this file are covered under the licence agreement in the
+// file "LICENCE" distributed with Cforall.
+// 
+// declarationErrors.c -- 
+// 
+// Author           : Peter A. Buhr
+// Created On       : Wed Aug 17 08:23:43 2016
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Wed Aug 17 08:27:15 2016
+// Update Count     : 2
+// 
+
 const short static int volatile x4;
 const static volatile short int x4;
-static short int volatile static const x9;		// duplicate static
-struct { int i; } const static volatile static x18;	// duplicate static
+static short int volatile static const x9;				// duplicate static
+struct { int i; } const static volatile static x18;		// duplicate static
 struct { int i; } const static volatile static volatile x19; // duplicate static & volatile
 typedef int Int;
-static Int volatile static const x28;			// duplicate static
+static Int volatile static const x28;					// duplicate static
 
-const static inline const volatile int f01();		// duplicate const
-volatile inline const volatile static int f02();	// duplicate volatile
-const inline const volatile int static f03();		// duplicate const
-volatile inline static const volatile int f04();	// duplicate volatile
-const static const inline volatile int f05();		// duplicate const
-volatile static const volatile inline int f06();	// duplicate volatile
-const static const volatile int inline f07();		// duplicate const
-volatile static const int inline volatile f08();	// duplicate volatile
+const static inline const volatile int f01();			// duplicate const
+volatile inline const volatile static int f02();		// duplicate volatile
+const inline const volatile int static f03();			// duplicate const
+volatile inline static const volatile int f04();		// duplicate volatile
+const static const inline volatile int f05();			// duplicate const
+volatile static const volatile inline int f06();		// duplicate volatile
+const static const volatile int inline f07();			// duplicate const
+volatile static const int inline volatile f08();		// duplicate volatile
 
 //Dummy main
@@ -21,2 +36,7 @@
 	return 0;
 }
+
+// Local Variables: //
+// tab-width: 4 //
+// compile-command: "cfa declarationErrors.c" //
+// End: //
Index: src/tests/declarationSpecifier.c
===================================================================
--- src/tests/declarationSpecifier.c	(revision cbaee0da9351cb4132c3c4b8bce4a1112819e565)
+++ src/tests/declarationSpecifier.c	(revision 5ead9f95cb4d5f1df7e1139c0f0dc62a52639a7c)
@@ -1,2 +1,17 @@
+// 
+// Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo
+//
+// The contents of this file are covered under the licence agreement in the
+// file "LICENCE" distributed with Cforall.
+// 
+// declarationSpecifier.c -- 
+// 
+// Author           : Peter A. Buhr
+// Created On       : Wed Aug 17 08:21:04 2016
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Wed Aug 17 08:24:33 2016
+// Update Count     : 2
+// 
+
 typedef short int Int;
 
@@ -78,2 +93,7 @@
 	return 0;
 }
+
+// Local Variables: //
+// tab-width: 4 //
+// compile-command: "cfa declarationSpecifier.c" //
+// End: //
Index: src/tests/dtor-early-exit.c
===================================================================
--- src/tests/dtor-early-exit.c	(revision cbaee0da9351cb4132c3c4b8bce4a1112819e565)
+++ src/tests/dtor-early-exit.c	(revision 5ead9f95cb4d5f1df7e1139c0f0dc62a52639a7c)
@@ -1,2 +1,17 @@
+// 
+// Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo
+//
+// The contents of this file are covered under the licence agreement in the
+// file "LICENCE" distributed with Cforall.
+// 
+// dtor-early-exit.c -- 
+// 
+// Author           : Rob Schluntz
+// Created On       : Wed Aug 17 08:26:25 2016
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Wed Aug 17 08:29:37 2016
+// Update Count     : 2
+// 
+
 #include <fstream>
 #include <stdlib>
@@ -215,2 +230,7 @@
 	h();
 }
+
+// Local Variables: //
+// tab-width: 4 //
+// compile-command: "cfa dtor-early-exit" //
+// End: //
Index: src/tests/functions.c
===================================================================
--- src/tests/functions.c	(revision cbaee0da9351cb4132c3c4b8bce4a1112819e565)
+++ src/tests/functions.c	(revision 5ead9f95cb4d5f1df7e1139c0f0dc62a52639a7c)
@@ -1,2 +1,17 @@
+// 
+// Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo
+//
+// The contents of this file are covered under the licence agreement in the
+// file "LICENCE" distributed with Cforall.
+// 
+// functions.c -- 
+// 
+// Author           : Peter A. Buhr
+// Created On       : Wed Aug 17 08:39:58 2016
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Wed Aug 17 08:40:52 2016
+// Update Count     : 1
+// 
+
 // ANSI function definitions
 
@@ -165,3 +180,4 @@
 // Local Variables: //
 // tab-width: 4 //
+// compile-command: "cfa functions.c" //
 // End: //
Index: src/tests/gccExtensions.c
===================================================================
--- src/tests/gccExtensions.c	(revision cbaee0da9351cb4132c3c4b8bce4a1112819e565)
+++ src/tests/gccExtensions.c	(revision 5ead9f95cb4d5f1df7e1139c0f0dc62a52639a7c)
@@ -10,6 +10,6 @@
 // Created On       : Sun Aug 14 17:28:17 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Aug 16 14:49:47 2016
-// Update Count     : 6
+// Last Modified On : Wed Aug 17 08:34:57 2016
+// Update Count     : 7
 // 
 
@@ -22,5 +22,7 @@
 
 	static int y asm( "yy" );
-//	static * int z asm( "zz" );							// CFA declaration
+#ifdef __CFA__
+	static * int z asm( "zz" );							// CFA declaration
+#endif // __CFA__
 
 	int src;
Index: src/tests/identFuncDeclarator.c
===================================================================
--- src/tests/identFuncDeclarator.c	(revision cbaee0da9351cb4132c3c4b8bce4a1112819e565)
+++ src/tests/identFuncDeclarator.c	(revision 5ead9f95cb4d5f1df7e1139c0f0dc62a52639a7c)
@@ -1,2 +1,17 @@
+// 
+// Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo
+//
+// The contents of this file are covered under the licence agreement in the
+// file "LICENCE" distributed with Cforall.
+// 
+// identFuncDeclarator.c -- 
+// 
+// Author           : Peter A. Buhr
+// Created On       : Wed Aug 17 08:36:34 2016
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Wed Aug 17 08:37:06 2016
+// Update Count     : 1
+// 
+
 int main() {
 	int f1;
@@ -97,2 +112,7 @@
 	int (* const(* const f81)(int))();
 }
+
+// Local Variables: //
+// tab-width: 4 //
+// compile-command: "cfa identFuncDeclarator.c" //
+// End: //
Index: src/tests/identParamDeclarator.c
===================================================================
--- src/tests/identParamDeclarator.c	(revision cbaee0da9351cb4132c3c4b8bce4a1112819e565)
+++ src/tests/identParamDeclarator.c	(revision 5ead9f95cb4d5f1df7e1139c0f0dc62a52639a7c)
@@ -1,2 +1,17 @@
+// 
+// Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo
+//
+// The contents of this file are covered under the licence agreement in the
+// file "LICENCE" distributed with Cforall.
+// 
+// identParamDeclarator.c -- 
+// 
+// Author           : Peter A. Buhr
+// Created On       : Wed Aug 17 08:37:56 2016
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Wed Aug 17 08:38:42 2016
+// Update Count     : 1
+// 
+
 int fred(
 	int f1,
@@ -147,2 +162,7 @@
 	return 0;
 }
+
+// Local Variables: //
+// tab-width: 4 //
+// compile-command: "cfa identParamDeclarator.c" //
+// End: //
Index: src/tests/variableDeclarator.c
===================================================================
--- src/tests/variableDeclarator.c	(revision cbaee0da9351cb4132c3c4b8bce4a1112819e565)
+++ src/tests/variableDeclarator.c	(revision 5ead9f95cb4d5f1df7e1139c0f0dc62a52639a7c)
@@ -1,3 +1,18 @@
-//Variable declarations test
+// 
+// Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo
+//
+// The contents of this file are covered under the licence agreement in the
+// file "LICENCE" distributed with Cforall.
+// 
+// variableDeclarator.c -- 
+// 
+// Author           : Peter A. Buhr
+// Created On       : Wed Aug 17 08:41:42 2016
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Wed Aug 17 08:42:21 2016
+// Update Count     : 1
+// 
+
+// Variable declarations test
 int f1;
 int (f2);
@@ -164,2 +179,7 @@
 	return 0;
 }
+
+// Local Variables: //
+// tab-width: 4 //
+// compile-command: "cfa variableDeclarator.c" //
+// End: //