From bd01452e2f030e96af9f13dd8498a6b5d9909d4e Mon Sep 17 00:00:00 2001
From: svenhoefer <svenhoefer@svenhoefer.com>
Date: Sat, 22 Dec 2018 10:03:40 +0100
Subject: [PATCH] - simplify more includes of compatibility headers

Signed-off-by: Thilo Graf <dbt@novatux.de>
---
 src/eitd/dmx.h                  | 8 ++------
 src/zapit/include/zapit/capmt.h | 3 ++-
 src/zapit/src/femanager.cpp     | 2 +-
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/eitd/dmx.h b/src/eitd/dmx.h
index 5444b3bf9..42d42f34b 100644
--- a/src/eitd/dmx.h
+++ b/src/eitd/dmx.h
@@ -29,12 +29,8 @@
 #include <sys/types.h>
 #include <vector>
 #include <config.h>
-#if HAVE_COOL_HARDWARE
-#include <dmx_cs.h>
-#endif
-#if USE_STB_HAL
-#include <dmx_hal.h>
-#endif
+
+#include <hardware/dmx.h>
 
 #include <zapit/types.h>
 #include <set>
diff --git a/src/zapit/include/zapit/capmt.h b/src/zapit/include/zapit/capmt.h
index 5e6d77017..4f29f4412 100644
--- a/src/zapit/include/zapit/capmt.h
+++ b/src/zapit/include/zapit/capmt.h
@@ -28,7 +28,8 @@
 #include <OpenThreads/Mutex>
 #include <zapit/channel.h>
 #include <dvbsi++/ca_program_map_section.h>
-#include <dmx_cs.h>
+
+#include <hardware/dmx.h>
 
 #define DEMUX_DECODE_0 1
 #define DEMUX_DECODE_1 2
diff --git a/src/zapit/src/femanager.cpp b/src/zapit/src/femanager.cpp
index 294fb2b55..202dea536 100644
--- a/src/zapit/src/femanager.cpp
+++ b/src/zapit/src/femanager.cpp
@@ -38,7 +38,7 @@
 #include <zapit/client/zapittools.h>
 #include <zapit/femanager.h>
 #include <zapit/capmt.h>
-#include <dmx_cs.h>
+#include <hardware/dmx.h>
 #include <OpenThreads/ScopedLock>
 
 static int fedebug = 0;