--- deliantra/server/include/global.h	2006/12/13 02:55:50	1.22
+++ deliantra/server/include/global.h	2006/12/15 19:59:19	1.26
@@ -39,10 +39,20 @@
 typedef int64_t		sint64;
 typedef uint64_t	uint64;
 
-typedef unsigned short Fontindex;
-
-#include <vector>
+#include "config.h"
+#include "define.h"
+#include "logger.h"
+
+#ifndef TRUE
+#define TRUE 1
+#endif
+
+#ifndef FALSE
+#define FALSE 0
+#endif
 
+// used only for tagging structure members so scripting languages
+// can easily parse the include files.
 #define ACC_CLASS(name)
 #define ACC(meta,member) member
 
@@ -65,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"
@@ -162,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 */
@@ -189,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"