Index: libcfa/src/bits/debug.hfa
===================================================================
--- libcfa/src/bits/debug.hfa	(revision dac5500446efde6cc36f8ce0afb6e51224e7d2ab)
+++ libcfa/src/bits/debug.hfa	(revision 2bb2efa918688a7626b7a598e52570fccc049d0b)
@@ -23,4 +23,6 @@
 	#define __cfaabi_dbg_ctx_param const char caller[]
 	#define __cfaabi_dbg_ctx_param2 , const char caller[]
+	#define __cfaabi_dbg_ctx_fwd caller
+	#define __cfaabi_dbg_ctx_fwd2 , caller
 #else
 	#define __cfaabi_dbg_debug_do(...)
@@ -30,4 +32,6 @@
 	#define __cfaabi_dbg_ctx_param
 	#define __cfaabi_dbg_ctx_param2
+	#define __cfaabi_dbg_ctx_fwd
+	#define __cfaabi_dbg_ctx_fwd2
 #endif
 
Index: libcfa/src/bits/locks.hfa
===================================================================
--- libcfa/src/bits/locks.hfa	(revision dac5500446efde6cc36f8ce0afb6e51224e7d2ab)
+++ libcfa/src/bits/locks.hfa	(revision 2bb2efa918688a7626b7a598e52570fccc049d0b)
@@ -54,7 +54,7 @@
 
 		#ifdef __CFA_DEBUG__
-			void __cfaabi_dbg_record(__spinlock_t & this, const char prev_name[]);
+			void __cfaabi_dbg_record_lock(__spinlock_t & this, const char prev_name[]);
 		#else
-			#define __cfaabi_dbg_record(x, y)
+			#define __cfaabi_dbg_record_lock(x, y)
 		#endif
 	}
@@ -69,5 +69,5 @@
 		bool result = (this.lock == 0) && (__atomic_test_and_set( &this.lock, __ATOMIC_ACQUIRE ) == 0);
 		if( result ) {
-			__cfaabi_dbg_record( this, caller );
+			__cfaabi_dbg_record_lock( this, caller );
 		} else {
 			enable_interrupts_noPoll();
@@ -99,5 +99,5 @@
 			#endif
 		}
-		__cfaabi_dbg_record( this, caller );
+		__cfaabi_dbg_record_lock( this, caller );
 	}