rationalise use of utils/utils.h header

content/content.c

@@ -25,7 +25,6 @@
 #include <stdlib.h>
 #include <nsutils/time.h>
 
-#include "utils/utils.h"
 #include "utils/log.h"
 #include "utils/messages.h"
 #include "netsurf/browser_window.h"

content/fetch.c

@@ -46,7 +46,6 @@
 #include "utils/log.h"
 #include "utils/messages.h"
 #include "utils/nsurl.h"
-#include "utils/utils.h"
 #include "utils/ring.h"
 #include "netsurf/misc.h"
 #include "desktop/gui_internal.h"

desktop/textarea.h

@@ -27,7 +27,6 @@
 #include <stdint.h>
 #include <stdbool.h>
 
-#include "utils/utils.h"
 #include "netsurf/plot_style.h"
 #include "netsurf/mouse.h"
 

desktop/treeview.c

@@ -22,6 +22,7 @@
  * Treeview handling implementation.
  */
 
+#include "utils/utils.h"
 #include "utils/log.h"
 #include "utils/nsurl.h"
 #include "utils/nsoption.h"

frontends/atari/redrawslots.h

@@ -22,7 +22,7 @@
 
 #include <mt_gem.h>
 
-#include "utils/utils.h"
+#include "netsurf/types.h"
 
 /**
  * This is the number of redraw requests that the slotlist can store.
@@ -31,8 +31,6 @@
  */
 #define MAX_REDRW_SLOTS	32
 
-struct rect;
-
 /**
  * This struct holds scheduled redraw requests.
  */

frontends/gtk/corewindow.c

@@ -39,7 +39,6 @@
 #include <gtk/gtk.h>
 
 #include "utils/log.h"
-#include "utils/utils.h"
 #include "utils/messages.h"
 #include "utils/utf8.h"
 #include "netsurf/types.h"

frontends/gtk/plotters.c

@@ -31,7 +31,6 @@
 #include <gtk/gtk.h>
 
 #include "utils/log.h"
-#include "utils/utils.h"
 #include "netsurf/plotters.h"
 #include "utils/nsoption.h"
 

frontends/gtk/toolbar.c

@@ -25,7 +25,6 @@
 #include "desktop/searchweb.h"
 #include "utils/log.h"
 #include "utils/messages.h"
-#include "utils/utils.h"
 #include "utils/nsoption.h"
 
 #include "gtk/gui.h"

frontends/gtk/window.c

@@ -34,7 +34,6 @@
 
 #include "utils/log.h"
 #include "utils/utf8.h"
-#include "utils/utils.h"
 #include "utils/nsoption.h"
 #include "netsurf/content.h"
 #include "netsurf/browser_window.h"

frontends/riscos/corewindow.c

@@ -34,8 +34,8 @@
 #include <stdint.h>
 #include <oslib/wimp.h>
 
-#include "utils/utils.h"
 #include "utils/log.h"
+#include "netsurf/types.h"
 #include "netsurf/mouse.h"
 #include "netsurf/keypress.h"
 

frontends/riscos/gui/url_bar.c

@@ -38,7 +38,6 @@
 #include "utils/log.h"
 #include "utils/messages.h"
 #include "utils/utf8.h"
-#include "utils/utils.h"
 #include "utils/nsurl.h"
 #include "netsurf/browser_window.h"
 #include "netsurf/plotters.h"

frontends/riscos/plotters.c

@@ -27,7 +27,6 @@
 #include "oslib/os.h"
 
 #include "utils/log.h"
-#include "utils/utils.h"
 #include "netsurf/plotters.h"
 
 #include "riscos/bitmap.h"

frontends/riscos/print.c

@@ -34,7 +34,6 @@
 #include "utils/config.h"
 #include "utils/log.h"
 #include "utils/messages.h"
-#include "utils/utils.h"
 #include "utils/nsoption.h"
 #include "netsurf/browser_window.h"
 #include "netsurf/plotters.h"

frontends/riscos/save_draw.c

@@ -31,7 +31,6 @@
 #include <pencil.h>
 
 #include "utils/log.h"
-#include "utils/utils.h"
 #include "netsurf/plotters.h"
 #include "netsurf/content.h"
 

frontends/windows/about.c

@@ -28,7 +28,6 @@
 #include <windows.h>
 
 #include "utils/log.h"
-#include "utils/utils.h"
 #include "utils/messages.h"
 #include "desktop/version.h"
 

frontends/windows/corewindow.c

@@ -38,9 +38,9 @@
 #include <windowsx.h>
 
 #include "utils/log.h"
-#include "utils/utils.h"
 #include "utils/messages.h"
 #include "utils/utf8.h"
+#include "netsurf/types.h"
 #include "netsurf/keypress.h"
 #include "netsurf/mouse.h"
 

frontends/windows/drawable.c

@@ -26,7 +26,6 @@
 
 #include "utils/errors.h"
 #include "utils/log.h"
-#include "utils/utils.h"
 #include "netsurf/browser_window.h"
 #include "netsurf/plotters.h"
 #include "netsurf/keypress.h"

