diff --git a/src/version.c b/src/version.c
index 962bae7c5e..153b3f5f89 100644
--- a/src/version.c
+++ b/src/version.c
@@ -758,6 +758,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2118,
 /**/
     2117,
 /**/
diff --git a/src/vim.h b/src/vim.h
index 498078a4d8..b7855270ec 100644
--- a/src/vim.h
+++ b/src/vim.h
@@ -98,11 +98,11 @@
 # ifndef HAVE_CONFIG_H
 #  define UNIX
 # endif
-# ifndef FEAT_CLIPBOARD
+# if defined(FEAT_SMALL) && !defined(FEAT_CLIPBOARD)
 #  define FEAT_CLIPBOARD
-#  if defined(FEAT_SMALL) && !defined(FEAT_MOUSE)
-#   define FEAT_MOUSE
-#  endif
+# endif
+# if defined(FEAT_SMALL) && !defined(FEAT_MOUSE)
+#  define FEAT_MOUSE
 # endif
 #endif
 #if defined(MACOS_X) || defined(MACOS_CLASSIC)