--- deliantra/server/socket/loop.C	2006/09/14 22:34:05	1.7
+++ deliantra/server/socket/loop.C	2006/12/12 20:53:03	1.9
@@ -39,13 +39,11 @@
 # include <sockproto.h>
 #endif
 
-#ifndef WIN32                   /* ---win32 exclude unix headers */
-# include <sys/types.h>
-# include <sys/time.h>
-# include <sys/socket.h>
-# include <netinet/in.h>
-# include <netdb.h>
-#endif /* end win32 */
+#include <sys/types.h>
+#include <sys/time.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <netdb.h>
 
 #ifdef HAVE_UNISTD_H
 # include <unistd.h>
@@ -381,7 +379,7 @@
           if (!QUERY_FLAG (pl->ob, FLAG_REMOVED))
             {
               terminate_all_pets (pl->ob);
-              remove_ob (pl->ob);
+              pl->ob->remove ();
             }
           leave (pl, 1);
           final_free_player (pl);
@@ -533,7 +531,7 @@
           if (!QUERY_FLAG (pl->ob, FLAG_REMOVED))
             {
               terminate_all_pets (pl->ob);
-              remove_ob (pl->ob);
+              pl->ob->remove ();
             }
           leave (pl, 1);
           final_free_player (pl);
@@ -552,7 +550,7 @@
               if (!QUERY_FLAG (pl->ob, FLAG_REMOVED))
                 {
                   terminate_all_pets (pl->ob);
-                  remove_ob (pl->ob);
+                  pl->ob->remove ();
                 }
               leave (pl, 1);
               final_free_player (pl);