diff --git a/lib/libiw/iwlib.h b/lib/libiw/iwlib.h
index 31cf39b73..c0fbe9461 100644
--- a/lib/libiw/iwlib.h
+++ b/lib/libiw/iwlib.h
@@ -30,7 +30,6 @@
 #include <netdb.h>		/* gethostbyname, getnetbyname */
 #include <net/ethernet.h>	/* struct ether_addr */
 #include <sys/time.h>		/* struct timeval */
-#include <unistd.h>
 
 /* This is our header selection. Try to hide the mess and the misery :-(
  * Don't look, you would go blind ;-)
@@ -41,7 +40,6 @@
 
 /* Set of headers proposed by Dr. Michael Rietz <rietz@mail.amps.de>, 27.3.2 */
 #include <net/if_arp.h>		/* For ARPHRD_ETHER */
-#include <sys/socket.h>		/* For AF_INET & struct sockaddr */
 #include <netinet/in.h>         /* For struct sockaddr_in */
 #include <netinet/if_ether.h>
 
diff --git a/src/driver/pictureviewer/jpeg.cpp b/src/driver/pictureviewer/jpeg.cpp
index 95413f180..accb8a512 100644
--- a/src/driver/pictureviewer/jpeg.cpp
+++ b/src/driver/pictureviewer/jpeg.cpp
@@ -15,7 +15,6 @@
 #include <unistd.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
-#include <sys/types.h>
 #include <sys/socket.h>
 
 #if __cplusplus >= 201103
diff --git a/src/gui/movieplayer.cpp b/src/gui/movieplayer.cpp
index a18773a4b..e00c8c430 100644
--- a/src/gui/movieplayer.cpp
+++ b/src/gui/movieplayer.cpp
@@ -56,7 +56,6 @@
 #include <driver/display.h>
 #include <driver/abstime.h>
 #include <driver/record.h>
-#include <driver/volume.h>
 #include <driver/fontrenderer.h>
 #include <eitd/edvbstring.h>
 #include <system/helpers.h>
diff --git a/src/gui/network_service.cpp b/src/gui/network_service.cpp
index fd14d9318..627c65163 100644
--- a/src/gui/network_service.cpp
+++ b/src/gui/network_service.cpp
@@ -36,8 +36,6 @@
 #include <system/debug.h>
 #include <system/helpers.h>
 
-#include <unistd.h>
-
 #define TOUCH_BASE "/var/etc/."
 
 struct network_service
diff --git a/src/gui/osd_setup.cpp b/src/gui/osd_setup.cpp
index 88b0c8e5e..be8002c52 100644
--- a/src/gui/osd_setup.cpp
+++ b/src/gui/osd_setup.cpp
@@ -56,7 +56,6 @@
 
 #include <driver/screen_max.h>
 #include <driver/neutrinofonts.h>
-#include <driver/screen_max.h>
 #include <driver/screenshot.h>
 #include <driver/volume.h>
 #include <driver/radiotext.h>
diff --git a/src/gui/plugins.cpp b/src/gui/plugins.cpp
index 0f7bdc7e6..55062700f 100644
--- a/src/gui/plugins.cpp
+++ b/src/gui/plugins.cpp
@@ -60,7 +60,6 @@
 #include "widget/shellwindow.h"
 
 #include <poll.h>
-#include <fcntl.h>
 #include <vector>
 
 #include <video.h>
diff --git a/src/gui/screensaver.cpp b/src/gui/screensaver.cpp
index d3d61e7bb..aecc3c6d9 100644
--- a/src/gui/screensaver.cpp
+++ b/src/gui/screensaver.cpp
@@ -36,7 +36,6 @@
 #include <neutrino.h>
 #include <pthread.h>
 #include <algorithm>    // sort
-#include <ctype.h>
 #include "audiomute.h"
 #include "screensaver.h"
 #include <system/debug.h>
