Index: src/libcfa/Makefile.am
===================================================================
--- src/libcfa/Makefile.am	(revision 875a72fc63ec1c00f94434e8e20f18e17cd51d0c)
+++ src/libcfa/Makefile.am	(revision bacc36ce667997c9f0ed8001bf0911d0fe811ee1)
@@ -100,12 +100,10 @@
 	math 				\
 	gmp 				\
+	bits/align.h 		\
 	bits/containers.h		\
 	bits/defs.h 		\
 	bits/debug.h 		\
 	bits/locks.h 		\
-	concurrency/invoke.h 	\
-	libhdr.h 			\
-	libhdr/libalign.h 	\
-	libhdr/libtools.h
+	concurrency/invoke.h
 
 CLEANFILES = libcfa-prelude.c
Index: src/libcfa/Makefile.in
===================================================================
--- src/libcfa/Makefile.in	(revision 875a72fc63ec1c00f94434e8e20f18e17cd51d0c)
+++ src/libcfa/Makefile.in	(revision bacc36ce667997c9f0ed8001bf0911d0fe811ee1)
@@ -263,7 +263,6 @@
 	containers/result containers/vector concurrency/coroutine \
 	concurrency/thread concurrency/kernel concurrency/monitor \
-	${shell echo stdhdr/*} math gmp bits/containers.h bits/defs.h \
-	bits/debug.h bits/locks.h concurrency/invoke.h libhdr.h \
-	libhdr/libalign.h libhdr/libtools.h
+	${shell echo stdhdr/*} math gmp bits/align.h bits/containers.h \
+	bits/defs.h bits/debug.h bits/locks.h concurrency/invoke.h
 HEADERS = $(nobase_cfa_include_HEADERS)
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
@@ -436,12 +435,10 @@
 	math 				\
 	gmp 				\
+	bits/align.h 		\
 	bits/containers.h		\
 	bits/defs.h 		\
 	bits/debug.h 		\
 	bits/locks.h 		\
-	concurrency/invoke.h 	\
-	libhdr.h 			\
-	libhdr/libalign.h 	\
-	libhdr/libtools.h
+	concurrency/invoke.h
 
 CLEANFILES = libcfa-prelude.c
Index: src/libcfa/bits/align.h
===================================================================
--- src/libcfa/bits/align.h	(revision bacc36ce667997c9f0ed8001bf0911d0fe811ee1)
+++ src/libcfa/bits/align.h	(revision bacc36ce667997c9f0ed8001bf0911d0fe811ee1)
@@ -0,0 +1,62 @@
+//
+// 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.
+//
+// align.h --
+//
+// Author           : Thierry Delisle
+// Created On       : Mon Nov 28 12:27:26 2016
+// Last Modified By : Peter A. Buhr
+// 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
+// under the terms of the GNU Lesser General Public License as published by the
+// Free Software  Foundation; either  version 2.1 of  the License, or  (at your
+// option) any later version.
+//
+// This library is distributed in the  hope that it will be useful, but WITHOUT
+// ANY  WARRANTY;  without even  the  implied  warranty  of MERCHANTABILITY  or
+// FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
+// for more details.
+//
+// You should  have received a  copy of the  GNU Lesser General  Public License
+// along  with this library.
+//
+
+#pragma once
+
+#include <assert.h>
+#include <stdbool.h>
+
+// Minimum size used to align memory boundaries for memory allocations.
+#define libAlign() (sizeof(double))
+
+// Check for power of 2
+static inline bool libPow2( unsigned long int value ) {
+    // clears all bits below value, rounding value down to the next lower multiple of value
+    return (value & (value - 1ul)) == 0ul;
+} // libPow2
+
+
+// Returns value aligned at the floor of align.
+static inline unsigned long int libFloor( unsigned long int value, unsigned long int align ) {
+    assert( libPow2( align ) );
+    // clears all bits above or equal to align, getting (value % align), the phase of value with regards to align
+    return value & -align;
+} // libFloor
+
+
+// Returns value aligned at the ceiling of align.
+
+static inline unsigned long int libCeiling( unsigned long int value, unsigned long int align ) {
+    assert( libPow2( align ) );
+    // "negate, round down, negate" is the same as round up
+    return -libFloor( -value, align );
+} // uCeiling
+
+// Local Variables: //
+// compile-command: "make install" //
+// End: //
Index: src/libcfa/bits/containers.h
===================================================================
--- src/libcfa/bits/containers.h	(revision 875a72fc63ec1c00f94434e8e20f18e17cd51d0c)
+++ src/libcfa/bits/containers.h	(revision bacc36ce667997c9f0ed8001bf0911d0fe811ee1)
@@ -15,6 +15,6 @@
 #pragma once
 
+#include "bits/align.h"
 #include "bits/defs.h"
-#include "libhdr.h"
 
 //-----------------------------------------------------------------------------
Index: src/libcfa/bits/debug.c
===================================================================
--- src/libcfa/bits/debug.c	(revision 875a72fc63ec1c00f94434e8e20f18e17cd51d0c)
+++ src/libcfa/bits/debug.c	(revision bacc36ce667997c9f0ed8001bf0911d0fe811ee1)
@@ -5,5 +5,5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// libdebug.c --
+// debug.c --
 //
 // Author           : Thierry Delisle
Index: src/libcfa/bits/debug.h
===================================================================
--- src/libcfa/bits/debug.h	(revision 875a72fc63ec1c00f94434e8e20f18e17cd51d0c)
+++ src/libcfa/bits/debug.h	(revision bacc36ce667997c9f0ed8001bf0911d0fe811ee1)
@@ -5,5 +5,5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// libdebug.h --
+// debug.h --
 //
 // Author           : Thierry Delisle
Index: src/libcfa/bits/defs.h
===================================================================
--- src/libcfa/bits/defs.h	(revision 875a72fc63ec1c00f94434e8e20f18e17cd51d0c)
+++ src/libcfa/bits/defs.h	(revision bacc36ce667997c9f0ed8001bf0911d0fe811ee1)
@@ -32,2 +32,10 @@
 #define __cfa_anonymous_object __cfa_anonymous_object
 #endif
+
+#ifdef __cforall
+extern "C" {
+#endif
+void abortf( const char fmt[], ... ) __attribute__ ((__nothrow__, __leaf__, __noreturn__));
+#ifdef __cforall
+}
+#endif
Index: src/libcfa/bits/locks.h
===================================================================
--- src/libcfa/bits/locks.h	(revision 875a72fc63ec1c00f94434e8e20f18e17cd51d0c)
+++ src/libcfa/bits/locks.h	(revision bacc36ce667997c9f0ed8001bf0911d0fe811ee1)
@@ -18,6 +18,4 @@
 #include "bits/debug.h"
 #include "bits/defs.h"
-
-#include "libhdr.h"
 
 // pause to prevent excess processor bus usage
Index: src/libcfa/concurrency/alarm.c
===================================================================
--- src/libcfa/concurrency/alarm.c	(revision 875a72fc63ec1c00f94434e8e20f18e17cd51d0c)
+++ src/libcfa/concurrency/alarm.c	(revision bacc36ce667997c9f0ed8001bf0911d0fe811ee1)
@@ -22,6 +22,4 @@
 #include <sys/time.h>
 }
-
-#include "libhdr.h"
 
 #include "alarm.h"
Index: src/libcfa/concurrency/coroutine.c
===================================================================
--- src/libcfa/concurrency/coroutine.c	(revision 875a72fc63ec1c00f94434e8e20f18e17cd51d0c)
+++ src/libcfa/concurrency/coroutine.c	(revision bacc36ce667997c9f0ed8001bf0911d0fe811ee1)
@@ -29,5 +29,4 @@
 #define __CFA_INVOKE_PRIVATE__
 #include "invoke.h"
-
 
 //-----------------------------------------------------------------------------
Index: src/libcfa/concurrency/invoke.c
===================================================================
--- src/libcfa/concurrency/invoke.c	(revision 875a72fc63ec1c00f94434e8e20f18e17cd51d0c)
+++ src/libcfa/concurrency/invoke.c	(revision bacc36ce667997c9f0ed8001bf0911d0fe811ee1)
@@ -18,5 +18,4 @@
 #include <stdio.h>
 
-#include "libhdr.h"
 #include "invoke.h"
 
Index: src/libcfa/concurrency/kernel.c
===================================================================
--- src/libcfa/concurrency/kernel.c	(revision 875a72fc63ec1c00f94434e8e20f18e17cd51d0c)
+++ src/libcfa/concurrency/kernel.c	(revision bacc36ce667997c9f0ed8001bf0911d0fe811ee1)
@@ -13,6 +13,4 @@
 // Update Count     : 2
 //
-
-#include "libhdr.h"
 
 //C Includes
Index: src/libcfa/concurrency/kernel_private.h
===================================================================
--- src/libcfa/concurrency/kernel_private.h	(revision 875a72fc63ec1c00f94434e8e20f18e17cd51d0c)
+++ src/libcfa/concurrency/kernel_private.h	(revision bacc36ce667997c9f0ed8001bf0911d0fe811ee1)
@@ -15,6 +15,4 @@
 
 #pragma once
-
-#include "libhdr.h"
 
 #include "kernel"
Index: src/libcfa/concurrency/monitor.c
===================================================================
--- src/libcfa/concurrency/monitor.c	(revision 875a72fc63ec1c00f94434e8e20f18e17cd51d0c)
+++ src/libcfa/concurrency/monitor.c	(revision bacc36ce667997c9f0ed8001bf0911d0fe811ee1)
@@ -19,5 +19,4 @@
 #include <inttypes.h>
 
-#include "libhdr.h"
 #include "kernel_private.h"
 
Index: src/libcfa/concurrency/preemption.c
===================================================================
--- src/libcfa/concurrency/preemption.c	(revision 875a72fc63ec1c00f94434e8e20f18e17cd51d0c)
+++ src/libcfa/concurrency/preemption.c	(revision bacc36ce667997c9f0ed8001bf0911d0fe811ee1)
@@ -14,5 +14,4 @@
 //
 
-#include "libhdr.h"
 #include "preemption.h"
 
Index: src/libcfa/concurrency/thread.c
===================================================================
--- src/libcfa/concurrency/thread.c	(revision 875a72fc63ec1c00f94434e8e20f18e17cd51d0c)
+++ src/libcfa/concurrency/thread.c	(revision bacc36ce667997c9f0ed8001bf0911d0fe811ee1)
@@ -17,5 +17,4 @@
 
 #include "kernel_private.h"
-#include "libhdr.h"
 
 #define __CFA_INVOKE_PRIVATE__
Index: src/libcfa/interpose.c
===================================================================
--- src/libcfa/interpose.c	(revision 875a72fc63ec1c00f94434e8e20f18e17cd51d0c)
+++ src/libcfa/interpose.c	(revision bacc36ce667997c9f0ed8001bf0911d0fe811ee1)
@@ -25,5 +25,5 @@
 
 #include "bits/debug.h"
-#include "libhdr/libtools.h"
+#include "bits/defs.h"
 #include "startup.h"
 
Index: src/libcfa/libhdr.h
===================================================================
--- src/libcfa/libhdr.h	(revision 875a72fc63ec1c00f94434e8e20f18e17cd51d0c)
+++ 	(revision )
@@ -1,24 +1,0 @@
-//
-// 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.
-//
-// libhdr.h --
-//
-// Author           : Thierry Delisle
-// Created On       : Mon Nov 28 12:27:26 2016
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Jul 22 09:56:32 2017
-// Update Count     : 1
-//
-
-#pragma once
-
-#include "libhdr/libalign.h"
-#include "libhdr/libtools.h"
-
-// Local Variables: //
-// mode: c //
-// tab-width: 4 //
-// End: //
Index: src/libcfa/libhdr/libalign.h
===================================================================
--- src/libcfa/libhdr/libalign.h	(revision 875a72fc63ec1c00f94434e8e20f18e17cd51d0c)
+++ 	(revision )
@@ -1,62 +1,0 @@
-//
-// 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.
-//
-// libdebug.h --
-//
-// Author           : Thierry Delisle
-// Created On       : Mon Nov 28 12:27:26 2016
-// Last Modified By : Peter A. Buhr
-// 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
-// under the terms of the GNU Lesser General Public License as published by the
-// Free Software  Foundation; either  version 2.1 of  the License, or  (at your
-// option) any later version.
-//
-// This library is distributed in the  hope that it will be useful, but WITHOUT
-// ANY  WARRANTY;  without even  the  implied  warranty  of MERCHANTABILITY  or
-// FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
-// for more details.
-//
-// You should  have received a  copy of the  GNU Lesser General  Public License
-// along  with this library.
-//
-
-#pragma once
-
-#include <assert.h>
-#include <stdbool.h>
-
-// Minimum size used to align memory boundaries for memory allocations.
-#define libAlign() (sizeof(double))
-
-// Check for power of 2
-static inline bool libPow2( unsigned long int value ) {
-    // clears all bits below value, rounding value down to the next lower multiple of value
-    return (value & (value - 1ul)) == 0ul;
-} // libPow2
-
-
-// Returns value aligned at the floor of align.
-static inline unsigned long int libFloor( unsigned long int value, unsigned long int align ) {
-    assert( libPow2( align ) );
-    // clears all bits above or equal to align, getting (value % align), the phase of value with regards to align
-    return value & -align;
-} // libFloor
-
-
-// Returns value aligned at the ceiling of align.
-
-static inline unsigned long int libCeiling( unsigned long int value, unsigned long int align ) {
-    assert( libPow2( align ) );
-    // "negate, round down, negate" is the same as round up
-    return -libFloor( -value, align );
-} // uCeiling
-
-// Local Variables: //
-// compile-command: "make install" //
-// End: //
Index: src/libcfa/libhdr/libtools.h
===================================================================
--- src/libcfa/libhdr/libtools.h	(revision 875a72fc63ec1c00f94434e8e20f18e17cd51d0c)
+++ 	(revision )
@@ -1,34 +1,0 @@
-//
-// 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.
-//
-// ools.h --
-//
-// Author           : Thierry Delisle
-// Created On       : Mon Nov 28 12:27:26 2016
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Jul 22 10:02:10 2017
-// Update Count     : 1
-//
-
-#pragma once
-
-// void abortf( const char *fmt, ... ) {
-//     abort();
-//     // CONTROL NEVER REACHES HERE!
-// } // libAbort
-
-#ifdef __cforall
-extern "C" {
-#endif
-void abortf( const char fmt[], ... ) __attribute__ ((__nothrow__, __leaf__, __noreturn__));
-#ifdef __cforall
-}
-#endif
-
-// Local Variables: //
-// mode: c //
-// tab-width: 4 //
-// End: //