diff --git a/src/gui_w32.c b/src/gui_w32.c
index b496166..feeb6d4 100644
--- a/src/gui_w32.c
+++ b/src/gui_w32.c
@@ -36,6 +36,10 @@
 # define IS_ENABLE_DIRECTX() (s_directx_enabled && s_dwc != NULL)
 #endif
 
+#ifdef FEAT_MENU
+static int gui_mswin_get_menu_height(int fix_window);
+#endif
+
 #if defined(FEAT_DIRECTX) || defined(PROTO)
     int
 directx_enabled(void)
@@ -458,7 +462,9 @@
  * stuff for dialogs, menus, tearoffs etc.
  */
 static LRESULT APIENTRY dialog_callback(HWND, UINT, WPARAM, LPARAM);
+#ifdef FEAT_TEAROFF
 static LRESULT APIENTRY tearoff_callback(HWND, UINT, WPARAM, LPARAM);
+#endif
 static PWORD
 add_dialog_element(
 	PWORD p,
@@ -472,7 +478,9 @@
 	const char *caption);
 static LPWORD lpwAlign(LPWORD);
 static int nCopyAnsiToWideChar(LPWORD, LPSTR);
+#if defined(FEAT_MENU) && defined(FEAT_TEAROFF)
 static void gui_mch_tearoff(char_u *title, vimmenu_T *menu, int initX, int initY);
+#endif
 static void get_dialog_font_metrics(void);
 
 static int dialog_default_button = -1;
diff --git a/src/gui_w48.c b/src/gui_w48.c
index 4b755bd..eff3f3f 100644
--- a/src/gui_w48.c
+++ b/src/gui_w48.c
@@ -138,7 +138,6 @@
 
 static void _OnPaint( HWND hwnd);
 static void clear_rect(RECT *rcp);
-static int gui_mswin_get_menu_height(int fix_window);
 
 static WORD		s_dlgfntheight;		/* height of the dialog font */
 static WORD		s_dlgfntwidth;		/* width of the dialog font */
@@ -342,7 +341,7 @@
 static LRESULT _OnImeNotify(HWND hWnd, DWORD dwCommand, DWORD dwData);
 #endif
 
-#if defined(FEAT_MBYTE) && defined(WIN3264)
+#if defined(FEAT_BROWSE)
 static char_u *convert_filter(char_u *s);
 #endif
 
diff --git a/src/version.c b/src/version.c
index 766937d..d2ae1ae 100644
--- a/src/version.c
+++ b/src/version.c
@@ -748,6 +748,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1363,
+/**/
     1362,
 /**/
     1361,