--- uae/src/include/memory.h	2018/04/24 16:40:14	1.1.1.3
+++ uae/src/include/memory.h	2018/04/24 16:42:26	1.1.1.4
@@ -23,9 +23,15 @@ typedef int (*check_func)(uaecptr, uae_u
 extern char *address_space, *good_address_map;
 extern uae_u8 *chipmemory;
 
+extern uae_u32 allocated_chipmem;
+extern uae_u32 allocated_fastmem;
+extern uae_u32 allocated_bogomem;
+extern uae_u32 allocated_gfxmem;
+extern uae_u32 allocated_z3fastmem;
+extern uae_u32 allocated_a3000mem;
+
 #undef DIRECT_MEMFUNCS_SUCCESSFUL
-#include "osdep/memory.h"
-#include "machdep/memory.h"
+#include "machdep/maccess.h"
 
 #ifndef CAN_MAP_MEMORY
 #undef USE_COMPILER
@@ -77,7 +83,6 @@ extern void rtarea_setup (void);
 extern void expamem_init (void);
 extern void expamem_reset (void);
 
-extern uae_u32 z3fastmem_size, fastmem_size, chipmem_size, bogomem_size, a3000mem_size, gfxmem_size;
 extern uae_u32 gfxmem_start;
 extern uae_u8 *gfxmemory;
 extern uae_u32 gfxmem_mask;