diff --git a/lib/dns/include/dns/rdata.h b/lib/dns/include/dns/rdata.h
index 36f79c8edd..ddbaad713b 100644
--- a/lib/dns/include/dns/rdata.h
+++ b/lib/dns/include/dns/rdata.h
@@ -117,10 +117,7 @@ struct dns_rdata {
 	ISC_LINK(dns_rdata_t) link;
 };
 
-#define DNS_RDATA_INIT                                           \
-	{                                                        \
-		NULL, 0, 0, 0, 0, { (void *)(-1), (void *)(-1) } \
-	}
+#define DNS_RDATA_INIT { NULL, 0, 0, 0, 0, { (void *)(-1), (void *)(-1) } }
 
 #define DNS_RDATA_CHECKINITIALIZED
 #ifdef DNS_RDATA_CHECKINITIALIZED
diff --git a/lib/dns/rcode.c b/lib/dns/rcode.c
index c0141621ef..07d9c92b03 100644
--- a/lib/dns/rcode.c
+++ b/lib/dns/rcode.c
@@ -66,24 +66,20 @@
 		{ 14, "RESERVED14", TOTEXTONLY },      \
 		{ 15, "RESERVED15", TOTEXTONLY },
 
-#define ERCODENAMES                                        \
-	/* extended rcodes */                              \
-	{ dns_rcode_badvers, "BADVERS", 0 },               \
-		{ dns_rcode_badcookie, "BADCOOKIE", 0 }, { \
-		0, NULL, 0                                 \
-	}
+#define ERCODENAMES                          \
+	/* extended rcodes */                \
+	{ dns_rcode_badvers, "BADVERS", 0 }, \
+		{ dns_rcode_badcookie, "BADCOOKIE", 0 }, { 0, NULL, 0 }
 
-#define TSIGRCODENAMES                                       \
-	/* extended rcodes */                                \
-	{ dns_tsigerror_badsig, "BADSIG", 0 },               \
-		{ dns_tsigerror_badkey, "BADKEY", 0 },       \
-		{ dns_tsigerror_badtime, "BADTIME", 0 },     \
-		{ dns_tsigerror_badmode, "BADMODE", 0 },     \
-		{ dns_tsigerror_badname, "BADNAME", 0 },     \
-		{ dns_tsigerror_badalg, "BADALG", 0 },       \
-		{ dns_tsigerror_badtrunc, "BADTRUNC", 0 }, { \
-		0, NULL, 0                                   \
-	}
+#define TSIGRCODENAMES                                   \
+	/* extended rcodes */                            \
+	{ dns_tsigerror_badsig, "BADSIG", 0 },           \
+		{ dns_tsigerror_badkey, "BADKEY", 0 },   \
+		{ dns_tsigerror_badtime, "BADTIME", 0 }, \
+		{ dns_tsigerror_badmode, "BADMODE", 0 }, \
+		{ dns_tsigerror_badname, "BADNAME", 0 }, \
+		{ dns_tsigerror_badalg, "BADALG", 0 },   \
+		{ dns_tsigerror_badtrunc, "BADTRUNC", 0 }, { 0, NULL, 0 }
 
 /* RFC4398 section 2.1 */
 
@@ -91,9 +87,7 @@
 	{ 1, "PKIX", 0 }, { 2, "SPKI", 0 }, { 3, "PGP", 0 },                \
 		{ 4, "IPKIX", 0 }, { 5, "ISPKI", 0 }, { 6, "IPGP", 0 },     \
 		{ 7, "ACPKIX", 0 }, { 8, "IACPKIX", 0 }, { 253, "URI", 0 }, \
-		{ 254, "OID", 0 }, {                                        \
-		0, NULL, 0                                                  \
-	}
+		{ 254, "OID", 0 }, { 0, NULL, 0 }
 
 /* RFC2535 section 7, RFC3110 */
 
@@ -115,20 +109,16 @@
 		{ DNS_KEYALG_ED448, "ED448", 0 },               \
 		{ DNS_KEYALG_INDIRECT, "INDIRECT", 0 },         \
 		{ DNS_KEYALG_PRIVATEDNS, "PRIVATEDNS", 0 },     \
