10 files changed, 0 insertions, 60 deletions
diff --git a/src/lib/upnp/ClientInit.cxx b/src/lib/upnp/ClientInit.cxx
index 1ea66e04d..19046f397 100644
--- a/src/lib/upnp/ClientInit.cxx
+++ b/src/lib/upnp/ClientInit.cxx
@@ -21,7 +21,6 @@
 #include "ClientInit.hxx"
 #include "Init.hxx"
 #include "Callback.hxx"
-#include "Domain.hxx"
 #include "thread/Mutex.hxx"
 #include "util/RuntimeError.hxx"
 
diff --git a/src/lib/upnp/ContentDirectoryService.cxx b/src/lib/upnp/ContentDirectoryService.cxx
index 9aa9a915e..bd824c001 100644
--- a/src/lib/upnp/ContentDirectoryService.cxx
+++ b/src/lib/upnp/ContentDirectoryService.cxx
@@ -20,7 +20,6 @@
 #include "config.h"
 #include "ContentDirectoryService.hxx"
 #include "UniqueIxml.hxx"
-#include "Domain.hxx"
 #include "Device.hxx"
 #include "ixmlwrap.hxx"
 #include "Util.hxx"
diff --git a/src/lib/upnp/ContentDirectoryService.hxx b/src/lib/upnp/ContentDirectoryService.hxx
index 74b9c3b70..6b1cbbdd5 100644
--- a/src/lib/upnp/ContentDirectoryService.hxx
+++ b/src/lib/upnp/ContentDirectoryService.hxx
@@ -27,7 +27,6 @@
 #include <string>
 #include <list>
 
-class Error;
 class UPnPDevice;
 struct UPnPService;
 class UPnPDirContent;
diff --git a/src/lib/upnp/Device.cxx b/src/lib/upnp/Device.cxx
index 0ed579ab1..f44d0670a 100644
--- a/src/lib/upnp/Device.cxx
+++ b/src/lib/upnp/Device.cxx
@@ -22,8 +22,6 @@
 #include "Util.hxx"
 #include "lib/expat/ExpatParser.hxx"
 
-#include <stdlib.h>
-
 #include <string.h>
 
 UPnPDevice::~UPnPDevice()
diff --git a/src/lib/upnp/Discovery.cxx b/src/lib/upnp/Discovery.cxx
index 24ee2b8c4..139eb6f36 100644
--- a/src/lib/upnp/Discovery.cxx
+++ b/src/lib/upnp/Discovery.cxx
@@ -19,7 +19,6 @@
 
 #include "config.h"
 #include "Discovery.hxx"
-#include "Domain.hxx"
 #include "ContentDirectoryService.hxx"
 #include "system/Clock.hxx"
 #include "Log.hxx"
diff --git a/src/lib/upnp/Discovery.hxx b/src/lib/upnp/Discovery.hxx
index 13935cfd8..6069afec6 100644
--- a/src/lib/upnp/Discovery.hxx
+++ b/src/lib/upnp/Discovery.hxx
@@ -24,7 +24,6 @@
 #include "Device.hxx"
 #include "WorkQueue.hxx"
 #include "thread/Mutex.hxx"
-#include "util/Error.hxx"
 #include "Compiler.h"
 
 #include <upnp/upnp.h>
diff --git a/src/lib/upnp/Domain.cxx b/src/lib/upnp/Domain.cxx
deleted file mode 100644
index 1665c53d7..000000000
--- a/src/lib/upnp/Domain.cxx
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright 2003-2016 The Music Player Daemon Project
- * http://www.musicpd.org
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#include "Domain.hxx"
-#include "util/Domain.hxx"
-
-const Domain upnp_domain("upnp");
diff --git a/src/lib/upnp/Domain.hxx b/src/lib/upnp/Domain.hxx
deleted file mode 100644
index 4e28b1c73..000000000
--- a/src/lib/upnp/Domain.hxx
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright 2003-2016 The Music Player Daemon Project
- * http://www.musicpd.org
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#ifndef MPD_UPNP_DOMAIN_HXX
-#define MPD_UPNP_DOMAIN_HXX
-
-class Domain;
-
-extern const Domain upnp_domain;
-
-#endif
diff --git a/src/lib/upnp/Init.cxx b/src/lib/upnp/Init.cxx
index 6f492db6a..c4bd1b9b0 100644
--- a/src/lib/upnp/Init.cxx
+++ b/src/lib/upnp/Init.cxx
@@ -19,7 +19,6 @@
 
 #include "config.h"
 #include "Init.hxx"
-#include "Domain.hxx"
 #include "thread/Mutex.hxx"
 #include "util/RuntimeError.hxx"
 
diff --git a/src/lib/upnp/Util.cxx b/src/lib/upnp/Util.cxx
index 9d7217f73..1792d905c 100644
--- a/src/lib/upnp/Util.cxx
+++ b/src/lib/upnp/Util.cxx
@@ -19,8 +19,6 @@
 
 #include "Util.hxx"
 
-#include <upnp/ixml.h>
-
 #include <assert.h>
 
 /** Get rid of white space at both ends */