diff --git a/shared/nm-glib-aux/nm-macros-internal.h b/shared/nm-glib-aux/nm-macros-internal.h
index 9b8b241892..cd77706584 100644
--- a/shared/nm-glib-aux/nm-macros-internal.h
+++ b/shared/nm-glib-aux/nm-macros-internal.h
@@ -695,12 +695,18 @@ NM_G_ERROR_MSG (GError *error)
 	                       void *: (const char *     *) (value)))
 #define NM_CAST_STRV_CC(value) \
 	(_Generic ((value), \
-	           const char *const*: (const char *const*) (value), \
-	           const char *     *: (const char *const*) (value), \
-	                 char *const*: (const char *const*) (value), \
-	                 char *     *: (const char *const*) (value), \
-	                 const void *: (const char *const*) (value), \
-	                       void *: (const char *const*) (value)))
+	           const char *const*     : (const char *const*) (value), \
+	           const char *     *     : (const char *const*) (value), \
+	                 char *const*     : (const char *const*) (value), \
+	                 char *     *     : (const char *const*) (value), \
+	                 const void *     : (const char *const*) (value), \
+	                       void *     : (const char *const*) (value), \
+	           const char *const*const: (const char *const*) (value), \
+	           const char *     *const: (const char *const*) (value), \
+	                 char *const*const: (const char *const*) (value), \
+	                 char *     *const: (const char *const*) (value), \
+	                 const void *const: (const char *const*) (value), \
+	                       void *const: (const char *const*) (value)))
 #else
 #define NM_CAST_STRV_MC(value) ((const char *     *) (value))
 #define NM_CAST_STRV_CC(value) ((const char *const*) (value))