diff --git a/src/os_mswin.c b/src/os_mswin.c
index 9767a5b..3d74bdc 100644
--- a/src/os_mswin.c
+++ b/src/os_mswin.c
@@ -114,6 +114,7 @@
 typedef int TEXTMETRIC;
 typedef int UINT;
 typedef int WCHAR;
+typedef int WNDENUMPROC;
 typedef int WORD;
 typedef int WPARAM;
 typedef void VOID;
diff --git a/src/proto/buffer.pro b/src/proto/buffer.pro
index 6820d97..131ac82 100644
--- a/src/proto/buffer.pro
+++ b/src/proto/buffer.pro
@@ -16,7 +16,7 @@
 void no_write_message(void);
 void no_write_message_nobang(buf_T *buf);
 int curbuf_reusable(void);
-buf_T *buflist_new(char_u *ffname, char_u *sfname, linenr_T lnum, int flags);
+buf_T *buflist_new(char_u *ffname_arg, char_u *sfname_arg, linenr_T lnum, int flags);
 void free_buf_options(buf_T *buf, int free_p_ff);
 int buflist_getfile(int n, linenr_T lnum, int options, int forceit);
 void buflist_getfpos(void);
@@ -31,7 +31,7 @@
 linenr_T buflist_findlnum(buf_T *buf);
 void buflist_list(exarg_T *eap);
 int buflist_name_nr(int fnum, char_u **fname, linenr_T *lnum);
-int setfname(buf_T *buf, char_u *ffname, char_u *sfname, int message);
+int setfname(buf_T *buf, char_u *ffname_arg, char_u *sfname_arg, int message);
 void buf_set_name(int fnum, char_u *name);
 void buf_name_changed(buf_T *buf);
 buf_T *setaltfname(char_u *ffname, char_u *sfname, linenr_T lnum);
diff --git a/src/proto/ex_cmds.pro b/src/proto/ex_cmds.pro
index 63f25b5..12e6b38 100644
--- a/src/proto/ex_cmds.pro
+++ b/src/proto/ex_cmds.pro
@@ -30,7 +30,7 @@
 void ex_wnext(exarg_T *eap);
 void do_wqall(exarg_T *eap);
 int not_writing(void);
-int getfile(int fnum, char_u *ffname, char_u *sfname, int setpm, linenr_T lnum, int forceit);
+int getfile(int fnum, char_u *ffname_arg, char_u *sfname_arg, int setpm, linenr_T lnum, int forceit);
 int do_ecmd(int fnum, char_u *ffname, char_u *sfname, exarg_T *eap, linenr_T newlnum, int flags, win_T *oldwin);
 void ex_append(exarg_T *eap);
 void ex_change(exarg_T *eap);
diff --git a/src/proto/ex_getln.pro b/src/proto/ex_getln.pro
index c7386a4..a2d7a9f 100644
--- a/src/proto/ex_getln.pro
+++ b/src/proto/ex_getln.pro
@@ -1,4 +1,5 @@
 /* ex_getln.c */
+void cmdline_init(void);
 char_u *getcmdline(int firstc, long count, int indent);
 char_u *getcmdline_prompt(int firstc, char_u *prompt, int attr, int xp_context, char_u *xp_arg);
 int text_locked(void);
@@ -52,7 +53,6 @@
 int read_viminfo_history(vir_T *virp, int writing);
 void handle_viminfo_history(garray_T *values, int writing);
 void finish_viminfo_history(vir_T *virp);
-void cmdline_init(void);
 void write_viminfo_history(FILE *fp, int merge);
 void cmd_pchar(int c, int offset);
 int cmd_gchar(int offset);
diff --git a/src/proto/misc2.pro b/src/proto/misc2.pro
index b821417..949ff72 100644
--- a/src/proto/misc2.pro
+++ b/src/proto/misc2.pro
@@ -20,8 +20,8 @@
 void adjust_cursor_col(void);
 int leftcol_changed(void);
 void vim_mem_profile_dump(void);
-char_u *alloc(unsigned size);
 int alloc_does_fail(long_u size);
+char_u *alloc(unsigned size);
 char_u *alloc_id(unsigned size, alloc_id_T id);
 char_u *alloc_clear(unsigned size);
 char_u *alloc_check(unsigned size);
diff --git a/src/proto/userfunc.pro b/src/proto/userfunc.pro
index ac9bdc0..25f1c3c 100644
--- a/src/proto/userfunc.pro
+++ b/src/proto/userfunc.pro
@@ -4,6 +4,8 @@
 char_u *deref_func_name(char_u *name, int *lenp, partial_T **partialp, int no_autoload);
 int get_func_tv(char_u *name, int len, typval_T *rettv, char_u **arg, linenr_T firstline, linenr_T lastline, int *doesrange, int evaluate, partial_T *partial, dict_T *selfdict);
 ufunc_T *find_func(char_u *name);
+void save_funccal(funccal_entry_T *entry);
+void restore_funccal(void);
 void free_all_functions(void);
 int func_call(char_u *name, typval_T *args, partial_T *partial, dict_T *selfdict, typval_T *rettv);
 int call_func(char_u *funcname, int len, typval_T *rettv, int argcount_in, typval_T *argvars_in, int (*argv_func)(int, typval_T *, int), linenr_T firstline, linenr_T lastline, int *doesrange, int evaluate, partial_T *partial, dict_T *selfdict_in);
@@ -39,8 +41,6 @@
 int *func_dbg_tick(void *cookie);
 int func_level(void *cookie);
 int current_func_returned(void);
-void save_funccal(funccal_entry_T *entry);
-void restore_funccal(void);
 int free_unref_funccal(int copyID, int testing);
 hashtab_T *get_funccal_local_ht(void);
 dictitem_T *get_funccal_local_var(void);
diff --git a/src/version.c b/src/version.c
index 069feb9..9daf4f7 100644
--- a/src/version.c
+++ b/src/version.c
@@ -800,6 +800,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    607,
+/**/
     606,
 /**/
     605,