18 files changed, 19 insertions, 2 deletions

diff --git a/content/content.c b/content/content.c
index b0d86b94c..4048d8278 100644
--- a/content/content.c
+++ b/content/content.c
@@ -22,7 +22,9 @@
  */
 
 #include <inttypes.h>
+#include <stdlib.h>
 
+#include "utils/utils.h"
 #include "utils/log.h"
 #include "utils/messages.h"
 #include "desktop/plotters.h"
diff --git a/content/content_factory.h b/content/content_factory.h
index 94de37609..22205dc02 100644
--- a/content/content_factory.h
+++ b/content/content_factory.h
@@ -25,7 +25,6 @@
 
 #include "content/content_type.h"
 #include "utils/errors.h"
-#include "utils/utils.h"
 
 #define CONTENT_FACTORY_REGISTER_TYPES(HNAME, HTYPELIST, HHANDLER)	\
 									\
diff --git a/desktop/knockout.c b/desktop/knockout.c
index b2139986a..54e371ccd 100644
--- a/desktop/knockout.c
+++ b/desktop/knockout.c
@@ -66,6 +66,7 @@
 #include <string.h>
 #include <stdio.h>
 
+#include "utils/utils.h"
 #include "utils/log.h"
 #include "utils/errors.h"
 #include "image/bitmap.h"
diff --git a/desktop/print.c b/desktop/print.c
index f3a1a69f9..64d796946 100644
--- a/desktop/print.c
+++ b/desktop/print.c
@@ -26,6 +26,7 @@
 #include <string.h>
 #include <dom/dom.h>
 
+#include "utils/utils.h"
 #include "utils/nsoption.h"
 #include "utils/log.h"
 #include "utils/talloc.h"
diff --git a/gtk/bitmap.c b/gtk/bitmap.c
index 3c5b1742c..f8dcf1d17 100644
--- a/gtk/bitmap.c
+++ b/gtk/bitmap.c
@@ -30,6 +30,7 @@
 #include <cairo.h>
 #include <gtk/gtk.h>
 
+#include "utils/utils.h"
 #include "utils/log.h"
 #include "content/content.h"
 #include "image/bitmap.h"
diff --git a/gtk/scaffolding.c b/gtk/scaffolding.c
index 65d73d6d9..82b58fcb1 100644
--- a/gtk/scaffolding.c
+++ b/gtk/scaffolding.c
@@ -26,7 +26,7 @@
 #include <gtk/gtk.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 
-#include "utils/config.h"
+#include "utils/utils.h"
 #include "utils/dirent.h"
 #include "utils/messages.h"
 #include "utils/corestrings.h"
diff --git a/image/bmp.c b/image/bmp.c
index 7e992ae43..2468b4d72 100644
--- a/image/bmp.c
+++ b/image/bmp.c
@@ -26,6 +26,7 @@
 #include <stdlib.h>
 #include <libnsbmp.h>
 
+#include "utils/utils.h"
 #include "utils/messages.h"
 #include "content/content_protected.h"
 #include "desktop/gui_internal.h"
diff --git a/image/gif.c b/image/gif.c
index b11a371c6..878a42a3c 100644
--- a/image/gif.c
+++ b/image/gif.c
@@ -36,6 +36,7 @@
 #include <stdlib.h>
 #include <libnsgif.h>
 
+#include "utils/utils.h"
 #include "utils/messages.h"
 #include "utils/nsoption.h"
 #include "content/content_protected.h"
diff --git a/image/ico.c b/image/ico.c
index cf74592a8..5f453bc9e 100644
--- a/image/ico.c
+++ b/image/ico.c
@@ -24,6 +24,7 @@
 #include <stdlib.h>
 #include <libnsbmp.h>
 
+#include "utils/utils.h"
 #include "utils/log.h"
 #include "utils/messages.h"
 #include "content/content_protected.h"
diff --git a/image/image.c b/image/image.c
index 1dac313df..b9bcf1e97 100644
--- a/image/image.c
+++ b/image/image.c
@@ -19,6 +19,7 @@
 #include <stdbool.h>
 #include <stdlib.h>
 
+#include "utils/utils.h"
 #include "utils/log.h"
 #include "utils/messages.h"
 #include "content/content.h"
diff --git a/image/image_cache.c b/image/image_cache.c
index 4631ee5f3..9f217f860 100644
--- a/image/image_cache.c
+++ b/image/image_cache.c
@@ -21,7 +21,9 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <string.h>
+#include <stdlib.h>
 
+#include "utils/utils.h"
 #include "utils/log.h"
 #include "content/content_protected.h"
 #include "desktop/gui_misc.h"
diff --git a/image/jpeg.c b/image/jpeg.c
index a9030be1e..cf265b47a 100644
--- a/image/jpeg.c
+++ b/image/jpeg.c
@@ -27,6 +27,7 @@
 #include <stdlib.h>
 #include <setjmp.h>
 
+#include "utils/utils.h"
 #include "utils/log.h"
 #include "utils/messages.h"
 #include "content/content_protected.h"
diff --git a/image/nssprite.c b/image/nssprite.c
index e61566391..0fe25270b 100644
--- a/image/nssprite.c
+++ b/image/nssprite.c
@@ -25,6 +25,7 @@
 #include <stdlib.h>
 #include <librosprite.h>
 
+#include "utils/utils.h"
 #include "utils/log.h"
 #include "utils/messages.h"
 #include "content/content_protected.h"
diff --git a/image/png.c b/image/png.c
index dfeac89e0..1c78d3006 100644
--- a/image/png.c
+++ b/image/png.c
@@ -22,6 +22,7 @@
 #include <stdlib.h>
 #include <png.h>
 
+#include "utils/utils.h"
 #include "utils/log.h"
 #include "utils/messages.h"
 #include "content/content_protected.h"
diff --git a/javascript/duktape/dukky.c b/javascript/duktape/dukky.c
index ab86d01dd..7dd3bd71e 100644
--- a/javascript/duktape/dukky.c
+++ b/javascript/duktape/dukky.c
@@ -29,6 +29,7 @@
 
 #include "content/content.h"
 
+#include "utils/utils.h"
 #include "utils/nsoption.h"
 #include "utils/log.h"
 #include "utils/corestrings.h"
diff --git a/monkey/browser.c b/monkey/browser.c
index a13262170..2b007fde6 100644
--- a/monkey/browser.c
+++ b/monkey/browser.c
@@ -20,6 +20,7 @@
 
 #include <stdio.h>
 
+#include "utils/utils.h"
 #include "utils/ring.h"
 #include "utils/log.h"
 #include "utils/messages.h"
diff --git a/monkey/download.c b/monkey/download.c
index bc820744c..242136662 100644
--- a/monkey/download.c
+++ b/monkey/download.c
@@ -18,6 +18,7 @@
 
 #include <stdio.h>
 #include <stdint.h>
+#include <stdlib.h>
 
 #include "utils/errors.h"
 #include "utils/ring.h"
diff --git a/render/html_object.c b/render/html_object.c
index e30b3ab09..9be3339a6 100644
--- a/render/html_object.c
+++ b/render/html_object.c
@@ -27,6 +27,7 @@
 #include <strings.h>
 #include <stdlib.h>
 
+#include "utils/utils.h"
 #include "utils/corestrings.h"
 #include "utils/config.h"
 #include "utils/log.h"