diff --git a/lib/hardware/audio.h b/lib/hardware/audio.h
new file mode 100644
index 000000000..7f2603721
--- /dev/null
+++ b/lib/hardware/audio.h
@@ -0,0 +1,8 @@
+#if HAVE_COOL_HARDWARE
+#include <audio_cs.h>
+#elif USE_STB_HAL
+#include <audio_hal.h>
+#else
+#error neither HAVE_COOL_HARDWARE nor USE_STB_HAL defined.
+#error do you need to include config.h?
+#endif
diff --git a/src/zapit/include/dmx.h b/lib/hardware/dmx.h
similarity index 99%
rename from src/zapit/include/dmx.h
rename to lib/hardware/dmx.h
index c8f41b8a3..2f1fcc764 100644
--- a/src/zapit/include/dmx.h
+++ b/lib/hardware/dmx.h
@@ -6,4 +6,3 @@
 #error neither HAVE_COOL_HARDWARE nor USE_STB_HAL defined.
 #error do you need to include config.h?
 #endif
-
diff --git a/lib/hardware/video.h b/lib/hardware/video.h
new file mode 100644
index 000000000..6da4b2929
--- /dev/null
+++ b/lib/hardware/video.h
@@ -0,0 +1,10 @@
+#if HAVE_COOL_HARDWARE
+#include <cs_api.h>
+#include <video_cs.h>
+#elif USE_STB_HAL
+#include <init_td.h>
+#include <video_hal.h>
+#else
+#error neither HAVE_COOL_HARDWARE nor USE_STB_HAL defined.
+#error do you need to include config.h?
+#endif
diff --git a/lib/libdvbsub/Makefile.am b/lib/libdvbsub/Makefile.am
index aa9082181..8b6ca3c74 100644
--- a/lib/libdvbsub/Makefile.am
+++ b/lib/libdvbsub/Makefile.am
@@ -1,8 +1,8 @@
 AM_CPPFLAGS = \
 	-I$(top_builddir) \
 	-I$(top_srcdir) \
+	-I$(top_srcdir)/lib \
 	-I$(top_srcdir)/src \
-	-I$(top_srcdir)/src/zapit/include \
 	@AVFORMAT_CFLAGS@ \
 	@SIGC_CFLAGS@ \
 	@HWLIB_CFLAGS@
diff --git a/lib/libdvbsub/dvbsub.cpp b/lib/libdvbsub/dvbsub.cpp
index 50df32b64..edf6f50a1 100644
--- a/lib/libdvbsub/dvbsub.cpp
+++ b/lib/libdvbsub/dvbsub.cpp
@@ -9,7 +9,7 @@
 
 #include <cerrno>
 
-#include <zapit/include/dmx.h>
+#include <hardware/dmx.h>
 
 #include "Debug.hpp"
 #include "PacketQueue.hpp"
diff --git a/lib/libtuxtxt/tuxtxt.cpp b/lib/libtuxtxt/tuxtxt.cpp
index c42e7e96c..0bfa7d8f7 100644
--- a/lib/libtuxtxt/tuxtxt.cpp
+++ b/lib/libtuxtxt/tuxtxt.cpp
@@ -18,8 +18,8 @@
 #include "teletext.h"
 #include "tuxtxt.h"
 #include <driver/framebuffer.h>
-#include <dmx.h>
-#include <video.h>
+#include <hardware/dmx.h>
+#include <hardware/video.h>
 #include <sys/stat.h>
 #include <global.h>
 #include <system/set_threadname.h>
diff --git a/lib/libtuxtxt/tuxtxt_common.h b/lib/libtuxtxt/tuxtxt_common.h
index 68b6d76bc..c5c8dd07a 100644
--- a/lib/libtuxtxt/tuxtxt_common.h
+++ b/lib/libtuxtxt/tuxtxt_common.h
@@ -11,7 +11,7 @@
 #include <zlib.h>
 #endif
 
-#include <zapit/include/dmx.h>
+#include <hardware/dmx.h>
 #include <system/set_threadname.h>
 
 tuxtxt_cache_struct tuxtxt_cache;
