diff --git a/.depend b/.depend
index f1810b93..9d039166 100644
--- a/.depend
+++ b/.depend
@@ -9,7 +9,6 @@ builtin-gconf.o:\
 	mce.h\
 	modules/display.h\
 	modules/doubletap.h\
-	modules/filter-brightness-als.h\
 	modules/led.h\
 	modules/memnotify.h\
 	modules/powersavemode.h\
@@ -28,7 +27,6 @@ builtin-gconf.pic.o:\
 	mce.h\
 	modules/display.h\
 	modules/doubletap.h\
-	modules/filter-brightness-als.h\
 	modules/led.h\
 	modules/memnotify.h\
 	modules/powersavemode.h\
@@ -194,10 +192,8 @@ mce-dsme.o:\
 	mce-dsme.c\
 	builtin-gconf.h\
 	datapipe.h\
-	mce-conf.h\
 	mce-dbus.h\
 	mce-dsme.h\
-	mce-lib.h\
 	mce-log.h\
 	mce-worker.h\
 	mce.h\
@@ -206,10 +202,8 @@ mce-dsme.pic.o:\
 	mce-dsme.c\
 	builtin-gconf.h\
 	datapipe.h\
-	mce-conf.h\
 	mce-dbus.h\
 	mce-dsme.h\
-	mce-lib.h\
 	mce-log.h\
 	mce-worker.h\
 	mce.h\
@@ -378,21 +372,15 @@ mce-wakelock.pic.o:\
 
 mce-wltimer.o:\
 	mce-wltimer.c\
-	datapipe.h\
-	mce-lib.h\
 	mce-log.h\
 	mce-wakelock.h\
 	mce-wltimer.h\
-	mce.h\
 
 mce-wltimer.pic.o:\
 	mce-wltimer.c\
-	datapipe.h\
-	mce-lib.h\
 	mce-log.h\
 	mce-wakelock.h\
 	mce-wltimer.h\
-	mce.h\
 
 mce-worker.o:\
 	mce-worker.c\
@@ -612,7 +600,6 @@ modules/camera.o:\
 	mce-conf.h\
 	mce-io.h\
 	mce.h\
-	mce.h\
 	tklock.h\
 	modules/camera.h\
 
@@ -622,7 +609,6 @@ modules/camera.pic.o:\
 	mce-conf.h\
 	mce-io.h\
 	mce.h\
-	mce.h\
 	tklock.h\
 	modules/camera.h\
 
@@ -659,7 +645,6 @@ modules/display.o:\
 	mce-setting.h\
 	mce-worker.h\
 	mce.h\
-	mce.h\
 	tklock.h\
 	modules/display.h\
 	modules/powersavemode.h\
@@ -681,7 +666,6 @@ modules/display.pic.o:\
 	mce-setting.h\
 	mce-worker.h\
 	mce.h\
-	mce.h\
 	tklock.h\
 	modules/display.h\
 	modules/powersavemode.h\
@@ -720,7 +704,6 @@ modules/filter-brightness-als.o:\
 	mce-setting.h\
 	mce-wakelock.h\
 	mce.h\
-	mce.h\
 	tklock.h\
 	modules/display.h\
 	modules/filter-brightness-als.h\
@@ -737,7 +720,6 @@ modules/filter-brightness-als.pic.o:\
 	mce-setting.h\
 	mce-wakelock.h\
 	mce.h\
-	mce.h\
 	tklock.h\
 	modules/display.h\
 	modules/filter-brightness-als.h\
@@ -827,21 +809,17 @@ modules/led.pic.o:\
 modules/memnotify.o:\
 	modules/memnotify.c\
 	builtin-gconf.h\
-	datapipe.h\
 	mce-dbus.h\
 	mce-log.h\
 	mce-setting.h\
-	mce.h\
 	modules/memnotify.h\
 
 modules/memnotify.pic.o:\
 	modules/memnotify.c\
 	builtin-gconf.h\
-	datapipe.h\
 	mce-dbus.h\
 	mce-log.h\
 	mce-setting.h\
-	mce.h\
 	modules/memnotify.h\
 
 modules/packagekit.o:\
@@ -928,7 +906,6 @@ modules/sensor-gestures.o:\
 	datapipe.h\
 	mce-dbus.h\
 	mce-log.h\
-	mce-sensorfw.h\
 	mce-setting.h\
 	mce.h\
 	modules/display.h\
@@ -939,7 +916,6 @@ modules/sensor-gestures.pic.o:\
 	datapipe.h\
 	mce-dbus.h\
 	mce-log.h\
