--- uae/src/gfxlib.c	2018/04/24 16:44:49	1.1.1.4
+++ uae/src/gfxlib.c	2018/04/24 17:02:00	1.1.1.7
@@ -31,10 +31,9 @@
 
 #include "config.h"
 #include "options.h"
-#include "threaddep/penguin.h"
+#include "threaddep/thread.h"
 #include "memory.h"
 #include "custom.h"
-#include "readcpu.h"
 #include "newcpu.h"
 #include "xwin.h"
 #include "autoconf.h"
@@ -368,7 +367,7 @@ static void dup_bandlist(struct BandList
     memcpy(to->maxy, from->maxy, to->count*sizeof(int));
 }
 
-static __inline__ void add_band(struct BandList *bl, int miny, int maxy, int pos)
+STATIC_INLINE void add_band(struct BandList *bl, int miny, int maxy, int pos)
 {
     if (bl->count == bl->space) {
 	bl->space += 20;
@@ -399,7 +398,7 @@ static void dup_rectlist(struct RectList
     memcpy(to->rects, from->rects, to->count*sizeof(struct Rectangle));
 }
 
-static __inline__ void add_rect(struct RectList *rl, struct Rectangle r)
+STATIC_INLINE void add_rect(struct RectList *rl, struct Rectangle r)
 {
     if (rl->count == 0)
 	rl->bounds = r;
@@ -420,7 +419,7 @@ static __inline__ void add_rect(struct R
     rl->rects[rl->count++] = r;
 }
 
-static __inline__ void rem_rect(struct RectList *rl, int num)
+STATIC_INLINE void rem_rect(struct RectList *rl, int num)
 {
     rl->count--;
     if (num == rl->count)
@@ -457,12 +456,12 @@ static int regionrect_cmpfn(const void *
     return 1;
 }
 
-static __inline__ int min(int x, int y)
+STATIC_INLINE int min(int x, int y)
 {
     return x < y ? x : y;
 }
 
-static __inline__ int max(int x, int y)
+STATIC_INLINE int max(int x, int y)
 {
     return x > y ? x : y;
 }