--- deliantra/server/include/libproto.h	2006/09/03 22:45:56	1.9
+++ deliantra/server/include/libproto.h	2006/09/04 16:46:32	1.11
@@ -185,7 +185,6 @@
 extern void get_rangevector_from_mapcoord(const mapstruct *m, int x, int y, const object *op2, rv_vector *retval, int flags);
 extern int on_same_map(const object *op1, const object *op2);
 /* object.c */
-extern int CAN_MERGE(object *ob1, object *ob2);
 extern signed long sum_weight(object *op);
 extern object *object_get_env_recursive(object *op);
 extern object *is_player_inv(object *op);
@@ -204,7 +203,6 @@
 extern void reset_object(object *op);
 extern void clear_object(object *op);
 extern void copy_object(object *op2, object *op);
-extern void expand_objects(void);
 extern object *get_object(void);
 extern void update_turn_face(object *op);
 extern void update_ob_speed(object *op);
@@ -212,9 +210,6 @@
 extern void update_object(object *op, int action);
 extern void free_object(object *ob);
 extern void free_object2(object *ob, int free_inventory);
-extern int count_free(void);
-extern int count_used(void);
-extern int count_active(void);
 extern void sub_weight(object *op, signed long weight);
 extern void remove_ob(object *op);
 extern object *merge_ob(object *op, object *top);