summaryrefslogtreecommitdiff
path: root/riscos
diff options
context:
space:
mode:
authorVincent Sanders <vince@kyllikki.org>2014-06-05 15:14:49 +0100
committerVincent Sanders <vince@kyllikki.org>2014-06-05 15:14:49 +0100
commit54fcb66d876420d6a9158ecd70854739f22f159b (patch)
tree9840b4e18de42e09cd388f1e6fb2de97967403b1 /riscos
parentf1c2dde13bf1ca59a466cfed2f2d2076c06b235f (diff)
downloadnetsurf-54fcb66d876420d6a9158ecd70854739f22f159b.tar.gz
netsurf-54fcb66d876420d6a9158ecd70854739f22f159b.tar.bz2
cleanup RISC OS frontend header usage
Diffstat (limited to 'riscos')
-rw-r--r--riscos/buffer.c19
-rw-r--r--riscos/configure.c16
-rw-r--r--riscos/configure/con_fonts.c10
-rw-r--r--riscos/configure/con_inter.c5
-rw-r--r--riscos/dialog.c27
-rw-r--r--riscos/filetype.h2
-rw-r--r--riscos/font.c16
-rw-r--r--riscos/gui.c2
-rw-r--r--riscos/gui.h39
-rw-r--r--riscos/gui/button_bar.c16
-rw-r--r--riscos/gui/status_bar.c2
-rw-r--r--riscos/gui/url_bar.c1
-rw-r--r--riscos/help.c35
-rw-r--r--riscos/hotlist.h8
-rw-r--r--riscos/iconbar.c19
-rw-r--r--riscos/image.c13
-rw-r--r--riscos/plotters.c5
-rw-r--r--riscos/print.c27
-rw-r--r--riscos/query.c10
-rw-r--r--riscos/save_draw.c15
-rw-r--r--riscos/textarea.c20
-rw-r--r--riscos/textselection.c1
-rw-r--r--riscos/url_complete.c11
23 files changed, 167 insertions, 152 deletions
diff --git a/riscos/buffer.c b/riscos/buffer.c
index c1971f68d..a8cb7fdf5 100644
--- a/riscos/buffer.c
+++ b/riscos/buffer.c
@@ -19,19 +19,22 @@
#include <stdbool.h>
#include <stdlib.h>
#include <string.h>
-#include "swis.h"
-#include "oslib/colourtrans.h"
-#include "oslib/os.h"
-#include "oslib/osspriteop.h"
-#include "oslib/wimp.h"
-#include "oslib/wimpreadsysinfo.h"
+#include <swis.h>
+#include <oslib/colourtrans.h>
+#include <oslib/os.h>
+#include <oslib/osspriteop.h>
+#include <oslib/wimp.h>
+#include <oslib/wimpreadsysinfo.h>
+
+#include "utils/nsoption.h"
+#include "utils/log.h"
+
#include "riscos/buffer.h"
#include "riscos/gui.h"
-#include "utils/nsoption.h"
#include "riscos/tinct.h"
#include "riscos/wimp.h"
#include "riscos/wimputils.h"
-#include "utils/log.h"
+
#define BUFFER_EXCLUSIVE_USER_REDRAW "Only support pure user redraw (faster)"
//#define BUFFER_EMULATE_32BPP "Redirect to a 32bpp sprite and plot with Tinct"
diff --git a/riscos/configure.c b/riscos/configure.c
index cd831b2e4..08bcd97c0 100644
--- a/riscos/configure.c
+++ b/riscos/configure.c
@@ -25,18 +25,20 @@
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
-#include "oslib/os.h"
-#include "oslib/osbyte.h"
-#include "oslib/territory.h"
-#include "oslib/wimp.h"
+#include <oslib/os.h>
+#include <oslib/osbyte.h>
+#include <oslib/territory.h>
+#include <oslib/wimp.h>
+
+#include "utils/log.h"
+#include "utils/utils.h"
+#include "utils/messages.h"
+
#include "riscos/dialog.h"
#include "riscos/configure.h"
#include "riscos/wimp.h"
#include "riscos/wimp_event.h"
#include "riscos/configure/configure.h"
-#include "utils/log.h"
-#include "utils/utils.h"
-#include "utils/messages.h"
#define CONFIGURE_ICON_PADDING_H 32
#define CONFIGURE_ICON_PADDING_V 32
diff --git a/riscos/configure/con_fonts.c b/riscos/configure/con_fonts.c
index 626115523..c2aa1dcf6 100644
--- a/riscos/configure/con_fonts.c
+++ b/riscos/configure/con_fonts.c
@@ -17,18 +17,20 @@
*/
#include <stdbool.h>
-#include "css/css.h"
+
#include "utils/nsoption.h"
+#include "utils/messages.h"
+#include "utils/utils.h"
#include "desktop/plot_style.h"
+#include "css/css.h"
+
#include "riscos/dialog.h"
-#include "riscos/gui.h"
+#include "riscos/font.h"
#include "riscos/menus.h"
#include "riscos/wimp.h"
#include "riscos/wimp_event.h"
#include "riscos/configure.h"
#include "riscos/configure/configure.h"
-#include "utils/messages.h"
-#include "utils/utils.h"
#define FONT_SANS_FIELD 3
diff --git a/riscos/configure/con_inter.c b/riscos/configure/con_inter.c
index 2af5e3aa5..30b824292 100644
--- a/riscos/configure/con_inter.c
+++ b/riscos/configure/con_inter.c
@@ -17,15 +17,16 @@
*/
#include <stdbool.h>
+
+#include "utils/nsoption.h"
+
#include "riscos/dialog.h"
#include "riscos/gui.h"
-#include "utils/nsoption.h"
#include "riscos/wimp.h"
#include "riscos/wimp_event.h"
#include "riscos/configure.h"
#include "riscos/configure/configure.h"
-
#define INTERFACE_STRIP_EXTNS_OPTION 2
#define INTERFACE_CONFIRM_OVWR_OPTION 3
#define INTERFACE_URL_COMPLETE_OPTION 6
diff --git a/riscos/dialog.c b/riscos/dialog.c
index 91d5c29b4..1c95a7099 100644
--- a/riscos/dialog.c
+++ b/riscos/dialog.c
@@ -22,19 +22,27 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#include "utils/config.h"
+
#include <assert.h>
#include <stddef.h>
#include <stdlib.h>
#include <string.h>
-#include "oslib/colourtrans.h"
-#include "oslib/osfile.h"
-#include "oslib/osgbpb.h"
-#include "oslib/osspriteop.h"
-#include "oslib/wimp.h"
-#include "rufl.h"
-#include "utils/config.h"
+#include <oslib/colourtrans.h>
+#include <oslib/osfile.h>
+#include <oslib/osgbpb.h>
+#include <oslib/osspriteop.h>
+#include <oslib/wimp.h>
+
+#include "utils/nsoption.h"
+#include "utils/log.h"
+#include "utils/messages.h"
+#include "utils/url.h"
+#include "utils/utils.h"
#include "desktop/netsurf.h"
+#include "desktop/browser.h"
#include "render/font.h"
+
#include "riscos/configure.h"
#include "riscos/cookies.h"
#include "riscos/dialog.h"
@@ -42,7 +50,6 @@
#include "riscos/gui.h"
#include "riscos/hotlist.h"
#include "riscos/menus.h"
-#include "utils/nsoption.h"
#include "riscos/save.h"
#include "riscos/sslcert.h"
#include "riscos/toolbar.h"
@@ -51,10 +58,6 @@
#include "riscos/wimp.h"
#include "riscos/wimp_event.h"
#include "riscos/wimputils.h"
-#include "utils/log.h"
-#include "utils/messages.h"
-#include "utils/url.h"
-#include "utils/utils.h"
#define ICON_ZOOM_VALUE 1
#define ICON_ZOOM_DEC 2
diff --git a/riscos/filetype.h b/riscos/filetype.h
index 115c1ef3b..20dfb6cbc 100644
--- a/riscos/filetype.h
+++ b/riscos/filetype.h
@@ -23,6 +23,8 @@
#ifndef _NETSURF_RISCOS_FILETYPE_H_
#define _NETSURF_RISCOS_FILETYPE_H_
+#include "content/content_type.h"
+
#ifndef FILETYPE_ACORN_URI
#define FILETYPE_ACORN_URI 0xf91
#endif
diff --git a/riscos/font.c b/riscos/font.c
index ddbe8536d..7e6c80fe5 100644
--- a/riscos/font.c
+++ b/riscos/font.c
@@ -17,25 +17,29 @@
*/
/** \file
- * Font handling (RISC OS implementation).
+ * RISC OS implementation of Font handling.
*
- * The RUfl is used handle and render fonts.
+ * The RUfl is used to handle and render fonts.
*/
+#include "utils/config.h"
+
#include <assert.h>
#include <string.h>
-#include "oslib/wimp.h"
-#include "oslib/wimpreadsysinfo.h"
-#include "rufl.h"
+#include <oslib/wimp.h>
+#include <oslib/wimpreadsysinfo.h>
+
#include "css/css.h"
#include "css/utils.h"
#include "render/font.h"
-#include "riscos/gui.h"
#include "utils/nsoption.h"
#include "utils/log.h"
#include "utils/messages.h"
#include "utils/utils.h"
+#include "riscos/gui.h"
+#include "riscos/font.h"
+
static void nsfont_check_option(char **option, const char *family,
const char *fallback);
static int nsfont_list_cmp(const void *keyval, const void *datum);
diff --git a/riscos/gui.c b/riscos/gui.c
index 4c04c72ab..35d3cb6d0 100644
--- a/riscos/gui.c
+++ b/riscos/gui.c
@@ -51,6 +51,7 @@
#include "desktop/save_complete.h"
#include "desktop/treeview.h"
#include "desktop/netsurf.h"
+#include "desktop/browser.h"
#include "content/urldb.h"
#include "content/hlcache.h"
#include "content/backing_store.h"
@@ -78,6 +79,7 @@
#include "riscos/mouse.h"
#include "riscos/ucstables.h"
#include "riscos/filetype.h"
+#include "riscos/font.h"
#include "riscos/content-handlers/artworks.h"
#include "riscos/content-handlers/draw.h"
#include "riscos/content-handlers/sprite.h"
diff --git a/riscos/gui.h b/riscos/gui.h
index 1dcc1e13c..bc59b5db9 100644
--- a/riscos/gui.h
+++ b/riscos/gui.h
@@ -21,15 +21,7 @@
#ifndef _NETSURF_RISCOS_GUI_H_
#define _NETSURF_RISCOS_GUI_H_
-#include <stdbool.h>
-#include <stdlib.h>
-#include <oslib/osspriteop.h>
#include <oslib/wimp.h>
-#include <rufl.h>
-
-#include "desktop/browser.h"
-#include "content/content_type.h"
-#include "utils/config.h"
#define RISCOS5 0xAA
@@ -53,6 +45,10 @@ struct node;
struct history;
struct css_style;
struct ssl_cert_info;
+struct nsurl;
+struct hlcache_handle;
+
+enum gui_pointer_shape;
extern wimp_t task_handle; /**< RISC OS wimp task handle. */
@@ -76,12 +72,6 @@ typedef enum { GUI_DRAG_NONE, GUI_DRAG_DOWNLOAD_SAVE, GUI_DRAG_SAVE }
extern ro_gui_drag_type gui_current_drag_type;
-/** desktop font, size and style being used */
-extern char ro_gui_desktop_font_family[];
-extern int ro_gui_desktop_font_size;
-extern rufl_style ro_gui_desktop_font_style;
-
-
/** RISC OS data for a browser window. */
struct gui_window {
/** Associated platform-independent browser window data. */
@@ -133,7 +123,7 @@ extern struct gui_download_table *riscos_download_table;
/* in 401login.c */
void ro_gui_401login_init(void);
-void gui_401login_open(nsurl *url, const char *realm,
+void gui_401login_open(struct nsurl *url, const char *realm,
nserror (*cb)(bool proceed, void *pw), void *cbpw);
/* in window.c */
@@ -156,14 +146,14 @@ bool ro_gui_window_to_window_pos(struct gui_window *g, int x, int y,
os_coord *pos);
bool ro_gui_window_to_screen_pos(struct gui_window *g, int x, int y,
os_coord *pos);
-browser_mouse_state ro_gui_mouse_click_state(wimp_mouse_state buttons,
+enum browser_mouse_state ro_gui_mouse_click_state(wimp_mouse_state buttons,
wimp_icon_flags type);
-browser_mouse_state ro_gui_mouse_drag_state(wimp_mouse_state buttons,
+enum browser_mouse_state ro_gui_mouse_drag_state(wimp_mouse_state buttons,
wimp_icon_flags type);
bool ro_gui_shift_pressed(void);
bool ro_gui_ctrl_pressed(void);
bool ro_gui_alt_pressed(void);
-void gui_window_set_pointer(struct gui_window *g, gui_pointer_shape shape);
+void gui_window_set_pointer(struct gui_window *g, enum gui_pointer_shape shape);
void gui_create_form_select_menu(struct browser_window *bw, struct form_control *control);
/* in history.c */
@@ -200,17 +190,6 @@ struct gui_search_table *riscos_search_table;
void ro_gui_print_init(void);
void ro_gui_print_prepare(struct gui_window *g);
-/* in font.c */
-void nsfont_init(void);
-bool nsfont_exists(const char *font_family);
-const char *nsfont_fallback_font(void);
-bool nsfont_paint(const plot_font_style_t *fstyle, const char *string,
- size_t length, int x, int y);
-void nsfont_read_style(const plot_font_style_t *fstyle,
- const char **font_family, unsigned int *font_size,
- rufl_style *font_style);
-void ro_gui_wimp_get_desktop_font(void);
-
/* in plotters.c */
extern const struct plotter_table ro_plotters;
extern int ro_plot_origin_x;
@@ -220,7 +199,7 @@ extern int ro_plot_origin_y;
bool ro_gui_theme_install_apply(wimp_w w);
/* in sslcert.c */
-void gui_cert_verify(nsurl *url,
+void gui_cert_verify(struct nsurl *url,
const struct ssl_cert_info *certs, unsigned long num,
nserror (*cb)(bool proceed, void *pw), void *cbpw);
diff --git a/riscos/gui/button_bar.c b/riscos/gui/button_bar.c
index 8602787a5..d92433d0b 100644
--- a/riscos/gui/button_bar.c
+++ b/riscos/gui/button_bar.c
@@ -26,18 +26,20 @@
#include <stdbool.h>
#include <stdlib.h>
#include <string.h>
-#include "oslib/dragasprite.h"
-#include "oslib/os.h"
-#include "oslib/osspriteop.h"
-#include "oslib/wimp.h"
-#include "oslib/wimpspriteop.h"
+#include <oslib/dragasprite.h>
+#include <oslib/os.h>
+#include <oslib/osspriteop.h>
+#include <oslib/wimp.h>
+#include <oslib/wimpspriteop.h>
+
+#include "utils/log.h"
+#include "utils/utils.h"
+
#include "riscos/gui/button_bar.h"
#include "riscos/gui.h"
#include "riscos/mouse.h"
#include "riscos/theme.h"
#include "riscos/wimp.h"
-#include "utils/log.h"
-#include "utils/utils.h"
#define BUTTONBAR_SPRITE_NAME_LENGTH 12
#define BUTTONBAR_VALIDATION_LENGTH 40
diff --git a/riscos/gui/status_bar.c b/riscos/gui/status_bar.c
index 8c45fd2c3..57a32ae7f 100644
--- a/riscos/gui/status_bar.c
+++ b/riscos/gui/status_bar.c
@@ -31,10 +31,12 @@
#include "desktop/plotters.h"
#include "utils/log.h"
#include "utils/utils.h"
+
#include "riscos/gui.h"
#include "riscos/wimp.h"
#include "riscos/wimp_event.h"
#include "riscos/wimputils.h"
+#include "riscos/font.h"
#include "riscos/gui/progress_bar.h"
#include "riscos/gui/status_bar.h"
diff --git a/riscos/gui/url_bar.c b/riscos/gui/url_bar.c
index c55fa614d..d89004856 100644
--- a/riscos/gui/url_bar.c
+++ b/riscos/gui/url_bar.c
@@ -37,6 +37,7 @@
#include "utils/utils.h"
#include "content/hlcache.h"
#include "content/content.h"
+#include "desktop/browser.h"
#include "riscos/gui.h"
#include "riscos/hotlist.h"
diff --git a/riscos/help.c b/riscos/help.c
index 80153a650..5c8c9c7db 100644
--- a/riscos/help.c
+++ b/riscos/help.c
@@ -20,33 +20,26 @@
* Interactive help (implementation).
*/
-#include <assert.h>
-#include <stdbool.h>
-#include <stdio.h>
-#include "oslib/help.h"
-#include "oslib/os.h"
-#include "oslib/taskmanager.h"
-#include "oslib/wimp.h"
-#include "desktop/tree.h"
-#include "riscos/cookies.h"
-#include "riscos/global_history.h"
-#include "riscos/gui.h"
-#include "riscos/hotlist.h"
-#include "riscos/help.h"
-#include "riscos/iconbar.h"
-#include "riscos/menus.h"
+#include <oslib/wimp.h>
+#include <oslib/taskmanager.h>
+
#include "utils/nsoption.h"
+#include "utils/log.h"
+#include "utils/utils.h"
+#include "utils/messages.h"
+#include "utils/utf8.h"
+
#include "riscos/treeview.h"
-#include "riscos/wimp.h"
+#include "riscos/help.h"
#include "riscos/wimp_event.h"
+#include "riscos/hotlist.h"
+#include "riscos/global_history.h"
+#include "riscos/cookies.h"
+#include "riscos/wimp.h"
+#include "riscos/iconbar.h"
#include "riscos/window.h"
-#include "utils/messages.h"
-#include "utils/log.h"
-#include "utils/utf8.h"
-#include "utils/utils.h"
#include "riscos/ucstables.h"
-
/* Recognised help keys
====================
Help keys should be registered using the wimp_event system to be
diff --git a/riscos/hotlist.h b/riscos/hotlist.h
index 5477ccea5..0b87a2e96 100644
--- a/riscos/hotlist.h
+++ b/riscos/hotlist.h
@@ -36,6 +36,8 @@
#include "riscos/menus.h"
+struct nsurl;
+
void ro_gui_hotlist_preinitialise(void);
void ro_gui_hotlist_postinitialise(void);
void ro_gui_hotlist_destroy(void);
@@ -43,9 +45,9 @@ void ro_gui_hotlist_open(void);
void ro_gui_hotlist_save(void);
bool ro_gui_hotlist_check_window(wimp_w window);
bool ro_gui_hotlist_check_menu(wimp_menu *menu);
-void ro_gui_hotlist_add_page(nsurl *url);
+void ro_gui_hotlist_add_page(struct nsurl *url);
void ro_gui_hotlist_add_cleanup(void);
-void ro_gui_hotlist_remove_page(nsurl *url);
-bool ro_gui_hotlist_has_page(nsurl *url);
+void ro_gui_hotlist_remove_page(struct nsurl *url);
+bool ro_gui_hotlist_has_page(struct nsurl *url);
#endif
diff --git a/riscos/iconbar.c b/riscos/iconbar.c
index e0949b365..bcc20d09a 100644
--- a/riscos/iconbar.c
+++ b/riscos/iconbar.c
@@ -28,23 +28,24 @@
#include <string.h>
#include <time.h>
#include <features.h>
+#include <oslib/os.h>
+#include <oslib/osbyte.h>
+#include <oslib/wimp.h>
+
+#include "utils/nsoption.h"
+#include "utils/log.h"
+#include "utils/messages.h"
+#include "utils/utils.h"
+#include "desktop/netsurf.h"
+#include "desktop/browser.h"
-#include "oslib/os.h"
-#include "oslib/osbyte.h"
-#include "oslib/wimp.h"
#include "riscos/configure.h"
#include "riscos/cookies.h"
#include "riscos/dialog.h"
#include "riscos/global_history.h"
#include "riscos/hotlist.h"
#include "riscos/iconbar.h"
-#include "desktop/netsurf.h"
-#include "desktop/browser.h"
-#include "utils/nsoption.h"
#include "riscos/wimp_event.h"
-#include "utils/log.h"
-#include "utils/messages.h"
-#include "utils/utils.h"
static bool ro_gui_iconbar_click(wimp_pointer *pointer);
diff --git a/riscos/image.c b/riscos/image.c
index 56feb2b96..07baecd60 100644
--- a/riscos/image.c
+++ b/riscos/image.c
@@ -17,16 +17,17 @@
*/
#include <stdbool.h>
-#include "swis.h"
-#include "oslib/colourtrans.h"
-#include "oslib/osspriteop.h"
-#include "riscos/image.h"
-#include "riscos/gui.h"
+#include <swis.h>
+#include <oslib/colourtrans.h>
+#include <oslib/osspriteop.h>
+
#include "utils/nsoption.h"
-#include "riscos/tinct.h"
#include "utils/log.h"
#include "utils/utils.h"
+#include "riscos/image.h"
+#include "riscos/gui.h"
+#include "riscos/tinct.h"
static bool image_redraw_tinct(osspriteop_id header, int x, int y,
int req_width, int req_height, int width, int height,
diff --git a/riscos/plotters.c b/riscos/plotters.c
index 0ab39d0ee..6e49c2278 100644
--- a/riscos/plotters.c
+++ b/riscos/plotters.c
@@ -25,13 +25,16 @@
#include "oslib/colourtrans.h"
#include "oslib/draw.h"
#include "oslib/os.h"
+
+#include "utils/log.h"
#include "desktop/plotters.h"
#include "render/font.h"
+
#include "riscos/bitmap.h"
#include "riscos/image.h"
#include "riscos/gui.h"
+#include "riscos/font.h"
#include "riscos/oslib_pre7.h"
-#include "utils/log.h"
static bool ro_plot_rectangle(int x0, int y0, int x1, int y1, const plot_style_t *style);
diff --git a/riscos/print.c b/riscos/print.c
index 16e657b51..360ff15c1 100644
--- a/riscos/print.c
+++ b/riscos/print.c
@@ -21,29 +21,32 @@
#include <assert.h>
#include <string.h>
-#include "swis.h"
-#include "oslib/font.h"
-#include "oslib/hourglass.h"
-#include "oslib/osfile.h"
-#include "oslib/osfind.h"
-#include "oslib/pdriver.h"
-#include "oslib/wimp.h"
-#include "rufl.h"
+#include <swis.h>
+#include <oslib/font.h>
+#include <oslib/hourglass.h>
+#include <oslib/osfile.h>
+#include <oslib/osfind.h>
+#include <oslib/pdriver.h>
+#include <oslib/wimp.h>
+#include <rufl.h>
+
#include "utils/config.h"
+#include "utils/log.h"
+#include "utils/messages.h"
+#include "utils/utils.h"
+#include "utils/nsoption.h"
#include "content/content.h"
#include "content/hlcache.h"
#include "desktop/browser_private.h"
-#include "utils/nsoption.h"
#include "desktop/plotters.h"
+
#include "riscos/dialog.h"
#include "riscos/menus.h"
#include "riscos/print.h"
#include "riscos/wimp.h"
#include "riscos/wimp_event.h"
-#include "utils/log.h"
-#include "utils/messages.h"
-#include "utils/utils.h"
#include "riscos/filetype.h"
+#include "riscos/font.h"
#define ICON_PRINT_TO_BOTTOM 1
diff --git a/riscos/query.c b/riscos/query.c
index 2be2e2a3d..6f3fca27f 100644
--- a/riscos/query.c
+++ b/riscos/query.c
@@ -18,17 +18,17 @@
#include <stdlib.h>
#include <string.h>
-
#include <stdbool.h>
-#include "riscos/dialog.h"
-#include "riscos/query.h"
-#include "riscos/wimp.h"
-#include "riscos/wimp_event.h"
#include "utils/log.h"
#include "utils/messages.h"
#include "utils/utf8.h"
#include "utils/utils.h"
+
+#include "riscos/dialog.h"
+#include "riscos/query.h"
+#include "riscos/wimp.h"
+#include "riscos/wimp_event.h"
#include "riscos/ucstables.h"
#define ICON_QUERY_MESSAGE 0
diff --git a/riscos/save_draw.c b/riscos/save_draw.c
index e0823323b..e8b7faae6 100644
--- a/riscos/save_draw.c
+++ b/riscos/save_draw.c
@@ -26,18 +26,21 @@
#include <assert.h>
#include <limits.h>
-#include "oslib/draw.h"
-#include "oslib/osfile.h"
-#include "pencil.h"
+#include <oslib/draw.h>
+#include <oslib/osfile.h>
+#include <pencil.h>
+
+#include "utils/log.h"
+#include "utils/types.h"
+#include "utils/utils.h"
#include "content/content.h"
#include "content/hlcache.h"
#include "desktop/plotters.h"
+
#include "riscos/bitmap.h"
#include "riscos/gui.h"
#include "riscos/save_draw.h"
-#include "utils/log.h"
-#include "utils/types.h"
-#include "utils/utils.h"
+#include "riscos/font.h"
static bool ro_save_draw_rectangle(int x0, int y0, int x1, int y1, const plot_style_t *style);
static bool ro_save_draw_line(int x0, int y0, int x1, int y1, const plot_style_t *style);
diff --git a/riscos/textarea.c b/riscos/textarea.c
index 85c9ca32f..303b7e771 100644
--- a/riscos/textarea.c
+++ b/riscos/textarea.c
@@ -24,13 +24,17 @@
#include <stdbool.h>
#include <stdint.h>
#include <string.h>
-#include "swis.h"
-#include "oslib/colourtrans.h"
-#include "oslib/osbyte.h"
-#include "oslib/serviceinternational.h"
-#include "oslib/wimp.h"
-#include "oslib/wimpspriteop.h"
-#include "rufl.h"
+#include <swis.h>
+#include <oslib/colourtrans.h>
+#include <oslib/osbyte.h>
+#include <oslib/serviceinternational.h>
+#include <oslib/wimp.h>
+#include <oslib/wimpspriteop.h>
+
+#include "utils/log.h"
+#include "utils/utf8.h"
+#include "desktop/browser.h"
+
#include "riscos/gui.h"
#include "riscos/oslib_pre7.h"
#include "riscos/textarea.h"
@@ -38,8 +42,6 @@
#include "riscos/wimp.h"
#include "riscos/wimp_event.h"
#include "riscos/wimputils.h"
-#include "utils/log.h"
-#include "utils/utf8.h"
#define MARGIN_LEFT 8
#define MARGIN_RIGHT 8
diff --git a/riscos/textselection.c b/riscos/textselection.c
index 2c8520425..f002e0773 100644
--- a/riscos/textselection.c
+++ b/riscos/textselection.c
@@ -32,6 +32,7 @@
#include "content/hlcache.h"
#include "desktop/gui.h"
#include "desktop/textinput.h"
+#include "desktop/browser.h"
#include "riscos/gui.h"
#include "riscos/menus.h"
diff --git a/riscos/url_complete.c b/riscos/url_complete.c
index 5f45cd514..6881de7ea 100644
--- a/riscos/url_complete.c
+++ b/riscos/url_complete.c
@@ -25,19 +25,22 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include "oslib/wimp.h"
-#include "content/urldb.h"
+#include <oslib/wimp.h>
+
#include "utils/log.h"
+#include "utils/nsoption.h"
+#include "utils/utils.h"
+#include "content/urldb.h"
+#include "desktop/browser.h"
+
#include "riscos/global_history.h"
#include "riscos/gui.h"
#include "riscos/mouse.h"
-#include "utils/nsoption.h"
#include "riscos/toolbar.h"
#include "riscos/url_complete.h"
#include "riscos/wimp.h"
#include "riscos/wimp_event.h"
#include "riscos/wimputils.h"
-#include "utils/utils.h"
#include "riscos/filetype.h"
#define MAXIMUM_VISIBLE_LINES 7