client: Fix up header inclusion mess

7 files changed, 26 insertions, 31 deletions

diff --git a/client/commands.c b/client/commands.c
index e1de7589..75856cd2 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 895397b5..8dae718f 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 78ec2cb7..d2c4f794 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 9a614c8a..ab642772 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 ae585be3..5e8b3923 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 df809114..7e6424f5 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 9f368580..1832a1d5 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)