--- uae/src/compiler.c	2018/04/24 16:40:09	1.1.1.3
+++ uae/src/compiler.c	2018/04/24 16:48:51	1.1.1.6
@@ -11,13 +11,10 @@
 
 #include "config.h"
 #include "options.h"
-#include "gensound.h"
-#include "sounddep/sound.h"
 #include "events.h"
 #include "gui.h"
 #include "memory.h"
 #include "custom.h"
-#include "machdep/m68k.h"
 #include "readcpu.h"
 #include "newcpu.h"
 #include "ersatz.h"
@@ -237,7 +234,7 @@ static void lru_touch_block(struct hash_
     lru_first_block.lru_prev = h;
 }
 
-static __inline__ int check_block(struct hash_block *hb)
+STATIC_INLINE int check_block(struct hash_block *hb)
 {
 #ifndef RELY_ON_LOADSEG_DETECTION
     struct hash_entry *h = hb->he_first;
@@ -406,7 +403,7 @@ void special_flush_hash(uaecptr addr)
     h->cacheflush = 1;
 }
 
-static __inline__ void m68k_setpc_hash(uaecptr newpc)
+STATIC_INLINE void m68k_setpc_hash(uaecptr newpc)
 {
     struct hash_entry *h = get_hash(newpc);
 
@@ -428,7 +425,7 @@ static __inline__ void m68k_setpc_hash(u
     regs.pc_p = regs.pc_oldp = get_real_address(newpc);
 }
 
-static __inline__ void m68k_setpc_nohash(uaecptr newpc)
+STATIC_INLINE void m68k_setpc_nohash(uaecptr newpc)
 {
 #if 0
     /* This is probably not too good for efficiency... FIXME */
@@ -496,7 +493,7 @@ static void code_init(void)
 #define CC68K_N 2
 #define CC68K_X 1
 
-static __inline__ int cc_flagmask_68k(const int cc)
+STATIC_INLINE int cc_flagmask_68k(const int cc)
 {
     switch(cc){
      case 0: return 0;                       /* T */
@@ -520,7 +517,7 @@ static __inline__ int cc_flagmask_68k(co
     return 0;
 }
 
-static __inline__ void translate_step_over_ea(uae_u8 **pcpp, amodes m,
+STATIC_INLINE void translate_step_over_ea(uae_u8 **pcpp, amodes m,
 					      wordsizes size)
 {
     switch (m) {
@@ -1190,7 +1187,7 @@ void m68k_do_bsr(uaecptr oldpc, uae_s32
 static char *compile_current_addr;
 static char *compile_last_addr;
 
-static __inline__ void assemble(uae_u8 a)
+STATIC_INLINE void assemble(uae_u8 a)
 {
     if (compile_current_addr < compile_last_addr) {
 	*compile_current_addr++ = a;
@@ -1199,7 +1196,7 @@ static __inline__ void assemble(uae_u8 a
     }
 }
 
-static __inline__ void assemble_ulong(uae_u32 a)
+STATIC_INLINE void assemble_ulong(uae_u32 a)
 {
     assemble(a);
     assemble(a >> 8);
@@ -1207,7 +1204,7 @@ static __inline__ void assemble_ulong(ua
     assemble(a >> 24);
 }
 
-static __inline__ void assemble_ulong_68k(uae_u32 a)
+STATIC_INLINE void assemble_ulong_68k(uae_u32 a)
 {
     assemble(a >> 24);
     assemble(a >> 16);
@@ -1215,23 +1212,23 @@ static __inline__ void assemble_ulong_68
     assemble(a);
 }
 
-static __inline__ void assemble_uword(uae_u16 a)
+STATIC_INLINE void assemble_uword(uae_u16 a)
 {
     assemble(a);
     assemble(a >> 8);
 }
 
-static __inline__ void assemble_long(void *a)
+STATIC_INLINE void assemble_long(void *a)
 {
     assemble_ulong((uae_u32)a);
 }
 
-static __inline__ void compile_org(char *addr)
+STATIC_INLINE void compile_org(char *addr)
 {
     compile_current_addr = addr;
 }
 
-static __inline__ char *compile_here(void)
+STATIC_INLINE char *compile_here(void)
 {
     return compile_current_addr;
 }
@@ -2033,7 +2030,7 @@ static void compile_get_excl_lock(struct
  * 386 instruction.
  */
 
-static __inline__ int rmop_long(struct ea_info *eai)
+STATIC_INLINE int rmop_long(struct ea_info *eai)
 {
     if (eai->data_reg == -2)
 	printf("rmop for const\n");
@@ -2063,7 +2060,7 @@ static __inline__ int rmop_long(struct e
     return 0;
 }
 
-static __inline__ int rmop_short(struct ea_info *eai)
+STATIC_INLINE int rmop_short(struct ea_info *eai)
 {
     if (eai->data_reg == -2)
 	printf("rmop_short for const\n");
@@ -2079,7 +2076,7 @@ static __inline__ int rmop_short(struct
     return 0;
 }
 
-static __inline__ void rmop_finalize(struct ea_info *eai)
+STATIC_INLINE void rmop_finalize(struct ea_info *eai)
 {
     if (eai->data_reg == -2)
 	assemble_ulong(eai->data_const_off);