Index: src/libcfa/bits/locks.h
===================================================================
--- src/libcfa/bits/locks.h	(revision 0cf5b7992194658ccc6f30eae5069589577633a3)
+++ src/libcfa/bits/locks.h	(revision 36982fc1f527597d650797d8db4fa9d288e819d9)
@@ -65,7 +65,7 @@
 
 	// Lock the spinlock, return false if already acquired
-	static inline _Bool try_lock  ( __spinlock_t & this DEBUG_CTX_PARAM2 ) {
+	static inline _Bool try_lock  ( __spinlock_t & this __cfaabi_dbg_ctx_param2 ) {
 		_Bool result = __lock_test_and_test_and_set( this.lock );
-		LIB_DEBUG_DO(
+		__cfaabi_dbg_debug_do(
 			if( result ) {
 				this.prev_name = caller;
@@ -77,5 +77,5 @@
 
 	// Lock the spinlock, spin if already acquired
-	static inline void lock( __spinlock_t & this DEBUG_CTX_PARAM2 ) {
+	static inline void lock( __spinlock_t & this __cfaabi_dbg_ctx_param2 ) {
 		#ifndef NOEXPBACK
 			enum { SPIN_START = 4, SPIN_END = 64 * 1024, };
@@ -98,5 +98,5 @@
 			#endif
 		}
-		LIB_DEBUG_DO(
+		__cfaabi_dbg_debug_do(
 			this.prev_name = caller;
 			this.prev_thrd = this_thread;
@@ -105,10 +105,10 @@
 
 	// Lock the spinlock, spin if already acquired
-	static inline void lock_yield( __spinlock_t & this DEBUG_CTX_PARAM2 ) {
+	static inline void lock_yield( __spinlock_t & this __cfaabi_dbg_ctx_param2 ) {
 		for ( unsigned int i = 1;; i += 1 ) {
 			if ( __lock_test_and_test_and_set( this.lock ) ) break;
 			yield( i );
 		}
-		LIB_DEBUG_DO(
+		__cfaabi_dbg_debug_do(
 			this.prev_name = caller;
 			this.prev_thrd = this_thread;