diff --git a/src/structs.h b/src/structs.h
index ae1c12e810..4ac98b18a8 100644
--- a/src/structs.h
+++ b/src/structs.h
@@ -731,8 +731,6 @@ typedef struct proptype_S
 #define PT_FLAG_INS_START_INCL	1	// insert at start included in property
 #define PT_FLAG_INS_END_INCL	2	// insert at end included in property
 
-
-#if defined(FEAT_SIGNS) || defined(PROTO)
 // Sign group
 typedef struct signgroup_S
 {
@@ -741,10 +739,6 @@ typedef struct signgroup_S
     char_u	sg_name[1];		// sign group name
 } signgroup_T;
 
-// Macros to get the sign group structure from the group name
-#define SGN_KEY_OFF	offsetof(signgroup_T, sg_name)
-#define HI2SG(hi)	((signgroup_T *)((hi)->hi_key - SGN_KEY_OFF))
-
 typedef struct signlist signlist_T;
 
 struct signlist
@@ -758,6 +752,11 @@ struct signlist
     signlist_T  *prev;		/* previous entry -- for easy reordering */
 };
 
+#if defined(FEAT_SIGNS) || defined(PROTO)
+// Macros to get the sign group structure from the group name
+#define SGN_KEY_OFF	offsetof(signgroup_T, sg_name)
+#define HI2SG(hi)	((signgroup_T *)((hi)->hi_key - SGN_KEY_OFF))
+
 // Default sign priority for highlighting
 #define SIGN_DEF_PRIO	10
 
diff --git a/src/version.c b/src/version.c
index 1772cfdc80..e76bf4bd8c 100644
--- a/src/version.c
+++ b/src/version.c
@@ -799,6 +799,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    659,
 /**/
     658,
 /**/