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

@@ -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"

wpa_supplicant/dbus/dbus_old.c

@@ -13,6 +13,7 @@
  */
 
 #include "includes.h"
+#include <dbus/dbus.h>
 
 #include "common.h"
 #include "eloop.h"

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

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"

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);

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"