diff --git a/src/server/connections.h b/src/server/connections.h
index 11a40cdf5e5c03d5e5a119ce03da214e570d1676..7f6ac6e9a1673180c33262dc51d12aacf1a11836 100644
--- a/src/server/connections.h
+++ b/src/server/connections.h
@@ -85,10 +85,6 @@ typedef struct connection {
  */
 extern struct isc_mcb *kom_server_mcb;
 
-#if 0
-extern Connection *all_connections;
-#endif
-
 /*
  * active_connection points to the info about the client who initiated this
  * call. This is set by connectins.c whenever a complete message is parsed
@@ -101,31 +97,31 @@ Connection * active_connection;
  * This enum describes the result of a function in services.c.
  */
 typedef enum {
-    number,			/* E.g. Pers_no, Conf_no, Text_no, time_t.
+    rt_number,			/* E.g. Pers_no, Conf_no, Text_no, time_t.
 				   This is somewhat special in that the
 				   function indicates an error by returning
 				   0 and not FAILURE. */
-    success,			/* Only return a Success. */
+    rt_success,			/* Only return a Success. */
     /* Functions of the following types returns a Success _and_ data
        of the indicated type. The corresponding types are found in
        kom-types.h */
-    person,
-    membership,
-    conf_list,
-    conf_no_list,
-    conference,
-    string,
-    mark_list,
-    text_stat,
-    text_list,
-    who_info_list,
-    who_info_list_old,
-    info,
-    membership_list,
-    member_list,
-    time_date,
-    session_info,
-    session_no
+    rt_person,
+    rt_membership,
+    rt_conf_list,
+    rt_conf_no_list,
+    rt_conference,
+    rt_string,
+    rt_mark_list,
+    rt_text_stat,
+    rt_text_list,
+    rt_who_info_list,
+    rt_who_info_list_old,
+    rt_info,
+    rt_membership_list,
+    rt_member_list,
+    rt_time_date,
+    rt_session_info,
+    rt_session_no
 } Res_type;
 
 /*
@@ -177,3 +173,6 @@ toploop(void);
 
 extern void
 dump_statistics(void);
+
+extern void
+logout_all_clients(void);