diff --git a/bin/named/server.c b/bin/named/server.c
index a0f8741aa5..a543b839a9 100644
--- a/bin/named/server.c
+++ b/bin/named/server.c
@@ -152,11 +152,11 @@
 #endif /* HAVE_LMDB */
 
 #ifndef SIZE_MAX
-#define SIZE_MAX ((size_t)-1)
+#define SIZE_MAX ((size_t) - 1)
 #endif /* ifndef SIZE_MAX */
 
 #ifndef SIZE_AS_PERCENT
-#define SIZE_AS_PERCENT ((size_t)-2)
+#define SIZE_AS_PERCENT ((size_t) - 2)
 #endif /* ifndef SIZE_AS_PERCENT */
 
 /* RFC7828 defines timeout as 16-bit value specified in units of 100
diff --git a/lib/dns/include/dns/librpz.h b/lib/dns/include/dns/librpz.h
index e971ab027d..79f307f701 100644
--- a/lib/dns/include/dns/librpz.h
+++ b/lib/dns/include/dns/librpz.h
@@ -157,7 +157,7 @@ typedef struct {
 typedef uint32_t librpz_idx_t;
 #define LIBRPZ_IDX_NULL 0
 #define LIBRPZ_IDX_MIN	1
-#define LIBRPZ_IDX_BAD	((librpz_idx_t)-1)
+#define LIBRPZ_IDX_BAD	((librpz_idx_t) - 1)
 /**
  * Partial decoded results of a set of RPZ queries for a single DNS response
  * or iteration through the mapped file.
diff --git a/lib/dns/include/dns/rpz.h b/lib/dns/include/dns/rpz.h
index eaf6fe982f..f03b68fd01 100644
--- a/lib/dns/include/dns/rpz.h
+++ b/lib/dns/include/dns/rpz.h
@@ -88,7 +88,7 @@ typedef uint8_t dns_rpz_num_t;
  */
 typedef uint64_t dns_rpz_zbits_t;
 
-#define DNS_RPZ_ALL_ZBITS ((dns_rpz_zbits_t)-1)
+#define DNS_RPZ_ALL_ZBITS ((dns_rpz_zbits_t) - 1)
 
 #define DNS_RPZ_INVALID_NUM DNS_RPZ_MAX_ZONES
 
diff --git a/lib/dns/rrl.c b/lib/dns/rrl.c
index 73c7b53ef4..c140cec599 100644
--- a/lib/dns/rrl.c
+++ b/lib/dns/rrl.c
@@ -53,30 +53,8 @@ log_end(dns_rrl_t *rrl, dns_rrl_entry_t *e, bool early, char *log_buf,
 static int
 hash_divisor(unsigned int initial) {
 	static uint16_t primes[] = {
-		3,
-		5,
-		7,
-		11,
-		13,
-		17,
-		19,
-		23,
-		29,
-		31,
-		37,
-		41,
-		43,
-		47,
-		53,
-		59,
-		61,
-		67,
-		71,
-		73,
-		79,
-		83,
-		89,
-		97,
+		3,  5,	7,  11, 13, 17, 19, 23, 29, 31, 37, 41,
+		43, 47, 53, 59, 61, 67, 71, 73, 79, 83, 89, 97,
 #if 0
 		101, 103, 107, 109, 113, 127, 131, 137, 139, 149, 151, 157,
 		163, 167, 173, 179, 181, 191, 193, 197, 199, 211, 223, 227,
diff --git a/lib/dns/zone.c b/lib/dns/zone.c
index c70579e0af..4d6284c6b3 100644
--- a/lib/dns/zone.c
+++ b/lib/dns/zone.c
@@ -1012,7 +1012,7 @@ static const char *dbargv_default[] = { ZONEDB_DEFAULT };
 	do {                                                                 \
 		isc_interval_t _i;                                           \
 		uint32_t _j;                                                 \
-		_j = (b)-isc_random_uniform((b) / 4);                        \
+		_j = (b) - isc_random_uniform((b) / 4);                      \
 		isc_interval_set(&_i, _j, 0);                                \
 		if (isc_time_add((a), &_i, (c)) != ISC_R_SUCCESS) {          \
 			dns_zone_log(zone, ISC_LOG_WARNING,                  \
diff --git a/lib/isc/include/isc/util.h b/lib/isc/include/isc/util.h
index a7bc9908ba..5eec716ea2 100644
--- a/lib/isc/include/isc/util.h
+++ b/lib/isc/include/isc/util.h
@@ -395,9 +395,9 @@ mock_assert(const int result, const char *const expression,
  * Alignment
  */
 #ifdef __GNUC__
-#define ISC_ALIGN(x, a) (((x) + (a)-1) & ~((typeof(x))(a)-1))
+#define ISC_ALIGN(x, a) (((x) + (a) - 1) & ~((typeof(x))(a) - 1))
 #else /* ifdef __GNUC__ */
-#define ISC_ALIGN(x, a) (((x) + (a)-1) & ~((uintmax_t)(a)-1))
+#define ISC_ALIGN(x, a) (((x) + (a) - 1) & ~((uintmax_t)(a) - 1))
 #endif /* ifdef __GNUC__ */
 
 /*%
diff --git a/lib/isc/picohttpparser.c b/lib/isc/picohttpparser.c
index d82fd01986..59f5ff1a18 100644
--- a/lib/isc/picohttpparser.c
+++ b/lib/isc/picohttpparser.c
@@ -52,7 +52,7 @@
 #define ALIGNED(n) __attribute__((aligned(n)))
 #endif
 
-#define IS_PRINTABLE_ASCII(c) ((unsigned char)(c)-040u < 0137u)
+#define IS_PRINTABLE_ASCII(c) ((unsigned char)(c) - 040u < 0137u)
 
 #define CHECK_EOF()           \
 	if (buf == buf_end) { \