diff --git a/src/if_ole.cpp b/src/if_ole.cpp
index a92f3a7..fad2097 100644
--- a/src/if_ole.cpp
+++ b/src/if_ole.cpp
@@ -13,14 +13,23 @@
  * See os_mswin.c for the client side.
  */
 
+/*
+ * We have some trouble with order of includes here.  For Borland it needs to
+ * be different from MSVC...
+ */
+#ifndef __BORLANDC__
 extern "C" {
-#include "vim.h"
+# include "vim.h"
 }
+#endif
 
 #include <windows.h>
 #include <oleauto.h>
 
 extern "C" {
+#ifdef __BORLANDC__
+# include "vim.h"
+#endif
 extern HWND s_hwnd;
 extern HWND vim_parent_hwnd;
 }
diff --git a/src/version.c b/src/version.c
index cfa4666..ef4fbac 100644
--- a/src/version.c
+++ b/src/version.c
@@ -667,6 +667,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    57,
+/**/
     56,
 /**/
     55,