move options include

amiga/arexx.c

@@ -23,7 +23,7 @@
 #include "amiga/gui.h"
 #include "amiga/hotlist.h"
 #include "amiga/theme.h"
-#include "desktop/options.h"
+#include "utils/nsoption.h"
 
 #include "desktop/browser_private.h"
 

amiga/bitmap.c

@@ -28,7 +28,7 @@
 #include <graphics/composite.h>
 #endif
 #include <graphics/gfxbase.h>
-#include "desktop/options.h"
+#include "utils/nsoption.h"
 #include <proto/datatypes.h>
 #include <datatypes/pictureclass.h>
 #include <proto/dos.h>

amiga/clipboard.c

@@ -19,7 +19,7 @@
 #include "desktop/gui.h"
 #include "desktop/plotters.h"
 #include "desktop/textinput.h"
-#include "desktop/options.h"
+#include "utils/nsoption.h"
 
 #include "amiga/bitmap.h"
 #include "amiga/clipboard.h"

amiga/context_menu.c

@@ -34,7 +34,7 @@
 #include "amiga/gui.h"
 #include "amiga/history_local.h"
 #include "amiga/iff_dr2d.h"
-#include "desktop/options.h"
+#include "utils/nsoption.h"
 #include "amiga/plugin_hack.h"
 #include "amiga/theme.h"
 #include "amiga/tree.h"

amiga/download.c

@@ -34,7 +34,7 @@
 #include "amiga/download.h"
 #include "amiga/icon.h"
 #include "amiga/object.h"
-#include "desktop/options.h"
+#include "utils/nsoption.h"
 #include "amiga/bitmap.h"
 #include "amiga/iff_dr2d.h"
 #include "amiga/file.h"

amiga/drag.c

@@ -37,7 +37,7 @@
 #include "amiga/drag.h"
 #include "amiga/file.h"
 #include "amiga/filetype.h"
-#include "desktop/options.h"
+#include "utils/nsoption.h"
 #include "amiga/theme.h"
 
 #include "utils/errors.h"

amiga/file.c

@@ -29,7 +29,7 @@
 #include "content/fetch.h"
 
 #include "desktop/browser_private.h"
-#include "desktop/options.h"
+#include "utils/nsoption.h"
 #include "desktop/save_complete.h"
 #include "desktop/save_pdf/pdf_plotters.h"
 #include "desktop/save_text.h"

amiga/font.c

@@ -23,7 +23,7 @@
 #include "amiga/gui.h"
 #include "amiga/utf8.h"
 #include "amiga/object.h"
-#include "desktop/options.h"
+#include "utils/nsoption.h"
 #include "css/css.h"
 #include "css/utils.h"
 #include "render/font.h"

amiga/font_scan.c

@@ -45,7 +45,7 @@
 #include "amiga/object.h"
 #include "amiga/utf8.h"
 
-#include "desktop/options.h"
+#include "utils/nsoption.h"
 #include "utils/log.h"
 #include "utils/messages.h"
 

amiga/gui.c

@@ -23,7 +23,7 @@
 #include "desktop/history_core.h"
 #include "desktop/mouse.h"
 #include "desktop/netsurf.h"
-#include "desktop/options.h"
+#include "utils/nsoption.h"
 #include "desktop/save_complete.h"
 #include "desktop/scrollbar.h"
 #include "desktop/searchweb.h"
@@ -553,7 +553,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 */

amiga/gui_options.c

@@ -38,7 +38,7 @@
 #include "amiga/utf8.h"
 #include "utils/messages.h"
 #include "desktop/browser_private.h"
-#include "desktop/options.h"
+#include "utils/nsoption.h"
 #include "desktop/searchweb.h"
 
 #include <proto/window.h>

amiga/launch.c

@@ -30,7 +30,7 @@
 #include <proto/utility.h>
 #include <proto/openurl.h>
 
-#include "desktop/options.h"
+#include "utils/nsoption.h"
 #include "utils/url.h"
 
 struct Library *OpenURLBase = NULL;

amiga/menu.c

@@ -50,7 +50,7 @@
 #include "amiga/history_local.h"
 #include "amiga/hotlist.h"
 #include "amiga/menu.h"
