From bc6547e95b4a06f12a03302fb16d997239ff0e5e Mon Sep 17 00:00:00 2001
From: Marcel Holtmann <marcel@holtmann.org>
Date: Tue, 11 Dec 2012 12:37:45 +0100
Subject: [PATCH] client: Fix up header inclusion mess

---
 client/commands.c     | 11 +++++------
 client/data_manager.c |  8 ++++----
 client/interactive.c  | 10 +++++-----
 client/main.c         | 12 +++++-------
 client/monitor.c      | 12 +++++-------
 client/services.c     |  2 +-
 client/technology.c   |  2 +-
 7 files changed, 26 insertions(+), 31 deletions(-)

diff --git a/client/commands.c b/client/commands.c
index e1de758..75856cd 100644
--- a/client/commands.c
+++ b/client/commands.c
@@ -33,12 +33,11 @@
 #include <glib.h>
 #include <gdbus.h>
 
-#include "client/services.h"
-#include "client/technology.h"
-#include "client/data_manager.h"
-#include "client/monitor.h"
-#include "client/interactive.h"
-#include "gdbus/gdbus.h"
+#include "services.h"
+#include "technology.h"
+#include "data_manager.h"
+#include "monitor.h"
+#include "interactive.h"
 
 #define MANDATORY_ARGS 3
 
diff --git a/client/data_manager.c b/client/data_manager.c
index 895397b..8dae718 100644
--- a/client/data_manager.c
+++ b/client/data_manager.c
@@ -32,11 +32,11 @@
 #include <errno.h>
 
 #include <glib.h>
+#include <gdbus.h>
 
-#include "client/services.h"
-#include "client/technology.h"
-#include "client/data_manager.h"
-#include "gdbus/gdbus.h"
+#include "services.h"
+#include "technology.h"
+#include "data_manager.h"
 #include "dbus.h"
 
 static void extract_manager_properties(DBusMessage *message)
diff --git a/client/interactive.c b/client/interactive.c
index 78ec2cb..d2c4f79 100644
--- a/client/interactive.c
+++ b/client/interactive.c
@@ -40,11 +40,11 @@
 #include <glib.h>
 #include <gdbus.h>
 
-#include "client/services.h"
-#include "client/technology.h"
-#include "client/data_manager.h"
-#include "client/monitor.h"
-#include "client/interactive.h"
+#include "services.h"
+#include "technology.h"
+#include "data_manager.h"
+#include "monitor.h"
+#include "interactive.h"
 
 static DBusConnection *interactive_conn;
 
diff --git a/client/main.c b/client/main.c
index 9a614c8..ab64277 100644
--- a/client/main.c
+++ b/client/main.c
@@ -33,15 +33,13 @@
 #include <readline/readline.h>
 
 #include <glib.h>
-
-#include <dbus/dbus.h>
 #include <gdbus.h>
 
-#include "client/data_manager.h"
-#include "client/services.h"
-#include "client/technology.h"
-#include "client/interactive.h"
-#include "client/monitor.h"
+#include "data_manager.h"
+#include "services.h"
+#include "technology.h"
+#include "interactive.h"
+#include "monitor.h"
 
 static GMainLoop *main_loop;
 
diff --git a/client/monitor.c b/client/monitor.c
index ae585be..5e8b392 100644
--- a/client/monitor.c
+++ b/client/monitor.c
@@ -31,14 +31,12 @@
 #include <stdint.h>
 
 #include <glib.h>
+#include <gdbus.h>
 
-#include <dbus/dbus.h>
-
-#include "client/monitor.h"
-#include "client/services.h"
-#include "client/technology.h"
-#include "client/data_manager.h"
-#include "gdbus/gdbus.h"
+#include "monitor.h"
+#include "services.h"
+#include "technology.h"
+#include "data_manager.h"
 
 static const char *get_service_name(DBusMessage *message, char *dbus_path)
 {
diff --git a/client/services.c b/client/services.c
index df80911..7e6424f 100644
--- a/client/services.c
+++ b/client/services.c
@@ -33,7 +33,7 @@
 
 #include <glib.h>
 
-#include "client/services.h"
+#include "services.h"
 #include "dbus.h"
 
 static void append_property_array(DBusMessageIter *iter, char *property,
diff --git a/client/technology.c b/client/technology.c
index 9f36858..1832a1d 100644
--- a/client/technology.c
+++ b/client/technology.c
@@ -32,7 +32,7 @@
 
 #include <glib.h>
 
-#include "client/technology.h"
+#include "technology.h"
 #include "dbus.h"
 
 void extract_properties(DBusMessageIter *dict)
-- 
2.7.4