diff --git a/bin/tests/dst/t_dst.c b/bin/tests/dst/t_dst.c
index d287d067bf..f2b644bb3a 100644
--- a/bin/tests/dst/t_dst.c
+++ b/bin/tests/dst/t_dst.c
@@ -81,7 +81,7 @@ cleandir(char *path) {
 			if (remove(fullname))
 				t_info("remove(%s) failed %d\n", fullname,
 				       errno);
-		} else 
+		} else
 		       t_info("unable to remove '%s/%s': path too long\n",
 			      path, pe->d_name);
 
diff --git a/lib/isc/mem.c b/lib/isc/mem.c
index 7f1ef34baa..4851aa977b 100644
--- a/lib/isc/mem.c
+++ b/lib/isc/mem.c
@@ -2426,20 +2426,20 @@ renderctx(isc__mem_t *ctx, summarystat_t *summary, xmlTextWriterPtr writer) {
 	TRY0(xmlTextWriterStartElement(writer, ISC_XMLCHAR "total"));
 	TRY0(xmlTextWriterWriteFormatString(writer,
 					    "%" ISC_PRINT_QUADFORMAT "u",
-				            (isc_uint64_t)ctx->total));
+					    (isc_uint64_t)ctx->total));
 	TRY0(xmlTextWriterEndElement(writer)); /* total */
 
 	summary->inuse += ctx->inuse;
 	TRY0(xmlTextWriterStartElement(writer, ISC_XMLCHAR "inuse"));
 	TRY0(xmlTextWriterWriteFormatString(writer,
 					    "%" ISC_PRINT_QUADFORMAT "u",
-				            (isc_uint64_t)ctx->inuse));
+					    (isc_uint64_t)ctx->inuse));
 	TRY0(xmlTextWriterEndElement(writer)); /* inuse */
 
 	TRY0(xmlTextWriterStartElement(writer, ISC_XMLCHAR "maxinuse"));
 	TRY0(xmlTextWriterWriteFormatString(writer,
 					    "%" ISC_PRINT_QUADFORMAT "u",
-				            (isc_uint64_t)ctx->maxinuse));
+					    (isc_uint64_t)ctx->maxinuse));
 	TRY0(xmlTextWriterEndElement(writer)); /* maxinuse */
 
 	TRY0(xmlTextWriterStartElement(writer, ISC_XMLCHAR "blocksize"));
@@ -2464,13 +2464,13 @@ renderctx(isc__mem_t *ctx, summarystat_t *summary, xmlTextWriterPtr writer) {
 	TRY0(xmlTextWriterStartElement(writer, ISC_XMLCHAR "hiwater"));
 	TRY0(xmlTextWriterWriteFormatString(writer,
 					    "%" ISC_PRINT_QUADFORMAT "u",
-				            (isc_uint64_t)ctx->hi_water));
+					    (isc_uint64_t)ctx->hi_water));
 	TRY0(xmlTextWriterEndElement(writer)); /* hiwater */
 
 	TRY0(xmlTextWriterStartElement(writer, ISC_XMLCHAR "lowater"));
 	TRY0(xmlTextWriterWriteFormatString(writer,
 					    "%" ISC_PRINT_QUADFORMAT "u",
-				            (isc_uint64_t)ctx->lo_water));
+					    (isc_uint64_t)ctx->lo_water));
 	TRY0(xmlTextWriterEndElement(writer)); /* lowater */
 
 	TRY0(xmlTextWriterEndElement(writer)); /* context */
@@ -2514,31 +2514,31 @@ isc_mem_renderxml(xmlTextWriterPtr writer) {
 	TRY0(xmlTextWriterStartElement(writer, ISC_XMLCHAR "TotalUse"));
 	TRY0(xmlTextWriterWriteFormatString(writer,
 					    "%" ISC_PRINT_QUADFORMAT "u",
-				            summary.total));
+					    summary.total));
 	TRY0(xmlTextWriterEndElement(writer)); /* TotalUse */
 
 	TRY0(xmlTextWriterStartElement(writer, ISC_XMLCHAR "InUse"));
 	TRY0(xmlTextWriterWriteFormatString(writer,
 					    "%" ISC_PRINT_QUADFORMAT "u",
-				            summary.inuse));
+					    summary.inuse));
 	TRY0(xmlTextWriterEndElement(writer)); /* InUse */
 
 	TRY0(xmlTextWriterStartElement(writer, ISC_XMLCHAR "BlockSize"));
 	TRY0(xmlTextWriterWriteFormatString(writer,
 					    "%" ISC_PRINT_QUADFORMAT "u",
-				            summary.blocksize));
+					    summary.blocksize));
 	TRY0(xmlTextWriterEndElement(writer)); /* BlockSize */
 
 	TRY0(xmlTextWriterStartElement(writer, ISC_XMLCHAR "ContextSize"));
 	TRY0(xmlTextWriterWriteFormatString(writer,
 					    "%" ISC_PRINT_QUADFORMAT "u",
-				            summary.contextsize));
+					    summary.contextsize));
 	TRY0(xmlTextWriterEndElement(writer)); /* ContextSize */
 
 	TRY0(xmlTextWriterStartElement(writer, ISC_XMLCHAR "Lost"));
 	TRY0(xmlTextWriterWriteFormatString(writer,
 					    "%" ISC_PRINT_QUADFORMAT "u",
-				            lost));
+					    lost));
 	TRY0(xmlTextWriterEndElement(writer)); /* Lost */
 
 	TRY0(xmlTextWriterEndElement(writer)); /* summary */