-#include "desktop/options.h"
+#include "utils/nsoption.h"
 #include "amiga/print.h"
 #include "amiga/search.h"
 #include "amiga/theme.h"

amiga/plotters.c

@@ -22,7 +22,7 @@
 #include "amiga/gui.h"
 #include "amiga/utf8.h"
 
-#include "desktop/options.h"
+#include "utils/nsoption.h"
 #include "utils/utils.h"
 #include "utils/log.h"
 

amiga/print.c

@@ -20,7 +20,7 @@
 #include "amiga/plotters.h"
 #include "render/font.h"
 #include "amiga/gui.h"
-#include "desktop/options.h"
+#include "utils/nsoption.h"
 #include "amiga/print.h"
 #include "utils/messages.h"
 #include "utils/utils.h"

amiga/stringview/urlhistory.c

@@ -29,7 +29,7 @@
 #include "urlhistory.h"
 
 #include "content/urldb.h"
-#include "desktop/options.h"
+#include "utils/nsoption.h"
 
 static struct List PageList;
 

amiga/system_colour.c

@@ -25,7 +25,7 @@
 #include "utils/utils.h"
 #include "utils/log.h"
 #include "desktop/gui.h"
-#include "desktop/options.h"
+#include "utils/nsoption.h"
 #include "desktop/tree.h"
 
 #include <proto/graphics.h>

amiga/theme.c

@@ -37,7 +37,7 @@
 #include "amiga/bitmap.h"
 #include "amiga/drag.h"
 #include "desktop/browser_private.h"
-#include "desktop/options.h"
+#include "utils/nsoption.h"
 #include "amiga/theme.h"
 #include "desktop/searchweb.h"
 #include "utils/messages.h"

amiga/thumbnail.c

@@ -20,7 +20,7 @@
 #include "desktop/browser.h"
 #include "amiga/gui.h"
 #include "amiga/bitmap.h"
-#include "desktop/options.h"
+#include "utils/nsoption.h"
 #include "content/urldb.h"
 #include "desktop/plotters.h"
 #include "desktop/thumbnail.h"

amiga/tree.c

@@ -53,7 +53,7 @@
 #include "amiga/drag.h" /* drag icon stuff */
 #include "amiga/theme.h" /* pointers */
 #include "amiga/filetype.h"
