Index: src/libcfa/concurrency/threads
===================================================================
--- src/libcfa/concurrency/threads	(revision ff2d7341fc5bc057a9f57248333f4772c4d879a6)
+++ src/libcfa/concurrency/threads	(revision bb82c03bc8335801bc35bfe955fe778079574ec8)
@@ -14,6 +14,4 @@
 // Update Count     : 0
 //
-
-#ifdef __CFORALL__
 
 #ifndef THREADS_H
@@ -75,9 +73,9 @@
       coroutine* src = this_coroutine();		// optimization
 
-	assertf( src->last != 0, 
+	assertf( src->last != 0,
 		"Attempt to suspend coroutine %.256s (%p) that has never been resumed.\n"
 		"Possible cause is a suspend executed in a member called by a coroutine user rather than by the coroutine main.",
 		src->name, src );
-	assertf( src->last->notHalted, 
+	assertf( src->last->notHalted,
 		"Attempt by coroutine %.256s (%p) to suspend back to terminated coroutine %.256s (%p).\n"
 		"Possible cause is terminated coroutine's main routine has already returned.",
@@ -100,5 +98,5 @@
       // not resuming self ?
 	if ( src != dst ) {
-		assertf( dst->notHalted , 
+		assertf( dst->notHalted ,
 			"Attempt by coroutine %.256s (%p) to resume terminated coroutine %.256s (%p).\n"
 			"Possible cause is terminated coroutine's main routine has already returned.",
@@ -115,8 +113,4 @@
 #endif //THREADS_H
 
-#else
-#include_next <thread>
-#endif //__CFORALL__
-
 // Local Variables: //
 // mode: c //
Index: src/libcfa/containers/vector
===================================================================
--- src/libcfa/containers/vector	(revision ff2d7341fc5bc057a9f57248333f4772c4d879a6)
+++ src/libcfa/containers/vector	(revision bb82c03bc8335801bc35bfe955fe778079574ec8)
@@ -13,6 +13,4 @@
 // Update Count     : 2
 //
-
-#ifdef __CFORALL__
 
 #ifndef VECTOR_H
@@ -170,8 +168,4 @@
 #endif // VECTOR_H
 
-#else
-#include_next <vector>
-#endif //__CFORALL__
-
 // Local Variables: //
 // mode: c //
Index: src/libcfa/fstream
===================================================================
--- src/libcfa/fstream	(revision ff2d7341fc5bc057a9f57248333f4772c4d879a6)
+++ src/libcfa/fstream	(revision bb82c03bc8335801bc35bfe955fe778079574ec8)
@@ -5,5 +5,5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// fstream -- 
+// fstream --
 //
 // Author           : Peter A. Buhr
@@ -13,6 +13,4 @@
 // Update Count     : 88
 //
-
-#ifdef __CFORALL__
 
 #ifndef __FSTREAM_H__
@@ -64,11 +62,6 @@
 #endif // __FSTREAM_H__
 
-#else
-#include_next <fstream>
-#endif //__CFORALL__
-
 // Local Variables: //
 // mode: c //
 // tab-width: 4 //
 // End: //
-
Index: src/libcfa/iostream
===================================================================
--- src/libcfa/iostream	(revision ff2d7341fc5bc057a9f57248333f4772c4d879a6)
+++ src/libcfa/iostream	(revision bb82c03bc8335801bc35bfe955fe778079574ec8)
@@ -5,5 +5,5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// iostream -- 
+// iostream --
 //
 // Author           : Peter A. Buhr
@@ -13,6 +13,4 @@
 // Update Count     : 93
 //
-
-#ifdef __CFORALL__
 
 #ifndef __IOSTREAM_H__
@@ -28,5 +26,5 @@
 	void sepReset( ostype *, _Bool );					// set separator and default state
 	void sepSet( ostype *, const char * );				// set separator to string (15 character maximum)
-	const char * sepGet( ostype * );					// get separator string 
+	const char * sepGet( ostype * );					// get separator string
 	_Bool sepDisable( ostype * );						// set default state to off, and return previous state
 	_Bool sepEnable( ostype * );						// set default state to on, and return previous state
@@ -128,8 +126,4 @@
 #endif // __IOSTREAM_H
 
-#else
-#include_next <iostream>
-#endif //__CFORALL__
-
 // Local Variables: //
 // mode: c //
Index: src/libcfa/iterator
===================================================================
--- src/libcfa/iterator	(revision ff2d7341fc5bc057a9f57248333f4772c4d879a6)
+++ src/libcfa/iterator	(revision bb82c03bc8335801bc35bfe955fe778079574ec8)
@@ -5,5 +5,5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// iterator -- 
+// iterator --
 //
 // Author           : Richard C. Bilson
@@ -13,6 +13,4 @@
 // Update Count     : 9
 //
-
-#ifdef __CFORALL__
 
 #ifndef ITERATOR_H
@@ -48,8 +46,4 @@
 #endif // ITERATOR_H
 
-#else
-#include_next <iterator>
-#endif //__CFORALL__
-
 // Local Variables: //
 // mode: c //
Index: src/libcfa/limits
===================================================================
--- src/libcfa/limits	(revision ff2d7341fc5bc057a9f57248333f4772c4d879a6)
+++ src/libcfa/limits	(revision bb82c03bc8335801bc35bfe955fe778079574ec8)
@@ -1,10 +1,10 @@
-// 
+//
 // 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.
-// 
-// limits -- 
-// 
+//
+// limits --
+//
 // Author           : Peter A. Buhr
 // Created On       : Wed Apr  6 18:06:52 2016
@@ -12,7 +12,5 @@
 // Last Modified On : Wed Apr  6 21:08:16 2016
 // Update Count     : 6
-// 
-
-#ifdef __CFORALL__
+//
 
 #ifndef LIMITS_H
@@ -114,8 +112,4 @@
 #endif // LIMITS_H
 
-#else
-#include_next <limits>
-#endif //__CFORALL__
-
 // Local Variables: //
 // mode: c //
Index: src/libcfa/math
===================================================================
--- src/libcfa/math	(revision ff2d7341fc5bc057a9f57248333f4772c4d879a6)
+++ src/libcfa/math	(revision bb82c03bc8335801bc35bfe955fe778079574ec8)
@@ -1,3 +1,3 @@
-// 
+//
 // Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo
 //
@@ -5,6 +5,6 @@
 // file "LICENCE" distributed with Cforall.
 //
-// math -- 
-// 
+// math --
+//
 // Author           : Peter A. Buhr
 // Created On       : Mon Apr 18 23:37:04 2016
@@ -12,7 +12,5 @@
 // Last Modified On : Sun Apr 24 12:45:02 2016
 // Update Count     : 59
-// 
-
-#ifdef __CFORALL__
+//
 
 #ifndef MATH_H
@@ -356,8 +354,4 @@
 #endif // MATH_H
 
-#else
-#include_next <math>
-#endif //__CFORALL__
-
 // Local Variables: //
 // mode: c //
Index: src/libcfa/rational
===================================================================
--- src/libcfa/rational	(revision ff2d7341fc5bc057a9f57248333f4772c4d879a6)
+++ src/libcfa/rational	(revision bb82c03bc8335801bc35bfe955fe778079574ec8)
@@ -1,12 +1,12 @@
-// 
+//
 // 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.
-// 
+//
 // rational -- Rational numbers are numbers written as a ratio, i.e., as a fraction, where the numerator (top number)
 //     and the denominator (bottom number) are whole numbers. When creating and computing with rational numbers, results
 //     are constantly reduced to keep the numerator and denominator as small as possible.
-// 
+//
 // Author           : Peter A. Buhr
 // Created On       : Wed Apr  6 17:56:25 2016
@@ -14,7 +14,5 @@
 // Last Modified On : Wed May  4 14:11:45 2016
 // Update Count     : 16
-// 
-#ifdef __CFORALL__
-
+//
 #ifndef RATIONAL_H
 #define RATIONAL_H
@@ -67,8 +65,4 @@
 #endif // RATIONAL_H
 
-#else
-#include_next <rational>
-#endif //__CFORALL__
-
 // Local Variables: //
 // mode: c //
Index: src/libcfa/stdlib
===================================================================
--- src/libcfa/stdlib	(revision ff2d7341fc5bc057a9f57248333f4772c4d879a6)
+++ src/libcfa/stdlib	(revision bb82c03bc8335801bc35bfe955fe778079574ec8)
@@ -5,5 +5,5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// stdlib -- 
+// stdlib --
 //
 // Author           : Peter A. Buhr
@@ -13,6 +13,4 @@
 // Update Count     : 99
 //
-
-#ifdef __CFORALL__
 
 #ifndef STDLIB_H
@@ -134,8 +132,4 @@
 #endif // STDLIB_H
 
-#else
-#include_next <stdlib>
-#endif //__CFORALL__
-
 // Local Variables: //
 // mode: c //