diff --git a/src/gui_gtk_x11.c b/src/gui_gtk_x11.c
index 741b733..dc95d81 100644
--- a/src/gui_gtk_x11.c
+++ b/src/gui_gtk_x11.c
@@ -22,6 +22,7 @@
  */
 
 #include "vim.h"
+
 #ifdef FEAT_GUI_GNOME
 /* Gnome redefines _() and N_().  Grrr... */
 # ifdef _
@@ -1592,7 +1593,7 @@
     if (!gtk_init_check(&gui_argc, &gui_argv))
     {
 	gui.dying = TRUE;
-	EMSG(_(e_opendisp));
+	EMSG(_((char *)e_opendisp));
 	return FAIL;
     }
 
@@ -2345,9 +2346,9 @@
     /* Don't write messages to the GUI anymore */
     full_screen = FALSE;
 
-    vim_strncpy(IObuff,
+    vim_strncpy(IObuff, (char_u *)
 		    _("Vim: Received \"die\" request from session manager\n"),
-	    IOSIZE - 1);
+		    IOSIZE - 1);
     preserve_exit();
 }
 
@@ -5244,7 +5245,7 @@
     if (font == NULL)
     {
 	if (report_error)
-	    EMSG2(_(e_font), name);
+	    EMSG2(_((char *)e_font), name);
 	return NULL;
     }
 
diff --git a/src/version.c b/src/version.c
index 11abe51..ec51a6c 100644
--- a/src/version.c
+++ b/src/version.c
@@ -677,6 +677,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    18,
+/**/
     17,
 /**/
     16,