diff --git a/src/driver/audiodec/ffmpegdec.cpp b/src/driver/audiodec/ffmpegdec.cpp
index 13a4c28b4..24fd40af6 100644
--- a/src/driver/audiodec/ffmpegdec.cpp
+++ b/src/driver/audiodec/ffmpegdec.cpp
@@ -36,7 +36,7 @@
 
 #include <global.h>
 #include <driver/audioplay.h>
-#include <zapit/include/audio.h>
+#include <hardware/audio.h>
 #include <eitd/edvbstring.h> // UTF8
 #include "ffmpegdec.h"
 
diff --git a/src/driver/audiodec/flacdec.cpp b/src/driver/audiodec/flacdec.cpp
index 1ed0fd0d0..89c97454c 100644
--- a/src/driver/audiodec/flacdec.cpp
+++ b/src/driver/audiodec/flacdec.cpp
@@ -39,7 +39,7 @@
 #include <algorithm>
 #include <sstream>
 
-#include <zapit/include/audio.h>
+#include <hardware/audio.h>
 #include <driver/netfile.h>
 extern cAudio *audioDecoder;
 
diff --git a/src/driver/audiodec/mp3dec.cpp b/src/driver/audiodec/mp3dec.cpp
index e4acc41e3..84a30d0d9 100644
--- a/src/driver/audiodec/mp3dec.cpp
+++ b/src/driver/audiodec/mp3dec.cpp
@@ -53,7 +53,7 @@
 
 #include <global.h>
 #include <neutrino.h>
-#include <zapit/include/audio.h>
+#include <hardware/audio.h>
 #include "mp3dec.h"
 #include <driver/netfile.h>
 #include <driver/display.h>
diff --git a/src/driver/audiodec/oggdec.cpp b/src/driver/audiodec/oggdec.cpp
index c3de04273..ec9a28b37 100644
--- a/src/driver/audiodec/oggdec.cpp
+++ b/src/driver/audiodec/oggdec.cpp
@@ -36,7 +36,7 @@
 #include <algorithm>
 #include <sstream>
 
-#include <zapit/include/audio.h>
+#include <hardware/audio.h>
 
 #include "oggdec.h"
 
diff --git a/src/driver/audiodec/wavdec.cpp b/src/driver/audiodec/wavdec.cpp
index e7c900bf1..4344eed77 100644
--- a/src/driver/audiodec/wavdec.cpp
+++ b/src/driver/audiodec/wavdec.cpp
@@ -37,7 +37,7 @@
 #include <sstream>
 #include <driver/audioplay.h>
 #include <linux/soundcard.h>
-#include <zapit/include/audio.h>
+#include <hardware/audio.h>
 
 #include "wavdec.h"
 
diff --git a/src/driver/fb_generic.cpp b/src/driver/fb_generic.cpp
index 654abfcde..a24a98e30 100644
--- a/src/driver/fb_generic.cpp
+++ b/src/driver/fb_generic.cpp
@@ -51,7 +51,7 @@
 #include <gui/pictureviewer.h>
 #include <system/debug.h>
 #include <global.h>
-#include <video.h>
+#include <hardware/video.h>
 #include <cs_api.h>
 
 extern cVideo * videoDecoder;
diff --git a/src/driver/lcd4l.cpp b/src/driver/lcd4l.cpp
index c80aa7e65..a913005dd 100644
--- a/src/driver/lcd4l.cpp
+++ b/src/driver/lcd4l.cpp
@@ -51,7 +51,7 @@
 #include <gui/movieplayer.h>
 #include <gui/pictureviewer.h>
 #include <eitd/sectionsd.h>
-#include <video.h>
+#include <hardware/video.h>
 
 #include "lcd4l.h"
 
diff --git a/src/driver/radiotext.h b/src/driver/radiotext.h
index 3b5125918..7d7fef71c 100644
--- a/src/driver/radiotext.h
+++ b/src/driver/radiotext.h
@@ -46,7 +46,7 @@
 #ifndef __RADIO_AUDIO_H
 #define __RADIO_AUDIO_H
 
