diff --git a/docs/AUTHORS.txt b/docs/AUTHORS.txt
index aa67bfc45..2ce7fb942 100644
--- a/docs/AUTHORS.txt
+++ b/docs/AUTHORS.txt
@@ -1069,10 +1069,11 @@ $Id$
   * Maemo (Nokia 770 and N880) coding and builds
     Alessandro Pasotti <apasotti@gmail.com>
 
-  * BeOS coding and builds
+  * BeOS and Haiku coding and builds
     Luc 'Begasus' Schrijvers <begasus@gmail.com>
     Scott McCreary <scottmc@users.sourceforge.net>
     Marcin 'Shard' Konicki <shard at beosjournal.org>  [retired]
+    Gerasim Troeglazov <3dEyes@gmail.com>
 
   * Debian Linux packages
     Ben Armstrong <synrg@sanctuary.nslug.ns.ca>
diff --git a/docs/CHANGES.txt b/docs/CHANGES.txt
index 5e508ef3d..5324453cb 100644
--- a/docs/CHANGES.txt
+++ b/docs/CHANGES.txt
@@ -9,7 +9,11 @@ http://www.tuxpaint.org/
 $Id$
 
 2020.June.22 (0.9.25)
-  * TBD
+  * Ports & Building
+    ----------------
+    * Corrections for Haiku not opening saved files.
+      (Ref: https://github.com/haikuports/haikuports/issues/3045)
+      Gerasim Troeglazov <3dEyes@gmail.com>
 
 2020.April.24 (0.9.24)
   * New tools
diff --git a/src/compiler.h b/src/compiler.h
index 82efd7a9c..61e6f3998 100644
--- a/src/compiler.h
+++ b/src/compiler.h
@@ -28,7 +28,6 @@
   $Id$
 */
 
-#ifndef __HAIKU__
 #ifdef __GNUC__
 // This version has strict type checking for safety.
 // See the "unnecessary" pointer comparison. (from Linux)
@@ -46,7 +45,6 @@
 #define min(a,b) (((a) < (b)) ? (a) : (b))
 #define max(a,b) (((a) > (b)) ? (a) : (b))
 #endif
-#endif /* Not Haiku */
 
 #define clamp(lo,value,hi)    (min(max(value,lo),hi))
 
diff --git a/src/tp_magic_api.h.in b/src/tp_magic_api.h.in
index 442f13a6b..0366b8bc1 100644
--- a/src/tp_magic_api.h.in
+++ b/src/tp_magic_api.h.in
@@ -10,7 +10,6 @@
 
 /* min() and max() variable comparisons: */
 
-#ifndef __HAIKU__
 #ifdef __GNUC__
 // This version has strict type checking for safety.
 // See the "unnecessary" pointer comparison. (from Linux)
@@ -28,7 +27,6 @@
 #define min(a,b) (((a) < (b)) ? (a) : (b))
 #define max(a,b) (((a) > (b)) ? (a) : (b))
 #endif
-#endif /* Not Haiku */
 
 /* clamp() returns 'value', unless it's less than 'lo' or greater than 'hi',
    in which cases it returns 'lo' or 'hi', respectively: */
diff --git a/src/tuxpaint.c b/src/tuxpaint.c
index 60b1495da..0632bcce8 100644
--- a/src/tuxpaint.c
+++ b/src/tuxpaint.c
@@ -278,7 +278,7 @@ char *strcasestr(const char *haystack, const char *needle)
 #include <dirent.h>
 #include <signal.h>
 
-#if defined __BEOS__
+#if defined __BEOS__ || defined __HAIKU__
 
 /* BeOS */