diff --git a/configure.ac b/configure.ac
index a4a8af4e7..fa8af0243 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_INIT(tuxbox-neutrino,1.0.1)
-AM_INIT_AUTOMAKE(tuxbox-neutrino,1.0.1)
+AM_INIT_AUTOMAKE([1.0.1 nostdinc])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES])
 
 TUXBOX_APPS
diff --git a/lib/libdvbsub/Makefile.am b/lib/libdvbsub/Makefile.am
index b27821edb..6d9c9c0b3 100644
--- a/lib/libdvbsub/Makefile.am
+++ b/lib/libdvbsub/Makefile.am
@@ -1,6 +1,7 @@
 INCLUDES = \
-	-I$(top_srcdir)/src/zapit/include \
-	-I$(top_srcdir)/src
+	-I$(top_srcdir) \
+	-I$(top_srcdir)/src \
+	-I$(top_srcdir)/src/zapit/include
 
 if BOXTYPE_COOL
 INCLUDES += -I$(top_srcdir)/lib/libcoolstream
diff --git a/lib/libmd5sum/Makefile.am b/lib/libmd5sum/Makefile.am
index 58b5fea8f..761a1cb39 100644
--- a/lib/libmd5sum/Makefile.am
+++ b/lib/libmd5sum/Makefile.am
@@ -5,5 +5,7 @@ noinst_LIBRARIES = libtuxbox-md5sum.a
 
 AM_CPPFLAGS = 
 
+INCLUDES = \
+	-I$(top_srcdir)
 
 libtuxbox_md5sum_a_SOURCES = libmd5sum.c md5.c
diff --git a/lib/libmd5sum/libmd5sum.c b/lib/libmd5sum/libmd5sum.c
index f6894d495..784861f43 100644
--- a/lib/libmd5sum/libmd5sum.c
+++ b/lib/libmd5sum/libmd5sum.c
@@ -1,16 +1,15 @@
-#include "libmd5sum.h"
-#include <sys/types.h>
-#include <error.h>
-
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
-
-#include "md5.h"
-#include "getline.h"
+#include <sys/types.h>
+#include <error.h>
 #include <errno.h>
 #include <string.h>
 
+#include "libmd5sum.h"
+#include "md5.h"
+#include "getline.h"
+
 #define STREQ(a, b) (strcmp ((a), (b)) == 0)
 
 static int have_read_stdin;
diff --git a/lib/libtuxtxt/Makefile.am b/lib/libtuxtxt/Makefile.am
index c3852770d..69fc22c9e 100644
--- a/lib/libtuxtxt/Makefile.am
+++ b/lib/libtuxtxt/Makefile.am
@@ -1,6 +1,7 @@
 INCLUDES = \
-        -I$(top_srcdir)/src/zapit/include \
+	-I$(top_srcdir) \
 	-I$(top_srcdir)/src \
+	-I$(top_srcdir)/src/zapit/include \
 	$(FREETYPE_CFLAGS)
 
 if BOXTYPE_COOL
diff --git a/lib/xmltree/Makefile.am b/lib/xmltree/Makefile.am
index fc2d4201e..485ba0ae4 100644
--- a/lib/xmltree/Makefile.am
+++ b/lib/xmltree/Makefile.am
@@ -1,4 +1,6 @@
-INCLUDES = -I$(srcdir)/xmltok
+INCLUDES = \
+	-I$(top_srcdir) \
+	-I$(srcdir)/xmltok
 
 AM_CXXFLAGS = -fno-rtti -fno-exceptions
 
diff --git a/lib/xmltree/hashtab.c b/lib/xmltree/hashtab.c
index 9e164a959..9b7defc60 100644
--- a/lib/xmltree/hashtab.c
+++ b/lib/xmltree/hashtab.c
@@ -21,7 +21,7 @@ Contributor(s):
 #include <stdlib.h>
 #include <string.h>
 
-#include "xmldef.h"
+#include <xmldef.h>
 #include "hashtab.h"
 
 #ifdef XML_UNICODE
diff --git a/lib/xmltree/xmlinterface.cpp b/lib/xmltree/xmlinterface.cpp
index 2b118ebf2..c2cd7493e 100644
--- a/lib/xmltree/xmlinterface.cpp
+++ b/lib/xmltree/xmlinterface.cpp
@@ -40,7 +40,7 @@
 #include <libxml/parser.h>
 #include <libxml/parserInternals.h>
 #else  /* USE_LIBXML */
-#include <xmltok.h>
+#include "xmltok.h"
 #endif /* USE_LIBXML */
 
 
diff --git a/lib/xmltree/xmlinterface.h b/lib/xmltree/xmlinterface.h
index 037731815..97d7b8325 100644
--- a/lib/xmltree/xmlinterface.h
+++ b/lib/xmltree/xmlinterface.h
@@ -33,7 +33,7 @@
 #define __xmlinterface_h__
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #include <string>
diff --git a/src/Makefile.am b/src/Makefile.am
index 0ca79dd57..7a8175d24 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,6 +3,8 @@ AM_CXXFLAGS = -fno-rtti -fno-exceptions
 SUBDIRS = zapit gui daemonc driver system eitd timerd nhttpd
 
 INCLUDES = \
+	-I$(srcdir) \
+	-I$(top_srcdir) \
 	-I$(top_srcdir)/daemons \
 	-I$(top_srcdir)/lib \
 	-I$(top_srcdir)/src/zapit/include \
diff --git a/src/daemonc/Makefile.am b/src/daemonc/Makefile.am
index 4cc65038d..f2838a74d 100644
--- a/src/daemonc/Makefile.am
+++ b/src/daemonc/Makefile.am
@@ -1,15 +1,16 @@
 AM_CPPFLAGS = -fno-rtti -fno-exceptions
 
 INCLUDES = \
-	-I$(top_srcdir)/daemons \
+	-I$(top_srcdir) \
 	-I$(top_srcdir)/src \
 	-I$(top_srcdir)/src/zapit/include \
+	-I$(top_srcdir)/daemons \
+	-I$(top_srcdir)/lib \
 	-I$(top_srcdir)/lib/libeventserver \
 	-I$(top_srcdir)/lib/libconfigfile \
 	-I$(top_srcdir)/lib/libnet \
 	-I$(top_srcdir)/lib/xmltree \
