diff --git a/src/gui/user_menue.cpp b/src/gui/user_menue.cpp
index c487c66f7..6596035b0 100644
--- a/src/gui/user_menue.cpp
+++ b/src/gui/user_menue.cpp
@@ -61,6 +61,7 @@
 #endif
 #include "pluginlist.h"
 #include "infoclock.h"
+#include "rc_lock.h"
 
 #include <global.h>
 #include <neutrino.h>
diff --git a/src/neutrino.cpp b/src/neutrino.cpp
index 4cd330c21..364002b1c 100644
--- a/src/neutrino.cpp
+++ b/src/neutrino.cpp
@@ -100,6 +100,7 @@
 #include "gui/pipsetup.h"
 #endif
 #include "gui/themes.h"
+#include "gui/timerlist.h"
 
 #include <system/ytcache.h>
 
diff --git a/src/neutrino.h b/src/neutrino.h
index 44c06e6a7..0a704617b 100644
--- a/src/neutrino.h
+++ b/src/neutrino.h
@@ -33,19 +33,12 @@
 #ifndef __neutrino__
 #define __neutrino__
 
-#include <configfile.h>
-
 #include <neutrinoMessages.h>
-#include "driver/framebuffer.h"
-#include "driver/neutrinofonts.h"
-#include "system/setting_helpers.h"
-#include "system/configure_network.h"
 #include "daemonc/remotecontrol.h"    /* st_rmsg      */
 #include "gui/channellist.h"          /* CChannelList */
 #include "gui/personalize.h"
-#include "gui/rc_lock.h"
 #include "gui/user_menue.h"
-#include "gui/timerlist.h"
+#include <timerdclient/timerdtypes.h>
 
 #include <string>
 
@@ -60,6 +53,10 @@
 extern const unsigned char genre_sub_classes[];            /* epgview.cpp */
 extern const neutrino_locale_t * genre_sub_classes_list[]; /* epgview.cpp */
 
+class CFrameBuffer;
+class CConfigFile;
+class CScanSettings;
+
 class CNeutrinoApp : public CMenuTarget, CChangeObserver
 {
 public:
diff --git a/src/neutrino_menue.cpp b/src/neutrino_menue.cpp
index 87e73620b..ad36eb999 100644
--- a/src/neutrino_menue.cpp
+++ b/src/neutrino_menue.cpp
@@ -69,6 +69,7 @@
 #include "gui/scan_setup.h"
 #include "gui/settings_manager.h"
 #include "gui/sleeptimer.h"
+#include "gui/timerlist.h"
 #include "gui/update_menue.h"
 #include "gui/streaminfo2.h"
 #ifdef ENABLE_TESTING