Switch to side-by-side view

--- a/upmpd/conman.hxx
+++ b/upmpd/conman.hxx
@@ -17,15 +17,17 @@
 #ifndef _CONMAN_H_X_INCLUDED_
 #define _CONMAN_H_X_INCLUDED_
 
-#include <string>
+#include <string>                       // for string
+#include <vector>                       // for vector
 
-#include "libupnpp/device/device.hxx"
+#include "libupnpp/device/device.hxx"   // for UpnpService
+#include "libupnpp/soaphelp.hxx"        // for SoapArgs, SoapData
+
+class UpMpd;
 
 using namespace UPnPP;
 
-class UpMpd;
-
-class UpMpdConMan : public UpnpService {
+class UpMpdConMan : public UPnPProvider::UpnpService {
 public:
     UpMpdConMan(UpMpd *dev);