summaryrefslogtreecommitdiff
path: root/frontends
diff options
context:
space:
mode:
Diffstat (limited to 'frontends')
-rw-r--r--frontends/amiga/arexx.c2
-rw-r--r--frontends/amiga/clipboard.c2
-rw-r--r--frontends/amiga/ctxmenu.c2
-rw-r--r--frontends/amiga/download.c2
-rw-r--r--frontends/amiga/drag.h2
-rw-r--r--frontends/amiga/file.c2
-rw-r--r--frontends/amiga/font.c2
-rw-r--r--frontends/amiga/gui.c2
-rwxr-xr-xfrontends/amiga/gui_options.c2
-rwxr-xr-xfrontends/amiga/history_local.c2
-rw-r--r--frontends/amiga/menu.c2
-rwxr-xr-xfrontends/amiga/search.c2
-rw-r--r--frontends/amiga/tree.c2
-rw-r--r--frontends/atari/about.c2
-rw-r--r--frontends/atari/ctxmenu.c2
-rw-r--r--frontends/atari/deskmenu.c2
-rw-r--r--frontends/atari/download.c2
-rw-r--r--frontends/atari/gui.c2
-rw-r--r--frontends/atari/rootwin.c2
-rw-r--r--frontends/atari/search.c2
-rw-r--r--frontends/atari/toolbar.c2
-rw-r--r--frontends/beos/bitmap.cpp2
-rw-r--r--frontends/beos/gui.cpp2
-rw-r--r--frontends/beos/login.cpp2
-rw-r--r--frontends/beos/scaffolding.cpp2
-rw-r--r--frontends/beos/schedule.cpp2
-rw-r--r--frontends/beos/window.cpp2
-rw-r--r--frontends/cocoa/BookmarksController.m2
-rw-r--r--frontends/cocoa/BrowserView.m2
-rw-r--r--frontends/cocoa/BrowserViewController.m2
-rw-r--r--frontends/cocoa/BrowserWindowController.m2
-rw-r--r--frontends/cocoa/FormSelectMenu.m2
-rw-r--r--frontends/cocoa/NetSurfAppDelegate.m2
-rw-r--r--frontends/cocoa/PreferencesWindowController.m2
-rw-r--r--frontends/cocoa/SearchWindowController.m2
-rw-r--r--frontends/cocoa/bitmap.m2
-rw-r--r--frontends/cocoa/coordinates.h2
-rw-r--r--frontends/cocoa/gui.m2
-rw-r--r--frontends/cocoa/plotter.m2
-rw-r--r--frontends/framebuffer/clipboard.c2
-rw-r--r--frontends/framebuffer/fbtk/bitmap.c2
-rw-r--r--frontends/framebuffer/fbtk/event.c2
-rw-r--r--frontends/framebuffer/fbtk/fbtk.c2
-rw-r--r--frontends/framebuffer/fbtk/fill.c2
-rw-r--r--frontends/framebuffer/fbtk/osk.c2
-rw-r--r--frontends/framebuffer/fbtk/scroll.c2
-rw-r--r--frontends/framebuffer/fbtk/text.c2
-rw-r--r--frontends/framebuffer/fbtk/window.c2
-rw-r--r--frontends/framebuffer/font_freetype.c2
-rw-r--r--frontends/framebuffer/framebuffer.c2
-rw-r--r--frontends/framebuffer/gui.c2
-rw-r--r--frontends/gtk/about.c2
-rw-r--r--frontends/gtk/completion.c2
-rw-r--r--frontends/gtk/gui.c2
-rw-r--r--frontends/gtk/preferences.c2
-rw-r--r--frontends/gtk/scaffolding.c2
-rw-r--r--frontends/gtk/search.c2
-rw-r--r--frontends/gtk/selection.c2
-rw-r--r--frontends/gtk/tabs.c2
-rw-r--r--frontends/gtk/toolbar.c2
-rw-r--r--frontends/gtk/viewdata.c2
-rw-r--r--frontends/gtk/viewsource.c2
-rw-r--r--frontends/gtk/window.c2
-rw-r--r--frontends/monkey/browser.c2
-rw-r--r--frontends/riscos/401login.c1
-rw-r--r--frontends/riscos/dialog.c2
-rw-r--r--frontends/riscos/gui.c2
-rw-r--r--frontends/riscos/gui/url_bar.c2
-rw-r--r--frontends/riscos/iconbar.c7
-rw-r--r--frontends/riscos/menus.c1
-rw-r--r--frontends/riscos/print.c2
-rw-r--r--frontends/riscos/save.c2
-rw-r--r--frontends/riscos/search.c3
-rw-r--r--frontends/riscos/sslcert.c1
-rw-r--r--frontends/riscos/textarea.c1
-rw-r--r--frontends/riscos/textselection.c9
-rw-r--r--frontends/riscos/theme_install.c1
-rw-r--r--frontends/riscos/treeview.c1
-rw-r--r--frontends/riscos/uri.c7
-rw-r--r--frontends/riscos/url_complete.c7
-rw-r--r--frontends/riscos/url_protocol.c7
-rw-r--r--frontends/riscos/window.c2
-rw-r--r--frontends/windows/drawable.c2
-rw-r--r--frontends/windows/file.c2
-rw-r--r--frontends/windows/gui.c2
-rw-r--r--frontends/windows/main.c2
-rw-r--r--frontends/windows/pointers.c2
-rw-r--r--frontends/windows/window.c2
88 files changed, 100 insertions, 98 deletions
diff --git a/frontends/amiga/arexx.c b/frontends/amiga/arexx.c
index 38274f1ae..8436fdc55 100644
--- a/frontends/amiga/arexx.c
+++ b/frontends/amiga/arexx.c
@@ -34,7 +34,7 @@
#include "utils/nsoption.h"
#include "utils/nsurl.h"
#include "content/hlcache.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "netsurf/window.h"
#include "desktop/version.h"
diff --git a/frontends/amiga/clipboard.c b/frontends/amiga/clipboard.c
index 2322f0e87..2d8630726 100644
--- a/frontends/amiga/clipboard.c
+++ b/frontends/amiga/clipboard.c
@@ -31,7 +31,7 @@
#include "utils/utf8.h"
#include "utils/nsurl.h"
#include "content/hlcache.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "desktop/plotters.h"
#include "desktop/textinput.h"
#include "netsurf/window.h"
diff --git a/frontends/amiga/ctxmenu.c b/frontends/amiga/ctxmenu.c
index 5951a10ae..2b6691fde 100644
--- a/frontends/amiga/ctxmenu.c
+++ b/frontends/amiga/ctxmenu.c
@@ -41,7 +41,7 @@
#include "utils/nsoption.h"
#include "utils/nsurl.h"
#include "content/hlcache.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "desktop/browser_history.h"
#include "netsurf/mouse.h"
#include "desktop/searchweb.h"
diff --git a/frontends/amiga/download.c b/frontends/amiga/download.c
index b1526b994..fb020cee6 100644
--- a/frontends/amiga/download.c
+++ b/frontends/amiga/download.c
@@ -50,7 +50,7 @@
#include "utils/string.h"
#include "desktop/download.h"
#include "desktop/save_complete.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "netsurf/mouse.h"
#include "netsurf/window.h"
#include "netsurf/download.h"
diff --git a/frontends/amiga/drag.h b/frontends/amiga/drag.h
index b8ccec160..f8a165576 100644
--- a/frontends/amiga/drag.h
+++ b/frontends/amiga/drag.h
@@ -19,7 +19,7 @@
#ifndef AMIGA_DRAG_H
#define AMIGA_DRAG_H
#include <exec/types.h>
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "netsurf/window.h"
#define AMI_DRAG_THRESHOLD 10
diff --git a/frontends/amiga/file.c b/frontends/amiga/file.c
index 3b5d5410b..595a981f9 100644
--- a/frontends/amiga/file.c
+++ b/frontends/amiga/file.c
@@ -29,7 +29,7 @@
#include "content/hlcache.h"
#include "content/content.h"
#include "content/fetch.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "desktop/save_complete.h"
#include "desktop/save_pdf.h"
#include "desktop/save_text.h"
diff --git a/frontends/amiga/font.c b/frontends/amiga/font.c
index af62652e8..d3b9c321d 100644
--- a/frontends/amiga/font.c
+++ b/frontends/amiga/font.c
@@ -24,7 +24,7 @@
#include "utils/log.h"
#include "utils/nsoption.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "netsurf/layout.h"
#include "amiga/font.h"
diff --git a/frontends/amiga/gui.c b/frontends/amiga/gui.c
index ebc7f8721..3ccb2eb4b 100644
--- a/frontends/amiga/gui.c
+++ b/frontends/amiga/gui.c
@@ -102,7 +102,7 @@
#include "content/urldb.h"
#include "content/handlers/image/ico.h"
#include "desktop/browser_history.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "desktop/hotlist.h"
#include "netsurf/mouse.h"
#include "netsurf/netsurf.h"
diff --git a/frontends/amiga/gui_options.c b/frontends/amiga/gui_options.c
index f921b093a..d700eafeb 100755
--- a/frontends/amiga/gui_options.c
+++ b/frontends/amiga/gui_options.c
@@ -61,7 +61,7 @@
#include "utils/nsurl.h"
#include "utils/messages.h"
#include "utils/nsoption.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "desktop/searchweb.h"
#include "netsurf/window.h"
diff --git a/frontends/amiga/history_local.c b/frontends/amiga/history_local.c
index 3be097fa5..a1ada5b00 100755
--- a/frontends/amiga/history_local.c
+++ b/frontends/amiga/history_local.c
@@ -45,7 +45,7 @@
#include "utils/utils.h"
#include "utils/messages.h"
#include "desktop/browser_history.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "desktop/plotters.h"
#include "netsurf/window.h"
#include "graphics/rpattr.h"
diff --git a/frontends/amiga/menu.c b/frontends/amiga/menu.c
index 0743bc7ba..4fa5ba19f 100644
--- a/frontends/amiga/menu.c
+++ b/frontends/amiga/menu.c
@@ -49,7 +49,7 @@
#include "utils/nsurl.h"
#include "content/hlcache.h"
#include "desktop/hotlist.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "netsurf/mouse.h"
#include "netsurf/window.h"
#include "desktop/textinput.h"
diff --git a/frontends/amiga/search.c b/frontends/amiga/search.c
index 86a27cf41..aaf54b06d 100755
--- a/frontends/amiga/search.c
+++ b/frontends/amiga/search.c
@@ -48,7 +48,7 @@
#include "utils/messages.h"
#include "utils/utils.h"
#include "content/content.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "desktop/search.h"
#include "netsurf/mouse.h"
#include "netsurf/window.h"
diff --git a/frontends/amiga/tree.c b/frontends/amiga/tree.c
index 05c2fa7c5..52d5899c9 100644
--- a/frontends/amiga/tree.c
+++ b/frontends/amiga/tree.c
@@ -55,7 +55,7 @@
#include "utils/messages.h"
#include "content/urldb.h"
#include "content/llcache.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "desktop/cookie_manager.h"
#include "desktop/global_history.h"
#include "desktop/hotlist.h"
diff --git a/frontends/atari/about.c b/frontends/atari/about.c
index 105037aab..c541b0fb8 100644
--- a/frontends/atari/about.c
+++ b/frontends/atari/about.c
@@ -28,7 +28,7 @@
#include "utils/nsurl.h"
#include "utils/messages.h"
#include "desktop/version.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "curl/curlver.h"
diff --git a/frontends/atari/ctxmenu.c b/frontends/atari/ctxmenu.c
index 0343b20c7..e7420351e 100644
--- a/frontends/atari/ctxmenu.c
+++ b/frontends/atari/ctxmenu.c
@@ -19,7 +19,7 @@
#include "utils/log.h"
#include "utils/messages.h"
#include "utils/nsoption.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "desktop/textinput.h"
#include "content/hlcache.h"
diff --git a/frontends/atari/deskmenu.c b/frontends/atari/deskmenu.c
index 723835873..2bb65cf4a 100644
--- a/frontends/atari/deskmenu.c
+++ b/frontends/atari/deskmenu.c
@@ -23,7 +23,7 @@
#include "utils/nsurl.h"
#include "utils/messages.h"
#include "utils/nsoption.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "desktop/save_complete.h"
#include "desktop/textinput.h"
diff --git a/frontends/atari/download.c b/frontends/atari/download.c
index c763ed2de..ebe3cc4a0 100644
--- a/frontends/atari/download.c
+++ b/frontends/atari/download.c
@@ -35,7 +35,7 @@
#include "desktop/save_complete.h"
#include "desktop/textinput.h"
#include "desktop/download.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "netsurf/download.h"
#include "atari/gui.h"
diff --git a/frontends/atari/gui.c b/frontends/atari/gui.c
index 0e349ab7e..24caa7c51 100644
--- a/frontends/atari/gui.c
+++ b/frontends/atari/gui.c
@@ -34,7 +34,7 @@
#include "content/backing_store.h"
#include "content/hlcache.h"
#include "desktop/treeview.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "netsurf/layout.h"
#include "netsurf/window.h"
#include "netsurf/clipboard.h"
diff --git a/frontends/atari/rootwin.c b/frontends/atari/rootwin.c
index ca25a0751..5a5bdcc25 100644
--- a/frontends/atari/rootwin.c
+++ b/frontends/atari/rootwin.c
@@ -37,7 +37,7 @@
#include <mt_gem.h>
#include "utils/log.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "netsurf/mouse.h"
#include "desktop/plotters.h"
#include "desktop/textinput.h"
diff --git a/frontends/atari/search.c b/frontends/atari/search.c
index 11fd67e4b..4da7f16a3 100644
--- a/frontends/atari/search.c
+++ b/frontends/atari/search.c
@@ -27,7 +27,7 @@
#include "utils/log.h"
#include "utils/messages.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "desktop/search.h"
#include "netsurf/search.h"
diff --git a/frontends/atari/toolbar.c b/frontends/atari/toolbar.c
index d2182c5fa..2a5053847 100644
--- a/frontends/atari/toolbar.c
+++ b/frontends/atari/toolbar.c
@@ -32,7 +32,7 @@
#include "utils/nsurl.h"
#include "utils/utf8.h"
#include "desktop/browser_history.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "netsurf/mouse.h"
#include "desktop/plot_style.h"
#include "desktop/plotters.h"
diff --git a/frontends/beos/bitmap.cpp b/frontends/beos/bitmap.cpp
index c9c786a94..3287fd0f7 100644
--- a/frontends/beos/bitmap.cpp
+++ b/frontends/beos/bitmap.cpp
@@ -41,7 +41,7 @@ extern "C" {
#include "content/content.h"
#include "content/urldb.h"
#include "desktop/plotters.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "netsurf/bitmap.h"
}
diff --git a/frontends/beos/gui.cpp b/frontends/beos/gui.cpp
index 58b9f9b36..c52fa81f3 100644
--- a/frontends/beos/gui.cpp
+++ b/frontends/beos/gui.cpp
@@ -62,7 +62,7 @@ extern "C" {
#include "content/fetchers/resource.h"
#include "content/hlcache.h"
#include "content/urldb.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "netsurf/misc.h"
#include "netsurf/clipboard.h"
#include "netsurf/search.h"
diff --git a/frontends/beos/login.cpp b/frontends/beos/login.cpp
index de2370d33..ad09d86af 100644
--- a/frontends/beos/login.cpp
+++ b/frontends/beos/login.cpp
@@ -30,7 +30,7 @@ extern "C" {
#include "utils/log.h"
#include "content/content.h"
#include "content/urldb.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "utils/messages.h"
#include "utils/url.h"
#include "utils/utils.h"
diff --git a/frontends/beos/scaffolding.cpp b/frontends/beos/scaffolding.cpp
index 82ae2afde..75ef241f7 100644
--- a/frontends/beos/scaffolding.cpp
+++ b/frontends/beos/scaffolding.cpp
@@ -54,7 +54,7 @@
extern "C" {
#include "content/content.h"
#include "desktop/browser_history.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "netsurf/netsurf.h"
#include "desktop/version.h"
#include "desktop/searchweb.h"
diff --git a/frontends/beos/schedule.cpp b/frontends/beos/schedule.cpp
index a9da53501..171d74545 100644
--- a/frontends/beos/schedule.cpp
+++ b/frontends/beos/schedule.cpp
@@ -26,7 +26,7 @@ extern "C" {
#include "utils/errors.h"
#include "beos/schedule.h"
#include "content/content.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#ifdef DEBUG_BEOS_SCHEDULE
#include "utils/log.h"
diff --git a/frontends/beos/window.cpp b/frontends/beos/window.cpp
index 5e75a0256..4fd682365 100644
--- a/frontends/beos/window.cpp
+++ b/frontends/beos/window.cpp
@@ -29,7 +29,7 @@ extern "C" {
#include "utils/utils.h"
#include "content/content.h"
#include "content/urldb.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "netsurf/mouse.h"
#include "desktop/textinput.h"
#include "desktop/plotters.h"
diff --git a/frontends/cocoa/BookmarksController.m b/frontends/cocoa/BookmarksController.m
index 0bd51b273..e11cb3f84 100644
--- a/frontends/cocoa/BookmarksController.m
+++ b/frontends/cocoa/BookmarksController.m
@@ -18,7 +18,7 @@
#import "utils/messages.h"
#import "utils/utils.h"
-#import "desktop/browser.h"
+#import "netsurf/browser_window.h"
#import "desktop/hotlist.h"
#import "desktop/tree.h"
#import "content/hlcache.h"
diff --git a/frontends/cocoa/BrowserView.m b/frontends/cocoa/BrowserView.m
index fc50dbc64..5d82c8526 100644
--- a/frontends/cocoa/BrowserView.m
+++ b/frontends/cocoa/BrowserView.m
@@ -18,7 +18,7 @@
#import "utils/nsoption.h"
#import "utils/messages.h"
-#import "desktop/browser.h"
+#import "netsurf/browser_window.h"
#import "desktop/plotters.h"
#import "desktop/textinput.h"
#import "content/hlcache.h"
diff --git a/frontends/cocoa/BrowserViewController.m b/frontends/cocoa/BrowserViewController.m
index 5fa8b642d..354015194 100644
--- a/frontends/cocoa/BrowserViewController.m
+++ b/frontends/cocoa/BrowserViewController.m
@@ -23,7 +23,7 @@
#import "utils/messages.h"
#import "utils/url.h"
#import "desktop/browser_history.h"
-#import "desktop/browser.h"
+#import "netsurf/browser_window.h"
#import "desktop/textinput.h"
#import "content/hlcache.h"
diff --git a/frontends/cocoa/BrowserWindowController.m b/frontends/cocoa/BrowserWindowController.m
index bfb8be05e..aa7375a0e 100644
--- a/frontends/cocoa/BrowserWindowController.m
+++ b/frontends/cocoa/BrowserWindowController.m
@@ -16,7 +16,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#import "desktop/browser.h"
+#import "netsurf/browser_window.h"
#import "utils/nsoption.h"
#import "utils/messages.h"
#import "utils/utils.h"
diff --git a/frontends/cocoa/FormSelectMenu.m b/frontends/cocoa/FormSelectMenu.m
index 84e04cd25..b0ea0e62d 100644
--- a/frontends/cocoa/FormSelectMenu.m
+++ b/frontends/cocoa/FormSelectMenu.m
@@ -19,7 +19,7 @@
#import "cocoa/FormSelectMenu.h"
#import "cocoa/coordinates.h"
-#import "desktop/browser.h"
+#import "netsurf/browser_window.h"
#import "render/form.h"
static inline NSRect cocoa_rect_for_control( struct browser_window *bw, struct form_control *control)
diff --git a/frontends/cocoa/NetSurfAppDelegate.m b/frontends/cocoa/NetSurfAppDelegate.m
index f42856380..0939a1149 100644
--- a/frontends/cocoa/NetSurfAppDelegate.m
+++ b/frontends/cocoa/NetSurfAppDelegate.m
@@ -20,7 +20,7 @@
#import "utils/messages.h"
#import "utils/utils.h"
#import "utils/nsurl.h"
-#import "desktop/browser.h"
+#import "netsurf/browser_window.h"
#import "cocoa/gui.h"
#import "cocoa/NetSurfAppDelegate.h"
diff --git a/frontends/cocoa/PreferencesWindowController.m b/frontends/cocoa/PreferencesWindowController.m
index f314736e3..752218626 100644
--- a/frontends/cocoa/PreferencesWindowController.m
+++ b/frontends/cocoa/PreferencesWindowController.m
@@ -17,7 +17,7 @@
*/
#import "utils/nsoption.h"
-#import "desktop/browser.h"
+#import "netsurf/browser_window.h"
#import "content/content.h"
#import "content/hlcache.h"
diff --git a/frontends/cocoa/SearchWindowController.m b/frontends/cocoa/SearchWindowController.m
index d07fd0413..95372fc19 100644
--- a/frontends/cocoa/SearchWindowController.m
+++ b/frontends/cocoa/SearchWindowController.m
@@ -21,7 +21,7 @@
#import "cocoa/BrowserViewController.h"
#import "netsurf/search.h"
-#import "desktop/browser.h"
+#import "netsurf/browser_window.h"
#import "desktop/search.h"
static void cocoa_search_set_back( bool active, void *p );
diff --git a/frontends/cocoa/bitmap.m b/frontends/cocoa/bitmap.m
index 14394d087..f7c28f0ad 100644
--- a/frontends/cocoa/bitmap.m
+++ b/frontends/cocoa/bitmap.m
@@ -23,7 +23,7 @@
#import <Cocoa/Cocoa.h>
-#import "desktop/browser.h"
+#import "netsurf/browser_window.h"
#import "desktop/plotters.h"
#import "netsurf/bitmap.h"
#import "content/urldb.h"
diff --git a/frontends/cocoa/coordinates.h b/frontends/cocoa/coordinates.h
index a43db0b65..4bd92220f 100644
--- a/frontends/cocoa/coordinates.h
+++ b/frontends/cocoa/coordinates.h
@@ -20,7 +20,7 @@
#define COCOA_COORDINATES_H
#include "utils/utils.h"
-#import "desktop/browser.h"
+#import "netsurf/browser_window.h"
extern CGFloat cocoa_scale_factor;
diff --git a/frontends/cocoa/gui.m b/frontends/cocoa/gui.m
index 7f39459b6..310e196a3 100644
--- a/frontends/cocoa/gui.m
+++ b/frontends/cocoa/gui.m
@@ -24,7 +24,7 @@
#import "netsurf/mouse.h"
#import "netsurf/window.h"
#import "netsurf/misc.h"
-#import "desktop/browser.h"
+#import "netsurf/browser_window.h"
#import "desktop/textinput.h"
#import "content/handlers/image/ico.h"
#import "content/fetchers/resource.h"
diff --git a/frontends/cocoa/plotter.m b/frontends/cocoa/plotter.m
index dbc9460c4..472857dbe 100644
--- a/frontends/cocoa/plotter.m
+++ b/frontends/cocoa/plotter.m
@@ -20,7 +20,7 @@
#import "utils/log.h"
#import "utils/utils.h"
-#import "desktop/browser.h"
+#import "netsurf/browser_window.h"
#import "desktop/plotters.h"
#import "desktop/plot_style.h"
diff --git a/frontends/framebuffer/clipboard.c b/frontends/framebuffer/clipboard.c
index 1d41622cf..1254c36f3 100644
--- a/frontends/framebuffer/clipboard.c
+++ b/frontends/framebuffer/clipboard.c
@@ -26,7 +26,7 @@
#include <stdlib.h>
#include "utils/log.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "netsurf/clipboard.h"
#include "framebuffer/gui.h"
diff --git a/frontends/framebuffer/fbtk/bitmap.c b/frontends/framebuffer/fbtk/bitmap.c
index 1f147be00..759b626d9 100644
--- a/frontends/framebuffer/fbtk/bitmap.c
+++ b/frontends/framebuffer/fbtk/bitmap.c
@@ -24,7 +24,7 @@
#include <libnsfb.h>
#include <libnsfb_plot.h>
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "framebuffer/gui.h"
#include "framebuffer/fbtk.h"
diff --git a/frontends/framebuffer/fbtk/event.c b/frontends/framebuffer/fbtk/event.c
index c0894921e..dab035530 100644
--- a/frontends/framebuffer/fbtk/event.c
+++ b/frontends/framebuffer/fbtk/event.c
@@ -31,7 +31,7 @@
#include "utils/utils.h"
#include "utils/log.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "desktop/textinput.h"
#include "framebuffer/gui.h"
diff --git a/frontends/framebuffer/fbtk/fbtk.c b/frontends/framebuffer/fbtk/fbtk.c
index db1c1f1a9..fa861b11b 100644
--- a/frontends/framebuffer/fbtk/fbtk.c
+++ b/frontends/framebuffer/fbtk/fbtk.c
@@ -34,7 +34,7 @@
#include "utils/utils.h"
#include "utils/log.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "desktop/plotters.h"
#include "framebuffer/gui.h"
diff --git a/frontends/framebuffer/fbtk/fill.c b/frontends/framebuffer/fbtk/fill.c
index 07397b2df..9377933cc 100644
--- a/frontends/framebuffer/fbtk/fill.c
+++ b/frontends/framebuffer/fbtk/fill.c
@@ -24,7 +24,7 @@
#include <libnsfb.h>
#include <libnsfb_plot.h>
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "framebuffer/gui.h"
#include "framebuffer/fbtk.h"
diff --git a/frontends/framebuffer/fbtk/osk.c b/frontends/framebuffer/fbtk/osk.c
index 1d57f157f..628fe9abd 100644
--- a/frontends/framebuffer/fbtk/osk.c
+++ b/frontends/framebuffer/fbtk/osk.c
@@ -27,7 +27,7 @@
#include <libnsfb_cursor.h>
#include "utils/log.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "framebuffer/gui.h"
#include "framebuffer/fbtk.h"
diff --git a/frontends/framebuffer/fbtk/scroll.c b/frontends/framebuffer/fbtk/scroll.c
index c86c8a6de..cc98fb2dd 100644
--- a/frontends/framebuffer/fbtk/scroll.c
+++ b/frontends/framebuffer/fbtk/scroll.c
@@ -28,7 +28,7 @@
#include <libnsfb_cursor.h>
#include "utils/log.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "framebuffer/gui.h"
#include "framebuffer/fbtk.h"
diff --git a/frontends/framebuffer/fbtk/text.c b/frontends/framebuffer/fbtk/text.c
index 258e9dff9..703a10b99 100644
--- a/frontends/framebuffer/fbtk/text.c
+++ b/frontends/framebuffer/fbtk/text.c
@@ -28,7 +28,7 @@
#include <libnsfb_event.h>
#include "utils/log.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "desktop/plotters.h"
#include "framebuffer/gui.h"
diff --git a/frontends/framebuffer/fbtk/window.c b/frontends/framebuffer/fbtk/window.c
index 787dac720..b385e8e3f 100644
--- a/frontends/framebuffer/fbtk/window.c
+++ b/frontends/framebuffer/fbtk/window.c
@@ -24,7 +24,7 @@
#include <libnsfb.h>
#include <libnsfb_plot.h>
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "framebuffer/gui.h"
#include "framebuffer/fbtk.h"
diff --git a/frontends/framebuffer/font_freetype.c b/frontends/framebuffer/font_freetype.c
index bf96cab50..9235ad476 100644
--- a/frontends/framebuffer/font_freetype.c
+++ b/frontends/framebuffer/font_freetype.c
@@ -29,7 +29,7 @@
#include "utils/nsoption.h"
#include "netsurf/utf8.h"
#include "netsurf/layout.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "framebuffer/gui.h"
#include "framebuffer/font.h"
diff --git a/frontends/framebuffer/framebuffer.c b/frontends/framebuffer/framebuffer.c
index 16e9dd736..00bd6a15a 100644
--- a/frontends/framebuffer/framebuffer.c
+++ b/frontends/framebuffer/framebuffer.c
@@ -31,7 +31,7 @@
#include "utils/utils.h"
#include "utils/log.h"
#include "utils/utf8.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "desktop/plotters.h"
#include "netsurf/bitmap.h"
diff --git a/frontends/framebuffer/gui.c b/frontends/framebuffer/gui.c
index 6313481c3..7559648d5 100644
--- a/frontends/framebuffer/gui.c
+++ b/frontends/framebuffer/gui.c
@@ -34,7 +34,7 @@
#include "utils/filepath.h"
#include "utils/log.h"
#include "utils/messages.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "desktop/textinput.h"
#include "desktop/browser_history.h"
#include "desktop/plotters.h"
diff --git a/frontends/gtk/about.c b/frontends/gtk/about.c
index d57afea7f..f003faf32 100644
--- a/frontends/gtk/about.c
+++ b/frontends/gtk/about.c
@@ -28,7 +28,7 @@
#include "utils/messages.h"
#include "utils/nsoption.h"
#include "utils/nsurl.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "desktop/version.h"
#include "gtk/warn.h"
diff --git a/frontends/gtk/completion.c b/frontends/gtk/completion.c
index 8444c8333..9b76411b6 100644
--- a/frontends/gtk/completion.c
+++ b/frontends/gtk/completion.c
@@ -28,7 +28,7 @@
#include "utils/nsoption.h"
#include "content/urldb.h"
#include "desktop/searchweb.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "gtk/warn.h"
#include "gtk/scaffolding.h"
diff --git a/frontends/gtk/gui.c b/frontends/gtk/gui.c
index 120142420..27b73b175 100644
--- a/frontends/gtk/gui.c
+++ b/frontends/gtk/gui.c
@@ -42,7 +42,7 @@
#include "content/hlcache.h"
#include "content/urldb.h"
#include "content/backing_store.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "desktop/save_complete.h"
#include "desktop/save_pdf.h"
#include "desktop/searchweb.h"
diff --git a/frontends/gtk/preferences.c b/frontends/gtk/preferences.c
index 3efb9eddd..e51e77014 100644
--- a/frontends/gtk/preferences.c
+++ b/frontends/gtk/preferences.c
@@ -26,7 +26,7 @@
#include "utils/file.h"
#include "utils/log.h"
#include "utils/nsurl.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "desktop/searchweb.h"
#include "gtk/compat.h"
diff --git a/frontends/gtk/scaffolding.c b/frontends/gtk/scaffolding.c
index 777256703..6873b8997 100644
--- a/frontends/gtk/scaffolding.c
+++ b/frontends/gtk/scaffolding.c
@@ -34,7 +34,7 @@
#include "utils/nsoption.h"
#include "utils/file.h"
#include "desktop/browser_history.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "desktop/hotlist.h"
#include "desktop/plotters.h"
#include "desktop/print.h"
diff --git a/frontends/gtk/search.c b/frontends/gtk/search.c
index 1124c6816..2c73814e3 100644
--- a/frontends/gtk/search.c
+++ b/frontends/gtk/search.c
@@ -30,7 +30,7 @@
#include "utils/messages.h"
#include "content/content.h"
#include "content/hlcache.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "desktop/search.h"
#include "desktop/searchweb.h"
#include "netsurf/search.h"
diff --git a/frontends/gtk/selection.c b/frontends/gtk/selection.c
index ae44e7803..228d65dbe 100644
--- a/frontends/gtk/selection.c
+++ b/frontends/gtk/selection.c
@@ -21,7 +21,7 @@
#include <stdlib.h>
#include "utils/log.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "netsurf/clipboard.h"
#include "gtk/window.h"
diff --git a/frontends/gtk/tabs.c b/frontends/gtk/tabs.c
index e8be7eea1..56a1ed6a5 100644
--- a/frontends/gtk/tabs.c
+++ b/frontends/gtk/tabs.c
@@ -21,7 +21,7 @@
#include "utils/nsoption.h"
#include "utils/messages.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "content/content.h"
#include "desktop/search.h"
diff --git a/frontends/gtk/toolbar.c b/frontends/gtk/toolbar.c
index b7bf07f88..6866f008a 100644
--- a/frontends/gtk/toolbar.c
+++ b/frontends/gtk/toolbar.c
@@ -21,7 +21,7 @@
#include <unistd.h>
#include <gtk/gtk.h>
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "desktop/searchweb.h"
#include "utils/log.h"
#include "utils/messages.h"
diff --git a/frontends/gtk/viewdata.c b/frontends/gtk/viewdata.c
index 55b25467e..90a2366e9 100644
--- a/frontends/gtk/viewdata.c
+++ b/frontends/gtk/viewdata.c
@@ -41,7 +41,7 @@
#include "utils/file.h"
#include "utils/filepath.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "content/hlcache.h"
#include "content/content.h"
diff --git a/frontends/gtk/viewsource.c b/frontends/gtk/viewsource.c
index 554cfbf39..b0907a3a5 100644
--- a/frontends/gtk/viewsource.c
+++ b/frontends/gtk/viewsource.c
@@ -23,7 +23,7 @@
#include "utils/utf8.h"
#include "utils/nsurl.h"
#include "utils/messages.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "content/content.h"
#include "gtk/viewdata.h"
diff --git a/frontends/gtk/window.c b/frontends/gtk/window.c
index 5c5d682ee..7cff9ee6b 100644
--- a/frontends/gtk/window.c
+++ b/frontends/gtk/window.c
@@ -39,7 +39,7 @@
#include "content/hlcache.h"
#include "gtk/window.h"
#include "gtk/selection.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "netsurf/mouse.h"
#include "desktop/searchweb.h"
#include "desktop/textinput.h"
diff --git a/frontends/monkey/browser.c b/frontends/monkey/browser.c
index 638dcdb26..5c1d15723 100644
--- a/frontends/monkey/browser.c
+++ b/frontends/monkey/browser.c
@@ -27,7 +27,7 @@
#include "utils/messages.h"
#include "netsurf/mouse.h"
#include "netsurf/window.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "desktop/plotters.h"
#include "content/hlcache.h"
diff --git a/frontends/riscos/401login.c b/frontends/riscos/401login.c
index e95a74809..476d631a2 100644
--- a/frontends/riscos/401login.c
+++ b/frontends/riscos/401login.c
@@ -28,7 +28,6 @@
#include "content/content.h"
#include "content/hlcache.h"
#include "content/urldb.h"
-#include "desktop/browser.h"
#include "riscos/gui.h"
#include "riscos/dialog.h"
diff --git a/frontends/riscos/dialog.c b/frontends/riscos/dialog.c
index d4356086d..2b258bbca 100644
--- a/frontends/riscos/dialog.c
+++ b/frontends/riscos/dialog.c
@@ -39,7 +39,7 @@
#include "utils/messages.h"
#include "utils/nsurl.h"
#include "desktop/version.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "riscos/configure.h"
#include "riscos/cookies.h"
diff --git a/frontends/riscos/gui.c b/frontends/riscos/gui.c
index 531b81694..e0e8e4e3b 100644
--- a/frontends/riscos/gui.c
+++ b/frontends/riscos/gui.c
@@ -52,7 +52,7 @@
#include "desktop/save_complete.h"
#include "desktop/treeview.h"
#include "netsurf/netsurf.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "content/urldb.h"
#include "content/hlcache.h"
#include "content/backing_store.h"
diff --git a/frontends/riscos/gui/url_bar.c b/frontends/riscos/gui/url_bar.c
index 053014784..37c4de111 100644
--- a/frontends/riscos/gui/url_bar.c
+++ b/frontends/riscos/gui/url_bar.c
@@ -37,7 +37,7 @@
#include "utils/utils.h"
#include "content/hlcache.h"
#include "content/content.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "desktop/plotters.h"
#include "riscos/gui.h"
diff --git a/frontends/riscos/iconbar.c b/frontends/riscos/iconbar.c
index 9cff116a1..8582a4539 100644
--- a/frontends/riscos/iconbar.c
+++ b/frontends/riscos/iconbar.c
@@ -16,8 +16,9 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-/** \file
- * Iconbar icon and menus (implementation).
+/**
+ * \file
+ * Iconbar icon and menus implementation.
*/
#include <assert.h>
@@ -36,7 +37,7 @@
#include "utils/log.h"
#include "utils/messages.h"
#include "utils/nsurl.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "riscos/gui.h"
#include "riscos/configure.h"
diff --git a/frontends/riscos/menus.c b/frontends/riscos/menus.c
index 37285c9d1..0b1ac1a2b 100644
--- a/frontends/riscos/menus.c
+++ b/frontends/riscos/menus.c
@@ -40,7 +40,6 @@
#include "content/hlcache.h"
#include "content/urldb.h"
#include "desktop/cookie_manager.h"
-#include "desktop/browser.h"
#include "desktop/textinput.h"
#include "riscos/dialog.h"
diff --git a/frontends/riscos/print.c b/frontends/riscos/print.c
index 95730d6be..26b50f65f 100644
--- a/frontends/riscos/print.c
+++ b/frontends/riscos/print.c
@@ -38,7 +38,7 @@
#include "utils/nsoption.h"
#include "content/content.h"
#include "content/hlcache.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "desktop/plotters.h"
#include "riscos/gui.h"
diff --git a/frontends/riscos/save.c b/frontends/riscos/save.c
index 6eab31533..325dbbb79 100644
--- a/frontends/riscos/save.c
+++ b/frontends/riscos/save.c
@@ -42,7 +42,7 @@
#include "utils/utf8.h"
#include "content/content.h"
#include "content/hlcache.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "desktop/hotlist.h"
#include "desktop/global_history.h"
#include "desktop/version.h"
diff --git a/frontends/riscos/search.c b/frontends/riscos/search.c
index 2e869bb43..544630e2e 100644
--- a/frontends/riscos/search.c
+++ b/frontends/riscos/search.c
@@ -33,9 +33,8 @@
#include "utils/messages.h"
#include "content/content.h"
#include "content/hlcache.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "netsurf/search.h"
-#include "desktop/browser.h"
#include "desktop/search.h"
#include "riscos/gui.h"
diff --git a/frontends/riscos/sslcert.c b/frontends/riscos/sslcert.c
index 9e43f2db1..7ab909dfa 100644
--- a/frontends/riscos/sslcert.c
+++ b/frontends/riscos/sslcert.c
@@ -34,7 +34,6 @@
#include "content/hlcache.h"
#include "content/fetch.h"
#include "content/urldb.h"
-#include "desktop/browser.h"
#include "desktop/sslcert_viewer.h"
#include "desktop/tree.h"
diff --git a/frontends/riscos/textarea.c b/frontends/riscos/textarea.c
index ecf3e0c3d..d9872927c 100644
--- a/frontends/riscos/textarea.c
+++ b/frontends/riscos/textarea.c
@@ -33,7 +33,6 @@
#include "utils/log.h"
#include "utils/utf8.h"
-#include "desktop/browser.h"
#include "riscos/gui.h"
#include "riscos/oslib_pre7.h"
diff --git a/frontends/riscos/textselection.c b/frontends/riscos/textselection.c
index 81ccc3a68..81274484a 100644
--- a/frontends/riscos/textselection.c
+++ b/frontends/riscos/textselection.c
@@ -16,9 +16,10 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-/** \file
- * Text selection code (platform-dependent implementation)
- */
+/**
+ * \file
+ * RISC OS text selection implementation.
+ */
#include <assert.h>
#include <stdio.h>
@@ -34,7 +35,7 @@
#include "netsurf/clipboard.h"
#include "netsurf/window.h"
#include "desktop/textinput.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "riscos/gui.h"
#include "riscos/menus.h"
diff --git a/frontends/riscos/theme_install.c b/frontends/riscos/theme_install.c
index 5c11ffb83..3448e742f 100644
--- a/frontends/riscos/theme_install.c
+++ b/frontends/riscos/theme_install.c
@@ -30,7 +30,6 @@
#include "utils/messages.h"
#include "content/content.h"
#include "content/hlcache.h"
-#include "desktop/browser.h"
#include "desktop/theme.h"
#include "riscos/dialog.h"
diff --git a/frontends/riscos/treeview.c b/frontends/riscos/treeview.c
index 3428ad3d4..83f60660f 100644
--- a/frontends/riscos/treeview.c
+++ b/frontends/riscos/treeview.c
@@ -40,7 +40,6 @@
#include "utils/messages.h"
#include "utils/utils.h"
#include "content/urldb.h"
-#include "desktop/browser.h"
#include "desktop/plotters.h"
#include "desktop/textinput.h"
#include "desktop/tree.h"
diff --git a/frontends/riscos/uri.c b/frontends/riscos/uri.c
index 9c384c9c0..a2f126b31 100644
--- a/frontends/riscos/uri.c
+++ b/frontends/riscos/uri.c
@@ -16,6 +16,11 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+/**
+ * \file
+ * RISC OS URI message handling implementation.
+ */
+
#include "utils/config.h"
#include <stdbool.h>
@@ -29,7 +34,7 @@
#include "utils/messages.h"
#include "utils/nsurl.h"
#include "content/fetch.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "riscos/gui.h"
#include "riscos/uri.h"
diff --git a/frontends/riscos/url_complete.c b/frontends/riscos/url_complete.c
index 3cf7f9228..eebb76443 100644
--- a/frontends/riscos/url_complete.c
+++ b/frontends/riscos/url_complete.c
@@ -16,8 +16,9 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-/** \file
- * GUI URL auto-completion (implementation).
+/**
+ * \file
+ * GUI URL auto-completion implementation.
*/
#include <assert.h>
@@ -30,7 +31,7 @@
#include "utils/log.h"
#include "utils/nsoption.h"
#include "content/urldb.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "riscos/global_history.h"
#include "riscos/gui.h"
diff --git a/frontends/riscos/url_protocol.c b/frontends/riscos/url_protocol.c
index 2b9ef3556..9a7ae062c 100644
--- a/frontends/riscos/url_protocol.c
+++ b/frontends/riscos/url_protocol.c
@@ -18,8 +18,9 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-/** \file
- * ANT URL launching protocol (implementation).
+/**
+ * \file
+ * ANT URL launching protocol implementation.
*
* See http://www.vigay.com/inet/inet_url.html
*/
@@ -38,7 +39,7 @@
#include "utils/nsurl.h"
#include "utils/config.h"
#include "content/fetch.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "riscos/gui.h"
#include "riscos/uri.h"
diff --git a/frontends/riscos/window.c b/frontends/riscos/window.c
index 2e012da99..1fc6edfbf 100644
--- a/frontends/riscos/window.c
+++ b/frontends/riscos/window.c
@@ -56,7 +56,7 @@
#include "content/hlcache.h"
#include "content/urldb.h"
#include "desktop/browser_history.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "desktop/cookie_manager.h"
#include "desktop/scrollbar.h"
#include "desktop/frames.h"
diff --git a/frontends/windows/drawable.c b/frontends/windows/drawable.c
index 4480eeaaa..9c26d8e9b 100644
--- a/frontends/windows/drawable.c
+++ b/frontends/windows/drawable.c
@@ -23,7 +23,7 @@
#include <windows.h>
#include <windowsx.h>
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "desktop/textinput.h"
#include "desktop/plotters.h"
#include "utils/errors.h"
diff --git a/frontends/windows/file.c b/frontends/windows/file.c
index e9eb9caf9..5c5b1f061 100644
--- a/frontends/windows/file.c
+++ b/frontends/windows/file.c
@@ -35,7 +35,7 @@
#include "utils/url.h"
#include "utils/file.h"
#include "utils/string.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "windows/file.h"
diff --git a/frontends/windows/gui.c b/frontends/windows/gui.c
index cb75cdfc4..0ab1e32ee 100644
--- a/frontends/windows/gui.c
+++ b/frontends/windows/gui.c
@@ -31,7 +31,7 @@
#include "utils/url.h"
#include "utils/file.h"
#include "utils/messages.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "netsurf/clipboard.h"
#include "windows/schedule.h"
diff --git a/frontends/windows/main.c b/frontends/windows/main.c
index c410de90b..49aa431a8 100644
--- a/frontends/windows/main.c
+++ b/frontends/windows/main.c
@@ -30,7 +30,7 @@
#include "utils/file.h"
#include "utils/nsurl.h"
#include "utils/nsoption.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "netsurf/fetch.h"
#include "netsurf/misc.h"
#include "netsurf/netsurf.h"
diff --git a/frontends/windows/pointers.c b/frontends/windows/pointers.c
index abb4fe760..b796a30ec 100644
--- a/frontends/windows/pointers.c
+++ b/frontends/windows/pointers.c
@@ -29,7 +29,7 @@
#include "utils/corestrings.h"
#include "utils/url.h"
#include "utils/file.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "netsurf/clipboard.h"
#include "windows/schedule.h"
diff --git a/frontends/windows/window.c b/frontends/windows/window.c
index afc741ff1..bbe0e96f0 100644
--- a/frontends/windows/window.c
+++ b/frontends/windows/window.c
@@ -30,7 +30,7 @@
#include "utils/nsurl.h"
#include "utils/messages.h"
#include "content/content.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
#include "netsurf/window.h"
#include "desktop/browser_history.h"
#include "desktop/textinput.h"