-#include <dmx.h>
+#include <hardware/dmx.h>
 #include <OpenThreads/Thread>
 #include <OpenThreads/Condition>
 #include <sigc++/signal.h>
diff --git a/src/driver/screenshot.cpp b/src/driver/screenshot.cpp
index 2cf2438d7..cadf95556 100644
--- a/src/driver/screenshot.cpp
+++ b/src/driver/screenshot.cpp
@@ -43,7 +43,7 @@
 #include <zapit/getservices.h>
 #include <eitd/sectionsd.h>
 
-#include <video.h>
+#include <hardware/video.h>
 #include <cs_api.h>
 #include <driver/screenshot.h>
 #include <system/set_threadname.h>
diff --git a/src/driver/streamts.cpp b/src/driver/streamts.cpp
index 7d7fab442..eb10cda04 100644
--- a/src/driver/streamts.cpp
+++ b/src/driver/streamts.cpp
@@ -49,7 +49,7 @@
 
 #include <string.h>
 
-#include <dmx.h>
+#include <hardware/dmx.h>
 #include <zapit/capmt.h>
 #include <zapit/zapit.h>
 #include <zapit/pat.h>
diff --git a/src/driver/streamts.h b/src/driver/streamts.h
index 7ec1bd321..51d755083 100644
--- a/src/driver/streamts.h
+++ b/src/driver/streamts.h
@@ -25,7 +25,7 @@
 #include <OpenThreads/Thread>
 #include <OpenThreads/Condition>
 
-#include <dmx.h>
+#include <hardware/dmx.h>
 #include <zapit/client/zapittypes.h>
 #include <zapit/femanager.h>
 #include <set>
diff --git a/src/driver/volume.cpp b/src/driver/volume.cpp
index e65e4553b..891aa7d02 100644
--- a/src/driver/volume.cpp
+++ b/src/driver/volume.cpp
@@ -32,9 +32,8 @@
 #include <gui/infoclock.h>
 #include <gui/keybind_setup.h>
 #include <system/debug.h>
-/* compat header from zapit/include */
-#include <audio.h>
-#include <video.h>
+#include <hardware/audio.h>
+#include <hardware/video.h>
 #include <system/settings.h>
 #include <system/helpers.h>
 #include <daemonc/remotecontrol.h>
diff --git a/src/gui/audio_setup.cpp b/src/gui/audio_setup.cpp
index 88d9f1856..8eda746a1 100644
--- a/src/gui/audio_setup.cpp
+++ b/src/gui/audio_setup.cpp
@@ -44,7 +44,7 @@
 
 #include <driver/screen_max.h>
 
-#include <audio.h>
+#include <hardware/audio.h>
 #include <zapit/zapit.h>
 
 #include <system/debug.h>
diff --git a/src/gui/audiomute.cpp b/src/gui/audiomute.cpp
index 5253de5ad..6bec9d9bf 100644
--- a/src/gui/audiomute.cpp
+++ b/src/gui/audiomute.cpp
@@ -30,7 +30,7 @@
 #endif
 #include <global.h>
 #include <neutrino.h>
-#include <video.h>
+#include <hardware/video.h>
 #include <driver/display.h>
 #include <gui/infoclock.h>
 #include <gui/volumebar.h>
diff --git a/src/gui/audioplayer.cpp b/src/gui/audioplayer.cpp
index d2b7fa09d..46fcbe44f 100644
--- a/src/gui/audioplayer.cpp
+++ b/src/gui/audioplayer.cpp
@@ -80,7 +80,7 @@ extern CPictureViewer * g_PicViewer;
 #endif
 
 #include <zapit/zapit.h>
-#include <video.h>
+#include <hardware/video.h>
 extern cVideo * videoDecoder;
 
 #define AUDIOPLAYERGUI_SMSKEY_TIMEOUT 1000
