Remove redundant #include directives

Also remove unmaintained, possibly not up to date hints about why headers are included.
sailfishos · May 27, 2014 · c4fdabb · c4fdabb
1 parent 2c75929
commit c4fdabb
Show file tree

Hide file tree

Showing 59 changed files with 364 additions and 773 deletions.
diff --git a/.depend b/.depend
@@ -125,7 +125,6 @@ mce-dbus.o:\
 	builtin-gconf.h\
 	datapipe.h\
 	mce-dbus.h\
-	mce-gconf.h\
 	mce-log.h\
 	mce.h\
 
@@ -134,7 +133,6 @@ mce-dbus.pic.o:\
 	builtin-gconf.h\
 	datapipe.h\
 	mce-dbus.h\
-	mce-gconf.h\
 	mce-log.h\
 	mce.h\
 
@@ -163,31 +161,23 @@ mce-dsme.pic.o:\
 mce-gconf.o:\
 	mce-gconf.c\
 	builtin-gconf.h\
-	datapipe.h\
 	mce-gconf.h\
 	mce-log.h\
-	mce.h\
 
 mce-gconf.pic.o:\
 	mce-gconf.c\
 	builtin-gconf.h\
-	datapipe.h\
 	mce-gconf.h\
 	mce-log.h\
-	mce.h\
 
 mce-hal.o:\
 	mce-hal.c\
-	builtin-gconf.h\
-	mce-dbus.h\
 	mce-hal.h\
 	mce-lib.h\
 	mce-log.h\
 
 mce-hal.pic.o:\
 	mce-hal.c\
-	builtin-gconf.h\
-	mce-dbus.h\
 	mce-hal.h\
 	mce-lib.h\
 	mce-log.h\
@@ -352,7 +342,6 @@ modules/alarm.o:\
 	modules/alarm.c\
 	builtin-gconf.h\
 	datapipe.h\
-	datapipe.h\
 	mce-dbus.h\
 	mce-log.h\
 	mce.h\
@@ -361,7 +350,6 @@ modules/alarm.pic.o:\
 	modules/alarm.c\
 	builtin-gconf.h\
 	datapipe.h\
-	datapipe.h\
 	mce-dbus.h\
 	mce-log.h\
 	mce.h\
@@ -387,7 +375,6 @@ modules/battery-bme.o:\
 	bme-dbus-names.h\
 	builtin-gconf.h\
 	datapipe.h\
-	datapipe.h\
 	mce-dbus.h\
 	mce-log.h\
 	mce.h\
@@ -397,7 +384,6 @@ modules/battery-bme.pic.o:\
 	bme-dbus-names.h\
 	builtin-gconf.h\
 	datapipe.h\
-	datapipe.h\
 	mce-dbus.h\
 	mce-log.h\
 	mce.h\
@@ -436,28 +422,23 @@ modules/callstate.o:\
 	modules/callstate.c\
 	builtin-gconf.h\
 	datapipe.h\
-	datapipe.h\
 	mce-dbus.h\
 	mce-lib.h\
 	mce-log.h\
 	mce.h\
-	modules/callstate.h\
 
 modules/callstate.pic.o:\
 	modules/callstate.c\
 	builtin-gconf.h\
 	datapipe.h\
-	datapipe.h\
 	mce-dbus.h\
 	mce-lib.h\
 	mce-log.h\
 	mce.h\
-	modules/callstate.h\
 
 modules/camera.o:\
 	modules/camera.c\
 	datapipe.h\
-	datapipe.h\
 	mce-conf.h\
 	mce-io.h\
 	mce.h\
@@ -466,7 +447,6 @@ modules/camera.o:\
 modules/camera.pic.o:\
 	modules/camera.c\
 	datapipe.h\
-	datapipe.h\
 	mce-conf.h\
 	mce-io.h\
 	mce.h\
@@ -490,7 +470,6 @@ modules/display.o:\
 	modules/display.c\
 	builtin-gconf.h\
 	datapipe.h\
-	datapipe.h\
 	filewatcher.h\
 	libwakelock.h\
 	mce-conf.h\
@@ -508,7 +487,6 @@ modules/display.pic.o:\
 	modules/display.c\
 	builtin-gconf.h\
 	datapipe.h\
-	datapipe.h\
 	filewatcher.h\
 	libwakelock.h\
 	mce-conf.h\
