diff --git a/oldbuild/haiku/GNUmakeinc.mk b/haiku/GNUfiles.mk
similarity index 72%
rename from oldbuild/haiku/GNUmakeinc.mk
rename to haiku/GNUfiles.mk
index 4d66667b..b0ebc9e1 100644
--- a/oldbuild/haiku/GNUmakeinc.mk
+++ b/haiku/GNUfiles.mk
@@ -31,17 +31,21 @@ CXXFILES += \
 HFILES += \
 	haiku/uipriv_haiku.hpp
 
-# thanks ebassi in irc.gimp.net/#gtk+
-CXXFLAGS += \
-	-D_UI_EXTERN='__attribute__((visibility("default"))) extern' \
-	-fvisibility=hidden \
-	-fPIC
+# TODO split into a separate file or put in GNUmakefile.libui somehow?
 
+# flags for the Haiku API
 LDFLAGS += \
-	-fvisibility=hidden \
-	-fPIC \
 	-lbe
 
+# flags for building a shared library
+LDFLAGS += \
+	-shared
+
 # flags for warning on undefined symbols
 LDFLAGS += \
 	-Wl,--no-undefined -Wl,--no-allow-shlib-undefined
+
+# flags for setting soname
+# TODO is this correct for Haiku?
+LDFLAGS += \
+	-Wl,-soname,$(NAME)$(SUFFIX).$(SOVERSION)
diff --git a/oldbuild/haiku/GNUosspecific.mk b/haiku/GNUosspecific.mk
similarity index 93%
rename from oldbuild/haiku/GNUosspecific.mk
rename to haiku/GNUosspecific.mk
index 0c47b0fa..8bc66e4c 100644
--- a/oldbuild/haiku/GNUosspecific.mk
+++ b/haiku/GNUosspecific.mk
@@ -3,6 +3,7 @@
 EXESUFFIX =
 LIBSUFFIX = .so
 OSHSUFFIX = .hpp
+TOOLCHAIN = gcc
 
 # Force GCC 4; GCC 2 is not supported.
 gccver = $(shell $(CC) --version | sed 's/-.*//g')