diff --git a/src/if_ruby.c b/src/if_ruby.c
index fd6e552..5180ed8 100644
--- a/src/if_ruby.c
+++ b/src/if_ruby.c
@@ -11,6 +11,7 @@
  * See README.txt for an overview of the Vim source code.
  */
 
+#include "protodef.h"
 #ifdef HAVE_CONFIG_H
 # include "auto/config.h"
 #endif
diff --git a/src/proto/digraph.pro b/src/proto/digraph.pro
index dfadc9d..4c12f51 100644
--- a/src/proto/digraph.pro
+++ b/src/proto/digraph.pro
@@ -1,6 +1,6 @@
 /* digraph.c */
 int do_digraph(int c);
-char_u *get_digraph_for_char(int val);
+char_u *get_digraph_for_char(int val_arg);
 int get_digraph(int cmdline);
 int getdigraph(int char1, int char2, int meta_char);
 void putdigraph(char_u *str);
diff --git a/src/proto/hardcopy.pro b/src/proto/hardcopy.pro
index d2c68ff..4791f4a 100644
--- a/src/proto/hardcopy.pro
+++ b/src/proto/hardcopy.pro
@@ -13,7 +13,7 @@
 int mch_print_begin_page(char_u *str);
 int mch_print_blank_page(void);
 void mch_print_start_line(int margin, int page_line);
-int mch_print_text_out(char_u *p, int len);
+int mch_print_text_out(char_u *textp, int len);
 void mch_print_set_font(int iBold, int iItalic, int iUnderline);
 void mch_print_set_bg(long_u bgcol);
 void mch_print_set_fg(long_u fgcol);
diff --git a/src/proto/option.pro b/src/proto/option.pro
index 22c163d..679329d 100644
--- a/src/proto/option.pro
+++ b/src/proto/option.pro
@@ -64,7 +64,7 @@
 int tabstop_padding(colnr_T col, int ts_arg, int *vts);
 int tabstop_at(colnr_T col, int ts, int *vts);
 colnr_T tabstop_start(colnr_T col, int ts, int *vts);
-void tabstop_fromto(colnr_T start_col, colnr_T end_col, int ts, int *vts, int *ntabs, int *nspcs);
+void tabstop_fromto(colnr_T start_col, colnr_T end_col, int ts_arg, int *vts, int *ntabs, int *nspcs);
 int tabstop_eq(int *ts1, int *ts2);
 int *tabstop_copy(int *oldts);
 int tabstop_count(int *ts);
diff --git a/src/proto/window.pro b/src/proto/window.pro
index c31e599..4527a37 100644
--- a/src/proto/window.pro
+++ b/src/proto/window.pro
@@ -94,5 +94,5 @@
 win_T *win_id2wp(typval_T *argvars);
 int win_id2win(typval_T *argvars);
 void win_findbuf(typval_T *argvars, list_T *list);
-void get_framelayout(frame_T *fr, list_T *l, int topframe);
+void get_framelayout(frame_T *fr, list_T *l, int outer);
 /* vim: set ft=c : */
diff --git a/src/protodef.h b/src/protodef.h
new file mode 100644
index 0000000..42a6cce
--- /dev/null
+++ b/src/protodef.h
@@ -0,0 +1,18 @@
+/* vi:set ts=8 sts=4 sw=4 noet:
+ *
+ * VIM - Vi IMproved	by Bram Moolenaar
+ *
+ * Do ":help uganda"  in Vim to read copying and usage conditions.
+ * Do ":help credits" in Vim to see a list of people who contributed.
+ */
+
+#ifdef PROTO
+// cproto runs into trouble when these types are missing
+typedef double _Float16;
+typedef double _Float32;
+typedef double _Float64;
+typedef double _Float128;
+typedef double _Float32x;
+typedef double _Float64x;
+#endif
+
diff --git a/src/version.c b/src/version.c
index 4dd6b65..76fdb49 100644
--- a/src/version.c
+++ b/src/version.c
@@ -795,6 +795,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    380,
+/**/
     379,
 /**/
     378,
diff --git a/src/vim.h b/src/vim.h
index 6d1c312..c30e8db 100644
--- a/src/vim.h
+++ b/src/vim.h
@@ -9,10 +9,7 @@
 #ifndef VIM__H
 # define VIM__H
 
-#ifdef PROTO
-/* cproto runs into trouble when this type is missing */
-typedef double _Float128;
-#endif
+#include "protodef.h"
 
 /* use fastcall for Borland, when compiling for Win32 */
 #if defined(__BORLANDC__) && defined(WIN32) && !defined(DEBUG)
diff --git a/src/workshop.c b/src/workshop.c
index cb6ba3e..4251743 100644
--- a/src/workshop.c
+++ b/src/workshop.c
@@ -8,6 +8,7 @@
  * See README.txt for an overview of the Vim source code.
  */
 
+#include "protodef.h"
 #ifdef HAVE_CONFIG_H
 # include "auto/config.h"
 #endif
@@ -1541,7 +1542,7 @@
 #ifdef FEAT_VARTABS
 	    idx = computeIndex(col, text, beval->ts, beval->vts);
 #else
-	    idx = computeIndex(col, text, beval->ts);
+	    idx = computeIndex(col, text, beval->ts, 0);
 #endif
 	    if (idx > 0)
 	    {
@@ -1577,11 +1578,8 @@
 computeIndex(
 	int		 wantedCol,
 	char_u		*line,
-	int		 ts
-#ifdef FEAT_VARTABS
-	int		*vts
-#else
-	)
+	int		 ts,
+	int		*vts UNUSED)
 {
     int		 col = 0;
     int		 idx = 0;