diff --git a/src/eval.c b/src/eval.c
index 4d7afa0..7d00c0e 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -10,9 +10,6 @@
 /*
  * eval.c: Expression evaluation.
  */
-#if defined(MSDOS) || defined(WIN16) || defined(WIN32) || defined(_WIN64)
-# include "vimio.h"	/* for mch_open(), must be before vim.h */
-#endif
 
 #include "vim.h"
 
diff --git a/src/ex_cmds.c b/src/ex_cmds.c
index 8a24c0a..3678083 100644
--- a/src/ex_cmds.c
+++ b/src/ex_cmds.c
@@ -11,10 +11,6 @@
  * ex_cmds.c: some functions for command line commands
  */
 
-#if defined(MSDOS) || defined(WIN16) || defined(WIN32) || defined(_WIN64)
-# include "vimio.h"	/* for mch_open(), must be before vim.h */
-#endif
-
 #include "vim.h"
 #include "version.h"
 
diff --git a/src/ex_cmds2.c b/src/ex_cmds2.c
index 8a7498a..e78b159 100644
--- a/src/ex_cmds2.c
+++ b/src/ex_cmds2.c
@@ -11,10 +11,6 @@
  * ex_cmds2.c: some more functions for command line commands
  */
 
-#if defined(MSDOS) || defined(WIN16) || defined(WIN32) || defined(_WIN64)
-# include "vimio.h"	/* for mch_open(), must be before vim.h */
-#endif
-
 #include "vim.h"
 #include "version.h"
 
diff --git a/src/fileio.c b/src/fileio.c
index 2828aa7..fcfb8cd 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -11,14 +11,6 @@
  * fileio.c: read from and write to a file
  */
 
-#if defined(MSDOS) || defined(WIN16) || defined(WIN32) || defined(_WIN64)
-# include "vimio.h"	/* for lseek(), must be before vim.h */
-#endif
-
-#if defined __EMX__
-# include "vimio.h"	/* for mktemp(), CJW 1997-12-03 */
-#endif
-
 #include "vim.h"
 
 #if defined(__TANDEM) || defined(__MINT__)
