--- uae/src/blitter.c	2018/04/24 17:09:17	1.1.1.13
+++ uae/src/blitter.c	2018/04/24 17:16:46	1.1.1.15
@@ -9,7 +9,6 @@
 #include "sysconfig.h"
 #include "sysdeps.h"
 
-#include "config.h"
 #include "options.h"
 #include "events.h"
 #include "uae.h"
@@ -37,6 +36,26 @@ uae_u32 blit_masktable[BLITTER_MAX_WORDS
 static uae_u16 blit_trashtable[BLITTER_MAX_WORDS];
 enum blitter_states bltstate;
 
+static uae_u8 blit_cycle_diagram_start[][10] =
+{
+    { 0, 1, 0 },		/* 0 */
+    { 0, 2, 4,0 },		/* 1 */
+    { 0, 2, 3,0 },		/* 2 */
+    { 2, 3, 3,0, 0,3,4 },	/* 3 */
+    { 0, 3, 2,0,0 },		/* 4 */
+    { 2, 3, 2,0, 0,2,4 },	/* 5 */
+    { 0, 3, 2,3,0 },		/* 6 */
+    { 3, 4, 2,3,0, 0,2,3,4 },	/* 7 */
+    { 0, 2, 1,0 },		/* 8 */
+    { 2, 2, 1,0, 1,4 },		/* 9 */
+    { 0, 2, 1,3 },		/* A */
+    { 3, 3, 1,3,0, 1,3,4 },	/* B */
+    { 2, 3, 1,2, 0,1,2 },	/* C */
+    { 3, 3, 1,2,0, 1,2,4 },	/* D */
+    { 0, 3, 1,2,3 },		/* E */
+    { 4, 4, 1,2,3,0, 1,2,3,4 }	/* F */
+};
+
 void build_blitfilltable(void)
 {
     unsigned int d, fillmask;
@@ -307,10 +326,13 @@ STATIC_INLINE void blitter_line_incy(voi
 
 static void blitter_line(void)
 {
-    uae_u16 blitahold = blinea >> blinea_shift, blitbhold = blineb & 1 ? 0xFFFF : 0, blitchold = blt_info.bltcdat;
+    uae_u16 blitahold = blinea >> blinea_shift;
+    uae_u16 blitbhold = blineb & 1 ? 0xFFFF : 0;
+    uae_u16 blitchold = blt_info.bltcdat;
     blt_info.bltddat = 0;
 
-    if (blitsing && blitonedot) blitahold = 0;
+    if (blitsing && blitonedot)
+	blitahold = 0;
     blitonedot = 1;
     blt_info.bltddat = blit_func(blitahold, blitbhold, blitchold, bltcon0 & 0xFF);
     if (!blitsign){
@@ -413,9 +435,10 @@ static void actually_do_blit(void)
 	    blitter_nxline();
 	} while (bltstate != BLT_done);
     } else {
-	/*blitcount[bltcon0 & 0xff]++;  blitter debug */
-	if (blitdesc) blitter_dofast_desc();
-	else blitter_dofast();
+	if (blitdesc)
+	    blitter_dofast_desc();
+	else
+	    blitter_dofast();
     }
     blitter_done_notify ();
 }
@@ -435,26 +458,6 @@ void blitter_handler(void)
     unset_special (SPCFLAG_BLTNASTY);
 }
 
-static uae_u8 blit_cycle_diagram_start[][10] =
-{
-    { 0, 1, 0 },		/* 0 */
-    { 0, 2, 4,0 },		/* 1 */
-    { 0, 2, 3,0 },		/* 2 */
-    { 2, 3, 3,0, 0,3,4 },	/* 3 */
-    { 0, 3, 2,0,0 },		/* 4 */
-    { 2, 3, 2,0, 0,2,4 },	/* 5 */
-    { 0, 3, 2,3,0 },		/* 6 */
-    { 3, 4, 2,3,0, 0,2,3,4 },	/* 7 */
-    { 0, 2, 1,0 },		/* 8 */
-    { 2, 2, 1,0, 1,4 },		/* 9 */
-    { 0, 2, 1,3 },		/* A */
-    { 3, 3, 1,3,0, 1,3,4 },	/* B */
-    { 2, 3, 1,2, 0,1,2 },	/* C */
-    { 3, 3, 1,2,0, 1,2,4 },	/* D */
-    { 0, 3, 1,2,3 },		/* E */
-    { 4, 4, 1,2,3,0, 1,2,3,4 }	/* F */
-};
-
 static long int blit_cycles;
 static long blit_firstline_cycles;
 static long blit_first_cycle;