Index: code/branches/libraries2/src/modules/questsystem/notifications/CMakeLists.txt
===================================================================
--- code/branches/libraries2/src/modules/questsystem/notifications/CMakeLists.txt	(revision 5721)
+++ code/branches/libraries2/src/modules/questsystem/notifications/CMakeLists.txt	(revision 5722)
@@ -1,3 +1,3 @@
-ADD_SOURCE_FILES(QUEST_SRC_FILES
+ADD_SOURCE_FILES(QUESTSYSTEM_SRC_FILES
   Notification.cc
   NotificationManager.cc
Index: code/branches/libraries2/src/modules/questsystem/notifications/Notification.h
===================================================================
--- code/branches/libraries2/src/modules/questsystem/notifications/Notification.h	(revision 5721)
+++ code/branches/libraries2/src/modules/questsystem/notifications/Notification.h	(revision 5722)
@@ -35,5 +35,5 @@
 #define _Notification_H__
 
-#include "objects/quest/QuestPrereqs.h"
+#include "questsystem/QuestsystemPrereqs.h"
 
 #include <string>
@@ -49,5 +49,5 @@
         Damian 'Mozork' Frick
     */
-    class _QuestExport Notification : public BaseObject
+    class _QuestsystemExport Notification : public BaseObject
     {
         public:
Index: code/branches/libraries2/src/modules/questsystem/notifications/NotificationManager.h
===================================================================
--- code/branches/libraries2/src/modules/questsystem/notifications/NotificationManager.h	(revision 5721)
+++ code/branches/libraries2/src/modules/questsystem/notifications/NotificationManager.h	(revision 5722)
@@ -35,5 +35,5 @@
 #define _NotificationManager_H__
 
-#include "objects/quest/QuestPrereqs.h"
+#include "questsystem/QuestsystemPrereqs.h"
 
 #include <ctime>
@@ -54,5 +54,5 @@
         Damian 'Mozork' Frick
     */
-    class _QuestExport NotificationManager : public ScopedSingleton<NotificationManager, ScopeID::GSLevel>, public OrxonoxClass
+    class _QuestsystemExport NotificationManager : public ScopedSingleton<NotificationManager, ScopeID::GSLevel>, public OrxonoxClass
     {
             friend class ScopedSingleton<NotificationManager, ScopeID::GSLevel>;
Index: code/branches/libraries2/src/modules/questsystem/notifications/NotificationOverlay.cc
===================================================================
--- code/branches/libraries2/src/modules/questsystem/notifications/NotificationOverlay.cc	(revision 5721)
+++ code/branches/libraries2/src/modules/questsystem/notifications/NotificationOverlay.cc	(revision 5722)
@@ -36,5 +36,5 @@
 #include "util/Exception.h"
 #include "core/CoreIncludes.h"
-#include "objects/quest/notifications/Notification.h"
+#include "Notification.h"
 #include "NotificationQueue.h"
 
Index: code/branches/libraries2/src/modules/questsystem/notifications/NotificationOverlay.h
===================================================================
--- code/branches/libraries2/src/modules/questsystem/notifications/NotificationOverlay.h	(revision 5721)
+++ code/branches/libraries2/src/modules/questsystem/notifications/NotificationOverlay.h	(revision 5722)
@@ -36,5 +36,5 @@
 #define _NotificationOverlay_H__
 
-#include "objects/quest/QuestPrereqs.h"
+#include "questsystem/QuestsystemPrereqs.h"
 
 #include <string>
@@ -50,5 +50,5 @@
         Damian 'Mozork' Frick
     */
-    class _QuestExport NotificationOverlay : public OverlayText
+    class _QuestsystemExport NotificationOverlay : public OverlayText
     {
 
Index: code/branches/libraries2/src/modules/questsystem/notifications/NotificationQueue.cc
===================================================================
--- code/branches/libraries2/src/modules/questsystem/notifications/NotificationQueue.cc	(revision 5721)
+++ code/branches/libraries2/src/modules/questsystem/notifications/NotificationQueue.cc	(revision 5722)
@@ -39,5 +39,5 @@
 #include "core/XMLPort.h"
 #include "NotificationOverlay.h"
-#include "objects/quest/notifications/NotificationManager.h"
+#include "NotificationManager.h"
 
 namespace orxonox
Index: code/branches/libraries2/src/modules/questsystem/notifications/NotificationQueue.h
===================================================================
--- code/branches/libraries2/src/modules/questsystem/notifications/NotificationQueue.h	(revision 5721)
+++ code/branches/libraries2/src/modules/questsystem/notifications/NotificationQueue.h	(revision 5722)
@@ -35,5 +35,5 @@
 #define _NotificationOueue_H__
 
-#include "objects/quest/QuestPrereqs.h"
+#include "questsystem/QuestsystemPrereqs.h"
 
 #include <ctime>
@@ -85,5 +85,5 @@
     */
 
-    class _QuestExport NotificationQueue : public OverlayGroup, public Tickable, public NotificationListener
+    class _QuestsystemExport NotificationQueue : public OverlayGroup, public Tickable, public NotificationListener
     {
 