-	mce-sensorfw.h\
 	mce-setting.h\
 	mce.h\
 	modules/display.h\
@@ -974,7 +950,6 @@ powerkey.o:\
 	datapipe.h\
 	evdev.h\
 	libwakelock.h\
-	mce-conf.h\
 	mce-dbus.h\
 	mce-dsme.h\
 	mce-lib.h\
@@ -992,7 +967,6 @@ powerkey.pic.o:\
 	datapipe.h\
 	evdev.h\
 	libwakelock.h\
-	mce-conf.h\
 	mce-dbus.h\
 	mce-dsme.h\
 	mce-lib.h\
@@ -1021,7 +995,6 @@ tests/ut/ut_display.o:\
 	mce-setting.h\
 	mce-worker.h\
 	mce.h\
-	mce.h\
 	tklock.h\
 	modules/display.c\
 	modules/display.h\
@@ -1045,7 +1018,6 @@ tests/ut/ut_display.pic.o:\
 	mce-setting.h\
 	mce-worker.h\
 	mce.h\
-	mce.h\
 	tklock.h\
 	modules/display.c\
 	modules/display.h\
@@ -1070,7 +1042,6 @@ tests/ut/ut_display_blanking_inhibit.o:\
 	mce-setting.h\
 	mce-worker.h\
 	mce.h\
-	mce.h\
 	tklock.h\
 	modules/display.c\
 	modules/display.h\
@@ -1095,7 +1066,6 @@ tests/ut/ut_display_blanking_inhibit.pic.o:\
 	mce-setting.h\
 	mce-worker.h\
 	mce.h\
-	mce.h\
 	tklock.h\
 	modules/display.c\
 	modules/display.h\
@@ -1120,7 +1090,6 @@ tests/ut/ut_display_conf.o:\
 	mce-setting.h\
 	mce-worker.h\
 	mce.h\
-	mce.h\
 	tklock.h\
 	modules/display.c\
 	modules/display.h\
@@ -1145,7 +1114,6 @@ tests/ut/ut_display_conf.pic.o:\
 	mce-setting.h\
 	mce-worker.h\
 	mce.h\
-	mce.h\
 	tklock.h\
 	modules/display.c\
 	modules/display.h\
@@ -1170,7 +1138,6 @@ tests/ut/ut_display_filter.o:\
 	mce-setting.h\
 	mce-worker.h\
 	mce.h\
-	mce.h\
 	tklock.h\
 	modules/display.c\
 	modules/display.h\
@@ -1195,7 +1162,6 @@ tests/ut/ut_display_filter.pic.o:\
 	mce-setting.h\
 	mce-worker.h\
 	mce.h\
-	mce.h\
 	tklock.h\
 	modules/display.c\
 	modules/display.h\
@@ -1220,7 +1186,6 @@ tests/ut/ut_display_stm.o:\
 	mce-setting.h\
 	mce-worker.h\
 	mce.h\
-	mce.h\
 	tklock.h\
 	modules/display.c\
 	modules/display.h\
@@ -1245,7 +1210,6 @@ tests/ut/ut_display_stm.pic.o:\
 	mce-setting.h\
 	mce-worker.h\
 	mce.h\
-	mce.h\
 	tklock.h\
 	modules/display.c\
 	modules/display.h\
@@ -1258,7 +1222,6 @@ tklock.o:\
 	datapipe.h\
 	evdev.h\
 	libwakelock.h\
-	mce-conf.h\
 	mce-dbus.h\
 	mce-hbtimer.h\
 	mce-io.h\
@@ -1278,7 +1241,6 @@ tklock.pic.o:\
 	datapipe.h\
 	evdev.h\
 	libwakelock.h\
-	mce-conf.h\
 	mce-dbus.h\
 	mce-hbtimer.h\
 	mce-io.h\
@@ -1322,7 +1284,6 @@ tools/mcetool.o:\
 	mce.h\
 	modules/display.h\
 	modules/doubletap.h\
-	modules/filter-brightness-als.h\
 	modules/led.h\
 	modules/memnotify.h\
 	modules/powersavemode.h\
@@ -1340,7 +1301,6 @@ tools/mcetool.pic.o:\
 	mce.h\
 	modules/display.h\
 	modules/doubletap.h\
-	modules/filter-brightness-als.h\
 	modules/led.h\
 	modules/memnotify.h\
 	modules/powersavemode.h\