-	@FREETYPE_CFLAGS@ \
-	-I$(top_srcdir)/lib 
+	@FREETYPE_CFLAGS@
 
 if BOXTYPE_COOL
 INCLUDES += -I$(top_srcdir)/lib/libcoolstream
diff --git a/src/driver/Makefile.am b/src/driver/Makefile.am
index e7feb5544..316c4d6e5 100644
--- a/src/driver/Makefile.am
+++ b/src/driver/Makefile.am
@@ -4,14 +4,15 @@ SUBDIRS = pictureviewer audiodec
 
 INCLUDES = \
 	-I$(top_srcdir)/daemons \
+	-I$(top_srcdir) \
 	-I$(top_srcdir)/src \
 	-I$(top_srcdir)/src/zapit/include \
+	-I$(top_srcdir)/lib \
 	-I$(top_srcdir)/lib/libnet \
 	-I$(top_srcdir)/lib/libconfigfile \
 	-I$(top_srcdir)/lib/connection \
 	-I$(top_srcdir)/lib/libeventserver \
-	@FREETYPE_CFLAGS@ \
-	-I$(top_srcdir)/lib
+	@FREETYPE_CFLAGS@
 
 noinst_LIBRARIES = libneutrino_driver.a libneutrino_driver_netfile.a
 
diff --git a/src/driver/audiodec/Makefile.am b/src/driver/audiodec/Makefile.am
index 523b2fabf..aff9c84cb 100644
--- a/src/driver/audiodec/Makefile.am
+++ b/src/driver/audiodec/Makefile.am
@@ -1,12 +1,13 @@
 AM_CXXFLAGS = -fno-rtti -fno-exceptions
 
 INCLUDES = \
+	-I$(top_srcdir) \
 	-I$(top_srcdir)/src \
-        -I$(top_srcdir)/lib \
+	-I$(top_srcdir)/lib \
 	-I$(top_srcdir)/src/zapit/include \
 	-I$(top_srcdir)/lib/libconfigfile \
-        @FREETYPE_CFLAGS@ \
-        @VORBISIDEC_CFLAGS@
+	@FREETYPE_CFLAGS@ \
+	@VORBISIDEC_CFLAGS@
 
 if BOXTYPE_COOL
 INCLUDES += -I$(top_srcdir)/lib/libcoolstream
diff --git a/src/driver/audiodec/basedec.cpp b/src/driver/audiodec/basedec.cpp
index 931c2d416..abf076fc1 100644
--- a/src/driver/audiodec/basedec.cpp
+++ b/src/driver/audiodec/basedec.cpp
@@ -27,12 +27,6 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-
-#include <basedec.h>
-#include <cdrdec.h>
-#include <mp3dec.h>
-#include <oggdec.h>
-#include <wavdec.h>
 #ifdef ENABLE_FLAC
 #include <flacdec.h>
 #endif
@@ -48,6 +42,12 @@
 #include <neutrino.h>
 #include <zapit/client/zapittools.h>
 
+#include "basedec.h"
+#include "cdrdec.h"
+#include "mp3dec.h"
+#include "oggdec.h"
+#include "wavdec.h"
+
 unsigned int CBaseDec::mSamplerate=0;
 
 void ShoutcastCallback(void *arg)
diff --git a/src/driver/audiodec/cdrdec.cpp b/src/driver/audiodec/cdrdec.cpp
index 1d483d4ee..8ba63bcb5 100644
--- a/src/driver/audiodec/cdrdec.cpp
+++ b/src/driver/audiodec/cdrdec.cpp
@@ -32,7 +32,7 @@
 
 #include <stdio.h>
 #include <unistd.h>