@@ -10336,7 +10328,7 @@
      * by a signal. */
     while (ret < (long)bufsize)
     {
-	wlen = vim_write(fd, buf + ret, bufsize - ret);
+	wlen = vim_write(fd, (char *)buf + ret, bufsize - ret);
 	if (wlen < 0)
 	{
 	    if (errno != EINTR)
diff --git a/src/if_cscope.c b/src/if_cscope.c
index 1a377da..bc8ea94 100644
--- a/src/if_cscope.c
+++ b/src/if_cscope.c
@@ -20,9 +20,6 @@
 #include <sys/stat.h>
 #if defined(UNIX)
 # include <sys/wait.h>
-#else
-    /* not UNIX, must be WIN32 */
-# include "vimio.h"
 #endif
 #include "if_cscope.h"
 
diff --git a/src/if_sniff.c b/src/if_sniff.c
index d82f4e5..a9e9be0 100644
--- a/src/if_sniff.c
+++ b/src/if_sniff.c
@@ -9,7 +9,6 @@
 
 #ifdef WIN32
 # include <stdio.h>
-# include "vimio.h"
 # include <process.h>
 # include <string.h>
 # include <assert.h>
diff --git a/src/main.c b/src/main.c
index faf574a..895a435 100644
--- a/src/main.c
+++ b/src/main.c
@@ -7,10 +7,6 @@
  * See README.txt for an overview of the Vim source code.
  */
 
-#if defined(MSDOS) || defined(WIN16) || defined(WIN32) || defined(_WIN64)
-# include "vimio.h"		/* for close() and dup() */
-#endif
-
 #define EXTERN
 #include "vim.h"
 
diff --git a/src/memfile.c b/src/memfile.c
index e9fe314..2d83ce8 100644
--- a/src/memfile.c
+++ b/src/memfile.c
@@ -32,10 +32,6 @@
  * file is opened.
  */
 
-#if defined(MSDOS) || defined(WIN16) || defined(WIN32) || defined(_WIN64)
-# include "vimio.h"	/* for lseek(), must be before vim.h */
-#endif
-
 #include "vim.h"
 
 /*
diff --git a/src/memline.c b/src/memline.c
index 7393324..d978b90 100644
--- a/src/memline.c
+++ b/src/memline.c
@@ -42,10 +42,6 @@
  *  mf_get().
  */
 
-#if defined(MSDOS) || defined(WIN16) || defined(WIN32) || defined(_WIN64)
-# include "vimio.h"	/* for mch_open(), must be before vim.h */
-#endif
-
 #include "vim.h"
 
 #ifndef UNIX		/* it's in os_unix.h for Unix */
diff --git a/src/netbeans.c b/src/netbeans.c
index f85e7d0..c0611d5 100644
--- a/src/netbeans.c
+++ b/src/netbeans.c
@@ -16,10 +16,6 @@
  * See ":help netbeans-protocol" for explanation.
  */
 
-#if defined(MSDOS) || defined(WIN16) || defined(WIN32) || defined(_WIN64)
-# include "vimio.h"	/* for mch_open(), must be before vim.h */
-#endif
-
 #include "vim.h"
 
 #if defined(FEAT_NETBEANS_INTG) || defined(PROTO)
diff --git a/src/os_msdos.c b/src/os_msdos.c
index 0df20c7..1b52d72 100644
--- a/src/os_msdos.c
+++ b/src/os_msdos.c
@@ -21,7 +21,6 @@
  * Some functions are also used for Win16 (MS-Windows 3.1).
  */
 
-#include "vimio.h"
 #include "vim.h"
 
 #include <conio.h>
diff --git a/src/os_mswin.c b/src/os_mswin.c
index e725e69..7dcc053 100644
--- a/src/os_mswin.c
+++ b/src/os_mswin.c
@@ -22,7 +22,6 @@
 # endif
 #endif
 
-#include "vimio.h"
 #include "vim.h"
 
 #ifdef WIN16
diff --git a/src/os_win16.c b/src/os_win16.c
index ba34072..66ca198 100644
--- a/src/os_win16.c
+++ b/src/os_win16.c
@@ -20,7 +20,6 @@
 # pragma warn -obs
 #endif
 
-#include "vimio.h"
 #include "vim.h"
 
 #include <dos.h>
diff --git a/src/os_win32.c b/src/os_win32.c
index 0dd7a82..dcf95ee 100644
--- a/src/os_win32.c
+++ b/src/os_win32.c
@@ -20,7 +20,6 @@
  * Roger Knobbe <rogerk@wonderware.com> did the initial port of Vim 3.0.
  */
 
-#include "vimio.h"
 #include "vim.h"
 
 #ifdef FEAT_MZSCHEME
diff --git a/src/spell.c b/src/spell.c
index 6716a6c..29cf687 100644
--- a/src/spell.c
+++ b/src/spell.c
@@ -303,10 +303,6 @@
  *			    few bytes as possible, see offset2bytes())
  */
 
-#if defined(MSDOS) || defined(WIN16) || defined(WIN32) || defined(_WIN64)
-# include "vimio.h"	/* for lseek(), must be before vim.h */
-#endif
-
 #include "vim.h"
 
 #if defined(FEAT_SPELL) || defined(PROTO)
diff --git a/src/tag.c b/src/tag.c
index 50c3ce6..0baa2c2 100644
--- a/src/tag.c
+++ b/src/tag.c
@@ -11,10 +11,6 @@
  * Code to handle tags and the tag stack
  */
 
-#if defined(MSDOS) || defined(WIN16) || defined(WIN32) || defined(_WIN64)
-# include "vimio.h"	/* for lseek(), must be before vim.h */
-#endif
-
 #include "vim.h"
 
 /*
diff --git a/src/undo.c b/src/undo.c
index bcf9463..ec7b1a4 100644
--- a/src/undo.c
+++ b/src/undo.c
@@ -81,10 +81,6 @@
 #define UH_MAGIC 0x18dade	/* value for uh_magic when in use */
 #define UE_MAGIC 0xabc123	/* value for ue_magic when in use */
 
-#if defined(MSDOS) || defined(WIN16) || defined(WIN32) || defined(_WIN64)
-# include "vimio.h"	/* for vim_read(), must be before vim.h */
-#endif
-
 #include "vim.h"
 
 static void u_unch_branch __ARGS((u_header_T *uhp));
diff --git a/src/version.c b/src/version.c
index 9e0ed46..7372e9a 100644
--- a/src/version.c
+++ b/src/version.c
@@ -715,6 +715,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    85,
+/**/
     84,
 /**/
     83,
diff --git a/src/vim.h b/src/vim.h
index 60e91c7..5eea085 100644
--- a/src/vim.h
+++ b/src/vim.h
@@ -27,6 +27,11 @@
 # endif
 #endif
 
+#if defined(MSDOS) || defined(WIN16) || defined(WIN32) || defined(_WIN64) \
+	|| defined(__EMX__)
+# include "vimio.h"
+#endif
+
 /* ============ the header file puzzle (ca. 50-100 pieces) ========= */
 
 #ifdef HAVE_CONFIG_H	/* GNU autoconf (or something else) was here */