diff --git a/src/servers/app/DebugInfoManager.cpp b/src/servers/app/DebugInfoManager.cpp
index 6b59b64493..e7b5ee539f 100644
--- a/src/servers/app/DebugInfoManager.cpp
+++ b/src/servers/app/DebugInfoManager.cpp
@@ -48,10 +48,13 @@ DebugInfoManager::AddInfo(const char* string)
 DebugInfoManager::DebugInfoManager()
 #if ON_SCREEN_DEBUGGING_INFO
 	: fRootLayer(NULL)
-#endif // ON_SCREEN_DEBUGGING_INFO
 {
 	gDebugString[0] = 0;
 }
+#else
+{
+}
+#endif // ON_SCREEN_DEBUGGING_INFO
 
 #if ON_SCREEN_DEBUGGING_INFO
 // SetRootLayer
diff --git a/src/servers/app/DebugInfoManager.h b/src/servers/app/DebugInfoManager.h
index 547718612e..eb4b4f7de9 100644
--- a/src/servers/app/DebugInfoManager.h
+++ b/src/servers/app/DebugInfoManager.h
@@ -13,16 +13,17 @@
 #include <OS.h>
 
 #if __HAIKU__
-# define ON_SCREEN_DEBUGGING_INFO 1
+# define ON_SCREEN_DEBUGGING_INFO 0
 #else
-# define ON_SCREEN_DEBUGGING_INFO 1
+# define ON_SCREEN_DEBUGGING_INFO 0
 #endif
 
 #if ON_SCREEN_DEBUGGING_INFO
   extern char* gDebugString;
 # define CRITICAL(x) { sprintf(gDebugString, (x)); DebugInfoManager::Default()->AddInfo(gDebugString); }
 #else
-# define CRITICAL(x) debugger x
+//# define CRITICAL(x) debugger (x)
+# define CRITICAL(x) ;
 #endif // ON_SCREEN_DEBUGGING_INFO
 
 class DebugInfoManager {