diff --git a/src/system/boot/platform/atari_m68k/Jamfile b/src/system/boot/platform/atari_m68k/Jamfile
index c5feac6872..df12a96300 100644
--- a/src/system/boot/platform/atari_m68k/Jamfile
+++ b/src/system/boot/platform/atari_m68k/Jamfile
@@ -32,7 +32,7 @@ KernelMergeObject boot_platform_atari_m68k.o :
 	cpu.cpp
 	#smp.cpp
 	#smp_trampoline.S
-	support.S
+#	support.S
 	video.cpp
 	#apm.cpp
 	
diff --git a/src/system/boot/platform/atari_m68k/mmu.cpp b/src/system/boot/platform/atari_m68k/mmu.cpp
index 200a7f1fcd..0d2b0cc897 100644
--- a/src/system/boot/platform/atari_m68k/mmu.cpp
+++ b/src/system/boot/platform/atari_m68k/mmu.cpp
@@ -7,7 +7,6 @@
 
 
 #include "mmu.h"
-#include "bios.h"
 
 #include <boot/platform.h>
 #include <boot/stdio.h>
diff --git a/src/system/boot/platform/atari_m68k/toscalls.h b/src/system/boot/platform/atari_m68k/toscalls.h
index f4a4df7e0c..a693c8e7e1 100644
--- a/src/system/boot/platform/atari_m68k/toscalls.h
+++ b/src/system/boot/platform/atari_m68k/toscalls.h
@@ -142,6 +142,31 @@ extern int32 gemdos(uint16 nr, ...);
 
 extern status_t toserror(int32 err);
 
+/*
+ * Cookie Jar access
+ */
+
+typedef struct tos_cookie {
+	uint32 cookie;
+	enum {
+		int32 ivalue;
+		void *pvalue;
+	}
+} tos_cookie;
+
+#define COOKIE_JAR (*((const tos_cookie **)0x5A0))
+
+static inline tos_cookie *tos_find_cookie(uint32 what)
+{
+	struct c = COOKIE_JAR;
+	while (c && (c->cookie)) {
+		if (c->cookie == what)
+			return c;
+		c++;
+	}
+	return NULL;
+}
+
 #endif /* __ASSEMBLER__ */
 
 #ifdef __cplusplus