diff --git a/src/defaults.c b/src/defaults.c
index 69832751..1f6b6eb6 100644
--- a/src/defaults.c
+++ b/src/defaults.c
@@ -61,7 +61,6 @@
 #include "dock.h"
 #include "workspace.h"
 #include "properties.h"
-#include "rootmenu.h"
 
 #define MAX_SHORTCUT_LENGTH 32
 
@@ -1013,9 +1012,6 @@ void wDefaultsCheckDomains(void* arg)
 				}
 				WDRootMenu->dictionary = dict;
 				wDefaultsMergeGlobalMenus(WDRootMenu);
-				scr = wScreenWithNumber(0);
-				configureMenu(scr, dict, True);
-				rebind_key_grabs(scr);
 			}
 		} else {
 			wwarning(_("could not load domain %s from user defaults database"), "WMRootMenu");
diff --git a/src/rootmenu.c b/src/rootmenu.c
index b2b28cec..cca29aeb 100644
--- a/src/rootmenu.c
+++ b/src/rootmenu.c
@@ -50,7 +50,6 @@
 #include "framewin.h"
 #include "session.h"
 #include "xmodifier.h"
-#include "rootmenu.h"
 
 #include <WINGs/WUtil.h>
 
@@ -64,6 +63,7 @@ extern WPreferences wPreferences;
 static WMenu *readMenuPipe(WScreen * scr, char **file_name);
 static WMenu *readMenuFile(WScreen * scr, char *file_name);
 static WMenu *readMenuDirectory(WScreen * scr, char *title, char **file_name, char *command);
+static WMenu *configureMenu(WScreen * scr, WMPropList * definition, Bool includeGlobals);
 
 typedef struct Shortcut {
 	struct Shortcut *next;
@@ -377,7 +377,7 @@ void wRootMenuBindShortcuts(Window window)
 	}
 }
 
-void rebind_key_grabs(WScreen *scr)
+static void rebindKeygrabs(WScreen * scr)
 {
 	WWindow *wwin;
 
@@ -1477,7 +1477,7 @@ static WMenu *makeDefaultMenu(WScreen * scr)
  *
  *----------------------------------------------------------------------
  */
-WMenu *configureMenu(WScreen *scr, WMPropList *definition, Bool includeGlobals)
+static WMenu *configureMenu(WScreen * scr, WMPropList * definition, Bool includeGlobals)
 {
 	WMenu *menu = NULL;
 	WMPropList *elem;
@@ -1728,5 +1728,5 @@ void OpenRootMenu(WScreen * scr, int x, int y, int keyboard)
 	}
 
 	if (scr->flags.root_menu_changed_shortcuts)
-		rebind_key_grabs(scr);
+		rebindKeygrabs(scr);
 }
diff --git a/src/rootmenu.h b/src/rootmenu.h
index 76085368..e7ed8557 100644
--- a/src/rootmenu.h
+++ b/src/rootmenu.h
@@ -23,11 +23,11 @@
 #define WMROOTMENU_H
 
 #include "WindowMaker.h"
-#include "screen.h"
-#include "menu.h"
+
 
 typedef void *WRootMenuData;
 
+
 typedef struct _WRootMenuReader {
     Bool (*checkMenuChange)(char *path, time_t lastAccessTime);
 
@@ -41,7 +41,4 @@ typedef struct _WRootMenuReader {
     void (*closeMenuFile)(WRootMenuData *data);
 } WRootMenuReader;
 
-void rebind_key_grabs(WScreen *scr);
-WMenu *configureMenu(WScreen *scr, WMPropList *definition, Bool includeGlobals);
-
 #endif /* WMROOTMENU_H */