diff --git a/src/os_unix.h b/src/os_unix.h
index d025200..4a35338 100644
--- a/src/os_unix.h
+++ b/src/os_unix.h
@@ -565,7 +565,9 @@
 # endif
 #endif
 
-#define HAVE_DUP		/* have dup() */
+#ifndef HAVE_DUP
+# define HAVE_DUP		/* have dup() */
+#endif
 #define HAVE_ST_MODE		/* have stat.st_mode */
 
 /* We have three kinds of ACL support. */
diff --git a/src/term.c b/src/term.c
index 35a6af9..41974de 100644
--- a/src/term.c
+++ b/src/term.c
@@ -4185,7 +4185,7 @@
 	    {
 #ifdef FEAT_MBYTE
 		int col;
-		int row_char;
+		int row_char = NUL;
 #endif
 		j = 0;
 		extra = 0;
diff --git a/src/version.c b/src/version.c
index bf33f2d..65c25fe 100644
--- a/src/version.c
+++ b/src/version.c
@@ -735,6 +735,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    216,
+/**/
     215,
 /**/
     214,