diff --git a/builtin-gconf.c b/builtin-gconf.c
index 2c7ad657..a306fd58 100644
--- a/builtin-gconf.c
+++ b/builtin-gconf.c
@@ -27,7 +27,6 @@
 #include "event-input.h"
 
 #include "modules/memnotify.h"
-#include "modules/filter-brightness-als.h"
 #include "modules/display.h"
 #include "modules/proximity.h"
 #include "modules/powersavemode.h"
diff --git a/event-input.c b/event-input.c
index 0c45be88..9fb5b95d 100644
--- a/event-input.c
+++ b/event-input.c
@@ -39,13 +39,10 @@
 #include <mce/dbus-names.h>
 #include <mce/mode-names.h>
 
-#include <linux/input.h>
-
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
 #include <fcntl.h>
-#include <dirent.h>
 
 #include <glib/gstdio.h>
 #include <gio/gio.h>
diff --git a/mce-dbus.c b/mce-dbus.c
index 0035e97a..c19261bd 100644
--- a/mce-dbus.c
+++ b/mce-dbus.c
@@ -30,7 +30,6 @@
 
 #include "systemui/dbus-names.h"
 
-#include <sys/types.h>
 #include <sys/stat.h>
 
 #include <stdio.h>
diff --git a/mce-dbus.h b/mce-dbus.h
index 07502470..5dd1723c 100644
--- a/mce-dbus.h
+++ b/mce-dbus.h
@@ -23,8 +23,6 @@
 
 #include "builtin-gconf.h"
 
-#include <stdbool.h>
-
 #include <dbus/dbus.h>
 
 /* ========================================================================= *
diff --git a/mce-dsme.c b/mce-dsme.c
index c51cc5ee..ccbe1775 100644
--- a/mce-dsme.c
+++ b/mce-dsme.c
@@ -28,14 +28,11 @@
 
 #include "mce.h"
 #include "mce-log.h"
-#include "mce-lib.h"
-#include "mce-conf.h"
 #include "mce-dbus.h"
 #include "mce-worker.h"
 
 #include <stdlib.h>
 #include <unistd.h>
-#include <errno.h>
 
 #include <dsme/state.h>
 #include <dsme/protocol.h>
diff --git a/mce-fbdev.c b/mce-fbdev.c
index 519d0613..7db87623 100644
--- a/mce-fbdev.c
+++ b/mce-fbdev.c
@@ -34,9 +34,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <fcntl.h>
-#include <signal.h>
 #include <errno.h>
-#include <time.h>
 
 /* ========================================================================= *
  * CONSTANTS
diff --git a/mce-hbtimer.c b/mce-hbtimer.c
index 5dba7c2b..8d45b4d9 100644
--- a/mce-hbtimer.c
+++ b/mce-hbtimer.c
@@ -34,14 +34,11 @@
 # include "libwakelock.h"
 #endif
 
-#include <sys/types.h>
 #include <sys/socket.h>
 
 #include <stdlib.h>
-#include <stdint.h>
 #include <inttypes.h>
 #include <string.h>
-#include <unistd.h>
 #include <errno.h>
 #include <pthread.h>
 
diff --git a/mce-io.c b/mce-io.c
index 1cc930de..aa052b4f 100644
--- a/mce-io.c
+++ b/mce-io.c
@@ -30,7 +30,6 @@
 # include "libwakelock.h"
 #endif
 
-#include <stdbool.h>
 #include <unistd.h>
 #include <inttypes.h>
 #include <string.h>
diff --git a/mce-sensorfw.c b/mce-sensorfw.c
index 26df1092..e8e0c0f5 100644
--- a/mce-sensorfw.c
+++ b/mce-sensorfw.c
@@ -38,7 +38,6 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <stdint.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <errno.h>
diff --git a/mce-setting.c b/mce-setting.c
index 200f5389..4d47b7c6 100644
--- a/mce-setting.c
+++ b/mce-setting.c
@@ -25,7 +25,6 @@
 
 #include "mce-log.h"
 
-#include <stdlib.h>
 #include <string.h>
 
 /** Pointer to the GConf client */
diff --git a/mce-wltimer.c b/mce-wltimer.c
index ea78fe01..26d66e32 100644
--- a/mce-wltimer.c
+++ b/mce-wltimer.c
@@ -26,9 +26,7 @@
 
 #include "mce-wltimer.h"
 
-#include "mce.h"
 #include "mce-log.h"
-#include "mce-lib.h"
 #include "mce-wakelock.h"
 
 #include <stdlib.h>
