--- uae/src/cia.c	2018/04/24 16:40:00	1.1.1.3
+++ uae/src/cia.c	2018/04/24 16:43:26	1.1.1.5
@@ -14,8 +14,6 @@
 #include "config.h"
 #include "options.h"
 #include "threaddep/penguin.h"
-#include "gensound.h"
-#include "sounddep/sound.h"
 #include "events.h"
 #include "memory.h"
 #include "custom.h"
@@ -310,7 +308,7 @@ static uae_u8 ReadCIAA(unsigned int addr
 {
     unsigned int tmp;
 
-    switch(addr & 0xf){
+    switch(addr & 0xf) {
      case 0:
 	if (currprefs.use_serial && (serstat < 0)) /* Only read status when needed */
 	    serstat=serial_readstatus();		/* and only once per frame */
@@ -368,7 +366,7 @@ static uae_u8 ReadCIAB(unsigned int addr
 {
     unsigned int tmp;
 
-    switch(addr & 0xf){
+    switch(addr & 0xf) {
      case 0:
 	if (currprefs.use_serial && serstat < 0) /* Only read status when needed */
 	    serstat=serial_readstatus();	 /* and only once per frame      */
@@ -418,7 +416,7 @@ static uae_u8 ReadCIAB(unsigned int addr
 static void WriteCIAA(uae_u16 addr,uae_u8 val)
 {
     int oldled, oldovl;
-    switch(addr & 0xf){
+    switch(addr & 0xf) {
      case 0:
 	oldovl = ciaapra & 1;
 	oldled = ciaapra & 2;
@@ -435,7 +433,7 @@ static void WriteCIAA(uae_u16 addr,uae_u
 	ciaaprb = val;
 	if (prtopen==1) {
 #ifndef __DOS__
-	    fprintf (prttmp,"%c",val);
+	    fprintf (prttmp, "%c",val);
 #else
 	    fputc (val, prttmp);
 	    fflush (prttmp);
@@ -450,9 +448,9 @@ static void WriteCIAA(uae_u16 addr,uae_u
 	    }
 	} else {
 #if defined(__unix) && !defined(__BEOS__) && !defined(__DOS__)
-	    prttmp=(FILE *)popen ((char *)prtname,"w");
+	    prttmp = (FILE *)popen ((const char *)prtname, "w");
 #else
-	    prttmp=(FILE *)fopen ((char *)prtname,"wb");
+	    prttmp = (FILE *)fopen ((const char *)prtname, "wb");
 #endif
 	    if (prttmp != NULL) {
 		prtopen = 1;
@@ -503,7 +501,7 @@ static void WriteCIAA(uae_u16 addr,uae_u
 	CIA_calctimers();
 	break;
      case 8:
-	if (ciaacrb & 0x80){
+	if (ciaacrb & 0x80) {
 	    ciaaalarm = (ciaaalarm & ~0xff) | val;
 	} else {
 	    ciaatod = (ciaatod & ~0xff) | val;
@@ -511,7 +509,7 @@ static void WriteCIAA(uae_u16 addr,uae_u
 	}
 	break;
      case 9:
-	if (ciaacrb & 0x80){
+	if (ciaacrb & 0x80) {
 	    ciaaalarm = (ciaaalarm & ~0xff00) | (val << 8);
 	} else {
 	    ciaatod = (ciaatod & ~0xff00) | (val << 8);
@@ -519,7 +517,7 @@ static void WriteCIAA(uae_u16 addr,uae_u
 	}
 	break;
      case 10:
-	if (ciaacrb & 0x80){
+	if (ciaacrb & 0x80) {
 	    ciaaalarm = (ciaaalarm & ~0xff0000) | (val << 16);
 	} else {
 	    ciaatod = (ciaatod & ~0xff0000) | (val << 16);
@@ -533,7 +531,7 @@ static void WriteCIAA(uae_u16 addr,uae_u
      case 14:
 	CIA_update();
 	ciaacra = val;
-	if (ciaacra & 0x10){
+	if (ciaacra & 0x10) {
 	    ciaacra &= ~0x10;
 	    ciaata = ciaala;
 	}
@@ -545,7 +543,7 @@ static void WriteCIAA(uae_u16 addr,uae_u
      case 15:
 	CIA_update();
 	ciaacrb = val;
-	if (ciaacrb & 0x10){
+	if (ciaacrb & 0x10) {
 	    ciaacrb &= ~0x10;
 	    ciaatb = ciaalb;
 	}
@@ -557,7 +555,7 @@ static void WriteCIAA(uae_u16 addr,uae_u
 static void WriteCIAB(uae_u16 addr,uae_u8 val)
 {
     int oldval;
-    switch(addr & 0xf){
+    switch(addr & 0xf) {
      case 0:
 	if (currprefs.use_serial) {
 	  oldval = ciabpra;
@@ -604,7 +602,7 @@ static void WriteCIAB(uae_u16 addr,uae_u
 	CIA_calctimers();
 	break;
      case 8:
-	if (ciabcrb & 0x80){
+	if (ciabcrb & 0x80) {
 	    ciabalarm = (ciabalarm & ~0xff) | val;
 	} else {
 	    ciabtod = (ciabtod & ~0xff) | val;
@@ -612,7 +610,7 @@ static void WriteCIAB(uae_u16 addr,uae_u
 	}
 	break;
      case 9:
-	if (ciabcrb & 0x80){
+	if (ciabcrb & 0x80) {
 	    ciabalarm = (ciabalarm & ~0xff00) | (val << 8);
 	} else {
 	    ciabtod = (ciabtod & ~0xff00) | (val << 8);
@@ -620,7 +618,7 @@ static void WriteCIAB(uae_u16 addr,uae_u
 	}
 	break;
      case 10:
-	if (ciabcrb & 0x80){
+	if (ciabcrb & 0x80) {
 	    ciabalarm = (ciabalarm & ~0xff0000) | (val << 16);
 	} else {
 	    ciabtod = (ciabtod & ~0xff0000) | (val << 16);
@@ -636,7 +634,7 @@ static void WriteCIAB(uae_u16 addr,uae_u
      case 14:
 	CIA_update();
 	ciabcra = val;
-	if (ciabcra & 0x10){
+	if (ciabcra & 0x10) {
 	    ciabcra &= ~0x10;
 	    ciabta = ciabla;
 	}
@@ -645,7 +643,7 @@ static void WriteCIAB(uae_u16 addr,uae_u
      case 15:
 	CIA_update();
 	ciabcrb = val;
-	if (ciabcrb & 0x10){
+	if (ciabcrb & 0x10) {
 	    ciabcrb &= ~0x10;
 	    ciabtb = ciablb;
 	}