diff --git a/src/daemonc/remotecontrol.cpp b/src/daemonc/remotecontrol.cpp
index 06ba0b50d..8a2f6c4fc 100644
--- a/src/daemonc/remotecontrol.cpp
+++ b/src/daemonc/remotecontrol.cpp
@@ -39,7 +39,6 @@
 #include <neutrino.h>
 #include <gui/infoviewer.h>
 
-#include <driver/encoding.h>
 #include <driver/record.h>
 #include <driver/abstime.h>
 #include "libdvbsub/dvbsub.h"
diff --git a/src/driver/rcinput.cpp b/src/driver/rcinput.cpp
index c064c5fd0..8365837e5 100644
--- a/src/driver/rcinput.cpp
+++ b/src/driver/rcinput.cpp
@@ -35,7 +35,6 @@
 
 #include <driver/rcinput.h>
 #include <driver/abstime.h>
-#include <driver/stream2file.h>
 
 #include <stdio.h>
 #include <asm/types.h>
@@ -1143,6 +1142,7 @@ printf("[neutrino] CSectionsdClient::EVT_GOT_CN_EPG\n");
 					}
 					else if (emsg.initiatorID == CEventServer::INITID_NEUTRINO)
 					{
+#if 0
 						if ((emsg.eventID == NeutrinoMessages::EVT_RECORDING_ENDED) &&
 								(read_bytes == sizeof(stream2file_status2_t)))
 						{
@@ -1150,6 +1150,7 @@ printf("[neutrino] CSectionsdClient::EVT_GOT_CN_EPG\n");
 							*data = (neutrino_msg_data_t) p;
 							dont_delete_p = true;
 						}
+#endif
 					}
 					else if (emsg.initiatorID == CEventServer::INITID_GENERIC_INPUT_EVENT_PROVIDER)
 					{
diff --git a/src/global.h b/src/global.h
index 97945f7b8..e0fe58160 100644
--- a/src/global.h
+++ b/src/global.h
@@ -40,7 +40,6 @@
 #include <driver/radiotext.h>
 #if HAVE_COOL_HARDWARE
 #include <driver/vfd.h>
-#include <driver/rfmod.h>
 #endif
 #if HAVE_TRIPLEDRAGON
 #include <driver/lcdd.h>
@@ -95,9 +94,6 @@ NEUTRINO_CPP  CInfoViewer	*g_InfoViewer;
 NEUTRINO_CPP  CNeutrinoEventList		*g_EventList;
 
 NEUTRINO_CPP CLocaleManager	*g_Locale;
-#if HAVE_COOL_HARDWARE
-NEUTRINO_CPP RFmod		*g_RFmod;
-#endif
 NEUTRINO_CPP CVideoSettings	*g_videoSettings;
 NEUTRINO_CPP CRadioText		*g_Radiotext;
 
diff --git a/src/gui/audioplayer.cpp b/src/gui/audioplayer.cpp
index d69841228..f0288f48e 100644
--- a/src/gui/audioplayer.cpp
+++ b/src/gui/audioplayer.cpp
@@ -42,7 +42,6 @@
 #include <global.h>
 #include <neutrino.h>
 
-#include <driver/encoding.h>
 #include <driver/fontrenderer.h>
 #include <driver/rcinput.h>
 #include <driver/audioplay.h>
diff --git a/src/gui/epgview.cpp b/src/gui/epgview.cpp
index d4ad4202d..279df0740 100644
--- a/src/gui/epgview.cpp
+++ b/src/gui/epgview.cpp
@@ -47,7 +47,6 @@
 #include <global.h>
 #include <neutrino.h>
 
-#include <driver/encoding.h>
 #include <driver/screen_max.h>
 #include <driver/fade.h>
 #include <gui/filebrowser.h>
diff --git a/src/gui/filebrowser.cpp b/src/gui/filebrowser.cpp
index 2f5487ccf..6b0049c6e 100644
--- a/src/gui/filebrowser.cpp
+++ b/src/gui/filebrowser.cpp
@@ -40,8 +40,6 @@
 #include <gui/widget/icons.h>
 #include <gui/widget/messagebox.h>
 
-#include <driver/encoding.h>
-
 #include <algorithm>
 #include <iostream>
 #include <cctype>
@@ -63,8 +61,6 @@
 #include <curl/types.h>
 #endif
 
-#include <driver/encoding.h>
-
 #include <xmltree/xmlinterface.h>
 
 #ifdef __USE_FILE_OFFSET64
diff --git a/src/gui/pluginlist.cpp b/src/gui/pluginlist.cpp
index 862888241..dfa8f6bd6 100644
--- a/src/gui/pluginlist.cpp
+++ b/src/gui/pluginlist.cpp
@@ -52,7 +52,6 @@
 
 #include <global.h>
 #include <neutrino.h>
-#include <driver/encoding.h>
 #include <driver/screen_max.h>
 #include <driver/fade.h>
 
diff --git a/src/gui/timerlist.cpp b/src/gui/timerlist.cpp
index bbe52bb48..c7c2fd3f8 100644
--- a/src/gui/timerlist.cpp
+++ b/src/gui/timerlist.cpp
@@ -40,7 +40,6 @@
 
 #include <daemonc/remotecontrol.h>
 
-#include <driver/encoding.h>
 #include <driver/fontrenderer.h>
 #include <driver/rcinput.h>
 #include <driver/screen_max.h>
diff --git a/src/gui/update.cpp b/src/gui/update.cpp
index 4ec7feaf9..71b71a3cb 100644
--- a/src/gui/update.cpp
+++ b/src/gui/update.cpp
@@ -39,7 +39,6 @@
 #include <neutrino.h>
 #include <neutrino_menue.h>
 
-#include <driver/encoding.h>
 #include <driver/fontrenderer.h>
 #include <driver/rcinput.h>
 #include <driver/screen_max.h>
diff --git a/src/gui/upnpbrowser.cpp b/src/gui/upnpbrowser.cpp
index 503562a90..717e4648e 100644
--- a/src/gui/upnpbrowser.cpp
+++ b/src/gui/upnpbrowser.cpp
@@ -43,7 +43,6 @@
 #include <xmltree.h>
 #include <upnpclient.h>
 
-#include <driver/encoding.h>
 #include <driver/fontrenderer.h>
 #include <driver/rcinput.h>
 #include <driver/audioplay.h>
diff --git a/src/neutrino.cpp b/src/neutrino.cpp
index 774aa7a45..f95fe0e0b 100644
--- a/src/neutrino.cpp
+++ b/src/neutrino.cpp
@@ -51,7 +51,6 @@
 #include <driver/framebuffer.h>
 #include <driver/rcinput.h>
 #include <driver/shutdown_count.h>
-#include <driver/stream2file.h>
 #include <driver/record.h>
 #include <driver/screenshot.h>
 #include <driver/volume.h>
diff --git a/src/system/flashtool.cpp b/src/system/flashtool.cpp
index e2c625fe3..ec9eff466 100644
--- a/src/system/flashtool.cpp
+++ b/src/system/flashtool.cpp
@@ -46,7 +46,6 @@
 
 //#include <libcramfs.h>
 
-#include <driver/encoding.h>
 #include <global.h>