diff --git a/libretroshare/src/upnp/UPnPBase.cpp b/libretroshare/src/upnp/UPnPBase.cpp
index 05f7a25fb..484fe0f8f 100644
--- a/libretroshare/src/upnp/UPnPBase.cpp
+++ b/libretroshare/src/upnp/UPnPBase.cpp
@@ -28,6 +28,7 @@
 
 #include "UPnPBase.h"
 #include <stdio.h>
+#include <string.h>
 
 #include <algorithm>		// For transform()
 
diff --git a/libretroshare/src/upnp/UPnPBase.h b/libretroshare/src/upnp/UPnPBase.h
index 5d82a916b..799933115 100644
--- a/libretroshare/src/upnp/UPnPBase.h
+++ b/libretroshare/src/upnp/UPnPBase.h
@@ -29,6 +29,7 @@
 #include <sstream>
 #include <memory>
 #include <vector>
+#include <string.h>
 
 #include <upnp/upnp.h>
 #include <upnp/upnptools.h>
diff --git a/retroshare-gui/src/gui/common/GroupTreeWidget.cpp b/retroshare-gui/src/gui/common/GroupTreeWidget.cpp
index 7b64c4855..e6d1ba2da 100644
--- a/retroshare-gui/src/gui/common/GroupTreeWidget.cpp
+++ b/retroshare-gui/src/gui/common/GroupTreeWidget.cpp
@@ -361,6 +361,7 @@ QTreeWidgetItem *GroupTreeWidget::getItemFromId(const QString &id)
 			return item;
 		}
 	}
+	return NULL ;
 }
 
 QTreeWidgetItem *GroupTreeWidget::activateId(const QString &id, bool focus)