diff --git a/src/gui/cec_setup.cpp b/src/gui/cec_setup.cpp
index 55d1ee5a6..6034a74fc 100644
--- a/src/gui/cec_setup.cpp
+++ b/src/gui/cec_setup.cpp
@@ -45,7 +45,7 @@
 #include <system/debug.h>
 
 #include <cs_api.h>
-#include <video.h>
+#include <hardware/video.h>
 
 extern cVideo *videoDecoder;
 
diff --git a/src/gui/components/cc_item_tvpic.cpp b/src/gui/components/cc_item_tvpic.cpp
index 36418ed93..a63ad3b15 100644
--- a/src/gui/components/cc_item_tvpic.cpp
+++ b/src/gui/components/cc_item_tvpic.cpp
@@ -32,7 +32,7 @@
 #include <neutrino.h>
 #include "cc_item_tvpic.h"
 
-#include <video.h>
+#include <hardware/video.h>
 
 extern cVideo * videoDecoder;
 
diff --git a/src/gui/imageinfo_ni.cpp b/src/gui/imageinfo_ni.cpp
index dec650219..4dac31c91 100644
--- a/src/gui/imageinfo_ni.cpp
+++ b/src/gui/imageinfo_ni.cpp
@@ -40,7 +40,7 @@
 #include <sys/utsname.h>
 
 #include <system/flashtool.h>
-#include <video.h>
+#include <hardware/video.h>
 #include <unistd.h>
 
 #include <fstream>
diff --git a/src/gui/infoviewer.cpp b/src/gui/infoviewer.cpp
index 279e6684e..e85a13258 100644
--- a/src/gui/infoviewer.cpp
+++ b/src/gui/infoviewer.cpp
@@ -76,7 +76,7 @@
 #include <zapit/femanager.h>
 #include <zapit/zapit.h>
 #include <eitd/sectionsd.h>
-#include <video.h>
+#include <hardware/video.h>
 
 //NI
 #include <driver/screen_max.h>
diff --git a/src/gui/infoviewer_bb.cpp b/src/gui/infoviewer_bb.cpp
index e851384a7..0a0504f8f 100644
--- a/src/gui/infoviewer_bb.cpp
+++ b/src/gui/infoviewer_bb.cpp
@@ -61,7 +61,7 @@
 #include <zapit/zapit.h>
 #include <zapit/capmt.h> //NI
 
-#include <video.h>
+#include <hardware/video.h>
 
 extern CRemoteControl *g_RemoteControl;	/* neutrino.cpp */
 extern cVideo * videoDecoder;
diff --git a/src/gui/lua/lua_video.cpp b/src/gui/lua/lua_video.cpp
index cf7af409f..3a3291b8e 100644
--- a/src/gui/lua/lua_video.cpp
+++ b/src/gui/lua/lua_video.cpp
@@ -29,7 +29,7 @@
 #include <gui/movieplayer.h>
 #include <gui/widget/msgbox.h>
 #include <zapit/zapit.h>
-#include <video.h>
+#include <hardware/video.h>
 #include <neutrino.h>
 
 #include "luainstance.h"
diff --git a/src/gui/mediaplayer.cpp b/src/gui/mediaplayer.cpp
index e0ad5e6a2..ef521f680 100644
--- a/src/gui/mediaplayer.cpp
+++ b/src/gui/mediaplayer.cpp
@@ -51,7 +51,7 @@
 #include <driver/screen_max.h>
 
 #include <system/debug.h>
-#include <video.h>
+#include <hardware/video.h>
 extern cVideo * videoDecoder;
 
 
diff --git a/src/gui/miscsettings_menu.cpp b/src/gui/miscsettings_menu.cpp
index a9012f37c..7322eb209 100644
--- a/src/gui/miscsettings_menu.cpp
+++ b/src/gui/miscsettings_menu.cpp
@@ -55,7 +55,7 @@
 #include <zapit/femanager.h>
 #include <eitd/sectionsd.h>
 
-#include <video.h>
+#include <hardware/video.h>
 
 #include <sectionsdclient/sectionsdclient.h>
 
