3 files changed, 9 insertions, 3 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 0607409b86c..08807cd5c09 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2014-07-25  Eli Zaretskii  <eliz@gnu.org>
+
+        * w32term.h (current_popup_menu, menubar_in_use): Move
+        declarations from w32term.c.
+
 2014-07-25  Martin Rudalics  <rudalics@gmx.at>
 
         * w32fns.c (menubar_in_use): No more static.
diff --git a/src/w32term.c b/src/w32term.c
index 0a82546d0a6..fd902ee7cd5 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -93,9 +93,6 @@ extern void free_frame_menubar (struct frame *);
 extern int w32_codepage_for_font (char *fontname);
 extern Cursor w32_load_cursor (LPCTSTR name);
 
-extern HMENU current_popup_menu;
-extern int menubar_in_use;
-
 #define x_any_window_to_frame x_window_to_frame
 #define x_top_window_to_frame x_window_to_frame
 
diff --git a/src/w32term.h b/src/w32term.h
index fdf5f4420b8..ae666925833 100644
--- a/src/w32term.h
+++ b/src/w32term.h
@@ -200,6 +200,10 @@ struct w32_display_info
 extern struct w32_display_info *x_display_list;
 extern struct w32_display_info one_w32_display_info;
 
+/* These 2 are set by w32fns.c and examined in w32term.c.  */
+extern HMENU current_popup_menu;
+extern int menubar_in_use;
+
 extern struct frame *x_window_to_frame (struct w32_display_info *, HWND);
 
 struct w32_display_info *x_display_info_for_name (Lisp_Object);