--- a/src/menubar-msw.c	Mon Aug 13 11:18:12 2007 +0200
+++ b/src/menubar-msw.c	Mon Aug 13 11:19:21 2007 +0200
@@ -78,7 +78,6 @@
 
 #include <config.h>
 #include "lisp.h"
-#include <limits.h>
 
 #include "buffer.h"
 #include "commands.h"
@@ -126,7 +125,7 @@
    of not hitting an error, maxlen should be >= 2*len + 3. */
 
 Bytecount
-msw_translate_menu_or_dialog_item (Bufbyte *item, Bytecount len,
+mswindows_translate_menu_or_dialog_item (Bufbyte *item, Bytecount len,
 				   Bytecount maxlen, Emchar *accel,
 				   Lisp_Object error_name)
 {
@@ -209,7 +208,7 @@
   /* Left flush part of the string */
   ll = gui_item_display_flush_left (gui_item, buf, MAX_MENUITEM_LENGTH);
 
-  ll = msw_translate_menu_or_dialog_item ((Bufbyte *) buf, ll,
+  ll = mswindows_translate_menu_or_dialog_item ((Bufbyte *) buf, ll,
 					  MAX_MENUITEM_LENGTH, accel,
 					  XGUI_ITEM (gui_item)->name);
 
@@ -668,7 +667,7 @@
 }
 
 int
-msw_char_is_accelerator (struct frame *f, Emchar ch)
+mswindows_char_is_accelerator (struct frame *f, Emchar ch)
 {
   Lisp_Object hash = FRAME_MSWINDOWS_MENU_HASH_TABLE (f);