@@ -573,22 +551,17 @@ modules/filter-brightness-als.pic.o:\
 modules/filter-brightness-simple.o:\
 	modules/filter-brightness-simple.c\
 	datapipe.h\
-	datapipe.h\
 	mce.h\
-	modules/filter-brightness-simple.h\
 
 modules/filter-brightness-simple.pic.o:\
 	modules/filter-brightness-simple.c\
 	datapipe.h\
-	datapipe.h\
 	mce.h\
-	modules/filter-brightness-simple.h\
 
 modules/inactivity.o:\
 	modules/inactivity.c\
 	builtin-gconf.h\
 	datapipe.h\
-	datapipe.h\
 	mce-dbus.h\
 	mce-log.h\
 	mce.h\
@@ -597,7 +570,6 @@ modules/inactivity.pic.o:\
 	modules/inactivity.c\
 	builtin-gconf.h\
 	datapipe.h\
-	datapipe.h\
 	mce-dbus.h\
 	mce-log.h\
 	mce.h\
@@ -606,7 +578,6 @@ modules/keypad.o:\
 	modules/keypad.c\
 	builtin-gconf.h\
 	datapipe.h\
-	datapipe.h\
 	mce-conf.h\
 	mce-dbus.h\
 	mce-hal.h\
@@ -621,7 +592,6 @@ modules/keypad.pic.o:\
 	modules/keypad.c\
 	builtin-gconf.h\
 	datapipe.h\
-	datapipe.h\
 	mce-conf.h\
 	mce-dbus.h\
 	mce-hal.h\
@@ -636,7 +606,6 @@ modules/led.o:\
 	modules/led.c\
 	builtin-gconf.h\
 	datapipe.h\
-	datapipe.h\
 	libwakelock.h\
 	mce-conf.h\
 	mce-dbus.h\
@@ -653,7 +622,6 @@ modules/led.pic.o:\
 	modules/led.c\
 	builtin-gconf.h\
 	datapipe.h\
-	datapipe.h\
 	libwakelock.h\
 	mce-conf.h\
 	mce-dbus.h\
@@ -670,7 +638,6 @@ modules/packagekit.o:\
 	modules/packagekit.c\
 	builtin-gconf.h\
 	datapipe.h\
-	datapipe.h\
 	mce-dbus.h\
 	mce-log.h\
 	mce.h\
@@ -679,7 +646,6 @@ modules/packagekit.pic.o:\
 	modules/packagekit.c\
 	builtin-gconf.h\
 	datapipe.h\
-	datapipe.h\
 	mce-dbus.h\
 	mce-log.h\
 	mce.h\
@@ -688,7 +654,6 @@ modules/powersavemode.o:\
 	modules/powersavemode.c\
 	builtin-gconf.h\
 	datapipe.h\
-	datapipe.h\
 	mce-dbus.h\
 	mce-gconf.h\
 	mce-log.h\
@@ -699,7 +664,6 @@ modules/powersavemode.pic.o:\
 	modules/powersavemode.c\
 	builtin-gconf.h\
 	datapipe.h\
-	datapipe.h\
 	mce-dbus.h\
 	mce-gconf.h\
 	mce-log.h\
@@ -710,7 +674,6 @@ modules/proximity.o:\
 	modules/proximity.c\
 	builtin-gconf.h\
 	datapipe.h\
-	datapipe.h\
 	mce-dbus.h\
 	mce-gconf.h\
 	mce-hal.h\
@@ -725,7 +688,6 @@ modules/proximity.pic.o:\
 	modules/proximity.c\
 	builtin-gconf.h\
 	datapipe.h\
-	datapipe.h\
 	mce-dbus.h\
 	mce-gconf.h\
 	mce-hal.h\
@@ -740,7 +702,6 @@ modules/radiostates.o:\
 	modules/radiostates.c\
 	builtin-gconf.h\
 	datapipe.h\
-	datapipe.h\
 	mce-conf.h\
 	mce-dbus.h\
 	mce-io.h\
@@ -752,7 +713,6 @@ modules/radiostates.pic.o:\
 	modules/radiostates.c\
 	builtin-gconf.h\
 	datapipe.h\
-	datapipe.h\
 	mce-conf.h\
 	mce-dbus.h\
 	mce-io.h\
@@ -764,7 +724,6 @@ modules/sensor-gestures.o:\
 	modules/sensor-gestures.c\
 	builtin-gconf.h\
 	datapipe.h\