-#include <cdrdec.h>
+#include "cdrdec.h"
 
 CCdrDec* CCdrDec::getInstance()
 {
diff --git a/src/driver/audiodec/cdrdec.h b/src/driver/audiodec/cdrdec.h
index 65217aa3e..64e0250e1 100644
--- a/src/driver/audiodec/cdrdec.h
+++ b/src/driver/audiodec/cdrdec.h
@@ -29,7 +29,7 @@
 #ifndef __CDR_DEC__
 #define __CDR_DEC__
 
-#include <driver/audiodec/wavdec.h>
+#include "wavdec.h"
 
 class CCdrDec : public CWavDec
 {
diff --git a/src/driver/audiodec/flacdec.h b/src/driver/audiodec/flacdec.h
index 8d92617b4..269432676 100644
--- a/src/driver/audiodec/flacdec.h
+++ b/src/driver/audiodec/flacdec.h
@@ -31,9 +31,9 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <pthread.h>
-#include <basedec.h>
 #include <driver/audiometadata.h>
 #include <FLAC/all.h>
+#include "basedec.h"
 
 #define DECODE_SLOTS 30
 
diff --git a/src/driver/audiodec/mp3dec.cpp b/src/driver/audiodec/mp3dec.cpp
index 77f7a1a6b..dacd390ec 100644
--- a/src/driver/audiodec/mp3dec.cpp
+++ b/src/driver/audiodec/mp3dec.cpp
@@ -43,7 +43,6 @@
 #include <string.h>
 #include <errno.h>
 #include <string>
-#include <driver/audiodec/mp3dec.h>
 #include <linux/soundcard.h>
 #include <assert.h>
 #include <cmath>
@@ -54,6 +53,7 @@
 #include <neutrino.h>
 #include <driver/netfile.h>
 #include <zapit/include/audio.h>
+#include "mp3dec.h"
 
 extern cAudio * audioDecoder;
 
diff --git a/src/driver/audiodec/mp3dec.h b/src/driver/audiodec/mp3dec.h
index b18924a9d..cafdc4f9c 100644
--- a/src/driver/audiodec/mp3dec.h
+++ b/src/driver/audiodec/mp3dec.h
@@ -42,11 +42,12 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <pthread.h>
-#include <basedec.h>
 #include <driver/audiometadata.h>
+
+#include "basedec.h"
 extern "C"
 {
-#include "driver/audiodec/tag.h"
+#include "tag.h"
 }
 
 class CMP3Dec : public CBaseDec
diff --git a/src/driver/audiodec/oggdec.cpp b/src/driver/audiodec/oggdec.cpp
index a494abd37..b431a3e02 100644
--- a/src/driver/audiodec/oggdec.cpp
+++ b/src/driver/audiodec/oggdec.cpp
@@ -32,7 +32,6 @@
 
 #include <endian.h>
 #include <errno.h>
-#include <oggdec.h>
 #include <linux/soundcard.h>
 #include <algorithm>
 #include <sstream>
@@ -40,6 +39,8 @@
 
 #include <zapit/include/audio.h>
 
+#include "oggdec.h"
+
 extern cAudio * audioDecoder;
 
 #define ProgName "OggDec"
diff --git a/src/driver/audiodec/oggdec.h b/src/driver/audiodec/oggdec.h
index e08189bf3..f3948d3d4 100644
--- a/src/driver/audiodec/oggdec.h
+++ b/src/driver/audiodec/oggdec.h
@@ -36,7 +36,6 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <pthread.h>
-#include <basedec.h>
 #include <driver/audiometadata.h>
 #ifdef USE_TREMOR
 #include <tremor/ogg.h>
@@ -46,6 +45,8 @@
 #include <vorbis/vorbisfile.h>
 #endif
 
+#include "basedec.h"
+
 #define DECODE_SLOTS 30
 
 class COggDec : public CBaseDec
diff --git a/src/driver/audiodec/tag.c b/src/driver/audiodec/tag.c
index 1aeefd20a..e3efe9834 100644
--- a/src/driver/audiodec/tag.c
+++ b/src/driver/audiodec/tag.c
@@ -20,7 +20,7 @@
  */
 
 # ifdef HAVE_CONFIG_H
-#  include "config.h"
+#  include <config.h>
 # endif
 
 //# include "global.h"
diff --git a/src/driver/audiodec/vis.cpp b/src/driver/audiodec/vis.cpp
index f2311a848..179d817a1 100644
--- a/src/driver/audiodec/vis.cpp
+++ b/src/driver/audiodec/vis.cpp
@@ -19,13 +19,17 @@
 
 #include <global.h>
 #include <neutrino.h>
+
 #if HAVE_COOL_HARDWARE
 #include <driver/vfd.h>
 #endif
+
 #if HAVE_TRIPLEDRAGON
 #include <driver/lcdd.h>
 #endif
+
 #include "int_fft.c"
+
 typedef signed short gint16;
 typedef int gint;
 typedef float gfloat;
diff --git a/src/driver/audiodec/wavdec.cpp b/src/driver/audiodec/wavdec.cpp
index dc01cf882..a34c5d862 100644
--- a/src/driver/audiodec/wavdec.cpp
+++ b/src/driver/audiodec/wavdec.cpp
@@ -33,12 +33,13 @@
 #include <cstring>
 #include <errno.h>
 #include <unistd.h>
-#include <wavdec.h>
 #include <sstream>
 #include <driver/audioplay.h>
 #include <linux/soundcard.h>
 #include <zapit/include/audio.h>
 
+#include "wavdec.h"
+
 extern cAudio * audioDecoder;
 
 #define ProgName "WavDec"
diff --git a/src/driver/audiodec/wavdec.h b/src/driver/audiodec/wavdec.h
index 5a9a9fadb..f8f4ccb58 100644
--- a/src/driver/audiodec/wavdec.h
+++ b/src/driver/audiodec/wavdec.h
@@ -30,7 +30,7 @@
 #define __WAV_DEC__
 
 #include <stdio.h>
-#include <driver/audiodec/basedec.h>
+#include "basedec.h"
 
 class CWavDec : public CBaseDec
 {
diff --git a/src/driver/pictureviewer/Makefile.am b/src/driver/pictureviewer/Makefile.am
index 5805e8f37..f9dced63d 100644
--- a/src/driver/pictureviewer/Makefile.am
+++ b/src/driver/pictureviewer/Makefile.am
@@ -1,11 +1,12 @@
 AM_CXXFLAGS = -fno-rtti -fno-exceptions
 
 INCLUDES = \
+	-I$(top_srcdir) \
 	-I$(top_srcdir)/src \
 	-I$(top_srcdir)/src/zapit/include \
+	-I$(top_srcdir)/lib \
 	-I$(top_srcdir)/lib/libconfigfile \
-	@FREETYPE_CFLAGS@ \
-	-I$(top_srcdir)/lib
+	@FREETYPE_CFLAGS@
 
 if BOXTYPE_COOL
 INCLUDES += -I$(top_srcdir)/lib/libcoolstream
diff --git a/src/driver/radiotext.h b/src/driver/radiotext.h
index 7df14c1d3..5b6af9726 100644
--- a/src/driver/radiotext.h
+++ b/src/driver/radiotext.h
@@ -58,7 +58,7 @@
 #include <vdr/receiver.h>
 #endif
 
-#include <dmx_cs.h>
+#include <dmx.h>
 
 //#define ENABLE_RASS
 
diff --git a/src/eitd/Makefile.am b/src/eitd/Makefile.am
index 5a7349c67..9cba35348 100644
--- a/src/eitd/Makefile.am
+++ b/src/eitd/Makefile.am
@@ -1,4 +1,5 @@
 INCLUDES = \
+	-I$(top_srcdir) \
 	-I$(top_srcdir)/src \
 	-I$(top_srcdir)/lib \
 	-I$(top_srcdir)/src/zapit/include \
diff --git a/src/eitd/SIevents.cpp b/src/eitd/SIevents.cpp
index 726bf4de9..6ed4282d3 100644
--- a/src/eitd/SIevents.cpp
+++ b/src/eitd/SIevents.cpp
@@ -26,10 +26,6 @@
 #include <stdio.h>
 #include <time.h>
 
-#include "SIlanguage.hpp"
-#include "SIutils.hpp"
-#include "SIevents.hpp"
-
 #include <dvbsi++/descriptor_tag.h>
 #include <dvbsi++/short_event_descriptor.h>
 #include <dvbsi++/extended_event_descriptor.h>
@@ -38,6 +34,10 @@
 #include <dvbsi++/content_descriptor.h>
 #include <dvbsi++/parental_rating_descriptor.h>
 
+#include "SIlanguage.hpp"
+#include "SIutils.hpp"
+#include "SIevents.hpp"
+
 const std::string languangeOFF = "OFF";
 
 SIevent::SIevent(const t_original_network_id _original_network_id, const t_transport_stream_id _transport_stream_id, const t_service_id _service_id,
diff --git a/src/eitd/SIevents.hpp b/src/eitd/SIevents.hpp
index 9248e5627..52e4b28c4 100644
--- a/src/eitd/SIevents.hpp
+++ b/src/eitd/SIevents.hpp
@@ -29,8 +29,8 @@
 #include <string>
 
 #include <sectionsdclient/sectionsdtypes.h>
-#include "edvbstring.h"
 #include <dvbsi++/event_information_section.h>
+#include "edvbstring.h"
 
 class SIlinkage {
 public:
diff --git a/src/eitd/SIlanguage.cpp b/src/eitd/SIlanguage.cpp
index a5e997693..e6ec07ae8 100644
--- a/src/eitd/SIlanguage.cpp
+++ b/src/eitd/SIlanguage.cpp
@@ -22,8 +22,6 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
-#include "SIlanguage.hpp"
-
 #include <string>
 #include <vector>
 #include <map>
@@ -32,6 +30,8 @@
 
 #include <sectionsdclient/sectionsdclient.h>
 
+#include "SIlanguage.hpp"
+
 #define LANGUAGEFILE "/var/tuxbox/config/epglanguages.conf"
 
 std::vector<std::string> SIlanguage::languages;
diff --git a/src/eitd/SIsections.cpp b/src/eitd/SIsections.cpp
index 99694ef38..5761aa29f 100644
--- a/src/eitd/SIsections.cpp
+++ b/src/eitd/SIsections.cpp
@@ -21,25 +21,25 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
-
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 #include <stdio.h>
 #include <unistd.h>
 
+#include <dvbsi++/descriptor_tag.h>
+#include <dvbsi++/nvod_reference_descriptor.h>
+#include <dvbsi++/service_descriptor.h>
+#include <dvbsi++/time_offset_section.h>
+#include <dvbsi++/time_date_section.h>
+#include <dvbsi++/local_time_offset_descriptor.h>
+
 #include "SIutils.hpp"
 #include "SIservices.hpp"
 #include "SIevents.hpp"
 #include "SIsections.hpp"
 #include "debug.h"
-#include <edvbstring.h>
-
-#include <dvbsi++/descriptor_tag.h>
-#include <dvbsi++/nvod_reference_descriptor.h>
-#include <dvbsi++/service_descriptor.h>
-
-#include <dvbsi++/time_offset_section.h>
-#include <dvbsi++/time_date_section.h>
-#include <dvbsi++/local_time_offset_descriptor.h>
+#include "edvbstring.h"
 
 void SIsectionEIT::parse(void)
 {
diff --git a/src/eitd/dmx.cpp b/src/eitd/dmx.cpp
index 5b0fcea1a..d64526454 100644
--- a/src/eitd/dmx.cpp
+++ b/src/eitd/dmx.cpp
@@ -22,10 +22,9 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
-
-#include <dmx.h>
-#include <debug.h>
-
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <endian.h>
 #include <errno.h>
 #include <fcntl.h>
@@ -38,8 +37,10 @@
 #include <map>
 
 #include <driver/abstime.h>
-
 #include <dvbsi++/long_section.h>
+
+#include "dmx.h"
+#include "dmxapi.h"
 #include "debug.h"
 
 //#define DEBUG_MUTEX 1
diff --git a/src/eitd/edvbstring.cpp b/src/eitd/edvbstring.cpp
index bdf713626..fb9336994 100644
--- a/src/eitd/edvbstring.cpp
+++ b/src/eitd/edvbstring.cpp
@@ -1,11 +1,11 @@
 #include <string>
 #include <ctype.h>
 #include <limits.h>
-#include <debug.h>
 #include <map>
 #include <set>
 
-#include <SIutils.hpp>
+#include "SIutils.hpp"
+#include "debug.h"
 
 std::map<std::string, int> CountryCodeDefaultMapping;
 std::map<int, int> TransponderDefaultMapping;
diff --git a/src/eitd/eitd.h b/src/eitd/eitd.h
index 2b3349a99..364d2f6c4 100644
--- a/src/eitd/eitd.h
+++ b/src/eitd/eitd.h
@@ -37,7 +37,7 @@
 #include "SIevents.hpp"
 #include "SIsections.hpp"
 #include "SIlanguage.hpp"
-
+#include "debug.h"
 //#define USE_BOOST_SHARED_PTR
 #ifdef USE_BOOST_SHARED_PTR
 #include <boost/shared_ptr.hpp>
diff --git a/src/eitd/sectionsd.cpp b/src/eitd/sectionsd.cpp
index 535e443a8..591869fb9 100644
--- a/src/eitd/sectionsd.cpp
+++ b/src/eitd/sectionsd.cpp
@@ -28,7 +28,6 @@
 
 #include <config.h>
 #include <malloc.h>
-#include <debug.h>
 
 #include <unistd.h>
 #include <string.h>
@@ -63,6 +62,7 @@
 #include "sectionsd.h"
 #include "edvbstring.h"
 #include "xmlutil.h"
+#include "debug.h"
 
 //#define ENABLE_SDT //FIXME
 
diff --git a/src/eitd/xmlutil.cpp b/src/eitd/xmlutil.cpp
index a35a3f4ed..8fd64e490 100644
--- a/src/eitd/xmlutil.cpp
+++ b/src/eitd/xmlutil.cpp
@@ -21,9 +21,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
-
-#include <debug.h>
+#endif
 
 #include <unistd.h>
 #include <string.h>
@@ -39,6 +39,7 @@
 
 #include "xmlutil.h"
 #include "eitd.h"
+#include "debug.h"
 
 void addEvent(const SIevent &evt, const time_t zeit, bool cn = false);
 extern MySIeventsOrderServiceUniqueKeyFirstStartTimeEventUniqueKey mySIeventsOrderServiceUniqueKeyFirstStartTimeEventUniqueKey;
diff --git a/src/global.h b/src/global.h
index 3e26fdd0c..b82d3304c 100644
--- a/src/global.h
+++ b/src/global.h
@@ -40,25 +40,25 @@
 #include <sectionsdclient/sectionsdclient.h>
 #include <timerdclient/timerdclient.h>
 
-#include "driver/fontrenderer.h"
-#include "driver/rcinput.h"
-#include "driver/radiotext.h"
+#include <driver/fontrenderer.h>
+#include <driver/rcinput.h>
+#include <driver/radiotext.h>
 #if HAVE_COOL_HARDWARE
-#include "driver/vfd.h"
-#include "driver/rfmod.h"
+#include <driver/vfd.h>
+#include <driver/rfmod.h>
 #endif
 #if HAVE_TRIPLEDRAGON
-#include "driver/lcdd.h"
+#include <driver/lcdd.h>
 #define CVFD CLCD
 #endif
 
-#include "system/localize.h"
-#include "system/settings.h"
+#include <system/localize.h>
+#include <system/settings.h>
 
-#include "gui/epgview.h"
-#include "gui/infoviewer.h"
-#include "gui/eventlist.h"
-#include "gui/videosettings.h"
+#include <gui/epgview.h>
+#include <gui/infoviewer.h>
+#include <gui/eventlist.h>
+#include <gui/videosettings.h>
 
 
 #ifndef NEUTRINO_CPP
diff --git a/src/gui/Makefile.am b/src/gui/Makefile.am
index 1527aa0d9..0854a655b 100644
--- a/src/gui/Makefile.am
+++ b/src/gui/Makefile.am
@@ -15,17 +15,18 @@ noinst_HEADERS = svn_version.h
 SUBDIRS = widget bedit
 
 INCLUDES = \
-	-I$(top_srcdir)/daemons \
+	-I$(top_srcdir) \
 	-I$(top_srcdir)/src \
 	-I$(top_srcdir)/src/zapit/include \
+	-I$(top_srcdir)/daemons \
+	-I$(top_srcdir)/lib \
 	-I$(top_srcdir)/lib/libeventserver \
 	-I$(top_srcdir)/lib/libnet \
 	-I$(top_srcdir)/lib/libconfigfile \
 	-I$(top_srcdir)/lib/xmltree \
 	-I$(top_srcdir)/lib/libupnpclient \
 	@CURL_CFLAGS@ \
-	@FREETYPE_CFLAGS@ \
-	-I$(top_srcdir)/lib 
+	@FREETYPE_CFLAGS@
 
 if BOXTYPE_COOL
 INCLUDES += -I$(top_srcdir)/lib/libcoolstream
diff --git a/src/gui/bedit/Makefile.am b/src/gui/bedit/Makefile.am
index b12653cba..13c96305d 100644
--- a/src/gui/bedit/Makefile.am
+++ b/src/gui/bedit/Makefile.am
@@ -1,15 +1,16 @@
 AM_CPPFLAGS = -fno-rtti -fno-exceptions
 
 INCLUDES = \
-	-I$(top_srcdir)/daemons \
+	-I$(top_srcdir) \
 	-I$(top_srcdir)/src \
+	-I$(top_srcdir)/daemons \
 	-I$(top_srcdir)/src/zapit/include \
+	-I$(top_srcdir)/lib \
 	-I$(top_srcdir)/lib/libeventserver \
 	-I$(top_srcdir)/lib/libconfigfile \
 	-I$(top_srcdir)/lib/libcoolstream \
 	-I$(top_srcdir)/lib/xmltree \
-	@FREETYPE_CFLAGS@ \
-	-I$(top_srcdir)/lib
+	@FREETYPE_CFLAGS@
 
 
 noinst_LIBRARIES = libneutrino_gui_bedit.a
diff --git a/src/gui/bedit/bouqueteditor_bouquets.cpp b/src/gui/bedit/bouqueteditor_bouquets.cpp
index e22c3ef77..dfd6f119e 100644
--- a/src/gui/bedit/bouqueteditor_bouquets.cpp
+++ b/src/gui/bedit/bouqueteditor_bouquets.cpp
@@ -33,22 +33,21 @@
 #include <config.h>
 #endif
 
-#include <gui/bedit/bouqueteditor_bouquets.h>
-
 #include <global.h>
 #include <neutrino.h>
 
 #include <driver/fontrenderer.h>
 #include <driver/screen_max.h>
-#include <gui/bedit/bouqueteditor_channels.h>
 #include <gui/widget/buttons.h>
 #include <gui/widget/hintbox.h>
 #include <gui/widget/icons.h>
 #include <gui/widget/messagebox.h>
 #include <gui/widget/stringinput.h>
-
 #include <zapit/client/zapitclient.h>
 #include <zapit/client/zapittools.h>
+
+#include "bouqueteditor_channels.h"
+#include "bouqueteditor_bouquets.h"
 extern CBouquetManager *g_bouquetManager;
 
 CBEBouquetWidget::CBEBouquetWidget()
diff --git a/src/gui/bedit/bouqueteditor_channels.cpp b/src/gui/bedit/bouqueteditor_channels.cpp
index 6a156b4eb..325233851 100644
--- a/src/gui/bedit/bouqueteditor_channels.cpp
+++ b/src/gui/bedit/bouqueteditor_channels.cpp
@@ -37,14 +37,14 @@
 #include <gui/widget/icons.h>
 #include <gui/widget/messagebox.h>
 
-#include <gui/bedit/bouqueteditor_channels.h>
+#include "bouqueteditor_channels.h"
 
 #include <global.h>
 #include <neutrino.h>
 
 #include <driver/fontrenderer.h>
 #include <driver/screen_max.h>
-#include <gui/bedit/bouqueteditor_chanselect.h>
+#include "bouqueteditor_chanselect.h"
 #include <gui/widget/buttons.h>
 #include <gui/widget/icons.h>
 
diff --git a/src/gui/bedit/bouqueteditor_chanselect.cpp b/src/gui/bedit/bouqueteditor_chanselect.cpp
index e151f678c..11dbe115f 100644
--- a/src/gui/bedit/bouqueteditor_chanselect.cpp
+++ b/src/gui/bedit/bouqueteditor_chanselect.cpp
@@ -33,8 +33,6 @@
 #include <config.h>
 #endif
 
-#include <gui/bedit/bouqueteditor_chanselect.h>
-
 #include <global.h>
 #include <neutrino.h>
 
@@ -47,6 +45,8 @@
 #include <zapit/zapit.h>
 #include <zapit/getservices.h>
 
+#include "bouqueteditor_chanselect.h"
+
 extern CBouquetManager *g_bouquetManager;
 
 CBEChannelSelectWidget::CBEChannelSelectWidget(const std::string & Caption, unsigned int Bouquet, CZapitClient::channelsMode Mode)
diff --git a/src/gui/pluginlist.cpp b/src/gui/pluginlist.cpp
index da3ea9124..862888241 100644
--- a/src/gui/pluginlist.cpp
+++ b/src/gui/pluginlist.cpp
@@ -52,13 +52,14 @@
 
 #include <global.h>
 #include <neutrino.h>
-#include <plugins.h>
 #include <driver/encoding.h>
 #include <driver/screen_max.h>
 #include <driver/fade.h>
 
 #include <zapit/client/zapittools.h>
 
+#include "plugins.h"
+
 /* for alexW images with old drivers:
  * #define USE_VBI_INTERFACE 1
  */
diff --git a/src/gui/plugins.cpp b/src/gui/plugins.cpp
index 427fef33a..f190c620b 100644
--- a/src/gui/plugins.cpp
+++ b/src/gui/plugins.cpp
@@ -33,8 +33,6 @@
 #include <config.h>
 #endif
 
-#include <gui/plugins.h>
-
 #include <sstream>
 #include <fstream>
 #include <iostream>
@@ -52,6 +50,7 @@
 
 #include <zapit/client/zapittools.h>
 
+#include "plugins.h"
 /* for alexW images with old drivers:
  * #define USE_VBI_INTERFACE 1
  */
diff --git a/src/gui/widget/Makefile.am b/src/gui/widget/Makefile.am
index 8d92eb76c..956821205 100644
--- a/src/gui/widget/Makefile.am
+++ b/src/gui/widget/Makefile.am
@@ -1,9 +1,10 @@
 AM_CPPFLAGS = -fno-rtti -fno-exceptions
 
 INCLUDES = \
-	-I$(top_srcdir)/lib \
+	-I$(top_srcdir) \
 	-I$(top_srcdir)/src \
 	-I$(top_srcdir)/src/zapit/include \
+	-I$(top_srcdir)/lib \
 	-I$(top_srcdir)/lib/libnet \
 	-I$(top_srcdir)/lib/libconfigfile \
 	@FREETYPE_CFLAGS@
diff --git a/src/nhttpd/Makefile.am b/src/nhttpd/Makefile.am
index bf4eb66a3..4b9bb9247 100644
--- a/src/nhttpd/Makefile.am
+++ b/src/nhttpd/Makefile.am
@@ -3,6 +3,8 @@ SUBDIRS = yhttpd_core yhttpd_mods tuxboxapi web
 AM_CPPFLAGS = -fno-rtti -fno-exceptions
 
 INCLUDES = \
+	-I$(srcdir) \
+	-I$(top_srcdir) \
 	-I$(top_srcdir)/lib \
 	-I$(top_srcdir)/src \
 	-I$(top_srcdir)/src/zapit/include \
diff --git a/src/nhttpd/tuxboxapi/coolstream/Makefile.am b/src/nhttpd/tuxboxapi/coolstream/Makefile.am
index 2d05e02a5..5ef7b4a96 100644
--- a/src/nhttpd/tuxboxapi/coolstream/Makefile.am
+++ b/src/nhttpd/tuxboxapi/coolstream/Makefile.am
@@ -1,6 +1,7 @@
 AM_CPPFLAGS = -fno-rtti -fno-exceptions
 
 INCLUDES = \
+	-I$(top_srcdir) \
 	-I$(top_srcdir)/lib \
 	-I$(top_srcdir)/src/zapit/include \
 	-I$(top_srcdir)/src \
diff --git a/src/nhttpd/yhttpd.cpp b/src/nhttpd/yhttpd.cpp
index 17997aaf5..a7039798b 100644
--- a/src/nhttpd/yhttpd.cpp
+++ b/src/nhttpd/yhttpd.cpp
@@ -14,12 +14,12 @@
 
 // yhttpd
 #include "yconfig.h"
-#include "ylogging.h"
-#include "ylanguage.h"
-#include "yhook.h"
+#include <ylogging.h>
+#include <ylanguage.h>
+#include <yhook.h>
 
 #ifdef Y_CONFIG_USE_YPARSER
-#include "mod_yparser.h"
+#include <mod_yparser.h>
 static CyParser yParser;
 #endif
 
diff --git a/src/nhttpd/yhttpd.h b/src/nhttpd/yhttpd.h
index 9d4de4f86..eff8a9ac8 100644
--- a/src/nhttpd/yhttpd.h
+++ b/src/nhttpd/yhttpd.h
@@ -15,8 +15,8 @@
 #include <stdlib.h>
 // yhttpd
 #include "yconfig.h"
-#include "ytypes_globals.h"
-#include "ywebserver.h"
+//#include <ytypes_globals.h>
+#include <ywebserver.h>
 
 //-----------------------------------------------------------------------------
 class Cyhttpd {
diff --git a/src/nhttpd/yhttpd_core/Makefile.am b/src/nhttpd/yhttpd_core/Makefile.am
index 3655b0394..ec562ae50 100644
--- a/src/nhttpd/yhttpd_core/Makefile.am
+++ b/src/nhttpd/yhttpd_core/Makefile.am
@@ -1,4 +1,5 @@
 INCLUDES = \
+	-I$(srcdir) \
 	-I$(top_srcdir)/lib \
 	-I$(top_srcdir)/src/zapit/include \
 	-I$(top_srcdir)/src \
diff --git a/src/nhttpd/yhttpd_core/ylanguage.cpp b/src/nhttpd/yhttpd_core/ylanguage.cpp
index 533f0ef36..80bde852b 100644
--- a/src/nhttpd/yhttpd_core/ylanguage.cpp
+++ b/src/nhttpd/yhttpd_core/ylanguage.cpp
@@ -9,8 +9,8 @@
 #include <cstdlib>
 
 // yhttpd
-#include "yconfig.h"
-#include "yhttpd.h"
+#include <yconfig.h>
+#include <yhttpd.h>
 #include "ytypes_globals.h"
 #include "ylanguage.h"
 #include "yconnection.h"
diff --git a/src/nhttpd/yhttpd_core/ylogging.cpp b/src/nhttpd/yhttpd_core/ylogging.cpp
index fcdac1481..2d93bc9e3 100644
--- a/src/nhttpd/yhttpd_core/ylogging.cpp
+++ b/src/nhttpd/yhttpd_core/ylogging.cpp
@@ -9,7 +9,7 @@
 #include <cstdlib>
 
 // yhttpd
-#include "yconfig.h"
+#include <yconfig.h>
 #include "ytypes_globals.h"
 #include "ylogging.h"
 #include "yconnection.h"
diff --git a/src/nhttpd/yhttpd_core/ylogging.h b/src/nhttpd/yhttpd_core/ylogging.h
index d5a461bfd..b2cf01519 100644
--- a/src/nhttpd/yhttpd_core/ylogging.h
+++ b/src/nhttpd/yhttpd_core/ylogging.h
@@ -8,7 +8,7 @@
 // system
 #include <pthread.h>
 // yhttpd
-#include "yconfig.h"
+#include <yconfig.h>
 
 // forward declaration
 class CWebserverConnection;
diff --git a/src/nhttpd/yhttpd_core/yrequest.h b/src/nhttpd/yhttpd_core/yrequest.h
index 65b670ab3..ff1d0e572 100644
--- a/src/nhttpd/yhttpd_core/yrequest.h
+++ b/src/nhttpd/yhttpd_core/yrequest.h
@@ -11,7 +11,7 @@
 #include <map>
 
 // yhttpd
-#include "yconfig.h"
+#include <yconfig.h>
 #include "ytypes_globals.h"
 
 // forward declaration
diff --git a/src/nhttpd/yhttpd_core/ysocket.h b/src/nhttpd/yhttpd_core/ysocket.h
index e6c924709..84fe6f59b 100644
--- a/src/nhttpd/yhttpd_core/ysocket.h
+++ b/src/nhttpd/yhttpd_core/ysocket.h
@@ -13,7 +13,7 @@
 #include <netinet/tcp.h>
 #include <sys/socket.h>
 
-#include "yconfig.h"
+#include <yconfig.h>
 #include "ytypes_globals.h"
 
 #ifdef Y_CONFIG_USE_OPEN_SSL
diff --git a/src/nhttpd/yhttpd_core/ywebserver.h b/src/nhttpd/yhttpd_core/ywebserver.h
index 73c5c8b9f..7cb8abbb8 100644
--- a/src/nhttpd/yhttpd_core/ywebserver.h
+++ b/src/nhttpd/yhttpd_core/ywebserver.h
@@ -20,7 +20,7 @@
 #include <arpa/inet.h>
 
 // yhttpd
-#include "yconfig.h"
+#include <yconfig.h>
 #include "ytypes_globals.h"
 #include "ysocket.h"
 
diff --git a/src/sectionsd/Makefile.am b/src/sectionsd/Makefile.am
index 200019dbe..813ed0596 100644
--- a/src/sectionsd/Makefile.am
+++ b/src/sectionsd/Makefile.am
@@ -1,4 +1,5 @@
 INCLUDES = \
+	-I$(top_srcdir) \
 	-I$(top_srcdir)/src \
 	-I$(top_srcdir)/lib \
 	-I$(top_srcdir)/src/zapit/include \
diff --git a/src/sectionsd/SIevents.cpp b/src/sectionsd/SIevents.cpp
index 28808a185..136e134c2 100644
--- a/src/sectionsd/SIevents.cpp
+++ b/src/sectionsd/SIevents.cpp
@@ -45,7 +45,7 @@
 #include "SInetworks.hpp"
 #endif
 #include "SIsections.hpp"
-#include <dmxapi.h>
+#include "dmxapi.h"
 
 const std::string languangeOFF = "OFF";
 
diff --git a/src/sectionsd/SIsections.cpp b/src/sectionsd/SIsections.cpp
index fa5d7aa43..fc34200f3 100644
--- a/src/sectionsd/SIsections.cpp
+++ b/src/sectionsd/SIsections.cpp
@@ -42,12 +42,12 @@
 #include "SInetworks.hpp"
 #endif
 #include "SIsections.hpp"
-#include <dmxapi.h>
 #include <zapit/dvbstring.h>
-#include <edvbstring.h>
 #ifdef ENABLE_FREESATEPG
 #include "FreesatTables.hpp"
 #endif
+#include "dmxapi.h"
+#include "edvbstring.h"
 
 #define NOVA		0x3ffe
 #define CANALDIGITAAL	0x3fff
diff --git a/src/sectionsd/dmx.cpp b/src/sectionsd/dmx.cpp
index 47a0eacda..d97f6c87b 100644
--- a/src/sectionsd/dmx.cpp
+++ b/src/sectionsd/dmx.cpp
@@ -23,9 +23,6 @@
  */
 
 
-#include <dmx.h>
-#include <dmxapi.h>
-#include <debug.h>
 
 #include <endian.h>
 #include <errno.h>
@@ -40,6 +37,9 @@
 
 #include <driver/abstime.h>
 
+#include "dmx.h"
+#include "dmxapi.h"
+#include "debug.h"
 /*
 #define DEBUG_MUTEX 1
 #define DEBUG_CACHED_SECTIONS 1
diff --git a/src/sectionsd/dmx.h b/src/sectionsd/dmx.h
index a0209bad8..856e1bcdb 100644
--- a/src/sectionsd/dmx.h
+++ b/src/sectionsd/dmx.h
@@ -24,17 +24,13 @@
 #ifndef __sectionsd__dmx_h__
 #define __sectionsd__dmx_h__
 
+#include <config.h>
+
 #include <pthread.h>
 #include <stdint.h>
 #include <sys/types.h>
 #include <vector>
-#include <config.h>
-#if HAVE_COOL_HARDWARE
-#include <dmx_cs.h>
-#endif
-#if HAVE_TRIPLEDRAGON
-#include <dmx_td.h>
-#endif
+#include <dmx.h>
 
 typedef uint64_t sections_id_t;
 typedef unsigned char version_number_t;
diff --git a/src/sectionsd/dmxapi.cpp b/src/sectionsd/dmxapi.cpp
index 953200509..2e00e586f 100644
--- a/src/sectionsd/dmxapi.cpp
+++ b/src/sectionsd/dmxapi.cpp
@@ -30,14 +30,9 @@
 #include <unistd.h>        /* close, read */
 #include <arpa/inet.h>     /* htons */
 #include <time.h>          /* ctime */
-#include <dmxapi.h>
-
-#if HAVE_TRIPLEDRAGON
-#include <dmx_td.h>
-#else
-#include <dmx_cs.h>
-#endif
+#include "dmxapi.h"
 
+#include <dmx.h>
 #include "SIutils.hpp"
 #include "debug.h"
 
diff --git a/src/sectionsd/edvbstring.cpp b/src/sectionsd/edvbstring.cpp
index 8226043da..c97929ad4 100644
--- a/src/sectionsd/edvbstring.cpp
+++ b/src/sectionsd/edvbstring.cpp
@@ -1,9 +1,9 @@
 #include <string>
 #include <ctype.h>
 #include <limits.h>
-#include <debug.h>
 #include <map>
 #include <set>
+#include "debug.h"
 
 std::map<std::string, int> CountryCodeDefaultMapping;
 std::map<int, int> TransponderDefaultMapping;
diff --git a/src/sectionsd/sectionsd.cpp b/src/sectionsd/sectionsd.cpp
index c7fb314b2..87cbe9a69 100644
--- a/src/sectionsd/sectionsd.cpp
+++ b/src/sectionsd/sectionsd.cpp
@@ -29,9 +29,6 @@
 
 #include <config.h>
 #include <malloc.h>
-#include <dmxapi.h>
-#include <dmx.h>
-#include <debug.h>
 
 #include <sys/socket.h>
 #include <sys/un.h>
@@ -90,6 +87,11 @@
 #include "SIlanguage.hpp"
 
 #include "edvbstring.h"
+#include "dmxapi.h"
+#include "dmx.h"
+#include "debug.h"
+
+
 //#include "timerdclient.h"
 //#include "../timermanager.h"
 
diff --git a/src/system/Makefile.am b/src/system/Makefile.am
index 4899bec4f..38a96f83e 100644
--- a/src/system/Makefile.am
+++ b/src/system/Makefile.am
@@ -1,6 +1,7 @@
 AM_CXXFLAGS = -fno-rtti -fno-exceptions
 
 INCLUDES = \
+	-I$(top_srcdir) \
 	-I$(top_srcdir)/lib \
 	-I$(top_srcdir)/src \
 	-I$(top_srcdir)/src/zapit/include \
diff --git a/src/timerd/Makefile.am b/src/timerd/Makefile.am
index 21db442a1..a20ebdd4b 100644
--- a/src/timerd/Makefile.am
+++ b/src/timerd/Makefile.am
@@ -1,6 +1,7 @@
 AM_CPPFLAGS = -fno-rtti -fno-exceptions
 
 INCLUDES = \
+	-I$(top_srcdir) \
 	-I$(top_srcdir)/src/zapit/include \
 	-I$(top_srcdir)/lib \
 	-I$(top_srcdir)/lib/libconfigfile \
diff --git a/src/timerd/timerd.cpp b/src/timerd/timerd.cpp
index d8c486969..4fa540ce2 100644
--- a/src/timerd/timerd.cpp
+++ b/src/timerd/timerd.cpp
@@ -30,13 +30,13 @@
 #include <unistd.h> /* fork */
 #include <syscall.h>
 
-#include <timermanager.h>
-#include <debug.h>
 #include <sectionsdclient/sectionsdclient.h>
-
 #include <connection/basicserver.h>
 #include <timerdclient/timerdmsg.h>
 
+#include "debug.h"
+#include "timermanager.h"
+
 int timerd_debug = 0;
 
 bool timerd_parse_command(CBasicMessage::Header &rmsg, int connfd)
diff --git a/src/timerd/timermanager.cpp b/src/timerd/timermanager.cpp
index 17478f8a5..f87eaef36 100644
--- a/src/timerd/timermanager.cpp
+++ b/src/timerd/timermanager.cpp
@@ -30,10 +30,8 @@
 
 #include <sstream>
 
-#include <timermanager.h>
 #include <timerdclient/timerdclient.h>
 #include <timerdclient/timerdmsg.h>
-#include <debug.h>
 #include <sectionsdclient/sectionsdclient.h>
 #if HAVE_COOL_HARDWARE
 #include <coolstream/cs_vfd.h>
@@ -42,6 +40,9 @@
 #include <vector>
 #include <cstdlib>
 
+#include "debug.h"
+#include "timermanager.h"
+
 #ifndef FP_IOCTL_CLEAR_WAKEUP_TIMER
 #define FP_IOCTL_CLEAR_WAKEUP_TIMER 10
 #endif
diff --git a/src/zapit/lib/Makefile.am b/src/zapit/lib/Makefile.am
index ed2d0ca37..ad36418d2 100644
--- a/src/zapit/lib/Makefile.am
+++ b/src/zapit/lib/Makefile.am
@@ -1,6 +1,7 @@
 AM_CPPFLAGS = -fno-rtti -fno-exceptions
 
 INCLUDES = \
+	-I$(top_srcdir) \
 	-I$(top_srcdir)/src/zapit/include \
 	-I$(top_srcdir)/lib \
 	-I$(top_srcdir)/lib/libeventserver \
diff --git a/src/zapit/src/Makefile.am b/src/zapit/src/Makefile.am
index f20bd57d2..8cd67867f 100644
--- a/src/zapit/src/Makefile.am
+++ b/src/zapit/src/Makefile.am
@@ -1,8 +1,9 @@
 AM_CPPFLAGS = -fno-rtti -fno-exceptions
 
 INCLUDES = \
-	-I$(top_srcdir)/src/zapit/include \
+	-I$(top_srcdir) \
 	-I$(top_srcdir)/src \
+	-I$(top_srcdir)/src/zapit/include \
 	-I$(top_srcdir)/lib \
 	-I$(top_srcdir)/lib/libconfigfile \
 	-I$(top_srcdir)/lib/connection \