From 7a5bdf46734560d9b3cbe82fc459553129d7fd28 Mon Sep 17 00:00:00 2001
From: Cedric Bail <cedric.bail@free.fr>
Date: Fri, 15 Mar 2013 09:32:20 +0100
Subject: [PATCH] edbus: fix compilation on Windows.

---
 src/lib/edbus/edbus_core.c          | 3 ---
 src/lib/edbus/edbus_private.h       | 2 ++
 src/lib/edbus/edbus_private_types.h | 5 -----
 src/lib/edbus/edbus_proxy.c         | 4 ++++
 src/lib/edbus/edbus_service.c       | 6 +++++-
 5 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/lib/edbus/edbus_core.c b/src/lib/edbus/edbus_core.c
index b7a77ea695..55339f5f03 100644
--- a/src/lib/edbus/edbus_core.c
+++ b/src/lib/edbus/edbus_core.c
@@ -4,9 +4,6 @@
 
 #include "edbus_private.h"
 #include "edbus_private_types.h"
-#include <dbus/dbus.h>
-
-#include <Ecore.h>
 
 #define EDBUS_CONNECTION_CHECK(conn)                        \
   do                                                        \
diff --git a/src/lib/edbus/edbus_private.h b/src/lib/edbus/edbus_private.h
index 1a69c9f813..a1ee0db478 100644
--- a/src/lib/edbus/edbus_private.h
+++ b/src/lib/edbus/edbus_private.h
@@ -1,8 +1,10 @@
 #ifndef EDBUS_PRIVATE_H
 #define EDBUS_PRIVATE_H
 
+#include <dbus/dbus.h>
 #include <Eina.h>
 #include "eina_safety_checks.h"
+#include <Ecore.h>
 #include "EDBus.h"
 #include "edbus_private_types.h"
 
diff --git a/src/lib/edbus/edbus_private_types.h b/src/lib/edbus/edbus_private_types.h
index 54da7da1b5..760f1306ea 100644
--- a/src/lib/edbus/edbus_private_types.h
+++ b/src/lib/edbus/edbus_private_types.h
@@ -1,11 +1,6 @@
 #ifndef EDBUS_PRIVATE_TYPES_H
 #define EDBUS_PRIVATE_TYPES_H 1
 
-#include "EDBus.h"
-#include <Eina.h>
-#include <dbus/dbus.h>
-#include <Ecore.h>
-
 typedef struct _EDBus_Connection_Name
 {
    const char *name;
diff --git a/src/lib/edbus/edbus_proxy.c b/src/lib/edbus/edbus_proxy.c
index 298bcc3f36..5b74a1184c 100644
--- a/src/lib/edbus/edbus_proxy.c
+++ b/src/lib/edbus/edbus_proxy.c
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include "edbus_private.h"
 #include "edbus_private_types.h"
 
diff --git a/src/lib/edbus/edbus_service.c b/src/lib/edbus/edbus_service.c
index bef480d453..07912e057f 100644
--- a/src/lib/edbus/edbus_service.c
+++ b/src/lib/edbus/edbus_service.c
@@ -1,5 +1,9 @@
-#include "edbus_private_types.h"
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include "edbus_private.h"
+#include "edbus_private_types.h"
 
 #define DBUS_ANNOTATION(name, value) \
         "<annotation" \