diff --git a/src/Makefile b/src/Makefile
index 31c213f7..a722f7bf 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -203,8 +203,7 @@ endif
     LOPT = $(shell sdl-config --libs) -lSDL_image -lpng -ljpeg -lz $(TTFLOPT) -lfreetype -lbe $(LUALOPT)
     CC = gcc
 	#Append the gcc kind to the objdir (gcc2 or gcc4) to avoid conflicts when switching from one to other.
-	OBJKIND = $(lastword $(shell setgcc))
-    OBJDIR = ../obj/haiku/$(OBJKIND)
+    OBJDIR = ../obj/haiku
     ZIP = zip
 
   else
diff --git a/src/setup.c b/src/setup.c
index 67cb3140..315c61f7 100644
--- a/src/setup.c
+++ b/src/setup.c
@@ -43,6 +43,8 @@
 #elif defined(__linux__)
   #include <limits.h>
   #include <unistd.h>
+#elif defined(__HAIKU__)
+  #include <FindDirectory.h>
 #endif
 
 #include "struct.h"