diff --git a/mce-worker.c b/mce-worker.c
index df3ae98f..9f96f9e5 100644
--- a/mce-worker.c
+++ b/mce-worker.c
@@ -29,7 +29,6 @@
 
 #include <sys/eventfd.h>
 
-#include <stdint.h>
 #include <string.h>
 #include <stdlib.h>
 #include <unistd.h>
diff --git a/modetransition.c b/modetransition.c
index 496cde45..4a26c9aa 100644
--- a/modetransition.c
+++ b/modetransition.c
@@ -26,9 +26,7 @@
 #include "mce-log.h"
 #include "mce-io.h"
 
-#include <stdlib.h>
 #include <unistd.h>
-#include <string.h>
 #include <errno.h>
 
 #include <glib/gstdio.h>
diff --git a/modules/battery-statefs.c b/modules/battery-statefs.c
index d09161b8..ea3af72c 100644
--- a/modules/battery-statefs.c
+++ b/modules/battery-statefs.c
@@ -49,18 +49,14 @@
 #include "../mce.h"
 #include "../mce-log.h"
 
-#include <sys/types.h>
 #include <sys/epoll.h>
 
-#include <stdio.h>
-#include <stdbool.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <errno.h>
 #include <string.h>
 #include <stdlib.h>
 
-#include <glib.h>
 #include <gmodule.h>
 
 /* ========================================================================= *
diff --git a/modules/buttonbacklight.c b/modules/buttonbacklight.c
index fe55a859..27ac53a1 100644
--- a/modules/buttonbacklight.c
+++ b/modules/buttonbacklight.c
@@ -25,9 +25,6 @@
 #include "../mce-dbus.h"
 #include "../mce-conf.h"
 
-#include <sys/types.h>
-#include <sys/stat.h>
-
 #include <unistd.h>
 #include <string.h>
 #include <fcntl.h>
diff --git a/modules/camera.c b/modules/camera.c
index b5530e30..e4606133 100644
--- a/modules/camera.c
+++ b/modules/camera.c
@@ -21,7 +21,6 @@
 
 #include "camera.h"
 
-#include "../mce.h"
 #include "../mce-io.h"
 #include "../mce-conf.h"
 #include "../tklock.h"
diff --git a/modules/cpu-keepalive.c b/modules/cpu-keepalive.c
index 60a0a038..2b5bee80 100644
--- a/modules/cpu-keepalive.c
+++ b/modules/cpu-keepalive.c
@@ -33,7 +33,6 @@
 # include "../libwakelock.h"
 #endif
 
-#include <stdint.h>
 #include <string.h>
 #include <inttypes.h>
 
diff --git a/modules/display.c b/modules/display.c
index 8b2bee99..12b2d194 100644
--- a/modules/display.c
+++ b/modules/display.c
@@ -22,7 +22,6 @@
 
 #include "display.h"
 
-#include "../mce.h"
 #include "../mce-log.h"
 #include "../mce-io.h"
 #include "../mce-lib.h"
diff --git a/modules/doubletap.c b/modules/doubletap.c
index 4b7513c2..f1d7ae3a 100644
--- a/modules/doubletap.c
+++ b/modules/doubletap.c
@@ -12,7 +12,6 @@
 #include "../mce-conf.h"
 #include "../mce-setting.h"
 
-#include <stdbool.h>
 #include <unistd.h>
 
 #include <gmodule.h>
diff --git a/modules/filter-brightness-als.c b/modules/filter-brightness-als.c
index cf6d8cfb..baf350aa 100644
--- a/modules/filter-brightness-als.c
+++ b/modules/filter-brightness-als.c
@@ -27,7 +27,6 @@
 #include "filter-brightness-als.h"
 #include "display.h"
 
-#include "../mce.h"
 #include "../mce-log.h"
 #include "../mce-io.h"
 #include "../mce-conf.h"
@@ -37,7 +36,6 @@
 #include "../mce-wakelock.h"
 #include "../tklock.h"
 
-#include <stdlib.h>
 #include <string.h>
 
 #include <mce/dbus-names.h>
diff --git a/modules/filter-brightness-als.h b/modules/filter-brightness-als.h
index 20c14afa..eb42a6d1 100644
--- a/modules/filter-brightness-als.h
+++ b/modules/filter-brightness-als.h
@@ -24,8 +24,6 @@
 #ifndef _FILTER_BRIGHTNESS_ALS_H_
 # define _FILTER_BRIGHTNESS_ALS_H_
 
-# include <glib.h>
-
 /** Name of common group in color profiles conf file */
 # define MCE_CONF_COMMON_GROUP           "Common"
 
