diff --git a/src/commands.c b/src/commands.c
index a1caae2..b0ad09f 100644
--- a/src/commands.c
+++ b/src/commands.c
@@ -6,7 +6,6 @@
  * file for more information.
  */
 
-#include <xmp.h>
 #include "common.h"
 
 #if defined(_WIN32) || defined(__OS2__) || defined(__DJGPP__) || defined(_DOS)
@@ -86,10 +85,10 @@ static int read_key(void)
 		}
 	}
 #elif defined(HAVE_TERMIOS_H)
-#ifdef __CYGWIN__
+	#ifdef __CYGWIN__
 	if (stdin_ready_for_reading())
-#endif
-		ret = read(0, &key, 1);
+	#endif
+	    ret = read(0, &key, 1);
 #else
 	ret = 0;
 #endif
diff --git a/src/common.h b/src/common.h
index c0635ec..f7f5d9c 100644
--- a/src/common.h
+++ b/src/common.h
@@ -19,6 +19,9 @@
 #define NUM_MODES 13
 #define MAX_DRV_PARM 20
 
+
+#include <xmp.h>
+
 struct player_mode {
 	const char *name;
 	const char *desc;
diff --git a/src/delay.c b/src/delay.c
index d537982..f00d101 100644
--- a/src/delay.c
+++ b/src/delay.c
@@ -6,7 +6,6 @@
  * file for more information.
  */
 
-#include <xmp.h>
 #include "common.h"
 
 #if defined(_WIN32)
diff --git a/src/info.c b/src/info.c
index 8d473ce..78bae9c 100644
--- a/src/info.c
+++ b/src/info.c
@@ -9,7 +9,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdarg.h>
-#include <xmp.h>
+
 #include "common.h"
 
 static int max_channels = -1;
diff --git a/src/main.c b/src/main.c
index c993ea1..1a0ffea 100644
--- a/src/main.c
+++ b/src/main.c
@@ -6,8 +6,8 @@
  * file for more information.
  */
 
-#include <xmp.h>
 #include "common.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -36,7 +36,8 @@
 #else
 #include "getopt_long.h"
 #endif
-#include "errno.h"
+#include <errno.h>
+
 #include "sound.h"
 #include "xmp_version.h"
 
diff --git a/src/options.c b/src/options.c
index 5b920f0..ffabafb 100644
--- a/src/options.c
+++ b/src/options.c
@@ -23,8 +23,6 @@
 #include "getopt_long.h"
 #endif
 
-#include <xmp.h>
-
 #include "common.h"
 #include "sound.h"
 #include "list.h"
diff --git a/src/read_config.c b/src/read_config.c
index 2ff1427..c773993 100644
--- a/src/read_config.c
+++ b/src/read_config.c
@@ -10,7 +10,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <limits.h>
-#include <xmp.h>
+
 #include "common.h"
 
 #if !defined(SYSCONFDIR)
diff --git a/src/sound.h b/src/sound.h
index 494d8d2..9c53f69 100644
--- a/src/sound.h
+++ b/src/sound.h
@@ -1,8 +1,8 @@
 #ifndef XMP_SOUND_H
 #define XMP_SOUND_H
 
-#include <xmp.h>
 #include <stdio.h>
+
 #include "common.h"
 #include "list.h"
 
diff --git a/src/sound_beos.cpp b/src/sound_beos.cpp
index 587aea0..77c13e0 100644
--- a/src/sound_beos.cpp
+++ b/src/sound_beos.cpp
@@ -15,7 +15,6 @@
 extern "C" {
 #include <string.h>
 #include <stdlib.h>
-#include "xmp.h"
 #include "sound.h"
 }
 
@@ -173,7 +172,7 @@ static void play(void *b, int i)
 		snooze(100000);
 
 	while (i) {
-        	if ((j = write_buffer((uint8 *)b, i)) > 0) {
+		if ((j = write_buffer((uint8 *)b, i)) > 0) {
 			i -= j;
 			b = (uint8 *)b + j;
 		} else {
diff --git a/src/terminal.c b/src/terminal.c
index 2c0fb4c..ecfaa7c 100644
--- a/src/terminal.c
+++ b/src/terminal.c
@@ -6,9 +6,8 @@
  * file for more information.
  */
 
-#include <stdio.h>
-#include <xmp.h>
 #include "common.h"
+#include <stdio.h>
 
 #if defined(XMP_AMIGA)
 #ifdef __amigaos4__
diff --git a/src/util.c b/src/util.c
index d2de12d..29e39c4 100644
--- a/src/util.c
+++ b/src/util.c
@@ -9,7 +9,7 @@
 #include <stddef.h>
 #include <stdlib.h>
 #include <string.h>
-#include <xmp.h>
+
 #include "common.h"
 
 char *xmp_strdup(const char *in)
@@ -23,7 +23,7 @@ char *xmp_strdup(const char *in)
 }
 
 
-/* locale-insensitive tolower and strcasecmp : */
+/* locale-insensitive tolower and strcasecmp: */
 
 static inline int xmp_tolower(int c)
 {
@@ -49,4 +49,3 @@ int xmp_strcasecmp(const char *s1, const char *s2)
 
 	return (int)(c1 - c2);
 }
-