diff --git a/src/libs/tgfclient/webserver.h b/src/libs/tgfclient/webserver.h
index 18bc89cf..e1894d46 100644
--- a/src/libs/tgfclient/webserver.h
+++ b/src/libs/tgfclient/webserver.h
@@ -22,11 +22,14 @@
     @version    $Id$
 */
 #ifdef WEBSERVER
+
+#ifndef _SD_WEBSERVER_H_
+#define _SD_WEBSERVER_H_
 #include "tgfclient.h"
 #include <vector>
 #include <string>
 #include <ctime>
-#include <curl/multi.h>
+#include <curl/curl.h>
 
 struct webRequest_t {
   int id;
@@ -127,6 +130,8 @@ class TGFCLIENT_API WebServer {
 		//destructor
 		~WebServer();	
 };
+
+#endif //_SD_WEBSERVER_H_
 #endif //WEBSERVER
 
 
diff --git a/src/modules/racing/standardgame/raceinit.cpp b/src/modules/racing/standardgame/raceinit.cpp
index 4981b355..de3e66e6 100644
--- a/src/modules/racing/standardgame/raceinit.cpp
+++ b/src/modules/racing/standardgame/raceinit.cpp
@@ -42,11 +42,12 @@
 #include <robottools.h>
 #include <replay.h>
 
-#include <portability.h>
+
 #include <tgf.hpp>
 #ifdef WEBSERVER
 #include <webserver.h>
 #endif //WEBSERVER
+#include <portability.h>
 
 #include <racemanagers.h>
 #include <race.h>
diff --git a/src/modules/racing/standardgame/raceresults.cpp b/src/modules/racing/standardgame/raceresults.cpp
index b7d3e36c..1af14bee 100644
--- a/src/modules/racing/standardgame/raceresults.cpp
+++ b/src/modules/racing/standardgame/raceresults.cpp
@@ -28,12 +28,14 @@
 #include <algorithm>
 #include <string>
 
-#include <portability.h>
-#include <robot.h>
 #ifdef WEBSERVER
 #include <webserver.h>
 #endif //WEBSERVER
 
+#include <portability.h>
+#include <robot.h>
+
+
 #include "standardgame.h"
 
 #include "racesituation.h"
diff --git a/src/modules/userinterface/legacymenu/confscreens/playerconfig.cpp b/src/modules/userinterface/legacymenu/confscreens/playerconfig.cpp
index d910bb06..8efc0b30 100644
--- a/src/modules/userinterface/legacymenu/confscreens/playerconfig.cpp
+++ b/src/modules/userinterface/legacymenu/confscreens/playerconfig.cpp
@@ -23,15 +23,17 @@
 #include <deque>
 #include <string>
 
+#ifdef WEBSERVER
+#include <webserver.h>
+#endif //WEBSERVER
+
 #include <portability.h>
 #include <tgfclient.h>
 #include <robot.h>
 #include <playerpref.h>
 #include <graphic.h>
 #include <gui.h>
-#ifdef WEBSERVER
-#include <webserver.h>
-#endif //WEBSERVER
+
 
 #include <drivers.h>