diff --git a/src/libs/tgfclient/CMakeLists.txt b/src/libs/tgfclient/CMakeLists.txt
index 77b7a1dab..1cabf1f3f 100644
--- a/src/libs/tgfclient/CMakeLists.txt
+++ b/src/libs/tgfclient/CMakeLists.txt
@@ -111,12 +111,12 @@ IF(WIN32)
     TARGET_LINK_LIBRARIES(tgfclient winmm)
 ENDIF(WIN32)
 
-IF(UNIX)
+IF(UNIX AND NOT HAIKU)
     ADD_X11_LIBRARY(tgfclient)
     IF(OPTION_XRANDR)
         ADD_XRANDR_LIBRARY(tgfclient)
     ENDIF(OPTION_XRANDR)
-ENDIF(UNIX)
+ENDIF(UNIX AND NOT HAIKU)
 
 IF(UNIX)
     SD_INSTALL_FILES(LIB lib TARGETS tgfclient)
diff --git a/src/libs/tgfclient/guifont.cpp b/src/libs/tgfclient/guifont.cpp
index 498330c9f..5648f1b44 100644
--- a/src/libs/tgfclient/guifont.cpp
+++ b/src/libs/tgfclient/guifont.cpp
@@ -45,7 +45,7 @@ GfuiFontClass *gfuiFont[GFUI_FONT_NB];
 const char *keySize[4] = { "size big", "size large", "size medium", "size small" };
 
 
-#ifndef WIN32
+#if !defined(WIN32) && !defined(__HAIKU__)
 #if BYTE_ORDER == BIG_ENDIAN
 void swap32(unsigned int *p, unsigned int size)
 {
@@ -159,7 +159,7 @@ GfuiFontClass::GfuiFontClass(char *FileName)
 		GfLogWarning( "Not all bytes are successfully read" );
 	//GfLogDebug("Font(%s) : texW=%d, texH=%d\n", FileName, font->TexWidth, font->TexHeight);
 
-#ifndef WIN32
+#if !defined(WIN32) && !defined(__HAIKU__)
 #if BYTE_ORDER == BIG_ENDIAN
 	swap32((unsigned int *) font, 24);
 #endif
@@ -181,7 +181,7 @@ GfuiFontClass::GfuiFontClass(char *FileName)
 	if( readSize <= 0 )
 		GfLogWarning( "Not all bytes are successfully read" );
 
-#ifndef WIN32
+#if !defined(WIN32) && !defined(__HAIKU__)
 #if BYTE_ORDER == BIG_ENDIAN
 	swap32((unsigned int *)font->Char, sizeof(GLFONTCHAR) * Num);
 #endif
diff --git a/src/modules/graphic/ssggraph/CMakeLists.txt b/src/modules/graphic/ssggraph/CMakeLists.txt
index f25b2b951..e41404080 100644
--- a/src/modules/graphic/ssggraph/CMakeLists.txt
+++ b/src/modules/graphic/ssggraph/CMakeLists.txt
@@ -33,9 +33,9 @@ SET(SSGGRAPH_SOURCES grMoonpos.cpp
                      ssggraph.cpp)
 
 SET(SSGGRAPH_OTHER_SOURCES )
-IF(NOT APPLE)
+IF(NOT APPLE AND NOT HAIKU)
     SET(SSGGRAPH_HEADERS ${SSGGRAPH_HEADERS} grshader.h grshader.cpp)
-ENDIF(NOT APPLE)
+ENDIF(NOT APPLE AND NOT HAIKU)
 
 ADD_INTERFACE_INCLUDEDIR()
 ADD_SDLIB_INCLUDEDIR(portability math tgf tgfclient robottools)
diff --git a/src/modules/graphic/ssggraph/grcar.h b/src/modules/graphic/ssggraph/grcar.h
index 474f81f14..8490de5ad 100644
--- a/src/modules/graphic/ssggraph/grcar.h
+++ b/src/modules/graphic/ssggraph/grcar.h
@@ -26,7 +26,7 @@
 #include <car.h>		//tCarElt
 #include <raceman.h>	//tSituation
 #include "grcam.h"		//cGrPerspCamera
-#ifndef __APPLE__
+#if !defined(__APPLE__) && !defined(__HAIKU__)
 #include "grshader.h"   //cGrShader
 #endif
 
@@ -97,7 +97,7 @@ public:
     tdble				py;
     tdble				sx;
     tdble				sy;
-#ifndef __APPLE__
+#if !defined(__APPLE__) && !defined(__HAIKU__)
     cgrShader           *shader;
 #endif
 };