diff --git a/src/option.c b/src/option.c
index 05dc992..05d8869 100644
--- a/src/option.c
+++ b/src/option.c
@@ -3074,6 +3074,7 @@
 static char_u *get_varp_scope __ARGS((struct vimoption *p, int opt_flags));
 static char_u *get_varp __ARGS((struct vimoption *));
 static void option_value2string __ARGS((struct vimoption *, int opt_flags));
+static void check_winopt __ARGS((winopt_T *wop));
 static int wc_use_keyname __ARGS((char_u *varp, long *wcp));
 #ifdef FEAT_LANGMAP
 static void langmap_init __ARGS((void));
@@ -10305,7 +10306,7 @@
 /*
  * Check for NULL pointers in a winopt_T and replace them with empty_option.
  */
-    void
+    static void
 check_winopt(wop)
     winopt_T	*wop UNUSED;
 {
diff --git a/src/proto/option.pro b/src/proto/option.pro
index 4729c47..e426e6c 100644
--- a/src/proto/option.pro
+++ b/src/proto/option.pro
@@ -40,7 +40,6 @@
 void win_copy_options __ARGS((win_T *wp_from, win_T *wp_to));
 void copy_winopt __ARGS((winopt_T *from, winopt_T *to));
 void check_win_options __ARGS((win_T *win));
-void check_winopt __ARGS((winopt_T *wop));
 void clear_winopt __ARGS((winopt_T *wop));
 void buf_copy_options __ARGS((buf_T *buf, int flags));
 void reset_modifiable __ARGS((void));
diff --git a/src/version.c b/src/version.c
index 78d39bb..8568a36 100644
--- a/src/version.c
+++ b/src/version.c
@@ -735,6 +735,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    339,
+/**/
     338,
 /**/
     337,