diff --git a/src/gui/movieplayer.cpp b/src/gui/movieplayer.cpp
index 42251313c..ba36ee5de 100644
--- a/src/gui/movieplayer.cpp
+++ b/src/gui/movieplayer.cpp
@@ -69,7 +69,7 @@
 #include <sys/mount.h>
 #include <json/json.h>
 
-#include <video.h>
+#include <hardware/video.h>
 #include <libtuxtxt/teletext.h>
 #include <zapit/zapit.h>
 #include <system/set_threadname.h>
diff --git a/src/gui/pictureviewer.cpp b/src/gui/pictureviewer.cpp
index d571cb0b0..b9ff75972 100644
--- a/src/gui/pictureviewer.cpp
+++ b/src/gui/pictureviewer.cpp
@@ -76,7 +76,7 @@
 #include <unistd.h>
 
 #include <zapit/zapit.h>
-#include <video.h>
+#include <hardware/video.h>
 extern cVideo * videoDecoder;
 
 
diff --git a/src/gui/pipsetup.cpp b/src/gui/pipsetup.cpp
index 5e5935961..985b60f96 100644
--- a/src/gui/pipsetup.cpp
+++ b/src/gui/pipsetup.cpp
@@ -12,7 +12,7 @@
 #include <global.h>
 #include <neutrino.h>
 #include <gui/pipsetup.h>
-#include <video.h>
+#include <hardware/video.h>
 
 #define PERCENT 5
 #define XMOVE 10
diff --git a/src/gui/plugins.cpp b/src/gui/plugins.cpp
index 5627be7fa..e1b0b3986 100644
--- a/src/gui/plugins.cpp
+++ b/src/gui/plugins.cpp
@@ -55,7 +55,7 @@
 #include <poll.h>
 #include <vector>
 
-#include <video.h>
+#include <hardware/video.h>
 extern cVideo * videoDecoder;
 
 #include "plugins.h"
diff --git a/src/gui/scan.cpp b/src/gui/scan.cpp
index 1389638a8..36728d74d 100644
--- a/src/gui/scan.cpp
+++ b/src/gui/scan.cpp
@@ -55,7 +55,7 @@
 #include <zapit/scan.h>
 #include <zapit/zapit.h>
 #include <zapit/getservices.h>
-#include <video.h>
+#include <hardware/video.h>
 
 extern cVideo * videoDecoder;
 
diff --git a/src/gui/screensaver.cpp b/src/gui/screensaver.cpp
index f885b927c..a7a743b62 100644
--- a/src/gui/screensaver.cpp
+++ b/src/gui/screensaver.cpp
@@ -44,7 +44,7 @@
 #include <zapit/zapit.h>
 #include <driver/pictureviewer/pictureviewer.h>
 
-#include <video.h>
+#include <hardware/video.h>
 extern cVideo * videoDecoder;
 
 //NI InfoIcons
diff --git a/src/gui/start_wizard.cpp b/src/gui/start_wizard.cpp
index d4091b6a5..c98737016 100644
--- a/src/gui/start_wizard.cpp
+++ b/src/gui/start_wizard.cpp
@@ -53,7 +53,7 @@
 
 #include <gui/widget/msgbox.h>
 
-#include <video.h>
+#include <hardware/video.h>
 
 extern cVideo * videoDecoder;
 extern Zapit_config zapitCfg;
diff --git a/src/gui/streaminfo1.cpp b/src/gui/streaminfo1.cpp
index ec0350fb2..808c2d3f2 100644
--- a/src/gui/streaminfo1.cpp
+++ b/src/gui/streaminfo1.cpp
@@ -48,9 +48,9 @@
 #include <daemonc/remotecontrol.h>
 #include <zapit/zapit.h>
 #include <zapit/getservices.h>
-#include <video.h>
-#include <audio.h>
-#include <dmx.h>
+#include <hardware/video.h>
+#include <hardware/audio.h>
+#include <hardware/dmx.h>
 #include <zapit/satconfig.h>
 #include <string>
 #include <system/helpers.h>
