Index: code/branches/FICN/src/orxonox/weapon/CMakeLists.txt
===================================================================
--- code/branches/FICN/src/orxonox/weapon/CMakeLists.txt	(revision 337)
+++ code/branches/FICN/src/orxonox/weapon/CMakeLists.txt	(revision 341)
@@ -1,6 +1,5 @@
 PROJECT(Orxonox)
 
-# create a few variables to simplify life
-SET( WEAPON_SRC
+SET( WEAPON_SRC_FILES
 	ammunition_dump.cc
 	barrel_gun.cc
@@ -11,5 +10,3 @@
 )
 
-INCLUDE_DIRECTORIES(..)
-
-ADD_LIBRARY(weapon ${WEAPON_SRC})
+ADD_LIBRARY(weapon ${WEAPON_SRC_FILES})
Index: code/branches/FICN/src/orxonox/weapon/ammunition_dump.cc
===================================================================
--- code/branches/FICN/src/orxonox/weapon/ammunition_dump.cc	(revision 337)
+++ code/branches/FICN/src/orxonox/weapon/ammunition_dump.cc	(revision 341)
@@ -26,5 +26,5 @@
  */
 
-#include "run_manager.h"
+#include "orxonox/run_manager.h"
 
 #include "ammunition_dump.h"
Index: code/branches/FICN/src/orxonox/weapon/ammunition_dump.h
===================================================================
--- code/branches/FICN/src/orxonox/weapon/ammunition_dump.h	(revision 337)
+++ code/branches/FICN/src/orxonox/weapon/ammunition_dump.h	(revision 341)
@@ -32,5 +32,5 @@
 #include "OgrePrerequisites.h"
 
-#include "orxonox_prerequisites.h"
+#include "orxonox/orxonox_prerequisites.h"
 
 
Index: code/branches/FICN/src/orxonox/weapon/barrel_gun.cc
===================================================================
--- code/branches/FICN/src/orxonox/weapon/barrel_gun.cc	(revision 337)
+++ code/branches/FICN/src/orxonox/weapon/barrel_gun.cc	(revision 341)
@@ -33,7 +33,8 @@
 #include "OgreSceneManager.h"
 
+#include "orxonox/inertial_node.h"
+
 #include "bullet.h"
 #include "bullet_manager.h"
-#include "inertial_node.h"
 #include "ammunition_dump.h"
 #include "base_weapon.h"
Index: code/branches/FICN/src/orxonox/weapon/barrel_gun.h
===================================================================
--- code/branches/FICN/src/orxonox/weapon/barrel_gun.h	(revision 337)
+++ code/branches/FICN/src/orxonox/weapon/barrel_gun.h	(revision 341)
@@ -32,5 +32,5 @@
 #include "OgrePrerequisites.h"
 
-#include "orxonox_prerequisites.h"
+#include "orxonox/orxonox_prerequisites.h"
 
 
Index: code/branches/FICN/src/orxonox/weapon/base_weapon.cc
===================================================================
--- code/branches/FICN/src/orxonox/weapon/base_weapon.cc	(revision 337)
+++ code/branches/FICN/src/orxonox/weapon/base_weapon.cc	(revision 341)
@@ -33,9 +33,10 @@
 #include "OgreSceneManager.h"
 
+#include "orxonox/inertial_node.h"
+#include "orxonox/run_manager.h"
+
 #include "bullet.h"
 #include "bullet_manager.h"
-#include "inertial_node.h"
 #include "ammunition_dump.h"
-#include "run_manager.h"
 
 #include "base_weapon.h"
Index: code/branches/FICN/src/orxonox/weapon/base_weapon.h
===================================================================
--- code/branches/FICN/src/orxonox/weapon/base_weapon.h	(revision 337)
+++ code/branches/FICN/src/orxonox/weapon/base_weapon.h	(revision 341)
@@ -32,5 +32,5 @@
 #include "OgrePrerequisites.h"
 
-#include "orxonox_prerequisites.h"
+#include "orxonox/orxonox_prerequisites.h"
 
 
Index: code/branches/FICN/src/orxonox/weapon/bullet.h
===================================================================
--- code/branches/FICN/src/orxonox/weapon/bullet.h	(revision 337)
+++ code/branches/FICN/src/orxonox/weapon/bullet.h	(revision 341)
@@ -32,5 +32,5 @@
 #include "OgrePrerequisites.h"
 
-#include "orxonox_prerequisites.h"
+#include "orxonox/orxonox_prerequisites.h"
 
 
Index: code/branches/FICN/src/orxonox/weapon/bullet_manager.h
===================================================================
--- code/branches/FICN/src/orxonox/weapon/bullet_manager.h	(revision 337)
+++ code/branches/FICN/src/orxonox/weapon/bullet_manager.h	(revision 341)
@@ -32,5 +32,5 @@
 #include "OgrePrerequisites.h"
 
-#include "orxonox_prerequisites.h"
+#include "orxonox/orxonox_prerequisites.h"
 
 
Index: code/branches/FICN/src/orxonox/weapon/weapon_station.h
===================================================================
--- code/branches/FICN/src/orxonox/weapon/weapon_station.h	(revision 337)
+++ code/branches/FICN/src/orxonox/weapon/weapon_station.h	(revision 341)
@@ -32,5 +32,5 @@
 #include "OgrePrerequisites.h"
 
-#include "orxonox_prerequisites.h"
+#include "orxonox/orxonox_prerequisites.h"
 
 
