--- deliantra/server/include/global.h	2006/12/14 02:37:37	1.25
+++ deliantra/server/include/global.h	2006/12/15 19:59:19	1.26
@@ -61,7 +61,6 @@
 #include "dynbuf.h"
 #include "util.h"
 #include "shstr.h"
-#include "newclient.h"
 
 /* This blob, in this order, is needed to actually define maps */
 #include "face.h"
@@ -76,7 +75,8 @@
 #include "skills.h"
 
 /* Pull in the socket structure - used in the player structure */
-#include "newserver.h"
+#include "network.h"
+#include "client.h"
 
 /* Pull in the player structure */
 #include "player.h"
@@ -200,7 +200,7 @@
 extern New_Face *dark_faces[];
 extern New_Face *smooth_face;
 
-extern client_socket *init_sockets;
+extern client *init_sockets;
 
 #include "libproto.h"
 #include "sockproto.h"