--- deliantra/server/include/global.h	2006/12/13 18:08:01	1.23
+++ deliantra/server/include/global.h	2006/12/15 20:08:45	1.28
@@ -18,7 +18,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    The author can be reached via e-mail to crossfire-devel@real-time.com
+    The author can be reached via e-mail to crossfire@schmorp.de
 */
 
 #ifndef GLOBAL_H
@@ -39,8 +39,6 @@
 typedef int64_t		sint64;
 typedef uint64_t	uint64;
 
-typedef unsigned short Fontindex;
-
 #include "config.h"
 #include "define.h"
 #include "logger.h"
@@ -63,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"
@@ -78,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"
@@ -175,7 +173,7 @@
  */
 EXTERN archetype *ring_arch,*amulet_arch,*staff_arch,*crown_arch;
 
-extern std::vector<Animations> animations;
+EXTERN std::vector<Animations> animations;
 EXTERN int num_animations,animations_allocated, bmaps_checksum;
 
 /* Rotate right from bsd sum. This is used in various places for checksumming */
@@ -202,7 +200,7 @@
 extern New_Face *dark_faces[];
 extern New_Face *smooth_face;
 
-extern NewSocket *init_sockets;
+extern client *init_sockets;
 
 #include "libproto.h"
 #include "sockproto.h"