Index: code/branches/FICN/src/orxonox/objects/Ambient.cc
===================================================================
--- code/branches/FICN/src/orxonox/objects/Ambient.cc	(revision 715)
+++ code/branches/FICN/src/orxonox/objects/Ambient.cc	(revision 716)
@@ -34,5 +34,5 @@
 #include "misc/Tokenizer.h"
 #include "misc/String2Number.h"
-#include "misc/ColourValue.h"
+#include "misc/Math.h"
 #include "../core/Debug.h"
 #include "../core/CoreIncludes.h"
Index: code/branches/FICN/src/orxonox/objects/BillboardSet.cc
===================================================================
--- code/branches/FICN/src/orxonox/objects/BillboardSet.cc	(revision 715)
+++ code/branches/FICN/src/orxonox/objects/BillboardSet.cc	(revision 716)
@@ -31,6 +31,5 @@
 
 #include "../Orxonox.h"
-#include "misc/Vector3.h"
-#include "misc/ColourValue.h"
+#include "misc/Math.h"
 
 #include "BillboardSet.h"
Index: code/branches/FICN/src/orxonox/objects/BillboardSet.h
===================================================================
--- code/branches/FICN/src/orxonox/objects/BillboardSet.h	(revision 715)
+++ code/branches/FICN/src/orxonox/objects/BillboardSet.h	(revision 716)
@@ -10,5 +10,5 @@
 #include "../core/CoreIncludes.h"
 #include "misc/ColourValue.h"
-#include "misc/Vector3.h"
+#include "misc/Math.h"
 
 namespace orxonox
Index: code/branches/FICN/src/orxonox/objects/Camera.cc
===================================================================
--- code/branches/FICN/src/orxonox/objects/Camera.cc	(revision 715)
+++ code/branches/FICN/src/orxonox/objects/Camera.cc	(revision 716)
@@ -10,5 +10,5 @@
 #include "misc/Tokenizer.h"
 #include "misc/String2Number.h"
-#include "misc/Vector3.h"
+#include "misc/Math.h"
 #include "../core/Debug.h"
 #include "../core/CoreIncludes.h"
Index: code/branches/FICN/src/orxonox/objects/Explosion.cc
===================================================================
--- code/branches/FICN/src/orxonox/objects/Explosion.cc	(revision 715)
+++ code/branches/FICN/src/orxonox/objects/Explosion.cc	(revision 716)
@@ -31,5 +31,5 @@
 
 #include "../core/CoreIncludes.h"
-#include "misc/ColourValue.h"
+#include "misc/Math.h"
 #include "../Orxonox.h"
 #include "../particle/ParticleInterface.h"
Index: code/branches/FICN/src/orxonox/objects/Light.h
===================================================================
--- code/branches/FICN/src/orxonox/objects/Light.h	(revision 715)
+++ code/branches/FICN/src/orxonox/objects/Light.h	(revision 716)
@@ -8,5 +8,5 @@
 #include "../OrxonoxPrereqs.h"
 
-#include "misc/ColourValue.h"
+#include "misc/Math.h"
 
 namespace orxonox
Index: code/branches/FICN/src/orxonox/objects/WorldEntity.h
===================================================================
--- code/branches/FICN/src/orxonox/objects/WorldEntity.h	(revision 715)
+++ code/branches/FICN/src/orxonox/objects/WorldEntity.h	(revision 716)
@@ -7,7 +7,5 @@
 #include "../OrxonoxPrereqs.h"
 
-#include "misc/Vector3.h"
-#include "misc/Matrix3.h"
-#include "misc/Quaternion.h"
+#include "misc/Math.h"
 #include "network/Synchronisable.h"
 #include "tinyxml/tinyxml.h"
Index: code/branches/FICN/src/orxonox/objects/weapon_system/BarrelGun.cc
===================================================================
--- code/branches/FICN/src/orxonox/objects/weapon_system/BarrelGun.cc	(revision 715)
+++ code/branches/FICN/src/orxonox/objects/weapon_system/BarrelGun.cc	(revision 716)
@@ -31,5 +31,5 @@
 #include <OgreSceneManager.h>
 
-#include "misc/Vector3.h"
+#include "misc/Math.h"
 #include "Bullet.h"
 #include "BulletManager.h"
Index: code/branches/FICN/src/orxonox/objects/weapon_system/BaseWeapon.cc
===================================================================
--- code/branches/FICN/src/orxonox/objects/weapon_system/BaseWeapon.cc	(revision 715)
+++ code/branches/FICN/src/orxonox/objects/weapon_system/BaseWeapon.cc	(revision 716)
@@ -31,5 +31,5 @@
 #include <OgreSceneManager.h>
 
-#include "misc/Vector3.h"
+#include "misc/Math.h"
 #include "../../Orxonox.h"
 #include "Bullet.h"
