diff --git a/lib/libdvbsub/dvbsub.cpp b/lib/libdvbsub/dvbsub.cpp
index ad67f055e..21a2b1bc6 100644
--- a/lib/libdvbsub/dvbsub.cpp
+++ b/lib/libdvbsub/dvbsub.cpp
@@ -16,7 +16,6 @@
 
 #include "Debug.hpp"
 #include "PacketQueue.hpp"
-#include "semaphore.h"
 #include "helpers.hpp"
 #include "dvbsubtitle.h"
 
diff --git a/lib/libdvbsub/dvbsubtitle.cpp b/lib/libdvbsub/dvbsubtitle.cpp
index 43297eade..b88ed4d6d 100644
--- a/lib/libdvbsub/dvbsubtitle.cpp
+++ b/lib/libdvbsub/dvbsubtitle.cpp
@@ -22,7 +22,7 @@ extern "C" {
 #include <libavcodec/avcodec.h>
 #include <libavutil/avutil.h>
 }
-#include "driver/framebuffer.h"
+#include <driver/framebuffer.h>
 #include "Debug.hpp"
 
 // Set these to 'true' for debug output:
diff --git a/lib/libtuxtxt/tuxtxt.cpp b/lib/libtuxtxt/tuxtxt.cpp
index 2a9da1f0a..9ef4c5c67 100644
--- a/lib/libtuxtxt/tuxtxt.cpp
+++ b/lib/libtuxtxt/tuxtxt.cpp
@@ -15,7 +15,7 @@
 
 #include "teletext.h"
 #include "tuxtxt.h"
-#include "driver/framebuffer.h"
+#include <driver/framebuffer.h>
 #include <dmx.h>
 #include <video.h>
 #include <sys/stat.h>
diff --git a/lib/xmltree/xmlparse.cpp b/lib/xmltree/xmlparse.cpp
index d0a531824..f2c2c5fd2 100644
--- a/lib/xmltree/xmlparse.cpp
+++ b/lib/xmltree/xmlparse.cpp
@@ -43,7 +43,7 @@ ChangeLog:
 #include <string.h>
 #include <stddef.h>
 
-#include "xmldef.h"
+#include "xmltok/xmldef.h"
 
 #ifdef XML_UNICODE
 #define XML_ENCODE_MAX XML_UTF16_ENCODE_MAX
diff --git a/lib/xmltree/xmlrole.c b/lib/xmltree/xmlrole.c
index 27d5c41ce..23b3a62c4 100644
--- a/lib/xmltree/xmlrole.c
+++ b/lib/xmltree/xmlrole.c
@@ -18,7 +18,7 @@ James Clark. All Rights Reserved.
 Contributor(s):
 */
 
-#include "xmldef.h"
+#include "xmltok/xmldef.h"
 #include "xmlrole.h"
 
 /* Doesn't check:
diff --git a/lib/xmltree/xmltok.c b/lib/xmltree/xmltok.c
index 4634a0356..989ea638b 100644
--- a/lib/xmltree/xmltok.c
+++ b/lib/xmltree/xmltok.c
@@ -18,9 +18,9 @@ James Clark. All Rights Reserved.
 Contributor(s):
 */
 
-#include "xmldef.h"
+#include "xmltok/xmldef.h"
 #include "xmltok.h"
-#include "nametab.h"
+#include "xmltok/nametab.h"
 
 #define VTABLE1 \
   { PREFIX(prologTok), PREFIX(contentTok), PREFIX(cdataSectionTok) }, \
@@ -265,7 +265,7 @@ static const struct normal_encoding utf8_encoding = {
   { VTABLE1, utf8_toUtf8, utf8_toUtf16, 1, 1, 0 },
   {
 #include "asciitab.h"
-#include "utf8tab.h"
+#include "xmltok/utf8tab.h"
   },
   NORMAL_VTABLE(utf8_)
 };
@@ -274,7 +274,7 @@ static const struct normal_encoding internal_utf8_encoding = {
   { VTABLE1, utf8_toUtf8, utf8_toUtf16, 1, 1, 0 },
   {
 #include "iasctab.h"
-#include "utf8tab.h"
+#include "xmltok/utf8tab.h"
   },
   NORMAL_VTABLE(utf8_)
 };
@@ -319,7 +319,7 @@ static const struct normal_encoding latin1_encoding = {
   { VTABLE1, latin1_toUtf8, latin1_toUtf16, 1, 0, 0 },
   {
 #include "asciitab.h"
-#include "latin1tab.h"
+#include "xmltok/latin1tab.h"
   },
   NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL
 };
@@ -490,7 +490,7 @@ static const struct normal_encoding little2_encoding = {
   },
   {
 #include "asciitab.h"
-#include "latin1tab.h"
+#include "xmltok/latin1tab.h"
   },
   NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL
 };
@@ -501,7 +501,7 @@ static const struct normal_encoding internal_little2_encoding = {
   { VTABLE, 2, 0, 1 },
   {
 #include "iasctab.h"
-#include "latin1tab.h"
+#include "xmltok/latin1tab.h"
   },
   NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL
 };
@@ -559,7 +559,7 @@ static const struct normal_encoding big2_encoding = {
   },
   {
 #include "asciitab.h"
-#include "latin1tab.h"
+#include "xmltok/latin1tab.h"
   },
   NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL
 };
diff --git a/src/daemonc/remotecontrol.cpp b/src/daemonc/remotecontrol.cpp
index 79bacc428..a9f1937a8 100644
--- a/src/daemonc/remotecontrol.cpp
+++ b/src/daemonc/remotecontrol.cpp
@@ -41,8 +41,8 @@
 
 #include <driver/record.h>
 #include <driver/abstime.h>
-#include "libdvbsub/dvbsub.h"
-#include "libtuxtxt/teletext.h"
+#include <libdvbsub/dvbsub.h>
+#include <libtuxtxt/teletext.h>
 
 #include <zapit/channel.h>
 #include <zapit/bouquets.h>
diff --git a/src/driver/audioplay.cpp b/src/driver/audioplay.cpp
index 3358043df..3ea3fd4d4 100644
--- a/src/driver/audioplay.cpp
+++ b/src/driver/audioplay.cpp
@@ -34,7 +34,7 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include "global.h"
+#include <global.h>
 #include <stdio.h>
 #include <fcntl.h>
 #include <sched.h>
diff --git a/src/driver/framebuffer.cpp b/src/driver/framebuffer.cpp
index ab4a80c3e..b727ef51e 100644
--- a/src/driver/framebuffer.cpp
+++ b/src/driver/framebuffer.cpp
@@ -38,8 +38,6 @@
 
 #include <linux/kd.h>
 
-#include <stdint.h>
-
 #include <gui/color.h>
 #include <gui/pictureviewer.h>
 #include <global.h>
diff --git a/src/driver/netfile.cpp b/src/driver/netfile.cpp
index 2b6303cb2..3a235e3fa 100644
--- a/src/driver/netfile.cpp
+++ b/src/driver/netfile.cpp
@@ -101,12 +101,10 @@
 #endif
 
 #include "netfile.h"
-#include "global.h"
+#include <global.h>
 #include <fcntl.h>
 #include <poll.h>
 #include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
 #include <driver/audioplay.h>
 /*
 TODO:
diff --git a/src/driver/pictureviewer/fb_display.cpp b/src/driver/pictureviewer/fb_display.cpp
index 469b07815..95b2a9b0e 100644
--- a/src/driver/pictureviewer/fb_display.cpp
+++ b/src/driver/pictureviewer/fb_display.cpp
@@ -18,7 +18,7 @@
 #include <errno.h>
 #include "fb_display.h"
 #include "pictureviewer.h"
-#include "driver/framebuffer.h"
+#include <driver/framebuffer.h>
 
 static unsigned char *lfb = 0;
 
diff --git a/src/driver/pictureviewer/pictureviewer.cpp b/src/driver/pictureviewer/pictureviewer.cpp
index 39ca3203d..3cef358f1 100644
--- a/src/driver/pictureviewer/pictureviewer.cpp
+++ b/src/driver/pictureviewer/pictureviewer.cpp
@@ -3,7 +3,6 @@
 #include <neutrino.h>
 #include "pictureviewer.h"
 #include "pv_config.h"
-#include "driver/framebuffer.h"
 
 #include <unistd.h>
 #include <stdio.h>
diff --git a/src/driver/pictureviewer/pictureviewer.h b/src/driver/pictureviewer/pictureviewer.h
index 094a11217..011fa8bee 100644
--- a/src/driver/pictureviewer/pictureviewer.h
+++ b/src/driver/pictureviewer/pictureviewer.h
@@ -30,7 +30,7 @@
 #include <vector>
 #include <stdio.h>    /* printf       */
 #include <sys/time.h> /* gettimeofday */
