--- deliantra/server/include/global.h	2006/09/03 07:57:56	1.11
+++ deliantra/server/include/global.h	2006/09/08 16:51:44	1.15
@@ -77,7 +77,6 @@
 typedef signed char	sint8;
 #define SINT8_MAX	127
 
-
 typedef unsigned short Fontindex;
 
 #ifdef WIN32
@@ -109,11 +108,14 @@
 
 #include <vector>
 
+#define ACC_CLASS(name)
+#define ACC(meta,member) member
+
 #include "keyword.h"
 #include "traits.h"
 #include "dynbuf.h"
-#include "shstr.h"
 #include "util.h"
+#include "shstr.h"
 
 /* This blob, in this order, is needed to actually define maps */
 #include "face.h"
@@ -149,7 +151,6 @@
   struct linked_char *next;
 } linked_char;
 
-
 /* Pull in artifacts */
 #include "artifact.h"
 
@@ -224,7 +225,6 @@
  * Used in treasure.c
  */
 EXTERN archetype *ring_arch,*amulet_arch,*staff_arch,*crown_arch;
-extern shstr undead_name;	/* Used in hit_player() in main.c */
 
 extern std::vector<Animations> animations;
 EXTERN int num_animations,animations_allocated, bmaps_checksum;
@@ -405,6 +405,7 @@
 #include "cfperl.h"
 
 //TODO: various TEMPORARY link guards to avoid doing the wrong thing
+void free (object *);
 void free (archetype *);
 void free (recipe *);
 void free (linked_char *);
@@ -414,5 +415,7 @@
 void free (treasure *);
 void free (materialtype_t *);
 void free (player *);
+void free (New_Face *);
 
 #endif /* GLOBAL_H */
+