diff --git a/src/gui/lua/luainstance.cpp b/src/gui/lua/luainstance.cpp
index e29f090a5..199a65196 100644
--- a/src/gui/lua/luainstance.cpp
+++ b/src/gui/lua/luainstance.cpp
@@ -36,12 +36,8 @@
 #include <driver/pictureviewer/pictureviewer.h>
 #include <driver/fontrenderer.h>
 #include <neutrino.h>
-#if HAVE_COOL_HARDWARE
-#include <video_cs.h>
-#endif
-#if USE_STB_HAL
-#include <video_hal.h>
-#endif
+
+#include <hardware/video.h>
 
 #include "luainstance.h"
 #include "lua_cc_header.h"
diff --git a/src/gui/osd_helpers.cpp b/src/gui/osd_helpers.cpp
index c42acb5b9..57a391360 100644
--- a/src/gui/osd_helpers.cpp
+++ b/src/gui/osd_helpers.cpp
@@ -14,12 +14,7 @@
 #include <gui/volumebar.h>
 #include <gui/osd_helpers.h>
 
-#if HAVE_COOL_HARDWARE
-#include <video_cs.h>
-#endif
-#if USE_STB_HAL
-#include <video_hal.h>
-#endif
+#include <hardware/video.h>
 
 extern CInfoClock *InfoClock;
 extern CTimeOSD *FileTimeOSD;
diff --git a/src/gui/osd_setup.cpp b/src/gui/osd_setup.cpp
index 3a943ab12..e992177b3 100644
--- a/src/gui/osd_setup.cpp
+++ b/src/gui/osd_setup.cpp
@@ -66,12 +66,7 @@
 #include <system/helpers.h>
 #include "cs_api.h"
 
-#if HAVE_COOL_HARDWARE
-#include <video_cs.h>
-#endif
-#if USE_STB_HAL
-#include <video_hal.h>
-#endif
+#include <hardware/video.h>
 
 extern CRemoteControl * g_RemoteControl;
 
diff --git a/src/gui/update.cpp b/src/gui/update.cpp
index 6639108da..baaabd418 100644
--- a/src/gui/update.cpp
+++ b/src/gui/update.cpp
@@ -79,7 +79,7 @@
 #include <cs_api.h>
 
 #if HAVE_ARM_HARDWARE
-#include <video_cs.h>
+#include <hardware/video.h>
 extern cVideo * videoDecoder;
 #endif
 
diff --git a/src/zapit/src/zapit.cpp b/src/zapit/src/zapit.cpp
index 07da38e49..fdde64837 100644
--- a/src/zapit/src/zapit.cpp
+++ b/src/zapit/src/zapit.cpp
@@ -56,19 +56,17 @@
 
 #include <zapit/satconfig.h>
 #include <zapit/femanager.h>
-#include <hardware/dmx.h>
+
 #if HAVE_COOL_HARDWARE
 #include <record_cs.h>
 #include <playback_cs.h>
 #include <pwrmngr.h>
-#include <audio_cs.h>
-#include <video_cs.h>
 #include <ca_cs.h>
 #endif
-#if USE_STB_HAL
-#include <video_hal.h>
-#include <audio_hal.h>
-#endif
+
+#include <hardware/audio.h>
+#include <hardware/dmx.h>
+#include <hardware/video.h>
 
 #include <driver/abstime.h>
 #include <system/set_threadname.h>