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 a23460ac9..d3d95d5b8 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 26e37f05c..d73f27c37 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;