diff --git a/headers/private/userlandfs/shared/Debug.h b/headers/private/userlandfs/shared/Debug.h
index 547d628ded..bf86c1646b 100644
--- a/headers/private/userlandfs/shared/Debug.h
+++ b/headers/private/userlandfs/shared/Debug.h
@@ -92,13 +92,14 @@ void dbg_printf_end();
 
 #define DEBUG_THREAD	find_thread(NULL)
 #define DEBUG_CONTEXT(x)	{ dbg_printf_begin(); __out(DEBUG_APP " [%" \
-	B_PRIdBIGTIME ": %5ld] ", system_time(), DEBUG_THREAD); x; dbg_printf_end(); }
+	B_PRIdBIGTIME ": %5" B_PRIdTHREAD "] ", system_time(), DEBUG_THREAD); \
+	x; dbg_printf_end(); }
 #define DEBUG_CONTEXT_FUNCTION(prefix, x)	{ dbg_printf_begin(); \
-	__out(DEBUG_APP " [%" B_PRIdBIGTIME ": %5ld] %s()" prefix, system_time(), \
-	DEBUG_THREAD, __FUNCTION__); x; dbg_printf_end(); }
+	__out(DEBUG_APP " [%" B_PRIdBIGTIME ": %5" B_PRIdTHREAD "] %s()" prefix, \
+	system_time(), DEBUG_THREAD, __FUNCTION__); x; dbg_printf_end(); }
 #define DEBUG_CONTEXT_LINE(x)	{ dbg_printf_begin(); __out(DEBUG_APP " [%" \
-	B_PRIdBIGTIME ": %5ld] %s():%d: ", system_time(), DEBUG_THREAD, \
-	__FUNCTION__, __LINE__); x; dbg_printf_end(); }
+	B_PRIdBIGTIME ": %5" B_PRIdTHREAD "] %s():%d: ", system_time(), \
+	DEBUG_THREAD, __FUNCTION__, __LINE__); x; dbg_printf_end(); }
 
 #define TPRINT(x) DEBUG_CONTEXT( __out x )
 #define TREPORT_ERROR(status) DEBUG_CONTEXT_LINE( __out("%s\n", strerror(status)) )