additional risc os header cleanups

8 files changed, 39 insertions, 27 deletions

diff --git a/riscos/configure/con_cache.c b/riscos/configure/con_cache.c
index 6e402fe81..cb464f799 100644
--- a/riscos/configure/con_cache.c
+++ b/riscos/configure/con_cache.c
@@ -17,17 +17,19 @@
  */
 
 #include <stdbool.h>
-#include "oslib/hourglass.h"
+#include <oslib/hourglass.h>
+
 #include "utils/nsoption.h"
-#include "riscos/dialog.h"
+#include "utils/filename.h"
+#include "utils/messages.h"
+#include "utils/utils.h"
+
 #include "riscos/gui.h"
 #include "riscos/wimp.h"
 #include "riscos/wimp_event.h"
 #include "riscos/configure.h"
 #include "riscos/configure/configure.h"
-#include "utils/filename.h"
-#include "utils/messages.h"
-#include "utils/utils.h"
+#include "riscos/dialog.h"
 
 
 #define CACHE_MEMORY_SIZE 3
diff --git a/riscos/configure/con_content.c b/riscos/configure/con_content.c
index d4f3e46bb..a1d27375f 100644
--- a/riscos/configure/con_content.c
+++ b/riscos/configure/con_content.c
@@ -17,16 +17,17 @@
  */
 
 #include <stdbool.h>
+
 #include "utils/nsoption.h"
-#include "riscos/dialog.h"
+#include "utils/messages.h"
+#include "utils/utils.h"
+
 #include "riscos/gui.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"
-
+#include "riscos/dialog.h"
 
 #define CONTENT_BLOCK_ADVERTISEMENTS 2
 #define CONTENT_BLOCK_POPUPS 3
diff --git a/riscos/configure/con_fonts.c b/riscos/configure/con_fonts.c
index c2aa1dcf6..1fe427c24 100644
--- a/riscos/configure/con_fonts.c
+++ b/riscos/configure/con_fonts.c
@@ -24,13 +24,14 @@
 #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 "riscos/dialog.h"
 
 
 #define FONT_SANS_FIELD 3
diff --git a/riscos/configure/con_home.c b/riscos/configure/con_home.c
index 6f7d01043..4dec6ad61 100644
--- a/riscos/configure/con_home.c
+++ b/riscos/configure/con_home.c
@@ -17,8 +17,11 @@
  */
 
 #include <stdbool.h>
+
+#include "utils/messages.h"
+#include "utils/utils.h"
 #include "utils/nsoption.h"
-#include "riscos/dialog.h"
+
 #include "riscos/gui.h"
 #include "riscos/menus.h"
 #include "riscos/url_suggest.h"
@@ -26,8 +29,7 @@
 #include "riscos/wimp_event.h"
 #include "riscos/configure.h"
 #include "riscos/configure/configure.h"
-#include "utils/messages.h"
-#include "utils/utils.h"
+#include "riscos/dialog.h"
 
 #define HOME_URL_FIELD 3
 #define HOME_URL_GRIGHT 4
diff --git a/riscos/configure/con_image.c b/riscos/configure/con_image.c
index a5ebb85d5..ee4281856 100644
--- a/riscos/configure/con_image.c
+++ b/riscos/configure/con_image.c
@@ -17,18 +17,21 @@
  */
 
 #include <stdbool.h>
-#include "swis.h"
-#include "oslib/osspriteop.h"
-#include "oslib/wimp.h"
+#include <swis.h>
+#include <oslib/osspriteop.h>
+#include <oslib/wimp.h>
+
 #include "utils/nsoption.h"
+#include "utils/log.h"
+#include "utils/utils.h"
+
+#include "riscos/gui.h"
 #include "riscos/configure/configure.h"
 #include "riscos/dialog.h"
 #include "riscos/menus.h"
 #include "riscos/tinct.h"
 #include "riscos/wimp.h"
 #include "riscos/wimp_event.h"
-#include "utils/log.h"
-#include "utils/utils.h"
 
 
 #define IMAGE_FOREGROUND_FIELD 3
diff --git a/riscos/configure/con_inter.c b/riscos/configure/con_inter.c
index 30b824292..7ab912c54 100644
--- a/riscos/configure/con_inter.c
+++ b/riscos/configure/con_inter.c
@@ -20,12 +20,12 @@
 
 #include "utils/nsoption.h"
 
-#include "riscos/dialog.h"
 #include "riscos/gui.h"
 #include "riscos/wimp.h"
 #include "riscos/wimp_event.h"
 #include "riscos/configure.h"
 #include "riscos/configure/configure.h"
+#include "riscos/dialog.h"
 
 #define INTERFACE_STRIP_EXTNS_OPTION 2
 #define INTERFACE_CONFIRM_OVWR_OPTION 3
diff --git a/riscos/configure/con_language.c b/riscos/configure/con_language.c
index 7e483b5af..ace7a6fdf 100644
--- a/riscos/configure/con_language.c
+++ b/riscos/configure/con_language.c
@@ -18,17 +18,19 @@
  */
 
 #include <stdbool.h>
+
 #include "utils/nsoption.h"
-#include "riscos/dialog.h"
+#include "utils/log.h"
+#include "utils/messages.h"
+#include "utils/utils.h"
+
 #include "riscos/gui.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/log.h"
-#include "utils/messages.h"
-#include "utils/utils.h"
+#include "riscos/dialog.h"
 
 
 #define LANGUAGE_INTERFACE_FIELD 3
diff --git a/riscos/configure/con_secure.c b/riscos/configure/con_secure.c
index 75e2bc705..2e3c31484 100644
--- a/riscos/configure/con_secure.c
+++ b/riscos/configure/con_secure.c
@@ -17,16 +17,17 @@
  */
 
 #include <stdbool.h>
+
 #include "utils/nsoption.h"
-#include "riscos/dialog.h"
+#include "utils/messages.h"
+#include "utils/utils.h"
+
 #include "riscos/gui.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"
-
+#include "riscos/dialog.h"
 
 #define SECURITY_REFERRER 2
 #define SECURITY_DURATION_FIELD 6