Do not use -I preprosessor directive to locate local headers

Using relative paths makes it easier to tell find local headers and
tell them from external headers.

Also remove unmaintained, possibly not up to date hints about why
headers are included.

.depend

@@ -473,51 +473,51 @@ modules/camera.pic.o:\
 modules/cpu-keepalive.o:\
 	modules/cpu-keepalive.c\
 	builtin-gconf.h\
+	libwakelock.h\
 	mce-dbus.h\
 	mce-log.h\
-	libwakelock.h\
 
 modules/cpu-keepalive.pic.o:\
 	modules/cpu-keepalive.c\
 	builtin-gconf.h\
+	libwakelock.h\
 	mce-dbus.h\
 	mce-log.h\
-	libwakelock.h\
 
 modules/display.o:\
 	modules/display.c\
 	builtin-gconf.h\
 	datapipe.h\
 	datapipe.h\
+	filewatcher.h\
+	libwakelock.h\
 	mce-conf.h\
 	mce-dbus.h\
 	mce-gconf.h\
+	mce-hybris.h\
 	mce-io.h\
 	mce-lib.h\
 	mce-log.h\
 	mce-sensorfw.h\
 	mce.h\
-	filewatcher.h\
-	libwakelock.h\
-	mce-hybris.h\
 	modules/display.h\
 
 modules/display.pic.o:\
 	modules/display.c\
 	builtin-gconf.h\
 	datapipe.h\
 	datapipe.h\
+	filewatcher.h\
+	libwakelock.h\
 	mce-conf.h\
 	mce-dbus.h\
 	mce-gconf.h\
+	mce-hybris.h\
 	mce-io.h\
 	mce-lib.h\
 	mce-log.h\
 	mce-sensorfw.h\
 	mce.h\
-	filewatcher.h\
-	libwakelock.h\
-	mce-hybris.h\
 	modules/display.h\
 
 modules/doubletap.o:\
@@ -635,33 +635,33 @@ modules/led.o:\
 	builtin-gconf.h\
 	datapipe.h\
 	datapipe.h\
+	libwakelock.h\
 	mce-conf.h\
 	mce-dbus.h\
 	mce-gconf.h\
 	mce-hal.h\
+	mce-hybris.h\
 	mce-io.h\
 	mce-lib.h\
 	mce-log.h\
 	mce.h\
-	libwakelock.h\
-	mce-hybris.h\
 	modules/led.h\
 
 modules/led.pic.o:\
 	modules/led.c\
 	builtin-gconf.h\
 	datapipe.h\
 	datapipe.h\
+	libwakelock.h\
 	mce-conf.h\
 	mce-dbus.h\
 	mce-gconf.h\
 	mce-hal.h\
+	mce-hybris.h\
 	mce-io.h\
 	mce-lib.h\
 	mce-log.h\
 	mce.h\
-	libwakelock.h\
-	mce-hybris.h\
 	modules/led.h\
 
 modules/packagekit.o:\
@@ -712,11 +712,11 @@ modules/proximity.o:\
 	mce-dbus.h\
 	mce-gconf.h\
 	mce-hal.h\
+	mce-hybris.h\
 	mce-io.h\
 	mce-log.h\
 	mce-sensorfw.h\
 	mce.h\
-	mce-hybris.h\
 	modules/proximity.h\
 
 modules/proximity.pic.o:\
@@ -727,11 +727,11 @@ modules/proximity.pic.o:\
 	mce-dbus.h\
 	mce-gconf.h\
 	mce-hal.h\
+	mce-hybris.h\
 	mce-io.h\
 	mce-log.h\
 	mce-sensorfw.h\
 	mce.h\
-	mce-hybris.h\
 	modules/proximity.h\
 
 modules/radiostates.o:\
@@ -806,9 +806,12 @@ powerkey.pic.o:\
 
 tests/ut/ut_display.o:\
 	tests/ut/ut_display.c\
+	mce-log.h\
 	builtin-gconf.h\
 	datapipe.h\
 	datapipe.h\
