trap.cpp & .h header include cleanup and forward declare

zone/trap.cpp

@@ -15,13 +15,15 @@
 	along with this program; if not, write to the Free Software
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
-#include "../common/debug.h"
-#include "../common/types.h"
-#include "entity.h"
-#include "masterentity.h"
+
 #include "../common/spdat.h"
-#include "../common/misc_functions.h"
 #include "../common/string_util.h"
+#include "../common/types.h"
+
+#include "client.h"
+#include "entity.h"
+#include "mob.h"
+#include "trap.h"
 
 /*
 

zone/trap.h

@@ -18,10 +18,11 @@
 #ifndef _TRAP_H
 #define _TRAP_H
 
-#include "../common/debug.h"
-
 #include "entity.h"
 
+class Mob;
+class NPC;
+
 //ID of the NPC type to spawn when a trap is set off, to do the damage
 #define TRAP_NPC_TYPE 1586