diff --git a/azbox/Makefile.am b/azbox/Makefile.am
index 0e6b74f..37269a0 100644
--- a/azbox/Makefile.am
+++ b/azbox/Makefile.am
@@ -1,7 +1,8 @@
 noinst_LTLIBRARIES = libazbox.la
 
 AM_CPPFLAGS = \
-	-I$(top_srcdir)/common
+	-I$(top_srcdir)/common \
+	-I$(top_srcdir)/include
 
 AM_CXXFLAGS = -fno-rtti -fno-exceptions -fno-strict-aliasing
 AM_LDFLAGS = -lpthread
diff --git a/azbox/audio_lib.h b/azbox/audio_lib.h
index 871060d..944fc11 100644
--- a/azbox/audio_lib.h
+++ b/azbox/audio_lib.h
@@ -3,7 +3,7 @@
 #ifndef _AUDIO_LIB_H_
 #define _AUDIO_LIB_H_
 
-#include "../common/cs_types.h"
+#include <cs_types.h>
 
 typedef enum
 {
diff --git a/azbox/dmx_lib.h b/azbox/dmx_lib.h
index 754511e..440d92d 100644
--- a/azbox/dmx_lib.h
+++ b/azbox/dmx_lib.h
@@ -6,7 +6,7 @@
 #include <inttypes.h>
 #include <sys/ioctl.h>
 #include <linux/dvb/dmx.h>
-#include "../common/cs_types.h"
+#include <cs_types.h>
 
 #define MAX_DMX_UNITS 4
 
diff --git a/azbox/video_lib.h b/azbox/video_lib.h
index c7286e9..00e33d2 100644
--- a/azbox/video_lib.h
+++ b/azbox/video_lib.h
@@ -2,7 +2,7 @@
 #define _VIDEO_TD_H
 
 #include <linux/dvb/video.h>
-#include "../common/cs_types.h"
+#include <cs_types.h>
 #include "dmx_lib.h"
 
 typedef enum {
diff --git a/common/Makefile.am b/common/Makefile.am
index 918a268..db959db 100644
--- a/common/Makefile.am
+++ b/common/Makefile.am
@@ -2,6 +2,9 @@ noinst_LTLIBRARIES = libcommon.la
 
 AM_CXXFLAGS = -fno-rtti -fno-exceptions -fno-strict-aliasing
 
+AM_CXXFLAGS += \
+	-I $(top_srcdir)/include
+
 libcommon_la_SOURCES = \
 	ca.cpp \
 	lt_debug.c \
diff --git a/common/hardware_caps.h b/common/hardware_caps.h
deleted file mode 120000
index 3bb479b..0000000
--- a/common/hardware_caps.h
+++ /dev/null
@@ -1 +0,0 @@
-../include/hardware_caps.h
\ No newline at end of file
diff --git a/generic-pc/Makefile.am b/generic-pc/Makefile.am
index f4dbbc7..04988c3 100644
--- a/generic-pc/Makefile.am
+++ b/generic-pc/Makefile.am
@@ -2,7 +2,8 @@ noinst_LTLIBRARIES = libgeneric.la
 
 AM_CPPFLAGS = -D__STDC_FORMAT_MACROS -D__STDC_CONSTANT_MACROS
 AM_CPPFLAGS += \
-	-I$(top_srcdir)/common
+	-I$(top_srcdir)/common \
+	-I$(top_srcdir)/include
 
 AM_CXXFLAGS = -fno-rtti -fno-exceptions -fno-strict-aliasing
 
diff --git a/generic-pc/audio_lib.h b/generic-pc/audio_lib.h
index 36ad41a..e4b13c3 100644
--- a/generic-pc/audio_lib.h
+++ b/generic-pc/audio_lib.h
@@ -5,7 +5,7 @@
 
 #include <stdint.h>
 #include <OpenThreads/Thread>
-#include "../common/cs_types.h"
+#include <cs_types.h>
 
 typedef enum
 {
diff --git a/generic-pc/dmx_lib.h b/generic-pc/dmx_lib.h
index 754511e..440d92d 100644
--- a/generic-pc/dmx_lib.h
+++ b/generic-pc/dmx_lib.h
@@ -6,7 +6,7 @@
 #include <inttypes.h>
 #include <sys/ioctl.h>
 #include <linux/dvb/dmx.h>
-#include "../common/cs_types.h"
+#include <cs_types.h>
 
 #define MAX_DMX_UNITS 4
 
diff --git a/generic-pc/video_lib.h b/generic-pc/video_lib.h
index 72ce7e5..f3f2764 100644
--- a/generic-pc/video_lib.h
+++ b/generic-pc/video_lib.h
@@ -5,7 +5,7 @@
 #include <OpenThreads/Mutex>
 #include <vector>
 #include <linux/dvb/video.h>
-#include "../common/cs_types.h"
+#include <cs_types.h>
 #include "dmx_lib.h"
 extern "C" {
 #include <libavutil/rational.h>
diff --git a/common/ca.h b/include/ca.h
similarity index 100%
rename from common/ca.h
rename to include/ca.h
diff --git a/include/ca_cs.h b/include/ca_cs.h
index f05f210..dae70d6 100644
--- a/include/ca_cs.h
+++ b/include/ca_cs.h
@@ -1 +1 @@
-#include "../common/ca.h"
+#include "ca.h"
diff --git a/common/cs_types.h b/include/cs_types.h
similarity index 100%
rename from common/cs_types.h
rename to include/cs_types.h
diff --git a/include/lt_debug.h b/include/lt_debug.h
deleted file mode 100644
index 513f17d..0000000
--- a/include/lt_debug.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#include <config.h>
-#if HAVE_TRIPLEDRAGON
-#include "../libtriple/playback_td.h"
-#elif HAVE_SPARK_HARDWARE
-#include "../libspark/playback_lib.h"
-#else
-#error neither HAVE_TRIPLEDRAGON nor HAVE_SPARK_HARDWARE defined
-#endif
diff --git a/libspark/Makefile.am b/libspark/Makefile.am
index 6d0384c..789f61c 100644
--- a/libspark/Makefile.am
+++ b/libspark/Makefile.am
@@ -2,6 +2,7 @@ noinst_LTLIBRARIES = libspark.la
 
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/common \
+	-I$(top_srcdir)/include \
 	-I$(top_srcdir)/libeplayer3/include
 
 AM_CXXFLAGS = -fno-rtti -fno-exceptions -fno-strict-aliasing
diff --git a/libspark/audio_lib.h b/libspark/audio_lib.h
index a8b5362..7fa19c6 100644
--- a/libspark/audio_lib.h
+++ b/libspark/audio_lib.h
@@ -2,7 +2,7 @@
 
 #ifndef _AUDIO_TD_H_
 #define _AUDIO_TD_H_
-#include "../common/cs_types.h"
+#include <cs_types.h>
 
 typedef enum
 {
diff --git a/libspark/dmx_lib.h b/libspark/dmx_lib.h
index af87a02..8826ff4 100644
--- a/libspark/dmx_lib.h
+++ b/libspark/dmx_lib.h
@@ -6,7 +6,7 @@
 #include <inttypes.h>
 #include <sys/ioctl.h>
 #include <linux/dvb/dmx.h>
-#include "../common/cs_types.h"
+#include <cs_types.h>
 
 #define MAX_DMX_UNITS 4
 
diff --git a/libspark/video_lib.h b/libspark/video_lib.h
index d8fab63..dd8a109 100644
--- a/libspark/video_lib.h
+++ b/libspark/video_lib.h
@@ -2,7 +2,7 @@
 #define _VIDEO_TD_H
 
 #include <linux/dvb/video.h>
-#include "../common/cs_types.h"
+#include <cs_types.h>
 #include "dmx_lib.h"
 
 typedef enum {
diff --git a/libtriple/Makefile.am b/libtriple/Makefile.am
index 6df87cb..40f5518 100644
--- a/libtriple/Makefile.am
+++ b/libtriple/Makefile.am
@@ -2,6 +2,7 @@ noinst_LTLIBRARIES = libtriple.la
 
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/common \
+	-I$(top_srcdir)/include \
 	@DIRECTFB_CFLAGS@
 
 AM_CXXFLAGS = -fno-rtti -fno-exceptions -fno-strict-aliasing
diff --git a/libtriple/audio_td.h b/libtriple/audio_td.h
index bc320f1..b310428 100644
--- a/libtriple/audio_td.h
+++ b/libtriple/audio_td.h
@@ -4,7 +4,7 @@
 #define _AUDIO_TD_H_
 
 #include <hardware/aud/aud_inf.h>
-#include "../common/cs_types.h"
+#include <cs_types.h>
 
 typedef enum
 {
diff --git a/libtriple/dmx_td.h b/libtriple/dmx_td.h
index a253f3c..71f36dd 100644
--- a/libtriple/dmx_td.h
+++ b/libtriple/dmx_td.h
@@ -8,7 +8,7 @@ extern "C" {
 #include <sys/ioctl.h>
 #include <hardware/xp/xp_osd_user.h>
 }
-#include "../common/cs_types.h"
+#include <cs_types.h>
 #if defined DMX_FILTER_SIZE
 #undef DMX_FILTER_SIZE
 #endif
diff --git a/libtriple/video_td.h b/libtriple/video_td.h
index d689420..d50aaa6 100644
--- a/libtriple/video_td.h
+++ b/libtriple/video_td.h
@@ -4,7 +4,7 @@
 #include <hardware/vid/vid_inf.h>
 #define video_format_t          vidDispSize_t
 //#define video_displayformat_t   vidDispMode_t
-#include "../common/cs_types.h"
+#include <cs_types.h>
 #include "dmx_td.h"
 
 #define STB_HAL_VIDEO_HAS_GETSCREENIMAGE 1
diff --git a/raspi/audio_lib.h b/raspi/audio_lib.h
index cfd1b81..4e26e9d 100644
--- a/raspi/audio_lib.h
+++ b/raspi/audio_lib.h
@@ -4,7 +4,7 @@
 #define _AUDIO_LIB_H_
 
 #include <stdint.h>
-#include "../common/cs_types.h"
+#include <cs_types.h>
 
 typedef enum
 {
diff --git a/raspi/dmx_lib.h b/raspi/dmx_lib.h
index 754511e..440d92d 100644
--- a/raspi/dmx_lib.h
+++ b/raspi/dmx_lib.h
@@ -6,7 +6,7 @@
 #include <inttypes.h>
 #include <sys/ioctl.h>
 #include <linux/dvb/dmx.h>
-#include "../common/cs_types.h"
+#include <cs_types.h>
 
 #define MAX_DMX_UNITS 4
 
diff --git a/raspi/video_lib.h b/raspi/video_lib.h
index 07718b1..1cc953b 100644
--- a/raspi/video_lib.h
+++ b/raspi/video_lib.h
@@ -3,7 +3,7 @@
 
 #include <vector>
 #include <linux/dvb/video.h>
-#include "../common/cs_types.h"
+#include <cs_types.h>
 #include "dmx_lib.h"
 extern "C" {
 #include <libavutil/rational.h>