Index: src/libcfa/containers/vector
===================================================================
--- src/libcfa/containers/vector	(revision 3a808fd1c133a2690d51c726e1772c54f50e824b)
+++ src/libcfa/containers/vector	(revision 00b7cd3e8a3b65734bb432ac26ee5940a9e3a00c)
@@ -1,6 +1,7 @@
 #pragma once
 
+extern "C" {
 #include <stdbool.h>
-#include <stdlib>
+}
 
 #define DESTROY(x)
Index: src/tests/ato.c
===================================================================
--- src/tests/ato.c	(revision 3a808fd1c133a2690d51c726e1772c54f50e824b)
+++ src/tests/ato.c	(revision 00b7cd3e8a3b65734bb432ac26ee5940a9e3a00c)
@@ -1,3 +1,2 @@
-//                               -*- Mode: C -*- 
 // 
 // Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo
@@ -11,14 +10,10 @@
 // Created On       : Thu Feb  4 08:10:57 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Feb 29 17:57:35 2016
-// Update Count     : 44
+// Last Modified On : Mon Jul  4 23:38:04 2016
+// Update Count     : 48
 // 
 
 #include <fstream>
 #include <stdlib>										// ato, strto
-extern "C" {
-#include <stdio.h>
-#include <float.h>
-}
 
 int main( void ) {
Index: src/tests/avltree/avl.h
===================================================================
--- src/tests/avltree/avl.h	(revision 3a808fd1c133a2690d51c726e1772c54f50e824b)
+++ src/tests/avltree/avl.h	(revision 00b7cd3e8a3b65734bb432ac26ee5940a9e3a00c)
@@ -6,5 +6,4 @@
 void free(void *);
 #define assert(cond) if (! (cond)) { printf("Assertion failed: (%s) at %s:%d\n", #cond, __FILE__, __LINE__); abort(); }
-void abort();
 int printf(const char *, ...);
 }
Index: src/tests/extension.c
===================================================================
--- src/tests/extension.c	(revision 3a808fd1c133a2690d51c726e1772c54f50e824b)
+++ src/tests/extension.c	(revision 00b7cd3e8a3b65734bb432ac26ee5940a9e3a00c)
@@ -1,4 +1,4 @@
 //
-// Cforall Version 1.0.0 Copyright (C) 2015 University of Waterloo
+// Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo
 //
 // extension.c -- 
@@ -7,6 +7,6 @@
 // Created On       : Mon Jul  4 20:42:43 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Jul  4 20:43:51 2016
-// Update Count     : 2
+// Last Modified On : Mon Jul  4 23:31:22 2016
+// Update Count     : 3
 //
 
Index: src/tests/init_once.c
===================================================================
--- src/tests/init_once.c	(revision 3a808fd1c133a2690d51c726e1772c54f50e824b)
+++ src/tests/init_once.c	(revision 00b7cd3e8a3b65734bb432ac26ee5940a9e3a00c)
@@ -9,7 +9,7 @@
 // Author           : Rob Schluntz
 // Created On       : Tue Jun 14 15:43:35 2016
-// Last Modified By : Rob Schluntz
-// Last Modified On : Tue Jun 14 15:45:03 2016
-// Update Count     : 1
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Tue Jul  5 16:40:07 2016
+// Update Count     : 2
 //
 
@@ -28,5 +28,4 @@
 void free(void *);
 #define assert(cond) if (! (cond)) { printf("Assertion failed: (%s) at %s:%d\n", #cond, __FILE__, __LINE__); abort(); }
-void abort();
 int printf(const char *, ...);
 void *memset(void *s, int c, size_t n);
Index: src/tests/libcfa_vector.c
===================================================================
--- src/tests/libcfa_vector.c	(revision 3a808fd1c133a2690d51c726e1772c54f50e824b)
+++ src/tests/libcfa_vector.c	(revision 00b7cd3e8a3b65734bb432ac26ee5940a9e3a00c)
@@ -1,49 +1,67 @@
-#include <stdlib>
+// 
+// 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.
+// 
+// libcfa_vector.c -- 
+// 
+// Author           : Thierry Delisle
+// Created On       : Mon Jul  4 23:36:19 2016
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Tue Jul  5 15:08:05 2016
+// Update Count     : 26
+// 
 
-extern "C" {
-	#include <stdio.h>
+#include <fstream>
+#include <vector>
+
+#undef assert
+#define assert(x)								\
+	do {										\
+		if ( !(x) ) {							\
+			sout | "CHECK failed :" | #x | "at" | __FILE__ | " :" | __LINE__ | endl;	\
+			abort();							\
+		}										\
+	} while( 0 == 1 )
+
+int main() {
+	vector( int, heap_allocator(int) ) iv;
+	ctor( &iv );
+
+	assert( empty( &iv ) );
+	assert( size( &iv ) == 0 );
+	sout | size( &iv ) | endl;
+
+	push_back( &iv, 1 );
+	assert( size( &iv ) == 1 );
+	sout | size( &iv ) | endl;
+
+	push_back( &iv, 2 );
+	assert( size( &iv ) == 2 );
+	sout | size( &iv ) | endl;
+
+	push_back( &iv, 3 );
+	assert( size( &iv ) == 3 );
+	sout | size( &iv ) | endl;
+
+	assert( !empty( &iv ) );
+	assert( size( &iv ) == 3 );
+	assert( at( &iv, 0 ) == 1 );
+	assert( (&iv)[0] == 1 );
+	assert( at( &iv, 1 ) == 2 );
+	assert( (&iv)[1] == 2 );
+	assert( at( &iv, 2 ) == 3 );
+	assert( (&iv)[2] == 3 );
+
+	clear( &iv );
+
+	assert( empty( &iv ) );
+	assert( size( &iv ) == 0 );
+	sout | size( &iv ) | endl;
 }
 
-#include <containers/vector>
-
-#define assert(x) do {\
-	if(!(x)) {\
-		printf("CHECK failed : %s at %s:%i\n", #x, __FILE__, __LINE__);\
-		abort();\
-	}}while(0 == 1)\
-
-int main(int argc, char const *argv[]) {
-	vector(int, heap_allocator(int)) iv;
-	ctor(&iv);
-
-	assert(empty(&iv));
-	assert(size(&iv) == 0);
-	printf("%d\n", size(&iv));
-
-	push_back(&iv, 1);
-	printf("%d\n", size(&iv));
-	assert(size(&iv) == 1);
-	push_back(&iv, 2);
-	printf("%d\n", size(&iv));
-	assert(size(&iv) == 2);
-	push_back(&iv, 3);
-	printf("%d\n", size(&iv));
-	assert(size(&iv) == 3);
-
-	assert(!empty(&iv));
-	assert(size(&iv) == 3);
-	assert(at(&iv, 0) == 1);
-	assert((&iv)[0] == 1);
-	assert(at(&iv, 1) == 2);
-	assert((&iv)[1] == 2);
-	assert(at(&iv, 2) == 3);
-	assert((&iv)[2] == 3);
-
-	clear(&iv);
-
-	assert(empty(&iv));
-	assert(size(&iv) == 0);
-	printf("%d\n", size(&iv));
-
-	return 0;
-}
+// Local Variables: //
+// tab-width: 4 //
+// compile-command: "cfa libcfa_vector.c" //
+// End: //