summaryrefslogtreecommitdiff
path: root/frontends/amiga
diff options
context:
space:
mode:
Diffstat (limited to 'frontends/amiga')
-rw-r--r--frontends/amiga/arexx.c6
-rw-r--r--frontends/amiga/bitmap.c4
-rw-r--r--frontends/amiga/clipboard.c10
-rwxr-xr-xfrontends/amiga/cookies.c6
-rwxr-xr-xfrontends/amiga/cookies.h2
-rw-r--r--frontends/amiga/ctxmenu.c10
-rw-r--r--frontends/amiga/download.c12
-rw-r--r--frontends/amiga/drag.c2
-rw-r--r--frontends/amiga/drag.h4
-rw-r--r--frontends/amiga/dt_anim.c2
-rw-r--r--frontends/amiga/dt_picture.c2
-rw-r--r--frontends/amiga/dt_sound.c4
-rw-r--r--frontends/amiga/file.c10
-rw-r--r--frontends/amiga/font.c4
-rwxr-xr-xfrontends/amiga/font.h2
-rw-r--r--frontends/amiga/font_diskfont.c2
-rw-r--r--frontends/amiga/font_scan.c4
-rw-r--r--frontends/amiga/gui.c28
-rw-r--r--frontends/amiga/gui.h2
-rwxr-xr-xfrontends/amiga/gui_options.c6
-rwxr-xr-xfrontends/amiga/history.c4
-rwxr-xr-xfrontends/amiga/history.h2
-rwxr-xr-xfrontends/amiga/history_local.c8
-rwxr-xr-xfrontends/amiga/hotlist.c6
-rwxr-xr-xfrontends/amiga/hotlist.h2
-rw-r--r--frontends/amiga/icon.c4
-rwxr-xr-xfrontends/amiga/login.c4
-rw-r--r--frontends/amiga/menu.c12
-rwxr-xr-xfrontends/amiga/misc.c2
-rw-r--r--frontends/amiga/plotters.c4
-rw-r--r--frontends/amiga/plotters.h2
-rw-r--r--frontends/amiga/plugin_hack.c2
-rw-r--r--frontends/amiga/print.c8
-rw-r--r--frontends/amiga/save_pdf.c6
-rwxr-xr-xfrontends/amiga/search.c10
-rw-r--r--frontends/amiga/selectmenu.c4
-rw-r--r--frontends/amiga/sslcert.c6
-rw-r--r--frontends/amiga/theme.c6
-rw-r--r--frontends/amiga/tree.c12
-rwxr-xr-xfrontends/amiga/tree.h2
-rwxr-xr-xfrontends/amiga/utf8.c2
-rw-r--r--frontends/amiga/version.c2
42 files changed, 116 insertions, 116 deletions
diff --git a/frontends/amiga/arexx.c b/frontends/amiga/arexx.c
index 412fc4056..adfb77b87 100644
--- a/frontends/amiga/arexx.c
+++ b/frontends/amiga/arexx.c
@@ -29,9 +29,9 @@
#include <gadgets/clicktab.h>
#include <reaction/reaction_macros.h>
-#include "desktop/browser.h"
-#include "desktop/gui_window.h"
-#include "desktop/version.h"
+#include "core/browser/browser.h"
+#include "core/api/window.h"
+#include "core/browser/version.h"
#include "utils/log.h"
#include "utils/nsoption.h"
diff --git a/frontends/amiga/bitmap.c b/frontends/amiga/bitmap.c
index 28c229b06..1699747bf 100644
--- a/frontends/amiga/bitmap.c
+++ b/frontends/amiga/bitmap.c
@@ -36,8 +36,8 @@
#include "utils/nsoption.h"
#include "utils/messages.h"
-#include "desktop/mouse.h"
-#include "desktop/gui_window.h"
+#include "core/browser/mouse.h"
+#include "core/api/window.h"
#include "image/bitmap.h"
#include "amiga/gui.h"
diff --git a/frontends/amiga/clipboard.c b/frontends/amiga/clipboard.c
index 92bf4df66..8f0cbc102 100644
--- a/frontends/amiga/clipboard.c
+++ b/frontends/amiga/clipboard.c
@@ -28,11 +28,11 @@
#include "utils/nsoption.h"
#include "utils/utf8.h"
-#include "desktop/browser.h"
-#include "desktop/plotters.h"
-#include "desktop/textinput.h"
-#include "desktop/gui_window.h"
-#include "desktop/gui_clipboard.h"
+#include "core/browser/browser.h"
+#include "core/browser/plotters.h"
+#include "core/browser/textinput.h"
+#include "core/api/window.h"
+#include "core/api/clipboard.h"
#include "amiga/bitmap.h"
#include "amiga/clipboard.h"
diff --git a/frontends/amiga/cookies.c b/frontends/amiga/cookies.c
index 0ca17413e..7d95524c1 100755
--- a/frontends/amiga/cookies.c
+++ b/frontends/amiga/cookies.c
@@ -18,9 +18,9 @@
#include <proto/exec.h>
-#include "desktop/cookie_manager.h"
-#include "desktop/mouse.h"
-#include "desktop/gui_window.h"
+#include "core/widgets/cookie_manager.h"
+#include "core/browser/mouse.h"
+#include "core/api/window.h"
#include "amiga/cookies.h"
#include "amiga/tree.h"
diff --git a/frontends/amiga/cookies.h b/frontends/amiga/cookies.h
index d6922750c..b3d915e71 100755
--- a/frontends/amiga/cookies.h
+++ b/frontends/amiga/cookies.h
@@ -18,7 +18,7 @@
#ifndef AMIGA_COOKIES_H
#define AMIGA_COOKIES_H
-#include "desktop/tree.h"
+#include "core/widgets/tree.h"
#include "amiga/tree.h"
void ami_cookies_initialise(void);
diff --git a/frontends/amiga/ctxmenu.c b/frontends/amiga/ctxmenu.c
index 8d49d4f15..848ecc6a4 100644
--- a/frontends/amiga/ctxmenu.c
+++ b/frontends/amiga/ctxmenu.c
@@ -44,11 +44,11 @@
#include "amiga/theme.h"
#include "amiga/utf8.h"
-#include "desktop/browser.h"
-#include "desktop/browser_history.h"
-#include "desktop/mouse.h"
-#include "desktop/searchweb.h"
-#include "desktop/textinput.h"
+#include "core/browser/browser.h"
+#include "core/browser/browser_history.h"
+#include "core/browser/mouse.h"
+#include "core/browser/searchweb.h"
+#include "core/browser/textinput.h"
#include "utils/log.h"
#include "utils/messages.h"
diff --git a/frontends/amiga/download.c b/frontends/amiga/download.c
index faa71dbc8..cf161ca04 100644
--- a/frontends/amiga/download.c
+++ b/frontends/amiga/download.c
@@ -46,12 +46,12 @@
#include "utils/messages.h"
#include "utils/utils.h"
#include "utils/nsoption.h"
-#include "desktop/download.h"
-#include "desktop/save_complete.h"
-#include "desktop/browser.h"
-#include "desktop/mouse.h"
-#include "desktop/gui_window.h"
-#include "desktop/gui_download.h"
+#include "core/browser/download.h"
+#include "core/browser/save_complete.h"
+#include "core/browser/browser.h"
+#include "core/browser/mouse.h"
+#include "core/api/window.h"
+#include "core/api/download.h"
#include "image/ico.h"
#include "amiga/gui.h"
diff --git a/frontends/amiga/drag.c b/frontends/amiga/drag.c
index 67d17223e..a34292c85 100644
--- a/frontends/amiga/drag.c
+++ b/frontends/amiga/drag.c
@@ -35,7 +35,7 @@
#include "utils/utils.h"
#include "utils/nsoption.h"
#include "content/hlcache.h"
-#include "desktop/mouse.h"
+#include "core/browser/mouse.h"
#include "amiga/bitmap.h"
#include "amiga/clipboard.h"
diff --git a/frontends/amiga/drag.h b/frontends/amiga/drag.h
index 59a1a8467..2cfcc4199 100644
--- a/frontends/amiga/drag.h
+++ b/frontends/amiga/drag.h
@@ -19,8 +19,8 @@
#ifndef AMIGA_DRAG_H
#define AMIGA_DRAG_H
#include <exec/types.h>
-#include "desktop/browser.h"
-#include "desktop/gui_window.h"
+#include "core/browser/browser.h"
+#include "core/api/window.h"
#define AMI_DRAG_THRESHOLD 10
diff --git a/frontends/amiga/dt_anim.c b/frontends/amiga/dt_anim.c
index d6f1f3652..f3b2b2c72 100644
--- a/frontends/amiga/dt_anim.c
+++ b/frontends/amiga/dt_anim.c
@@ -37,7 +37,7 @@
#include "utils/log.h"
#include "utils/messages.h"
#include "content/content_protected.h"
-#include "desktop/plotters.h"
+#include "core/browser/plotters.h"
#include "image/bitmap.h"
#include "amiga/bitmap.h"
diff --git a/frontends/amiga/dt_picture.c b/frontends/amiga/dt_picture.c
index b3dbb3481..8f1955270 100644
--- a/frontends/amiga/dt_picture.c
+++ b/frontends/amiga/dt_picture.c
@@ -33,7 +33,7 @@
#include "utils/log.h"
#include "utils/messages.h"
#include "content/content_protected.h"
-#include "desktop/plotters.h"
+#include "core/browser/plotters.h"
#include "image/bitmap.h"
#include "image/image_cache.h"
diff --git a/frontends/amiga/dt_sound.c b/frontends/amiga/dt_sound.c
index 6c49f0960..e3ae4d94c 100644
--- a/frontends/amiga/dt_sound.c
+++ b/frontends/amiga/dt_sound.c
@@ -26,8 +26,8 @@
#include "amiga/filetype.h"
#include "amiga/datatypes.h"
#include "content/content_protected.h"
-#include "desktop/plotters.h"
-#include "render/box.h"
+#include "core/browser/plotters.h"
+#include "core/html/box.h"
#include "utils/log.h"
#include "utils/messages.h"
diff --git a/frontends/amiga/file.c b/frontends/amiga/file.c
index 8e81b9c28..bcbe79c1a 100644
--- a/frontends/amiga/file.c
+++ b/frontends/amiga/file.c
@@ -27,11 +27,11 @@
#include "utils/messages.h"
#include "content/content.h"
#include "content/fetch.h"
-#include "desktop/browser.h"
-#include "desktop/save_complete.h"
-#include "desktop/save_pdf.h"
-#include "desktop/save_text.h"
-#include "desktop/gui_window.h"
+#include "core/browser/browser.h"
+#include "core/browser/save_complete.h"
+#include "core/browser/save_pdf.h"
+#include "core/browser/save_text.h"
+#include "core/api/window.h"
#include "amiga/gui.h"
#include "amiga/bitmap.h"
diff --git a/frontends/amiga/font.c b/frontends/amiga/font.c
index 39cb38602..c09dcca17 100644
--- a/frontends/amiga/font.c
+++ b/frontends/amiga/font.c
@@ -24,8 +24,8 @@
#include "utils/log.h"
#include "utils/nsoption.h"
-#include "desktop/browser.h"
-#include "desktop/font.h"
+#include "core/browser/browser.h"
+#include "core/browser/font.h"
#include "amiga/font.h"
#include "amiga/font_bullet.h"
diff --git a/frontends/amiga/font.h b/frontends/amiga/font.h
index da23b5989..1093a2d66 100755
--- a/frontends/amiga/font.h
+++ b/frontends/amiga/font.h
@@ -19,7 +19,7 @@
#ifndef AMIGA_FONT_H
#define AMIGA_FONT_H
-#include "desktop/plotters.h"
+#include "core/browser/plotters.h"
#include <graphics/rastport.h>
#include <graphics/text.h>
diff --git a/frontends/amiga/font_diskfont.c b/frontends/amiga/font_diskfont.c
index 20b69856b..205b8e36c 100644
--- a/frontends/amiga/font_diskfont.c
+++ b/frontends/amiga/font_diskfont.c
@@ -28,7 +28,7 @@
#include "utils/log.h"
#include "utils/utf8.h"
#include "utils/nsoption.h"
-#include "desktop/font.h"
+#include "core/browser/font.h"
#include "amiga/font.h"
#include "amiga/font_diskfont.h"
diff --git a/frontends/amiga/font_scan.c b/frontends/amiga/font_scan.c
index b65798d6e..8780c3180 100644
--- a/frontends/amiga/font_scan.c
+++ b/frontends/amiga/font_scan.c
@@ -48,8 +48,8 @@
#include "utils/nsoption.h"
#include "utils/log.h"
#include "utils/messages.h"
-#include "desktop/mouse.h"
-#include "desktop/gui_window.h"
+#include "core/browser/mouse.h"
+#include "core/api/window.h"
#include "amiga/font_scan.h"
#include "amiga/gui.h"
diff --git a/frontends/amiga/gui.c b/frontends/amiga/gui.c
index 3d1a87413..13ffa6ccf 100644
--- a/frontends/amiga/gui.c
+++ b/frontends/amiga/gui.c
@@ -100,20 +100,20 @@
#include "content/fetchers/resource.h"
#include "content/urldb.h"
#include "image/ico.h"
-#include "desktop/browser_history.h"
-#include "desktop/browser.h"
-#include "desktop/hotlist.h"
-#include "desktop/mouse.h"
-#include "desktop/netsurf.h"
-#include "desktop/version.h"
-#include "desktop/save_complete.h"
-#include "desktop/scrollbar.h"
-#include "desktop/searchweb.h"
-#include "desktop/textinput.h"
-#include "desktop/tree.h"
-#include "desktop/gui_window.h"
-#include "desktop/gui_fetch.h"
-#include "desktop/gui_misc.h"
+#include "core/browser/browser_history.h"
+#include "core/browser/browser.h"
+#include "core/widgets/hotlist.h"
+#include "core/browser/mouse.h"
+#include "core/api/netsurf.h"
+#include "core/browser/version.h"
+#include "core/browser/save_complete.h"
+#include "core/browser/scrollbar.h"
+#include "core/browser/searchweb.h"
+#include "core/browser/textinput.h"
+#include "core/widgets/tree.h"
+#include "core/api/window.h"
+#include "core/api/fetch.h"
+#include "core/api/misc.h"
/* NetSurf Amiga platform includes */
#include "amiga/gui.h"
diff --git a/frontends/amiga/gui.h b/frontends/amiga/gui.h
index 172a858d9..0111a589c 100644
--- a/frontends/amiga/gui.h
+++ b/frontends/amiga/gui.h
@@ -27,7 +27,7 @@
#include "amiga/object.h"
#include "amiga/os3support.h"
#include "amiga/plotters.h"
-#include "desktop/gui_window.h"
+#include "core/api/window.h"
#ifdef __amigaos4__
#define HOOKF(ret,func,type,ptr,msgtype) static ret func(struct Hook *hook, type ptr, msgtype msg)
diff --git a/frontends/amiga/gui_options.c b/frontends/amiga/gui_options.c
index 3be0cd55f..85e88e049 100755
--- a/frontends/amiga/gui_options.c
+++ b/frontends/amiga/gui_options.c
@@ -59,9 +59,9 @@
#include "utils/messages.h"
#include "utils/nsoption.h"
-#include "desktop/browser.h"
-#include "desktop/searchweb.h"
-#include "desktop/gui_window.h"
+#include "core/browser/browser.h"
+#include "core/browser/searchweb.h"
+#include "core/api/window.h"
#include "amiga/file.h"
#include "amiga/font.h"
diff --git a/frontends/amiga/history.c b/frontends/amiga/history.c
index 72b69d435..a8c10d89b 100755
--- a/frontends/amiga/history.c
+++ b/frontends/amiga/history.c
@@ -20,8 +20,8 @@
#include <proto/exec.h>
#include "utils/errors.h"
-#include "desktop/mouse.h"
-#include "desktop/gui_window.h"
+#include "core/browser/mouse.h"
+#include "core/api/window.h"
#include "amiga/history.h"
#include "amiga/tree.h"
diff --git a/frontends/amiga/history.h b/frontends/amiga/history.h
index 1f064746a..25741176e 100755
--- a/frontends/amiga/history.h
+++ b/frontends/amiga/history.h
@@ -18,7 +18,7 @@
#ifndef AMIGA_HISTORY_H
#define AMIGA_HISTORY_H
-#include "desktop/tree.h"
+#include "core/widgets/tree.h"
#define GLOBAL_HISTORY_RECENT_URLS 16
diff --git a/frontends/amiga/history_local.c b/frontends/amiga/history_local.c
index f11c78473..512d620df 100755
--- a/frontends/amiga/history_local.c
+++ b/frontends/amiga/history_local.c
@@ -44,10 +44,10 @@
#include "utils/log.h"
#include "utils/utils.h"
#include "utils/messages.h"
-#include "desktop/browser_history.h"
-#include "desktop/browser.h"
-#include "desktop/plotters.h"
-#include "desktop/gui_window.h"
+#include "core/browser/browser_history.h"
+#include "core/browser/browser.h"
+#include "core/browser/plotters.h"
+#include "core/api/window.h"
#include "graphics/rpattr.h"
#include "amiga/libs.h"
diff --git a/frontends/amiga/hotlist.c b/frontends/amiga/hotlist.c
index 79e679f77..bff44bd7e 100755
--- a/frontends/amiga/hotlist.c
+++ b/frontends/amiga/hotlist.c
@@ -20,9 +20,9 @@
#include <proto/exec.h>
#include "utils/nsurl.h"
-#include "desktop/hotlist.h"
-#include "desktop/mouse.h"
-#include "desktop/gui_window.h"
+#include "core/widgets/hotlist.h"
+#include "core/browser/mouse.h"
+#include "core/api/window.h"
#include "amiga/hotlist.h"
#include "amiga/tree.h"
diff --git a/frontends/amiga/hotlist.h b/frontends/amiga/hotlist.h
index c50ceecfb..5f163ce58 100755
--- a/frontends/amiga/hotlist.h
+++ b/frontends/amiga/hotlist.h
@@ -19,7 +19,7 @@
#ifndef AMIGA_HOTLIST_H
#define AMIGA_HOTLIST_H
-#include "desktop/tree.h"
+#include "core/widgets/tree.h"
#include "amiga/tree.h"
struct nsurl;
diff --git a/frontends/amiga/icon.c b/frontends/amiga/icon.c
index f77f2eb6e..37288616e 100644
--- a/frontends/amiga/icon.c
+++ b/frontends/amiga/icon.c
@@ -41,7 +41,7 @@
#include "utils/messages.h"
#include "utils/utils.h"
#include "utils/file.h"
-#include "desktop/plotters.h"
+#include "core/browser/plotters.h"
#include "image/bitmap.h"
#include "content/content_protected.h"
@@ -51,7 +51,7 @@
#include "amiga/misc.h"
#define THUMBNAIL_WIDTH 100 /* Icon sizes for thumbnails, usually the same as */
-#define THUMBNAIL_HEIGHT 86 /* WIDTH/HEIGHT in desktop/thumbnail.c */
+#define THUMBNAIL_HEIGHT 86 /* WIDTH/HEIGHT in core/browser/thumbnail.c */
ULONG *amiga_icon_convertcolouricon32(UBYTE *icondata, ULONG width, ULONG height,
ULONG trans, ULONG pals1, struct ColorRegister *pal1, int alpha);
diff --git a/frontends/amiga/login.c b/frontends/amiga/login.c
index 4cf9ba8bf..d5886df31 100755
--- a/frontends/amiga/login.c
+++ b/frontends/amiga/login.c
@@ -40,8 +40,8 @@
#include "utils/messages.h"
#include "utils/errors.h"
#include "content/urldb.h"
-#include "desktop/mouse.h"
-#include "desktop/gui_window.h"
+#include "core/browser/mouse.h"
+#include "core/api/window.h"
#include "amiga/gui.h"
#include "amiga/libs.h"
diff --git a/frontends/amiga/menu.c b/frontends/amiga/menu.c
index 08b2aed25..0dbb66498 100644
--- a/frontends/amiga/menu.c
+++ b/frontends/amiga/menu.c
@@ -44,12 +44,12 @@
#include "utils/nsoption.h"
#include "utils/messages.h"
-#include "desktop/hotlist.h"
-#include "desktop/browser.h"
-#include "desktop/mouse.h"
-#include "desktop/gui_window.h"
-#include "desktop/textinput.h"
-#include "desktop/version.h"
+#include "core/widgets/hotlist.h"
+#include "core/browser/browser.h"
+#include "core/browser/mouse.h"
+#include "core/api/window.h"
+#include "core/browser/textinput.h"
+#include "core/browser/version.h"
#include "amiga/arexx.h"
#include "amiga/bitmap.h"
diff --git a/frontends/amiga/misc.c b/frontends/amiga/misc.c
index aa9d1196b..977c09c45 100755
--- a/frontends/amiga/misc.c
+++ b/frontends/amiga/misc.c
@@ -32,7 +32,7 @@
#include "utils/messages.h"
#include "utils/url.h"
-#include "desktop/gui_window.h"
+#include "core/api/window.h"
#include "amiga/gui.h"
#include "amiga/misc.h"
diff --git a/frontends/amiga/plotters.c b/frontends/amiga/plotters.c
index c6c546b03..47bb8e303 100644
--- a/frontends/amiga/plotters.c
+++ b/frontends/amiga/plotters.c
@@ -38,8 +38,8 @@
#include "utils/utils.h"
#include "utils/log.h"
#include "css/utils.h"
-#include "desktop/mouse.h"
-#include "desktop/gui_window.h"
+#include "core/browser/mouse.h"
+#include "core/api/window.h"
#include "amiga/plotters.h"
#include "amiga/bitmap.h"
diff --git a/frontends/amiga/plotters.h b/frontends/amiga/plotters.h
index 841700e4a..3be84923b 100644
--- a/frontends/amiga/plotters.h
+++ b/frontends/amiga/plotters.h
@@ -18,7 +18,7 @@
#ifndef AMIGA_PLOTTERS_H
#define AMIGA_PLOTTERS_H
-#include "desktop/plotters.h"
+#include "core/browser/plotters.h"
#include <proto/layers.h>
#include <proto/graphics.h>
diff --git a/frontends/amiga/plugin_hack.c b/frontends/amiga/plugin_hack.c
index ad4bfaa3e..b260e03cc 100644
--- a/frontends/amiga/plugin_hack.c
+++ b/frontends/amiga/plugin_hack.c
@@ -26,7 +26,7 @@
#include "amiga/plugin_hack.h"
#include "content/content_protected.h"
#include "content/hlcache.h"
-#include "desktop/plotters.h"
+#include "core/browser/plotters.h"
#include "utils/log.h"
#include "utils/messages.h"
diff --git a/frontends/amiga/print.c b/frontends/amiga/print.c
index 84cca8fac..657f9ba6c 100644
--- a/frontends/amiga/print.c
+++ b/frontends/amiga/print.c
@@ -48,10 +48,10 @@
#include "utils/nsoption.h"
#include "utils/messages.h"
#include "utils/utils.h"
-#include "desktop/printer.h"
-#include "desktop/font.h"
-#include "desktop/mouse.h"
-#include "desktop/gui_window.h"
+#include "core/browser/printer.h"
+#include "core/browser/font.h"
+#include "core/browser/mouse.h"
+#include "core/api/window.h"
#include "amiga/plotters.h"
#include "amiga/gui.h"
diff --git a/frontends/amiga/save_pdf.c b/frontends/amiga/save_pdf.c
index b70fc5716..1e1deba3b 100644
--- a/frontends/amiga/save_pdf.c
+++ b/frontends/amiga/save_pdf.c
@@ -26,9 +26,9 @@
#include <stdbool.h>
#include "content/content.h"
-#include "desktop/print.h"
-#include "desktop/save_pdf/font_haru.h"
-#include "desktop/save_pdf/pdf_plotters.h"
+#include "core/browser/print.h"
+#include "core/browser/save_pdf/font_haru.h"
+#include "core/browser/save_pdf/pdf_plotters.h"
#include "amiga/save_pdf.h"
#include "utils/log.h"
#include "utils/config.h"
diff --git a/frontends/amiga/search.c b/frontends/amiga/search.c
index 5ca979220..c5276c5a2 100755
--- a/frontends/amiga/search.c
+++ b/frontends/amiga/search.c
@@ -48,11 +48,11 @@
#include "utils/messages.h"
#include "utils/utils.h"
#include "content/content.h"
-#include "desktop/browser.h"
-#include "desktop/search.h"
-#include "desktop/mouse.h"
-#include "desktop/gui_window.h"
-#include "desktop/gui_search.h"
+#include "core/browser/browser.h"
+#include "core/browser/search.h"
+#include "core/browser/mouse.h"
+#include "core/api/window.h"
+#include "core/api/search.h"
#include "amiga/libs.h"
#include "amiga/misc.h"
diff --git a/frontends/amiga/selectmenu.c b/frontends/amiga/selectmenu.c
index 25931783f..099fc3d5c 100644
--- a/frontends/amiga/selectmenu.c
+++ b/frontends/amiga/selectmenu.c
@@ -28,8 +28,8 @@
#include "utils/errors.h"
#include "utils/log.h"
#include "utils/messages.h"
-#include "render/form.h"
-#include "desktop/mouse.h"
+#include "core/html/form.h"
+#include "core/browser/mouse.h"
#include "amiga/gui.h"
#include "amiga/selectmenu.h"
diff --git a/frontends/amiga/sslcert.c b/frontends/amiga/sslcert.c
index 699ce71b8..d50bac617 100644
--- a/frontends/amiga/sslcert.c
+++ b/frontends/amiga/sslcert.c
@@ -20,9 +20,9 @@
#include "utils/nsurl.h"
#include "content/llcache.h"
-#include "desktop/mouse.h"
-#include "desktop/gui_window.h"
-#include "desktop/sslcert_viewer.h"
+#include "core/browser/mouse.h"
+#include "core/api/window.h"
+#include "core/browser/sslcert_viewer.h"
#include "amiga/tree.h"
#include "amiga/sslcert.h"
diff --git a/frontends/amiga/theme.c b/frontends/amiga/theme.c
index 6a0d5dac0..7b8696f71 100644
--- a/frontends/amiga/theme.c
+++ b/frontends/amiga/theme.c
@@ -39,9 +39,9 @@
#include "utils/messages.h"
#include "utils/nsoption.h"
#include "utils/utils.h"
-#include "desktop/searchweb.h"
-#include "desktop/mouse.h"
-#include "desktop/gui_window.h"
+#include "core/browser/searchweb.h"
+#include "core/browser/mouse.h"
+#include "core/api/window.h"
#include "amiga/gui.h"
#include "amiga/drag.h"
diff --git a/frontends/amiga/tree.c b/frontends/amiga/tree.c
index ba5f66260..68620209a 100644
--- a/frontends/amiga/tree.c
+++ b/frontends/amiga/tree.c
@@ -54,12 +54,12 @@
#include "utils/messages.h"
#include "content/urldb.h"
#include "content/llcache.h"
-#include "desktop/browser.h"
-#include "desktop/cookie_manager.h"
-#include "desktop/global_history.h"
-#include "desktop/hotlist.h"
-#include "desktop/gui_window.h"
-#include "desktop/sslcert_viewer.h"
+#include "core/browser/browser.h"
+#include "core/widgets/cookie_manager.h"
+#include "core/widgets/global_history.h"
+#include "core/widgets/hotlist.h"
+#include "core/api/window.h"
+#include "core/browser/sslcert_viewer.h"
#include "amiga/gui.h"
#include "amiga/tree.h"
diff --git a/frontends/amiga/tree.h b/frontends/amiga/tree.h
index 39a71d70d..bd5292740 100755
--- a/frontends/amiga/tree.h
+++ b/frontends/amiga/tree.h
@@ -22,7 +22,7 @@
#include <exec/types.h>
#include <intuition/classusr.h>
#include "amiga/os3support.h"
-#include "desktop/tree.h"
+#include "core/widgets/tree.h"
struct treeview_window;
diff --git a/frontends/amiga/utf8.c b/frontends/amiga/utf8.c
index 91d7c90c0..f202ca452 100755
--- a/frontends/amiga/utf8.c
+++ b/frontends/amiga/utf8.c
@@ -25,7 +25,7 @@
#include "utils/nsoption.h"
#include "utils/utf8.h"
-#include "desktop/gui_utf8.h"
+#include "core/api/utf8.h"
#include "amiga/utf8.h"
diff --git a/frontends/amiga/version.c b/frontends/amiga/version.c
index b70e24ac7..595b53749 100644
--- a/frontends/amiga/version.c
+++ b/frontends/amiga/version.c
@@ -21,7 +21,7 @@
/* NB: AmigaOS revision numbers start at 1 (not 0) and are monotonically
* incremental (v1.20 is higher than v1.3 and not the same as v1.2).
* Consequently, this version pair may not match the user-facing one in
- * desktop/version.c. Release revisions are prepended with 6000 to ensure
+ * core/browser/version.c. Release revisions are prepended with 6000 to ensure
* they are higher than CI builds, and make this (slightly) less confusing.
*/
#define NETSURF_VERSION_MAJOR "3"