diff --git a/src/apps/deskbar/BarApp.cpp b/src/apps/deskbar/BarApp.cpp
index 542e29f5e9..0833f8b2f1 100644
--- a/src/apps/deskbar/BarApp.cpp
+++ b/src/apps/deskbar/BarApp.cpp
@@ -99,7 +99,7 @@ TBarApp::TBarApp()
 	InitSettings();
 	InitIconPreloader();
 
-#if defined(__HAIKU__) || defined(HAIKU_TARGET_PLATFORM_LIBBE_TEST)
+#ifdef __HAIKU__
 	be_roster->StartWatching(this);
 #endif
 
@@ -134,7 +134,7 @@ TBarApp::TBarApp()
 
 TBarApp::~TBarApp()
 {
-#if defined(__HAIKU__) || defined(HAIKU_TARGET_PLATFORM_LIBBE_TEST)
+#ifdef __HAIKU__
 	be_roster->StopWatching(this);
 #endif
 
diff --git a/src/apps/deskbar/BeMenu.cpp b/src/apps/deskbar/BeMenu.cpp
index f430468ad2..f89675f230 100644
--- a/src/apps/deskbar/BeMenu.cpp
+++ b/src/apps/deskbar/BeMenu.cpp
@@ -445,7 +445,7 @@ TBeMenu::ResetTargets()
 				case CMD_SUSPEND_SYSTEM:
 				case CMD_SHUTDOWN_SYSTEM:
 					// restart/shutdown
-#if __HAIKU__
+#ifdef __HAIKU__
 					item->SetTarget(be_app);
 #else
 					item->SetTarget(BMessenger(ROSTER_SIG));