+	filewatcher.h\
+	libwakelock.h\
 	mce-conf.h\
 	mce-dbus.h\
 	mce-gconf.h\
@@ -817,18 +820,18 @@ tests/ut/ut_display.o:\
 	mce-log.h\
 	mce-sensorfw.h\
 	mce.h\
-	mce-log.h\
-	filewatcher.h\
-	libwakelock.h\
 	modules/display.c\
 	modules/display.h\
 	tests/ut/common.h\
 
 tests/ut/ut_display.pic.o:\
 	tests/ut/ut_display.c\
+	mce-log.h\
 	builtin-gconf.h\
 	datapipe.h\
 	datapipe.h\
+	filewatcher.h\
+	libwakelock.h\
 	mce-conf.h\
 	mce-dbus.h\
 	mce-gconf.h\
@@ -837,177 +840,174 @@ tests/ut/ut_display.pic.o:\
 	mce-log.h\
 	mce-sensorfw.h\
 	mce.h\
-	mce-log.h\
-	filewatcher.h\
-	libwakelock.h\
 	modules/display.c\
 	modules/display.h\
 	tests/ut/common.h\
 
 tests/ut/ut_display_blanking_inhibit.o:\
 	tests/ut/ut_display_blanking_inhibit.c\
+	mce-log.h\
 	builtin-gconf.h\
 	datapipe.h\
 	datapipe.h\
+	filewatcher.h\
+	libwakelock.h\
 	mce-conf.h\
 	mce-dbus.h\
 	mce-gconf.h\
+	mce-hybris.h\
 	mce-io.h\
 	mce-lib.h\
 	mce-log.h\
 	mce-sensorfw.h\
 	mce.h\
-	mce-log.h\
-	filewatcher.h\
-	libwakelock.h\
-	mce-hybris.h\
 	modules/display.c\
 	modules/display.h\
 	tests/ut/common.h\
 
 tests/ut/ut_display_blanking_inhibit.pic.o:\
 	tests/ut/ut_display_blanking_inhibit.c\
+	mce-log.h\
 	builtin-gconf.h\
 	datapipe.h\
 	datapipe.h\
+	filewatcher.h\
+	libwakelock.h\
 	mce-conf.h\
 	mce-dbus.h\
 	mce-gconf.h\
+	mce-hybris.h\
 	mce-io.h\
 	mce-lib.h\
 	mce-log.h\
 	mce-sensorfw.h\
 	mce.h\
-	mce-log.h\
-	filewatcher.h\
-	libwakelock.h\
-	mce-hybris.h\
 	modules/display.c\
 	modules/display.h\
 	tests/ut/common.h\
 
 tests/ut/ut_display_conf.o:\
 	tests/ut/ut_display_conf.c\
+	mce-log.h\
 	builtin-gconf.h\
 	datapipe.h\
 	datapipe.h\
+	filewatcher.h\
+	libwakelock.h\
 	mce-conf.h\
 	mce-dbus.h\
 	mce-gconf.h\
+	mce-hybris.h\
 	mce-io.h\
 	mce-lib.h\
 	mce-log.h\
 	mce-sensorfw.h\
 	mce.h\
-	mce-log.h\
-	filewatcher.h\
-	libwakelock.h\
-	mce-hybris.h\
 	modules/display.c\
 	modules/display.h\
 	tests/ut/common.h\
 
 tests/ut/ut_display_conf.pic.o:\
 	tests/ut/ut_display_conf.c\
+	mce-log.h\
 	builtin-gconf.h\
 	datapipe.h\
 	datapipe.h\
+	filewatcher.h\
+	libwakelock.h\
 	mce-conf.h\
 	mce-dbus.h\
 	mce-gconf.h\
+	mce-hybris.h\
 	mce-io.h\
 	mce-lib.h\
 	mce-log.h\
 	mce-sensorfw.h\
 	mce.h\
