--- deliantra/server/include/cfperl.h	2008/05/08 20:03:50	1.97
+++ deliantra/server/include/cfperl.h	2008/11/16 03:52:12	1.100
@@ -52,7 +52,9 @@
 #undef srand48
 #undef drand48
 #undef srandom
+#undef opendir
 #undef readdir
+#undef closedir
 #undef getprotobyname
 #undef gethostbyname
 #undef ctime
@@ -97,7 +99,6 @@
 void cfperl_emergency_save ();
 void cfperl_cleanup (int make_core);
 void cfperl_make_book (object *book, int level);
-void cfperl_expand_cfpod (player *pl, std::string &msg);
 void cfperl_send_msg (client *ns, int color, const char *type, const char *msg);
 int cfperl_can_merge (object *ob1, object *ob2);
 
@@ -184,14 +185,14 @@
 {
   static MGVTBL vtbl;
 
-  static unordered_vector<attachable *> mortals;
-  MTH static void check_mortals ();
-
   enum {
     F_DESTROYED   = 0x01,
     F_DEBUG_TRACE = 0x02,
   };
-  int ACC (RW, flags);
+  uint8 ACC (RW, flags);
+
+  static unordered_vector<attachable *> mortals;
+  MTH static void check_mortals ();
 
   // object is delete'd after the refcount reaches 0
   MTH int refcnt_cnt () const;