diff --git a/src/proto/map.pro b/src/proto/map.pro
index 3aa93e9..05d66fb 100644
--- a/src/proto/map.pro
+++ b/src/proto/map.pro
@@ -19,6 +19,9 @@
 void get_maparg(typval_T *argvars, typval_T *rettv, int exact);
 void init_mappings(void);
 void add_map(char_u *map, int mode);
+int langmap_adjust_mb(int c);
+void langmap_init(void);
+void langmap_set(void);
 void ex_abbreviate(exarg_T *eap);
 void ex_map(exarg_T *eap);
 void ex_unmap(exarg_T *eap);
diff --git a/src/proto/option.pro b/src/proto/option.pro
index 3350a1f..e842484 100644
--- a/src/proto/option.pro
+++ b/src/proto/option.pro
@@ -22,8 +22,7 @@
 void set_string_option_direct(char_u *name, int opt_idx, char_u *val, int opt_flags, int set_sid);
 void set_string_option_direct_in_win(win_T *wp, char_u *name, int opt_idx, char_u *val, int opt_flags, int set_sid);
 void set_string_option_direct_in_buf(buf_T *buf, char_u *name, int opt_idx, char_u *val, int opt_flags, int set_sid);
-int valid_spellang(char_u *val);
-char *check_colorcolumn(win_T *wp);
+int valid_name(char_u *val, char *allowed);
 void set_term_option_sctx_idx(char *name, int opt_idx);
 int get_option_value(char_u *name, long *numval, char_u **stringval, int opt_flags);
 int get_option_value_strict(char_u *name, long *numval, char_u **stringval, int opt_type, void *from);
@@ -38,7 +37,6 @@
 void free_termoptions(void);
 void free_one_termoption(char_u *var);
 void set_term_defaults(void);
-void comp_col(void);
 void unset_global_local_option(char_u *name, void *from);
 char_u *get_equalprg(void);
 void win_copy_options(win_T *wp_from, win_T *wp_to);
@@ -51,7 +49,6 @@
 void set_context_in_set_cmd(expand_T *xp, char_u *arg, int opt_flags);
 int ExpandSettings(expand_T *xp, regmatch_T *regmatch, int *num_file, char_u ***file);
 int ExpandOldSetting(int *num_file, char_u ***file);
-int langmap_adjust_mb(int c);
 int has_format_option(int x);
 int shortmess(int x);
 void vimrc_found(char_u *fname, char_u *envname);
diff --git a/src/proto/quickfix.pro b/src/proto/quickfix.pro
index 6607808..0d84112 100644
--- a/src/proto/quickfix.pro
+++ b/src/proto/quickfix.pro
@@ -26,11 +26,13 @@
 void ex_cbelow(exarg_T *eap);
 void ex_cfile(exarg_T *eap);
 void ex_vimgrep(exarg_T *eap);
-int get_errorlist(qf_info_T *qi_arg, win_T *wp, int qf_idx, list_T *list);
-int qf_get_properties(win_T *wp, dict_T *what, dict_T *retdict);
 int set_errorlist(win_T *wp, list_T *list, int action, char_u *title, dict_T *what);
 int set_ref_in_quickfix(int copyID);
 void ex_cbuffer(exarg_T *eap);
 void ex_cexpr(exarg_T *eap);
 void ex_helpgrep(exarg_T *eap);
+void f_getloclist(typval_T *argvars, typval_T *rettv);
+void f_getqflist(typval_T *argvars, typval_T *rettv);
+void f_setloclist(typval_T *argvars, typval_T *rettv);
+void f_setqflist(typval_T *argvars, typval_T *rettv);
 /* vim: set ft=c : */
diff --git a/src/proto/screen.pro b/src/proto/screen.pro
index 0aaed5f..cf95f79 100644
--- a/src/proto/screen.pro
+++ b/src/proto/screen.pro
@@ -59,7 +59,9 @@
 int redrawing(void);
 int messaging(void);
 void showruler(int always);
+void comp_col(void);
 int number_width(win_T *wp);
 int screen_screencol(void);
 int screen_screenrow(void);
+char *set_chars_option(char_u **varp);
 /* vim: set ft=c : */
diff --git a/src/proto/spell.pro b/src/proto/spell.pro
index c2b14bf..6114412 100644
--- a/src/proto/spell.pro
+++ b/src/proto/spell.pro
@@ -34,4 +34,8 @@
 int spell_word_start(int startcol);
 void spell_expand_check_cap(colnr_T col);
 int expand_spelling(linenr_T lnum, char_u *pat, char_u ***matchp);
+int valid_spellang(char_u *val);
+int valid_spellfile(char_u *val);
+char *did_set_spell_option(int is_spellfile);
+char *compile_cap_prog(synblock_T *synblock);
 /* vim: set ft=c : */
diff --git a/src/proto/window.pro b/src/proto/window.pro
index e685b1c..1c4ade8 100644
--- a/src/proto/window.pro
+++ b/src/proto/window.pro
@@ -82,6 +82,7 @@
 int win_hasvertsplit(void);
 int get_win_number(win_T *wp, win_T *first_win);
 int get_tab_number(tabpage_T *tp);
+char *check_colorcolumn(win_T *wp);
 int win_getid(typval_T *argvars);
 int win_gotoid(typval_T *argvars);
 void win_id2tabwin(typval_T *argvars, list_T *list);