diff --git a/src/qt-gui/CMakeLists.txt b/src/qt-gui/CMakeLists.txt
index 8ddb0a4..dd84111 100644
--- a/src/qt-gui/CMakeLists.txt
+++ b/src/qt-gui/CMakeLists.txt
@@ -36,8 +36,20 @@ SET(MOC_HEADERS
 QT4_WRAP_CPP(MOC_SRCS ${MOC_HEADERS})
 
 INCLUDE_DIRECTORIES(".")
-set_source_files_properties(osx-configuration.mm PROPERTIES COMPILE_FLAGS -ObjC++)
-
+IF(UNIX AND NOT APPLE)
+  INCLUDE_DIRECTORIES(/usr/local/include/GNUstep /usr/include/GNUstep)
+  EXECUTE_PROCESS(COMMAND gnustep-config --objc-flags
+    OUTPUT_VARIABLE GnuStep_FLAGS
+    OUTPUT_STRIP_TRAILING_WHITESPACE)
+  EXECUTE_PROCESS(COMMAND gnustep-config --base-libs
+    OUTPUT_VARIABLE GnuStep_LINK_FLAGS
+    OUTPUT_STRIP_TRAILING_WHITESPACE)
+  STRING(REPLACE "\n" "" GnuStep_FLAGS ${GnuStep_FLAGS})
+  STRING(REPLACE "\n" "" GnuStep_LINK_FLAGS ${GnuStep_LINK_FLAGS})
+  set_source_files_properties(osx-configuration.mm PROPERTIES COMPILE_FLAGS "${GnuStep_FLAGS}")
+ELSE()
+  set_source_files_properties(osx-configuration.mm PROPERTIES COMPILE_FLAGS -ObjC++)
+ENDIF()
 
 add_executable(demo-application
   main.cpp
@@ -65,6 +77,10 @@ ADD_EXECUTABLE(${BundleName} MACOSX_BUNDLE
   ${MOC_SRCS}
   ${EXTRA_SRC}
   )
+IF(UNIX AND NOT APPLE)
+  SET_TARGET_PROPERTIES(${BundleName} PROPERTIES
+    LINK_FLAGS "${GnuStep_LINK_FLAGS}")
+ENDIF()
 TARGET_LINK_LIBRARIES(${BundleName} ${LIBS} ${QT_LIBRARIES} clmTracker avatarAnim ${EXTRA_LIBS})
 
 
diff --git a/src/qt-gui/gui/worker-thread.cpp b/src/qt-gui/gui/worker-thread.cpp
index 880565d..f420753 100644
--- a/src/qt-gui/gui/worker-thread.cpp
+++ b/src/qt-gui/gui/worker-thread.cpp
@@ -24,7 +24,7 @@
 #include <stdexcept>
 #include <numeric>
 
-#include "avatar/avatar.hpp"
+#include "avatar/Avatar.hpp"
 #include "gui/avatar.hpp"
 #include "configuration.hpp"
 
diff --git a/src/qt-gui/osx-configuration.mm b/src/qt-gui/osx-configuration.mm
index 2e3e1f6..4d841f5 100644
--- a/src/qt-gui/osx-configuration.mm
+++ b/src/qt-gui/osx-configuration.mm
@@ -19,6 +19,7 @@
 
 #include <Foundation/NSBundle.h>
 #include <Foundation/NSString.h>
+#include <Foundation/NSValue.h>
 #include <Foundation/NSPathUtilities.h>
 #include <Foundation/NSAutoreleasePool.h>
 #include <Foundation/NSDictionary.h>