--- hatari/src/includes/stMemory.h	2019/04/01 07:13:41	1.1.1.7
+++ hatari/src/includes/stMemory.h	2019/04/09 08:47:16	1.1.1.9
@@ -8,10 +8,9 @@
 #ifndef HATARI_STMEMORY_H
 #define HATARI_STMEMORY_H
 
-#include "config.h"
+#include "main.h"
 #include "sysdeps.h"
 #include "maccess.h"
-#include "main.h"
 
 #if ENABLE_SMALL_MEM
 extern Uint8 *STRam;
@@ -25,8 +24,14 @@ extern Uint8 STRam[16*1024*1024];
 extern Uint32 STRamEnd;
 
 /* Offset ST address to PC pointer: */
-#define STRAM_ADDR(Var)  ((unsigned long)STRam+((Uint32)(Var) & 0x00ffffff))
-
+#if ENABLE_SMALL_MEM
+# define STRAM_ADDR(Var) \
+	(((Var)>= 0xe00000) \
+		 ? ((unsigned long)RomMem+((Uint32)(Var) & 0x00ffffff)) \
+		 : ((unsigned long)STRam+((Uint32)(Var) & 0x00ffffff)))
+#else
+# define STRAM_ADDR(Var)  ((unsigned long)STRam+((Uint32)(Var) & 0x00ffffff))
+#endif
 
 /*-----------------------------------------------------------------------*/
 /*