diff --git a/CHANGES b/CHANGES
index 3ba71cd275..ab4b2dfec9 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,5 @@
-3307.	[bug]		Add missing ISC_LANG_ENDDECLS to <dns/tsec.h>. [RT #28956]
+3307.	[bug]		Add missing ISC_LANG_BEGINDECLS and ISC_LANG_ENDDECLS.
+			[RT #28956]
 
 3306.	[bug]		Improve DNS64 reverse zone performance. [RT #28563]
 
diff --git a/lib/dns/include/dns/ecdb.h b/lib/dns/include/dns/ecdb.h
index 5c735b53cc..42a22fd922 100644
--- a/lib/dns/include/dns/ecdb.h
+++ b/lib/dns/include/dns/ecdb.h
@@ -39,6 +39,8 @@
  *** Functions
  ***/
 
+ISC_LANG_BEGINDECLS
+
 /* TBD: describe those */
 
 isc_result_t
diff --git a/lib/dns/include/dns/rpz.h b/lib/dns/include/dns/rpz.h
index eba46276dd..32c1ef2ded 100644
--- a/lib/dns/include/dns/rpz.h
+++ b/lib/dns/include/dns/rpz.h
@@ -194,5 +194,7 @@ dns_rpz_cidr_find(dns_rpz_cidr_t *cidr, const isc_netaddr_t *netaddr,
 dns_rpz_policy_t
 dns_rpz_decode_cname(dns_rdataset_t *, dns_name_t *selfname);
 
+ISC_LANG_ENDDECLS
+
 #endif /* DNS_RPZ_H */
 
diff --git a/lib/dns/include/dns/stats.h b/lib/dns/include/dns/stats.h
index b8dc17eba5..bc77d1e9c5 100644
--- a/lib/dns/include/dns/stats.h
+++ b/lib/dns/include/dns/stats.h
@@ -147,6 +147,8 @@ typedef void (*dns_rdatatypestats_dumper_t)(dns_rdatastatstype_t, isc_uint64_t,
 					    void *);
 typedef void (*dns_opcodestats_dumper_t)(dns_opcode_t, isc_uint64_t, void *);
 
+ISC_LANG_BEGINDECLS
+
 isc_result_t
 dns_generalstats_create(isc_mem_t *mctx, dns_stats_t **statsp, int ncounters);
 /*%<
diff --git a/lib/dns/include/dns/view.h b/lib/dns/include/dns/view.h
index 46e513e63c..3d65243656 100644
--- a/lib/dns/include/dns/view.h
+++ b/lib/dns/include/dns/view.h
@@ -1104,4 +1104,6 @@ dns_view_setnewzones(dns_view_t *view, isc_boolean_t allow, void *cfgctx,
 void
 dns_view_restorekeyring(dns_view_t *view);
 
+ISC_LANG_ENDDECLS
+
 #endif /* DNS_VIEW_H */