From bad0dc3c0cbd2b9fb1fac6ec579a128c006a4230 Mon Sep 17 00:00:00 2001
From: Jouni Malinen <j@w1.fi>
Date: Fri, 1 Jan 2010 18:20:05 +0200
Subject: [PATCH] dbus: Do not include libdbus dbus/dbus.h into
 dbus_{old,new}.h

These header files are included outside the dbus subdirectory and there
is not really any need to force the libdbus dbus/dbus.h header file to
be included into these files.
---
 wpa_supplicant/dbus/dbus_new.h              | 2 --
 wpa_supplicant/dbus/dbus_old.c              | 1 +
 wpa_supplicant/dbus/dbus_old.h              | 5 -----
 wpa_supplicant/dbus/dbus_old_handlers.c     | 1 +
 wpa_supplicant/dbus/dbus_old_handlers.h     | 1 +
 wpa_supplicant/dbus/dbus_old_handlers_wps.c | 1 +
 6 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/wpa_supplicant/dbus/dbus_new.h b/wpa_supplicant/dbus/dbus_new.h
index 01de05599..51a46e889 100644
--- a/wpa_supplicant/dbus/dbus_new.h
+++ b/wpa_supplicant/dbus/dbus_new.h
@@ -83,8 +83,6 @@ struct wpas_dbus_callbacks {
 
 #ifdef CONFIG_CTRL_IFACE_DBUS_NEW
 
-#include <dbus/dbus.h>
-
 #define WPAS_DBUS_OBJECT_PATH_MAX 150
 
 #define WPAS_DBUS_NEW_SERVICE		"fi.w1.wpa_supplicant1"
diff --git a/wpa_supplicant/dbus/dbus_old.c b/wpa_supplicant/dbus/dbus_old.c
index aa0494b79..2cf7ec64d 100644
--- a/wpa_supplicant/dbus/dbus_old.c
+++ b/wpa_supplicant/dbus/dbus_old.c
@@ -13,6 +13,7 @@
  */
 
 #include "includes.h"
+#include <dbus/dbus.h>
 
 #include "common.h"
 #include "eloop.h"
diff --git a/wpa_supplicant/dbus/dbus_old.h b/wpa_supplicant/dbus/dbus_old.h
index a346a2db9..5aef01d02 100644
--- a/wpa_supplicant/dbus/dbus_old.h
+++ b/wpa_supplicant/dbus/dbus_old.h
@@ -19,8 +19,6 @@ struct wps_credential;
 
 #ifdef CONFIG_CTRL_IFACE_DBUS
 
-#include <dbus/dbus.h>
-
 #define WPAS_DBUS_OBJECT_PATH_MAX 150
 
 #define WPAS_DBUS_SERVICE	"fi.epitest.hostap.WPASupplicant"
@@ -99,9 +97,6 @@ const char *wpa_supplicant_get_dbus_path(struct wpa_supplicant *wpa_s);
 struct wpa_supplicant * wpa_supplicant_get_iface_by_dbus_path(
 	struct wpa_global *global, const char *path);
 
-DBusMessage * wpas_dbus_new_invalid_iface_error(DBusMessage *message);
-DBusMessage * wpas_dbus_new_invalid_network_error(DBusMessage *message);
-
 #else /* CONFIG_CTRL_IFACE_DBUS */
 
 static inline void
diff --git a/wpa_supplicant/dbus/dbus_old_handlers.c b/wpa_supplicant/dbus/dbus_old_handlers.c
index e848f25cd..5f48e42dc 100644
--- a/wpa_supplicant/dbus/dbus_old_handlers.c
+++ b/wpa_supplicant/dbus/dbus_old_handlers.c
@@ -13,6 +13,7 @@
  */
 
 #include "includes.h"
+#include <dbus/dbus.h>
 
 #include "common.h"
 #include "eap_peer/eap_methods.h"
diff --git a/wpa_supplicant/dbus/dbus_old_handlers.h b/wpa_supplicant/dbus/dbus_old_handlers.h
index 8af3fec0e..4de895403 100644
--- a/wpa_supplicant/dbus/dbus_old_handlers.h
+++ b/wpa_supplicant/dbus/dbus_old_handlers.h
@@ -16,6 +16,7 @@
 #define CTRL_IFACE_DBUS_HANDLERS_H
 
 DBusMessage * wpas_dbus_new_invalid_iface_error(DBusMessage *message);
+DBusMessage * wpas_dbus_new_invalid_network_error(DBusMessage *message);
 
 DBusMessage * wpas_dbus_global_add_interface(DBusMessage *message,
 					     struct wpa_global *global);
diff --git a/wpa_supplicant/dbus/dbus_old_handlers_wps.c b/wpa_supplicant/dbus/dbus_old_handlers_wps.c
index 79dfdab20..b5879f3ae 100644
--- a/wpa_supplicant/dbus/dbus_old_handlers_wps.c
+++ b/wpa_supplicant/dbus/dbus_old_handlers_wps.c
@@ -13,6 +13,7 @@
  */
 
 #include "includes.h"
+#include <dbus/dbus.h>
 
 #include "common.h"
 #include "../config.h"