diff --git a/src/add-ons/input_server/devices/keyboard/KeyboardInputDevice.cpp b/src/add-ons/input_server/devices/keyboard/KeyboardInputDevice.cpp
index 749fdc7912..1027411142 100644
--- a/src/add-ons/input_server/devices/keyboard/KeyboardInputDevice.cpp
+++ b/src/add-ons/input_server/devices/keyboard/KeyboardInputDevice.cpp
@@ -67,10 +67,10 @@
 								__FUNCTION__, sFunctionDepth)
 #	define KID_CALLED(x...)	FunctionTracer _ft(this, "KeyboardInputDevice", \
 								__FUNCTION__, sFunctionDepth)
-#	define TRACE(x...)	{ BString _to; \
+#	define TRACE(x...)	do { BString _to; \
 							_to.Append(' ', (sFunctionDepth + 1) * 2); \
 							debug_printf("%p -> %s", this, _to.String()); \
-							debug_printf(x); }
+							debug_printf(x); } while (0)
 #	define LOG_EVENT(text...) do {} while (0)
 #	define LOG_ERR(text...) TRACE(text)
 #else
diff --git a/src/add-ons/input_server/devices/mouse/MouseInputDevice.cpp b/src/add-ons/input_server/devices/mouse/MouseInputDevice.cpp
index acda0b9173..d40fc7358f 100644
--- a/src/add-ons/input_server/devices/mouse/MouseInputDevice.cpp
+++ b/src/add-ons/input_server/devices/mouse/MouseInputDevice.cpp
@@ -76,10 +76,10 @@
 								__FUNCTION__, sFunctionDepth)
 #	define MID_CALLED(x...)	FunctionTracer _ft(this, "MouseInputDevice", \
 								__FUNCTION__, sFunctionDepth)
-#	define TRACE(x...)	{ BString _to; \
+#	define TRACE(x...)	do { BString _to; \
 							_to.Append(' ', (sFunctionDepth + 1) * 2); \
 							debug_printf("%p -> %s", this, _to.String()); \
-							debug_printf(x); }
+							debug_printf(x); } while (0)
 #	define LOG_EVENT(text...) do {} while (0)
 #	define LOG_ERR(text...) TRACE(text)
 #else