diff --git a/src/gui/test_menu.cpp b/src/gui/test_menu.cpp
index f5edf226d..a2dfa2f32 100644
--- a/src/gui/test_menu.cpp
+++ b/src/gui/test_menu.cpp
@@ -59,7 +59,6 @@
 #include <driver/record.h>
 #include <gui/buildinfo.h>
 #include <gui/widget/buttons.h>
-#include <system/helpers.h>
 #include <gui/components/cc_timer.h>
 
 extern int cs_test_card(int unit, char * str);
diff --git a/src/gui/widget/shellwindow.cpp b/src/gui/widget/shellwindow.cpp
index 480b6df4a..bd5daa3ca 100644
--- a/src/gui/widget/shellwindow.cpp
+++ b/src/gui/widget/shellwindow.cpp
@@ -46,7 +46,6 @@
 #include <errno.h>
 #include <system/helpers.h>
 #include <gui/widget/msgbox.h>
-#include <errno.h>
 #include <system/debug.h>
 
 CShellWindow::CShellWindow(const std::string &Command, const int Mode, int *Res, bool auto_exec)
diff --git a/src/neutrino.cpp b/src/neutrino.cpp
index 080a31d07..15a73d540 100644
--- a/src/neutrino.cpp
+++ b/src/neutrino.cpp
@@ -40,7 +40,6 @@
 #include <sys/stat.h>
 #include <signal.h>
 #include <sys/mount.h>
-#include <sys/types.h>
 #include <dirent.h>
 
 #include <fstream>
@@ -72,7 +71,6 @@
 #include "gui/bouquetlist.h"
 #include "gui/cam_menu.h"
 #include "gui/cec_setup.h"
-#include "gui/channellist.h"
 #include "gui/epgview.h"
 #include "gui/eventlist.h"
 #include "gui/favorites.h"
diff --git a/src/nhttpd/tuxboxapi/controlapi.cpp b/src/nhttpd/tuxboxapi/controlapi.cpp
index 296c83ae7..215ca5d17 100644
--- a/src/nhttpd/tuxboxapi/controlapi.cpp
+++ b/src/nhttpd/tuxboxapi/controlapi.cpp
@@ -23,7 +23,6 @@
 #include <time.h>
 #include <locale.h>
 #include <langinfo.h>
-#include <unistd.h>
 #include <dirent.h>
 // tuxbox
 #include <global.h>
@@ -34,7 +33,6 @@
 #include <configfile.h>
 #include <system/configure_network.h>
 #include <cs_api.h>
-#include <global.h>
 #include <gui/plugins.h>//for relodplugins
 #include <neutrino.h>
 #include <driver/screenshot.h>
diff --git a/src/nhttpd/yhttpd.cpp b/src/nhttpd/yhttpd.cpp
index 93e6a66e6..72698d9ed 100644
--- a/src/nhttpd/yhttpd.cpp
+++ b/src/nhttpd/yhttpd.cpp
@@ -15,7 +15,6 @@
 #include <system/set_threadname.h>
 #include <system/helpers.h>
 // yhttpd
-#include "yconfig.h"
 #include <ylogging.h>
 #include <ylanguage.h>
 #include <yhook.h>
diff --git a/src/nhttpd/yhttpd_core/helper.cpp b/src/nhttpd/yhttpd_core/helper.cpp
index 6361bd0c7..8bd342654 100644
--- a/src/nhttpd/yhttpd_core/helper.cpp
+++ b/src/nhttpd/yhttpd_core/helper.cpp
@@ -16,7 +16,6 @@
 // yhttpd
 #include <yconfig.h>
 #include <tuxboxapi/controlapi.h>
-#include "ytypes_globals.h"
 #include "helper.h"
 #include "ylogging.h"
 
