4 files changed, 19 insertions, 21 deletions
diff --git a/src/ephy-private.h b/src/ephy-private.h
index f8d0e2c8f..e1e39fabe 100644
--- a/src/ephy-private.h
+++ b/src/ephy-private.h
@@ -36,5 +36,7 @@ GtkActionGroup         *ephy_window_get_toolbar_action_group (EphyWindow *window
 
 EphyLocationController *ephy_window_get_location_controller  (EphyWindow *window);
 
+EphyEmbedEvent	       *ephy_window_get_context_event	     (EphyWindow *window);
+
 #endif
 
diff --git a/src/ephy-window.c b/src/ephy-window.c
index 1c53fcbf0..94f3d2a70 100644
--- a/src/ephy-window.c
+++ b/src/ephy-window.c
@@ -3112,6 +3112,16 @@ ephy_window_set_chrome (EphyWindow *window, EphyWebViewChrome mask)
 }
 
 static void
+ephy_window_set_downloads_box_visibility (EphyWindow *window,
+					  gboolean show)
+{
+	if (show)
+		gtk_widget_show (window->priv->downloads_box);
+	else
+		gtk_widget_hide (window->priv->downloads_box);
+}
+
+static void
 download_added_cb (EphyEmbedShell *shell,
 		   EphyDownload *download,
 		   gpointer data)
@@ -3205,16 +3215,6 @@ setup_downloads_box (EphyWindow *window)
 	return widget;
 }
 
-void
-ephy_window_set_downloads_box_visibility (EphyWindow *window,
-					  gboolean show)
-{
-	if (show)
-		gtk_widget_show (window->priv->downloads_box);
-	else
-		gtk_widget_hide (window->priv->downloads_box);
-}
-
 static void
 ephy_window_dispose (GObject *object)
 {
diff --git a/src/ephy-window.h b/src/ephy-window.h
index 0bbd7e717..743211156 100644
--- a/src/ephy-window.h
+++ b/src/ephy-window.h
@@ -79,11 +79,6 @@ const char       *ephy_window_get_location        (EphyWindow *window);
 void              ephy_window_set_location        (EphyWindow *window,
                                                    const char *address);
 
-EphyEmbedEvent	 *ephy_window_get_context_event	  (EphyWindow *window);
-
-void		  ephy_window_set_downloads_box_visibility (EphyWindow *window,
-							    gboolean show);
-
 G_END_DECLS
 
 #endif
diff --git a/src/popup-commands.c b/src/popup-commands.c
index d725bf743..fd3235565 100644
--- a/src/popup-commands.c
+++ b/src/popup-commands.c
@@ -19,22 +19,23 @@
  */
 
 #include "config.h"
-
 #include "popup-commands.h"
+
+#include "ephy-bookmarks-ui.h"
 #include "ephy-download.h"
-#include "ephy-shell.h"
 #include "ephy-embed-container.h"
 #include "ephy-embed-utils.h"
+#include "ephy-file-chooser.h"
+#include "ephy-file-helpers.h"
 #include "ephy-prefs.h"
+#include "ephy-private.h"
 #include "ephy-settings.h"
-#include "ephy-file-helpers.h"
-#include "ephy-file-chooser.h"
-#include "ephy-bookmarks-ui.h"
+#include "ephy-shell.h"
 #include "ephy-web-view.h"
 
-#include <string.h>
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
+#include <string.h>
 #include <webkit/webkit.h>
 
 void