Index: code/branches/pch/src/orxonox/objects/collisionshapes/CollisionShape.cc
===================================================================
--- code/branches/pch/src/orxonox/objects/collisionshapes/CollisionShape.cc	(revision 3130)
+++ code/branches/pch/src/orxonox/objects/collisionshapes/CollisionShape.cc	(revision 3149)
@@ -31,5 +31,4 @@
 #include "BulletCollision/CollisionShapes/btCollisionShape.h"
 
-#include "util/Exception.h"
 #include "core/CoreIncludes.h"
 #include "core/XMLPort.h"
Index: code/branches/pch/src/orxonox/objects/collisionshapes/CompoundCollisionShape.cc
===================================================================
--- code/branches/pch/src/orxonox/objects/collisionshapes/CompoundCollisionShape.cc	(revision 3130)
+++ code/branches/pch/src/orxonox/objects/collisionshapes/CompoundCollisionShape.cc	(revision 3149)
@@ -31,5 +31,4 @@
 #include "BulletCollision/CollisionShapes/btCompoundShape.h"
 
-#include "util/Exception.h"
 #include "core/CoreIncludes.h"
 #include "core/XMLPort.h"
Index: code/branches/pch/src/orxonox/objects/collisionshapes/WorldEntityCollisionShape.cc
===================================================================
--- code/branches/pch/src/orxonox/objects/collisionshapes/WorldEntityCollisionShape.cc	(revision 3130)
+++ code/branches/pch/src/orxonox/objects/collisionshapes/WorldEntityCollisionShape.cc	(revision 3149)
@@ -31,5 +31,5 @@
 #include "BulletCollision/CollisionShapes/btCompoundShape.h"
 
-#include "util/Exception.h"
+#include "util/OrxAssert.h"
 #include "core/CoreIncludes.h"
 #include "objects/worldentities/WorldEntity.h"
Index: code/branches/pch/src/orxonox/objects/quest/AddQuest.cc
===================================================================
--- code/branches/pch/src/orxonox/objects/quest/AddQuest.cc	(revision 3130)
+++ code/branches/pch/src/orxonox/objects/quest/AddQuest.cc	(revision 3149)
@@ -37,5 +37,4 @@
 
 #include "core/CoreIncludes.h"
-#include "util/Exception.h"
 
 #include "orxonox/objects/infos/PlayerInfo.h"
Index: code/branches/pch/src/orxonox/objects/quest/AddQuestHint.cc
===================================================================
--- code/branches/pch/src/orxonox/objects/quest/AddQuestHint.cc	(revision 3130)
+++ code/branches/pch/src/orxonox/objects/quest/AddQuestHint.cc	(revision 3149)
@@ -35,5 +35,4 @@
 
 #include "core/CoreIncludes.h"
-#include "util/Exception.h"
 
 #include "orxonox/objects/infos/PlayerInfo.h"
Index: code/branches/pch/src/orxonox/objects/quest/CompleteQuest.cc
===================================================================
--- code/branches/pch/src/orxonox/objects/quest/CompleteQuest.cc	(revision 3130)
+++ code/branches/pch/src/orxonox/objects/quest/CompleteQuest.cc	(revision 3149)
@@ -35,5 +35,4 @@
 
 #include "core/CoreIncludes.h"
-#include "util/Exception.h"
 
 #include "orxonox/objects/infos/PlayerInfo.h"
Index: code/branches/pch/src/orxonox/objects/quest/FailQuest.cc
===================================================================
--- code/branches/pch/src/orxonox/objects/quest/FailQuest.cc	(revision 3130)
+++ code/branches/pch/src/orxonox/objects/quest/FailQuest.cc	(revision 3149)
@@ -35,5 +35,4 @@
 
 #include "core/CoreIncludes.h"
-#include "util/Exception.h"
 
 #include "orxonox/objects/infos/PlayerInfo.h"
Index: code/branches/pch/src/orxonox/objects/quest/GlobalQuest.cc
===================================================================
--- code/branches/pch/src/orxonox/objects/quest/GlobalQuest.cc	(revision 3130)
+++ code/branches/pch/src/orxonox/objects/quest/GlobalQuest.cc	(revision 3149)
@@ -37,5 +37,4 @@
 #include "core/CoreIncludes.h"
 #include "core/Super.h"
-#include "util/Exception.h"
 
 #include "QuestEffect.h"
