[gupnp] Avoid redefinition of GUPnPDevice and GUPnPService

[Jens Georg <jensgeorg src gnome org>]

commit adaad1bc9eddcd1e9e4a6b25015271ec327377b1
Author: Jens Georg <mail jensge org>
Date:   Sun Jun 29 13:08:21 2014 +0200

    Avoid redefinition of GUPnPDevice and GUPnPService
    
    This was a C++11 feature.
    
    Signed-off-by: Jens Georg <mail jensge org>
    
    https://bugzilla.gnome.org/show_bug.cgi?id=731209

 libgupnp/gupnp-acl-private.h |    1 +
 libgupnp/gupnp-acl.c         |    1 +
 libgupnp/gupnp-acl.h         |   20 ++++++++++----------
 libgupnp/gupnp-context.c     |    1 +
 4 files changed, 13 insertions(+), 10 deletions(-)
---
diff --git a/libgupnp/gupnp-acl-private.h b/libgupnp/gupnp-acl-private.h
index 16c9187..69b060d 100644
--- a/libgupnp/gupnp-acl-private.h
+++ b/libgupnp/gupnp-acl-private.h
@@ -28,6 +28,7 @@
 
 #include "gupnp-acl.h"
 #include "gupnp-context.h"
+#include "gupnp-service.h"
 
 G_BEGIN_DECLS
 
diff --git a/libgupnp/gupnp-acl.c b/libgupnp/gupnp-acl.c
index 0d4c55a..cab2e1f 100644
--- a/libgupnp/gupnp-acl.c
+++ b/libgupnp/gupnp-acl.c
@@ -32,6 +32,7 @@
 
 #include "gupnp-acl.h"
 #include "gupnp-acl-private.h"
+#include "gupnp-device.h"
 
 G_DEFINE_INTERFACE(GUPnPAcl, gupnp_acl, G_TYPE_OBJECT)
 
diff --git a/libgupnp/gupnp-acl.h b/libgupnp/gupnp-acl.h
index df5ebe8..2d639b2 100644
--- a/libgupnp/gupnp-acl.h
+++ b/libgupnp/gupnp-acl.h
@@ -68,22 +68,22 @@ typedef struct _GUPnPAcl GUPnPAcl;
 typedef struct _GUPnPAclInterface GUPnPAclInterface;
 
 /* Forward declarations to avoid recursive includes */
-typedef struct _GUPnPDevice GUPnPDevice;
-typedef struct _GUPnPService GUPnPService;
+struct _GUPnPDevice;
+struct _GUPnPService;
 
 struct _GUPnPAclInterface {
     GTypeInterface parent;
 
     gboolean (*is_allowed) (GUPnPAcl     *self,
-                            GUPnPDevice  *device,
-                            GUPnPService *service,
+                            struct _GUPnPDevice  *device,
+                            struct _GUPnPService *service,
                             const char   *path,
                             const char   *address,
                             const char   *agent);
 
     void     (*is_allowed_async) (GUPnPAcl           *self,
-                                  GUPnPDevice        *device,
-                                  GUPnPService       *service,
+                                  struct _GUPnPDevice        *device,
+                                  struct _GUPnPService       *service,
                                   const char         *path,
                                   const char         *address,
                                   const char         *agent,
@@ -108,16 +108,16 @@ struct _GUPnPAclInterface {
 
 gboolean
 gupnp_acl_is_allowed (GUPnPAcl     *self,
-                      GUPnPDevice  *device,
-                      GUPnPService *service,
+                      struct _GUPnPDevice  *device,
+                      struct _GUPnPService *service,
                       const char   *path,
                       const char   *address,
                       const char   *agent);
 
 void
 gupnp_acl_is_allowed_async (GUPnPAcl           *self,
-                            GUPnPDevice        *device,
-                            GUPnPService       *service,
+                            struct _GUPnPDevice        *device,
+                            struct _GUPnPService       *service,
                             const char         *path,
                             const char         *address,
                             const char         *agent,
diff --git a/libgupnp/gupnp-context.c b/libgupnp/gupnp-context.c
index b942369..795d8d9 100644
--- a/libgupnp/gupnp-context.c
+++ b/libgupnp/gupnp-context.c
@@ -59,6 +59,7 @@
 #include "gupnp-marshal.h"
 #include "gena-protocol.h"
 #include "http-headers.h"
+#include "gupnp-device.h"
 
 #define GUPNP_CONTEXT_DEFAULT_LANGUAGE "en"