Simplify duplicative object/ includes.

code/object/collideshipweapon.cpp

@@ -17,7 +17,6 @@
 #include "network/multiutil.h"
 #include "object/objcollide.h"
 #include "object/object.h"
-#include "parse/lua.h"
 #include "parse/scripting.h"
 #include "playerman/player.h"
 #include "ship/ship.h"

code/object/collideweaponweapon.cpp

@@ -13,7 +13,6 @@
 #include "network/multi.h"
 #include "object/objcollide.h"
 #include "object/object.h"
-#include "parse/lua.h"
 #include "parse/scripting.h"
 #include "ship/ship.h"
 #include "stats/scoring.h"

code/object/deadobjectdock.cpp

@@ -6,7 +6,6 @@
 
 
 
-#include "globalincs/pstypes.h"
 #include "object/deadobjectdock.h"
 #include "object/object.h"
 

code/object/deadobjectdock.h

@@ -10,7 +10,7 @@
 #define _DEAD_OBJECT_DOCK_H
 
 #include "globalincs/globals.h"
-#include "objectdock.h"
+#include "object/objectdock.h"
 
 
 // get the first object in objp's dock list

code/object/objectdock.cpp

@@ -6,7 +6,6 @@
 
 
 
-#include "globalincs/pstypes.h"
 #include "math/bitarray.h"
 #include "math/vecmat.h"
 #include "mission/missionparse.h"

code/object/objectdock.h

@@ -10,6 +10,7 @@
 #define _OBJECT_DOCK_H
 
 #include "globalincs/globals.h"
+#include "globalincs/pstypes.h"
 
 class object;
 

code/object/objectsnd.cpp

@@ -14,7 +14,6 @@
 #include "debugconsole/console.h"
 #include "gamesnd/gamesnd.h"
 #include "globalincs/linklist.h"
-#include "globalincs/pstypes.h"
 #include "io/joy_ff.h"
 #include "io/timer.h"
 #include "object/object.h"