diff --git a/src/misc2.c b/src/misc2.c
index 04f34e9..9ed3e40 100644
--- a/src/misc2.c
+++ b/src/misc2.c
@@ -1075,7 +1075,7 @@
     ResetRedobuff();
     ResetRedobuff();
 
-#ifdef FEAT_CLIENTSERVER
+#if defined(FEAT_CLIENTSERVER) && defined(FEAT_X11)
     vim_free(serverDelayedStartName);
 #endif
 
diff --git a/src/os_mswin.c b/src/os_mswin.c
index 26d8533..27bd3d8 100644
--- a/src/os_mswin.c
+++ b/src/os_mswin.c
@@ -239,6 +239,11 @@
 
     if (gui.in_use)
 	gui_exit(r);
+
+#ifdef EXITFREE
+    free_all_mem();
+#endif
+
     exit(r);
 }
 
diff --git a/src/version.c b/src/version.c
index 5846a40..4c22d49 100644
--- a/src/version.c
+++ b/src/version.c
@@ -667,6 +667,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    197,
+/**/
     196,
 /**/
     195,