diff --git a/bin/named/server.c b/bin/named/server.c
index df02039f3e..1d30bb8f82 100644
--- a/bin/named/server.c
+++ b/bin/named/server.c
@@ -148,11 +148,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 */
 
 #ifdef TUNE_LARGE
diff --git a/lib/dns/rdata/generic/opt_41.c b/lib/dns/rdata/generic/opt_41.c
index e5e7168628..07d873eda7 100644
--- a/lib/dns/rdata/generic/opt_41.c
+++ b/lib/dns/rdata/generic/opt_41.c
@@ -72,9 +72,9 @@ totext_opt(ARGS_TOTEXT) {
 			or = r;
 			or.length = length;
 			if (tctx->width == 0) { /* No splitting */
-				RETERR(isc_base64_totext(& or, 60, "", target));
+				RETERR(isc_base64_totext(&or, 60, "", target));
 			} else {
-				RETERR(isc_base64_totext(& or, tctx->width - 2,
+				RETERR(isc_base64_totext(&or, tctx->width - 2,
 							 tctx->linebreak,
 							 target));
 			}
diff --git a/lib/isc/include/isc/thread.h b/lib/isc/include/isc/thread.h
index a70e2c7937..5e44dee582 100644
--- a/lib/isc/include/isc/thread.h
+++ b/lib/isc/include/isc/thread.h
@@ -48,6 +48,6 @@ isc_thread_yield(void);
 void
 isc_thread_setname(isc_thread_t thread, const char *name);
 
-#define isc_thread_self (uintptr_t) pthread_self
+#define isc_thread_self (uintptr_t)pthread_self
 
 ISC_LANG_ENDDECLS
diff --git a/lib/isc/netmgr/netmgr-int.h b/lib/isc/netmgr/netmgr-int.h
index cc635e3f5f..c13b6fae99 100644
--- a/lib/isc/netmgr/netmgr-int.h
+++ b/lib/isc/netmgr/netmgr-int.h
@@ -126,9 +126,9 @@ isc__nm_dump_active(isc_nm_t *nm);
 
 #if defined(__linux__)
 #include <syscall.h>
-#define gettid() (uint32_t) syscall(SYS_gettid)
+#define gettid() (uint32_t)syscall(SYS_gettid)
 #else
-#define gettid() (uint32_t) pthread_self()
+#define gettid() (uint32_t)pthread_self()
 #endif
 
 #ifdef NETMGR_TRACE_VERBOSE