diff --git a/src/tools/menuview/CMakeLists.txt b/src/tools/menuview/CMakeLists.txt
index 605f552e..eb7711bf 100644
--- a/src/tools/menuview/CMakeLists.txt
+++ b/src/tools/menuview/CMakeLists.txt
@@ -3,7 +3,7 @@ PROJECT(menuview)
 
 SET(MENUVIEW_SOURCES main.cpp previewmenu.cpp)
 
-ADD_SDLIB_INCLUDEDIR(client robottools tgf tgfclient math portability)
+ADD_SDLIB_INCLUDEDIR(robottools tgf tgfclient math portability)
 ADD_OSSPEC_INCLUDEDIR()
 ADD_SDL_INCLUDEDIR()
 ADD_INTERFACE_INCLUDEDIR()
@@ -22,7 +22,7 @@ IF (WIN32)
 ENDIF(WIN32)
 
 
-ADD_SDLIB_LIBRARY(${SD_TOOLS_EXECPREFIX}menuview robottools tgf tgfclient client)
+ADD_SDLIB_LIBRARY(${SD_TOOLS_EXECPREFIX}menuview robottools tgf tgfclient)
 
 
 IF(OPENGL_FOUND)
diff --git a/src/tools/menuview/main.cpp b/src/tools/menuview/main.cpp
index 773228f4..673da878 100644
--- a/src/tools/menuview/main.cpp
+++ b/src/tools/menuview/main.cpp
@@ -17,26 +17,28 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <config.h>
+#include <string>
 
-#ifdef WIN32
+#ifdef _MSC_VER
 #include <windows.h>
-#include <direct.h>
 #include <shlobj.h>
 #endif
 
 #include <portability.h>
 
+#include <tgf.h>
+#include <tgfclient.h>
+
 #ifdef WIN32
-#include "windowsspec.h"
+#include <windowsspec.h>
 #else
-#include "linuxspec.h"
+#include <linuxspec.h>
 #endif
 
-#include <client.h>
+//#include <client.h>
 
-#include "mainmenu.h"
-#include "splash.h"
+//#include "mainmenu.h"
+//#include "splash.h"
 #include "previewmenu.h"
 
 
diff --git a/src/tools/menuview/previewmenu.cpp b/src/tools/menuview/previewmenu.cpp
index ccd0fc70..fc6fc586 100644
--- a/src/tools/menuview/previewmenu.cpp
+++ b/src/tools/menuview/previewmenu.cpp
@@ -25,7 +25,10 @@
 
 
 void *menuHandle = NULL;
-tModList *RacemanModLoaded = (tModList*)NULL;
+
+// What's this ? RacemanModLoaded never set anywhere but initialized to 0 !
+//tModList *RacemanModLoaded = (tModList*)NULL;
+
 std::string g_strFile;
 
 void LoadMenuScreen();
@@ -40,9 +43,10 @@ endofprog(void * /* dummy */)
 static void
 PreviewMenuActivate(void * /* dummy */)
 {
-    if (RacemanModLoaded) {
-	GfModUnloadList(&RacemanModLoaded);
-    }
+// What's this ? RacemanModLoaded never set anywhere but initialized to 0 !
+//    if (RacemanModLoaded) {
+//	GfModUnloadList(&RacemanModLoaded);
+//    }
 }
 
 int ReadControl(void *param,std::string strType,const char *pControlName)
diff --git a/src/tools/menuview/previewmenu.h b/src/tools/menuview/previewmenu.h
index 0a6d5bb1..cb094b5b 100644
--- a/src/tools/menuview/previewmenu.h
+++ b/src/tools/menuview/previewmenu.h
@@ -25,7 +25,9 @@
 #endif
 
 extern void *menuHandle;
-extern tModList *RacemanModLoaded;
+
+// What's this ? RacemanModLoaded never set anywhere but initialized to 0 !
+//extern tModList *RacemanModLoaded;
 
 extern int PreviewMenuInit(const char *pFile);
 extern int PreviewMenuRun(void);
diff --git a/src/tools/trackgen/CMakeLists.txt b/src/tools/trackgen/CMakeLists.txt
index 3cf932c4..56970fd7 100644
--- a/src/tools/trackgen/CMakeLists.txt
+++ b/src/tools/trackgen/CMakeLists.txt
@@ -30,7 +30,7 @@ IF (WIN32)
 	ADD_EXECUTABLE(${SD_TOOLS_EXECPREFIX}trackgen ${TRACKGEN_SOURCES} ../../windows/windowsspec.cpp)
 ENDIF(WIN32)
 
-ADD_SDLIB_LIBRARY(${SD_TOOLS_EXECPREFIX}trackgen robottools tgf tgfclient client)
+ADD_SDLIB_LIBRARY(${SD_TOOLS_EXECPREFIX}trackgen robottools tgf tgfclient)
 
 IF(OPENGL_FOUND)
 	TARGET_LINK_LIBRARIES(${SD_TOOLS_EXECPREFIX}trackgen ${OPENGL_LIBRARY})