--- a/include/jcomp-compat.h
+++ b/include/jcomp-compat.h
@@ -66,6 +66,6 @@
     handel hds;
 };
 
-int deliver__flag;
+extern int deliver__flag;
 
 typedef void(*shutdown_func)(void *arg);
--- a/src/conference_user.c
+++ b/src/conference_user.c
@@ -19,7 +19,7 @@
  */
 
 #include "conference.h"
-extern int deliver__flag;
+int deliver__flag;
 
 cnu con_user_new(cnr room, jid id)
 {
--- a/include/jcomp.h
+++ b/include/jcomp.h
@@ -98,7 +98,7 @@
 #define _STREAM_ERROR	   4
 #define _STREAM_SHUTDOWN   5
 
-jcr_instance jcr;
+extern jcr_instance jcr;
 
 void log_debug(char *, const char *, ...) G_GNUC_PRINTF(2, 3);
 void log_warn(char *, const char *, ...) G_GNUC_PRINTF(2, 3);
--- a/src/conference.c
+++ b/src/conference.c
@@ -20,6 +20,8 @@
 
 #include "conference.h"
 
+jcr_instance jcr;
+
 void con_server_browsewalk(gpointer key, gpointer data, gpointer arg)
 {
   cnr room = (cnr)data;
@@ -1064,7 +1066,6 @@
 /*** everything starts here ***/
 void conference(instance i, xmlnode x)
 {
-  extern jcr_instance jcr;
   cni master;
   xmlnode cfg;
   jid sadmin;