-	datapipe.h\
 	mce-dbus.h\
 	mce-log.h\
 	mce-sensorfw.h\
@@ -774,7 +733,6 @@ modules/sensor-gestures.pic.o:\
 	modules/sensor-gestures.c\
 	builtin-gconf.h\
 	datapipe.h\
-	datapipe.h\
 	mce-dbus.h\
 	mce-log.h\
 	mce-sensorfw.h\
@@ -811,7 +769,6 @@ tests/ut/ut_display.o:\
 	mce-log.h\
 	builtin-gconf.h\
 	datapipe.h\
-	datapipe.h\
 	filewatcher.h\
 	libwakelock.h\
 	mce-conf.h\
@@ -831,7 +788,6 @@ tests/ut/ut_display.pic.o:\
 	mce-log.h\
 	builtin-gconf.h\
 	datapipe.h\
-	datapipe.h\
 	filewatcher.h\
 	libwakelock.h\
 	mce-conf.h\
@@ -851,7 +807,6 @@ tests/ut/ut_display_blanking_inhibit.o:\
 	mce-log.h\
 	builtin-gconf.h\
 	datapipe.h\
-	datapipe.h\
 	filewatcher.h\
 	libwakelock.h\
 	mce-conf.h\
@@ -872,7 +827,6 @@ tests/ut/ut_display_blanking_inhibit.pic.o:\
 	mce-log.h\
 	builtin-gconf.h\
 	datapipe.h\
-	datapipe.h\
 	filewatcher.h\
 	libwakelock.h\
 	mce-conf.h\
@@ -893,7 +847,6 @@ tests/ut/ut_display_conf.o:\
 	mce-log.h\
 	builtin-gconf.h\
 	datapipe.h\
-	datapipe.h\
 	filewatcher.h\
 	libwakelock.h\
 	mce-conf.h\
@@ -914,7 +867,6 @@ tests/ut/ut_display_conf.pic.o:\
 	mce-log.h\
 	builtin-gconf.h\
 	datapipe.h\
-	datapipe.h\
 	filewatcher.h\
 	libwakelock.h\
 	mce-conf.h\
@@ -935,7 +887,6 @@ tests/ut/ut_display_filter.o:\
 	mce-log.h\
 	builtin-gconf.h\
 	datapipe.h\
-	datapipe.h\
 	filewatcher.h\
 	libwakelock.h\
 	mce-conf.h\
@@ -956,7 +907,6 @@ tests/ut/ut_display_filter.pic.o:\
 	mce-log.h\
 	builtin-gconf.h\
 	datapipe.h\
-	datapipe.h\
 	filewatcher.h\
 	libwakelock.h\
 	mce-conf.h\
@@ -977,7 +927,6 @@ tests/ut/ut_display_stm.o:\
 	mce-log.h\
 	builtin-gconf.h\
 	datapipe.h\
-	datapipe.h\
 	filewatcher.h\
 	libwakelock.h\
 	mce-conf.h\
@@ -998,7 +947,6 @@ tests/ut/ut_display_stm.pic.o:\
 	mce-log.h\
 	builtin-gconf.h\
 	datapipe.h\
-	datapipe.h\
 	filewatcher.h\
 	libwakelock.h\
 	mce-conf.h\

diff --git a/builtin-gconf.c b/builtin-gconf.c
@@ -18,16 +18,14 @@
  * - value types can't be changed
  * ------------------------------------------------------------------------- */
 
-#include <glib.h>
+#include "mce-log.h"
+#include "mce-io.h"
+#include "mce-dbus.h"
 
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <glob.h>
 #include <errno.h>
-
-#include "mce-log.h"
-#include "mce-io.h"
+#include <glob.h>
 
 /* ========================================================================= *
  *
@@ -56,9 +54,6 @@
 /** Tag unused parameters as such to avoid compilation warnings */
 #define unused(variable) (void)&variable
 
-#include "builtin-gconf.h"
-#include "mce-dbus.h"
-
 /* ========================================================================= *
  *
  * FUNCTION PROTOTYPES

diff --git a/builtin-gconf.h b/builtin-gconf.h
@@ -7,6 +7,8 @@
 #ifndef BUILTIN_GCONF_H_
 # define BUILTIN_GCONF_H_
 
+#include <glib.h>
+
 # ifdef __cplusplus
 extern "C" {
 # elif 0