Index: code/trunk/src/orxonox/objects/weapon/AmmunitionDump.cc
===================================================================
--- code/trunk/src/orxonox/objects/weapon/AmmunitionDump.cc	(revision 790)
+++ code/trunk/src/orxonox/objects/weapon/AmmunitionDump.cc	(revision 871)
@@ -31,4 +31,5 @@
 #include "BulletManager.h"
 #include "util/tinyxml/tinyxml.h"
+#include "core/CoreIncludes.h"
 
 #include "AmmunitionDump.h"
Index: code/trunk/src/orxonox/objects/weapon/AmmunitionDump.h
===================================================================
--- code/trunk/src/orxonox/objects/weapon/AmmunitionDump.h	(revision 790)
+++ code/trunk/src/orxonox/objects/weapon/AmmunitionDump.h	(revision 871)
@@ -37,5 +37,4 @@
 
 #include "network/Synchronisable.h"
-//#include "../core/CoreIncludes.h"
 #include "core/BaseObject.h"
 
@@ -66,5 +65,4 @@
     int *capacity_;
   };
-  ExportClass(AmmunitionDump, Orxonox);
 }
 
Index: code/trunk/src/orxonox/objects/weapon/BarrelGun.cc
===================================================================
--- code/trunk/src/orxonox/objects/weapon/BarrelGun.cc	(revision 790)
+++ code/trunk/src/orxonox/objects/weapon/BarrelGun.cc	(revision 871)
@@ -38,4 +38,5 @@
 #include "AmmunitionDump.h"
 #include "BaseWeapon.h"
+#include "core/CoreIncludes.h"
 
 #include "BarrelGun.h"
Index: code/trunk/src/orxonox/objects/weapon/BarrelGun.h
===================================================================
--- code/trunk/src/orxonox/objects/weapon/BarrelGun.h	(revision 790)
+++ code/trunk/src/orxonox/objects/weapon/BarrelGun.h	(revision 871)
@@ -60,5 +60,4 @@
 
   };
-  ExportClass(BarrelGun, Orxonox);
 }
 
Index: code/trunk/src/orxonox/objects/weapon/BaseWeapon.cc
===================================================================
--- code/trunk/src/orxonox/objects/weapon/BaseWeapon.cc	(revision 790)
+++ code/trunk/src/orxonox/objects/weapon/BaseWeapon.cc	(revision 871)
@@ -38,4 +38,5 @@
 #include "BulletManager.h"
 #include "AmmunitionDump.h"
+#include "core/CoreIncludes.h"
 
 #include "BaseWeapon.h"
Index: code/trunk/src/orxonox/objects/weapon/BaseWeapon.h
===================================================================
--- code/trunk/src/orxonox/objects/weapon/BaseWeapon.h	(revision 790)
+++ code/trunk/src/orxonox/objects/weapon/BaseWeapon.h	(revision 871)
@@ -122,5 +122,4 @@
 
   };
-  ExportAbstractClass(BaseWeapon, Orxonox);
 }
 
Index: code/trunk/src/orxonox/objects/weapon/Bullet.cc
===================================================================
--- code/trunk/src/orxonox/objects/weapon/Bullet.cc	(revision 790)
+++ code/trunk/src/orxonox/objects/weapon/Bullet.cc	(revision 871)
@@ -27,4 +27,5 @@
 
 #include "OrxonoxStableHeaders.h"
+#include "core/CoreIncludes.h"
 
 #include "Bullet.h"
Index: code/trunk/src/orxonox/objects/weapon/Bullet.h
===================================================================
--- code/trunk/src/orxonox/objects/weapon/Bullet.h	(revision 790)
+++ code/trunk/src/orxonox/objects/weapon/Bullet.h	(revision 871)
@@ -47,5 +47,4 @@
     inline virtual void loadParams(TiXmlElement* xmlElem) { Model::loadParams(xmlElem); };
  };
-  ExportClass(Bullet, Orxonox);
 }
 
Index: code/trunk/src/orxonox/objects/weapon/BulletManager.cc
===================================================================
--- code/trunk/src/orxonox/objects/weapon/BulletManager.cc	(revision 790)
+++ code/trunk/src/orxonox/objects/weapon/BulletManager.cc	(revision 871)
@@ -30,4 +30,5 @@
 #include "BulletManager.h"
 #include "Bullet.h"
+#include "core/CoreIncludes.h"
 
 
Index: code/trunk/src/orxonox/objects/weapon/BulletManager.h
===================================================================
--- code/trunk/src/orxonox/objects/weapon/BulletManager.h	(revision 790)
+++ code/trunk/src/orxonox/objects/weapon/BulletManager.h	(revision 871)
@@ -38,5 +38,4 @@
 #include "network/Synchronisable.h"
 #include "util/tinyxml/tinyxml.h"
-#include "../../core/CoreIncludes.h"
 #include "core/BaseObject.h"
 #include "../Tickable.h"
@@ -67,5 +66,4 @@
 	  int bulletsIndex_;
   };
-  ExportClass(BulletManager, Orxonox);
 }
 
