Index: trunk/src/world_entities/weapons/aiming_turret.cc
===================================================================
--- trunk/src/world_entities/weapons/aiming_turret.cc	(revision 10013)
+++ trunk/src/world_entities/weapons/aiming_turret.cc	(revision 10114)
@@ -27,6 +27,6 @@
 #include "util/loading/factory.h"
 
-#include "class_id_DEPRECATED.h"
-ObjectListDefinitionID(AimingTurret, CL_AIMING_TURRET);
+
+ObjectListDefinition(AimingTurret);
 CREATE_FACTORY(AimingTurret);
 
Index: trunk/src/world_entities/weapons/boomerang_gun.cc
===================================================================
--- trunk/src/world_entities/weapons/boomerang_gun.cc	(revision 10013)
+++ trunk/src/world_entities/weapons/boomerang_gun.cc	(revision 10114)
@@ -27,6 +27,6 @@
 #include "util/loading/factory.h"
 
-#include "class_id_DEPRECATED.h"
-ObjectListDefinitionID(BoomerangGun, CL_BOOMERANG_GUN);
+
+ObjectListDefinition(BoomerangGun);
 CREATE_FACTORY(BoomerangGun);
 
Index: trunk/src/world_entities/weapons/cannon.cc
===================================================================
--- trunk/src/world_entities/weapons/cannon.cc	(revision 10013)
+++ trunk/src/world_entities/weapons/cannon.cc	(revision 10114)
@@ -36,6 +36,6 @@
 
 
-#include "class_id_DEPRECATED.h"
-ObjectListDefinitionID(Cannon, CL_CANNON);
+
+ObjectListDefinition(Cannon);
 CREATE_FACTORY(Cannon);
 
Index: trunk/src/world_entities/weapons/fps_sniper_rifle.cc
===================================================================
--- trunk/src/world_entities/weapons/fps_sniper_rifle.cc	(revision 10013)
+++ trunk/src/world_entities/weapons/fps_sniper_rifle.cc	(revision 10114)
@@ -39,6 +39,6 @@
 
 
-#include "class_id_DEPRECATED.h"
-ObjectListDefinitionID(FPSSniperRifle, CL_FPS_SNIPER_RIFLE);
+
+ObjectListDefinition(FPSSniperRifle);
 CREATE_FACTORY(FPSSniperRifle);
 
Index: trunk/src/world_entities/weapons/hyperblaster.cc
===================================================================
--- trunk/src/world_entities/weapons/hyperblaster.cc	(revision 10013)
+++ trunk/src/world_entities/weapons/hyperblaster.cc	(revision 10114)
@@ -35,6 +35,6 @@
 
 
-#include "class_id_DEPRECATED.h"
-ObjectListDefinitionID(Hyperblaster, CL_HYPERBLASTER);
+
+ObjectListDefinition(Hyperblaster);
 CREATE_FACTORY(Hyperblaster);
 
Index: trunk/src/world_entities/weapons/laser_cannon.cc
===================================================================
--- trunk/src/world_entities/weapons/laser_cannon.cc	(revision 10013)
+++ trunk/src/world_entities/weapons/laser_cannon.cc	(revision 10114)
@@ -31,6 +31,6 @@
 #include "loading/fast_factory.h"
 
-#include "class_id_DEPRECATED.h"
-ObjectListDefinitionID(LaserCannon, CL_LASER_CANNON);
+
+ObjectListDefinition(LaserCannon);
 CREATE_FACTORY(LaserCannon);
 
Index: trunk/src/world_entities/weapons/targeting_turret.cc
===================================================================
--- trunk/src/world_entities/weapons/targeting_turret.cc	(revision 10013)
+++ trunk/src/world_entities/weapons/targeting_turret.cc	(revision 10114)
@@ -26,6 +26,6 @@
 #include "util/loading/factory.h"
 
-#include "class_id_DEPRECATED.h"
-ObjectListDefinitionID(TargetingTurret, CL_TARGETING_TURRET);
+
+ObjectListDefinition(TargetingTurret);
 CREATE_FACTORY(TargetingTurret);
 
Index: trunk/src/world_entities/weapons/test_gun.cc
===================================================================
--- trunk/src/world_entities/weapons/test_gun.cc	(revision 10013)
+++ trunk/src/world_entities/weapons/test_gun.cc	(revision 10114)
@@ -33,6 +33,6 @@
 #include "loading/fast_factory.h"
 
-#include "class_id_DEPRECATED.h"
-ObjectListDefinitionID(TestGun, CL_TEST_GUN);
+
+ObjectListDefinition(TestGun);
 CREATE_FACTORY(TestGun);
 /**
Index: trunk/src/world_entities/weapons/turret.cc
===================================================================
--- trunk/src/world_entities/weapons/turret.cc	(revision 10013)
+++ trunk/src/world_entities/weapons/turret.cc	(revision 10114)
@@ -27,6 +27,6 @@
 #include "util/loading/factory.h"
 
-#include "class_id_DEPRECATED.h"
-ObjectListDefinitionID(Turret, CL_TURRET);
+
+ObjectListDefinition(Turret);
 CREATE_FACTORY(Turret);
 
