diff --git a/libretroshare/src/rs_upnp/upnp18_retrocompat.h b/libretroshare/src/rs_upnp/upnp18_retrocompat.h index 5b0aad2cd..18bd8a274 100644 --- a/libretroshare/src/rs_upnp/upnp18_retrocompat.h +++ b/libretroshare/src/rs_upnp/upnp18_retrocompat.h @@ -19,7 +19,7 @@ *******************************************************************************/ #pragma once -#include "upnp/upnp.h" +#include #if UPNP_VERSION < 10800 diff --git a/libretroshare/src/rs_upnp/upnphandler_miniupnp.cc b/libretroshare/src/rs_upnp/upnphandler_miniupnp.cc index 316e23748..97b972cf1 100644 --- a/libretroshare/src/rs_upnp/upnphandler_miniupnp.cc +++ b/libretroshare/src/rs_upnp/upnphandler_miniupnp.cc @@ -31,8 +31,8 @@ extern "C" { #endif /* This stuff is actually C */ -#include "upnp/upnphandler_miniupnp.h" -#include "upnp/upnputil.h" +#include "rs_upnp/upnphandler_miniupnp.h" +#include "rs_upnp/upnputil.h" class uPnPConfigData { diff --git a/libretroshare/src/rs_upnp/upnptest.cc b/libretroshare/src/rs_upnp/upnptest.cc index c6f55e787..80d98e4e5 100644 --- a/libretroshare/src/rs_upnp/upnptest.cc +++ b/libretroshare/src/rs_upnp/upnptest.cc @@ -1,6 +1,6 @@ //this file use miniupnp -#include "upnp/upnphandler.h" +#include int main(int argc, char **argv) diff --git a/libretroshare/src/rs_upnp/upnputil.c b/libretroshare/src/rs_upnp/upnputil.c index 0ee6bec42..28b0c4de6 100644 --- a/libretroshare/src/rs_upnp/upnputil.c +++ b/libretroshare/src/rs_upnp/upnputil.c @@ -23,7 +23,7 @@ //this file uses miniupnp //From https://github.com/miniupnp/miniupnp/blob/master/miniupnpc/upnpc.c -#include "upnp/upnputil.h" +#include "rs_upnp/upnputil.h" #if MINIUPNPC_API_VERSION >= -4//1.0 2008/02/18 #include "util/rstime.h" diff --git a/libretroshare/src/rsserver/p3face-info.cc b/libretroshare/src/rsserver/p3face-info.cc index a6b9ff17f..18fdc40aa 100644 --- a/libretroshare/src/rsserver/p3face-info.cc +++ b/libretroshare/src/rsserver/p3face-info.cc @@ -32,9 +32,9 @@ #endif #ifdef RS_USE_LIBUPNP -# include "upnp/upnpconfig.h" +# include #elif defined(RS_USE_LIBMINIUPNPC) -# include "miniupnpc/miniupnpc.h" +# include #endif // def RS_USE_LIBUPNP std::string RsServer::getSQLCipherVersion()