diff --git a/src/proto/buffer.pro b/src/proto/buffer.pro
index 010be9c..d85a9ff 100644
--- a/src/proto/buffer.pro
+++ b/src/proto/buffer.pro
@@ -27,6 +27,7 @@
 int ExpandBufnames(char_u *pat, int *num_file, char_u ***file, int options);
 buf_T *buflist_findnr(int nr);
 char_u *buflist_nr2name(int n, int fullname, int helptail);
+void buflist_setfpos(buf_T *buf, win_T *win, linenr_T lnum, colnr_T col, int copy_options);
 void get_winopts(buf_T *buf);
 pos_T *buflist_findfpos(buf_T *buf);
 linenr_T buflist_findlnum(buf_T *buf);
@@ -55,8 +56,6 @@
 void do_arg_all(int count, int forceit, int keep_tabs);
 void ex_buffer_all(exarg_T *eap);
 void do_modelines(int flags);
-int read_viminfo_bufferlist(vir_T *virp, int writing);
-void write_viminfo_bufferlist(FILE *fp);
 int bt_normal(buf_T *buf);
 int bt_quickfix(buf_T *buf);
 int bt_terminal(buf_T *buf);
diff --git a/src/proto/eval.pro b/src/proto/eval.pro
index 8a19542..6f08ae7 100644
--- a/src/proto/eval.pro
+++ b/src/proto/eval.pro
@@ -126,8 +126,7 @@
 void setwinvar(typval_T *argvars, typval_T *rettv, int off);
 char_u *autoload_name(char_u *name);
 int script_autoload(char_u *name, int reload);
-int read_viminfo_varlist(vir_T *virp, int writing);
-void write_viminfo_varlist(FILE *fp);
+var_flavour_T var_flavour(char_u *varname);
 int store_session_globals(FILE *fd);
 void last_set_msg(sctx_T script_ctx);
 void reset_v_option_vars(void);
diff --git a/src/proto/ex_cmds.pro b/src/proto/ex_cmds.pro
index c769b4b..783ed11 100644
--- a/src/proto/ex_cmds.pro
+++ b/src/proto/ex_cmds.pro
@@ -10,13 +10,6 @@
 void do_shell(char_u *cmd, int flags);
 char_u *make_filter_cmd(char_u *cmd, char_u *itmp, char_u *otmp);
 void append_redir(char_u *buf, int buflen, char_u *opt, char_u *fname);
-int viminfo_error(char *errnum, char *message, char_u *line);
-int read_viminfo(char_u *file, int flags);
-void write_viminfo(char_u *file, int forceit);
-int viminfo_readline(vir_T *virp);
-char_u *viminfo_readstring(vir_T *virp, int off, int convert);
-void viminfo_writestring(FILE *fd, char_u *p);
-int barline_writestring(FILE *fd, char_u *s, int remaining_start);
 time_T vim_time(void);
 void do_fixdel(exarg_T *eap);
 void print_line_no_prefix(linenr_T lnum, int use_number, int list);
diff --git a/src/proto/viminfo.pro b/src/proto/viminfo.pro
new file mode 100644
index 0000000..4d7b46e
--- /dev/null
+++ b/src/proto/viminfo.pro
@@ -0,0 +1,10 @@
+/* viminfo.c */
+int viminfo_error(char *errnum, char *message, char_u *line);
+int read_viminfo(char_u *file, int flags);
+void write_viminfo(char_u *file, int forceit);
+int viminfo_readline(vir_T *virp);
+char_u *viminfo_readstring(vir_T *virp, int off, int convert);
+void viminfo_writestring(FILE *fd, char_u *p);
+int barline_writestring(FILE *fd, char_u *s, int remaining_start);
+void ex_viminfo(exarg_T *eap);
+/* vim: set ft=c : */