frontends/windows/filetype.c

@@ -20,7 +20,6 @@
 #include <string.h>
 
 #include "utils/log.h"
-#include "utils/utils.h"
 #include "content/fetch.h"
 #include "netsurf/fetch.h"
 

frontends/windows/gui.c

@@ -26,7 +26,6 @@
 #include "utils/errors.h"
 #include "utils/nsurl.h"
 #include "utils/log.h"
-#include "utils/utils.h"
 #include "utils/corestrings.h"
 #include "utils/url.h"
 #include "utils/file.h"

frontends/windows/localhistory.c

@@ -24,7 +24,6 @@
 
 #include "desktop/browser_history.h"
 #include "netsurf/plotters.h"
-#include "utils/utils.h"
 #include "utils/log.h"
 #include "utils/messages.h"
 

frontends/windows/plot.c

@@ -27,7 +27,6 @@
 
 #include "utils/log.h"
 #include "utils/utf8.h"
-#include "utils/utils.h"
 #include "netsurf/mouse.h"
 #include "netsurf/window.h"
 #include "netsurf/plotters.h"

frontends/windows/pointers.c

@@ -25,7 +25,6 @@
 #include "utils/errors.h"
 #include "utils/nsurl.h"
 #include "utils/log.h"
-#include "utils/utils.h"
 #include "utils/corestrings.h"
 #include "utils/url.h"
 #include "utils/file.h"

frontends/windows/prefs.c

@@ -24,7 +24,6 @@
 #include "utils/nsoption.h"
 #include "utils/log.h"
 #include "utils/messages.h"
-#include "utils/utils.h"
 #include "utils/file.h"
 
 #include "windows/gui.h"

frontends/windows/schedule.c

@@ -21,7 +21,6 @@
 
 #include "utils/sys_time.h"
 #include "utils/log.h"
-#include "utils/utils.h"
 #include "utils/errors.h"
 
 #include "windows/schedule.h"

include/netsurf/types.h

@@ -34,4 +34,12 @@
  */
 typedef uint32_t colour;
 
+/**
+ * Rectangle coordinates
+ */
+typedef struct rect {
+	int x0, y0; /**< Top left */
+	int x1, y1; /**< Bottom right */
+} rect;
+
 #endif

render/box.c

@@ -19,8 +19,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** \file
- * Box tree manipulation (implementation).
+/**
+ * \file
+ * implementation of box tree manipulation.
  */
 
 #include <assert.h>
@@ -32,7 +33,6 @@
 #include "utils/nsoption.h"
 #include "utils/log.h"
 #include "utils/talloc.h"
-#include "utils/utils.h"
 #include "netsurf/misc.h"
 #include "netsurf/content.h"
 #include "netsurf/mouse.h"

render/box_construct.c

@@ -38,7 +38,6 @@
 #include "utils/log.h"
 #include "utils/messages.h"
 #include "utils/talloc.h"
-#include "utils/utils.h"
 #include "utils/string.h"
 #include "utils/ascii.h"
 #include "netsurf/css.h"

render/form.c

@@ -21,7 +21,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** \file
+/**
+ * \file
  * Form handling functions (implementation).
  */
 
@@ -38,7 +39,6 @@
 #include "utils/talloc.h"
 #include "utils/url.h"
 #include "utils/utf8.h"
-#include "utils/utils.h"
 #include "utils/ascii.h"
 #include "netsurf/browser_window.h"
 #include "netsurf/mouse.h"

render/html.c

@@ -29,6 +29,7 @@
 #include <stdlib.h>
 #include <nsutils/time.h>
 
+#include "utils/utils.h"
 #include "utils/config.h"
 #include "utils/corestrings.h"
 #include "utils/http.h"

render/html_css_fetcher.c

@@ -23,7 +23,6 @@
 #include <string.h>
 
 #include <dom/dom.h>
-
 #include <libwapcaplet/libwapcaplet.h>
 
 #include "utils/config.h"

render/imagemap.c

@@ -27,14 +27,14 @@
 
 #include <dom/dom.h>
 
+#include "utils/log.h"
+#include "utils/corestrings.h"
 #include "content/content_protected.h"
 #include "content/hlcache.h"
+
 #include "render/box.h"
 #include "render/html_internal.h"
 #include "render/imagemap.h"
-#include "utils/corestrings.h"
-#include "utils/log.h"
-#include "utils/utils.h"
 
 #define HASH_SIZE 31 /* fixed size hash table */
 

render/search.c

@@ -18,7 +18,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
  
- /** \file
+/**
+ * \file
  * Free text search (core)
  */
 

utils/utils.h

@@ -29,14 +29,6 @@
 #include <inttypes.h>
 #include <stdbool.h>
 
-/** Rectangle coordinates */
-struct rect {
-	int x0, y0; /**< Top left */
-	int x1, y1; /**< Bottom right */
-};
-
-struct dirent;
-
 #ifndef NOF_ELEMENTS
 #define NOF_ELEMENTS(array) (sizeof(array)/sizeof(*(array)))
 #endif