diff --git a/capplets/keyboard/gnome-keyboard-properties-xkb.h b/capplets/keyboard/gnome-keyboard-properties-xkb.h
index e86f9961b..23a1df384 100644
--- a/capplets/keyboard/gnome-keyboard-properties-xkb.h
+++ b/capplets/keyboard/gnome-keyboard-properties-xkb.h
@@ -37,18 +37,10 @@ extern GkbdKeyboardConfig initial_config;
 
 extern void setup_xkb_tabs (GladeXML * dialog, GConfChangeSet * changeset);
 
-extern void xkb_layouts_fill_available_tree (GladeXML * dialog);
-
-extern void xkb_options_fill_available_tree (GladeXML * dialog);
-
 extern void xkb_layouts_fill_selected_tree (GladeXML * dialog);
 
-extern void xkb_options_fill_selected_tree (GladeXML * dialog);
-
 extern void xkb_layouts_register_buttons_handlers (GladeXML * dialog);
 
-extern void xkb_options_register_buttons_handlers (GladeXML * dialog);
-
 extern void xkb_layouts_register_gconf_listener (GladeXML * dialog);
 
 extern void xkb_options_register_gconf_listener (GladeXML * dialog);
@@ -56,16 +48,12 @@ extern void xkb_options_register_gconf_listener (GladeXML * dialog);
 extern void xkb_layouts_prepare_selected_tree (GladeXML * dialog,
 					       GConfChangeSet * changeset);
 
-extern void xkb_options_prepare_selected_tree (GladeXML * dialog);
-
 extern void xkb_options_load_options (GladeXML * dialog);
 
 extern void clear_xkb_elements_list (GSList * list);
 
 extern char *xci_desc_to_utf8 (XklConfigItem * ci);
 
-extern void sort_tree_content (GtkWidget * tree_view);
-
 extern void enable_disable_restoring (GladeXML * dialog);
 
 extern void preview_toggled (GladeXML * dialog, GtkWidget * button);
@@ -78,6 +66,7 @@ extern void xkb_layouts_enable_disable_default (GladeXML * dialog,
 						gboolean enable);
 
 extern GSList *xkb_layouts_get_selected_list (void);
+
 extern GSList *xkb_options_get_selected_list (void);
 
 #define xkb_layouts_set_selected_list(list) \
diff --git a/capplets/keyboard/gnome-keyboard-properties-xkbltadd.c b/capplets/keyboard/gnome-keyboard-properties-xkbltadd.c
index 884192808..705e024b7 100644
--- a/capplets/keyboard/gnome-keyboard-properties-xkbltadd.c
+++ b/capplets/keyboard/gnome-keyboard-properties-xkbltadd.c
@@ -117,7 +117,7 @@ xkb_layout_chooser_selection_changed (GladeXML * chooser_dialog)
 	xkb_layout_chooser_enable_disable_buttons (chooser_dialog);
 }
 
-void
+static void
 sort_tree_content (GtkWidget * tree_view)
 {
 	GtkTreeModel *tree_model =
@@ -133,7 +133,7 @@ sort_tree_content (GtkWidget * tree_view)
 				 sorted_tree_model);
 }
 
-void
+static void
 xkb_layouts_fill_available_tree (GladeXML * chooser_dialog)
 {
 	GtkTreeStore *tree_store =