diff --git a/src/version.c b/src/version.c
index 9985b4f..002aded 100644
--- a/src/version.c
+++ b/src/version.c
@@ -767,6 +767,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1581,
+/**/
     1580,
 /**/
     1579,
diff --git a/src/vim.h b/src/vim.h
index 3cad062..a30aa90 100644
--- a/src/vim.h
+++ b/src/vim.h
@@ -2119,15 +2119,21 @@
 #endif
 
 # if defined(FEAT_MBYTE) && defined(FEAT_EVAL) \
-	&& ((!defined(FEAT_GUI_W32) \
+	&& (!defined(FEAT_GUI_W32) \
 	     || !(defined(FEAT_MBYTE_IME) || defined(GLOBAL_IME))) \
-	     || (defined(MACOS_CONVERT) && !defined(FEAT_GUI_MAC)))
-/* Whether IME is supported by im_get_status() defined in mbyte.c. */
+	&& !defined(FEAT_GUI_MAC) \
+	&& !defined(MACOS_CONVERT)
+/* Whether IME is supported by im_get_status() defined in mbyte.c.
+ * For Win32 GUI it's in gui_w32.c when FEAT_MBYTE_IME or GLOBAL_IME is defined.
+ * for Mac it is in gui_mac.c for the GUI or in os_mac_conv.c when
+ * MACOS_CONVERT is defined. */
 # define IME_WITHOUT_XIM
 #endif
 
 #if defined(FEAT_MBYTE) && (defined(FEAT_XIM) \
 	|| defined(IME_WITHOUT_XIM) \
+	|| (defined(FEAT_GUI_W32) \
+	    && (defined(FEAT_MBYTE_IME) || defined(GLOBAL_IME))) \
 	|| defined(FEAT_GUI_MAC))
 /* im_set_active() is available */
 # define HAVE_INPUT_METHOD