move options include

14 files changed, 15 insertions, 15 deletions

diff --git a/atari/bitmap.c b/atari/bitmap.c
index 0f27be49e..6d986fb5b 100755
--- a/atari/bitmap.c
+++ b/atari/bitmap.c
@@ -22,7 +22,7 @@
 
 
 #include "assert.h"
-#include "desktop/options.h"
+#include "utils/nsoption.h"
 #include "image/bitmap.h"
 #include "atari/bitmap.h"
 #include "atari/plot/plot.h"
diff --git a/atari/ctxmenu.c b/atari/ctxmenu.c
index 1806d5499..5b33fe45f 100644
--- a/atari/ctxmenu.c
+++ b/atari/ctxmenu.c
@@ -42,7 +42,7 @@
 #include "atari/rootwin.h"

 #include "atari/misc.h"

 #include "atari/clipboard.h"

-#include "desktop/options.h"

+#include "utils/nsoption.h"

 #include "atari/res/netsurf.rsh"

 #include "atari/ctxmenu.h"

 

diff --git a/atari/deskmenu.c b/atari/deskmenu.c
index e2b0dea6b..e4bfa98ba 100644
--- a/atari/deskmenu.c
+++ b/atari/deskmenu.c
@@ -5,7 +5,7 @@
 #include "utils/url.h"
 #include "desktop/browser.h"
 #include "desktop/browser_private.h"
-#include "desktop/options.h"
+#include "utils/nsoption.h"
 #include "desktop/save_complete.h"

 #include "atari/res/netsurf.rsh"
 #include "atari/gemtk/gemtk.h"
diff --git a/atari/download.c b/atari/download.c
index 32a6f1252..407be063d 100755
--- a/atari/download.c
+++ b/atari/download.c
@@ -30,7 +30,7 @@
 #include "desktop/gui.h"

 #include "desktop/history_core.h"

 #include "desktop/netsurf.h"

-#include "desktop/options.h"

+#include "utils/nsoption.h"

 #include "desktop/save_complete.h"

 #include "desktop/textinput.h"

 #include "desktop/download.h"

diff --git a/atari/font.c b/atari/font.c
index dfa0efee5..7640f6106 100755
--- a/atari/font.c
+++ b/atari/font.c
@@ -42,7 +42,7 @@
 #include "render/font.h"

 #include "utils/utf8.h"

 #include "utils/log.h"

-#include "desktop/options.h"

+#include "utils/nsoption.h"

 #include "desktop/mouse.h"

 #include "desktop/plotters.h"

 

diff --git a/atari/gui.c b/atari/gui.c
index 776e30a25..97d63ce3c 100644
--- a/atari/gui.c
+++ b/atari/gui.c
@@ -40,7 +40,7 @@
 #include "desktop/netsurf.h"
 #include "desktop/401login.h"
 
-#include "desktop/options.h"
+#include "utils/nsoption.h"
 #include "desktop/save_complete.h"
 #include "desktop/textinput.h"
 #include "desktop/browser.h"
@@ -922,7 +922,7 @@ nsurl *gui_get_resource_url(const char *path)
     return url;
 }
 
-/* Documented in desktop/options.h */
+/* Documented in utils/nsoption.h */
 void gui_options_init_defaults(void)
 {
     /* Set defaults for absent option strings */
diff --git a/atari/history.c b/atari/history.c
index aa32cbf7e..49e24ced0 100755
--- a/atari/history.c
+++ b/atari/history.c
@@ -22,7 +22,7 @@
 #include <stdlib.h>
 #include <time.h>
 #include "desktop/browser.h"
-#include "desktop/options.h"
+#include "utils/nsoption.h"
 #include "desktop/tree.h"
 #include "desktop/tree_url_node.h"
 #include "desktop/gui.h"
diff --git a/atari/hotlist.c b/atari/hotlist.c
index adfd596ca..f3b093d6f 100755
--- a/atari/hotlist.c
+++ b/atari/hotlist.c
@@ -27,7 +27,7 @@
 #include "content/content.h"
 #include "content/hlcache.h"
 #include "content/urldb.h"
-#include "desktop/options.h"
+#include "utils/nsoption.h"
 #include "desktop/hotlist.h"
 #include "desktop/tree.h"
 #include "desktop/tree_url_node.h"
diff --git a/atari/misc.c b/atari/misc.c
index e8e6a9bb0..96abcf57a 100755
--- a/atari/misc.c
+++ b/atari/misc.c
@@ -31,7 +31,7 @@
 #include "desktop/mouse.h"
 #include "desktop/cookies.h"
 #include "desktop/tree.h"
-#include "desktop/options.h"

+#include "utils/nsoption.h"

 #include "utils/messages.h"

 #include "utils/utils.h"

 #include "utils/url.h"

diff --git a/atari/plot/font_freetype.c b/atari/plot/font_freetype.c
index ed850bce2..8b3980d6d 100755
--- a/atari/plot/font_freetype.c
+++ b/atari/plot/font_freetype.c
@@ -22,7 +22,7 @@
 #include <ft2build.h>

 #include FT_CACHE_H

 

-#include "desktop/options.h"

+#include "utils/nsoption.h"

 #include "atari/plot/plot.h"

 #include "atari/plot/font_freetype.h"
 #include "atari/findfile.h"
diff --git a/atari/plot/plot.c b/atari/plot/plot.c
index dfd9b0eff..33810b74e 100755
--- a/atari/plot/plot.c
+++ b/atari/plot/plot.c
@@ -34,7 +34,7 @@
 
 #include "atari/bitmap.h"
 #include "atari/gui.h"
-#include "desktop/options.h"
+#include "utils/nsoption.h"
 #include "atari/plot/plot.h"
 
 void vq_scrninfo(VdiHdl handle, short *work_out);
diff --git a/atari/settings.c b/atari/settings.c
index 5244a7f8b..1fc425a39 100644
--- a/atari/settings.c
+++ b/atari/settings.c
@@ -9,7 +9,7 @@
 #include <stdbool.h>
 #include <cflib.h>
 
-#include "desktop/options.h"
+#include "utils/nsoption.h"
 #include "desktop/plot_style.h"
 #include "atari/res/netsurf.rsh"
 #include "atari/settings.h"
diff --git a/atari/system_colour.c b/atari/system_colour.c
index 5f8673371..efcd7b6ac 100644
--- a/atari/system_colour.c
+++ b/atari/system_colour.c
@@ -28,7 +28,7 @@
 #include "utils/utils.h"
 #include "utils/log.h"
 #include "desktop/gui.h"
-#include "desktop/options.h"
+#include "utils/nsoption.h"
 #include "desktop/plot_style.h"
 
 struct gui_system_colour_ctx {
diff --git a/atari/toolbar.c b/atari/toolbar.c
index 18d8a456a..79be31b73 100644
--- a/atari/toolbar.c
+++ b/atari/toolbar.c
@@ -37,7 +37,7 @@
 #include "desktop/plot_style.h"

 #include "desktop/plotters.h"
 #include "desktop/tree.h"
-#include "desktop/options.h"
+#include "utils/nsoption.h"
 #include "utils/utf8.h"

 #include "atari/clipboard.h"

 #include "atari/gui.h"