-		{ DNS_KEYALG_PRIVATEOID, "PRIVATEOID", 0 }, {   \
-		0, NULL, 0                                      \
-	}
+		{ DNS_KEYALG_PRIVATEOID, "PRIVATEOID", 0 }, { 0, NULL, 0 }
 
 /* RFC2535 section 7.1 */
 
-#define SECPROTONAMES                                                       \
-	{ 0, "NONE", 0 }, { 1, "TLS", 0 }, { 2, "EMAIL", 0 },               \
-		{ 3, "DNSSEC", 0 }, { 4, "IPSEC", 0 }, { 255, "ALL", 0 }, { \
-		0, NULL, 0                                                  \
-	}
+#define SECPROTONAMES                                                     \
+	{ 0, "NONE", 0 }, { 1, "TLS", 0 }, { 2, "EMAIL", 0 },             \
+		{ 3, "DNSSEC", 0 }, { 4, "IPSEC", 0 }, { 255, "ALL", 0 }, \
+		{ 0, NULL, 0 }
 
-#define HASHALGNAMES \
-	{ 1, "SHA-1", 0 }, { 0, NULL, 0 }
+#define HASHALGNAMES { 1, "SHA-1", 0 }, { 0, NULL, 0 }
 
 /* RFC3658, RFC4509, RFC5933, RFC6605 */
 
@@ -138,9 +128,7 @@
 		{ DNS_DSDIGEST_SHA256, "SHA256", 0 },                        \
 		{ DNS_DSDIGEST_GOST, "GOST", 0 },                            \
 		{ DNS_DSDIGEST_SHA384, "SHA-384", 0 },                       \
-		{ DNS_DSDIGEST_SHA384, "SHA384", 0 }, {                      \
-		0, NULL, 0                                                   \
-	}
+		{ DNS_DSDIGEST_SHA384, "SHA384", 0 }, { 0, NULL, 0 }
 
 struct tbl {
 	unsigned int value;
diff --git a/lib/isc/include/isc/net.h b/lib/isc/include/isc/net.h
index 358b40aad9..e7d0d565bf 100644
--- a/lib/isc/include/isc/net.h
+++ b/lib/isc/include/isc/net.h
@@ -78,43 +78,22 @@
 #ifndef IN6ADDR_LOOPBACK_INIT
 #ifdef s6_addr
 /*% IPv6 address loopback init */
-#define IN6ADDR_LOOPBACK_INIT                                                  \
-	{                                                                      \
-		{                                                              \
-			{                                                      \
-				0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1 \
-			}                                                      \
-		}                                                              \
-	}
+#define IN6ADDR_LOOPBACK_INIT \
+	{ { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1 } } }
 #else /* ifdef s6_addr */
-#define IN6ADDR_LOOPBACK_INIT                                          \
-	{                                                              \
-		{                                                      \
-			0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1 \
-		}                                                      \
-	}
+#define IN6ADDR_LOOPBACK_INIT \
+	{ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1 } }
 #endif /* ifdef s6_addr */
 #endif /* ifndef IN6ADDR_LOOPBACK_INIT */
 
 #ifndef IN6ADDR_V4MAPPED_INIT
 #ifdef s6_addr
 /*% IPv6 v4mapped prefix init */
-#define IN6ADDR_V4MAPPED_INIT                                                \
-	{                                                                    \
-		{                                                            \
-			{                                                    \
-				0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0xff, 0xff, 0, \
-					0, 0, 0                              \
-			}                                                    \
-		}                                                            \
-	}
+#define IN6ADDR_V4MAPPED_INIT \
+	{ { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0xff, 0xff, 0, 0, 0, 0 } } }
 #else /* ifdef s6_addr */
-#define IN6ADDR_V4MAPPED_INIT                                                \
-	{                                                                    \
-		{                                                            \
-			0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0xff, 0xff, 0, 0, 0, 0 \
-		}                                                            \
-	}
+#define IN6ADDR_V4MAPPED_INIT \
+	{ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0xff, 0xff, 0, 0, 0, 0 } }
 #endif /* ifdef s6_addr */
 #endif /* ifndef IN6ADDR_V4MAPPED_INIT */