diff --git a/src/proto/if_mzsch.pro b/src/proto/if_mzsch.pro
index 26ffa77c87..c8b327f8ef 100644
--- a/src/proto/if_mzsch.pro
+++ b/src/proto/if_mzsch.pro
@@ -1,4 +1,5 @@
 /* if_mzsch.c */
+Thread_Local_Variables *scheme_external_get_thread_local_variables(void);
 int mzscheme_enabled(int verbose);
 void mzvim_check_threads(void);
 char *did_set_mzquantum(optset_T *args);
diff --git a/src/proto/insexpand.pro b/src/proto/insexpand.pro
index bff291171f..bd84cb259d 100644
--- a/src/proto/insexpand.pro
+++ b/src/proto/insexpand.pro
@@ -26,6 +26,7 @@ int has_compl_option(int dict_opt);
 int vim_is_ctrl_x_key(int c);
 int ins_compl_accept_char(int c);
 int ins_compl_add_infercase(char_u *str_arg, int len, int icase, char_u *fname, int dir, int cont_s_ipos, int score);
+int ins_compl_is_match_selected(void);
 int ins_compl_preinsert_longest(void);
 char_u *ins_compl_leader(void);
 int ins_compl_col_range_attr(linenr_T lnum, int col);
@@ -77,5 +78,4 @@ int ins_complete(int c, int enable_pum);
 void ins_compl_enable_autocomplete(void);
 void free_insexpand_stuff(void);
 void f_preinserted(typval_T *argvars, typval_T *rettv);
-int ins_compl_is_match_selected(void);
 /* vim: set ft=c : */
diff --git a/src/proto/optionstr.pro b/src/proto/optionstr.pro
index b3ee0f8b2e..4e04d696f8 100644
--- a/src/proto/optionstr.pro
+++ b/src/proto/optionstr.pro
@@ -136,6 +136,8 @@ int expand_set_printoptions(optexpand_T *args, int *numMatches, char_u ***matche
 char *did_set_renderoptions(optset_T *args);
 char *did_set_rightleftcmd(optset_T *args);
 int expand_set_rightleftcmd(optexpand_T *args, int *numMatches, char_u ***matches);
+char *did_set_pumborder(optset_T *args);
+int expand_set_pumborder(optexpand_T *args, int *numMatches, char_u ***matches);
 char *did_set_rulerformat(optset_T *args);
 char *did_set_tabpanelopt(optset_T *args);
 int expand_set_tabpanelopt(optexpand_T *args, int *numMatches, char_u ***matches);
@@ -209,6 +211,4 @@ int check_ff_value(char_u *p);
 void save_clear_shm_value(void);
 void restore_shm_value(void);
 void export_myvimdir(void);
-char *did_set_pumborder(optset_T *args);
-int expand_set_pumborder(optexpand_T *args, int *numMatches, char_u ***matches);
 /* vim: set ft=c : */
diff --git a/src/proto/os_amiga.pro b/src/proto/os_amiga.pro
index 86d14903d9..514b258019 100644
--- a/src/proto/os_amiga.pro
+++ b/src/proto/os_amiga.pro
@@ -37,7 +37,6 @@ void mch_set_shellsize(void);
 void mch_new_shellsize(void);
 int mch_call_shell(char_u *cmd, int options);
 void mch_breakcheck(int force);
-long Chk_Abort(void);
 int mch_expandpath(garray_T *gap, char_u *pat, int flags);
 int mch_has_exp_wildcard(char_u *p);
 int mch_has_wildcard(char_u *p);
diff --git a/src/proto/os_mswin.pro b/src/proto/os_mswin.pro
index e8e08d2ee5..6b023b9440 100644
--- a/src/proto/os_mswin.pro
+++ b/src/proto/os_mswin.pro
@@ -22,6 +22,8 @@ void display_errors(void);
 int mch_has_exp_wildcard(char_u *p);
 int mch_has_wildcard(char_u *p);
 int mch_chdir(char *path);
+int mch_char_avail(void);
+int mch_check_messages(void);
 int mch_icon_load(HANDLE *iconp);
 int mch_get_random(char_u *buf, int len);
 int mch_libcall(char_u *libname, char_u *funcname, char_u *argstring, int argint, char_u **string_result, int *number_result);
diff --git a/src/proto/os_qnx.pro b/src/proto/os_qnx.pro
index a3fab620f1..c752a16463 100644
--- a/src/proto/os_qnx.pro
+++ b/src/proto/os_qnx.pro
@@ -1,6 +1,6 @@
 /* os_qnx.c */
 void qnx_init(void);
-void qnx_clip_init (void);
+void qnx_clip_init(void);
 int clip_mch_own_selection(Clipboard_T *cbd);
 void clip_mch_lose_selection(Clipboard_T *cbd);
 void clip_mch_request_selection(Clipboard_T *cbd);
diff --git a/src/proto/popupmenu.pro b/src/proto/popupmenu.pro
index b689f6fb33..66316dfab2 100644
--- a/src/proto/popupmenu.pro
+++ b/src/proto/popupmenu.pro
@@ -1,4 +1,7 @@
 /* popupmenu.c */
+void pum_set_border(int enable);
+void pum_set_shadow(int enable);
+void pum_set_margin(int enable);
 void pum_display(pumitem_T *array, int size, int selected);
 void pum_call_update_screen(void);
 int pum_under_menu(int row, int col, int only_redrawing);
@@ -18,8 +21,5 @@ void ui_may_remove_balloon(void);
 void pum_show_popupmenu(vimmenu_T *menu);
 void pum_make_popup(char_u *path_name, int use_mouse_pos);
 void pum_set_border_chars(int top, int right, int bottom, int left, int top_left, int top_right, int bottom_right, int bottom_left);
-void pum_set_border(int enable);
-void pum_set_shadow(int enable);
-void pum_set_margin(int enable);
 void put_shadow_char(int row, int col);
 /* vim: set ft=c : */
diff --git a/src/version.c b/src/version.c
index 36e5528966..55fe9bc113 100644
--- a/src/version.c
+++ b/src/version.c
@@ -729,6 +729,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1838,
 /**/
     1837,
 /**/