--- /dev/null
+diff -urp git_/hald/hald_dbus.c git/hald/hald_dbus.c
+--- git_/hald/hald_dbus.c 2014-10-11 04:26:01.697811062 +0300
++++ git/hald/hald_dbus.c 2014-10-11 04:35:40.340332288 +0300
+@@ -36,7 +36,6 @@
+ #include <stdint.h>
+ #include <sys/time.h>
+ #include <glib.h>
+-#include <glib/gprintf.h>
+ #include <dbus/dbus.h>
+ #include <dbus/dbus-glib-lowlevel.h>
+
+diff -urp git_/hald/linux/addons/addon-acpi-buttons-toshiba.c git/hald/linux/addons/addon-acpi-buttons-toshiba.c
+--- git_/hald/linux/addons/addon-acpi-buttons-toshiba.c 2014-10-11 04:26:01.709810638 +0300
++++ git/hald/linux/addons/addon-acpi-buttons-toshiba.c 2014-10-11 04:36:01.859533542 +0300
+@@ -40,7 +40,7 @@ else
+ #include <string.h>
+ #include <unistd.h>
+
+-#include <glib/gmain.h>
++#include <glib.h>
+
+ #include "libhal/libhal.h"
+ #include "../../logger.h"
+diff -urp git_/hald/linux/addons/addon-cpufreq.c git/hald/linux/addons/addon-cpufreq.c
+--- git_/hald/linux/addons/addon-cpufreq.c 2014-10-11 04:26:01.709810638 +0300
++++ git/hald/linux/addons/addon-cpufreq.c 2014-10-11 04:36:09.763240131 +0300
+@@ -32,7 +32,6 @@
+ #include <unistd.h>
+ #include <signal.h>
+ #include <getopt.h>
+-#include <glib/gprintf.h>
+
+ #include "addon-cpufreq.h"
+ #include "addon-cpufreq-userspace.h"
+diff -urp git_/hald/linux/addons/addon-dell-backlight.cpp git/hald/linux/addons/addon-dell-backlight.cpp
+--- git_/hald/linux/addons/addon-dell-backlight.cpp 2014-10-11 04:26:01.709810638 +0300
++++ git/hald/linux/addons/addon-dell-backlight.cpp 2014-10-11 04:36:22.846754514 +0300
+@@ -29,7 +29,7 @@
+
+ #include <string.h>
+
+-#include <glib/gmain.h>
++#include <glib.h>
+ #include <dbus/dbus-glib.h>
+ #include <dbus/dbus-glib-lowlevel.h>
+
+diff -urp git_/hald/linux/addons/addon-generic-backlight.c git/hald/linux/addons/addon-generic-backlight.c
+--- git_/hald/linux/addons/addon-generic-backlight.c 2014-10-11 04:26:01.709810638 +0300
++++ git/hald/linux/addons/addon-generic-backlight.c 2014-10-11 04:34:30.122938747 +0300
+@@ -35,7 +35,7 @@
+ #include <sys/stat.h>
+ #include <unistd.h>
+
+-#include <glib/gmain.h>
++#include <glib.h>
+ #include <dbus/dbus-glib.h>
+ #include <dbus/dbus-glib-lowlevel.h>
+
+diff -urp git_/hald/linux/addons/addon-imac-backlight.c git/hald/linux/addons/addon-imac-backlight.c
+--- git_/hald/linux/addons/addon-imac-backlight.c 2014-10-11 04:26:01.709810638 +0300
++++ git/hald/linux/addons/addon-imac-backlight.c 2014-10-11 04:36:35.126298634 +0300
+@@ -29,7 +29,7 @@
+ #include <stdlib.h>
+ #include <sys/io.h>
+
+-#include <glib/gmain.h>
++#include <glib.h>
+ #include <dbus/dbus-glib.h>
+ #include <dbus/dbus-glib-lowlevel.h>
+
+diff -urp git_/hald/linux/addons/addon-input.c git/hald/linux/addons/addon-input.c
+--- git_/hald/linux/addons/addon-input.c 2014-10-11 04:26:01.709810638 +0300
++++ git/hald/linux/addons/addon-input.c 2014-10-11 04:36:42.066041141 +0300
+@@ -41,8 +41,7 @@
+ #else
+ #include <linux/input.h>
+ #endif
+-#include <glib/gmain.h>
+-#include <glib/gprintf.h>
++#include <glib.h>
+ #include <dbus/dbus-glib-lowlevel.h>
+
+ #include "libhal/libhal.h"
+diff -urp git_/hald/linux/addons/addon-ipw-killswitch.c git/hald/linux/addons/addon-ipw-killswitch.c
+--- git_/hald/linux/addons/addon-ipw-killswitch.c 2014-10-11 04:26:01.709810638 +0300
++++ git/hald/linux/addons/addon-ipw-killswitch.c 2014-10-11 04:36:47.761829682 +0300
+@@ -36,8 +36,6 @@
+ #include <unistd.h>
+
+ #include <glib.h>
+-#include <glib/gmain.h>
+-#include <glib/gstdio.h>
+ #include <dbus/dbus-glib.h>
+ #include <dbus/dbus-glib-lowlevel.h>
+
+diff -urp git_/hald/linux/addons/addon-leds.c git/hald/linux/addons/addon-leds.c
+--- git_/hald/linux/addons/addon-leds.c 2014-10-11 04:26:01.709810638 +0300
++++ git/hald/linux/addons/addon-leds.c 2014-10-11 04:36:55.109556974 +0300
+@@ -36,8 +36,6 @@
+ #include <unistd.h>
+
+ #include <glib.h>
+-#include <glib/gmain.h>
+-#include <glib/gstdio.h>
+ #include <dbus/dbus-glib.h>
+ #include <dbus/dbus-glib-lowlevel.h>
+
+diff -urp git_/hald/linux/addons/addon-macbookpro-backlight.c git/hald/linux/addons/addon-macbookpro-backlight.c
+--- git_/hald/linux/addons/addon-macbookpro-backlight.c 2014-10-11 04:26:01.709810638 +0300
++++ git/hald/linux/addons/addon-macbookpro-backlight.c 2014-10-11 04:37:04.857719948 +0300
+@@ -39,7 +39,7 @@
+ #include <pci/pci.h>
+ #include <unistd.h>
+
+-#include <glib/gmain.h>
++#include <glib.h>
+ #include <dbus/dbus-glib.h>
+ #include <dbus/dbus-glib-lowlevel.h>
+
+diff -urp git_/hald/linux/addons/addon-omap-backlight.c git/hald/linux/addons/addon-omap-backlight.c
+--- git_/hald/linux/addons/addon-omap-backlight.c 2014-10-11 04:26:01.709810638 +0300
++++ git/hald/linux/addons/addon-omap-backlight.c 2014-10-11 04:37:11.510111615 +0300
+@@ -41,7 +41,7 @@
+ #include <fcntl.h>
+ #include <unistd.h>
+
+-#include <glib/gmain.h>
++#include <glib.h>
+ #include <dbus/dbus-glib.h>
+ #include <dbus/dbus-glib-lowlevel.h>
+
+diff -urp git_/hald/linux/addons/addon-rfkill-killswitch.c git/hald/linux/addons/addon-rfkill-killswitch.c
+--- git_/hald/linux/addons/addon-rfkill-killswitch.c 2014-10-11 04:26:01.709810638 +0300
++++ git/hald/linux/addons/addon-rfkill-killswitch.c 2014-10-11 04:37:17.662774232 +0300
+@@ -36,8 +36,6 @@
+ #include <unistd.h>
+
+ #include <glib.h>
+-#include <glib/gmain.h>
+-#include <glib/gstdio.h>
+ #include <dbus/dbus-glib.h>
+ #include <dbus/dbus-glib-lowlevel.h>
+
+diff -urp git_/hald/linux/addons/addon-storage.c git/hald/linux/addons/addon-storage.c
+--- git_/hald/linux/addons/addon-storage.c 2014-10-11 04:26:01.709810638 +0300
++++ git/hald/linux/addons/addon-storage.c 2014-10-11 04:37:28.908674427 +0300
+@@ -39,7 +39,7 @@
+ #include <string.h>
+ #include <sys/ioctl.h>
+ #include <unistd.h>
+-#include <glib/gmain.h>
++#include <glib.h>
+ #include <dbus/dbus-glib.h>
+ #include <dbus/dbus-glib-lowlevel.h>
+
+diff -urp git_/hald/linux/addons/addon-usb-csr.c git/hald/linux/addons/addon-usb-csr.c
+--- git_/hald/linux/addons/addon-usb-csr.c 2014-10-11 04:26:01.709810638 +0300
++++ git/hald/linux/addons/addon-usb-csr.c 2014-10-11 04:37:43.236902519 +0300
+@@ -29,7 +29,7 @@
+ #include <string.h>
+ #include <usb.h>
+
+-#include <glib/gmain.h>
++#include <glib.h>
+ #include <dbus/dbus-glib.h>
+ #include <dbus/dbus-glib-lowlevel.h>
+
+diff -urp git_/hald/linux/hal-file-monitor.c git/hald/linux/hal-file-monitor.c
+--- git_/hald/linux/hal-file-monitor.c 2014-10-11 04:26:01.709810638 +0300
++++ git/hald/linux/hal-file-monitor.c 2014-10-11 04:38:16.332696881 +0300
+@@ -36,8 +36,6 @@
+ #endif
+
+ #include <glib.h>
+-#include <glib/gi18n.h>
+-#include <glib/gstdio.h>
+ #include <glib-object.h>
+
+ #include "../hal-file-monitor.h"
+diff -urp git_/tools/hal-storage-cleanup-all-mountpoints.c git/tools/hal-storage-cleanup-all-mountpoints.c
+--- git_/tools/hal-storage-cleanup-all-mountpoints.c 2014-10-11 04:26:01.685811644 +0300
++++ git/tools/hal-storage-cleanup-all-mountpoints.c 2014-10-11 04:38:33.219985840 +0300
+@@ -31,7 +31,6 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <glib.h>
+-#include <glib/gstdio.h>
+
+ #include "hal-storage-shared.h"
+
+diff -urp git_/tools/hal-storage-cleanup-mountpoint.c git/tools/hal-storage-cleanup-mountpoint.c
+--- git_/tools/hal-storage-cleanup-mountpoint.c 2014-10-11 04:26:01.689811446 +0300
++++ git/tools/hal-storage-cleanup-mountpoint.c 2014-10-11 04:38:37.219817351 +0300
+@@ -31,7 +31,6 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <glib.h>
+-#include <glib/gstdio.h>
+
+ #include "hal-storage-shared.h"
+
+diff -urp git_/tools/hal-storage-closetray.c git/tools/hal-storage-closetray.c
+--- git_/tools/hal-storage-closetray.c 2014-10-11 04:26:01.685811644 +0300
++++ git/tools/hal-storage-closetray.c 2014-10-11 04:38:41.819623611 +0300
+@@ -30,7 +30,6 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <glib.h>
+-#include <glib/gstdio.h>
+ #include <sys/types.h>
+ #include <unistd.h>
+
+diff -urp git_/tools/hal-storage-eject.c git/tools/hal-storage-eject.c
+--- git_/tools/hal-storage-eject.c 2014-10-11 04:26:01.689811446 +0300
++++ git/tools/hal-storage-eject.c 2014-10-11 04:38:45.247479302 +0300
+@@ -29,7 +29,6 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <glib.h>
+-#include <glib/gstdio.h>
+ #include <sys/types.h>
+ #include <unistd.h>
+
+diff -urp git_/tools/hal-storage-mount.c git/tools/hal-storage-mount.c
+--- git_/tools/hal-storage-mount.c 2014-10-11 04:26:01.685811644 +0300
++++ git/tools/hal-storage-mount.c 2014-10-11 04:38:49.591296265 +0300
+@@ -30,7 +30,6 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <glib.h>
+-#include <glib/gstdio.h>
+ #ifdef __FreeBSD__
+ #include <fstab.h>
+ #include <sys/param.h>
+diff -urp git_/tools/hal-storage-shared.c git/tools/hal-storage-shared.c
+--- git_/tools/hal-storage-shared.c 2014-10-11 04:26:01.685811644 +0300
++++ git/tools/hal-storage-shared.c 2014-10-11 04:38:53.171145482 +0300
+@@ -30,7 +30,6 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <glib.h>
+-#include <glib/gstdio.h>
+ #ifdef __FreeBSD__
+ #include <fstab.h>
+ #include <sys/param.h>
+diff -urp git_/tools/hal-storage-unmount.c git/tools/hal-storage-unmount.c
+--- git_/tools/hal-storage-unmount.c 2014-10-11 04:26:01.685811644 +0300
++++ git/tools/hal-storage-unmount.c 2014-10-11 04:38:57.506962892 +0300
+@@ -30,7 +30,6 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <glib.h>
+-#include <glib/gstdio.h>
+ #ifdef __FreeBSD__
+ #include <fstab.h>
+ #include <sys/param.h>