Index: code/branches/pch/src/orxonox/objects/quest/LocalQuest.cc
===================================================================
--- code/branches/pch/src/orxonox/objects/quest/LocalQuest.cc	(revision 3130)
+++ code/branches/pch/src/orxonox/objects/quest/LocalQuest.cc	(revision 3149)
@@ -36,5 +36,4 @@
 #include "core/CoreIncludes.h"
 #include "core/Super.h"
-#include "util/Exception.h"
 
 #include "orxonox/objects/infos/PlayerInfo.h"
Index: code/branches/pch/src/orxonox/objects/quest/QuestHint.cc
===================================================================
--- code/branches/pch/src/orxonox/objects/quest/QuestHint.cc	(revision 3130)
+++ code/branches/pch/src/orxonox/objects/quest/QuestHint.cc	(revision 3149)
@@ -35,5 +35,4 @@
 
 #include "core/CoreIncludes.h"
-#include "util/Exception.h"
 
 #include "orxonox/objects/infos/PlayerInfo.h"
Index: code/branches/pch/src/orxonox/objects/quest/QuestListener.cc
===================================================================
--- code/branches/pch/src/orxonox/objects/quest/QuestListener.cc	(revision 3130)
+++ code/branches/pch/src/orxonox/objects/quest/QuestListener.cc	(revision 3149)
@@ -36,5 +36,4 @@
 #include "core/CoreIncludes.h"
 #include "core/XMLPort.h"
-#include "util/Exception.h"
 
 #include "Quest.h"
Index: code/branches/pch/src/orxonox/objects/quest/QuestManager.cc
===================================================================
--- code/branches/pch/src/orxonox/objects/quest/QuestManager.cc	(revision 3130)
+++ code/branches/pch/src/orxonox/objects/quest/QuestManager.cc	(revision 3149)
@@ -38,5 +38,4 @@
 #include "core/input/InputManager.h"
 
-#include "util/Exception.h"
 #include "gui/GUIManager.h"
 #include "objects/infos/PlayerInfo.h"
Index: code/branches/pch/src/orxonox/objects/worldentities/Backlight.cc
===================================================================
--- code/branches/pch/src/orxonox/objects/worldentities/Backlight.cc	(revision 3130)
+++ code/branches/pch/src/orxonox/objects/worldentities/Backlight.cc	(revision 3149)
@@ -37,5 +37,4 @@
 #include "core/XMLPort.h"
 #include "objects/Scene.h"
-#include "util/Exception.h"
 
 namespace orxonox
Index: code/branches/pch/src/orxonox/objects/worldentities/MobileEntity.cc
===================================================================
--- code/branches/pch/src/orxonox/objects/worldentities/MobileEntity.cc	(revision 3130)
+++ code/branches/pch/src/orxonox/objects/worldentities/MobileEntity.cc	(revision 3149)
@@ -34,5 +34,4 @@
 #include "util/Debug.h"
 #include "util/MathConvert.h"
-#include "util/Exception.h"
 #include "core/CoreIncludes.h"
 #include "core/XMLPort.h"
Index: code/branches/pch/src/orxonox/objects/worldentities/StaticEntity.cc
===================================================================
--- code/branches/pch/src/orxonox/objects/worldentities/StaticEntity.cc	(revision 3130)
+++ code/branches/pch/src/orxonox/objects/worldentities/StaticEntity.cc	(revision 3149)
@@ -33,5 +33,5 @@
 #include "BulletDynamics/Dynamics/btRigidBody.h"
 
-#include "util/Exception.h"
+#include "util/OrxAssert.h"
 #include "core/CoreIncludes.h"
 
Index: code/branches/pch/src/orxonox/objects/worldentities/WorldEntity.cc
===================================================================
--- code/branches/pch/src/orxonox/objects/worldentities/WorldEntity.cc	(revision 3130)
+++ code/branches/pch/src/orxonox/objects/worldentities/WorldEntity.cc	(revision 3149)
@@ -35,5 +35,5 @@
 #include "BulletDynamics/Dynamics/btRigidBody.h"
 
-#include "util/Exception.h"
+#include "util/OrxAssert.h"
 #include "util/Convert.h"
 #include "core/CoreIncludes.h"
Index: code/branches/pch/src/orxonox/objects/worldentities/pawns/SpaceShip.cc
===================================================================
--- code/branches/pch/src/orxonox/objects/worldentities/pawns/SpaceShip.cc	(revision 3130)
+++ code/branches/pch/src/orxonox/objects/worldentities/pawns/SpaceShip.cc	(revision 3149)
@@ -32,5 +32,4 @@
 
 #include "util/Math.h"
-#include "util/Exception.h"
 #include "core/CoreIncludes.h"
 #include "core/ConfigValueIncludes.h"
