diff --git a/amiga/cookies.c b/amiga/cookies.c
index 4ee463751..05fd9f85c 100755
--- a/amiga/cookies.c
+++ b/amiga/cookies.c
@@ -18,7 +18,7 @@
 
 #include <proto/exec.h>
 #include "amiga/cookies.h"
-#include "desktop/cookies.h"
+#include "desktop/cookies_old.h"
 #include "amiga/tree.h"
 
 void ami_cookies_initialise(void)
diff --git a/amiga/misc.c b/amiga/misc.c
index 4359c79b5..11af05147 100755
--- a/amiga/misc.c
+++ b/amiga/misc.c
@@ -32,7 +32,7 @@
 
 #include "amiga/gui.h"
 #include "amiga/utf8.h"
-#include "desktop/cookies.h"
+#include "desktop/cookies_old.h"
 #include "utils/log.h"
 #include "utils/messages.h"
 #include "utils/url.h"
diff --git a/amiga/tree.c b/amiga/tree.c
index ddaf81ebc..9c7305dac 100644
--- a/amiga/tree.c
+++ b/amiga/tree.c
@@ -55,7 +55,7 @@
 #include "amiga/filetype.h"
 #include "utils/nsoption.h"
 #include "content/urldb.h"
-#include "desktop/cookies.h"
+#include "desktop/cookies_old.h"
 #include "desktop/history_global_core.h"
 #include "desktop/hotlist.h"
 #include "desktop/tree_url_node.h"
diff --git a/atari/misc.c b/atari/misc.c
index 96abcf57a..75410d2e6 100755
--- a/atari/misc.c
+++ b/atari/misc.c
@@ -27,9 +27,8 @@
 
 #include "content/content.h"
 #include "content/hlcache.h"
-#include "desktop/cookies.h"
+#include "desktop/cookies_old.h"
 #include "desktop/mouse.h"
-#include "desktop/cookies.h"
 #include "desktop/tree.h"
 #include "utils/nsoption.h"
 #include "utils/messages.h"
