diff --git a/src/screen.c b/src/screen.c
index 37e4da31..c61aa1f7 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -81,6 +81,11 @@ extern int wScreenCount;
 extern int wXkbSupported;
 #endif
 
+#ifdef HAVE_XRANDR
+Bool has_randr;
+int randr_event_base;
+#endif
+
 extern WDDomain *WDWindowMaker;
 
 /**** Local ****/
diff --git a/src/screen.h b/src/screen.h
index 861983fc..be27cdb9 100644
--- a/src/screen.h
+++ b/src/screen.h
@@ -36,8 +36,8 @@
 #define WTB_MENU 6
 
 #ifdef HAVE_XRANDR
-Bool has_randr;
-int randr_event_base;
+extern Bool has_randr;
+extern int randr_event_base;
 #endif
 
 typedef struct {
diff --git a/util/wmmenugen.c b/util/wmmenugen.c
index 82ad8ce0..ac3846bb 100644
--- a/util/wmmenugen.c
+++ b/util/wmmenugen.c
@@ -45,6 +45,10 @@ char *terminal;
 
 extern char *__progname;
 
+/* Global Variables from wmmenugen.h */
+WMTreeNode *menu;
+char *env_lang, *env_ctry, *env_enc, *env_mod;
+
 int main(int argc, char **argv)
 {
 	struct stat st;
diff --git a/util/wmmenugen.h b/util/wmmenugen.h
index cdefbe99..3a60ab2a 100644
--- a/util/wmmenugen.h
+++ b/util/wmmenugen.h
@@ -46,9 +46,9 @@ typedef struct {
 
 /* the abstract menu tree
  */
-WMTreeNode *menu;
+extern WMTreeNode *menu;
 
-char *env_lang, *env_ctry, *env_enc, *env_mod;
+extern char *env_lang, *env_ctry, *env_enc, *env_mod;
 
 /* wmmenu_misc.c
  */