diff --git a/bin/dnssec/dnssec-signzone.c b/bin/dnssec/dnssec-signzone.c
index e16db1a24c..2cf0a9bd83 100644
--- a/bin/dnssec/dnssec-signzone.c
+++ b/bin/dnssec/dnssec-signzone.c
@@ -106,7 +106,7 @@ static int nsec_datatype = dns_rdatatype_nsec;
 		     "dns_dbiterator_current()")
 
 #define IS_NSEC3  (nsec_datatype == dns_rdatatype_nsec3)
-#define OPTOUT(x) (((x)&DNS_NSEC3FLAG_OPTOUT) != 0)
+#define OPTOUT(x) (((x) & DNS_NSEC3FLAG_OPTOUT) != 0)
 
 #define REVOKE(x) ((dst_key_flags(x) & DNS_KEYFLAG_REVOKE) != 0)
 
diff --git a/lib/dns/adb.c b/lib/dns/adb.c
index 65904e0f5d..2933546802 100644
--- a/lib/dns/adb.c
+++ b/lib/dns/adb.c
@@ -423,8 +423,8 @@ enum {
  * These are currently used on simple unsigned ints, so they are
  * not really associated with any particular type.
  */
-#define WANT_INET(x)  (((x)&DNS_ADBFIND_INET) != 0)
-#define WANT_INET6(x) (((x)&DNS_ADBFIND_INET6) != 0)
+#define WANT_INET(x)  (((x) & DNS_ADBFIND_INET) != 0)
+#define WANT_INET6(x) (((x) & DNS_ADBFIND_INET6) != 0)
 
 #define EXPIRE_OK(exp, now) ((exp == INT_MAX) || (exp < now))
 
@@ -435,7 +435,7 @@ enum {
  */
 #define STARTATZONE_MATCHES(nf, o)                  \
 	(((nf)->flags & DNS_ADBFIND_STARTATZONE) == \
-	 ((o)&DNS_ADBFIND_STARTATZONE))
+	 ((o) & DNS_ADBFIND_STARTATZONE))
 
 #define ENTER_LEVEL  ISC_LOG_DEBUG(50)
 #define CLEAN_LEVEL  ISC_LOG_DEBUG(100)
diff --git a/lib/dns/include/dns/db.h b/lib/dns/include/dns/db.h
index b3657be2e8..1643b6716e 100644
--- a/lib/dns/include/dns/db.h
+++ b/lib/dns/include/dns/db.h
@@ -78,15 +78,15 @@ extern unsigned int dns_pps;
 *****/
 
 typedef struct dns_dbmethods {
-	void (*destroy)(dns_db_t *db);
+	void	     (*destroy)(dns_db_t *db);
 	isc_result_t (*beginload)(dns_db_t	       *db,
 				  dns_rdatacallbacks_t *callbacks);
 	isc_result_t (*endload)(dns_db_t *db, dns_rdatacallbacks_t *callbacks);
 	void (*currentversion)(dns_db_t *db, dns_dbversion_t **versionp);
 	isc_result_t (*newversion)(dns_db_t *db, dns_dbversion_t **versionp);
-	void (*attachversion)(dns_db_t *db, dns_dbversion_t *source,
+	void	     (*attachversion)(dns_db_t *db, dns_dbversion_t *source,
 			      dns_dbversion_t **targetp);
-	void (*closeversion)(dns_db_t *db, dns_dbversion_t **versionp,
+	void	     (*closeversion)(dns_db_t *db, dns_dbversion_t **versionp,
 			     bool commit DNS__DB_FLARG);
 	isc_result_t (*findnode)(dns_db_t *db, const dns_name_t *name,
 				 bool		      create,
@@ -103,7 +103,7 @@ typedef struct dns_dbmethods {
 				    dns_name_t		       *dcname,
 				    dns_rdataset_t	       *rdataset,
 				    dns_rdataset_t *sigrdataset DNS__DB_FLARG);
-	void (*attachnode)(dns_db_t *db, dns_dbnode_t *source,
+	void	     (*attachnode)(dns_db_t *db, dns_dbnode_t *source,
 			   dns_dbnode_t **targetp DNS__DB_FLARG);
 	void (*detachnode)(dns_db_t *db, dns_dbnode_t **targetp DNS__DB_FLARG);
 	isc_result_t (*createiterator)(dns_db_t *db, unsigned int options,
@@ -131,9 +131,9 @@ typedef struct dns_dbmethods {
 				       dns_dbversion_t	     *version,
 				       dns_rdatatype_t	      type,
 				       dns_rdatatype_t covers DNS__DB_FLARG);
-	bool (*issecure)(dns_db_t *db);
+	bool	     (*issecure)(dns_db_t *db);
 	unsigned int (*nodecount)(dns_db_t *db, dns_dbtree_t);
-	void (*setloop)(dns_db_t *db, isc_loop_t *);
+	void	     (*setloop)(dns_db_t *db, isc_loop_t *);
 	isc_result_t (*getoriginnode)(dns_db_t		  *db,
 				      dns_dbnode_t **nodep DNS__DB_FLARG);
 	isc_result_t (*getnsec3parameters)(dns_db_t	   *db,
@@ -164,7 +164,7 @@ typedef struct dns_dbmethods {
 				dns_rdataset_t		   *rdataset,
 				dns_rdataset_t *sigrdataset DNS__DB_FLARG);
 	isc_result_t (*setcachestats)(dns_db_t *db, isc_stats_t *stats);
-	size_t (*hashsize)(dns_db_t *db);
+	size_t	     (*hashsize)(dns_db_t *db);
 	isc_result_t (*getsize)(dns_db_t *db, dns_dbversion_t *version,
 				uint64_t *records, uint64_t *bytes);
 	isc_result_t (*setservestalettl)(dns_db_t *db, dns_ttl_t ttl);
diff --git a/lib/dns/include/dns/dbiterator.h b/lib/dns/include/dns/dbiterator.h
index e03636a7e7..d9b31ad4e3 100644
--- a/lib/dns/include/dns/dbiterator.h
+++ b/lib/dns/include/dns/dbiterator.h
@@ -68,7 +68,7 @@ ISC_LANG_BEGINDECLS
 *****/
 
 typedef struct dns_dbiteratormethods {
-	void (*destroy)(dns_dbiterator_t **iteratorp DNS__DB_FLARG);
+	void	     (*destroy)(dns_dbiterator_t **iteratorp DNS__DB_FLARG);
 	isc_result_t (*first)(dns_dbiterator_t *iterator DNS__DB_FLARG);
 	isc_result_t (*last)(dns_dbiterator_t *iterator DNS__DB_FLARG);
 	isc_result_t (*seek)(dns_dbiterator_t	   *iterator,
diff --git a/lib/dns/include/dns/keytable.h b/lib/dns/include/dns/keytable.h
index b407cf2552..1712abe9a9 100644
--- a/lib/dns/include/dns/keytable.h
+++ b/lib/dns/include/dns/keytable.h
@@ -287,9 +287,9 @@ dns_keynode_trust(dns_keynode_t *keynode);
 
 void
 dns_keytable_forall(dns_keytable_t *keytable,
-		    void (*func)(dns_keytable_t *, dns_keynode_t *,
-				 dns_name_t *, void *),
-		    void *arg);
+		    void	    (*func)(dns_keytable_t *, dns_keynode_t *,
+				    dns_name_t *, void *),
+		    void	   *arg);
 /*%<
  * Call 'func' on each keynode in 'keytable'.
  */
diff --git a/lib/dns/include/dns/qp.h b/lib/dns/include/dns/qp.h
index cb92d4f78d..2c6ab53c6b 100644
--- a/lib/dns/include/dns/qp.h
+++ b/lib/dns/include/dns/qp.h
@@ -282,11 +282,11 @@ typedef struct dns_qpchain {
  * readable identifier into `buf` which has max length `size`.
  */
 typedef struct dns_qpmethods {
-	void (*attach)(void *uctx, void *pval, uint32_t ival);
-	void (*detach)(void *uctx, void *pval, uint32_t ival);
+	void   (*attach)(void *uctx, void *pval, uint32_t ival);
+	void   (*detach)(void *uctx, void *pval, uint32_t ival);
 	size_t (*makekey)(dns_qpkey_t key, void *uctx, void *pval,
 			  uint32_t ival);
-	void (*triename)(void *uctx, char *buf, size_t size);
+	void   (*triename)(void *uctx, char *buf, size_t size);
 } dns_qpmethods_t;
 
 /*%
diff --git a/lib/dns/include/dns/rbt.h b/lib/dns/include/dns/rbt.h
index 08b4803ab9..88d87ebb5d 100644
--- a/lib/dns/include/dns/rbt.h
+++ b/lib/dns/include/dns/rbt.h
@@ -698,7 +698,7 @@ dns_rbt_destroy2(dns_rbt_t **rbtp, unsigned int quantum);
 
 void
 dns_rbt_printtext(dns_rbt_t *rbt, void (*data_printer)(FILE *, void *),
-		  FILE	    *f);
+		  FILE *f);
 /*%<
  * Print an ASCII representation of the internal structure of the red-black
  * tree of trees to the passed stream.
diff --git a/lib/dns/include/dns/rdataset.h b/lib/dns/include/dns/rdataset.h
index 8216164100..df804f0546 100644
--- a/lib/dns/include/dns/rdataset.h
+++ b/lib/dns/include/dns/rdataset.h
@@ -75,11 +75,11 @@ typedef enum {
 } dns_rdatasetadditional_t;
 
 typedef struct dns_rdatasetmethods {
-	void (*disassociate)(dns_rdataset_t *rdataset DNS__DB_FLARG);
+	void	     (*disassociate)(dns_rdataset_t *rdataset DNS__DB_FLARG);
 	isc_result_t (*first)(dns_rdataset_t *rdataset);
 	isc_result_t (*next)(dns_rdataset_t *rdataset);
-	void (*current)(dns_rdataset_t *rdataset, dns_rdata_t *rdata);
-	void (*clone)(dns_rdataset_t	    *source,
+	void	     (*current)(dns_rdataset_t *rdataset, dns_rdata_t *rdata);
+	void	     (*clone)(dns_rdataset_t	    *source,
 		      dns_rdataset_t *target DNS__DB_FLARG);
 	unsigned int (*count)(dns_rdataset_t *rdataset);
 	isc_result_t (*addnoqname)(dns_rdataset_t   *rdataset,
@@ -92,9 +92,9 @@ typedef struct dns_rdatasetmethods {
 	isc_result_t (*getclosest)(dns_rdataset_t *rdataset, dns_name_t *name,
 				   dns_rdataset_t	 *neg,
 				   dns_rdataset_t *negsig DNS__DB_FLARG);
-	void (*settrust)(dns_rdataset_t *rdataset, dns_trust_t trust);
-	void (*expire)(dns_rdataset_t *rdataset DNS__DB_FLARG);
-	void (*clearprefetch)(dns_rdataset_t *rdataset);
+	void	     (*settrust)(dns_rdataset_t *rdataset, dns_trust_t trust);
+	void	     (*expire)(dns_rdataset_t *rdataset DNS__DB_FLARG);
+	void	     (*clearprefetch)(dns_rdataset_t *rdataset);
 	void (*setownercase)(dns_rdataset_t *rdataset, const dns_name_t *name);
 	void (*getownercase)(const dns_rdataset_t *rdataset, dns_name_t *name);
 	isc_result_t (*addglue)(dns_rdataset_t	*rdataset,
diff --git a/lib/dns/include/dns/rdatasetiter.h b/lib/dns/include/dns/rdatasetiter.h
index 4689d333c3..4976babcd0 100644
--- a/lib/dns/include/dns/rdatasetiter.h
+++ b/lib/dns/include/dns/rdatasetiter.h
@@ -67,10 +67,10 @@ ISC_LANG_BEGINDECLS
 *****/
 
 typedef struct dns_rdatasetitermethods {
-	void (*destroy)(dns_rdatasetiter_t **iteratorp DNS__DB_FLARG);
+	void	     (*destroy)(dns_rdatasetiter_t **iteratorp DNS__DB_FLARG);
 	isc_result_t (*first)(dns_rdatasetiter_t *iterator DNS__DB_FLARG);
 	isc_result_t (*next)(dns_rdatasetiter_t *iterator DNS__DB_FLARG);
-	void (*current)(dns_rdatasetiter_t	*iterator,
+	void	     (*current)(dns_rdatasetiter_t	*iterator,
 			dns_rdataset_t *rdataset DNS__DB_FLARG);
 } dns_rdatasetitermethods_t;
 
diff --git a/lib/dns/include/dns/rdatatype.h b/lib/dns/include/dns/rdatatype.h
index 46ecef329f..a1b301ac85 100644
--- a/lib/dns/include/dns/rdatatype.h
+++ b/lib/dns/include/dns/rdatatype.h
@@ -19,7 +19,7 @@
 
 #include <dns/types.h>
 
-#define DNS_TYPEPAIR_TYPE(type)	  ((dns_rdatatype_t)((type)&0xFFFF))
+#define DNS_TYPEPAIR_TYPE(type)	  ((dns_rdatatype_t)((type) & 0xFFFF))
 #define DNS_TYPEPAIR_COVERS(type) ((dns_rdatatype_t)((type) >> 16))
 #define DNS_TYPEPAIR_VALUE(base, ext) \
 	((dns_typepair_t)(((uint32_t)ext) << 16) | (((uint32_t)base) & 0xffff))
diff --git a/lib/dns/include/dns/stats.h b/lib/dns/include/dns/stats.h
index ffa7e21ae1..447ec95277 100644
--- a/lib/dns/include/dns/stats.h
+++ b/lib/dns/include/dns/stats.h
@@ -234,7 +234,7 @@ enum {
 /*%<
  * Conversion macros among dns_rdatatype_t, attributes and isc_statscounter_t.
  */
-#define DNS_RDATASTATSTYPE_BASE(type)  ((dns_rdatatype_t)((type)&0xFFFF))
+#define DNS_RDATASTATSTYPE_BASE(type)  ((dns_rdatatype_t)((type) & 0xFFFF))
 #define DNS_RDATASTATSTYPE_ATTR(type)  ((type) >> 16)
 #define DNS_RDATASTATSTYPE_VALUE(b, a) (((a) << 16) | (b))
 
diff --git a/lib/dns/include/dns/update.h b/lib/dns/include/dns/update.h
index 8ca1bf090e..95dea85b5c 100644
--- a/lib/dns/include/dns/update.h
+++ b/lib/dns/include/dns/update.h
@@ -27,8 +27,8 @@
 #include <dns/types.h>
 
 typedef struct {
-	void (*func)(void *arg, dns_zone_t *zone, int level,
-		     const char *message);
+	void  (*func)(void *arg, dns_zone_t *zone, int level,
+		      const char *message);
 	void *arg;
 } dns_update_log_t;
 
diff --git a/lib/dns/include/dns/view.h b/lib/dns/include/dns/view.h
index 8904a5a485..7bfd7ce892 100644
--- a/lib/dns/include/dns/view.h
+++ b/lib/dns/include/dns/view.h
@@ -212,13 +212,13 @@ struct dns_view {
 	 * XXX: This should be a pointer to an opaque type that
 	 * named implements.
 	 */
-	char	*new_zone_dir;
-	char	*new_zone_file;
-	char	*new_zone_db;
-	void	*new_zone_dbenv;
-	uint64_t new_zone_mapsize;
-	void	*new_zone_config;
-	void (*cfg_destroy)(void **);
+	char	   *new_zone_dir;
+	char	   *new_zone_file;
+	char	   *new_zone_db;
+	void	   *new_zone_dbenv;
+	uint64_t    new_zone_mapsize;
+	void	   *new_zone_config;
+	void	    (*cfg_destroy)(void **);
 	isc_mutex_t new_zone_lock;
 
 	unsigned char secret[32]; /* Client secret */
@@ -230,11 +230,11 @@ struct dns_view {
 
 	/* Registered module instances */
 	void *plugins;
-	void (*plugins_free)(isc_mem_t *, void **);
+	void  (*plugins_free)(isc_mem_t *, void **);
 
 	/* Hook table */
 	void *hooktable; /* ns_hooktable */
-	void (*hooktable_free)(isc_mem_t *, void **);
+	void  (*hooktable_free)(isc_mem_t *, void **);
 };
 
 #define DNS_VIEW_MAGIC	     ISC_MAGIC('V', 'i', 'e', 'w')
diff --git a/lib/dns/master.c b/lib/dns/master.c
index b8f1bfaff6..81cc999b00 100644
--- a/lib/dns/master.c
+++ b/lib/dns/master.c
@@ -87,7 +87,7 @@
 #define DNS_MASTER_LHS 2048
 #define DNS_MASTER_RHS MINTSIZ
 
-#define CHECKNAMESFAIL(x) (((x)&DNS_MASTER_CHECKNAMESFAIL) != 0)
+#define CHECKNAMESFAIL(x) (((x) & DNS_MASTER_CHECKNAMESFAIL) != 0)
 
 typedef ISC_LIST(dns_rdatalist_t) rdatalist_head_t;
 
diff --git a/lib/dns/nsec3.c b/lib/dns/nsec3.c
index 227ac5c129..7a9d6becdd 100644
--- a/lib/dns/nsec3.c
+++ b/lib/dns/nsec3.c
@@ -48,10 +48,10 @@
 			goto failure;        \
 	} while (0)
 
-#define OPTOUT(x)  (((x)&DNS_NSEC3FLAG_OPTOUT) != 0)
-#define CREATE(x)  (((x)&DNS_NSEC3FLAG_CREATE) != 0)
-#define INITIAL(x) (((x)&DNS_NSEC3FLAG_INITIAL) != 0)
-#define REMOVE(x)  (((x)&DNS_NSEC3FLAG_REMOVE) != 0)
+#define OPTOUT(x)  (((x) & DNS_NSEC3FLAG_OPTOUT) != 0)
+#define CREATE(x)  (((x) & DNS_NSEC3FLAG_CREATE) != 0)
+#define INITIAL(x) (((x) & DNS_NSEC3FLAG_INITIAL) != 0)
+#define REMOVE(x)  (((x) & DNS_NSEC3FLAG_REMOVE) != 0)
 
 isc_result_t
 dns_nsec3_buildrdata(dns_db_t *db, dns_dbversion_t *version, dns_dbnode_t *node,
diff --git a/lib/dns/private.c b/lib/dns/private.c
index 35ccda0223..a6bd714e8c 100644
--- a/lib/dns/private.c
+++ b/lib/dns/private.c
@@ -38,10 +38,10 @@
  * been requested to be built otherwise a NSEC chain needs to be built.
  */
 
-#define REMOVE(x)  (((x)&DNS_NSEC3FLAG_REMOVE) != 0)
-#define CREATE(x)  (((x)&DNS_NSEC3FLAG_CREATE) != 0)
-#define INITIAL(x) (((x)&DNS_NSEC3FLAG_INITIAL) != 0)
-#define NONSEC(x)  (((x)&DNS_NSEC3FLAG_NONSEC) != 0)
+#define REMOVE(x)  (((x) & DNS_NSEC3FLAG_REMOVE) != 0)
+#define CREATE(x)  (((x) & DNS_NSEC3FLAG_CREATE) != 0)
+#define INITIAL(x) (((x) & DNS_NSEC3FLAG_INITIAL) != 0)
+#define NONSEC(x)  (((x) & DNS_NSEC3FLAG_NONSEC) != 0)
 
 #define CHECK(x)                             \
 	do {                                 \
diff --git a/lib/dns/zone.c b/lib/dns/zone.c
index 6fb44e43cd..bdabac8a4d 100644
--- a/lib/dns/zone.c
+++ b/lib/dns/zone.c
@@ -126,7 +126,7 @@
  */
 #define RANGE(a, min, max) (((a) < (min)) ? (min) : ((a) < (max) ? (a) : (max)))
 
-#define NSEC3REMOVE(x) (((x)&DNS_NSEC3FLAG_REMOVE) != 0)
+#define NSEC3REMOVE(x) (((x) & DNS_NSEC3FLAG_REMOVE) != 0)
 
 /*%
  * Key flags
diff --git a/lib/isc/hashmap.c b/lib/isc/hashmap.c
index 1fa5460770..5927b52cc9 100644
--- a/lib/isc/hashmap.c
+++ b/lib/isc/hashmap.c
@@ -40,19 +40,19 @@
 #include <isc/types.h>
 #include <isc/util.h>
 
-#define APPROX_99_PERCENT(x) (((x)*1013) >> 10)
-#define APPROX_95_PERCENT(x) (((x)*972) >> 10)
-#define APPROX_90_PERCENT(x) (((x)*921) >> 10)
-#define APPROX_85_PERCENT(x) (((x)*870) >> 10)
-#define APPROX_40_PERCENT(x) (((x)*409) >> 10)
-#define APPROX_35_PERCENT(x) (((x)*359) >> 10)
-#define APPROX_30_PERCENT(x) (((x)*308) >> 10)
-#define APPROX_25_PERCENT(x) (((x)*256) >> 10)
-#define APPROX_20_PERCENT(x) (((x)*205) >> 10)
-#define APPROX_15_PERCENT(x) (((x)*154) >> 10)
-#define APPROX_10_PERCENT(x) (((x)*103) >> 10)
-#define APPROX_05_PERCENT(x) (((x)*52) >> 10)
-#define APPROX_01_PERCENT(x) (((x)*11) >> 10)
+#define APPROX_99_PERCENT(x) (((x) * 1013) >> 10)
+#define APPROX_95_PERCENT(x) (((x) * 972) >> 10)
+#define APPROX_90_PERCENT(x) (((x) * 921) >> 10)
+#define APPROX_85_PERCENT(x) (((x) * 870) >> 10)
+#define APPROX_40_PERCENT(x) (((x) * 409) >> 10)
+#define APPROX_35_PERCENT(x) (((x) * 359) >> 10)
+#define APPROX_30_PERCENT(x) (((x) * 308) >> 10)
+#define APPROX_25_PERCENT(x) (((x) * 256) >> 10)
+#define APPROX_20_PERCENT(x) (((x) * 205) >> 10)
+#define APPROX_15_PERCENT(x) (((x) * 154) >> 10)
+#define APPROX_10_PERCENT(x) (((x) * 103) >> 10)
+#define APPROX_05_PERCENT(x) (((x) * 52) >> 10)
+#define APPROX_01_PERCENT(x) (((x) * 11) >> 10)
 
 #define ISC_HASHMAP_MAGIC	   ISC_MAGIC('H', 'M', 'a', 'p')
 #define ISC_HASHMAP_VALID(hashmap) ISC_MAGIC_VALID(hashmap, ISC_HASHMAP_MAGIC)
diff --git a/lib/isc/include/isc/endian.h b/lib/isc/include/isc/endian.h
index 6d5e6c2b4f..3c7ffbc298 100644
--- a/lib/isc/include/isc/endian.h
+++ b/lib/isc/include/isc/endian.h
@@ -86,29 +86,29 @@
 #include <inttypes.h>
 
 #ifndef bswap_16
-#define bswap_16(x)                                 \
-	((uint16_t)((((uint16_t)(x)&0xff00) >> 8) | \
-		    (((uint16_t)(x)&0x00ff) << 8)))
+#define bswap_16(x)                                   \
+	((uint16_t)((((uint16_t)(x) & 0xff00) >> 8) | \
+		    (((uint16_t)(x) & 0x00ff) << 8)))
 #endif /* !bswap_16 */
 
 #ifndef bswap_32
-#define bswap_32(x)                                      \
-	((uint32_t)((((uint32_t)(x)&0xff000000) >> 24) | \
-		    (((uint32_t)(x)&0x00ff0000) >> 8) |  \
-		    (((uint32_t)(x)&0x0000ff00) << 8) |  \
-		    (((uint32_t)(x)&0x000000ff) << 24)))
+#define bswap_32(x)                                        \
+	((uint32_t)((((uint32_t)(x) & 0xff000000) >> 24) | \
+		    (((uint32_t)(x) & 0x00ff0000) >> 8) |  \
+		    (((uint32_t)(x) & 0x0000ff00) << 8) |  \
+		    (((uint32_t)(x) & 0x000000ff) << 24)))
 #endif /* !bswap_32 */
 
 #ifndef bswap_64
-#define bswap_64(x)                                                 \
-	((uint64_t)((((uint64_t)(x)&0xff00000000000000ULL) >> 56) | \
-		    (((uint64_t)(x)&0x00ff000000000000ULL) >> 40) | \
-		    (((uint64_t)(x)&0x0000ff0000000000ULL) >> 24) | \
-		    (((uint64_t)(x)&0x000000ff00000000ULL) >> 8) |  \
-		    (((uint64_t)(x)&0x00000000ff000000ULL) << 8) |  \
-		    (((uint64_t)(x)&0x0000000000ff0000ULL) << 24) | \
-		    (((uint64_t)(x)&0x000000000000ff00ULL) << 40) | \
-		    (((uint64_t)(x)&0x00000000000000ffULL) << 56)))
+#define bswap_64(x)                                                   \
+	((uint64_t)((((uint64_t)(x) & 0xff00000000000000ULL) >> 56) | \
+		    (((uint64_t)(x) & 0x00ff000000000000ULL) >> 40) | \
+		    (((uint64_t)(x) & 0x0000ff0000000000ULL) >> 24) | \
+		    (((uint64_t)(x) & 0x000000ff00000000ULL) >> 8) |  \
+		    (((uint64_t)(x) & 0x00000000ff000000ULL) << 8) |  \
+		    (((uint64_t)(x) & 0x0000000000ff0000ULL) << 24) | \
+		    (((uint64_t)(x) & 0x000000000000ff00ULL) << 40) | \
+		    (((uint64_t)(x) & 0x00000000000000ffULL) << 56)))
 #endif /* !bswap_64 */
 
 #ifndef htobe16
diff --git a/lib/isc/include/isc/job.h b/lib/isc/include/isc/job.h
index 9a44974c25..56a95e3d84 100644
--- a/lib/isc/include/isc/job.h
+++ b/lib/isc/include/isc/job.h
@@ -30,7 +30,7 @@
 #include <isc/types.h>
 #include <isc/urcu.h>
 
-typedef void (*isc_job_cb)(void *);
+typedef void	       (*isc_job_cb)(void *);
 typedef struct isc_job isc_job_t;
 
 struct isc_job {
diff --git a/lib/isc/include/isc/net.h b/lib/isc/include/isc/net.h
index a50bcde583..358b40aad9 100644
--- a/lib/isc/include/isc/net.h
+++ b/lib/isc/include/isc/net.h
@@ -191,10 +191,10 @@
 
 /*% Is IP address multicast? */
 #define ISC_IPADDR_ISMULTICAST(i) \
-	(((uint32_t)(i)&ISC__IPADDR(0xf0000000)) == ISC__IPADDR(0xe0000000))
+	(((uint32_t)(i) & ISC__IPADDR(0xf0000000)) == ISC__IPADDR(0xe0000000))
 
 #define ISC_IPADDR_ISEXPERIMENTAL(i) \
-	(((uint32_t)(i)&ISC__IPADDR(0xf0000000)) == ISC__IPADDR(0xf0000000))
+	(((uint32_t)(i) & ISC__IPADDR(0xf0000000)) == ISC__IPADDR(0xf0000000))
 
 /***
  *** Functions.
diff --git a/lib/isc/include/isc/radix.h b/lib/isc/include/isc/radix.h
index 3bb01fbd80..cdedb68764 100644
--- a/lib/isc/include/isc/radix.h
+++ b/lib/isc/include/isc/radix.h
@@ -192,7 +192,7 @@ isc_radix_process(isc_radix_tree_t *radix, isc_radix_processfunc_t func);
  */
 
 #define RADIX_MAXBITS  128
-#define RADIX_NBIT(x)  (0x80 >> ((x)&0x7f))
+#define RADIX_NBIT(x)  (0x80 >> ((x) & 0x7f))
 #define RADIX_NBYTE(x) ((x) >> 3)
 
 #define RADIX_WALK(Xhead, Xnode)                              \
diff --git a/lib/isc/include/isc/thread.h b/lib/isc/include/isc/thread.h
index a24dfcdca5..b9bbaabdc3 100644
--- a/lib/isc/include/isc/thread.h
+++ b/lib/isc/include/isc/thread.h
@@ -33,7 +33,7 @@
 ISC_LANG_BEGINDECLS
 
 typedef pthread_t isc_thread_t;
-typedef void *(*isc_threadfunc_t)(void *);
+typedef void	 *(*isc_threadfunc_t)(void *);
 
 /*%
  * like isc_thread_create(), but run the function on the current
diff --git a/lib/isc/include/isc/work.h b/lib/isc/include/isc/work.h
index df196e95ea..e456e90597 100644
--- a/lib/isc/include/isc/work.h
+++ b/lib/isc/include/isc/work.h
@@ -18,8 +18,8 @@
 #include <isc/lang.h>
 #include <isc/loop.h>
 
-typedef void (*isc_work_cb)(void *arg);
-typedef void (*isc_after_work_cb)(void *arg);
+typedef void		(*isc_work_cb)(void *arg);
+typedef void		(*isc_after_work_cb)(void *arg);
 typedef struct isc_work isc_work_t;
 
 ISC_LANG_BEGINDECLS
diff --git a/lib/isc/netaddr.c b/lib/isc/netaddr.c
index 762be21c1e..2c7894f8c7 100644
--- a/lib/isc/netaddr.c
+++ b/lib/isc/netaddr.c
@@ -392,7 +392,7 @@ isc_netaddr_issitelocal(const isc_netaddr_t *na) {
 }
 
 #define ISC_IPADDR_ISNETZERO(i) \
-	(((uint32_t)(i)&ISC__IPADDR(0xff000000)) == ISC__IPADDR(0x00000000))
+	(((uint32_t)(i) & ISC__IPADDR(0xff000000)) == ISC__IPADDR(0x00000000))
 
 bool
 isc_netaddr_isnetzero(const isc_netaddr_t *na) {
diff --git a/lib/isc/url.c b/lib/isc/url.c
index cccb712be3..320a8638e4 100644
--- a/lib/isc/url.c
+++ b/lib/isc/url.c
@@ -44,7 +44,7 @@
 #ifndef BIT_AT
 #define BIT_AT(a, i)                                    \
 	(!!((unsigned int)(a)[(unsigned int)(i) >> 3] & \
-	    (1 << ((unsigned int)(i)&7))))
+	    (1 << ((unsigned int)(i) & 7))))
 #endif
 
 #if HTTP_PARSER_STRICT
@@ -201,7 +201,8 @@ typedef enum {
 #define IS_URL_CHAR(c)	(BIT_AT(normal_url_char, (unsigned char)c))
 #define IS_HOST_CHAR(c) (isalnum((unsigned char)c) || (c) == '.' || (c) == '-')
 #else
-#define IS_URL_CHAR(c) (BIT_AT(normal_url_char, (unsigned char)c) || ((c)&0x80))
+#define IS_URL_CHAR(c) \
+	(BIT_AT(normal_url_char, (unsigned char)c) || ((c) & 0x80))
 #define IS_HOST_CHAR(c) \
 	(isalnum((unsigned char)c) || (c) == '.' || (c) == '-' || (c) == '_')
 #endif
diff --git a/lib/isccfg/include/isccfg/cfg.h b/lib/isccfg/include/isccfg/cfg.h
index f790cd4377..2f9c81b907 100644
--- a/lib/isccfg/include/isccfg/cfg.h
+++ b/lib/isccfg/include/isccfg/cfg.h
@@ -501,11 +501,11 @@ cfg_listelt_value(const cfg_listelt_t *elt);
 
 void
 cfg_print(const cfg_obj_t *obj,
-	  void (*f)(void *closure, const char *text, int textlen),
-	  void *closure);
+	  void		   (*f)(void *closure, const char *text, int textlen),
+	  void		  *closure);
 void
 cfg_printx(const cfg_obj_t *obj, unsigned int flags,
-	   void (*f)(void *closure, const char *text, int textlen),
+	   void	 (*f)(void *closure, const char *text, int textlen),
 	   void *closure);
 
 #define CFG_PRINTER_XKEY    0x1 /* '?' out shared keys. */
@@ -527,7 +527,7 @@ cfg_printx(const cfg_obj_t *obj, unsigned int flags,
 
 void
 cfg_print_grammar(const cfg_type_t *type, unsigned int flags,
-		  void (*f)(void *closure, const char *text, int textlen),
+		  void	(*f)(void *closure, const char *text, int textlen),
 		  void *closure);
 /*%<
  * Print a summary of the grammar of the configuration type 'type'.
diff --git a/lib/isccfg/include/isccfg/grammar.h b/lib/isccfg/include/isccfg/grammar.h
index 7cbcf7f470..b93d38d139 100644
--- a/lib/isccfg/include/isccfg/grammar.h
+++ b/lib/isccfg/include/isccfg/grammar.h
@@ -87,9 +87,9 @@ typedef struct cfg_rep cfg_rep_t;
 
 typedef isc_result_t (*cfg_parsefunc_t)(cfg_parser_t *, const cfg_type_t *type,
 					cfg_obj_t **);
-typedef void (*cfg_printfunc_t)(cfg_printer_t *, const cfg_obj_t *);
-typedef void (*cfg_docfunc_t)(cfg_printer_t *, const cfg_type_t *);
-typedef void (*cfg_freefunc_t)(cfg_parser_t *, cfg_obj_t *);
+typedef void	     (*cfg_printfunc_t)(cfg_printer_t *, const cfg_obj_t *);
+typedef void	     (*cfg_docfunc_t)(cfg_printer_t *, const cfg_type_t *);
+typedef void	     (*cfg_freefunc_t)(cfg_parser_t *, cfg_obj_t *);
 
 /*
  * Structure definitions
@@ -101,7 +101,7 @@ typedef void (*cfg_freefunc_t)(cfg_parser_t *, cfg_obj_t *);
  * by calling the function 'f'.
  */
 struct cfg_printer {
-	void (*f)(void *closure, const char *text, int textlen);
+	void  (*f)(void *closure, const char *text, int textlen);
 	void *closure;
 	int   indent;
 	int   flags;
@@ -574,7 +574,7 @@ cfg_clause_validforzone(const char *name, unsigned int ztype);
 
 void
 cfg_print_zonegrammar(const unsigned int zonetype, unsigned int flags,
-		      void (*f)(void *closure, const char *text, int textlen),
+		      void  (*f)(void *closure, const char *text, int textlen),
 		      void *closure);
 /*%<
  * Print a summary of the grammar of the zone type represented by
diff --git a/lib/ns/include/ns/client.h b/lib/ns/include/ns/client.h
index db938bc4f5..4df84d332e 100644
--- a/lib/ns/include/ns/client.h
+++ b/lib/ns/include/ns/client.h
@@ -184,13 +184,13 @@ struct ns_client {
 	uint16_t	extflags;
 	int16_t		ednsversion; /* -1 noedns */
 	uint16_t	additionaldepth;
-	void (*cleanup)(ns_client_t *);
-	ns_query_t    query;
-	isc_time_t    requesttime;
-	isc_stdtime_t now;
-	isc_time_t    tnow;
-	dns_name_t    signername; /*%< [T]SIG key name */
-	dns_name_t   *signer;	  /*%< NULL if not valid sig */
+	void		(*cleanup)(ns_client_t *);
+	ns_query_t	query;
+	isc_time_t	requesttime;
+	isc_stdtime_t	now;
+	isc_time_t	tnow;
+	dns_name_t	signername; /*%< [T]SIG key name */
+	dns_name_t     *signer;	    /*%< NULL if not valid sig */
 
 	isc_sockaddr_t peeraddr;
 	bool	       peeraddr_valid;
diff --git a/lib/ns/query.c b/lib/ns/query.c
index f5e89bd50a..712bee0871 100644
--- a/lib/ns/query.c
+++ b/lib/ns/query.c
@@ -202,7 +202,7 @@ client_trace(ns_client_t *client, int level, const char *message) {
 #define DNS_GETDB_IGNOREACL  0x08U
 #define DNS_GETDB_STALEFIRST 0X0CU
 
-#define PENDINGOK(x) (((x)&DNS_DBFIND_PENDINGOK) != 0)
+#define PENDINGOK(x) (((x) & DNS_DBFIND_PENDINGOK) != 0)
 
 #define SFCACHE_CDFLAG 0x1
 
diff --git a/tests/bench/siphash.c b/tests/bench/siphash.c
index 292cd6d8e1..8c1238537b 100644
--- a/tests/bench/siphash.c
+++ b/tests/bench/siphash.c
@@ -23,7 +23,7 @@
 
 #define SIZE (1024 * 1024)
 
-#define KILOHASHES(count, us) ((us) == 0 ? 0.0 : ((count)*1000.0 / (us)))
+#define KILOHASHES(count, us) ((us) == 0 ? 0.0 : ((count) * 1000.0 / (us)))
 
 int
 main(void) {
diff --git a/tests/isc/doh_test.c b/tests/isc/doh_test.c
index 91d2ed8e2d..2a05429ba8 100644
--- a/tests/isc/doh_test.c
+++ b/tests/isc/doh_test.c
@@ -744,7 +744,7 @@ doh_connect_thread(void *arg) {
 		isc_loopmgr_shutdown(loopmgr);
 	}
 
-next : {}
+next: {}
 }
 
 static void