diff --git a/beos/gui.cpp b/beos/gui.cpp
index 766782259..0abef08c1 100644
--- a/beos/gui.cpp
+++ b/beos/gui.cpp
@@ -50,7 +50,7 @@ extern "C" {
 #include "content/urldb.h"
 #include "desktop/401login.h"
 #include "desktop/browser_private.h"
-#include "desktop/cookies.h"
+#include "desktop/cookies_old.h"
 #include "desktop/gui.h"
 #include "desktop/netsurf.h"
 #include "utils/nsoption.h"
diff --git a/cocoa/NetSurf.xcodeproj/project.pbxproj b/cocoa/NetSurf.xcodeproj/project.pbxproj
index ca0bed6f3..ef25d2f1a 100644
--- a/cocoa/NetSurf.xcodeproj/project.pbxproj
+++ b/cocoa/NetSurf.xcodeproj/project.pbxproj
@@ -41,7 +41,7 @@
 		260F1F8512D620E800D9B07F /* browser.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = browser.c; sourceTree = "<group>"; };
 		260F1F8612D620E800D9B07F /* browser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = browser.h; sourceTree = "<group>"; };
 		260F1F8712D620E800D9B07F /* cookies.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = cookies.c; sourceTree = "<group>"; };
-		260F1F8812D620E800D9B07F /* cookies.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cookies.h; sourceTree = "<group>"; };
+		260F1F8812D620E800D9B07F /* cookies_old.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cookies_old.h; sourceTree = "<group>"; };
 		260F1F8912D620E800D9B07F /* download.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = download.c; sourceTree = "<group>"; };
 		260F1F8A12D620E800D9B07F /* download.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = download.h; sourceTree = "<group>"; };
 		260F1F8B12D620E800D9B07F /* frames.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = frames.c; sourceTree = "<group>"; };
@@ -398,7 +398,7 @@
 				260F1F8512D620E800D9B07F /* browser.c */,
 				260F1F8612D620E800D9B07F /* browser.h */,
 				260F1F8712D620E800D9B07F /* cookies.c */,
-				260F1F8812D620E800D9B07F /* cookies.h */,
+				260F1F8812D620E800D9B07F /* cookies_old.h */,
 				260F1F8912D620E800D9B07F /* download.c */,
 				260F1F8A12D620E800D9B07F /* download.h */,
 				260F1F8B12D620E800D9B07F /* frames.c */,
diff --git a/content/urldb.c b/content/urldb.c
index c950dcd90..126ee5ed7 100644
--- a/content/urldb.c
+++ b/content/urldb.c
@@ -100,7 +100,7 @@
 #include "image/bitmap.h"
 #include "content/content.h"
 #include "content/urldb.h"
-#include "desktop/cookies.h"
+#include "desktop/cookies_old.h"
 #include "utils/nsoption.h"
 #include "utils/log.h"
 #include "utils/corestrings.h"
diff --git a/desktop/Makefile b/desktop/Makefile
index ded75aaa2..1c62f1a58 100644
--- a/desktop/Makefile
+++ b/desktop/Makefile
@@ -1,6 +1,6 @@
 # Sources for desktop
 
-S_DESKTOP := cookies.c history_global_core.c hotlist.c knockout.c	\
+S_DESKTOP := cookies_old.c history_global_core.c hotlist.c knockout.c	\
 	mouse.c plot_style.c print.c search.c searchweb.c	\
 	scrollbar.c sslcert.c textarea.c thumbnail.c tree.c 		\
 	tree_url_node.c version.c system_colour.c global_history.c treeview.c
diff --git a/framebuffer/misc.c b/framebuffer/misc.c
index 035e6b4a9..0568e3670 100644
--- a/framebuffer/misc.c
+++ b/framebuffer/misc.c
@@ -21,7 +21,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "desktop/cookies.h"
+#include "desktop/cookies_old.h"
 #include "utils/log.h"
 #include "utils/messages.h"
 #include "utils/utils.h"
diff --git a/gtk/cookies.c b/gtk/cookies.c
index dd62d568e..99b2a803f 100644
--- a/gtk/cookies.c
+++ b/gtk/cookies.c
@@ -21,7 +21,7 @@
  */
 
 
-#include "desktop/cookies.h"
+#include "desktop/cookies_old.h"
 #include "desktop/plotters.h"
 #include "desktop/tree.h"
 #include "utils/log.h"
diff --git a/gtk/gui.c b/gtk/gui.c
index 01f9688e3..3fb2c2bd7 100644
--- a/gtk/gui.c
+++ b/gtk/gui.c
@@ -45,7 +45,7 @@
 #include "content/hlcache.h"
 #include "content/urldb.h"
 #include "desktop/browser_private.h"
-#include "desktop/cookies.h"
+#include "desktop/cookies_old.h"
 #include "desktop/gui.h"
 #include "desktop/history_global_core.h"
 #include "desktop/netsurf.h"
diff --git a/riscos/cookies.c b/riscos/cookies.c
index 8fb45947f..14a1d03a1 100644
--- a/riscos/cookies.c
+++ b/riscos/cookies.c
@@ -30,7 +30,7 @@
 #include "oslib/wimp.h"
 #include "oslib/wimpspriteop.h"
 #include "content/urldb.h"
-#include "desktop/cookies.h"
+#include "desktop/cookies_old.h"
 #include "desktop/tree.h"
 #include "riscos/cookies.h"
 #include "riscos/dialog.h"
diff --git a/riscos/gui.c b/riscos/gui.c
index e409fbb3e..81b8a6309 100644
--- a/riscos/gui.c
+++ b/riscos/gui.c
@@ -55,7 +55,7 @@
 #include "content/hlcache.h"
 #include "content/urldb.h"
 #include "content/fetchers/resource.h"
-#include "desktop/cookies.h"
+#include "desktop/cookies_old.h"
 #include "desktop/gui.h"
 #include "desktop/history_global_core.h"
 #include "desktop/hotlist.h"
diff --git a/riscos/menus.c b/riscos/menus.c
index 337ca4810..bf9fa84a2 100644
--- a/riscos/menus.c
+++ b/riscos/menus.c
@@ -34,7 +34,7 @@
 #include "content/content.h"
 #include "content/hlcache.h"
 #include "content/urldb.h"
-#include "desktop/cookies.h"
+#include "desktop/cookies_old.h"
 #include "desktop/browser.h"
 #include "desktop/gui.h"
 #include "desktop/history_global_core.h"
diff --git a/riscos/window.c b/riscos/window.c
index 8e0f0a018..cbb31cf63 100644
--- a/riscos/window.c
+++ b/riscos/window.c
@@ -46,7 +46,7 @@
 #include "content/urldb.h"
 #include "css/css.h"
 #include "desktop/browser_private.h"
-#include "desktop/cookies.h"
+#include "desktop/cookies_old.h"
 #include "desktop/scrollbar.h"
 #include "desktop/frames.h"
 #include "desktop/local_history.h"
diff --git a/test/llcache.c b/test/llcache.c
index de823047c..b3eb0d25a 100644
--- a/test/llcache.c
+++ b/test/llcache.c
@@ -105,11 +105,11 @@ char *url_to_path(const char *url)
  * Things that are absolutely not reasonable, and should disappear            *
  ******************************************************************************/
 
-#include "desktop/cookies.h"
+#include "desktop/cookies_old.h"
 #include "desktop/gui.h"
 #include "desktop/tree.h"
 
-/* desktop/cookies.h -- used by urldb 
+/* desktop/cookies_old.h -- used by urldb 
  *
  * URLdb should have a cookies update event + handler registration
  */
@@ -118,7 +118,7 @@ bool cookies_schedule_update(const struct cookie_data *data)
 	return true;
 }
 
-/* desktop/cookies.h -- used by urldb 
+/* desktop/cookies_old.h -- used by urldb 
  *
  * URLdb should have a cookies removal handler registration
  */
diff --git a/test/urldbtest.c b/test/urldbtest.c
index bc9d899a1..7c72ed7d1 100644
--- a/test/urldbtest.c
+++ b/test/urldbtest.c
@@ -32,7 +32,7 @@
 #include "image/bitmap.h"
 #include "content/content.h"
 #include "content/urldb.h"
-#include "desktop/cookies.h"
+#include "desktop/cookies_old.h"
 #include "utils/nsoption.h"
 #ifdef riscos
 /** \todo lose this */
diff --git a/windows/misc.c b/windows/misc.c
index 5132e612b..51c02ca11 100644
--- a/windows/misc.c
+++ b/windows/misc.c
@@ -25,7 +25,7 @@
 
 #include <windows.h>
 
-#include "desktop/cookies.h"
+#include "desktop/cookies_old.h"
 #include "utils/messages.h"
 #include "utils/utils.h"
 #include "utils/url.h"