--- deliantra/server/socket/item.C	2006/12/15 00:34:17	1.21
+++ deliantra/server/socket/item.C	2006/12/15 19:59:20	1.23
@@ -35,8 +35,6 @@
 
 #include <global.h>
 #include <object.h>             /* LOOK_OBJ */
-#include <newclient.h>
-#include <newserver.h>
 #include <sproto.h>
 
 /** This is the maximum number of bytes we expect any one item to take up */
@@ -116,7 +114,7 @@
  * animation of face to the client.
  */
 static void
-add_object_to_socklist (client_socket &ns, packet &sl, object *head)
+add_object_to_socklist (client &ns, packet &sl, object *head)
 {
   int flags, len, anim_speed;
   char item_n[MAX_BUF];
@@ -642,10 +640,10 @@
 
 /** Client wants to apply some object.  Lets do so. */
 void
-LockItem (uint8 *data, int len, player *pl)
+LockItem (char *data, int len, player *pl)
 {
   int flag = data[0];
-  tag_t tag = net_uint32 (data + 1);
+  tag_t tag = net_uint32 ((uint8 *)data + 1);
   object *op = esrv_get_ob_from_count (pl->ob, tag);
 
   if (!op)
@@ -664,9 +662,9 @@
 
 /** Client wants to apply some object.  Lets do so. */
 void
-MarkItem (uint8 * data, int len, player *pl)
+MarkItem (char *data, int len, player *pl)
 {
-  tag_t tag = net_uint32 (data);
+  tag_t tag = net_uint32 ((uint8 *)data);
   object *op = esrv_get_ob_from_count (pl->ob, tag);
 
   if (!op)