diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index 0f2344fba8..1d950838e7 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -18,3 +18,5 @@ e577b1eca70856b816ffa36199f14078e4b76b58
 59e5fa42179366049fb31265532d504208f0329f
 # reformat shell scripts with shfmt
 b8b9b4ac2c0ae88de85f4d83982edb97694959d7
+# Reformat sources with up-to-date clang-format-17
+6a85e79c0b349003449f9c9a64eba74a97653826
diff --git a/lib/dns/include/dns/db.h b/lib/dns/include/dns/db.h
index 58758f8552..9b53f0435f 100644
--- a/lib/dns/include/dns/db.h
+++ b/lib/dns/include/dns/db.h
@@ -75,8 +75,8 @@ extern unsigned int dns_pps;
 *****/
 
 typedef struct dns_dbmethods {
-	void	     (*attach)(dns_db_t *source, dns_db_t **targetp);
-	void	     (*detach)(dns_db_t **dbp);
+	void (*attach)(dns_db_t *source, dns_db_t **targetp);
+	void (*detach)(dns_db_t **dbp);
 	isc_result_t (*beginload)(dns_db_t	       *db,
 				  dns_rdatacallbacks_t *callbacks);
 	isc_result_t (*endload)(dns_db_t *db, dns_rdatacallbacks_t *callbacks);
@@ -85,9 +85,9 @@ typedef struct dns_dbmethods {
 			     dns_masterformat_t masterformat);
 	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);
 	isc_result_t (*findnode)(dns_db_t *db, const dns_name_t *name,
 				 bool create, dns_dbnode_t **nodep);
@@ -103,12 +103,12 @@ typedef struct dns_dbmethods {
 				    dns_name_t	   *dcname,
 				    dns_rdataset_t *rdataset,
 				    dns_rdataset_t *sigrdataset);
