Index: runtime/kioslave/network/network/builder/simpleitemfactory.cpp
===================================================================
--- runtime/kioslave/network/network/builder/simpleitemfactory.cpp	(revision 1079847)
+++ runtime/kioslave/network/network/builder/simpleitemfactory.cpp	(revision 1079848)
@@ -24,8 +24,8 @@
 
 // lib
 #include "netservice_p.h"
-#include "upnp/service.h"
-#include "upnp/device.h"
+#include "service.h"
+#include "device.h"
 // KDE
 #include <KUrl>
 
Index: runtime/kioslave/network/network/builder/upnp/upnpnetworkbuilder.cpp
===================================================================
--- runtime/kioslave/network/network/builder/upnp/upnpnetworkbuilder.cpp	(revision 1079847)
+++ runtime/kioslave/network/network/builder/upnp/upnpnetworkbuilder.cpp	(revision 1079848)
@@ -29,8 +29,8 @@
 #include "netdevice_p.h"
 #include "netservice_p.h"
 // KUPnP
-#include <upnp/devicebrowser.h>
-#include <upnp/device.h>
+#include <devicebrowser.h>
+#include <device.h>
 // Qt
 #include <QtCore/QStringList>
 
Index: runtime/kioslave/network/CMakeLists.txt
===================================================================
--- runtime/kioslave/network/CMakeLists.txt	(revision 1079847)
+++ runtime/kioslave/network/CMakeLists.txt	(revision 1079848)
@@ -1,8 +1,6 @@
-macro_optional_find_package(Upnp)
-if(FOUND_UPNP)
- add_subdirectory( network )
- add_subdirectory( ioslave )
- add_subdirectory( kded )
- add_subdirectory( mimetypes )
- add_subdirectory( kupnp )
-endif(FOUND_UPNP) 
+include_directories(${CMAKE_SOURCE_DIR}/network/kupnp/lib/)
+add_subdirectory( network )
+add_subdirectory( ioslave )
+add_subdirectory( kded )
+add_subdirectory( mimetypes )
+add_subdirectory( kupnp )