diff --git a/src/gui/streaminfo2.cpp b/src/gui/streaminfo2.cpp
index abbfe97c2..59d944ffe 100644
--- a/src/gui/streaminfo2.cpp
+++ b/src/gui/streaminfo2.cpp
@@ -55,9 +55,9 @@ extern "C" {
 #include <daemonc/remotecontrol.h>
 #include <zapit/zapit.h>
 #include <zapit/getservices.h>
-#include <video.h>
-#include <audio.h>
-#include <dmx.h>
+#include <hardware/video.h>
+#include <hardware/audio.h>
+#include <hardware/dmx.h>
 #include <zapit/satconfig.h>
 #include <string>
 #include <system/helpers.h>
diff --git a/src/gui/upnpbrowser.cpp b/src/gui/upnpbrowser.cpp
index 904084585..398d3f53c 100644
--- a/src/gui/upnpbrowser.cpp
+++ b/src/gui/upnpbrowser.cpp
@@ -53,7 +53,7 @@
 #include <system/settings.h>
 #include <system/helpers.h>
 #include <zapit/zapit.h>
-#include <video.h>
+#include <hardware/video.h>
 
 extern cVideo * videoDecoder;
 extern CPictureViewer * g_PicViewer;
diff --git a/src/gui/user_menue.cpp b/src/gui/user_menue.cpp
index 868518eb0..ee67c1460 100644
--- a/src/gui/user_menue.cpp
+++ b/src/gui/user_menue.cpp
@@ -87,7 +87,7 @@
 
 #include <system/helpers.h>
 #include <zapit/zapit.h>
-#include <video.h>
+#include <hardware/video.h>
 
 #include <daemonc/remotecontrol.h>
 extern CRemoteControl * g_RemoteControl;	/* neutrino.cpp */
diff --git a/src/gui/videosettings.cpp b/src/gui/videosettings.cpp
index 9e8dca13b..ab058e309 100644
--- a/src/gui/videosettings.cpp
+++ b/src/gui/videosettings.cpp
@@ -57,7 +57,7 @@
 #include <system/debug.h>
 
 #include <cs_api.h>
-#include <video.h>
+#include <hardware/video.h>
 
 #ifdef BOXMODEL_CS_HD2
 #include <cnxtfb.h>
diff --git a/src/neutrino.cpp b/src/neutrino.cpp
index 77307f385..ccafc9484 100644
--- a/src/neutrino.cpp
+++ b/src/neutrino.cpp
@@ -111,10 +111,10 @@
 
 #include <system/ytcache.h>
 
-#include <audio.h>
+#include <hardware/audio.h>
 #include <ca_cs.h>
 #include <cs_api.h>
-#include <video.h>
+#include <hardware/video.h>
 #include <pwrmngr.h>
 
 #include <system/debug.h>
diff --git a/src/nhttpd/tuxboxapi/controlapi.cpp b/src/nhttpd/tuxboxapi/controlapi.cpp
index 912f910d9..b59a0145a 100644
--- a/src/nhttpd/tuxboxapi/controlapi.cpp
+++ b/src/nhttpd/tuxboxapi/controlapi.cpp
@@ -49,7 +49,7 @@ extern CPictureViewer *g_PicViewer;
 // nhttpd
 #include "neutrinoapi.h"
 #include "controlapi.h"
-#include <video.h>
+#include <hardware/video.h>
 #include <zapit/femanager.h>
 
 extern cVideo * videoDecoder;
diff --git a/src/nhttpd/tuxboxapi/neutrinoapi.cpp b/src/nhttpd/tuxboxapi/neutrinoapi.cpp
index 41a80a6c9..245f90a8c 100644
--- a/src/nhttpd/tuxboxapi/neutrinoapi.cpp
+++ b/src/nhttpd/tuxboxapi/neutrinoapi.cpp
@@ -36,9 +36,9 @@
 #include <gui/movieplayer.h>
 #include <daemonc/remotecontrol.h>
 #include <zapit/frontend_c.h>
-#include <video.h>
-#include <audio.h>
-#include <dmx.h>
+#include <hardware/video.h>
+#include <hardware/audio.h>
+#include <hardware/dmx.h>
 #include <zapit/satconfig.h>
 #include <zapit/client/zapitclient.h>
 #include <zapit/zapit.h>
diff --git a/src/system/setting_helpers.cpp b/src/system/setting_helpers.cpp
index cd347b07f..559f2f2ba 100644
--- a/src/system/setting_helpers.cpp
+++ b/src/system/setting_helpers.cpp
@@ -69,9 +69,9 @@
 #include <gui/plugins.h>
 #include <daemonc/remotecontrol.h>
 #include <xmlinterface.h>
-#include <audio.h>
-#include <video.h>
-#include <dmx.h>
+#include <hardware/audio.h>
+#include <hardware/video.h>
+#include <hardware/dmx.h>
 #include <cs_api.h>
 #include <pwrmngr.h>
 #include <libdvbsub/dvbsub.h>
diff --git a/src/zapit/include/audio.h b/src/zapit/include/audio.h
deleted file mode 100644
index 812f2501a..000000000
--- a/src/zapit/include/audio.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#if HAVE_COOL_HARDWARE
-#include <audio_cs.h>
-#endif
-#if USE_STB_HAL
-#include <audio_hal.h>
-#endif
diff --git a/src/zapit/include/video.h b/src/zapit/include/video.h
deleted file mode 100644
index 61ca70a4d..000000000
--- a/src/zapit/include/video.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#if HAVE_COOL_HARDWARE
-#include <cs_api.h>
-#include <video_cs.h>
-#endif
-#if USE_STB_HAL
-#include <init_td.h>
-#include <video_hal.h>
-#endif
diff --git a/src/zapit/include/zapit/channel.h b/src/zapit/include/zapit/channel.h
index 3bc586bd8..66fed2a9e 100644
--- a/src/zapit/include/zapit/channel.h
+++ b/src/zapit/include/zapit/channel.h
@@ -33,7 +33,7 @@
 
 /* zapit */
 #include "types.h"
-//#include <zapit/audio.h>
+//#include <hardware/audio.h>
 
 #define DEFAULT_CH_LOCKED   false
 #define DEFAULT_CH_UNAME    ""
diff --git a/src/zapit/include/zapit/pat.h b/src/zapit/include/zapit/pat.h
index 8898b122d..2f209fabd 100644
--- a/src/zapit/include/zapit/pat.h
+++ b/src/zapit/include/zapit/pat.h
@@ -24,7 +24,7 @@
 #define __zapit_pat_h__
 
 #include <zapit/channel.h>
-#include <dmx.h>
+#include <hardware/dmx.h>
 
 #define PAT_SECTION_SIZE 1024
 
diff --git a/src/zapit/include/zapit/scanbat.h b/src/zapit/include/zapit/scanbat.h
index daa055fc3..3e2ec9018 100644
--- a/src/zapit/include/zapit/scanbat.h
+++ b/src/zapit/include/zapit/scanbat.h
@@ -24,7 +24,7 @@
 #define __zapit_scan_bat_h__
 
 #include <OpenThreads/Thread>
-#include <dmx.h>
+#include <hardware/dmx.h>
 #include <dvbsi++/bouquet_association_section.h>
 #include <dvbsi++/service_list_descriptor.h>
 #include <dvbsi++/logical_channel_descriptor.h>
diff --git a/src/zapit/include/zapit/scannit.h b/src/zapit/include/zapit/scannit.h
index e0bb4bb01..49a51e2c0 100644
--- a/src/zapit/include/zapit/scannit.h
+++ b/src/zapit/include/zapit/scannit.h
@@ -24,7 +24,7 @@
 #define __zapit_scan_nit_h__
 
 #include <OpenThreads/Thread>
-#include <dmx.h>
+#include <hardware/dmx.h>
 #include <dvbsi++/network_information_section.h>
 #include <dvbsi++/satellite_delivery_system_descriptor.h>
 #include <dvbsi++/cable_delivery_system_descriptor.h>
diff --git a/src/zapit/include/zapit/scansdt.h b/src/zapit/include/zapit/scansdt.h
index 23f5c1e00..1947c005e 100644
--- a/src/zapit/include/zapit/scansdt.h
+++ b/src/zapit/include/zapit/scansdt.h
@@ -24,7 +24,7 @@
 #define __zapit_scan_sdt_h__
 
 #include <zapit/pat.h>
-#include <dmx.h>
+#include <hardware/dmx.h>
 #include <dvbsi++/service_description_section.h>
 #include <dvbsi++/service_descriptor.h>
 
diff --git a/src/zapit/src/pat.cpp b/src/zapit/src/pat.cpp
index c9e9fb73a..3ed188d0b 100644
--- a/src/zapit/src/pat.cpp
+++ b/src/zapit/src/pat.cpp
@@ -22,7 +22,7 @@
 
 #include <zapit/debug.h>
 #include <zapit/pat.h>
-#include <dmx.h>
+#include <hardware/dmx.h>
 
 CPat::CPat(int dnum)
 {
diff --git a/src/zapit/src/scanbat.cpp b/src/zapit/src/scanbat.cpp
index 79e3a1b24..214898bd4 100644
--- a/src/zapit/src/scanbat.cpp
+++ b/src/zapit/src/scanbat.cpp
@@ -20,7 +20,7 @@
 
 #include <zapit/debug.h>
 #include <zapit/getservices.h>
-#include <dmx.h>
+#include <hardware/dmx.h>
 #include <zapit/scanbat.h>
 #include <zapit/scan.h>
 #include <dvbsi++/descriptor_tag.h>
diff --git a/src/zapit/src/scannit.cpp b/src/zapit/src/scannit.cpp
index 7912fd2db..df846a258 100644
--- a/src/zapit/src/scannit.cpp
+++ b/src/zapit/src/scannit.cpp
@@ -20,7 +20,7 @@
 
 #include <zapit/debug.h>
 #include <zapit/getservices.h>
-#include <dmx.h>
+#include <hardware/dmx.h>
 #include <zapit/scannit.h>
 #include <zapit/scan.h>
 #include <dvbsi++/descriptor_tag.h>
diff --git a/src/zapit/src/scanpmt.cpp b/src/zapit/src/scanpmt.cpp
index 6ecbdf400..3d10d6c63 100644
--- a/src/zapit/src/scanpmt.cpp
+++ b/src/zapit/src/scanpmt.cpp
@@ -27,7 +27,7 @@
 #include <zapit/scanpmt.h>
 #include <zapit/scan.h>
 #include <eitd/edvbstring.h>
-#include <dmx.h>
+#include <hardware/dmx.h>
 
 #include <dvbsi++/descriptor_tag.h>
 #include <dvbsi++/program_map_section.h>
diff --git a/src/zapit/src/scansdt.cpp b/src/zapit/src/scansdt.cpp
index a91dbb30f..f921ae411 100644
--- a/src/zapit/src/scansdt.cpp
+++ b/src/zapit/src/scansdt.cpp
@@ -30,7 +30,7 @@
 #include <zapit/types.h>
 #include <zapit/zapit.h>
 #include <zapit/scan.h>
-#include <dmx.h>
+#include <hardware/dmx.h>
 
 #include <dvbsi++/descriptor_tag.h>
 #include <dvbsi++/ca_identifier_descriptor.h>
diff --git a/src/zapit/src/zapit.cpp b/src/zapit/src/zapit.cpp
index beebb846a..ae1fb68bb 100644
--- a/src/zapit/src/zapit.cpp
+++ b/src/zapit/src/zapit.cpp
@@ -56,7 +56,7 @@
 
 #include <zapit/satconfig.h>
 #include <zapit/femanager.h>
-#include <dmx.h>
+#include <hardware/dmx.h>
 #if HAVE_COOL_HARDWARE
 #include <record_cs.h>
 #include <playback_cs.h>