diff --git a/atari/certview.c b/atari/certview.c
index f3c2deead..0238e5a0c 100644
--- a/atari/certview.c
+++ b/atari/certview.c
@@ -25,6 +25,7 @@
 
 #include "desktop/browser.h"
 #include "content/urldb.h"
+#include "content/hlcache.h"
 #include "desktop/sslcert_viewer.h"
 #include "desktop/gui.h"
 #include "desktop/core_window.h"
@@ -32,7 +33,6 @@
 #include "utils/log.h"
 #include "utils/messages.h"
 #include "utils/utils.h"
-#include "content/hlcache.h"
 
 #include "atari/gui.h"
 #include "atari/misc.h"
diff --git a/atari/deskmenu.c b/atari/deskmenu.c
index 663e244ac..7c423b74c 100644
--- a/atari/deskmenu.c
+++ b/atari/deskmenu.c
@@ -1,6 +1,6 @@
 #include <stdlib.h>
 #include <cflib.h>
-#include <limits.h>
+#include <sys/types.h>
 
 #include "utils/log.h"
 #include "utils/messages.h"
diff --git a/cocoa/BookmarksController.m b/cocoa/BookmarksController.m
index 698f27133..7d7173fd8 100644
--- a/cocoa/BookmarksController.m
+++ b/cocoa/BookmarksController.m
@@ -28,7 +28,7 @@
 #import "desktop/tree.h"
 #import "utils/messages.h"
 #import "utils/utils.h"
-#inport "content/hlcache.h"
+#import "content/hlcache.h"
 
 @interface BookmarksController ()
 - (void) noteAppWillTerminate: (NSNotification *) note;
diff --git a/cocoa/BrowserView.m b/cocoa/BrowserView.m
index ca5808c90..24214128e 100644
--- a/cocoa/BrowserView.m
+++ b/cocoa/BrowserView.m
@@ -29,6 +29,7 @@
 #import "desktop/textinput.h"
 #import "utils/nsoption.h"
 #import "utils/messages.h"
+#import "content/hlcache.h"
 
 @interface BrowserView ()
 
diff --git a/riscos/save.h b/riscos/save.h
index 6b83c7af1..7e509cf40 100644
--- a/riscos/save.h
+++ b/riscos/save.h
@@ -25,8 +25,7 @@
 
 #include <stdbool.h>
 #include "oslib/wimp.h"
-
-struct hlcache_handle;
+#include "desktop/gui.h"
 
 void gui_drag_save_object(struct gui_window *g, struct hlcache_handle *c, gui_save_type save_type);
 void gui_drag_save_selection(struct gui_window *g, const char *selection);