--- uae/src/readcpu.c	2018/04/24 16:59:56	1.1.1.6
+++ uae/src/readcpu.c	2018/04/24 17:12:20	1.1.1.9
@@ -10,8 +10,6 @@
 #include "sysdeps.h"
 #include <ctype.h>
 
-#include "config.h"
-#include "options.h"
 #include "readcpu.h"
 
 int nr_cpuop_funcs;
@@ -535,7 +533,7 @@ static void build_insn (int insn)
 	    case 'R': destreg = bitval[bitR]; dstgather = 1; dstpos = bitpos[bitR]; break;
 	    default: abort();
 	    }
-            if (dstpos < 0 || dstpos >= 32)
+	    if (dstpos < 0 || dstpos >= 32)
 		abort ();
 	    break;
 	case 'A':
@@ -546,7 +544,7 @@ static void build_insn (int insn)
 	    case 'x': destreg = 0; dstgather = 0; dstpos = 0; break;
 	    default: abort();
 	    }
-            if (dstpos < 0 || dstpos >= 32)
+	    if (dstpos < 0 || dstpos >= 32)
 		abort ();
 	    switch (opcstr[pos]) {
 	    case 'p': destmode = Apdi; pos++; break;
@@ -687,7 +685,7 @@ static void build_insn (int insn)
       endofline:
 	/* now, we have a match */
 	if (table68k[opc].mnemo != i_ILLG)
-	    fprintf(stderr, "Double match: %x: %s\n", opc, opcstr);
+	    write_log ("Double match: %x: %s\n", opc, opcstr);
 	if (find == -1) {
 	    for (find = 0;; find++) {
 		if (strcmp(mnemonic, lookuptab[find].name) == 0) {