Index: code/branches/libraries2/src/orxonox/objects/quest/QuestEffectBeacon.cc
===================================================================
--- code/branches/libraries2/src/orxonox/objects/quest/QuestEffectBeacon.cc	(revision 5717)
+++ code/branches/libraries2/src/orxonox/objects/quest/QuestEffectBeacon.cc	(revision 5720)
@@ -37,6 +37,6 @@
 #include "core/XMLPort.h"
 #include "core/EventIncludes.h"
-#include "orxonox/objects/worldentities/pawns/Pawn.h"
-#include "orxonox/objects/worldentities/triggers/PlayerTrigger.h"
+#include "objects/worldentities/pawns/Pawn.h"
+#include "objects/worldentities/triggers/PlayerTrigger.h"
 #include "QuestEffect.h"
 
@@ -52,5 +52,5 @@
     {
         RegisterObject(QuestEffectBeacon);
-        
+
         this->status_ = QuestEffectBeaconStatus::Active;
         this->times_ = INFINITE_TIME;
@@ -63,5 +63,5 @@
     {
     }
-    
+
     /**
     @brief
@@ -74,8 +74,8 @@
         XMLPortParam(QuestEffectBeacon, "times", setTimes, getTimes, xmlelement, mode);
         XMLPortObject(QuestEffectBeacon, QuestEffect, "effects", addEffect, getEffect, xmlelement, mode);
-        
+
         COUT(3) << "New QuestEffectBeacon created." << std::endl;
     }
-    
+
     /**
     @brief
@@ -85,8 +85,8 @@
     {
         SUPER(QuestEffectBeacon, processEvent, event);
-    
+
         ORXONOX_SET_SUBCLASS_EVENT(QuestEffectBeacon, "execute", execute, event, PlayerTrigger);
     }
-    
+
     /**
     @brief
@@ -109,5 +109,5 @@
             return false;
         }
-        
+
         if(!trigger->isForPlayer()) //!< The PlayerTrigger is not exclusively for ControllableEntities which means we cannot extract one.
         {
@@ -123,8 +123,8 @@
             return false;
         }
-        
+
         //! Extract the PlayerInfo from the ControllableEntity.
         PlayerInfo* player = pawn->getPlayer();
-        
+
         if(player == NULL)
         {
@@ -144,5 +144,5 @@
         return false;
     }
-    
+
     /**
     @brief
@@ -159,5 +159,5 @@
             return false;
         }
-        
+
         if(activate)
         {
@@ -165,9 +165,9 @@
         return true;
         }
-        
+
         this->status_ = QuestEffectBeaconStatus::Inactive;
         return true;
     }
-    
+
     /**
     @brief
@@ -186,5 +186,5 @@
             return true;
         }
-        
+
         this->times_ = this->times_ - 1; //!< Decrement number of times the QuestEffectBeacon can be executed.
         if(this->getTimes() == 0) //!< Set the QuestEffectBeacon to inactive when the number of times it can be executed is reduced to 0.
@@ -192,8 +192,8 @@
             this->status_ = QuestEffectBeaconStatus::Inactive;
         }
-        
-        return true;
-    }
-    
+
+        return true;
+    }
+
     /**
     @brief
@@ -212,9 +212,9 @@
             return false;
         }
-        
+
         this->times_ = n;
         return true;
     }
-    
+
     /**
     @brief
@@ -238,5 +238,5 @@
         return true;
     }
-    
+
     /**
     @brief
Index: code/branches/libraries2/src/orxonox/objects/quest/QuestEffectBeacon.h
===================================================================
--- code/branches/libraries2/src/orxonox/objects/quest/QuestEffectBeacon.h	(revision 5717)
+++ code/branches/libraries2/src/orxonox/objects/quest/QuestEffectBeacon.h	(revision 5720)
@@ -38,5 +38,5 @@
 
 #include <list>
-#include "orxonox/objects/worldentities/StaticEntity.h"
+#include "objects/worldentities/StaticEntity.h"
 
 namespace orxonox
Index: code/branches/libraries2/src/orxonox/objects/quest/notifications/NotificationOverlay.h
===================================================================
--- code/branches/libraries2/src/orxonox/objects/quest/notifications/NotificationOverlay.h	(revision 5717)
+++ code/branches/libraries2/src/orxonox/objects/quest/notifications/NotificationOverlay.h	(revision 5720)
@@ -39,5 +39,5 @@
 
 #include <string>
-#include "orxonox/overlays/OverlayText.h"
+#include "overlays/OverlayText.h"
 
 namespace orxonox
Index: code/branches/libraries2/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc
===================================================================
--- code/branches/libraries2/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc	(revision 5717)
+++ code/branches/libraries2/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc	(revision 5720)
@@ -31,5 +31,5 @@
 #include "core/CoreIncludes.h"
 #include "core/XMLPort.h"
-#include "orxonox/objects/worldentities/pawns/Pawn.h"
+#include "objects/worldentities/pawns/Pawn.h"
 
 namespace orxonox
