diff -r 04cd5e61dca3 -r f9e14ee50af6 gmyth-upnp/src/gmyth_upnp.h
--- a/gmyth-upnp/src/gmyth_upnp.h	Mon Feb 25 14:12:27 2008 +0000
+++ b/gmyth-upnp/src/gmyth_upnp.h	Fri Mar 14 13:14:54 2008 +0000
@@ -32,40 +32,16 @@
 #include <glib.h>
 #include <glib-object.h>
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
+G_BEGIN_DECLS
+#define GMYTH_UPNP_TYPE                 (gmyth_upnp_get_type ())
+#define GMYTH_UPNP(obj)                 (G_TYPE_CHECK_INSTANCE_CAST ((obj), GMYTH_UPNP_TYPE, GMythUPnP))
+#define GMYTH_UPNP_CLASS(klass)         (G_TYPE_CHECK_CLASS_CAST ((klass), GMYTH_UPNP_TYPE, GMythUPnPClass))
+#define IS_GMYTH_UPNP(obj)              (G_TYPE_CHECK_INSTANCE_CAST ((obj), GMYTH_UPNP_TYPE))
+#define IS_GMYTH_UPNP_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), GMYTH_UPNP_TYPE))
+#define GMYTH_UPNP_GET_CLASS(obj)       (G_TYPE_INSTANCE_GET_CLASS ((obj), GMYTH_UPNP_TYPE, GMythUPnPClass))
 
-#include <gmyth/gmyth_backendinfo.h>
-
-G_BEGIN_DECLS
-#define GMYTH_UPNP_TYPE               (gmyth_upnp_get_type ())
-#define GMYTH_UPNP(obj)          		 	(G_TYPE_CHECK_INSTANCE_CAST ((obj), GMYTH_UPNP_TYPE, GMythUPnP))
-#define GMYTH_UPNP_CLASS(klass)       (G_TYPE_CHECK_CLASS_CAST ((klass), GMYTH_UPNP_TYPE, GMythUPnPClass))
-#define IS_GMYTH_UPNP(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GMYTH_UPNP_TYPE))
-#define IS_GMYTH_UPNP_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GMYTH_UPNP_TYPE))
-#define GMYTH_UPNP_GET_CLASS(obj)     (G_TYPE_INSTANCE_GET_CLASS ((obj), GMYTH_UPNP_TYPE, GMythUPnPClass))
 typedef struct _GMythUPnP GMythUPnP;
 typedef struct _GMythUPnPClass GMythUPnPClass;
-typedef struct _GMythUPnPDevice GMythUPnPDevice;
-
-/****************************************
-* Data Type
-****************************************/
-
-typedef enum upnp_device_list_status {
-    GMYTH_UPNP_DEVICE_ADDED = 0,
-    GMYTH_UPNP_DEVICE_UPDATED,
-    GMYTH_UPNP_DEVICE_REMOVED
-} GMythUPnPDeviceStatus;
-
-struct _GMythUPnPDevice {
-    gchar  *uri;
-    gchar  *host;
-    gint   port;
-    gchar  *protocol;
-};
-
 
 struct _GMythUPnPClass {
     GObjectClass    parent_class;