-#include "desktop/options.h"
+#include "utils/nsoption.h"
 #include "content/urldb.h"
 #include "desktop/cookies.h"
 #include "desktop/history_global_core.h"

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"

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"
 

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"

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"

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"
 

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 */

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"

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"

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"

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"

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);

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"

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 {

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"

beos/fetch_rsrc.cpp

@@ -35,7 +35,7 @@ extern "C" {
 #include "content/fetch.h"
 #include "content/urldb.h"
 #include "desktop/netsurf.h"
-#include "desktop/options.h"
+#include "utils/nsoption.h"
 #include "utils/log.h"
 #include "utils/messages.h"
 #include "utils/url.h"

beos/font.cpp

@@ -35,7 +35,7 @@ extern "C" {
 #include "render/font.h"
 #include "utils/utils.h"
 #include "utils/log.h"
-#include "desktop/options.h"
+#include "utils/nsoption.h"
 }
 
 #include "beos/gui.h"

beos/gui.cpp

@@ -53,7 +53,7 @@ extern "C" {
 #include "desktop/cookies.h"
 #include "desktop/gui.h"
 #include "desktop/netsurf.h"
-#include "desktop/options.h"
+#include "utils/nsoption.h"
 
 #include "render/form.h"
 #include "utils/filename.h"
@@ -467,7 +467,7 @@ int gui_init_replicant(int argc, char** argv)
 	return 0;
 }
 
-/* Documented in desktop/options.h */
+/* Documented in utils/nsoption.h */
 void gui_options_init_defaults(void)
 {
 	/* Set defaults for absent option strings */

beos/gui_options.cpp

@@ -23,7 +23,7 @@
 #include <string.h>
 extern "C" {
 #include "utils/log.h"
-#include "desktop/options.h"
+#include "utils/nsoption.h"
 }
 #include "beos/gui.h"
 #include "beos/scaffolding.h"

beos/plotters.cpp

@@ -35,7 +35,7 @@ extern "C" {
 #include "render/font.h"
 #include "utils/log.h"
 #include "utils/utils.h"
-#include "desktop/options.h"
+#include "utils/nsoption.h"
 }
 #include "beos/font.h"
 #include "beos/gui.h"

beos/scaffolding.cpp

@@ -56,7 +56,7 @@ extern "C" {
 #include "desktop/gui.h"
 #include "desktop/netsurf.h"
 #include "desktop/plotters.h"
-#include "desktop/options.h"
+#include "utils/nsoption.h"
 #include "desktop/textinput.h"
 #include "render/font.h"
 #include "render/form.h"

beos/system_colour.cpp

@@ -34,7 +34,7 @@ extern "C" {
 #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"
 
 }

beos/window.cpp

@@ -25,7 +25,7 @@ extern "C" {
 #include "css/utils.h"
 #include "desktop/browser_private.h"
 #include "desktop/mouse.h"
-#include "desktop/options.h"
+#include "utils/nsoption.h"
 #include "desktop/textinput.h"
 #include "render/font.h"
 #include "utils/log.h"

cocoa/BrowserView.m

@@ -27,7 +27,7 @@
 #import "desktop/history_core.h"
 #import "desktop/plotters.h"
 #import "desktop/textinput.h"
-#import "desktop/options.h"
+#import "utils/nsoption.h"
 #import "utils/messages.h"
 
 @interface BrowserView ()

cocoa/BrowserViewController.m

@@ -23,7 +23,7 @@
 #import "desktop/browser_private.h"
 #import "desktop/history_core.h"
 #import "desktop/textinput.h"
-#import "desktop/options.h"
+#import "utils/nsoption.h"
 
 #import "utils/corestrings.h"
 #import "utils/filename.h"

cocoa/BrowserWindowController.m

@@ -26,7 +26,7 @@
 #import "cocoa/NetsurfApp.h"
 
 #import "desktop/browser.h"
-#import "desktop/options.h"
+#import "utils/nsoption.h"
 #import "utils/messages.h"
 
 @interface BrowserWindowController ()

cocoa/NetSurfAppDelegate.m

@@ -22,7 +22,7 @@
 #import "cocoa/HistoryWindowController.h"
 
 #import "desktop/browser.h"
-#import "desktop/options.h"
+#import "utils/nsoption.h"
 #import "utils/messages.h"
 
 @interface NetSurfAppDelegate ()

cocoa/NetsurfApp.m

@@ -29,7 +29,7 @@
 #import "desktop/history_core.h"
 #import "desktop/mouse.h"
 #import "desktop/netsurf.h"
-#import "desktop/options.h"
+#import "utils/nsoption.h"
 #import "desktop/plotters.h"
 #import "desktop/save_complete.h"
 #import "desktop/textinput.h"
@@ -163,7 +163,7 @@ void cocoa_autorelease( void )
 	pool = [[NSAutoreleasePool alloc] init];
 }
 
-/* Documented in desktop/options.h */
+/* Documented in utils/nsoption.h */
 void gui_options_init_defaults(void)
 {
 	/* Set defaults for absent option strings */

cocoa/PreferencesWindowController.m

@@ -24,7 +24,7 @@
 
 #import "desktop/browser_private.h"
 #import "content/content.h"
-#import "desktop/options.h"
+#import "utils/nsoption.h"
 
 @implementation PreferencesWindowController
 

cocoa/font.m

@@ -22,7 +22,7 @@
 #import "cocoa/font.h"
 
 #import "css/css.h"
-#import "desktop/options.h"
+#import "utils/nsoption.h"
 #import "render/font.h"
 #import "desktop/plotters.h"
 

cocoa/gui.m

@@ -28,7 +28,7 @@
 #import "desktop/gui.h"
 #import "desktop/netsurf.h"
 #import "desktop/browser_private.h"
-#import "desktop/options.h"
+#import "utils/nsoption.h"
 #import "desktop/textinput.h"
 #import "desktop/401login.h"
 #import "utils/utils.h"

cocoa/system_colour.m

@@ -24,7 +24,7 @@
 #import "utils/utils.h"
 #import "utils/log.h"
 #import "desktop/gui.h"
-#import "desktop/options.h"
+#import "utils/nsoption.h"
 
 struct gui_system_colour_ctx {
 	const char *name;

content/content.c

@@ -37,7 +37,7 @@
 #include "css/css.h"
 #include "image/bitmap.h"
 #include "desktop/browser.h"
-#include "desktop/options.h"
+#include "utils/nsoption.h"
 #include "render/html.h"
 #include "render/textplain.h"
 

content/fetch.c

@@ -45,7 +45,7 @@
 #include "content/fetchers/file.h"
 #include "content/urldb.h"
 #include "desktop/netsurf.h"
-#include "desktop/options.h"
+#include "utils/nsoption.h"
 #include "utils/log.h"
 #include "utils/messages.h"
 #include "utils/nsurl.h"

content/fetchers/about.c

@@ -47,7 +47,7 @@
 #include "content/fetchers/about.h"
 #include "content/urldb.h"
 #include "desktop/netsurf.h"
-#include "desktop/options.h"
+#include "utils/nsoption.h"
 #include "utils/log.h"
 #include "utils/messages.h"
 #include "utils/url.h"

content/fetchers/curl.c

@@ -45,7 +45,7 @@
 #include "content/fetchers/curl.h"
 #include "content/urldb.h"
 #include "desktop/netsurf.h"
-#include "desktop/options.h"
+#include "utils/nsoption.h"
 #include "utils/log.h"
 #include "utils/messages.h"
 #include "utils/schedule.h"

content/fetchers/data.c

@@ -34,7 +34,7 @@
 #include "content/fetchers/data.h"
 #include "content/urldb.h"
 #include "desktop/netsurf.h"
-#include "desktop/options.h"
+#include "utils/nsoption.h"
 #include "utils/log.h"
 #include "utils/messages.h"
 #include "utils/url.h"

content/fetchers/file.c

@@ -47,7 +47,7 @@
 #include "content/fetchers/file.h"
 #include "content/urldb.h"
 #include "desktop/netsurf.h"
-#include "desktop/options.h"
+#include "utils/nsoption.h"
 #include "utils/errors.h"
 #include "utils/log.h"
 #include "utils/messages.h"

content/fetchers/resource.c

@@ -42,7 +42,7 @@
 #include "content/fetchers/resource.h"
 #include "content/urldb.h"
 #include "desktop/gui.h"
-#include "desktop/options.h"
+#include "utils/nsoption.h"
 #include "utils/log.h"
 #include "utils/messages.h"
 #include "utils/url.h"

content/urldb.c

@@ -101,7 +101,7 @@
 #include "content/content.h"
 #include "content/urldb.h"
 #include "desktop/cookies.h"
-#include "desktop/options.h"
+#include "utils/nsoption.h"
 #include "utils/log.h"
 #include "utils/corestrings.h"
 #include "utils/filename.h"

css/select.c

@@ -27,7 +27,7 @@
 #include "css/select.h"
 #include "css/utils.h"
 #include "desktop/gui.h"
-#include "desktop/options.h"
+#include "utils/nsoption.h"
 #include "utils/corestrings.h"
 #include "utils/log.h"
 #include "utils/url.h"

css/utils.c

@@ -21,7 +21,7 @@
 
 #include "css/utils.h"
 
-#include "desktop/options.h"
+#include "utils/nsoption.h"
 #include "utils/log.h"
 
 /** Screen DPI in fixed point units: defaults to 90, which RISC OS uses */

desktop/browser.c

@@ -49,7 +49,7 @@
 #include "desktop/hotlist.h"
 #include "desktop/gui.h"
 #include "desktop/knockout.h"
-#include "desktop/options.h"
+#include "utils/nsoption.h"
 #include "desktop/scrollbar.h"
 #include "desktop/selection.h"
 #include "desktop/plotters.h"

desktop/cookies.c

@@ -31,7 +31,7 @@
 #include "content/hlcache.h"
 #include "content/urldb.h"
 #include "desktop/cookies.h"
-#include "desktop/options.h"
+#include "utils/nsoption.h"
 #include "desktop/tree.h"
 #include "utils/log.h"
 #include "utils/messages.h"

desktop/netsurf.c

@@ -40,7 +40,7 @@
 #include "desktop/401login.h"
 #include "desktop/browser.h"
 #include "desktop/gui.h"
-#include "desktop/options.h"
+#include "utils/nsoption.h"
 #include "desktop/searchweb.h"
 
 #include "javascript/js.h"

desktop/options.c

@@ -36,7 +36,7 @@
 #include "desktop/plot_style.h"
 #include "utils/log.h"
 #include "utils/utils.h"
-#include "desktop/options.h"
+#include "utils/nsoptions.h"
 
 struct ns_options nsoptions = {
 	NSOPTION_MAIN_DEFAULTS,

desktop/print.c

@@ -30,7 +30,7 @@
 #include "content/content.h"
 #include "content/hlcache.h"
 #include "css/utils.h"
-#include "desktop/options.h"
+#include "utils/nsoption.h"
 #include "desktop/print.h"
 #include "desktop/printer.h"
 #include "render/box.h"

desktop/save_pdf/font_haru.c

@@ -39,7 +39,7 @@
 #include "css/css.h"
 #include "css/utils.h"
 
-#include "desktop/options.h"
+#include "utils/nsoption.h"
 #include "desktop/save_pdf/font_haru.h"
 #include "render/font.h"
 #include "utils/log.h"

desktop/save_pdf/pdf_plotters.c

@@ -31,7 +31,7 @@
 #include <hpdf.h>
 
 #include "content/hlcache.h"
-#include "desktop/options.h"
+#include "utils/nsoption.h"
 #include "desktop/plotters.h"
 #include "desktop/print.h"
 #include "desktop/printer.h"

desktop/scrollbar.c

@@ -27,7 +27,7 @@
 
 #include "desktop/mouse.h"
 #include "desktop/scrollbar.h"
-#include "desktop/options.h"
+#include "utils/nsoption.h"
 #include "desktop/plotters.h"
 #include "desktop/plot_style.h"
 #include "utils/log.h"

desktop/search.c

@@ -30,7 +30,7 @@
 #include "content/hlcache.h"
 #include "desktop/browser_private.h"
 #include "desktop/gui.h"
-#include "desktop/options.h"
+#include "utils/nsoption.h"
 #include "desktop/search.h"
 #include "desktop/selection.h"
 #include "render/box.h"

desktop/searchweb.c

@@ -27,7 +27,7 @@
 #include "content/hlcache.h"
 #include "desktop/browser.h"
 #include "desktop/gui.h"
-#include "desktop/options.h"
+#include "utils/nsoption.h"
 #include "desktop/searchweb.h"
 #include "utils/config.h"
 #include "utils/log.h"

desktop/thumbnail.c

@@ -27,7 +27,7 @@
 #include "content/hlcache.h"
 #include "desktop/browser.h"
 #include "desktop/knockout.h"
-#include "desktop/options.h"
+#include "utils/nsoption.h"
 #include "desktop/plotters.h"
 #include "desktop/thumbnail.h"
 #include "utils/log.h"

desktop/tree.c

@@ -34,7 +34,7 @@
 #include "desktop/textarea.h"
 #include "desktop/textinput.h"
 #include "desktop/tree.h"
-#include "desktop/options.h"
+#include "utils/nsoption.h"
 #include "desktop/plotters.h"
 #include "render/font.h"
 #include "utils/log.h"

desktop/tree_url_node.c

@@ -32,7 +32,7 @@
 #include "content/hlcache.h"
 #include "content/urldb.h"
 #include "desktop/browser.h"
-#include "desktop/options.h"
+#include "utils/nsoption.h"
 #include "desktop/tree_url_node.h"
 #include "utils/corestrings.h"
 #include "utils/libdom.h"

framebuffer/font_freetype.c

@@ -29,7 +29,7 @@
 #include "utils/filepath.h"
 #include "utils/utf8.h"
 #include "utils/log.h"
-#include "desktop/options.h"
+#include "utils/nsoption.h"
 
 #include "framebuffer/gui.h"
 #include "framebuffer/font.h"

framebuffer/font_internal.c

@@ -23,7 +23,7 @@
 #include <assert.h>
 #include "css/css.h"
 #include "render/font.h"
-#include "desktop/options.h"
+#include "utils/nsoption.h"
 #include "utils/utf8.h"
 
 #include "framebuffer/gui.h"

framebuffer/gui.c

@@ -36,7 +36,7 @@
 #include "desktop/mouse.h"
 #include "desktop/plotters.h"
 #include "desktop/netsurf.h"
-#include "desktop/options.h"
+#include "utils/nsoption.h"
 #include "utils/filepath.h"
 #include "utils/log.h"
 #include "utils/messages.h"
@@ -476,7 +476,7 @@ process_cmdline(int argc, char** argv)
 	return true;
 }
 
-/* Documented in desktop/options.h */
+/* Documented in utils/nsoption.h */
 void gui_options_init_defaults(void)
 {
 	/* Set defaults for absent option strings */

framebuffer/localhistory.c

@@ -35,7 +35,7 @@
 #include "desktop/gui.h"
 #include "desktop/plotters.h"
 #include "desktop/netsurf.h"
-#include "desktop/options.h"
+#include "utils/nsoption.h"
 #include "utils/log.h"
 #include "utils/url.h"
 #include "utils/messages.h"

framebuffer/system_colour.c

@@ -24,7 +24,7 @@
 #include "utils/utils.h"
 #include "utils/log.h"
 #include "desktop/gui.h"
-#include "desktop/options.h"
+#include "utils/nsoption.h"
 
 struct gui_system_colour_ctx {
 	const char *name;

gtk/completion.c

@@ -21,7 +21,7 @@
 
 #include "content/urldb.h"
 #include "utils/log.h"
-#include "desktop/options.h"
+#include "utils/nsoption.h"
 
 GtkListStore *nsgtk_completion_list;
 

gtk/dialogs/preferences.c

@@ -20,7 +20,7 @@
 #include <math.h>
 
 #include "desktop/browser_private.h"
-#include "desktop/options.h"
+#include "utils/nsoption.h"
 #include "desktop/searchweb.h"
 #include "utils/log.h"
 #include "utils/utils.h"

gtk/dialogs/source.c

@@ -33,7 +33,7 @@
 #include "desktop/browser_private.h"
 #include "desktop/netsurf.h"
 #include "desktop/print.h"
-#include "desktop/options.h"
+#include "utils/nsoption.h"
 #include "utils/messages.h"
 #include "utils/url.h"
 #include "utils/utils.h"

gtk/download.c

@@ -30,7 +30,7 @@
 #include "desktop/gui.h"
 #include "gtk/gui.h"
 #include "gtk/scaffolding.h"
-#include "desktop/options.h"
+#include "utils/nsoption.h"
 #include "gtk/download.h"
 #include "gtk/window.h"
 #include "gtk/compat.h"

gtk/font_pango.c

@@ -34,7 +34,7 @@
 #include "render/font.h"
 #include "utils/utils.h"
 #include "utils/log.h"
-#include "desktop/options.h"
+#include "utils/nsoption.h"
 
 static bool nsfont_width(const plot_font_style_t *fstyle,
 		const char *string, size_t length,

gtk/gui.c

@@ -49,7 +49,7 @@
 #include "desktop/gui.h"
 #include "desktop/history_global_core.h"
 #include "desktop/netsurf.h"
-#include "desktop/options.h"
+#include "utils/nsoption.h"
 #include "desktop/save_complete.h"
 #include "desktop/save_pdf/pdf_plotters.h"
 #include "desktop/searchweb.h"
@@ -241,7 +241,7 @@ nsgtk_init_glade(char **respath)
 	widWarning = GTK_WIDGET(gtk_builder_get_object(gladeWarning, "labelWarning"));
 }
 
-/* Documented in desktop/options.h */
+/* Documented in utils/nsoption.h */
 void gui_options_init_defaults(void)
 {
 	char *hdir = getenv("HOME");

gtk/hotlist.c

@@ -18,7 +18,7 @@
 
 
 #include "desktop/hotlist.h"
-#include "desktop/options.h"
+#include "utils/nsoption.h"
 #include "desktop/plotters.h"
 #include "desktop/tree.h"
 #include "gtk/gui.h"

gtk/plotters.c

@@ -37,7 +37,7 @@
 #include "gtk/plotters.h"
 #include "gtk/scaffolding.h"
 #include "render/font.h"
-#include "desktop/options.h"
+#include "utils/nsoption.h"
 #include "gtk/bitmap.h"
 
 GtkWidget *current_widget;

gtk/print.c

@@ -33,7 +33,7 @@
 
 #include "content/content.h"
 #include "content/hlcache.h"
-#include "desktop/options.h"
+#include "utils/nsoption.h"
 #include "desktop/plotters.h"
 #include "desktop/print.h"
 #include "desktop/printer.h"

gtk/scaffolding.c

@@ -37,7 +37,7 @@
 #include "desktop/hotlist.h"
 #include "desktop/gui.h"
 #include "desktop/netsurf.h"
-#include "desktop/options.h"
+#include "utils/nsoption.h"
 #include "desktop/plotters.h"
 #include "desktop/print.h"
 #include "desktop/save_complete.h"

gtk/system_colour.c

@@ -24,7 +24,7 @@
 #include "utils/utils.h"
 #include "utils/log.h"
 #include "desktop/gui.h"
-#include "desktop/options.h"
+#include "utils/nsoption.h"
 
 struct gui_system_colour_ctx {
 	const char *name;

gtk/tabs.c

@@ -24,7 +24,7 @@
 #include "gtk/gui.h"
 #include "desktop/browser.h"
 #include "content/content.h"
-#include "desktop/options.h"
+#include "utils/nsoption.h"
 #include "desktop/search.h"
 #include "utils/utils.h"
 #include "gtk/search.h"

gtk/theme.c

@@ -31,7 +31,7 @@
 #include "gtk/menu.h"
 #include "gtk/theme.h"
 #include "gtk/window.h"
-#include "desktop/options.h"
+#include "utils/nsoption.h"
 #include "gtk/dialogs/preferences.h"
 #include "utils/container.h"
 #include "utils/log.h"

gtk/window.c

@@ -30,7 +30,7 @@
 #include "gtk/window.h"
 #include "desktop/browser_private.h"
 #include "desktop/mouse.h"
-#include "desktop/options.h"
+#include "utils/nsoption.h"
 #include "desktop/searchweb.h"
 #include "desktop/textinput.h"
 #include "gtk/compat.h"

image/gif.c

@@ -37,7 +37,7 @@
 #include "utils/config.h"
 #include "content/content_protected.h"
 #include "content/hlcache.h"
-#include "desktop/options.h"
+#include "utils/nsoption.h"
 #include "desktop/plotters.h"
 #include "image/image.h"
 #include "image/bitmap.h"

image/mng.c

@@ -28,7 +28,7 @@
 #include <time.h>
 #include <libmng.h>
 #include "content/content_protected.h"
-#include "desktop/options.h"
+#include "utils/nsoption.h"
 #include "desktop/plotters.h"
 #include "image/bitmap.h"
 #include "image/mng.h"

javascript/jsapi/navigator.bnd

@@ -22,8 +22,8 @@ preamble %{
 #include <stdlib.h>
 
 #include "desktop/netsurf.h"
-#include "desktop/options.h"
 #include "utils/config.h"
+#include "utils/nsoption.h"
 #include "utils/useragent.h"
 #include "utils/log.h"
 #include "utils/utsname.h"

javascript/none.c

@@ -21,7 +21,7 @@
  */
 
 #include "content/content.h"
-#include "desktop/options.h"
+#include "utils/nsoption.h"
 
 #include "javascript/js.h"
 #include "utils/log.h"

monkey/font.c

@@ -18,7 +18,7 @@
 
 #include "css/css.h"
 #include "render/font.h"
-#include "desktop/options.h"
+#include "utils/nsoption.h"
 #include "utils/utf8.h"
 
 

monkey/main.c

@@ -21,7 +21,7 @@
 #include <stdlib.h>
 
 #include "monkey/filetype.h"
-#include "desktop/options.h"
+#include "utils/nsoption.h"
 #include "monkey/poll.h"
 #include "monkey/dispatch.h"
 #include "monkey/browser.h"
@@ -92,7 +92,7 @@ static void quit_handler(int argc, char **argv)
   netsurf_quit = true;
 }
 
-/* Documented in desktop/options.h */
+/* Documented in utils/nsoption.h */
 void gui_options_init_defaults(void)
 {
   /* Set defaults for absent option strings */

monkey/system_colour.c

@@ -24,7 +24,7 @@
 #include "utils/utils.h"
 #include "utils/log.h"
 #include "desktop/gui.h"
-#include "desktop/options.h"
+#include "utils/nsoption.h"
 
 struct gui_system_colour_ctx {
 	const char *name;