9 files changed, 12 insertions, 10 deletions
diff --git a/content/content.c b/content/content.c
index 51c40d73f..2eb035cdf 100644
--- a/content/content.c
+++ b/content/content.c
@@ -21,10 +21,11 @@
  * Content handling implementation.
  */
 
-#include <inttypes.h>
+#include <stdint.h>
 #include <stdlib.h>
 #include <nsutils/time.h>
 
+#include "netsurf/inttypes.h"
 #include "utils/log.h"
 #include "utils/messages.h"
 #include "netsurf/browser_window.h"
diff --git a/content/fetchers/data.c b/content/fetchers/data.c
index 139d09aea..cb99e6ff2 100644
--- a/content/fetchers/data.c
+++ b/content/fetchers/data.c
@@ -27,6 +27,7 @@
 #include <libwapcaplet/libwapcaplet.h>
 #include <nsutils/base64.h>
 
+#include "netsurf/inttypes.h"
 #include "utils/url.h"
 #include "utils/nsurl.h"
 #include "utils/corestrings.h"
diff --git a/content/fetchers/file.c b/content/fetchers/file.c
index 6ffa63810..4fa1a2138 100644
--- a/content/fetchers/file.c
+++ b/content/fetchers/file.c
@@ -44,6 +44,7 @@
 #endif
 #include <libwapcaplet/libwapcaplet.h>
 
+#include "netsurf/inttypes.h"
 #include "utils/nsurl.h"
 #include "utils/dirent.h"
 #include "utils/corestrings.h"
diff --git a/content/fetchers/resource.c b/content/fetchers/resource.c
index 21ad8c746..b8b4b191f 100644
--- a/content/fetchers/resource.c
+++ b/content/fetchers/resource.c
@@ -29,6 +29,7 @@
 #include <stdarg.h>
 #include <libwapcaplet/libwapcaplet.h>
 
+#include "netsurf/inttypes.h"
 #include "utils/nsurl.h"
 #include "utils/corestrings.h"
 #include "utils/log.h"
diff --git a/content/fs_backing_store.c b/content/fs_backing_store.c
index 635f917ba..8670c3117 100644
--- a/content/fs_backing_store.c
+++ b/content/fs_backing_store.c
@@ -43,11 +43,11 @@
 #include <stdlib.h>
 #include <nsutils/unistd.h>
 
+#include "netsurf/inttypes.h"
 #include "utils/filepath.h"
 #include "utils/file.h"
 #include "utils/nsurl.h"
 #include "utils/log.h"
-#include "utils/utils.h"
 #include "utils/messages.h"
 #include "desktop/gui_internal.h"
 #include "netsurf/misc.h"
diff --git a/content/handlers/image/image_cache.c b/content/handlers/image/image_cache.c
index 9c7ce2200..02107f75f 100644
--- a/content/handlers/image/image_cache.c
+++ b/content/handlers/image/image_cache.c
@@ -22,12 +22,12 @@
  */
 
 #include <assert.h>
-#include <inttypes.h>
 #include <stdint.h>
 #include <stdbool.h>
 #include <string.h>
 #include <stdlib.h>
 
+#include "netsurf/inttypes.h"
 #include "utils/utils.h"
 #include "utils/log.h"
 #include "netsurf/misc.h"
diff --git a/content/handlers/image/png.c b/content/handlers/image/png.c
index 93185c12f..0baf411bf 100644
--- a/content/handlers/image/png.c
+++ b/content/handlers/image/png.c
@@ -22,6 +22,7 @@
 #include <stdlib.h>
 #include <png.h>
 
+#include "netsurf/inttypes.h"
 #include "utils/utils.h"
 #include "utils/log.h"
 #include "utils/messages.h"
diff --git a/content/handlers/javascript/duktape/dukky.c b/content/handlers/javascript/duktape/dukky.c
index 7dd3bd71e..1282ad9fe 100644
--- a/content/handlers/javascript/duktape/dukky.c
+++ b/content/handlers/javascript/duktape/dukky.c
@@ -23,16 +23,15 @@
  * Duktapeish implementation of javascript engine functions.
  */
 
-#include <inttypes.h>
-
+#include <stdint.h>
 #include <nsutils/time.h>
 
-#include "content/content.h"
-
+#include "netsurf/inttypes.h"
 #include "utils/utils.h"
 #include "utils/nsoption.h"
 #include "utils/log.h"
 #include "utils/corestrings.h"
+#include "content/content.h"
 
 #include "javascript/js.h"
 #include "javascript/content.h"
diff --git a/content/llcache.c b/content/llcache.c
index 4bd6eb3e4..eb300534d 100644
--- a/content/llcache.c
+++ b/content/llcache.c
@@ -35,12 +35,10 @@
 #include <stdint.h>
 #include <string.h>
 #include <strings.h>
-#include <inttypes.h>
-
 #include <nsutils/time.h>
 
+#include "netsurf/inttypes.h"
 #include "utils/config.h"
-
 #include "utils/corestrings.h"
 #include "utils/log.h"
 #include "utils/messages.h"