3 files changed, 5 insertions, 2 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index c0f618630a8..bef939adb4f 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,9 @@
 2010-08-06  Jan Djärv  <jan.h.d@swipnet.se>
 
+        * nsterm.h (x_set_menu_bar_lines): Declare.
+
+        * window.c: Don't include menu.h, it depends on lots of other .h-files.
+
         * xfaces.c (x_create_gc, x_free_gc): Convert to ANSI C prototypes.
 
         * window.c: Include menu.h.
diff --git a/src/nsterm.h b/src/nsterm.h
index 541b7e13daf..9b7f0accad1 100644
--- a/src/nsterm.h
+++ b/src/nsterm.h
@@ -761,6 +761,7 @@ extern int x_char_height (struct frame *f);
 extern int x_pixel_width (struct frame *f);
 extern int x_pixel_height (struct frame *f);
 extern void x_set_frame_alpha (struct frame *f);
+extern void x_set_menu_bar_lines (struct frame *, Lisp_Object, Lisp_Object);
 extern void x_set_tool_bar_lines (struct frame *f,
                                   Lisp_Object value,
                                   Lisp_Object oldval);
diff --git a/src/window.c b/src/window.c
index 29be829005d..1fabe72d72d 100644
--- a/src/window.c
+++ b/src/window.c
@@ -37,7 +37,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "blockinput.h"
 #include "intervals.h"
 #include "termhooks.h"          /* For FRAME_TERMINAL.  */
-#include "menu.h"
 
 #ifdef HAVE_X_WINDOWS
 #include "xterm.h"
@@ -52,7 +51,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "nsterm.h"
 #endif
 
-
 Lisp_Object Qwindowp, Qwindow_live_p, Qwindow_configuration_p;
 Lisp_Object Qdisplay_buffer;
 Lisp_Object Qscroll_up, Qscroll_down, Qscroll_command;