--- uae/src/include/memory.h	2018/04/24 16:40:14	1.1.1.3
+++ uae/src/include/memory.h	2018/04/24 16:48:59	1.1.1.5
@@ -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;
@@ -136,37 +141,37 @@ extern void byteput(uaecptr addr, uae_u3
 
 #endif
 
-static __inline__ uae_u32 get_long(uaecptr addr)
+STATIC_INLINE uae_u32 get_long(uaecptr addr)
 {
     return longget_1(addr);
 }
-static __inline__ uae_u32 get_word(uaecptr addr)
+STATIC_INLINE uae_u32 get_word(uaecptr addr)
 {
     return wordget_1(addr);
 }
-static __inline__ uae_u32 get_byte(uaecptr addr)
+STATIC_INLINE uae_u32 get_byte(uaecptr addr)
 {
     return byteget_1(addr);
 }
-static __inline__ void put_long(uaecptr addr, uae_u32 l)
+STATIC_INLINE void put_long(uaecptr addr, uae_u32 l)
 {
     longput_1(addr, l);
 }
-static __inline__ void put_word(uaecptr addr, uae_u32 w)
+STATIC_INLINE void put_word(uaecptr addr, uae_u32 w)
 {
     wordput_1(addr, w);
 }
-static __inline__ void put_byte(uaecptr addr, uae_u32 b)
+STATIC_INLINE void put_byte(uaecptr addr, uae_u32 b)
 {
     byteput_1(addr, b);
 }
 
-static __inline__ uae_u8 *get_real_address(uaecptr addr)
+STATIC_INLINE uae_u8 *get_real_address(uaecptr addr)
 {
     return get_mem_bank(addr).xlateaddr(addr);
 }
 
-static __inline__ int valid_address(uaecptr addr, uae_u32 size)
+STATIC_INLINE int valid_address(uaecptr addr, uae_u32 size)
 {
     return get_mem_bank(addr).check(addr, size);
 }