diff --git a/src/nhttpd/yhttpd_core/yconnection.cpp b/src/nhttpd/yhttpd_core/yconnection.cpp
index 074c78584..62cafb6dc 100644
--- a/src/nhttpd/yhttpd_core/yconnection.cpp
+++ b/src/nhttpd/yhttpd_core/yconnection.cpp
@@ -9,8 +9,6 @@
 #include <cstring>
 // yhttpd
 #include <yconfig.h>
-#include "ytypes_globals.h"
-#include "ywebserver.h"
 #include "yconnection.h"
 #include "helper.h"
 //=============================================================================
diff --git a/src/nhttpd/yhttpd_core/yhook.cpp b/src/nhttpd/yhttpd_core/yhook.cpp
index 7838cefa9..2d4a88d4d 100644
--- a/src/nhttpd/yhttpd_core/yhook.cpp
+++ b/src/nhttpd/yhttpd_core/yhook.cpp
@@ -10,7 +10,6 @@
 
 // yhttpd
 #include "yhook.h"
-#include "ylogging.h"
 #include "helper.h"
 
 //=============================================================================
diff --git a/src/nhttpd/yhttpd_core/ylanguage.cpp b/src/nhttpd/yhttpd_core/ylanguage.cpp
index 47391ddc6..f733d16e2 100644
--- a/src/nhttpd/yhttpd_core/ylanguage.cpp
+++ b/src/nhttpd/yhttpd_core/ylanguage.cpp
@@ -14,7 +14,6 @@
 // yhttpd
 #include <yconfig.h>
 #include <yhttpd.h>
-#include "ytypes_globals.h"
 #include "ylanguage.h"
 #include "yconnection.h"
 
diff --git a/src/nhttpd/yhttpd_core/ywebserver.cpp b/src/nhttpd/yhttpd_core/ywebserver.cpp
index e1a5f149d..e3debef47 100644
--- a/src/nhttpd/yhttpd_core/ywebserver.cpp
+++ b/src/nhttpd/yhttpd_core/ywebserver.cpp
@@ -20,11 +20,9 @@
 
 // yhttpd
 #include <yhttpd.h>
-#include "ytypes_globals.h"
 #include "ywebserver.h"
 #include "ylogging.h"
 #include "helper.h"
-#include "ysocket.h"
 #include "yconnection.h"
 #include "yrequest.h"
 #include <system/set_threadname.h>
diff --git a/src/system/helpers.h b/src/system/helpers.h
index c7f3ae06a..48ac50a06 100644
--- a/src/system/helpers.h
+++ b/src/system/helpers.h
@@ -23,7 +23,6 @@
 */
 
 #include <stdlib.h>
-#include <string.h>
 #include <unistd.h>
 #include <stdint.h>
 #include <string.h>
@@ -33,9 +32,6 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <map>
- 
-#include <sys/stat.h>
-#include <sys/types.h>
 
 int my_system(const char * cmd);
 int my_system(int argc, const char *arg, ...); /* argc is number of arguments including command */
diff --git a/src/zapit/include/zapit/client/msgtypes.h b/src/zapit/include/zapit/client/msgtypes.h
index c38b754d5..52a0f8144 100644
--- a/src/zapit/include/zapit/client/msgtypes.h
+++ b/src/zapit/include/zapit/client/msgtypes.h
@@ -25,7 +25,6 @@
 #define __msgtypes_h__
 
 
-#include "zapittypes.h"
 #include <connection/basicmessage.h>
 #include "zapitclient.h"
 
diff --git a/src/zapit/src/zapit.cpp b/src/zapit/src/zapit.cpp
index c88eabe0b..f6641dbb8 100644
--- a/src/zapit/src/zapit.cpp
+++ b/src/zapit/src/zapit.cpp
@@ -74,7 +74,6 @@
 #include <libdvbsub/dvbsub.h>
 #include <OpenThreads/ScopedLock>
 #include <libtuxtxt/teletext.h>
-#include <OpenThreads/ScopedLock>
 
 #include <neutrino.h>
 #include <gui/osd_helpers.h>