diff --git a/lib/dns/compress.c b/lib/dns/compress.c
index 605e97f9a8..ec97235da2 100644
--- a/lib/dns/compress.c
+++ b/lib/dns/compress.c
@@ -15,6 +15,7 @@
 
 #include <config.h>
 
+#include <inttypes.h>
 #include <stdbool.h>
 
 #include <isc/mem.h>
diff --git a/lib/dns/spnego.c b/lib/dns/spnego.c
index e24b36e517..ad77f242b8 100644
--- a/lib/dns/spnego.c
+++ b/lib/dns/spnego.c
@@ -129,6 +129,8 @@
 
 #include <config.h>
 
+#include <inttypes.h>
+#include <stdbool.h>
 #include <stdlib.h>
 #include <errno.h>
 
diff --git a/lib/isc/strtoul.c b/lib/isc/strtoul.c
index 382432a61f..acc541a799 100644
--- a/lib/isc/strtoul.c
+++ b/lib/isc/strtoul.c
@@ -38,14 +38,13 @@
  * SUCH DAMAGE.
  */
 
+#include <config.h>
+
 /*! \file */
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)strtoul.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 
-
-#include <config.h>
-
 #include <limits.h>
 #include <ctype.h>
 #include <errno.h>
diff --git a/lib/isc/unix/ifiter_sysctl.c b/lib/isc/unix/ifiter_sysctl.c
index d91d977c85..ebbefe90ba 100644
--- a/lib/isc/unix/ifiter_sysctl.c
+++ b/lib/isc/unix/ifiter_sysctl.c
@@ -17,8 +17,6 @@
  * and 19.16.
  */
 
-#include <config.h>
-
 #include <inttypes.h>
 
 #include <sys/param.h>
diff --git a/lib/isc/win32/socket.c b/lib/isc/win32/socket.c
index 225e8474ee..231107866d 100644
--- a/lib/isc/win32/socket.c
+++ b/lib/isc/win32/socket.c
@@ -25,7 +25,6 @@
  */
 
 #define MAKE_EXTERNAL 1
-#include <config.h>
 
 #include <sys/types.h>