Index: src/libcfa/libhdr/libdebug.c
===================================================================
--- src/libcfa/libhdr/libdebug.c	(revision 6b0b624129f6017f7706b516a24a52e382e3a334)
+++ src/libcfa/libhdr/libdebug.c	(revision af0c8dabd4bc59ed96120c8fd8004bceb1e3cbbc)
@@ -9,6 +9,6 @@
 // Author           : Thierry Delisle
 // Created On       : Thu Mar 30 12:30:01 2017
-// Last Modified By : 
-// Last Modified On : 
+// Last Modified By :
+// Last Modified On :
 // Update Count     : 0
 //
@@ -28,14 +28,14 @@
 extern "C" {
 
-	void __lib_debug_write( int fd, const char *in_buffer, int len ) {
+	void __lib_debug_write( const char *in_buffer, int len ) {
 		// ensure all data is written
-		for ( int count = 0, retcode; count < len; count += retcode ) { 
+		for ( int count = 0, retcode; count < len; count += retcode ) {
 			in_buffer += count;
 
 			for ( ;; ) {
-				retcode = write( fd, in_buffer, len - count );
+				retcode = write( STDERR_FILENO, in_buffer, len - count );
 
 				// not a timer interrupt ?
-				if ( retcode != -1 || errno != EINTR ) break; 
+				if ( retcode != -1 || errno != EINTR ) break;
 			}
 
@@ -52,7 +52,7 @@
 		va_start( args, fmt );
 		__lib_debug_acquire();
-		
+
 		int len = vsnprintf( buffer, buffer_size, fmt, args );
-		__lib_debug_write( STDERR_FILENO, buffer, len );
+		__lib_debug_write( buffer, len );
 
 		__lib_debug_release();
@@ -64,7 +64,7 @@
 
 		va_start( args, fmt );
-		
+
 		int len = vsnprintf( buffer, buffer_size, fmt, args );
-		__lib_debug_write( STDERR_FILENO, buffer, len );
+		__lib_debug_write( buffer, len );
 
 		va_end( args );
@@ -73,5 +73,5 @@
 	void __lib_debug_print_vararg( const char fmt[], va_list args ) {
 		int len = vsnprintf( buffer, buffer_size, fmt, args );
-		__lib_debug_write( STDERR_FILENO, buffer, len );
+		__lib_debug_write( buffer, len );
 	}
 
@@ -80,7 +80,7 @@
 
 		va_start( args, fmt );
-		
+
 		int len = vsnprintf( in_buffer, in_buffer_size, fmt, args );
-		__lib_debug_write( STDERR_FILENO, in_buffer, len );
+		__lib_debug_write( in_buffer, len );
 
 		va_end( args );
Index: src/libcfa/libhdr/libdebug.h
===================================================================
--- src/libcfa/libhdr/libdebug.h	(revision 6b0b624129f6017f7706b516a24a52e382e3a334)
+++ src/libcfa/libhdr/libdebug.h	(revision af0c8dabd4bc59ed96120c8fd8004bceb1e3cbbc)
@@ -44,7 +44,8 @@
 extern "C" {
 #endif
-      #include <stdarg.h>
+	#include <stdarg.h>
+	#include <stdio.h>
 
-      extern void __lib_debug_write( int fd, const char *buffer, int len );
+      extern void __lib_debug_write( const char *buffer, int len );
       extern void __lib_debug_acquire();
       extern void __lib_debug_release();
@@ -58,5 +59,5 @@
 
 #ifdef __CFA_DEBUG_PRINT__
-	#define LIB_DEBUG_WRITE( fd, buffer, len )     __lib_debug_write( fd, buffer, len )
+	#define LIB_DEBUG_WRITE( buffer, len )         __lib_debug_write( buffer, len )
 	#define LIB_DEBUG_ACQUIRE()                    __lib_debug_acquire()
 	#define LIB_DEBUG_RELEASE()                    __lib_debug_release()
@@ -64,6 +65,6 @@
 	#define LIB_DEBUG_PRINT_NOLOCK(...)            __lib_debug_print_nolock (__VA_ARGS__)
 	#define LIB_DEBUG_PRINT_BUFFER(...)            __lib_debug_print_buffer (__VA_ARGS__)
-	#define LIB_DEBUG_PRINT_BUFFER_DECL(fd, ...)   char text[256]; int len = snprintf( text, 256, __VA_ARGS__ ); __lib_debug_write( fd, text, len );
-	#define LIB_DEBUG_PRINT_BUFFER_LOCAL(fd, ...)  len = snprintf( text, 256, __VA_ARGS__ ); __lib_debug_write( fd, text, len );
+	#define LIB_DEBUG_PRINT_BUFFER_DECL(...)       char __dbg_text[256]; int __dbg_len = snprintf( __dbg_text, 256, __VA_ARGS__ ); __lib_debug_write( __dbg_text, __dbg_len );
+	#define LIB_DEBUG_PRINT_BUFFER_LOCAL(...)      __dbg_len = snprintf( __dbg_text, 256, __VA_ARGS__ ); __lib_debug_write( __dbg_text, __dbg_len );
 #else
 	#define LIB_DEBUG_WRITE(...)               ((void)0)