-#include "driver/framebuffer.h"
+#include <driver/framebuffer.h>
 class CPictureViewer
 {
 	struct cformathandler 
diff --git a/src/driver/record.cpp b/src/driver/record.cpp
index b11a6fbb1..a5ff08e7c 100644
--- a/src/driver/record.cpp
+++ b/src/driver/record.cpp
@@ -40,13 +40,15 @@
 #include <neutrino.h>
 #include <gui/filebrowser.h>
 #include <gui/movieplayer.h>
+#include <gui/nfs.h>
 #include <gui/widget/hintbox.h>
 #include <gui/widget/messagebox.h>
 #include <gui/widget/mountchooser.h>
 #include <daemonc/remotecontrol.h>
 #include <system/setting_helpers.h>
 #include <system/fsmounter.h>
-#include <gui/nfs.h>
+#include <system/helpers.h>
+
 
 #include <driver/record.h>
 #include <zapit/capmt.h>
@@ -1446,7 +1448,7 @@ bool CRecordManager::RunStartScript(void)
 		return false;
 
 	puts("[neutrino.cpp] executing " NEUTRINO_RECORDING_START_SCRIPT ".");
-	if (system(NEUTRINO_RECORDING_START_SCRIPT) != 0) {
+	if (file_exists(NEUTRINO_RECORDING_START_SCRIPT) && my_system(NEUTRINO_RECORDING_START_SCRIPT,NULL,NULL) != 0) {
 		perror(NEUTRINO_RECORDING_START_SCRIPT " failed");
 		return false;
 	}
@@ -1460,7 +1462,7 @@ bool CRecordManager::RunStopScript(void)
 		return false;
 
 	puts("[neutrino.cpp] executing " NEUTRINO_RECORDING_ENDED_SCRIPT ".");
-	if (system(NEUTRINO_RECORDING_ENDED_SCRIPT) != 0) {
+	if (file_exists(NEUTRINO_RECORDING_ENDED_SCRIPT) && my_system(NEUTRINO_RECORDING_ENDED_SCRIPT,NULL,NULL) != 0) {
 		perror(NEUTRINO_RECORDING_ENDED_SCRIPT " failed");
 		return false;
 	}
diff --git a/src/driver/screen_max.cpp b/src/driver/screen_max.cpp
index 404fbb50a..601d46206 100644
--- a/src/driver/screen_max.cpp
+++ b/src/driver/screen_max.cpp
@@ -12,8 +12,8 @@
 
 
 
-#include "global.h"
-#include "driver/screen_max.h"
+#include <global.h>
+#include <driver/screen_max.h>
 
 
 // -- this is a simple odd class provided for 'static' usage
diff --git a/src/gui/audio_select.cpp b/src/gui/audio_select.cpp
index ab66db7b6..cabf99de6 100644
--- a/src/gui/audio_select.cpp
+++ b/src/gui/audio_select.cpp
@@ -47,8 +47,8 @@ extern CRemoteControl		* g_RemoteControl; /* neutrino.cpp */
 extern CAudioSetupNotifier	* audioSetupNotifier;
 
 #include <gui/audio_select.h>
-#include "libdvbsub/dvbsub.h"
-#include "libtuxtxt/teletext.h"
+#include <libdvbsub/dvbsub.h>
+#include <libtuxtxt/teletext.h>
 
 //
 //  -- AUDIO Selector Menue Handler Class
diff --git a/src/gui/audio_setup.cpp b/src/gui/audio_setup.cpp
index 4cf8ee6a5..ec407188b 100644
--- a/src/gui/audio_setup.cpp
+++ b/src/gui/audio_setup.cpp
@@ -33,7 +33,7 @@
 #endif
 
 
-#include "gui/audio_setup.h"
+#include "audio_setup.h"
 
 #include <global.h>
 #include <neutrino.h>
diff --git a/src/gui/audioplayer.cpp b/src/gui/audioplayer.cpp
index 60359eb71..308cecdb3 100644
--- a/src/gui/audioplayer.cpp
+++ b/src/gui/audioplayer.cpp
@@ -60,14 +60,13 @@
 
 #include <gui/widget/buttons.h>
 #include <gui/widget/icons.h>
-#include <gui/widget/menue.h>
 #include <gui/widget/messagebox.h>
 #include <gui/widget/hintbox.h>
 #include <gui/widget/stringinput.h>
 #include <gui/widget/stringinput_ext.h>
 
 #include <system/settings.h>
-#include <xmltree/xmlinterface.h>
+#include <system/helpers.h>
 #include <driver/screen_max.h>
 
 #include <algorithm>
@@ -145,7 +144,7 @@ void CAudiofileExt::operator=(const CAudiofileExt& src)
 #include <curl/curl.h>
 #include <curl/easy.h>
 
-#ifndef NEW_LIBCURL
+#if LIBCURL_VERSION_NUM < 0x071507
 #include <curl/types.h>
 #endif
 
@@ -319,7 +318,7 @@ int CAudioPlayerGui::exec(CMenuTarget* parent, const std::string &actionKey)
 	g_Sectionsd->setPauseScanning(true);
 
 	puts("[audioplayer.cpp] executing " AUDIOPLAYER_START_SCRIPT ".");
-	if (system(AUDIOPLAYER_START_SCRIPT) != 0)
+	if (file_exists(AUDIOPLAYER_START_SCRIPT) && my_system(AUDIOPLAYER_START_SCRIPT,NULL,NULL) != 0)
 		perror("Datei " AUDIOPLAYER_START_SCRIPT " fehlt.Bitte erstellen, wenn gebraucht.\nFile " AUDIOPLAYER_START_SCRIPT " not found. Please create if needed.\n");
 
 	show();
@@ -331,7 +330,7 @@ int CAudioPlayerGui::exec(CMenuTarget* parent, const std::string &actionKey)
 	m_frameBuffer->paintBackground();
 
 	puts("[audioplayer.cpp] executing " AUDIOPLAYER_END_SCRIPT ".");
-	if (system(AUDIOPLAYER_END_SCRIPT) != 0)
+	if (file_exists(AUDIOPLAYER_END_SCRIPT) && my_system(AUDIOPLAYER_END_SCRIPT,NULL,NULL) != 0)
 		perror("Datei " AUDIOPLAYER_END_SCRIPT " fehlt. Bitte erstellen, wenn gebraucht.\nFile " AUDIOPLAYER_END_SCRIPT " not found. Please create if needed.\n");
 
 	g_Zapit->unlockPlayBack();
diff --git a/src/gui/audioplayer.h b/src/gui/audioplayer.h
index 07a6c6fc5..92ff2a2bb 100644
--- a/src/gui/audioplayer.h
+++ b/src/gui/audioplayer.h
@@ -34,11 +34,11 @@
 #define __audioplayergui__
 
 
-#include "driver/framebuffer.h"
-#include "driver/audiofile.h"
-#include "gui/filebrowser.h"
-#include "gui/widget/components.h"
-#include "gui/widget/menue.h"
+#include <driver/framebuffer.h>
+#include <driver/audiofile.h>
+#include <gui/filebrowser.h>
+#include <gui/widget/components.h>
+#include <gui/widget/menue.h>
 
 #include <xmltree/xmlinterface.h>
 
diff --git a/src/gui/audioplayer_setup.cpp b/src/gui/audioplayer_setup.cpp
index 4dea21a80..5ebee8d9a 100644
--- a/src/gui/audioplayer_setup.cpp
+++ b/src/gui/audioplayer_setup.cpp
@@ -34,7 +34,7 @@
 #endif
 
 
-#include "gui/audioplayer_setup.h"
+#include "audioplayer_setup.h"
 
 #include <global.h>
 #include <neutrino.h>
@@ -44,8 +44,8 @@
 #include <gui/widget/icons.h>
 #include <gui/widget/stringinput.h>
 
-#include "gui/audioplayer.h"
-#include "gui/filebrowser.h"
+#include <gui/audioplayer.h>
+#include <gui/filebrowser.h>
 
 #include <driver/screen_max.h>
 
diff --git a/src/gui/bedit/bouqueteditor_bouquets.cpp b/src/gui/bedit/bouqueteditor_bouquets.cpp
index 6cfb749f6..157723695 100644
--- a/src/gui/bedit/bouqueteditor_bouquets.cpp
+++ b/src/gui/bedit/bouqueteditor_bouquets.cpp
@@ -35,19 +35,17 @@
 
 #include <global.h>
 #include <neutrino.h>
+#include "bouqueteditor_channels.h"
+#include "bouqueteditor_bouquets.h"
 
 #include <driver/fontrenderer.h>
 #include <driver/screen_max.h>
 #include <gui/widget/buttons.h>
 #include <gui/widget/hintbox.h>
-#include <gui/widget/icons.h>
 #include <gui/widget/messagebox.h>
 #include <gui/widget/stringinput.h>
-#include <zapit/client/zapitclient.h>
 #include <zapit/client/zapittools.h>
 
-#include "bouqueteditor_channels.h"
-#include "bouqueteditor_bouquets.h"
 extern CBouquetManager *g_bouquetManager;
 
 CBEBouquetWidget::CBEBouquetWidget()
diff --git a/src/gui/bedit/bouqueteditor_channels.cpp b/src/gui/bedit/bouqueteditor_channels.cpp
index 00fa4d5e0..86cf9a28d 100644
--- a/src/gui/bedit/bouqueteditor_channels.cpp
+++ b/src/gui/bedit/bouqueteditor_channels.cpp
@@ -35,10 +35,7 @@
 #include <config.h>
 #endif
 
-#include <gui/widget/buttons.h>
-#include <gui/widget/icons.h>
 #include <gui/widget/messagebox.h>
-
 #include "bouqueteditor_channels.h"
 
 #include <global.h>
@@ -53,7 +50,6 @@
 #include <zapit/getservices.h>
 #include <zapit/femanager.h>
 
-#include <zapit/client/zapitclient.h>
 extern CBouquetManager *g_bouquetManager;
 
 CBEChannelWidget::CBEChannelWidget(const std::string & Caption, unsigned int Bouquet)
diff --git a/src/gui/bedit/bouqueteditor_chanselect.cpp b/src/gui/bedit/bouqueteditor_chanselect.cpp
index e2f787e44..9eadfe56c 100644
--- a/src/gui/bedit/bouqueteditor_chanselect.cpp
+++ b/src/gui/bedit/bouqueteditor_chanselect.cpp
@@ -35,17 +35,16 @@
 
 #include <global.h>
 #include <neutrino.h>
+#include "bouqueteditor_chanselect.h"
 
 #include <driver/fontrenderer.h>
 #include <driver/screen_max.h>
 #include <gui/widget/icons.h>
 #include <gui/widget/buttons.h>
 
-#include <zapit/client/zapitclient.h>
 #include <zapit/zapit.h>
 #include <zapit/getservices.h>
 
-#include "bouqueteditor_chanselect.h"
 
 extern CBouquetManager *g_bouquetManager;
 
diff --git a/src/gui/bookmarkmanager.cpp b/src/gui/bookmarkmanager.cpp
index d7f81a167..4da3d7427 100644
--- a/src/gui/bookmarkmanager.cpp
+++ b/src/gui/bookmarkmanager.cpp
@@ -43,7 +43,6 @@
 #include <gui/widget/buttons.h>
 
 #include <fcntl.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <sys/ioctl.h>
 #include <sys/stat.h>
diff --git a/src/gui/bouquetlist.cpp b/src/gui/bouquetlist.cpp
index c433ffad4..009885b51 100644
--- a/src/gui/bouquetlist.cpp
+++ b/src/gui/bouquetlist.cpp
@@ -33,7 +33,6 @@
 #include <config.h>
 #endif
 
-#include <string>
 #include <algorithm>
 
 #include <gui/bouquetlist.h>
@@ -353,7 +352,8 @@ int CBouquetList::show(bool bShowChannelList)
 				loop = false;
 		}
 		else if ((msg == CRCInput::RC_timeout                             ) ||
-				(msg == (neutrino_msg_t)g_settings.key_channelList_cancel))
+				(msg == (neutrino_msg_t)g_settings.key_channelList_cancel) ||
+				(msg == CRCInput::RC_favorites) )
 		{
 			selected = oldselected;
 			if(fader.StartFadeOut()) {
diff --git a/src/gui/cam_menu.cpp b/src/gui/cam_menu.cpp
index ae836ced5..6da597a76 100644
--- a/src/gui/cam_menu.cpp
+++ b/src/gui/cam_menu.cpp
@@ -22,6 +22,7 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
+#include "cam_menu.h"
 
 #include <stdio.h>
 #include <unistd.h>
@@ -31,25 +32,21 @@
 #include <sys/ioctl.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <fcntl.h>
 #include <dirent.h>
 #include <dlfcn.h>
 #include <sys/mount.h>
 
 #include <global.h>
 #include <neutrino.h>
-#include <gui/widget/icons.h>
-#include "gui/widget/menue.h"
-#include "gui/widget/stringinput.h"
-#include "gui/widget/messagebox.h"
-#include "gui/widget/hintbox.h"
-#include "gui/widget/progresswindow.h"
+#include "widget/icons.h"
+#include "widget/stringinput.h"
+#include "widget/messagebox.h"
+#include "widget/progresswindow.h"
 
-#include "system/setting_helpers.h"
-#include "system/settings.h"
-#include "system/debug.h"
+#include <system/setting_helpers.h>
+#include <system/settings.h>
+#include <system/debug.h>
 
-#include <gui/cam_menu.h>
 #include <mymenu.h>
 #include <eitd/edvbstring.h>
 
diff --git a/src/gui/cec_setup.cpp b/src/gui/cec_setup.cpp
index 605fa262b..edc861b6b 100644
--- a/src/gui/cec_setup.cpp
+++ b/src/gui/cec_setup.cpp
@@ -31,7 +31,7 @@
 #endif
 
 
-#include "gui/cec_setup.h"
+#include "cec_setup.h"
 
 #include <global.h>
 #include <neutrino.h>
diff --git a/src/gui/channellist.cpp b/src/gui/channellist.cpp
index 078e5e467..f7c8b1d57 100644
--- a/src/gui/channellist.cpp
+++ b/src/gui/channellist.cpp
@@ -50,16 +50,14 @@
 #include <gui/color.h>
 #include <gui/eventlist.h>
 #include <gui/infoviewer.h>
+#include <gui/osd_setup.h>
 #include <gui/widget/buttons.h>
 #include <gui/widget/icons.h>
-#include <gui/widget/menue.h>
 #include <gui/widget/messagebox.h>
 #include <gui/widget/progressbar.h>
 #include <gui/widget/components.h>
-#include <gui/osd_setup.h>
 
 #include <system/settings.h>
-#include <system/lastchannel.h>
 #include <gui/customcolor.h>
 
 #include <gui/bouquetlist.h>
diff --git a/src/gui/epgplus.h b/src/gui/epgplus.h
index 45adfb0ae..b03aed939 100644
--- a/src/gui/epgplus.h
+++ b/src/gui/epgplus.h
@@ -35,7 +35,6 @@
 
 #include <driver/framebuffer.h>
 #include <driver/fontrenderer.h>
-#include <driver/rcinput.h>
 #include <system/settings.h>
 
 #include "color.h"
diff --git a/src/gui/eventlist.cpp b/src/gui/eventlist.cpp
index 4a2ee9eef..20afa9c3e 100644
--- a/src/gui/eventlist.cpp
+++ b/src/gui/eventlist.cpp
@@ -48,7 +48,7 @@
 
 #include "widget/hintbox.h"
 #include "widget/buttons.h"
-#include "gui/bouquetlist.h"
+#include "bouquetlist.h"
 #include <gui/widget/stringinput.h>
 
 #include <driver/screen_max.h>
diff --git a/src/gui/filebrowser.cpp b/src/gui/filebrowser.cpp
index 9bfc94f0e..4e7f07f1f 100644
--- a/src/gui/filebrowser.cpp
+++ b/src/gui/filebrowser.cpp
@@ -58,10 +58,10 @@
 #include <curl/curl.h>
 #include <curl/easy.h>
 
-#ifndef NEW_LIBCURL
+#if LIBCURL_VERSION_NUM < 0x071507
 #include <curl/types.h>
 #endif
-
+#include <system/helpers.h>
 #include <xmltree/xmlinterface.h>
 
 #ifdef __USE_FILE_OFFSET64
diff --git a/src/gui/hdd_menu.cpp b/src/gui/hdd_menu.cpp
index 178c56192..88b618954 100644
--- a/src/gui/hdd_menu.cpp
+++ b/src/gui/hdd_menu.cpp
@@ -48,18 +48,18 @@
 #include <global.h>
 #include <neutrino.h>
 #include <neutrino_menue.h>
+#include "hdd_menu.h"
 
 #include <gui/widget/icons.h>
-#include "gui/widget/stringinput.h"
-#include "gui/widget/messagebox.h"
-#include "gui/widget/hintbox.h"
-#include "gui/widget/progresswindow.h"
+#include <gui/widget/stringinput.h>
+#include <gui/widget/messagebox.h>
+#include <gui/widget/hintbox.h>
+#include <gui/widget/progresswindow.h>
 
-#include "system/setting_helpers.h"
-#include "system/settings.h"
-#include "system/debug.h"
+#include <system/helpers.h>
+#include <system/settings.h>
+#include <system/debug.h>
 
-#include <gui/hdd_menu.h>
 #include <mymenu.h>
 #include <driver/screen_max.h>
 
diff --git a/src/gui/info_menue.cpp b/src/gui/info_menue.cpp
index ea5ffd0c7..bb8470a48 100644
--- a/src/gui/info_menue.cpp
+++ b/src/gui/info_menue.cpp
@@ -34,9 +34,9 @@
 #include <neutrino.h>
 #include <neutrino_menue.h>
 
-#include "gui/info_menue.h"
-#include "gui/imageinfo.h"
-#include "gui/dboxinfo.h"
+#include <gui/info_menue.h>
+#include <gui/imageinfo.h>
+#include <gui/dboxinfo.h>
 #include <gui/streaminfo2.h>
 
 #include <driver/screen_max.h>
diff --git a/src/gui/infoclock.h b/src/gui/infoclock.h
index a03abf2a6..73b4ebb93 100644
--- a/src/gui/infoclock.h
+++ b/src/gui/infoclock.h
@@ -6,7 +6,7 @@
 #include <driver/fontrenderer.h>
 #include <system/settings.h>
 
-#include "gui/color.h"
+#include <gui/color.h>
 
 #include <string>
 
diff --git a/src/gui/infoviewer.cpp b/src/gui/infoviewer.cpp
index 8312763cb..4485919b0 100644
--- a/src/gui/infoviewer.cpp
+++ b/src/gui/infoviewer.cpp
@@ -32,7 +32,8 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include <string>
+#include "infoviewer.h"
+
 #include <algorithm>
 
 #include <sys/types.h>
@@ -48,7 +49,6 @@
 #include <global.h>
 #include <neutrino.h>
 
-#include <gui/infoviewer.h>
 #include <gui/bouquetlist.h>
 #include <gui/widget/icons.h>
 #include <gui/widget/hintbox.h>
diff --git a/src/gui/infoviewer_bb.cpp b/src/gui/infoviewer_bb.cpp
index 1d0f8a193..b8e2bb967 100644
--- a/src/gui/infoviewer_bb.cpp
+++ b/src/gui/infoviewer_bb.cpp
@@ -32,7 +32,8 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include <string>
+#include "infoviewer_bb.h"
+
 #include <algorithm>
 
 #include <sys/types.h>
@@ -49,13 +50,12 @@
 #include <neutrino.h>
 
 #include <gui/infoviewer.h>
-#include <gui/infoviewer_bb.h>
 #include <gui/bouquetlist.h>
 #include <gui/widget/icons.h>
 #include <gui/widget/hintbox.h>
 #include <gui/customcolor.h>
 #include <gui/pictureviewer.h>
-
+#include <system/helpers.h>
 #include <daemonc/remotecontrol.h>
 
 #include <zapit/femanager.h>
diff --git a/src/gui/infoviewer_bb.h b/src/gui/infoviewer_bb.h
index b41c0afcd..349be1a7a 100644
--- a/src/gui/infoviewer_bb.h
+++ b/src/gui/infoviewer_bb.h
@@ -42,7 +42,6 @@
 #include <system/settings.h>
 #include "widget/menue.h"
 #include <gui/widget/progressbar.h>
-#include <gui/infoviewer.h>
 #include <string>
 
 class CInfoViewerBB
diff --git a/src/gui/keybind_setup.cpp b/src/gui/keybind_setup.cpp
index ae783f70e..608046f6c 100644
--- a/src/gui/keybind_setup.cpp
+++ b/src/gui/keybind_setup.cpp
@@ -47,7 +47,7 @@
 #endif
 #endif
 
-#include "gui/keybind_setup.h"
+#include "keybind_setup.h"
 
 #include <global.h>
 #include <neutrino.h>
@@ -58,7 +58,7 @@
 #include <gui/widget/messagebox.h>
 #include <gui/widget/stringinput.h>
 
-#include "gui/filebrowser.h"
+#include <gui/filebrowser.h>
 
 #include <driver/screen_max.h>
 #include <driver/screenshot.h>
diff --git a/src/gui/mediaplayer.cpp b/src/gui/mediaplayer.cpp
index dd4422e0e..30172d0f5 100644
--- a/src/gui/mediaplayer.cpp
+++ b/src/gui/mediaplayer.cpp
@@ -31,17 +31,17 @@
 #endif
 
 
-#include "gui/mediaplayer.h"
+#include "mediaplayer.h"
 
 #include <global.h>
 #include <neutrino.h>
 #include <neutrino_menue.h>
 #include <neutrinoMessages.h>
 
-#include "gui/movieplayer.h"
-#include "gui/pictureviewer.h"
+#include <gui/movieplayer.h>
+#include <gui/pictureviewer.h>
 #if ENABLE_UPNP
-#include "gui/upnpbrowser.h"
+#include <gui/upnpbrowser.h>
 #endif
 
 #include <gui/widget/icons.h>
diff --git a/src/gui/mediaplayer.h b/src/gui/mediaplayer.h
index d2cfe042e..a52199d8b 100644
--- a/src/gui/mediaplayer.h
+++ b/src/gui/mediaplayer.h
@@ -30,8 +30,8 @@
 #define __MEDIAPLAYER__
 
 #include <gui/widget/menue.h>
-#include "gui/audioplayer.h"
-#include "gui/personalize.h"
+#include <gui/audioplayer.h>
+#include <gui/personalize.h>
 
 #include <string>
 
diff --git a/src/gui/mediaplayer_setup.cpp b/src/gui/mediaplayer_setup.cpp
index fe48d6646..f10df62d7 100644
--- a/src/gui/mediaplayer_setup.cpp
+++ b/src/gui/mediaplayer_setup.cpp
@@ -35,17 +35,17 @@
 #endif
 
 
-#include "gui/mediaplayer_setup.h"
+#include "mediaplayer_setup.h"
 
 #include <global.h>
 #include <neutrino.h>
 
 #include <gui/widget/icons.h>
-#include "gui/widget/stringinput.h"
+#include <gui/widget/stringinput.h>
 
 
-#include "gui/audioplayer_setup.h"
-#include "gui/pictureviewer_setup.h"
+#include <gui/audioplayer_setup.h>
+#include <gui/pictureviewer_setup.h>
 
 
 #include <driver/screen_max.h>
diff --git a/src/gui/miscsettings_menu.cpp b/src/gui/miscsettings_menu.cpp
index 01ec9cfb6..bc05e028c 100644
--- a/src/gui/miscsettings_menu.cpp
+++ b/src/gui/miscsettings_menu.cpp
@@ -35,13 +35,13 @@
 #include <neutrino_menue.h>
 #include <system/setting_helpers.h>
 
-#include "gui/miscsettings_menu.h"
-#include "gui/cec_setup.h"
-#include "gui/filebrowser.h"
-#include "gui/keybind_setup.h"
-#include "gui/plugins.h"
-#include "gui/sleeptimer.h"
-#include "gui/zapit_setup.h"
+#include <gui/miscsettings_menu.h>
+#include <gui/cec_setup.h>
+#include <gui/filebrowser.h>
+#include <gui/keybind_setup.h>
+#include <gui/plugins.h>
+#include <gui/sleeptimer.h>
+#include <gui/zapit_setup.h>
 
 #include <gui/widget/icons.h>
 #include <gui/widget/stringinput.h>
diff --git a/src/gui/miscsettings_menu.h b/src/gui/miscsettings_menu.h
index 888d91915..84e4e72b5 100644
--- a/src/gui/miscsettings_menu.h
+++ b/src/gui/miscsettings_menu.h
@@ -32,7 +32,6 @@
 #include <system/settings.h>
 
 #include <string>
-#include "gui/widget/menue.h"
 
 //#define CPU_FREQ
 
diff --git a/src/gui/motorcontrol.cpp b/src/gui/motorcontrol.cpp
index 6c42ab6d4..8b43f99f5 100644
--- a/src/gui/motorcontrol.cpp
+++ b/src/gui/motorcontrol.cpp
@@ -36,7 +36,7 @@
 #include <gui/customcolor.h>
 #include <driver/rcinput.h>
 #include <gui/motorcontrol.h>
-#include "gui/scan_setup.h"
+#include <gui/scan_setup.h>
 #include <gui/color.h>
 #include <gui/widget/menue.h>
 #include <gui/widget/messagebox.h>
diff --git a/src/gui/moviebrowser.cpp b/src/gui/moviebrowser.cpp
index 243a870e2..199f3a485 100644
--- a/src/gui/moviebrowser.cpp
+++ b/src/gui/moviebrowser.cpp
@@ -53,23 +53,23 @@
 #include <cstdlib>
 #include "moviebrowser.h"
 #include "filebrowser.h"
-#include "widget/hintbox.h"
-#include "widget/helpbox.h"
-#include "widget/messagebox.h"
-#include "widget/stringinput_ext.h"
+#include <gui/widget/hintbox.h>
+#include <gui/widget/helpbox.h>
+#include <gui/widget/icons.h>
+#include <gui/widget/progressbar.h>
+#include <gui/widget/messagebox.h>
+#include <gui/widget/stringinput.h>
+#include <gui/widget/stringinput_ext.h>
 #include <dirent.h>
 #include <sys/stat.h>
 #include <gui/nfs.h>
-#include "neutrino.h"
+#include <neutrino.h>
 #include <sys/vfs.h> // for statfs
 #include <sys/mount.h>
 #include <utime.h>
 #include <unistd.h>
-#include <gui/widget/icons.h>
-#include <gui/widget/progressbar.h>
 #include <gui/pictureviewer.h>
 #include <gui/customcolor.h>
-#include <gui/widget/stringinput.h>
 #include <driver/record.h>
 
 extern CPictureViewer * g_PicViewer;
diff --git a/src/gui/moviebrowser.h b/src/gui/moviebrowser.h
index 1f1bcf637..a18f19fe3 100644
--- a/src/gui/moviebrowser.h
+++ b/src/gui/moviebrowser.h
@@ -73,13 +73,13 @@
 
 #include <string>
 #include <vector>
-#include "gui/widget/listframe.h"
-#include "gui/widget/menue.h"
-#include "gui/widget/textbox.h"
-#include "gui/movieinfo.h"
-#include "driver/file.h"
+#include <gui/widget/listframe.h>
+#include <gui/widget/menue.h>
+#include <gui/widget/textbox.h>
+#include <gui/movieinfo.h>
+#include <driver/file.h>
 #include <driver/fb_window.h>
-#include "driver/pictureviewer/pictureviewer.h"
+#include <driver/pictureviewer/pictureviewer.h>
 
 #define MAX_NUMBER_OF_BOOKMARK_ITEMS MI_MOVIE_BOOK_USER_MAX // we just use the same size as used in Movie info (MAX_NUMBER_OF_BOOKMARK_ITEMS is used for the number of menu items)
 #define MOVIEBROWSER_SETTINGS_FILE          CONFIGDIR "/moviebrowser.conf"
diff --git a/src/gui/movieplayer.cpp b/src/gui/movieplayer.cpp
index dbdb1b020..0103724a8 100644
--- a/src/gui/movieplayer.cpp
+++ b/src/gui/movieplayer.cpp
@@ -32,22 +32,20 @@
 
 #include <gui/movieplayer.h>
 #include <gui/infoviewer.h>
-#include <gui/bookmarkmanager.h>
 #include <gui/timeosd.h>
-#include <gui/moviebrowser.h>
 #include <gui/widget/helpbox.h>
 #include <gui/infoclock.h>
 #include <gui/plugins.h>
 #include <driver/screenshot.h>
 #include <driver/volume.h>
+#include <system/helpers.h>
 
 #include <unistd.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <sys/timeb.h>
 
 #include <video.h>
-#include "libtuxtxt/teletext.h"
+#include <libtuxtxt/teletext.h>
 #include <zapit/zapit.h>
 #include <fstream>
 #include <iostream>
@@ -178,7 +176,7 @@ int CMoviePlayerGui::exec(CMenuTarget * parent, const std::string & actionKey)
 	startposition = 0;
 
 	puts("[movieplayer.cpp] executing " MOVIEPLAYER_START_SCRIPT ".");
-	if (system(MOVIEPLAYER_START_SCRIPT) != 0)
+	if (file_exists(MOVIEPLAYER_START_SCRIPT) && my_system(MOVIEPLAYER_START_SCRIPT,NULL,NULL) != 0)
 		perror(MOVIEPLAYER_START_SCRIPT " failed");
 	
 	isMovieBrowser = false;
@@ -216,7 +214,7 @@ int CMoviePlayerGui::exec(CMenuTarget * parent, const std::string & actionKey)
 	bookmarkmanager->flush();
 
 	puts("[movieplayer.cpp] executing " MOVIEPLAYER_END_SCRIPT ".");
-	if (system(MOVIEPLAYER_END_SCRIPT) != 0)
+	if (file_exists(MOVIEPLAYER_END_SCRIPT) && my_system(MOVIEPLAYER_END_SCRIPT,NULL,NULL) != 0)
 		perror(MOVIEPLAYER_END_SCRIPT " failed");
 
 	CVFD::getInstance()->setMode(CVFD::MODE_TVRADIO);
@@ -303,7 +301,7 @@ bool CMoviePlayerGui::SelectFile()
 
 	printf("CMoviePlayerGui::SelectFile: isBookmark %d timeshift %d isMovieBrowser %d\n", isBookmark, timeshift, isMovieBrowser);
 	if (has_hdd)
-		system("(rm /hdd/.wakeup; touch /hdd/.wakeup; sync) > /dev/null  2> /dev/null &");
+		wakeup_hdd(g_settings.network_nfs_recordingdir);
 
 	if (timeshift) {
 		t_channel_id live_channel_id = CZapit::getInstance()->GetCurrentChannelID();
diff --git a/src/gui/movieplayer.h b/src/gui/movieplayer.h
index 2afd1a8b6..1ede8b215 100644
--- a/src/gui/movieplayer.h
+++ b/src/gui/movieplayer.h
@@ -34,12 +34,12 @@
 
 #include <config.h>
 #include <configfile.h>
-#include "driver/framebuffer.h"
-#include "gui/filebrowser.h"
-#include "gui/bookmarkmanager.h"
-#include "gui/widget/menue.h"
-#include "gui/moviebrowser.h"
-#include "gui/movieinfo.h"
+#include <driver/framebuffer.h>
+#include <gui/filebrowser.h>
+#include <gui/bookmarkmanager.h>
+#include <gui/widget/menue.h>
+#include <gui/moviebrowser.h>
+#include <gui/movieinfo.h>
 #include <gui/widget/hintbox.h>
 #include <driver/record.h>
 #include <playback.h>
diff --git a/src/gui/network_service.cpp b/src/gui/network_service.cpp
index 6585c919c..450c49953 100644
--- a/src/gui/network_service.cpp
+++ b/src/gui/network_service.cpp
@@ -28,8 +28,8 @@
 #include <neutrino.h>
 
 #include <gui/widget/icons.h>
-#include "gui/network_service.h"
-#include "mymenu.h"
+#include "network_service.h"
+#include <mymenu.h>
 
 #include <driver/screen_max.h>
 
diff --git a/src/gui/network_setup.cpp b/src/gui/network_setup.cpp
index 97e5c879b..f3f6083e2 100644
--- a/src/gui/network_setup.cpp
+++ b/src/gui/network_setup.cpp
@@ -34,9 +34,9 @@
 
 #include <dirent.h>
 
-#include "gui/network_setup.h"
-#include "gui/proxyserver_setup.h"
-#include "gui/nfs.h"
+#include "network_setup.h"
+#include <gui/proxyserver_setup.h>
+#include <gui/nfs.h>
 
 #include <gui/widget/icons.h>
 #include <gui/widget/stringinput.h>
diff --git a/src/gui/parentallock_setup.cpp b/src/gui/parentallock_setup.cpp
index 8a7d867a1..364dd9423 100644
--- a/src/gui/parentallock_setup.cpp
+++ b/src/gui/parentallock_setup.cpp
@@ -34,7 +34,7 @@
 #endif
 
 
-#include "gui/parentallock_setup.h"
+#include "parentallock_setup.h"
 
 #include <gui/widget/icons.h>
 #include <gui/widget/stringinput.h>
diff --git a/src/gui/personalize.h b/src/gui/personalize.h
index 3c9c8a242..c9c7b4c2e 100644
--- a/src/gui/personalize.h
+++ b/src/gui/personalize.h
@@ -52,8 +52,8 @@
 #define __personalize__
 
 #include <gui/widget/menue.h>
-#include "gui/plugins.h"
-#include "gui/user_menue_setup.h"
+#include <gui/plugins.h>
+#include <gui/user_menue_setup.h>
 #include "widget/stringinput.h"
 #include "widget/stringinput_ext.h"
 #include <string>
diff --git a/src/gui/pictureviewer.h b/src/gui/pictureviewer.h
index dda45557e..2a72c7728 100644
--- a/src/gui/pictureviewer.h
+++ b/src/gui/pictureviewer.h
@@ -33,10 +33,10 @@
 #define __pictureviewergui__
 
 
-#include "driver/framebuffer.h"
-#include "driver/pictureviewer/pictureviewer.h"
-#include "gui/widget/menue.h"
-#include "gui/filebrowser.h"
+#include <driver/framebuffer.h>
+#include <driver/pictureviewer/pictureviewer.h>
+#include <gui/widget/menue.h>
+#include <gui/filebrowser.h>
 
 #include <string>
 
diff --git a/src/gui/pictureviewer_setup.cpp b/src/gui/pictureviewer_setup.cpp
index 601638c6b..6dd9be459 100644
--- a/src/gui/pictureviewer_setup.cpp
+++ b/src/gui/pictureviewer_setup.cpp
@@ -33,7 +33,7 @@
 #include <config.h>
 #endif
 
-#include "gui/pictureviewer_setup.h"
+#include "pictureviewer_setup.h"
 
 #include <global.h>
 #include <neutrino.h>
@@ -43,8 +43,8 @@
 #include <gui/widget/stringinput.h>
 #include <gui/widget/stringinput_ext.h>
 
-#include "gui/pictureviewer.h"
-#include "gui/filebrowser.h"
+#include <gui/pictureviewer.h>
+#include <gui/filebrowser.h>
 
 #include <driver/screen_max.h>
 
diff --git a/src/gui/plugins.cpp b/src/gui/plugins.cpp
index 8a0e1c7e9..06b8b88e8 100644
--- a/src/gui/plugins.cpp
+++ b/src/gui/plugins.cpp
@@ -96,18 +96,6 @@ int CPlugins::find_plugin(const std::string & filename)
 	return -1;
 }
 
-bool CPlugins::pluginfile_exists(const std::string & filename)
-{
-	struct stat stat_buf;
-	if(::stat(filename.c_str(), &stat_buf) == 0)
-	{
-		return true;
-	} else
-	{
-		return false;
-	}
-}
-
 void CPlugins::scanDir(const char *dir)
 {
 	struct dirent **namelist;
@@ -370,7 +358,7 @@ void CPlugins::startScriptPlugin(int number)
 {
 	const char *script = plugin_list[number].pluginfile.c_str();
 	printf("[CPlugins] executing script %s\n",script);
-	if (!pluginfile_exists(plugin_list[number].pluginfile))
+	if (!file_exists(script))
 	{
 		printf("[CPlugins] could not find %s,\nperhaps wrong plugin type in %s\n",
 		       script, plugin_list[number].cfgfile.c_str());
@@ -423,7 +411,7 @@ void CPlugins::startPlugin(int number,int /*param*/)
 		startScriptPlugin(number);
 		return;
 	}
-	if (!pluginfile_exists(plugin_list[number].pluginfile))
+	if (!file_exists(plugin_list[number].pluginfile.c_str()))
 	{
 		printf("[CPlugins] could not find %s,\nperhaps wrong plugin type in %s\n",
 		       plugin_list[number].pluginfile.c_str(), plugin_list[number].cfgfile.c_str());
diff --git a/src/gui/plugins.h b/src/gui/plugins.h
index 9fab562b2..f37cc0704 100644
--- a/src/gui/plugins.h
+++ b/src/gui/plugins.h
@@ -97,7 +97,6 @@ class CPlugins
 		void scanDir(const char *dir);
 		bool plugin_exists(const std::string & filename);
 		int find_plugin(const std::string & filename);
-		bool pluginfile_exists(const std::string & filename);
 		CPlugins::p_type_t getPluginType(int type);
 	public:
 		CPlugins();
diff --git a/src/gui/proxyserver_setup.cpp b/src/gui/proxyserver_setup.cpp
index 38c8990b3..b4600e7f0 100644
--- a/src/gui/proxyserver_setup.cpp
+++ b/src/gui/proxyserver_setup.cpp
@@ -32,7 +32,7 @@
 #include <config.h>
 #endif
 
-#include "gui/proxyserver_setup.h"
+#include "proxyserver_setup.h"
 
 #include <global.h>
 #include <neutrino.h>
diff --git a/src/gui/record_setup.cpp b/src/gui/record_setup.cpp
index f9ba63afb..aced80cda 100644
--- a/src/gui/record_setup.cpp
+++ b/src/gui/record_setup.cpp
@@ -39,8 +39,8 @@
 #include <neutrino_menue.h>
 #include <mymenu.h>
 
-#include "gui/record_setup.h"
-#include "gui/filebrowser.h"
+#include "record_setup.h"
+#include <gui/filebrowser.h>
 
 #include <gui/widget/icons.h>
 #include <gui/widget/messagebox.h>
@@ -51,7 +51,7 @@
 #include <driver/record.h>
 
 #include <system/debug.h>
-
+#include <system/helpers.h>
 
 CRecordSetup::CRecordSetup()
 {
diff --git a/src/gui/scan.cpp b/src/gui/scan.cpp
index 75324cfd1..0c6587f83 100644
--- a/src/gui/scan.cpp
+++ b/src/gui/scan.cpp
@@ -38,7 +38,7 @@
 #include <fcntl.h>
 
 #include <gui/scan.h>
-#include "gui/scan_setup.h"
+#include <gui/scan_setup.h>
 
 #include <driver/rcinput.h>
 #include <driver/screen_max.h>
@@ -52,6 +52,7 @@
 #include <gui/widget/progressbar.h>
 
 #include <system/settings.h>
+#include <system/helpers.h>
 
 #include <global.h>
 #include <neutrino.h>
@@ -248,7 +249,7 @@ int CScanTs::exec(CMenuTarget* /*parent*/, const std::string & actionKey)
 
 	if(!manual) {
 		g_RCInput->close_click();
-                if (system(NEUTRINO_SCAN_START_SCRIPT) != 0)
+                if (file_exists(NEUTRINO_SCAN_START_SCRIPT) && my_system(NEUTRINO_SCAN_START_SCRIPT,NULL,NULL) != 0)
                 	perror(NEUTRINO_SCAN_START_SCRIPT " failed");
 	}
 
@@ -310,7 +311,7 @@ int CScanTs::exec(CMenuTarget* /*parent*/, const std::string & actionKey)
 	g_Zapit->stopScan();
 
 	if(!manual) {
-                if (system(NEUTRINO_SCAN_STOP_SCRIPT) != 0)
+                if (file_exists(NEUTRINO_SCAN_STOP_SCRIPT) && my_system(NEUTRINO_SCAN_STOP_SCRIPT,NULL,NULL) != 0)
                 	perror(NEUTRINO_SCAN_STOP_SCRIPT " failed");
 		g_RCInput->open_click();
 	}
diff --git a/src/gui/scan_setup.cpp b/src/gui/scan_setup.cpp
index b59936c4a..fbf007e41 100644
--- a/src/gui/scan_setup.cpp
+++ b/src/gui/scan_setup.cpp
@@ -38,13 +38,13 @@
 #include <mymenu.h>
 #include <neutrino_menue.h>
 
-#include "gui/scan.h"
-#include "gui/scan_setup.h"
-#include "gui/motorcontrol.h"
-#include "gui/bedit/bouqueteditor_bouquets.h"
+#include <gui/scan.h>
+#include <gui/scan_setup.h>
+#include <gui/motorcontrol.h>
+#include <gui/bedit/bouqueteditor_bouquets.h>
 
-#include "gui/widget/hintbox.h"
-#include "gui/widget/stringinput.h"
+#include <gui/widget/hintbox.h>
+#include <gui/widget/stringinput.h>
 
 #include <driver/screen_max.h>
 #include <driver/framebuffer.h>
@@ -53,7 +53,6 @@
 
 #include <zapit/femanager.h>
 #include <zapit/getservices.h>
-#include <zapit/satconfig.h>
 #include <zapit/scan.h>
 #include <zapit/zapit.h>
 #include <zapit/debug.h>
diff --git a/src/gui/screensetup.cpp b/src/gui/screensetup.cpp
index c004b564d..fd51c7def 100644
--- a/src/gui/screensetup.cpp
+++ b/src/gui/screensetup.cpp
@@ -37,7 +37,7 @@
 
 #include <gui/color.h>
 #include <gui/widget/messagebox.h>
-#include "gui/widget/icons.h"
+#include <gui/widget/icons.h>
 
 #include <driver/fontrenderer.h>
 #include <driver/rcinput.h>
diff --git a/src/gui/settings_manager.cpp b/src/gui/settings_manager.cpp
index e1ac9e752..724fac6d7 100644
--- a/src/gui/settings_manager.cpp
+++ b/src/gui/settings_manager.cpp
@@ -34,12 +34,10 @@
 #include <neutrino.h>
 #include <neutrino_menue.h>
 
-#include "gui/settings_manager.h"
-
-#include "gui/filebrowser.h"
-
-#include "gui/widget/messagebox.h"
-#include "gui/widget/stringinput.h"
+#include <gui/settings_manager.h>
+#include <gui/filebrowser.h>
+#include <gui/widget/messagebox.h>
+#include <gui/widget/stringinput.h>
 
 #include <driver/screen_max.h>
 #include <system/setting_helpers.h>
diff --git a/src/gui/subchannel_select.cpp b/src/gui/subchannel_select.cpp
index c059e8344..86b0a6a1c 100644
--- a/src/gui/subchannel_select.cpp
+++ b/src/gui/subchannel_select.cpp
@@ -38,7 +38,7 @@
 #include <neutrino.h>
 #include <mymenu.h>
 
-#include "gui/subchannel_select.h"
+#include "subchannel_select.h"
 #include <driver/record.h>
 
 extern CRemoteControl * g_RemoteControl;
diff --git a/src/gui/test_menu.cpp b/src/gui/test_menu.cpp
index b46f22dd8..bb6e3aae7 100644
--- a/src/gui/test_menu.cpp
+++ b/src/gui/test_menu.cpp
@@ -30,7 +30,7 @@
 #include <config.h>
 #endif
 
-#include "gui/test_menu.h"
+#include "test_menu.h"
 
 #include <global.h>
 #include <neutrino.h>
@@ -45,9 +45,9 @@
 #include <arpa/inet.h>
 #include <xmlinterface.h>
 
-#include "gui/widget/hintbox.h"
-#include "gui/scan.h"
-#include "gui/scan_setup.h"
+#include <gui/widget/hintbox.h>
+#include <gui/scan.h>
+#include <gui/scan_setup.h>
 #include <zapit/zapit.h>
 #include <zapit/scan.h>
 #include <zapit/femanager.h>
diff --git a/src/gui/timeosd.cpp b/src/gui/timeosd.cpp
index 3e3345bbb..0d80900c2 100644
--- a/src/gui/timeosd.cpp
+++ b/src/gui/timeosd.cpp
@@ -29,8 +29,7 @@
 #include <gui/timeosd.h>
 #include <driver/fontrenderer.h>
 #include <system/settings.h>
-#include <gui/widget/progressbar.h>
-#include "gui/infoclock.h"
+#include <gui/infoclock.h>
 
 //static CProgressBar *timescale = 0;
 
diff --git a/src/gui/timerlist.cpp b/src/gui/timerlist.cpp
index b5c2605c0..29a95527f 100644
--- a/src/gui/timerlist.cpp
+++ b/src/gui/timerlist.cpp
@@ -54,7 +54,6 @@
 #include <gui/widget/buttons.h>
 #include <gui/widget/hintbox.h>
 #include <gui/widget/icons.h>
-#include <gui/widget/menue.h>
 #include <gui/widget/messagebox.h>
 #include <gui/widget/stringinput.h>
 #include <gui/widget/stringinput_ext.h>
diff --git a/src/gui/update.cpp b/src/gui/update.cpp
index e6afd19ba..32551ec9f 100644
--- a/src/gui/update.cpp
+++ b/src/gui/update.cpp
@@ -59,7 +59,7 @@
 #include <curl/curl.h>
 #include <curl/easy.h>
 
-#ifndef NEW_LIBCURL
+#if LIBCURL_VERSION_NUM < 0x071507
 #include <curl/types.h>
 #endif
 
diff --git a/src/gui/update_menue.h b/src/gui/update_menue.h
index 683bdae0e..8948a49f6 100644
--- a/src/gui/update_menue.h
+++ b/src/gui/update_menue.h
@@ -33,7 +33,7 @@
 #define __software_update__
 
 #include <gui/widget/menue.h>
-#include "gui/update.h"
+#include <gui/update.h>
 #include <string>
 
 class CSoftwareUpdate : public CMenuTarget
diff --git a/src/gui/update_settings.cpp b/src/gui/update_settings.cpp
index c6a432bd7..07de21474 100644
--- a/src/gui/update_settings.cpp
+++ b/src/gui/update_settings.cpp
@@ -37,7 +37,7 @@
 #include <neutrino.h>
 #include <neutrino_menue.h>
 #include "update_settings.h"
-#include "gui/filebrowser.h"
+#include "filebrowser.h"
 #include <gui/widget/icons.h>
 #include <driver/screen_max.h>
 #include <system/debug.h>
diff --git a/src/gui/update_settings.h b/src/gui/update_settings.h
index 1c9b44198..c58676774 100644
--- a/src/gui/update_settings.h
+++ b/src/gui/update_settings.h
@@ -34,7 +34,7 @@
 
 #include <gui/widget/menue.h>
 
-#include "gui/update.h"
+#include "update.h"
 
 // #define USE_SMS_INPUT
 
diff --git a/src/gui/upnpbrowser.h b/src/gui/upnpbrowser.h
index 03b6cc7b8..c4495d5fc 100644
--- a/src/gui/upnpbrowser.h
+++ b/src/gui/upnpbrowser.h
@@ -32,11 +32,11 @@
 #ifndef __upnpplayergui__
 #define __upnpplayergui__
 
-#include "driver/framebuffer.h"
-#include "driver/audiofile.h"
-#include "driver/pictureviewer/pictureviewer.h"
-#include "gui/filebrowser.h"
-#include "gui/widget/menue.h"
+#include <driver/framebuffer.h>
+#include <driver/audiofile.h>
+#include <driver/pictureviewer/pictureviewer.h>
+#include <gui/filebrowser.h>
+#include <gui/widget/menue.h>
 
 #include <string>
 #include <sstream>
diff --git a/src/gui/user_menue.cpp b/src/gui/user_menue.cpp
index e9c7c0c7b..2aa65eed7 100644
--- a/src/gui/user_menue.cpp
+++ b/src/gui/user_menue.cpp
@@ -41,20 +41,20 @@
 #include <config.h>
 #endif
 
-#include "gui/user_menue.h"
-#include "gui/user_menue_setup.h"
-#include "gui/subchannel_select.h"
-#include "gui/favorites.h"
-#include "gui/audio_select.h"
-#include "gui/streaminfo2.h"
-#include "gui/epgplus.h"
-#include "gui/movieplayer.h"
-#include "gui/timerlist.h"
-#include "gui/plugins.h"
-#include "gui/imageinfo.h"
-#include "gui/dboxinfo.h"
-#include "gui/cam_menu.h"
-#include "gui/pluginlist.h"
+#include "user_menue.h"
+#include "user_menue_setup.h"
+#include "subchannel_select.h"
+#include "favorites.h"
+#include "audio_select.h"
+#include "streaminfo2.h"
+#include "epgplus.h"
+#include "movieplayer.h"
+#include "timerlist.h"
+#include "plugins.h"
+#include "imageinfo.h"
+#include "dboxinfo.h"
+#include "cam_menu.h"
+#include "pluginlist.h"
 
 #include <global.h>
 #include <neutrino.h>
diff --git a/src/gui/user_menue_setup.cpp b/src/gui/user_menue_setup.cpp
index 85e510544..b1991d760 100644
--- a/src/gui/user_menue_setup.cpp
+++ b/src/gui/user_menue_setup.cpp
@@ -35,7 +35,7 @@
 #endif
 
 
-#include "gui/user_menue_setup.h"
+#include "user_menue_setup.h"
 
 #include <global.h>
 #include <neutrino.h>
diff --git a/src/gui/vfd_setup.cpp b/src/gui/vfd_setup.cpp
index 2373eae4d..30f62d1ab 100644
--- a/src/gui/vfd_setup.cpp
+++ b/src/gui/vfd_setup.cpp
@@ -34,7 +34,7 @@
 #endif
 
 
-#include "gui/vfd_setup.h"
+#include "vfd_setup.h"
 
 #include <global.h>
 #include <neutrino.h>
diff --git a/src/gui/videosettings.cpp b/src/gui/videosettings.cpp
index 51f5f9763..f59e02752 100644
--- a/src/gui/videosettings.cpp
+++ b/src/gui/videosettings.cpp
@@ -41,8 +41,8 @@
 
 #include <gui/widget/icons.h>
 #include <gui/widget/stringinput.h>
-#include "gui/widget/hintbox.h"
-#include "gui/widget/messagebox.h"
+#include <gui/widget/hintbox.h>
+#include <gui/widget/messagebox.h>
 
 #include <driver/screen_max.h>
 
diff --git a/src/gui/widget/colorchooser.cpp b/src/gui/widget/colorchooser.cpp
index 58f319069..075155a9d 100644
--- a/src/gui/widget/colorchooser.cpp
+++ b/src/gui/widget/colorchooser.cpp
@@ -44,7 +44,7 @@
 
 #include <gui/color.h>
 #include <gui/widget/messagebox.h>
-#include "gui/widget/icons.h"
+#include <gui/widget/icons.h>
 
 
 #define VALUE_R     0
diff --git a/src/gui/widget/listframe.cpp b/src/gui/widget/listframe.cpp
index b5c79b107..8a9678ede 100644
--- a/src/gui/widget/listframe.cpp
+++ b/src/gui/widget/listframe.cpp
@@ -51,7 +51,7 @@
 
 #include <global.h>
 
-#include "stdlib.h"
+#include <stdlib.h>
 #include "listframe.h"
 #include <gui/widget/icons.h>
 
diff --git a/src/gui/widget/menue.cpp b/src/gui/widget/menue.cpp
index b973b7eb0..e4c8a971b 100644
--- a/src/gui/widget/menue.cpp
+++ b/src/gui/widget/menue.cpp
@@ -31,7 +31,6 @@
 #include <gui/widget/menue.h>
 
 #include <driver/fontrenderer.h>
-#include <driver/rcinput.h>
 #include <driver/screen_max.h>
 
 #include <gui/widget/stringinput.h>
diff --git a/src/gui/widget/msgbox.h b/src/gui/widget/msgbox.h
index 85905a4f0..ead68cda1 100644
--- a/src/gui/widget/msgbox.h
+++ b/src/gui/widget/msgbox.h
@@ -54,7 +54,6 @@
 #include <string>
 #include "textbox.h"
 
-#include <gui/widget/icons.h>
 #include <driver/fb_window.h>
 
 class CMsgBox  
diff --git a/src/gui/widget/stringinput.h b/src/gui/widget/stringinput.h
index 0da2a07f2..0a5a5aea9 100644
--- a/src/gui/widget/stringinput.h
+++ b/src/gui/widget/stringinput.h
@@ -37,7 +37,6 @@
 
 #include <driver/framebuffer.h>
 #include <system/localize.h>
-#include <gui/widget/icons.h>
 
 #include <string>
 
diff --git a/src/gui/zapit_setup.cpp b/src/gui/zapit_setup.cpp
index 12bb06ec4..f8e18168c 100644
--- a/src/gui/zapit_setup.cpp
+++ b/src/gui/zapit_setup.cpp
@@ -27,7 +27,7 @@
 #endif
 
 
-#include "gui/zapit_setup.h"
+#include "zapit_setup.h"
 
 #include <global.h>
 #include <neutrino.h>
diff --git a/src/neutrino.cpp b/src/neutrino.cpp
index 3b333b3e7..1345ffee9 100644
--- a/src/neutrino.cpp
+++ b/src/neutrino.cpp
@@ -39,7 +39,6 @@
 #include <signal.h>
 
 #include <fstream>
-#include <string>
 
 #include "global.h"
 #include "neutrino.h"
@@ -75,7 +74,6 @@
 #include "gui/rc_lock.h"
 #include "gui/scan_setup.h"
 #include "gui/start_wizard.h"
-#include "gui/timerlist.h"
 #include "gui/videosettings.h"
 
 #include "gui/widget/hintbox.h"
@@ -98,6 +96,7 @@
 #include <system/fsmounter.h>
 #include <system/setting_helpers.h>
 #include <system/settings.h>
+#include <system/helpers.h>
 
 #include <timerdclient/timerdmsg.h>
 
@@ -107,12 +106,11 @@
 #include <zapit/satconfig.h>
 #include <zapit/client/zapitclient.h>
 
-#include <string.h>
 #include <linux/reboot.h>
 #include <sys/reboot.h>
 
-#include "libdvbsub/dvbsub.h"
-#include "libtuxtxt/teletext.h"
+#include <lib/libdvbsub/dvbsub.h>
+#include <lib/libtuxtxt/teletext.h>
 #include <eitd/sectionsd.h>
 
 int old_b_id = -1;
@@ -1739,7 +1737,7 @@ void wake_up( bool &wakeup)
 	if(!wakeup){
 		const char *neutrino_leave_deepstandby_script = CONFIGDIR "/deepstandby.off";
 		printf("[%s] executing %s\n",__FILE__ ,neutrino_leave_deepstandby_script);
-		if (system(neutrino_leave_deepstandby_script) != 0)
+		if (file_exists(neutrino_leave_deepstandby_script) && my_system(neutrino_leave_deepstandby_script,NULL,NULL) != 0)
 			perror( neutrino_leave_deepstandby_script );
 	}
 #endif
@@ -2679,7 +2677,8 @@ _repeat:
 		return messages_return::handled;
 	}
 	else if( msg == NeutrinoMessages::ANNOUNCE_RECORD) {
-		system(NEUTRINO_RECORDING_TIMER_SCRIPT);
+		if(file_exists(NEUTRINO_RECORDING_TIMER_SCRIPT))
+			my_system(NEUTRINO_RECORDING_TIMER_SCRIPT,NULL,NULL);
 		if (g_settings.recording_type == RECORDING_FILE) {
 			char * recordingDir = ((CTimerd::RecordingInfo*)data)->recordingDir;
 			for(int i=0 ; i < NETWORK_NFS_NR_OF_ENTRIES ; i++) {
@@ -2693,7 +2692,7 @@ _repeat:
 				}
 			}
 			if(has_hdd) {
-				system("(rm /media/sda1/.wakeup; touch /media/sda1/.wakeup; sync) > /dev/null  2> /dev/null &"); // wakeup hdd
+				wakeup_hdd(g_settings.network_nfs_recordingdir);
 			}
 		}
 		if( g_settings.recording_zap_on_announce ) {
@@ -2939,7 +2938,7 @@ void CNeutrinoApp::ExitRun(const bool /*write_si*/, int retcode)
 		if(retcode) {
 			const char *neutrino_enter_deepstandby_script = CONFIGDIR "/deepstandby.on";
 			printf("[%s] executing %s\n",__FILE__ ,neutrino_enter_deepstandby_script);
-			if (system(neutrino_enter_deepstandby_script) != 0)
+			if (file_exists(neutrino_enter_deepstandby_script) && my_system(neutrino_enter_deepstandby_script,NULL,NULL) != 0)
 				perror(neutrino_enter_deepstandby_script );
 
 			printf("entering off state\n");
@@ -3217,7 +3216,7 @@ void CNeutrinoApp::standbyMode( bool bOnOff, bool fromDeepStandby )
 		standby_channel_id = CZapit::getInstance()->GetCurrentChannelID();
 
 		puts("[neutrino.cpp] executing " NEUTRINO_ENTER_STANDBY_SCRIPT ".");
-		if (system(NEUTRINO_ENTER_STANDBY_SCRIPT) != 0)
+		if (file_exists(NEUTRINO_ENTER_STANDBY_SCRIPT) && my_system(NEUTRINO_ENTER_STANDBY_SCRIPT,NULL,NULL) != 0)
 			perror(NEUTRINO_ENTER_STANDBY_SCRIPT " failed");
 
 		if(!CRecordManager::getInstance()->RecordingStatus())
@@ -3261,7 +3260,7 @@ void CNeutrinoApp::standbyMode( bool bOnOff, bool fromDeepStandby )
 		}
 
 		puts("[neutrino.cpp] executing " NEUTRINO_LEAVE_STANDBY_SCRIPT ".");
-		if (system(NEUTRINO_LEAVE_STANDBY_SCRIPT) != 0)
+		if (file_exists(NEUTRINO_LEAVE_STANDBY_SCRIPT) && my_system(NEUTRINO_LEAVE_STANDBY_SCRIPT,NULL,NULL) != 0)
 			perror(NEUTRINO_LEAVE_STANDBY_SCRIPT " failed");
 
 		CVFD::getInstance()->setMode(CVFD::MODE_TVRADIO);
diff --git a/src/neutrino.h b/src/neutrino.h
index 97b483a7c..3ff32bf3e 100644
--- a/src/neutrino.h
+++ b/src/neutrino.h
@@ -36,16 +36,15 @@
 #include <configfile.h>
 
 #include <neutrinoMessages.h>
-#include <driver/framebuffer.h>
-#include <system/setting_helpers.h>
-#include <system/configure_network.h>
-#include <gui/timerlist.h>
-#include <timerdclient/timerdtypes.h>
-#include <gui/channellist.h>          /* CChannelList */
-#include <gui/rc_lock.h>
-#include <daemonc/remotecontrol.h>    /* st_rmsg      */
-#include <gui/personalize.h>
-#include <gui/user_menue.h>
+#include "driver/framebuffer.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 <string>
 
diff --git a/src/neutrino_menue.cpp b/src/neutrino_menue.cpp
index 3e8ddce2c..d4f5b98ee 100644
--- a/src/neutrino_menue.cpp
+++ b/src/neutrino_menue.cpp
@@ -48,7 +48,7 @@
 #include "gui/bouquetlist.h"
 #include "gui/cam_menu.h"
 #include "gui/dboxinfo.h"
-#include <gui/epgplus.h>
+#include "gui/epgplus.h"
 #include "gui/favorites.h"
 #include "gui/hdd_menu.h"
 #include "gui/imageinfo.h"
@@ -59,7 +59,7 @@
 #include "gui/miscsettings_menu.h"
 #include "gui/motorcontrol.h"
 #include "gui/movieplayer.h"
-#include <gui/network_setup.h>
+#include "gui/network_setup.h"
 #include "gui/osd_setup.h"
 #include "gui/osdlang_setup.h"
 #include "gui/parentallock_setup.h"
@@ -70,11 +70,11 @@
 #include "gui/settings_manager.h"
 #include "gui/sleeptimer.h"
 #include "gui/update_menue.h"
-#include <gui/streaminfo2.h>
+#include "gui/streaminfo2.h"
 #include "gui/test_menu.h"
 #include "gui/update.h"
 #include "gui/vfd_setup.h"
-#include <driver/record.h>
+#include "driver/record.h"
 
 
 extern CPlugins       * g_PluginList;
diff --git a/src/system/configure_network.cpp b/src/system/configure_network.cpp
index ead2b3227..7ba9342ec 100644
--- a/src/system/configure_network.cpp
+++ b/src/system/configure_network.cpp
@@ -25,8 +25,8 @@
 #include <string.h>
 #include <unistd.h>
 #include "configure_network.h"
-#include "libnet.h"             /* netGetNameserver, netSetNameserver   */
-#include "network_interfaces.h" /* getInetAttributes, setInetAttributes */
+#include <lib/libnet/libnet.h>             /* netGetNameserver, netSetNameserver   */
+#include <lib/libnet/network_interfaces.h> /* getInetAttributes, setInetAttributes */
 #include <stdlib.h>             /* system                               */
 #include <iostream>
 #include <iomanip>
diff --git a/src/system/helpers.cpp b/src/system/helpers.cpp
index 4e3758ad4..6038eea98 100644
--- a/src/system/helpers.cpp
+++ b/src/system/helpers.cpp
@@ -28,9 +28,37 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <sys/wait.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <sys/vfs.h>    /* or <sys/statfs.h> */
+#include <string.h>
+#include <fcntl.h>
 
 #include <system/helpers.h>
 
+bool file_exists(const char *filename)
+{
+	struct stat stat_buf;
+	if(::stat(filename, &stat_buf) == 0)
+	{
+		return true;
+	} else
+	{
+		return false;
+	}
+}
+
+void  wakeup_hdd(const char *hdd_dir)
+{
+	if(!check_dir(hdd_dir)){
+		std::string wakeup_file = hdd_dir;
+		wakeup_file += "/.wakeup";
+		remove(wakeup_file.c_str());
+		creat(wakeup_file.c_str(),S_IREAD|S_IWRITE);
+		sync();
+	}
+}
+
 int my_system(const char * cmd, const char * arg1, const char * arg2)
 {
         int i;
@@ -102,3 +130,44 @@ FILE* my_popen( pid_t& pid, const char *cmdstring, const char *type)
 	}
 	return(fp);
 }
+
+int safe_mkdir(char * path)
+{
+	struct statfs s;
+	int ret = 0;
+	if(!strncmp(path, "/hdd", 4)) {
+		ret = statfs("/hdd", &s);
+		if((ret != 0) || (s.f_type == 0x72b6))
+			ret = -1;
+		else
+			mkdir(path, 0755);
+	} else
+		mkdir(path, 0755);
+	return ret;
+}
+
+int check_dir(const char * newdir)
+{
+  
+  	struct statfs s;
+	if (::statfs(newdir, &s) == 0) {
+		switch (s.f_type)	/* f_type is long */
+		{
+			case 0xEF53L:		/*EXT2 & EXT3*/
+			case 0x6969L:		/*NFS*/
+			case 0xFF534D42L:	/*CIFS*/
+			case 0x517BL:		/*SMB*/
+			case 0x52654973L:	/*REISERFS*/
+			case 0x65735546L:	/*fuse for ntfs*/
+			case 0x58465342L:	/*xfs*/
+			case 0x4d44L:		/*msdos*/
+			case 0x0187:		/* AUTOFS_SUPER_MAGIC */
+			case 0x858458f6: 	/*ramfs*/
+				return 0;//ok
+			default:
+				fprintf( stderr,"%s Unknow File system type: %i\n",newdir ,s.f_type);
+				break;
+		}
+	}
+	return 1;	// error
+}
diff --git a/src/system/helpers.h b/src/system/helpers.h
index 9fd335f3b..ec3074d6c 100644
--- a/src/system/helpers.h
+++ b/src/system/helpers.h
@@ -24,5 +24,9 @@
 
 int my_system(const char * cmd, const char * arg1, const char * arg2);
 FILE* my_popen( pid_t& pid, const char *cmdstring, const char *type);
+int safe_mkdir(char * path);
+int check_dir(const char * newdir);
+bool file_exists(const char *filename);
+void wakeup_hdd(const char *hdd_dir);
 
 #endif
diff --git a/src/system/httptool.cpp b/src/system/httptool.cpp
index de17a1c0c..20bd5fba7 100644
--- a/src/system/httptool.cpp
+++ b/src/system/httptool.cpp
@@ -24,7 +24,7 @@
 #include <curl/curl.h>
 #include <curl/easy.h>
 
-#ifndef NEW_LIBCURL
+#if LIBCURL_VERSION_NUM < 0x071507
 #include <curl/types.h>
 #endif
 
diff --git a/src/system/setting_helpers.cpp b/src/system/setting_helpers.cpp
index ac601a102..677b696f9 100644
--- a/src/system/setting_helpers.cpp
+++ b/src/system/setting_helpers.cpp
@@ -33,7 +33,6 @@
 #include "configure_network.h"
 #include <stdio.h>
 #include <stdlib.h>
-#include <string>
 #include <unistd.h>
 #include <iostream>
 #include <iomanip>
@@ -44,12 +43,9 @@
 #include <libnet.h>
 #include <linux/if.h>
 #include <sys/time.h>
-#include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/wait.h>
 #include <sys/ioctl.h>
-#include <sys/stat.h>
-#include <sys/vfs.h>
 
 #if HAVE_COOL_HARDWARE
 #include <coolstream/control.h>
@@ -76,8 +72,8 @@
 #include <dmx.h>
 #include <cs_api.h>
 #include <pwrmngr.h>
-#include "libdvbsub/dvbsub.h"
-#include "libtuxtxt/teletext.h"
+#include <libdvbsub/dvbsub.h>
+#include <libtuxtxt/teletext.h>
 #include <zapit/satconfig.h>
 #include <zapit/zapit.h>
 
@@ -566,44 +562,3 @@ bool CAutoModeNotifier::changeNotify(const neutrino_locale_t /*OptionName*/, voi
 	videoDecoder->SetAutoModes(modes);
 	return false;
 }
-
-int safe_mkdir(char * path)
-{
-	struct statfs s;
-	int ret = 0;
-	if(!strncmp(path, "/hdd", 4)) {
-		ret = statfs("/hdd", &s);
-		if((ret != 0) || (s.f_type == 0x72b6))
-			ret = -1;
-		else
-			mkdir(path, 0755);
-	} else
-		mkdir(path, 0755);
-	return ret;
-}
-
-int check_dir(const char * newdir)
-{
-  
-  	struct statfs s;
-	if (::statfs(newdir, &s) == 0) {
-		switch (s.f_type)	/* f_type is long */
-		{
-			case 0xEF53L:		/*EXT2 & EXT3*/
-			case 0x6969L:		/*NFS*/
-			case 0xFF534D42L:	/*CIFS*/
-			case 0x517BL:		/*SMB*/
-			case 0x52654973L:	/*REISERFS*/
-			case 0x65735546L:	/*fuse for ntfs*/
-			case 0x58465342L:	/*xfs*/
-			case 0x4d44L:		/*msdos*/
-			case 0x0187:		/* AUTOFS_SUPER_MAGIC */
-			case 0x858458f6: 	/*ramfs*/
-				return 0;//ok
-			default:
-				fprintf( stderr,"%s Unknow File system type: %i\n",newdir ,s.f_type);
-				break;
-		}
-	}
-	return 1;	// error
-}
diff --git a/src/system/setting_helpers.h b/src/system/setting_helpers.h
index 149a5e082..a8eda16bc 100644
--- a/src/system/setting_helpers.h
+++ b/src/system/setting_helpers.h
@@ -144,9 +144,6 @@ class COnekeyPluginChangeExec : public CMenuTarget
 		int exec(CMenuTarget* parent, const std::string & actionKey);
 };
 
-int safe_mkdir(char * path);
-int check_dir(const char * newdir);
-
 class CTZChangeNotifier : public CChangeObserver
 {
 public:
diff --git a/src/zapit/src/zapit.cpp b/src/zapit/src/zapit.cpp
index 143ee9ef3..eb86e40b5 100644
--- a/src/zapit/src/zapit.cpp
+++ b/src/zapit/src/zapit.cpp
@@ -69,8 +69,8 @@
 #endif
 
 #include <driver/abstime.h>
-#include "libdvbsub/dvbsub.h"
-#include "libtuxtxt/teletext.h"
+#include <libdvbsub/dvbsub.h>
+#include <libtuxtxt/teletext.h>
 
 /* globals */
 int sig_delay = 2; // seconds between signal check