diff --git a/src/gui.h b/src/gui.h
index 0a1d274..1882000 100644
--- a/src/gui.h
+++ b/src/gui.h
@@ -176,7 +176,7 @@
 				// to reduce the count.
 #endif
 
-#if FEAT_GUI_HAIKU
+#ifdef FEAT_GUI_HAIKU
     VimScrollBar *id;		// Pointer to real scroll bar
 #endif
 #ifdef FEAT_GUI_PHOTON
diff --git a/src/structs.h b/src/structs.h
index 3b51e0c..6d77deb 100644
--- a/src/structs.h
+++ b/src/structs.h
@@ -4333,7 +4333,7 @@
     HMENU	submenu_id;	    // If this is submenu, add children here
     HWND	tearoff_handle;	    // hWnd of tearoff if created
 #endif
-#if FEAT_GUI_HAIKU
+#ifdef FEAT_GUI_HAIKU
     BMenuItem  *id;		    // Id of menu item
     BMenu  *submenu_id;		    // If this is submenu, add children here
 # ifdef FEAT_TOOLBAR
diff --git a/src/version.c b/src/version.c
index f440140..675103f 100644
--- a/src/version.c
+++ b/src/version.c
@@ -705,6 +705,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    18,
+/**/
     17,
 /**/
     16,