-	void	     (*attachnode)(dns_db_t *db, dns_dbnode_t *source,
+	void (*attachnode)(dns_db_t *db, dns_dbnode_t *source,
 			   dns_dbnode_t **targetp);
-	void	     (*detachnode)(dns_db_t *db, dns_dbnode_t **targetp);
+	void (*detachnode)(dns_db_t *db, dns_dbnode_t **targetp);
 	isc_result_t (*expirenode)(dns_db_t *db, dns_dbnode_t *node,
 				   isc_stdtime_t now);
-	void	     (*printnode)(dns_db_t *db, dns_dbnode_t *node, FILE *out);
+	void (*printnode)(dns_db_t *db, dns_dbnode_t *node, FILE *out);
 	isc_result_t (*createiterator)(dns_db_t *db, unsigned int options,
 				       dns_dbiterator_t **iteratorp);
 	isc_result_t (*findrdataset)(dns_db_t *db, dns_dbnode_t *node,
@@ -135,13 +135,13 @@ typedef struct dns_dbmethods {
 				       dns_dbversion_t *version,
 				       dns_rdatatype_t	type,
 				       dns_rdatatype_t	covers);
-	bool	     (*issecure)(dns_db_t *db);
+	bool (*issecure)(dns_db_t *db);
 	unsigned int (*nodecount)(dns_db_t *db, dns_dbtree_t);
-	bool	     (*ispersistent)(dns_db_t *db);
-	void	     (*overmem)(dns_db_t *db, bool overmem);
-	void	     (*settask)(dns_db_t *db, isc_task_t *);
+	bool (*ispersistent)(dns_db_t *db);
+	void (*overmem)(dns_db_t *db, bool overmem);
+	void (*settask)(dns_db_t *db, isc_task_t *);
 	isc_result_t (*getoriginnode)(dns_db_t *db, dns_dbnode_t **nodep);
-	void	     (*transfernode)(dns_db_t *db, dns_dbnode_t **sourcep,
+	void (*transfernode)(dns_db_t *db, dns_dbnode_t **sourcep,
 			     dns_dbnode_t **targetp);
 	isc_result_t (*getnsec3parameters)(dns_db_t	   *db,
 					   dns_dbversion_t *version,
@@ -155,11 +155,11 @@ typedef struct dns_dbmethods {
 				       isc_stdtime_t resign);
 	isc_result_t (*getsigningtime)(dns_db_t *db, dns_rdataset_t *rdataset,
 				       dns_name_t *name);
-	void	     (*resigned)(dns_db_t *db, dns_rdataset_t *rdataset,
+	void (*resigned)(dns_db_t *db, dns_rdataset_t *rdataset,
 			 dns_dbversion_t *version);
-	bool	     (*isdnssec)(dns_db_t *db);
+	bool (*isdnssec)(dns_db_t *db);
 	dns_stats_t *(*getrrsetstats)(dns_db_t *db);
-	void	     (*rpz_attach)(dns_db_t *db, void *rpzs, uint8_t rpz_num);
+	void (*rpz_attach)(dns_db_t *db, void *rpzs, uint8_t rpz_num);
 	isc_result_t (*rpz_ready)(dns_db_t *db);
 	isc_result_t (*findnodeext)(dns_db_t *db, const dns_name_t *name,
 				    bool		     create,
@@ -175,7 +175,7 @@ typedef struct dns_dbmethods {
 				dns_rdataset_t		*rdataset,
 				dns_rdataset_t		*sigrdataset);
 	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 (*nodefullname)(dns_db_t *db, dns_dbnode_t *node,
 				     dns_name_t *name);
 	isc_result_t (*getsize)(dns_db_t *db, dns_dbversion_t *version,
diff --git a/lib/dns/include/dns/dbiterator.h b/lib/dns/include/dns/dbiterator.h
index c752a0c07b..dcec59a867 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);
+	void (*destroy)(dns_dbiterator_t **iteratorp);
 	isc_result_t (*first)(dns_dbiterator_t *iterator);
 	isc_result_t (*last)(dns_dbiterator_t *iterator);
 	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 447c2018b3..6095a85e3f 100644
--- a/lib/dns/include/dns/keytable.h
+++ b/lib/dns/include/dns/keytable.h
@@ -345,7 +345,7 @@ dns_keynode_trust(dns_keynode_t *keynode);
 
 isc_result_t
 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);
 ISC_LANG_ENDDECLS
diff --git a/lib/dns/include/dns/rbt.h b/lib/dns/include/dns/rbt.h
index f345a9d2f8..3b62e12114 100644
--- a/lib/dns/include/dns/rbt.h
+++ b/lib/dns/include/dns/rbt.h
@@ -699,7 +699,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 3e3094814b..566ea44cf9 100644
--- a/lib/dns/include/dns/rdataset.h
+++ b/lib/dns/include/dns/rdataset.h
@@ -63,11 +63,11 @@ typedef enum {
 } dns_rdatasetadditional_t;
 
 typedef struct dns_rdatasetmethods {
-	void	     (*disassociate)(dns_rdataset_t *rdataset);
+	void (*disassociate)(dns_rdataset_t *rdataset);
 	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, dns_rdataset_t *target);
+	void (*current)(dns_rdataset_t *rdataset, dns_rdata_t *rdata);
+	void (*clone)(dns_rdataset_t *source, dns_rdataset_t *target);
 	unsigned int (*count)(dns_rdataset_t *rdataset);
 	isc_result_t (*addnoqname)(dns_rdataset_t   *rdataset,
 				   const dns_name_t *name);
@@ -77,9 +77,9 @@ typedef struct dns_rdatasetmethods {
 				   const dns_name_t *name);
 	isc_result_t (*getclosest)(dns_rdataset_t *rdataset, dns_name_t *name,
 				   dns_rdataset_t *neg, dns_rdataset_t *negsig);
-	void	     (*settrust)(dns_rdataset_t *rdataset, dns_trust_t trust);
-	void	     (*expire)(dns_rdataset_t *rdataset);
-	void	     (*clearprefetch)(dns_rdataset_t *rdataset);
+	void (*settrust)(dns_rdataset_t *rdataset, dns_trust_t trust);
+	void (*expire)(dns_rdataset_t *rdataset);
+	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 b80f62e667..8611d9900c 100644
--- a/lib/dns/include/dns/rdatasetiter.h
+++ b/lib/dns/include/dns/rdatasetiter.h
@@ -67,7 +67,7 @@ ISC_LANG_BEGINDECLS
 *****/
 
 typedef struct dns_rdatasetitermethods {
-	void	     (*destroy)(dns_rdatasetiter_t **iteratorp);
+	void (*destroy)(dns_rdatasetiter_t **iteratorp);
 	isc_result_t (*first)(dns_rdatasetiter_t *iterator);
 	isc_result_t (*next)(dns_rdatasetiter_t *iterator);
 	void (*current)(dns_rdatasetiter_t *iterator, dns_rdataset_t *rdataset);
diff --git a/lib/dns/include/dns/update.h b/lib/dns/include/dns/update.h
index 95dea85b5c..8ca1bf090e 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 a3527d3820..18b0b3394a 100644
--- a/lib/dns/include/dns/view.h
+++ b/lib/dns/include/dns/view.h
@@ -223,13 +223,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 */
@@ -241,11 +241,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/isc/include/isc/thread.h b/lib/isc/include/isc/thread.h
index 60e0ebbadb..a70e2c7937 100644
--- a/lib/isc/include/isc/thread.h
+++ b/lib/isc/include/isc/thread.h
@@ -31,9 +31,9 @@ extern thread_local size_t isc_tid_v;
 
 ISC_LANG_BEGINDECLS
 
-typedef pthread_t	   isc_thread_t;
-typedef void		  *isc_threadresult_t;
-typedef void		  *isc_threadarg_t;
+typedef pthread_t isc_thread_t;
+typedef void	 *isc_threadresult_t;
+typedef void	 *isc_threadarg_t;
 typedef isc_threadresult_t (*isc_threadfunc_t)(isc_threadarg_t);
 
 void
diff --git a/lib/isccfg/include/isccfg/cfg.h b/lib/isccfg/include/isccfg/cfg.h
index 8861a683a0..c4f2d86362 100644
--- a/lib/isccfg/include/isccfg/cfg.h
+++ b/lib/isccfg/include/isccfg/cfg.h
@@ -481,11 +481,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. */
@@ -507,7 +507,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 2da2a337d9..83482d94fe 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;
@@ -569,7 +569,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 fe4d2dceb1..7a7196f763 100644
--- a/lib/ns/include/ns/client.h
+++ b/lib/ns/include/ns/client.h
@@ -194,15 +194,15 @@ 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 */
-	bool		mortal;	    /*%< Die after handling request */
-	isc_quota_t    *recursionquota;
+	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 */
+	bool	      mortal;	  /*%< Die after handling request */
+	isc_quota_t  *recursionquota;
 
 	isc_sockaddr_t peeraddr;
 	bool	       peeraddr_valid;