diff --git a/lib/isc/unix/socket.c b/lib/isc/unix/socket.c
index d5ac000a04..aef2538752 100644
--- a/lib/isc/unix/socket.c
+++ b/lib/isc/unix/socket.c
@@ -2269,7 +2269,7 @@ use_min_mtu(isc__socket_t *sock) {
 	if (sock->pf == AF_INET6) {
 		int on = 1;
 		(void)setsockopt(sock->fd, IPPROTO_IPV6, IPV6_USE_MIN_MTU,
-			        (void *)&on, sizeof(on));
+				(void *)&on, sizeof(on));
 	}
 #endif
 #if defined(IPV6_MTU)
@@ -5991,7 +5991,7 @@ isc_socketmgr_renderxml(isc_socketmgr_t *mgr0, xmlTextWriterPtr writer) {
 			TRY0(xmlTextWriterStartElement(writer,
 						       ISC_XMLCHAR "name"));
 			TRY0(xmlTextWriterWriteFormatString(writer, "%s",
-						            sock->name));
+							    sock->name));
 			TRY0(xmlTextWriterEndElement(writer)); /* name */
 		}
 
@@ -6023,7 +6023,7 @@ isc_socketmgr_renderxml(isc_socketmgr_t *mgr0, xmlTextWriterPtr writer) {
 		TRY0(xmlTextWriterStartElement(writer, ISC_XMLCHAR "states"));
 		if (sock->pending_recv)
 			TRY0(xmlTextWriterWriteElement(writer,
-					        ISC_XMLCHAR "state",
+						ISC_XMLCHAR "state",
 						ISC_XMLCHAR "pending-receive"));
 		if (sock->pending_send)
 			TRY0(xmlTextWriterWriteElement(writer,
diff --git a/lib/isc/win32/socket.c b/lib/isc/win32/socket.c
index 53463aefc4..a5053c64a4 100644
--- a/lib/isc/win32/socket.c
+++ b/lib/isc/win32/socket.c
@@ -1438,7 +1438,7 @@ use_min_mtu(isc__socket_t *sock) {
 	if (sock->pf == AF_INET6) {
 		int on = 1;
 		(void)setsockopt(sock->fd, IPPROTO_IPV6, IPV6_USE_MIN_MTU,
-			        (void *)&on, sizeof(on));
+				(void *)&on, sizeof(on));
 	}
 #endif
 }
@@ -3919,14 +3919,14 @@ isc_socketmgr_renderxml(isc_socketmgr_t *mgr, xmlTextWriterPtr writer)
 			TRY0(xmlTextWriterStartElement(writer,
 						       ISC_XMLCHAR "name"));
 			TRY0(xmlTextWriterWriteFormatString(writer, "%s",
-						            sock->name));
+							    sock->name));
 			TRY0(xmlTextWriterEndElement(writer)); /* name */
 		}
 
 		TRY0(xmlTextWriterStartElement(writer,
 					       ISC_XMLCHAR "references"));
 		TRY0(xmlTextWriterWriteFormatString(writer, "%d",
-					            sock->references));
+						    sock->references));
 		TRY0(xmlTextWriterEndElement(writer));
 
 		TRY0(xmlTextWriterWriteElement(writer, ISC_XMLCHAR "type",
@@ -3951,7 +3951,7 @@ isc_socketmgr_renderxml(isc_socketmgr_t *mgr, xmlTextWriterPtr writer)
 		TRY0(xmlTextWriterStartElement(writer, ISC_XMLCHAR "states"));
 		if (sock->pending_recv)
 			TRY0(xmlTextWriterWriteElement(writer,
-					        ISC_XMLCHAR "state",
+						ISC_XMLCHAR "state",
 						ISC_XMLCHAR "pending-receive"));
 		if (sock->pending_send)
 			TRY0(xmlTextWriterWriteElement(writer,