-	mce-log.h\
-	filewatcher.h\
-	libwakelock.h\
-	mce-hybris.h\
 	modules/display.c\
 	modules/display.h\
 	tests/ut/common.h\
 
 tests/ut/ut_display_filter.o:\
 	tests/ut/ut_display_filter.c\
+	mce-log.h\
 	builtin-gconf.h\
 	datapipe.h\
 	datapipe.h\
+	filewatcher.h\
+	libwakelock.h\
 	mce-conf.h\
 	mce-dbus.h\
 	mce-gconf.h\
+	mce-hybris.h\
 	mce-io.h\
 	mce-lib.h\
 	mce-log.h\
 	mce-sensorfw.h\
 	mce.h\
-	mce-log.h\
-	filewatcher.h\
-	libwakelock.h\
-	mce-hybris.h\
 	modules/display.c\
 	modules/display.h\
 	tests/ut/common.h\
 
 tests/ut/ut_display_filter.pic.o:\
 	tests/ut/ut_display_filter.c\
+	mce-log.h\
 	builtin-gconf.h\
 	datapipe.h\
 	datapipe.h\
+	filewatcher.h\
+	libwakelock.h\
 	mce-conf.h\
 	mce-dbus.h\
 	mce-gconf.h\
+	mce-hybris.h\
 	mce-io.h\
 	mce-lib.h\
 	mce-log.h\
 	mce-sensorfw.h\
 	mce.h\
-	mce-log.h\
-	filewatcher.h\
-	libwakelock.h\
-	mce-hybris.h\
 	modules/display.c\
 	modules/display.h\
 	tests/ut/common.h\
 
 tests/ut/ut_display_stm.o:\
 	tests/ut/ut_display_stm.c\
+	mce-log.h\
 	builtin-gconf.h\
 	datapipe.h\
 	datapipe.h\
+	filewatcher.h\
+	libwakelock.h\
 	mce-conf.h\
 	mce-dbus.h\
 	mce-gconf.h\
+	mce-hybris.h\
 	mce-io.h\
 	mce-lib.h\
 	mce-log.h\
 	mce-sensorfw.h\
 	mce.h\
-	mce-log.h\
-	filewatcher.h\
-	libwakelock.h\
-	mce-hybris.h\
 	modules/display.c\
 	modules/display.h\
 	tests/ut/common.h\
 
 tests/ut/ut_display_stm.pic.o:\
 	tests/ut/ut_display_stm.c\
+	mce-log.h\
 	builtin-gconf.h\
 	datapipe.h\
 	datapipe.h\
+	filewatcher.h\
+	libwakelock.h\
 	mce-conf.h\
 	mce-dbus.h\
 	mce-gconf.h\
+	mce-hybris.h\
 	mce-io.h\
 	mce-lib.h\
 	mce-log.h\
 	mce-sensorfw.h\
 	mce.h\
-	mce-log.h\
-	filewatcher.h\
-	libwakelock.h\
-	mce-hybris.h\
 	modules/display.c\
 	modules/display.h\
 	tests/ut/common.h\

Makefile

@@ -186,7 +186,6 @@ DBUSCONF              := mce.conf
 
 # C Preprocessor
 CPPFLAGS += -D_GNU_SOURCE
-CPPFLAGS += -I.
 CPPFLAGS += -DG_DISABLE_DEPRECATED
 CPPFLAGS += -DOSSOLOG_COMPILE
 CPPFLAGS += -DMCE_VAR_DIR=$(VARDIR)

event-input.h

@@ -23,7 +23,7 @@
 
 #include <glib.h>
 
-#include <linux/input.h>	/* KEY_POWER */
+#include <linux/input.h>
 
 /** Path to the input device directory */
 #define DEV_INPUT_PATH			"/dev/input"

mce-gconf.h

@@ -21,9 +21,7 @@
 #ifndef _MCE_GCONF_H_
 #define _MCE_GCONF_H_
 
-#include <glib.h>			/* gboolean, gpointer,
-					 * gchar, guint, gint
-					 */
+#include <glib.h>
 
 #include "builtin-gconf.h"