--- uae/src/gfxlib.c	2018/04/24 16:40:02	1.1.1.3
+++ uae/src/gfxlib.c	2018/04/24 16:56:41	1.1.1.6
@@ -34,7 +34,6 @@
 #include "threaddep/penguin.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;
 }
@@ -1644,16 +1643,17 @@ void gfxlib_install(void)
     uae_u32 begin, end, resname, resid;
     int i;
 
-    if(!use_gfxlib) return;
+    if (! currprefs.use_gfxlib)
+	return;
 
-    fprintf(stderr, "Warning: you enabled the graphics.library replacement with -g\n"
-	    "This may be buggy right now, and will not speed things up much.\n");
+    fprintf (stderr, "Warning: you enabled the graphics.library replacement with -g\n"
+	     "This may be buggy right now, and will not speed things up much.\n");
 
-    resname = ds("UAEgfxlib.resource");
-    resid = ds("UAE gfxlib 0.1");
+    resname = ds ("UAEgfxlib.resource");
+    resid = ds ("UAE gfxlib 0.1");
 
-    gfxlibname = ds("graphics.library");
-    layerslibname = ds("layers.library");
+    gfxlibname = ds ("graphics.library");
+    layerslibname = ds ("layers.library");
 
     begin = here();
     dw(0x4AFC);             /* RTC_MATCHuae_s16 */