diff --git a/modules/memnotify.c b/modules/memnotify.c
index 78eb4291..7ad92c42 100644
--- a/modules/memnotify.c
+++ b/modules/memnotify.c
@@ -21,7 +21,6 @@
 
 #include "memnotify.h"
 
-#include "../mce.h"
 #include "../mce-log.h"
 #include "../mce-dbus.h"
 #include "../mce-setting.h"
diff --git a/modules/sensor-gestures.c b/modules/sensor-gestures.c
index d7675b7c..04044eb3 100644
--- a/modules/sensor-gestures.c
+++ b/modules/sensor-gestures.c
@@ -24,7 +24,6 @@
 #include "../mce-log.h"
 #include "../mce-setting.h"
 #include "../mce-dbus.h"
-#include "../mce-sensorfw.h"
 #include "display.h"
 
 #include <mce/dbus-names.h>
diff --git a/multitouch.c b/multitouch.c
index 6191aed3..6bab5676 100644
--- a/multitouch.c
+++ b/multitouch.c
@@ -26,11 +26,8 @@
 
 #include "multitouch.h"
 
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
-#include <inttypes.h>
 
 /* ========================================================================= *
  * TYPES & FUNCTIONS
diff --git a/powerkey.c b/powerkey.c
index bff368a3..ccc5e16b 100644
--- a/powerkey.c
+++ b/powerkey.c
@@ -25,10 +25,8 @@
 #include "tklock.h"
 #include "evdev.h"
 
-#include "mce.h"
 #include "mce-log.h"
 #include "mce-lib.h"
-#include "mce-conf.h"
 #include "mce-setting.h"
 #include "mce-dbus.h"
 #include "mce-dsme.h"
@@ -43,12 +41,10 @@
 
 #include <linux/input.h>
 
-#include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <fcntl.h>
-#include <errno.h>
 
 #include <mce/dbus-names.h>
 #include <mce/mode-names.h>
diff --git a/tklock.c b/tklock.c
index af48cf49..66316a66 100644
--- a/tklock.c
+++ b/tklock.c
@@ -23,11 +23,9 @@
 
 #include "tklock.h"
 
-#include "mce.h"
 #include "mce-log.h"
 #include "mce-lib.h"
 #include "mce-io.h"
-#include "mce-conf.h"
 #include "mce-setting.h"
 #include "mce-dbus.h"
 #include "mce-hbtimer.h"
@@ -45,9 +43,6 @@
 
 #include <linux/input.h>
 
-#include <sys/types.h>
-#include <sys/stat.h>
-
 #include <unistd.h>
 #include <string.h>
 #include <fcntl.h>
diff --git a/tklock.h b/tklock.h
index 60a61c72..93c854d9 100644
--- a/tklock.h
+++ b/tklock.h
@@ -24,8 +24,6 @@
 
 # include "mce.h"
 
-# include <glib.h>
-
 /* ========================================================================= *
  * Settings
  * ========================================================================= */
diff --git a/tools/evdev_trace.c b/tools/evdev_trace.c
index 8cac5b8b..9565cd4b 100644
--- a/tools/evdev_trace.c
+++ b/tools/evdev_trace.c
@@ -12,12 +12,10 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <stdarg.h>
 #include <stdbool.h>
 #include <unistd.h>
 #include <string.h>
 #include <errno.h>
-#include <time.h>
 #include <poll.h>
 #include <glob.h>
 #include <getopt.h>
diff --git a/tools/fileusers.c b/tools/fileusers.c
index 8498b76e..229a9a84 100644
--- a/tools/fileusers.c
+++ b/tools/fileusers.c
@@ -27,11 +27,8 @@
 #include "fileusers.h"
 #include "../mce-log.h"
 
-#include <sys/types.h>
-
 #include <stdio.h>
 #include <stdbool.h>
-#include <dirent.h>
 #include <unistd.h>
 #include <string.h>
 #include <stdlib.h>
diff --git a/tools/mcetool.c b/tools/mcetool.c
index 0b49a4eb..4ab5f877 100644
--- a/tools/mcetool.c
+++ b/tools/mcetool.c
@@ -25,7 +25,6 @@
 #include "../modules/display.h"
 #include "../modules/doubletap.h"
 #include "../modules/powersavemode.h"
-#include "../modules/filter-brightness-als.h"
 #include "../modules/proximity.h"
 #include "../modules/memnotify.h"
 #include "../modules/led.h"