diff --git a/Makefile.am b/Makefile.am
index 705d469f..db671101 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -31,14 +31,7 @@ XFAIL_TESTS =
 check_PROGRAMS =
 
 AM_CPPFLAGS = -DPKGLIBDIR="\"$(pkglibdir)\""
-# That can be trimmed down later when adapting the sources to
-# use relative paths for includes.
-# TODO: Actually do more relative includes.
-AM_CPPFLAGS += \
-  $(LTDLINCL) \
-  -I$(top_srcdir)/src \
-  -I$(top_srcdir)/src/compat \
-  -I$(top_srcdir)/src/common
+AM_CPPFLAGS += $(LTDLINCL)
 
 # Automake cannot handle dependencies behind an autoconf expansion.
 # So we need elaborate ifelsery here to make it see the libtool
diff --git a/NEWS b/NEWS
index 70784969..2c0cf202 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,8 @@
 ------
 - build:
 -- Reorganize shared headers, API headers into src/include.
+-- Use relative include paths, avoiding internal directories in
+   CPPFLAGS except for config.h.
 -- Group C99 feature checks and make several standard headers
    mandatory.
 -- Get rid of SIZE_P, OFF_P and friends.
diff --git a/ports/cmake/src/CMakeLists.txt b/ports/cmake/src/CMakeLists.txt
index 09e44922..f86d7f47 100644
--- a/ports/cmake/src/CMakeLists.txt
+++ b/ports/cmake/src/CMakeLists.txt
@@ -341,8 +341,6 @@ option(USE_NEW_HUFFTABLE "use new huffman decoding scheme by Taihei (faster on m
 include_directories(
     "${CMAKE_CURRENT_SOURCE_DIR}/../../../src/"
     "${CMAKE_CURRENT_BINARY_DIR}"
-    "${CMAKE_CURRENT_SOURCE_DIR}/../../../src/compat"
-    "${CMAKE_CURRENT_SOURCE_DIR}/../../../src/common"
     "${CMAKE_CURRENT_SOURCE_DIR}/../../../src/include")
 
 add_compile_definitions(
diff --git a/scripts/fixinc.pl b/scripts/fixinc.pl
new file mode 100644
index 00000000..819588c9
--- /dev/null
+++ b/scripts/fixinc.pl
@@ -0,0 +1,42 @@
+#!/usr/bin/perl
+
+use File::Basename qw(dirname);
+use File::Spec::Functions qw(abs2rel);
+
+my @incdirs = ('src/common', 'src/compat', 'src');
+
+sub header
+{
+	my ($from, $inc) = @_;
+	for(dirname($from), @incdirs)
+	{
+		my $cand = "$_/$inc";
+		return $cand if -e $cand;
+	}
+	return undef;
+}
+
+for my $f (@ARGV)
+{
+	open(my $ih, '<', $f) or die "meh: $!\n";
+	open(my $oh, '>', "$f.tmp") or die "moh: $!\n";
+	while(my $line = <$ih>)
+	{
+		if($line =~ m,^(\s*\#\s*include\s+)"([^/]+)\"(.*)$,)
+		{
+			my ($pre, $inc, $post) = ($1, $2, $3);
+			my $h = header($f, $inc);
+			if($inc ne "config.h" and defined $h)
+			{
+				if(dirname($h) ne dirname($f))
+				{
+					my $rel = abs2rel($h, dirname($f));
+					print "$f: including $inc ($rel)\n";
+					$line = $pre.'"'.$rel.'"'.$post."\n";
+				}
+			}
+		}
+		print $oh "$line";
+	}
+	rename("$f.tmp", $f);
+}
diff --git a/src/audio.c b/src/audio.c
index bb4532fc..055efeb3 100644
--- a/src/audio.c
+++ b/src/audio.c
@@ -40,7 +40,7 @@
 #include <sys/wait.h>
 #endif
 
-#include "debug.h"
+#include "common/debug.h"
 
 static syn123_handle *sh = NULL;
 static struct mpg123_fmt outfmt = { .encoding=0, .rate=0, .channels=0 };
diff --git a/src/audio.h b/src/audio.h
index f2610137..b37c60e3 100644
--- a/src/audio.h
+++ b/src/audio.h
@@ -16,7 +16,7 @@
 #ifndef _MPG123_AUDIO_H_
 #define _MPG123_AUDIO_H_
 
-#include "compat.h"
+#include "compat/compat.h"
 #include "mpg123.h"
 #include "out123.h"
 
diff --git a/src/common.c b/src/common.c
index cf98cbbb..eea1c336 100644
--- a/src/common.c
+++ b/src/common.c
@@ -18,7 +18,7 @@
 #include "terms.h"
 #include "metaprint.h"
 
-#include "debug.h"
+#include "common/debug.h"
 
 enum player_state playstate = STATE_PLAYING;
 const char playsym[STATE_COUNT] = { '>', '_', '=', '?' };
diff --git a/src/compat/compat.c b/src/compat/compat.c
index 0cf64983..b66fe7ea 100644
--- a/src/compat/compat.c
+++ b/src/compat/compat.c
@@ -39,7 +39,7 @@
 #include <shlwapi.h>
 #endif
 
-#include "debug.h"
+#include "../common/debug.h"
 
 #ifndef WINDOWS_UWP
 
diff --git a/src/compat/compat.h b/src/compat/compat.h
index 59aaf64e..dee811f7 100644
--- a/src/compat/compat.h
+++ b/src/compat/compat.h
@@ -279,7 +279,7 @@ size_t INT123_unintr_fwrite(const void *ptr, size_t size, size_t nmemb, FILE *st
 #define normal mpg123_normal
 #endif
 
-#include "true.h"
+#include "../common/true.h"
 
 #if (!defined(WIN32) || defined (__CYGWIN__)) && defined(HAVE_SIGNAL_H)
 void (*INT123_catchsignal(int signum, void(*handler)(int)))(int);
diff --git a/src/compat/compat_dl.c b/src/compat/compat_dl.c
index e704d2ce..e8433165 100644
--- a/src/compat/compat_dl.c
+++ b/src/compat/compat_dl.c
@@ -47,7 +47,7 @@
 #  endif
 #endif
 
-#include "debug.h"
+#include "../common/debug.h"
 
 #include "wpathconv.h"
 
diff --git a/src/compat/compat_str.c b/src/compat/compat_str.c
index 27729f2d..7e9797a1 100644
--- a/src/compat/compat_str.c
+++ b/src/compat/compat_str.c
@@ -26,7 +26,7 @@
 #include <locale.h>
 #endif
 
-#include "debug.h"
+#include "../common/debug.h"
 
 /* A safe realloc also for very old systems where realloc(NULL, size) returns NULL. */
 void *INT123_safe_realloc(void *ptr, size_t size)
diff --git a/src/control_generic.c b/src/control_generic.c
index 8a811c43..2e3f6376 100644
--- a/src/control_generic.c
+++ b/src/control_generic.c
@@ -21,7 +21,7 @@
 #ifndef _BSD_SOURCE
 #define _BSD_SOURCE
 #endif
-#include "compat.h"
+#include "compat/compat.h"
 
 #include "mpg123app.h"
 #include "out123.h"
@@ -60,7 +60,7 @@ static int mode = MODE_STOPPED;
 static int init = 0;
 static int sendstat_disabled = FALSE;
 
-#include "debug.h"
+#include "common/debug.h"
 
 void generic_sendmsg (const char *fmt, ...)
 {
diff --git a/src/equalizer.c b/src/equalizer.c
index 127d2324..ee54d9bf 100644
--- a/src/equalizer.c
+++ b/src/equalizer.c
@@ -7,7 +7,7 @@
 */
 
 #include "mpg123app.h"
-#include "debug.h"
+#include "common/debug.h"
 
 /* Load the settings from the path in the global variable equalfile.
    If there is no file, restore equalizer defaults. 
diff --git a/src/filters.c b/src/filters.c
index 7174da80..d65b9df9 100644
--- a/src/filters.c
+++ b/src/filters.c
@@ -9,7 +9,7 @@
 #include "filters.h"
 #include <ctype.h>
 
-#include "debug.h"
+#include "common/debug.h"
 
 // Validate syntax of filter specification, returning the number
 // of configured filters.
diff --git a/src/filters.h b/src/filters.h
index 3345718f..5e963456 100644
--- a/src/filters.h
+++ b/src/filters.h
@@ -19,7 +19,7 @@
 #ifndef MPG123_FILTERS_H
 #define MPG123_FILTERS_H
 
-#include "compat.h"
+#include "compat/compat.h"
 
 struct filter
 {
diff --git a/src/getlopt.c b/src/getlopt.c
index c1b077de..572feaf0 100644
--- a/src/getlopt.c
+++ b/src/getlopt.c
@@ -8,9 +8,9 @@
 */
 
 #include "config.h"
-#include "compat.h"
+#include "compat/compat.h"
 #include "getlopt.h"
-#include "debug.h"
+#include "common/debug.h"
 
 int loptind = 1;	/* index in argv[] */
 int loptchr = 0;	/* index in argv[loptind] */
diff --git a/src/httpget.c b/src/httpget.c
index d3b4132f..35bd912a 100644
--- a/src/httpget.c
+++ b/src/httpget.c
@@ -34,12 +34,12 @@
 #include "resolver.h"
 
 #include <errno.h>
-#include "true.h"
+#include "common/true.h"
 #endif
 
 #include <ctype.h>
 
-#include "debug.h"
+#include "common/debug.h"
 
 void httpdata_init(struct httpdata *e)
 {
diff --git a/src/libmpg123/calctables.c b/src/libmpg123/calctables.c
index 9d61d282..371c3708 100644
--- a/src/libmpg123/calctables.c
+++ b/src/libmpg123/calctables.c
@@ -12,7 +12,7 @@
 
 #define CALCTABLES
 #include "mpg123lib_intern.h"
-#include "debug.h"
+#include "../common/debug.h"
 
 #define ASIZE(a) (sizeof(a)/sizeof(*a))
 
diff --git a/src/libmpg123/dither_impl.h b/src/libmpg123/dither_impl.h
index 87eaad6a..4d93baf9 100644
--- a/src/libmpg123/dither_impl.h
+++ b/src/libmpg123/dither_impl.h
@@ -7,7 +7,7 @@
 */
 
 #include "config.h"
-#include "compat.h"
+#include "../compat/compat.h"
 #include "dither.h"
 
 static const uint32_t init_seed = 2463534242UL;
diff --git a/src/libmpg123/format.c b/src/libmpg123/format.c
index 60936aa0..5350ed4e 100644
--- a/src/libmpg123/format.c
+++ b/src/libmpg123/format.c
@@ -26,8 +26,8 @@
 */
 
 #include "mpg123lib_intern.h"
-#include "sample.h"
-#include "debug.h"
+#include "../common/sample.h"
+#include "../common/debug.h"
 
 /* static int chans[NUM_CHANNELS] = { 1 , 2 }; */
 static const long my_rates[MPG123_RATES] = /* only the standard rates */
@@ -686,7 +686,7 @@ static void conv_s16_to_s32(struct outbuffer *buf)
 #endif
 #endif
 
-#include "swap_bytes_impl.h"
+#include "../common/swap_bytes_impl.h"
 
 void swap_endian(struct outbuffer *buf, int block)
 {
diff --git a/src/libmpg123/frame.c b/src/libmpg123/frame.c
index 7e4794fa..45636c1e 100644
--- a/src/libmpg123/frame.c
+++ b/src/libmpg123/frame.c
@@ -9,7 +9,7 @@
 #define WANT_GETCPUFLAGS
 #include "mpg123lib_intern.h"
 #include "getcpuflags.h"
-#include "debug.h"
+#include "../common/debug.h"
 
 static void frame_fixed_reset(mpg123_handle *fr);
 
diff --git a/src/libmpg123/gapless.h b/src/libmpg123/gapless.h
index d7b71b1f..1896cd86 100644
--- a/src/libmpg123/gapless.h
+++ b/src/libmpg123/gapless.h
@@ -7,7 +7,7 @@
 	This is no stand-alone header, precisely to be able to fool it into using fake handle types for testing the math.
 */
 
-#include "debug.h"
+#include "../common/debug.h"
 
 #ifdef GAPLESS
 /* From internal sample number to external. */
diff --git a/src/libmpg123/getbits.h b/src/libmpg123/getbits.h
index 6d0d548e..3572027b 100644
--- a/src/libmpg123/getbits.h
+++ b/src/libmpg123/getbits.h
@@ -13,7 +13,7 @@
 #define _MPG123_GETBITS_H_
 
 #include "mpg123lib_intern.h"
-#include "debug.h"
+#include "../common/debug.h"
 
 #define backbits(fr,nob) ((void)( \
   fr->bits_avail  += nob, \
diff --git a/src/libmpg123/icy.h b/src/libmpg123/icy.h
index 104c7ff3..c2edb11e 100644
--- a/src/libmpg123/icy.h
+++ b/src/libmpg123/icy.h
@@ -10,7 +10,7 @@
 
 #ifndef NO_ICY
 
-#include "compat.h"
+#include "../compat/compat.h"
 #include "mpg123.h"
 
 struct icy_meta
diff --git a/src/libmpg123/icy2utf8.c b/src/libmpg123/icy2utf8.c
index cfda64ec..2ca190de 100644
--- a/src/libmpg123/icy2utf8.c
+++ b/src/libmpg123/icy2utf8.c
@@ -28,7 +28,7 @@
 
 #include "config.h"
 /* Includes string and stdlib headers... */
-#include "compat.h"
+#include "../compat/compat.h"
 
 /* ThOr: too lazy for this type check; also we use char/short all around anyway.
    Of cource, it would be the proper way to use _these_ kind of types all around. */
diff --git a/src/libmpg123/id3.c b/src/libmpg123/id3.c
index 104da6a3..180f489f 100644
--- a/src/libmpg123/id3.c
+++ b/src/libmpg123/id3.c
@@ -85,7 +85,7 @@
 
 #include "mpg123lib_intern.h"
 #include "id3.h"
-#include "debug.h"
+#include "../common/debug.h"
 
 #ifndef NO_ID3V2 /* Only the main parsing routine will always be there. */
 
diff --git a/src/libmpg123/index.c b/src/libmpg123/index.c
index cb868868..e13cbd14 100644
--- a/src/libmpg123/index.c
+++ b/src/libmpg123/index.c
@@ -8,7 +8,7 @@
 */
 
 #include "index.h"
-#include "debug.h"
+#include "../common/debug.h"
 
 /* The next expected frame offset, one step ahead. */
 static int64_t fi_next(struct frame_index *fi)
diff --git a/src/libmpg123/index.h b/src/libmpg123/index.h
index b1872597..af12211b 100644
--- a/src/libmpg123/index.h
+++ b/src/libmpg123/index.h
@@ -21,7 +21,7 @@
 */
 
 #include "config.h"
-#include "compat.h"
+#include "../compat/compat.h"
 
 struct frame_index
 {
diff --git a/src/libmpg123/layer1.c b/src/libmpg123/layer1.c
index 83e0ef4d..6126a6e2 100644
--- a/src/libmpg123/layer1.c
+++ b/src/libmpg123/layer1.c
@@ -10,7 +10,7 @@
 
 #include "mpg123lib_intern.h"
 #include "getbits.h"
-#include "debug.h"
+#include "../common/debug.h"
 
 /*
 	Allocation value is not allowed to be 15. Initially, libmad showed me the
diff --git a/src/libmpg123/layer3.c b/src/libmpg123/layer3.c
index a9a07021..0ddaf5a5 100644
--- a/src/libmpg123/layer3.c
+++ b/src/libmpg123/layer3.c
@@ -21,7 +21,7 @@
 #include "huffman.h"
 #endif
 #include "getbits.h"
-#include "debug.h"
+#include "../common/debug.h"
 
 
 
diff --git a/src/libmpg123/lfs_wrap.c b/src/libmpg123/lfs_wrap.c
index ba284120..99714222 100644
--- a/src/libmpg123/lfs_wrap.c
+++ b/src/libmpg123/lfs_wrap.c
@@ -32,7 +32,7 @@
 #endif
 
 // For correct MPG123_EXPORT.
-#include "abi_align.h"
+#include "../common/abi_align.h"
 
 // Need the full header with non-portable API, for the bare mpg123_open*()
 // declarations. But no renaming shenanigans.
@@ -40,8 +40,8 @@
 #include "mpg123.h"
 
 #include "lfs_wrap.h"
-#include "abi_align.h"
-#include "compat.h"
+#include "../common/abi_align.h"
+#include "../compat/compat.h"
 #include <sys/stat.h>
 #include <fcntl.h>
 
@@ -61,7 +61,7 @@
 // A paranoid check that someone did not define a wrong SIZEOF_OFF_T at configure time.
 typedef unsigned char MPG123_STATIC_ASSERT[(SIZEOF_OFF_T == sizeof(off_t)) ? 1 : -1];
 
-#include "debug.h"
+#include "../common/debug.h"
 
 // We do not want to expose this publicly, but it is cleaner to have it also defined
 // as portable API to offer the legacy function wrapper over. It's an undocumented
diff --git a/src/libmpg123/libmpg123.c b/src/libmpg123/libmpg123.c
index 71908146..67920643 100644
--- a/src/libmpg123/libmpg123.c
+++ b/src/libmpg123/libmpg123.c
@@ -7,19 +7,19 @@
 */
 
 #include "mpg123lib_intern.h"
-#include "version.h"
+#include "../version.h"
 #include "icy2utf8.h"
 
 #include "gapless.h"
 /* Want accurate rounding function regardless of decoder setup. */
 #define FORCE_ACCURATE
-#include "sample.h"
+#include "../common/sample.h"
 #include "parse.h"
 #ifndef PORTABLE_API
 #include "lfs_wrap.h"
 #endif
 
-#include "debug.h"
+#include "../common/debug.h"
 
 #define SEEKFRAME(mh) ((mh)->ignoreframe < 0 ? 0 : (mh)->ignoreframe)
 
diff --git a/src/libmpg123/mpg123lib_intern.h b/src/libmpg123/mpg123lib_intern.h
index cc2369f7..2ca416d6 100644
--- a/src/libmpg123/mpg123lib_intern.h
+++ b/src/libmpg123/mpg123lib_intern.h
@@ -15,9 +15,9 @@
 
 #include "config.h" /* Load this before _anything_ */
 
-#include "abi_align.h"
+#include "../common/abi_align.h"
 
-#include "compat.h"
+#include "../compat/compat.h"
 
 // Only portable API plays a role in the library itself, outside of lfs_wrap.c.
 // Also, we need to ensure no suffix renaming for the primary implementations.
@@ -278,7 +278,7 @@ static inline int32_t scale_rounded(int32_t x, int shift)
    now: factor on minimum frame buffer size (which takes upsampling into account) */
 #define		AUDIOBUFSIZE		2
 
-#include "true.h"
+#include "../common/true.h"
 
 #define         MAX_NAME_SIZE           81
 #define         SBLIMIT                 32
diff --git a/src/libmpg123/ntom.c b/src/libmpg123/ntom.c
index 1fb4c019..4d24ec27 100644
--- a/src/libmpg123/ntom.c
+++ b/src/libmpg123/ntom.c
@@ -8,7 +8,7 @@
 
 #define SAFE_NTOM /* Do not depend on int64_t*int64_t with big values still being in the range... */
 #include "mpg123lib_intern.h"
-#include "debug.h"
+#include "../common/debug.h"
 
 int INT123_synth_ntom_set_step(mpg123_handle *fr)
 {
diff --git a/src/libmpg123/optimize.c b/src/libmpg123/optimize.c
index 2478bef6..1d8232b0 100644
--- a/src/libmpg123/optimize.c
+++ b/src/libmpg123/optimize.c
@@ -12,7 +12,7 @@
 #define WANT_GETCPUFLAGS
 #include "mpg123lib_intern.h" /* includes optimize.h */
 #include "getcpuflags.h"
-#include "debug.h"
+#include "../common/debug.h"
 
 
 /* Ugly macros to build conditional synth function array values. */
diff --git a/src/libmpg123/parse.c b/src/libmpg123/parse.c
index 98a49ebe..1a9d76c3 100644
--- a/src/libmpg123/parse.c
+++ b/src/libmpg123/parse.c
@@ -30,7 +30,7 @@
 
 #include "mpeghead.h"
 
-#include "debug.h"
+#include "../common/debug.h"
 
 #define bsbufid(fr) (fr)->bsbuf==(fr)->bsspace[0] ? 0 : ((fr)->bsbuf==fr->bsspace[1] ? 1 : ( (fr)->bsbuf==(fr)->bsspace[0]+512 ? 2 : ((fr)->bsbuf==fr->bsspace[1]+512 ? 3 : -1) ) )
 
diff --git a/src/libmpg123/readers.c b/src/libmpg123/readers.c
index 1c158567..9a0831e3 100644
--- a/src/libmpg123/readers.c
+++ b/src/libmpg123/readers.c
@@ -11,7 +11,7 @@
 
 #include "mpg123lib_intern.h"
 
-#include "debug.h"
+#include "../common/debug.h"
 
 static int stream_init(mpg123_handle *fr);
 static int64_t get_fileinfo(mpg123_handle *);
diff --git a/src/libmpg123/stringbuf.c b/src/libmpg123/stringbuf.c
index cc00878a..590ee4a6 100644
--- a/src/libmpg123/stringbuf.c
+++ b/src/libmpg123/stringbuf.c
@@ -10,9 +10,9 @@
 #include "mpg123lib_intern.h"
 #include "config.h"
 #include "mpg123.h"
-#include "compat.h"
+#include "../compat/compat.h"
 #include <string.h>
-#include "debug.h"
+#include "../common/debug.h"
 
 mpg123_string* attribute_align_arg mpg123_new_string(const char *val)
 {
diff --git a/src/libmpg123/synth.c b/src/libmpg123/synth.c
index e6817005..2b22bbc3 100644
--- a/src/libmpg123/synth.c
+++ b/src/libmpg123/synth.c
@@ -10,8 +10,8 @@
 #ifdef OPT_GENERIC_DITHER
 #define FORCE_ACCURATE
 #endif
-#include "sample.h"
-#include "debug.h"
+#include "../common/sample.h"
+#include "../common/debug.h"
 
 /*
 	Part 1: All synth functions that produce signed short.
diff --git a/src/libmpg123/synth_8bit.c b/src/libmpg123/synth_8bit.c
index 966aa17b..ee7614d0 100644
--- a/src/libmpg123/synth_8bit.c
+++ b/src/libmpg123/synth_8bit.c
@@ -7,8 +7,8 @@
 */
 
 #include "mpg123lib_intern.h"
-#include "sample.h"
-#include "debug.h"
+#include "../common/sample.h"
+#include "../common/debug.h"
 
 /* 
 	Part 2: All synth functions that produce 8bit output.
diff --git a/src/libmpg123/synth_real.c b/src/libmpg123/synth_real.c
index 703e4fac..cc8bd7d6 100644
--- a/src/libmpg123/synth_real.c
+++ b/src/libmpg123/synth_real.c
@@ -7,8 +7,8 @@
 */
 
 #include "mpg123lib_intern.h"
-#include "sample.h"
-#include "debug.h"
+#include "../common/sample.h"
+#include "../common/debug.h"
 
 #ifdef REAL_IS_FIXED
 #error "Do not build this file with fixed point math!"
diff --git a/src/libmpg123/synth_s32.c b/src/libmpg123/synth_s32.c
index 4c99847f..9380ac34 100644
--- a/src/libmpg123/synth_s32.c
+++ b/src/libmpg123/synth_s32.c
@@ -7,8 +7,8 @@
 */
 
 #include "mpg123lib_intern.h"
-#include "sample.h"
-#include "debug.h"
+#include "../common/sample.h"
+#include "../common/debug.h"
 
 #ifdef REAL_IS_FIXED
 #error "Do not build this file with fixed point math!"
diff --git a/src/libmpg123/system.c b/src/libmpg123/system.c
index 37cbfce9..bad5d9db 100644
--- a/src/libmpg123/system.c
+++ b/src/libmpg123/system.c
@@ -19,8 +19,8 @@
 #include <stdio.h>
 #include <errno.h>
 
-#include "mpg123app.h" <<<--- nope!
-#include "debug.h"
+#include "../mpg123app.h" <<<--- nope!
+#include "../common/debug.h"
 
 static int filept;
 static int verbose = 1;
diff --git a/src/libmpg123/tabinit.c b/src/libmpg123/tabinit.c
index 00da7c12..1a31f8a8 100644
--- a/src/libmpg123/tabinit.c
+++ b/src/libmpg123/tabinit.c
@@ -7,7 +7,7 @@
 */
 
 #include "mpg123lib_intern.h"
-#include "debug.h"
+#include "../common/debug.h"
 
 // The (normally precomputed) cos tables.
 #include "costabs.h"
diff --git a/src/libout123/buffer.c b/src/libout123/buffer.c
index 3b074357..f99cd2ff 100644
--- a/src/libout123/buffer.c
+++ b/src/libout123/buffer.c
@@ -45,7 +45,7 @@
 #endif
 #endif
 
-#include "debug.h"
+#include "../common/debug.h"
 
 #define BUF_CMD_OPEN     XF_CMD_CUSTOM1
 #define BUF_CMD_CLOSE    XF_CMD_CUSTOM2
diff --git a/src/libout123/buffer.h b/src/libout123/buffer.h
index 44215939..3be4b71b 100644
--- a/src/libout123/buffer.h
+++ b/src/libout123/buffer.h
@@ -17,7 +17,7 @@
 #define _MPG123_BUFFER_H_
 
 #include "out123_int.h"
-#include "compat.h"
+#include "../compat/compat.h"
 
 int  INT123_buffer_init(out123_handle *ao, size_t bytes);
 void INT123_buffer_exit(out123_handle *ao);
diff --git a/src/libout123/hextxt.c b/src/libout123/hextxt.c
index 74f59e36..de7c58de 100644
--- a/src/libout123/hextxt.c
+++ b/src/libout123/hextxt.c
@@ -19,7 +19,7 @@
 
 #include "out123_int.h"
 #include "hextxt.h"
-#include "debug.h"
+#include "../common/debug.h"
 
 int hex_formats(out123_handle *ao)
 {
diff --git a/src/libout123/legacy_module.c b/src/libout123/legacy_module.c
index 03354b43..5ae3aa16 100644
--- a/src/libout123/legacy_module.c
+++ b/src/libout123/legacy_module.c
@@ -7,7 +7,7 @@
 */
 
 #include "out123_int.h"
-#include "debug.h"
+#include "../common/debug.h"
 
 /* A single module is staticly compiled in for each type */
 extern mpg123_module_t mpg123_output_module_info;
diff --git a/src/libout123/libout123.c b/src/libout123/libout123.c
index 80eaf5c0..44dd52bc 100644
--- a/src/libout123/libout123.c
+++ b/src/libout123/libout123.c
@@ -32,7 +32,7 @@
 #endif
 #endif
 
-#include "version.h"
+#include "../version.h"
 #include "wav.h"
 #include "hextxt.h"
 #ifndef NOXFERMEM
@@ -44,7 +44,7 @@ static int have_buffer(out123_handle *ao)
 #endif
 #include "stringlists.h"
 
-#include "debug.h"
+#include "../common/debug.h"
 
 const char * attribute_align_arg out123_distversion(unsigned int *major, unsigned int *minor, unsigned int *patch)
 {
diff --git a/src/libout123/module.c b/src/libout123/module.c
index 7ede2d3c..7fae87ae 100644
--- a/src/libout123/module.c
+++ b/src/libout123/module.c
@@ -11,11 +11,11 @@
 #define _BSD_SOURCE
 #include "config.h"
 #include "stringlists.h"
-#include "compat.h"
+#include "../compat/compat.h"
 #include <errno.h>
 
 #include "module.h"
-#include "debug.h"
+#include "../common/debug.h"
 
 #ifndef USE_MODULES
 #error This is a build without modules. Why am I here?
diff --git a/src/libout123/modules/aix.c b/src/libout123/modules/aix.c
index b26b14a8..fdd8cb5c 100644
--- a/src/libout123/modules/aix.c
+++ b/src/libout123/modules/aix.c
@@ -23,7 +23,7 @@
 #include <sys/stat.h>
 #include <sys/param.h>
 
-#include "debug.h"
+#include "../../common/debug.h"
 
 /* use AUDIO_BSIZE to set the msec for audio buffering in Ultimedia library
  */
diff --git a/src/libout123/modules/alib.c b/src/libout123/modules/alib.c
index 0e60f9b7..63f73954 100644
--- a/src/libout123/modules/alib.c
+++ b/src/libout123/modules/alib.c
@@ -44,7 +44,7 @@
 #include <Alib.h>   /* /opt/audio/include */
 #include <CUlib.h>  /* /opt/audio/include */
 
-#include "debug.h"
+#include "../../common/debug.h"
 
 /**************************************************************************/
 
diff --git a/src/libout123/modules/alsa.c b/src/libout123/modules/alsa.c
index ad94d4cb..11d172aa 100644
--- a/src/libout123/modules/alsa.c
+++ b/src/libout123/modules/alsa.c
@@ -27,7 +27,7 @@
 #include <alloca.h> /* GCC complains about missing declaration of alloca. */
 #include <alsa/asoundlib.h>
 
-#include "debug.h"
+#include "../../common/debug.h"
 
 /* Total buffer size in seconds, 0.2 is more true to what ALSA maximally uses
    here (8192 samples). The earlier default of 0.5 was never true. */
diff --git a/src/libout123/modules/arts.c b/src/libout123/modules/arts.c
index 70168499..3d3b0165 100644
--- a/src/libout123/modules/arts.c
+++ b/src/libout123/modules/arts.c
@@ -10,7 +10,7 @@
 
 #include "../out123_int.h"
 #include <artsc.h>
-#include "debug.h"
+#include "../../common/debug.h"
 
 typedef struct
 {
diff --git a/src/libout123/modules/coreaudio.c b/src/libout123/modules/coreaudio.c
index 665c9d87..a4286814 100644
--- a/src/libout123/modules/coreaudio.c
+++ b/src/libout123/modules/coreaudio.c
@@ -46,7 +46,7 @@
 #define SFIFO_STATIC
 #include "../sfifo.c"
 
-#include "debug.h"
+#include "../../common/debug.h"
 
 /* Duration of the ring buffer in seconds.
    Is that all that there is to tunable latency?
diff --git a/src/libout123/modules/dummy.c b/src/libout123/modules/dummy.c
index 83caa096..8cc3ce5d 100644
--- a/src/libout123/modules/dummy.c
+++ b/src/libout123/modules/dummy.c
@@ -6,7 +6,7 @@
 */
 
 #include "../out123_int.h"
-#include "debug.h"
+#include "../../common/debug.h"
 
 static int open_dummy(out123_handle *ao)
 {
diff --git a/src/libout123/modules/esd.c b/src/libout123/modules/esd.c
index 1b80b224..b4465728 100644
--- a/src/libout123/modules/esd.c
+++ b/src/libout123/modules/esd.c
@@ -22,7 +22,7 @@
 #include <sys/ioctl.h>
 #include <sys/audioio.h>
 #endif
-#include "debug.h"
+#include "../../common/debug.h"
 
 static unsigned esd_rate = 0, esd_format = 0, esd_channels = 0;
 
diff --git a/src/libout123/modules/hp.c b/src/libout123/modules/hp.c
index 734ace91..464dfda6 100644
--- a/src/libout123/modules/hp.c
+++ b/src/libout123/modules/hp.c
@@ -9,7 +9,7 @@
 #include "../out123_int.h"
 #include <fcntl.h>
 #include <sys/audio.h>
-#include "debug.h"
+#include "../../common/debug.h"
 
 
 static int set_rate(out123_handle *ao)
diff --git a/src/libout123/modules/jack.c b/src/libout123/modules/jack.c
index f6fa6818..9616cea2 100644
--- a/src/libout123/modules/jack.c
+++ b/src/libout123/modules/jack.c
@@ -26,7 +26,7 @@
 #include <semaphore.h>
 #include <sys/errno.h>
 
-#include "debug.h"
+#include "../../common/debug.h"
 
 typedef struct {
 	int alive;
diff --git a/src/libout123/modules/mint.c b/src/libout123/modules/mint.c
index bd607bb3..e8cf191e 100644
--- a/src/libout123/modules/mint.c
+++ b/src/libout123/modules/mint.c
@@ -12,7 +12,7 @@
 #include <fcntl.h>
 #include <ioctl.h>
 #include <audios.h>
-#include "debug.h"
+#include "../../common/debug.h"
 
 /* Globals */
 /* extern int outburst; */
diff --git a/src/libout123/modules/nas.c b/src/libout123/modules/nas.c
index 2c083029..0b5737ca 100644
--- a/src/libout123/modules/nas.c
+++ b/src/libout123/modules/nas.c
@@ -10,7 +10,7 @@
 #include <fcntl.h>
 #include <audio/audiolib.h>
 #include <audio/soundlib.h>
-#include "debug.h"
+#include "../../common/debug.h"
 
 typedef struct
 {
diff --git a/src/libout123/modules/openal.c b/src/libout123/modules/openal.c
index c324aa06..0db2c805 100644
--- a/src/libout123/modules/openal.c
+++ b/src/libout123/modules/openal.c
@@ -25,7 +25,7 @@
 #include <errno.h>
 #include <unistd.h>
 
-#include "debug.h"
+#include "../../common/debug.h"
 
 #define NUM_BUFFERS 16
 
diff --git a/src/libout123/modules/os2.c b/src/libout123/modules/os2.c
index 150456a1..62b93bd6 100644
--- a/src/libout123/modules/os2.c
+++ b/src/libout123/modules/os2.c
@@ -20,7 +20,7 @@
 #include <stdlib.h>
 #include <ctype.h>
 
-#include "debug.h"
+#include "../../common/debug.h"
 
 // Only one instance at a time! This all needs to go into userptr!
 static BOOL opened = FALSE;
diff --git a/src/libout123/modules/oss.c b/src/libout123/modules/oss.c
index 711ef08a..5505bc0d 100644
--- a/src/libout123/modules/oss.c
+++ b/src/libout123/modules/oss.c
@@ -39,7 +39,7 @@
 # endif
 #endif
 
-#include "debug.h"
+#include "../../common/debug.h"
 
 struct oss_stuff
 {
diff --git a/src/libout123/modules/portaudio.c b/src/libout123/modules/portaudio.c
index 389b541e..e8d74b72 100644
--- a/src/libout123/modules/portaudio.c
+++ b/src/libout123/modules/portaudio.c
@@ -21,7 +21,7 @@
 #define SFIFO_STATIC
 #include "../sfifo.c"
 
-#include "debug.h"
+#include "../../common/debug.h"
 
 #define SAMPLE_SIZE			(2)
 #define FRAMES_PER_BUFFER	(256)
diff --git a/src/libout123/modules/pulse.c b/src/libout123/modules/pulse.c
index b3922b81..74939cc5 100644
--- a/src/libout123/modules/pulse.c
+++ b/src/libout123/modules/pulse.c
@@ -19,7 +19,7 @@
 #include <pulse/error.h>
 #include <pulse/pulseaudio.h>
 
-#include "debug.h"
+#include "../../common/debug.h"
 
 // Since we learned the async API for enumeration, let's abuse it for
 // a simple check if a pulse server is active before accidentally
diff --git a/src/libout123/modules/qsa.c b/src/libout123/modules/qsa.c
index 05c9ec29..c541eda5 100644
--- a/src/libout123/modules/qsa.c
+++ b/src/libout123/modules/qsa.c
@@ -13,7 +13,7 @@
 #include <stdint.h>
 #include <sys/asoundlib.h>
 
-#include "debug.h"
+#include "../../common/debug.h"
 
 typedef struct _qsa_mp_map
 {
diff --git a/src/libout123/modules/sdl.c b/src/libout123/modules/sdl.c
index 987829a1..e47697f0 100644
--- a/src/libout123/modules/sdl.c
+++ b/src/libout123/modules/sdl.c
@@ -23,7 +23,7 @@
 #define SFIFO_STATIC
 #include "../sfifo.c"
 
-#include "debug.h"
+#include "../../common/debug.h"
 
 
 #define SAMPLE_SIZE			(2)
diff --git a/src/libout123/modules/sgi.c b/src/libout123/modules/sgi.c
index 7969f041..606efa87 100644
--- a/src/libout123/modules/sgi.c
+++ b/src/libout123/modules/sgi.c
@@ -9,8 +9,8 @@
 #include "../out123_int.h"
 #include <fcntl.h>
 #include <dmedia/audio.h>
-#include "errno.h"
-#include "debug.h"
+#include <errno.h>
+#include "../../common/debug.h"
 
 static int set_rate(out123_handle *ao, ALconfig config)
 {
diff --git a/src/libout123/modules/sndio.c b/src/libout123/modules/sndio.c
index bd4add0e..726d2663 100644
--- a/src/libout123/modules/sndio.c
+++ b/src/libout123/modules/sndio.c
@@ -21,7 +21,7 @@
 
 #include <sndio.h>
 
-#include "debug.h"
+#include "../../common/debug.h"
 
 static int sndio_to_mpg123_enc(int sign, int bits)
 {
diff --git a/src/libout123/modules/sun.c b/src/libout123/modules/sun.c
index 8400e30d..457026fe 100644
--- a/src/libout123/modules/sun.c
+++ b/src/libout123/modules/sun.c
@@ -29,7 +29,7 @@
 #endif
 
 #include <fcntl.h>
-#include "debug.h"
+#include "../../common/debug.h"
 
 static void set_format_helper(out123_handle *ao, audio_info_t *ainfo)
 {
diff --git a/src/libout123/modules/tinyalsa.c b/src/libout123/modules/tinyalsa.c
index acc2c60f..8c6f35b7 100644
--- a/src/libout123/modules/tinyalsa.c
+++ b/src/libout123/modules/tinyalsa.c
@@ -12,7 +12,7 @@
 
 #include <tinyalsa/asoundlib.h>
 
-#include "debug.h"
+#include "../../common/debug.h"
 
 
 typedef struct
diff --git a/src/libout123/modules/win32.c b/src/libout123/modules/win32.c
index 77ae3457..ef2731cb 100644
--- a/src/libout123/modules/win32.c
+++ b/src/libout123/modules/win32.c
@@ -11,7 +11,7 @@
 
 #include "../out123_int.h"
 #include <windows.h>
-#include "debug.h"
+#include "../../common/debug.h"
 
 /*
     Buffer size and number of buffers in the playback ring
diff --git a/src/libout123/modules/win32_wasapi.c b/src/libout123/modules/win32_wasapi.c
index 59d4de08..8dfd3540 100644
--- a/src/libout123/modules/win32_wasapi.c
+++ b/src/libout123/modules/win32_wasapi.c
@@ -21,7 +21,7 @@
 #include <mmdeviceapi.h>
 #include <avrt.h>
 #include <functiondiscoverykeys_devpkey.h>
-#include "debug.h"
+#include "../../common/debug.h"
 
 #ifdef _MSC_VER
 
diff --git a/src/libout123/out123_int.h b/src/libout123/out123_int.h
index e597ef9c..6d30af6f 100644
--- a/src/libout123/out123_int.h
+++ b/src/libout123/out123_int.h
@@ -12,8 +12,8 @@
 #define MPG123_ENUM_API
 
 #include "config.h"
-#include "abi_align.h"
-#include "compat.h"
+#include "../common/abi_align.h"
+#include "../compat/compat.h"
 #include "out123.h"
 #include "module.h"
 
diff --git a/src/libout123/sfifo.c b/src/libout123/sfifo.c
index 0cf26beb..13dd230f 100644
--- a/src/libout123/sfifo.c
+++ b/src/libout123/sfifo.c
@@ -19,7 +19,7 @@ TODO:
 #include	<stdlib.h>
 
 #include "sfifo.h"
-#include "debug.h"
+#include "../common/debug.h"
 
 /*
  * Alloc buffer, init FIFO etc...
diff --git a/src/libout123/stringlists.c b/src/libout123/stringlists.c
index 203f3c14..8630ffaf 100644
--- a/src/libout123/stringlists.c
+++ b/src/libout123/stringlists.c
@@ -10,7 +10,7 @@
 	functions just for returning driver module lists.
 */
 
-#include "compat.h"
+#include "../compat/compat.h"
 #include "out123.h"
 
 static char* always_strdup(const char *in)
diff --git a/src/libout123/wav.c b/src/libout123/wav.c
index 7f852b11..230a101a 100644
--- a/src/libout123/wav.c
+++ b/src/libout123/wav.c
@@ -28,7 +28,7 @@
 #include "wav.h"
 
 #include <errno.h>
-#include "debug.h"
+#include "../common/debug.h"
 
 /* Create the two WAV headers. */
 
diff --git a/src/libout123/xfermem.c b/src/libout123/xfermem.c
index fb638e64..486fd015 100644
--- a/src/libout123/xfermem.c
+++ b/src/libout123/xfermem.c
@@ -10,7 +10,7 @@
 */
 
 #include "config.h"
-#include "compat.h"
+#include "../compat/compat.h"
 #include "xfermem.h"
 #include <string.h>
 #include <errno.h>
@@ -24,7 +24,7 @@
 #include <sys/shm.h>
 #endif
 
-#include "debug.h"
+#include "../common/debug.h"
 
 #if defined (HAVE_MMAP) && defined(MAP_ANONYMOUS) && !defined(MAP_ANON)
 #define MAP_ANON MAP_ANONYMOUS
diff --git a/src/libout123/xfermem.h b/src/libout123/xfermem.h
index d6232660..6c6fc8f3 100644
--- a/src/libout123/xfermem.h
+++ b/src/libout123/xfermem.h
@@ -20,7 +20,7 @@
 #ifndef _XFERMEM_H_
 #define _XFERMEM_H_
 
-#include "compat.h"
+#include "../compat/compat.h"
 
 typedef struct {
 	size_t freeindex;	/* [W] next free index */
diff --git a/src/libsyn123/libsyn123.c b/src/libsyn123/libsyn123.c
index 142ba30d..a68c43f9 100644
--- a/src/libsyn123/libsyn123.c
+++ b/src/libsyn123/libsyn123.c
@@ -20,9 +20,9 @@
 */
 
 #include "syn123_int.h"
-#include "version.h"
-#include "sample.h"
-#include "debug.h"
+#include "../version.h"
+#include "../common/sample.h"
+#include "../common/debug.h"
 
 const char * attribute_align_arg syn123_distversion(unsigned int *major, unsigned int *minor, unsigned int *patch)
 {
diff --git a/src/libsyn123/resample.c b/src/libsyn123/resample.c
index 64d89af6..adee8a67 100644
--- a/src/libsyn123/resample.c
+++ b/src/libsyn123/resample.c
@@ -82,7 +82,7 @@ TODO: initialize with first sample or zero? is there an actual benefit? impulse
 // SSIZE_MAX is not standard C:-/
 #define _POSIX_C_SOURCE 200809L
 #include "syn123_int.h"
-#include "debug.h"
+#include "../common/debug.h"
 
 // coefficient tables generated from coeff-ellip-6-0.01-36-16.txd
 // (coeff-{filter_type}-{order}-{passband_ripple}-{rejection_dB}-{points})
diff --git a/src/libsyn123/sampleconv.c b/src/libsyn123/sampleconv.c
index 3dce2f87..765761f2 100644
--- a/src/libsyn123/sampleconv.c
+++ b/src/libsyn123/sampleconv.c
@@ -19,8 +19,8 @@
 #define NO_SMAX
 #define RAND_XORSHIFT32
 #include "syn123_int.h"
-#include "sample.h"
-#include "debug.h"
+#include "../common/sample.h"
+#include "../common/debug.h"
 // Avoid conflict with pragmas in isnan() and friends.
 #undef warning
 
@@ -988,7 +988,7 @@ mix_end:
 
 /* All the byte-swappery for those little big endian boxes. */
 
-#include "swap_bytes_impl.h"
+#include "../common/swap_bytes_impl.h"
 
 void attribute_align_arg
 syn123_swap_bytes(void* buf, size_t samplesize, size_t samplecount)
diff --git a/src/libsyn123/syn123_int.h b/src/libsyn123/syn123_int.h
index fecebbd8..70292b28 100644
--- a/src/libsyn123/syn123_int.h
+++ b/src/libsyn123/syn123_int.h
@@ -17,8 +17,8 @@
 #ifdef LFS_LARGEFILE_64
 #define _LARGEFILE64_SOURCE
 #endif
-#include "abi_align.h"
-#include "compat.h"
+#include "../common/abi_align.h"
+#include "../compat/compat.h"
 
 #define SYN123_NO_LARGEFUNC
 #include "syn123.h"
diff --git a/src/libsyn123/volume.c b/src/libsyn123/volume.c
index a80851d0..491ae14a 100644
--- a/src/libsyn123/volume.c
+++ b/src/libsyn123/volume.c
@@ -11,7 +11,7 @@
 #define NO_GROW_BUF
 #define NO_SMAX
 #include "syn123_int.h"
-#include "debug.h"
+#include "../common/debug.h"
 // Avoid conflict with pragmas in isnan() and friends.
 #undef warning
 
diff --git a/src/local.c b/src/local.c
index a1483445..4875314d 100644
--- a/src/local.c
+++ b/src/local.c
@@ -22,7 +22,7 @@
 #ifdef HAVE_LANGINFO_H
 #include <langinfo.h>
 #endif
-#include "compat.h"
+#include "compat/compat.h"
 
 #include "local.h"
 
@@ -39,7 +39,7 @@
 #include <wincon.h>
 #endif
 
-#include "debug.h"
+#include "common/debug.h"
 
 int utf8force = 0; // enforce UTF-8 workings
 int utf8env = 0; // produce UTF-8 text output
diff --git a/src/metaprint.c b/src/metaprint.c
index 5f5d6a4e..6ff18f3c 100644
--- a/src/metaprint.c
+++ b/src/metaprint.c
@@ -19,7 +19,7 @@
 
 #include "metaprint.h"
 
-#include "debug.h"
+#include "common/debug.h"
 
 int meta_show_lyrics = 0;
 
diff --git a/src/mpg123-id3dump.c b/src/mpg123-id3dump.c
index 2defce19..73e2fc0c 100644
--- a/src/mpg123-id3dump.c
+++ b/src/mpg123-id3dump.c
@@ -11,7 +11,7 @@
 #define _BSD_SOURCE
 #include "config.h"
 #include "version.h"
-#include "compat.h"
+#include "compat/compat.h"
 #if defined(WIN32) && defined(DYNAMIC_BUILD)
 #define LINK_MPG123_DLL
 #endif
@@ -21,7 +21,7 @@
 #include <ctype.h>
 #include "win32_support.h"
 
-#include "debug.h"
+#include "common/debug.h"
 
 static int errors = 0;
 
diff --git a/src/mpg123-strip.c b/src/mpg123-strip.c
index 9b1fb0b3..8433ca44 100644
--- a/src/mpg123-strip.c
+++ b/src/mpg123-strip.c
@@ -8,7 +8,7 @@
 
 #include "config.h"
 #include "version.h"
-#include "compat.h"
+#include "compat/compat.h"
 
 #if defined(WIN32) && defined(DYNAMIC_BUILD)
 #define LINK_MPG123_DLL
diff --git a/src/mpg123.c b/src/mpg123.c
index f3b660a4..61d39dc6 100644
--- a/src/mpg123.c
+++ b/src/mpg123.c
@@ -44,7 +44,7 @@
 #include "httpget.h"
 #include "streamdump.h"
 
-#include "debug.h"
+#include "common/debug.h"
 
 static void usage(int err);
 static void want_usage(char* arg, topt *);
diff --git a/src/mpg123app.h b/src/mpg123app.h
index 396344fc..40149c6f 100644
--- a/src/mpg123app.h
+++ b/src/mpg123app.h
@@ -22,7 +22,7 @@
 #endif
 
 /* everyone needs it */
-#include "compat.h"
+#include "compat/compat.h"
 /* import DLL symbols on windows */
 
 #include "httpget.h"
diff --git a/src/net123_exec.c b/src/net123_exec.c
index f005aa5d..ff3bc5a8 100644
--- a/src/net123_exec.c
+++ b/src/net123_exec.c
@@ -26,9 +26,9 @@
 // Just for parameter struct that we use for HTTP auth and proxy info.
 #include "mpg123app.h"
 
-#include "compat.h"
+#include "compat/compat.h"
 
-#include "debug.h"
+#include "common/debug.h"
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <unistd.h>
diff --git a/src/net123_winhttp.c b/src/net123_winhttp.c
index 26f797f5..d1a379fe 100644
--- a/src/net123_winhttp.c
+++ b/src/net123_winhttp.c
@@ -1,8 +1,8 @@
 #include "config.h"
 #include "version.h"
 #include "net123.h"
-#include "compat.h"
-#include "debug.h"
+#include "compat/compat.h"
+#include "common/debug.h"
 #include <ws2tcpip.h>
 #include <winhttp.h>
 
diff --git a/src/net123_wininet.c b/src/net123_wininet.c
index eb706c9a..e23c9194 100644
--- a/src/net123_wininet.c
+++ b/src/net123_wininet.c
@@ -1,8 +1,8 @@
 #include "config.h"
 #include "version.h"
 #include "net123.h"
-#include "compat.h"
-#include "debug.h"
+#include "compat/compat.h"
+#include "common/debug.h"
 #include <ws2tcpip.h>
 #include <wininet.h>
 
diff --git a/src/out123.c b/src/out123.c
index 2adc936a..1a1d7560 100644
--- a/src/out123.c
+++ b/src/out123.c
@@ -29,7 +29,7 @@
 #define ME "out123"
 #include "config.h"
 #include "version.h"
-#include "compat.h"
+#include "compat/compat.h"
 #include <ctype.h>
 #if _WIN32
 #include "win32_support.h"
@@ -62,7 +62,7 @@
 #include "syn123.h"
 #include "filters.h"
 
-#include "debug.h"
+#include "common/debug.h"
 
 /* be paranoid about setpriority support */
 #ifndef PRIO_PROCESS
diff --git a/src/playlist.c b/src/playlist.c
index 4a4648c7..4e124a16 100644
--- a/src/playlist.c
+++ b/src/playlist.c
@@ -22,7 +22,7 @@
 #include "local.h"
 #include "metaprint.h"
 #include <time.h> /* For srand(). */
-#include "debug.h"
+#include "common/debug.h"
 
 #ifdef HAVE_RANDOM
 #define RAND random
diff --git a/src/resolver.c b/src/resolver.c
index 4c451eb1..09435b56 100644
--- a/src/resolver.c
+++ b/src/resolver.c
@@ -16,7 +16,7 @@
 #include "mpg123app.h"
 
 #ifdef NETWORK
-#include "true.h"
+#include "common/true.h"
 #include "resolver.h"
 #if !defined (WANT_WIN32_SOCKETS)
 #include <netdb.h>
@@ -39,7 +39,7 @@
 #include <sys/types.h>
 #endif
 #include <unistd.h>
-#include "debug.h"
+#include "common/debug.h"
 
 int split_url(mpg123_string *url, mpg123_string *auth, mpg123_string *host, mpg123_string *port, mpg123_string *path)
 {
diff --git a/src/streamdump.c b/src/streamdump.c
index d7f8a6b1..e6b9bd20 100644
--- a/src/streamdump.c
+++ b/src/streamdump.c
@@ -16,7 +16,7 @@
 #include "streamdump.h"
 #include <fcntl.h>
 #include <errno.h>
-#include "debug.h"
+#include "common/debug.h"
 
 #ifndef O_BINARY
 #define O_BINARY 0
diff --git a/src/sysutil.c b/src/sysutil.c
index d3b89690..99c941f7 100644
--- a/src/sysutil.c
+++ b/src/sysutil.c
@@ -10,7 +10,7 @@
 #include <sys/stat.h>
 #include "sysutil.h"
 
-#include "debug.h"
+#include "common/debug.h"
 
 #if 0
 /* removed the strndup for better portability */
diff --git a/src/term.c b/src/term.c
index 4e4fcf63..7d5a8069 100644
--- a/src/term.c
+++ b/src/term.c
@@ -14,7 +14,7 @@
 #include "common.h"
 #include "playlist.h"
 #include "metaprint.h"
-#include "debug.h"
+#include "common/debug.h"
 
 static int term_enable = 0;
 static const char *extrabreak = "";
diff --git a/src/term_posix.c b/src/term_posix.c
index 45813beb..b262b7cd 100644
--- a/src/term_posix.c
+++ b/src/term_posix.c
@@ -22,7 +22,7 @@
 #include <os2.h>
 #endif
 
-#include "compat.h"
+#include "compat/compat.h"
 
 #ifndef HAVE_TERMIOS
 #error "No TERMIOS? Here?"
@@ -36,7 +36,7 @@
 
 #include "terms.h"
 
-#include "debug.h"
+#include "common/debug.h"
 
 static int term_is_fun = -1;
 // This now always refers to a ;freshly opened terminal descriptor (e.g. /dev/tty).
diff --git a/src/term_win32.c b/src/term_win32.c
index 88faa228..be1eca41 100644
--- a/src/term_win32.c
+++ b/src/term_win32.c
@@ -14,7 +14,7 @@
 
 
 #include "config.h"
-#include "compat.h"
+#include "compat/compat.h"
 
 #include "terms.h"
 
@@ -24,7 +24,7 @@
 #include <windows.h>
 #include <wincon.h>
 
-#include "debug.h"
+#include "common/debug.h"
 
 static HANDLE consoleintput = INVALID_HANDLE_VALUE;
 static HANDLE consoleoutput = INVALID_HANDLE_VALUE;
diff --git a/src/tests/decode_fixed.c b/src/tests/decode_fixed.c
index 9d32ff89..e0c67a07 100644
--- a/src/tests/decode_fixed.c
+++ b/src/tests/decode_fixed.c
@@ -1,6 +1,6 @@
-#include "compat.h"
+#include "../compat/compat.h"
 #include <mpg123.h>
-#include "debug.h"
+#include "../common/debug.h"
 
 
 int work(mpg123_handle *mh, int ch, int enc)
diff --git a/src/tests/plain_id3.c b/src/tests/plain_id3.c
index b3038e1d..e5fc64a7 100644
--- a/src/tests/plain_id3.c
+++ b/src/tests/plain_id3.c
@@ -1,8 +1,8 @@
 /* Just printing out ID3 tags with plain data from libmpg123 and explicitly called conversion routine. */
 
-#include "compat.h"
+#include "../compat/compat.h"
 #include <mpg123.h>
-#include "debug.h"
+#include "../common/debug.h"
 
 int test_whence(const char* path, int scan_before)
 {
diff --git a/src/tests/seek_accuracy.c b/src/tests/seek_accuracy.c
index dd34b3f0..c0df12b4 100644
--- a/src/tests/seek_accuracy.c
+++ b/src/tests/seek_accuracy.c
@@ -12,7 +12,7 @@
 #include <stdio.h>
 #include <fcntl.h>
 #include "mpg123.h"
-#include "compat.h"
+#include "../compat/compat.h"
 
 #define SAMPLES 187
 /* Cannot use the const value as fixed array size:-( */
diff --git a/src/tests/seek_whence.c b/src/tests/seek_whence.c
index eb082f00..5f36d084 100644
--- a/src/tests/seek_whence.c
+++ b/src/tests/seek_whence.c
@@ -1,6 +1,6 @@
-#include "compat.h"
+#include "../compat/compat.h"
 #include <mpg123.h>
-#include "debug.h"
+#include "../common/debug.h"
 
 int test_whence(const char* path, int scan_before)
 {
diff --git a/src/tests/sweeper.c b/src/tests/sweeper.c
index 3807ecb9..c3246641 100644
--- a/src/tests/sweeper.c
+++ b/src/tests/sweeper.c
@@ -2,7 +2,7 @@
 #include <syn123.h>
 #include <out123.h>
 
-#include "compat.h"
+#include "../compat/compat.h"
 
 static long block_rate(long rate, double speed, double factor, off_t bi)
 {
diff --git a/src/tests/text.c b/src/tests/text.c
index c7287b3c..23c136bf 100644
--- a/src/tests/text.c
+++ b/src/tests/text.c
@@ -9,7 +9,7 @@
 */
 
 #include <mpg123.h>
-#include <compat.h>
+#include "../compat/compat.h"
 
 #include "testtext.h"
 
diff --git a/src/tests/textprint.c b/src/tests/textprint.c
index 80ef6f24..ed697fd3 100644
--- a/src/tests/textprint.c
+++ b/src/tests/textprint.c
@@ -8,8 +8,8 @@
 	initially written by Thomas Orgis
 */
 
-#include "mpg123app.h"
-#include "local.h"
+#include "../mpg123app.h"
+#include "../local.h"
 
 // A number of UTF-8 strings to test.
 
diff --git a/src/win32_net.c b/src/win32_net.c
index 3418b6c6..e633312a 100755
--- a/src/win32_net.c
+++ b/src/win32_net.c
@@ -8,7 +8,7 @@
 
 #include "win32_support.h"
 #include "mpg123app.h"
-#include "debug.h"
+#include "common/debug.h"
 
 #ifdef DEBUG
 #define msgme(x) win32_net_msg(x,__FILE__,__LINE__)
diff --git a/src/win32_support.c b/src/win32_support.c
index 2e68ed5d..c8d148e1 100755
--- a/src/win32_support.c
+++ b/src/win32_support.c
@@ -1,6 +1,6 @@
 #include "config.h"
 #include "mpg123app.h"
-#include "debug.h"
+#include "common/debug.h"
 
 #ifdef WANT_WIN32_UNICODE