diff --git a/src/base/detect.h b/src/base/detect.h
index 386bfec58..e9cc76066 100644
--- a/src/base/detect.h
+++ b/src/base/detect.h
@@ -96,7 +96,7 @@
 #define CONF_FAMILY_UNIX 1
 #define CONF_FAMILY_STRING "unix"
 #define CONF_PLATFORM_HAIKU 1
-#define CONF_PLATFORM_STRING "haiku"
+#define PLATFORM_STRING "haiku"
 #endif
 
 /* use gcc endianness definitions when available */
@@ -179,7 +179,13 @@
 #define PLATFORM_SUFFIX ""
 #endif
 
-#define CONF_PLATFORM_STRING PLATFORM_STRING PLATFORM_SUFFIX
+#ifndef CONF_PLATFORM_STRING
+#define CONF_PLATFORM_STRING "unknown"
+#endif
+
+#ifndef PLATFORM_STRING
+#define PLATFORM_STRING "unknown"
+#endif
 
 #ifndef CONF_ARCH_STRING
 #define CONF_ARCH_STRING "unknown"
diff --git a/src/engine/client/backend_sdl.cpp b/src/engine/client/backend_sdl.cpp
index 1478600b0..27ad7e19a 100644
--- a/src/engine/client/backend_sdl.cpp
+++ b/src/engine/client/backend_sdl.cpp
@@ -1115,7 +1115,8 @@ void CGraphicsBackend_SDL_OpenGL::SetWindowParams(int FullscreenMode, bool IsBor
 	{
 		if(FullscreenMode == 1)
 		{
-#if defined(CONF_PLATFORM_MACOS) || defined(CONF_PLATFORM_HAIKU) // Todo SDL: remove this when fixed (game freezes when losing focus in fullscreen)
+#if defined(CONF_PLATFORM_MACOS) || defined(CONF_PLATFORM_HAIKU)
+			// Todo SDL: remove this when fixed (game freezes when losing focus in fullscreen)
 			SDL_SetWindowFullscreen(m_pWindow, SDL_WINDOW_FULLSCREEN_DESKTOP);
 #else
 			SDL_SetWindowFullscreen(m_pWindow, SDL_WINDOW_FULLSCREEN);
diff --git a/src/engine/client/notifications.cpp b/src/engine/client/notifications.cpp
index 28c2d1619..b38e53353 100644
--- a/src/engine/client/notifications.cpp
+++ b/src/engine/client/notifications.cpp
@@ -4,7 +4,7 @@
 
 #if defined(CONF_PLATFORM_MACOS)
 // Code is in src/macos/notification.mm.
-#elif defined(CONF_FAMILY_UNIX) && !defined(CONF_PLATFORM_ANDROID)
+#elif defined(CONF_FAMILY_UNIX) && !defined(CONF_PLATFORM_ANDROID) && !defined(CONF_PLATFORM_HAIKU)
 #include <libnotify/notify.h>
 void NotificationsInit()
 {