Index: code/branches/pch/src/orxonox/objects/infos/Bot.cc
===================================================================
--- code/branches/pch/src/orxonox/objects/infos/Bot.cc	(revision 3178)
+++ code/branches/pch/src/orxonox/objects/infos/Bot.cc	(revision 3179)
@@ -29,4 +29,5 @@
 #include "Bot.h"
 
+#include "util/Math.h"
 #include "core/GameMode.h"
 #include "core/CoreIncludes.h"
@@ -34,5 +35,4 @@
 #include "objects/gametypes/Gametype.h"
 #include "objects/controllers/AIController.h"
-#include "util/Math.h"
 
 namespace orxonox
@@ -66,5 +66,5 @@
     void Bot::setConfigValues()
     {
-        static std::string names[] =
+        static const std::string names[] =
         {
             "Dr. Julius No",
Index: code/branches/pch/src/orxonox/objects/infos/Bot.h
===================================================================
--- code/branches/pch/src/orxonox/objects/infos/Bot.h	(revision 3178)
+++ code/branches/pch/src/orxonox/objects/infos/Bot.h	(revision 3179)
@@ -31,6 +31,6 @@
 
 #include "OrxonoxPrereqs.h"
+
 #include <vector>
-
 #include "PlayerInfo.h"
 
Index: code/branches/pch/src/orxonox/objects/infos/GametypeInfo.cc
===================================================================
--- code/branches/pch/src/orxonox/objects/infos/GametypeInfo.cc	(revision 3178)
+++ code/branches/pch/src/orxonox/objects/infos/GametypeInfo.cc	(revision 3179)
@@ -31,4 +31,5 @@
 #include "core/CoreIncludes.h"
 #include "core/GameMode.h"
+#include "core/ObjectList.h"
 #include "network/NetworkFunction.h"
 #include "network/Host.h"
Index: code/branches/pch/src/orxonox/objects/infos/GametypeInfo.h
===================================================================
--- code/branches/pch/src/orxonox/objects/infos/GametypeInfo.h	(revision 3178)
+++ code/branches/pch/src/orxonox/objects/infos/GametypeInfo.h	(revision 3179)
@@ -32,4 +32,5 @@
 #include "OrxonoxPrereqs.h"
 
+#include <string>
 #include "Info.h"
 
Index: code/branches/pch/src/orxonox/objects/infos/HumanPlayer.cc
===================================================================
--- code/branches/pch/src/orxonox/objects/infos/HumanPlayer.cc	(revision 3178)
+++ code/branches/pch/src/orxonox/objects/infos/HumanPlayer.cc	(revision 3179)
@@ -29,7 +29,7 @@
 #include "HumanPlayer.h"
 
-#include "core/GameMode.h"
 #include "core/CoreIncludes.h"
 #include "core/ConfigValueIncludes.h"
+#include "core/GameMode.h"
 #include "network/ClientInformation.h"
 #include "network/Host.h"
Index: code/branches/pch/src/orxonox/objects/infos/HumanPlayer.h
===================================================================
--- code/branches/pch/src/orxonox/objects/infos/HumanPlayer.h	(revision 3178)
+++ code/branches/pch/src/orxonox/objects/infos/HumanPlayer.h	(revision 3179)
@@ -32,4 +32,5 @@
 #include "OrxonoxPrereqs.h"
 
+#include <string>
 #include "PlayerInfo.h"
 
Index: code/branches/pch/src/orxonox/objects/infos/Info.cc
===================================================================
--- code/branches/pch/src/orxonox/objects/infos/Info.cc	(revision 3178)
+++ code/branches/pch/src/orxonox/objects/infos/Info.cc	(revision 3179)
@@ -28,5 +28,4 @@
 
 #include "Info.h"
-
 #include "core/CoreIncludes.h"
 
Index: code/branches/pch/src/orxonox/objects/infos/PlayerInfo.cc
===================================================================
--- code/branches/pch/src/orxonox/objects/infos/PlayerInfo.cc	(revision 3178)
+++ code/branches/pch/src/orxonox/objects/infos/PlayerInfo.cc	(revision 3179)
@@ -34,4 +34,5 @@
 #include "network/ClientInformation.h"
 #include "objects/gametypes/Gametype.h"
+#include "objects/worldentities/ControllableEntity.h"
 
 namespace orxonox
Index: code/branches/pch/src/orxonox/objects/infos/PongBot.h
===================================================================
--- code/branches/pch/src/orxonox/objects/infos/PongBot.h	(revision 3178)
+++ code/branches/pch/src/orxonox/objects/infos/PongBot.h	(revision 3179)
@@ -31,5 +31,4 @@
 
 #include "OrxonoxPrereqs.h"
-
 #include "Bot.h"
 
