diff --git a/mythtv/programs/mythbackend/upnpcdsvideo.cpp b/mythtv/programs/mythbackend/upnpcdsvideo.cpp
diff --git a/mythtv/programs/mythbackend/upnpcdsvideo.h b/mythtv/programs/mythbackend/upnpcdsvideo.h
@@ -1,18 +1,19 @@
 //////////////////////////////////////////////////////////////////////////////
-// Program Name: upnpcdstv.h
-//
-// Purpose - uPnp Content Directory Extension for Video
-//
+// Program Name: upnpcdsvideo.h
+//                                                                            
+// Purpose - UPnP Content Directory Extention for Videos
+//                                                                            
 // Created By  : David Blain                    Created On : Jan. 24, 2005
-// Modified By :                                Modified On:
-//
+// Modified By :                                Modified On:                  
+//                                                                            
 //////////////////////////////////////////////////////////////////////////////
 
 #ifndef UPnpCDSVIDEO_H_
 #define UPnpCDSVIDEO_H_
 
+#include "mainserver.h"
 #include "upnpcds.h"
-
+              
 typedef QMap<int, QString> IntMap;
 
 //////////////////////////////////////////////////////////////////////////////
@@ -31,16 +32,6 @@ class UPnpCDSVideo : public UPnpCDSExtension
 
     protected:
 
-        virtual UPnpCDSExtensionResults *ProcessItem( UPnpCDSRequest          *pRequest,
-                                                      UPnpCDSExtensionResults *pResults,
-                                                      QStringList             &idPath );
-
-        virtual void             CreateItems   ( UPnpCDSRequest          *pRequest,
-                                                 UPnpCDSExtensionResults *pResults,
-                                                 int                      nNodeIdx,
-                                                 const QString           &sKey,
-                                                 bool                     bAddRef );
-
         virtual bool             IsBrowseRequestForUs( UPnpCDSRequest *pRequest );
         virtual bool             IsSearchRequestForUs( UPnpCDSRequest *pRequest );
 
@@ -51,14 +42,13 @@ class UPnpCDSVideo : public UPnpCDSExtension
         virtual QString          GetTableName  ( QString sColumn );
         virtual QString          GetItemListSQL( QString sColumn = "");
 
-        virtual void             BuildItemQuery( MSqlQuery        &query,
+        virtual void             BuildItemQuery( MSqlQuery        &query, 
                                                  const QStringMap &mapParams );
 
-
         virtual void             AddItem( const UPnpCDSRequest    *pRequest, 
                                           const QString           &sObjectId,
                                           UPnpCDSExtensionResults *pResults,
-                                          bool                     bAddRef,
+                                          bool                     bAddRef, 
                                           MSqlQuery               &query );
 
     public:

diff --git a/mythtv/programs/mythbackend/upnpmedia.cpp b/mythtv/programs/mythbackend/upnpmedia.cpp
diff --git a/mythtv/programs/mythbackend/upnpmedia.h b/mythtv/programs/mythbackend/upnpmedia.h