diff --git a/src/detection/brightness/brightness_haiku.cpp b/src/detection/brightness/brightness_haiku.cpp
index 84cbf54af..86fbe6d82 100644
--- a/src/detection/brightness/brightness_haiku.cpp
+++ b/src/detection/brightness/brightness_haiku.cpp
@@ -29,10 +29,10 @@ const char* ffDetectBrightness(FF_A_UNUSED FFBrightnessOptions* options, FFlist*
         FFBrightnessResult* brightness = FF_LIST_ADD(FFBrightnessResult, *result);
 
         if (err == B_OK) {
-            ffStrbufInitF(&brightness->name, "%s %s (%ld)", monitor.vendor, monitor.name, screen.ID().id);
+            ffStrbufInitF(&brightness->name, "%s %s (%d)", monitor.vendor, monitor.name, screen.ID().id);
             ffStrbufTrimRightSpace(&brightness->name);
         } else {
-            ffStrbufInitF(&brightness->name, "Screen %ld", screen.ID().id);
+            ffStrbufInitF(&brightness->name, "Screen %d", screen.ID().id);
         }
 
         brightness->max = 1.0f;
diff --git a/src/detection/os/os_haiku.c b/src/detection/os/os_haiku.c
index 1a3c40cfa..e8e9f4a8d 100644
--- a/src/detection/os/os_haiku.c
+++ b/src/detection/os/os_haiku.c
@@ -1,7 +1,7 @@
 #include "os.h"
 #include <OS.h>
 #include <image.h>
-#include <SupportDefs.h>
+#include <inttypes.h>
 
 void ffDetectOSImpl(FFOSResult* os) {
     ffStrbufSetStatic(&os->name, "Haiku");
@@ -33,7 +33,7 @@ void ffDetectOSImpl(FFOSResult* os) {
             int32 relVer = ver / 0x10000;
             ver %= 0x10000;
             if (ver == 0) {
-                ffStrbufSetF(&os->version, "R%" B_PRId32, relVer);
+                ffStrbufSetF(&os->version, "R%" PRIi32, relVer);
             } else {
                 relVer++;
 
@@ -41,16 +41,16 @@ void ffDetectOSImpl(FFOSResult* os) {
                 if (ver < B_HAIKU_VERSION_1_PRE_BETA_1) {
                     int32 alphaVer = ver / 0x100;
                     if (isPre) {
-                        ffStrbufSetF(&os->version, "R%" B_PRId32 "A%ld-", relVer, alphaVer + 1);
+                        ffStrbufSetF(&os->version, "R%" PRId32 "A%" PRIi32 "-", relVer, alphaVer + 1);
                     } else {
-                        ffStrbufSetF(&os->version, "R%" B_PRId32 "A%ld", relVer, alphaVer);
+                        ffStrbufSetF(&os->version, "R%" PRIi32 "A%" PRIi32, relVer, alphaVer);
                     }
                 } else if (ver < 0x00010000 /* B_HAIKU_VERSION_1 */) {
                     int32 betaVer = (ver - B_HAIKU_VERSION_1_ALPHA_4) / 0x100;
                     if (isPre) {
-                        ffStrbufSetF(&os->version, "R%" B_PRId32 "B%ld-", relVer, betaVer + 1);
+                        ffStrbufSetF(&os->version, "R%" PRIi32 "B%" PRIi32 "-", relVer, betaVer + 1);
                     } else {
-                        ffStrbufSetF(&os->version, "R%" B_PRId32 "B%ld", relVer, betaVer);
+                        ffStrbufSetF(&os->version, "R%" PRIi32 "B%" PRIi32, relVer, betaVer);
                     }
                 }
             }
@@ -60,7 +60,7 @@ void ffDetectOSImpl(FFOSResult* os) {
     if (!os->version.length) {
         system_info sys;
         if (get_system_info(&sys) == B_OK) {
-            ffStrbufAppendF(&os->version, "R%" B_PRIx64, sys.kernel_version);
+            ffStrbufAppendF(&os->version, "R%" PRIx64, sys.kernel_version);
         }
     }
 }