diff --git a/libresapi/src/api/ApiServer.cpp b/libresapi/src/api/ApiServer.cpp
index 327dd6260..d4e1c9fe5 100644
--- a/libresapi/src/api/ApiServer.cpp
+++ b/libresapi/src/api/ApiServer.cpp
@@ -377,8 +377,8 @@ std::string ApiServer::handleRequest(Request &request)
     if(data.isRawData())
         return data.getRawData();
 
-	if(!resp.mCallbackName.empty())
-		    outstream << resource_api::makeKeyValueReference("callback_name", resp.mCallbackName);
+    if(!resp.mCallbackName.empty())
+        outstream << resource_api::makeKeyValueReference("callback_name", resp.mCallbackName);
 
     outstream << resource_api::makeKeyValue("debug_msg", debugString.str());
     outstream << resource_api::makeKeyValueReference("returncode", returncode);
diff --git a/libresapi/src/api/IdentityHandler.cpp b/libresapi/src/api/IdentityHandler.cpp
index be2e28622..8e2f5eee3 100644
--- a/libresapi/src/api/IdentityHandler.cpp
+++ b/libresapi/src/api/IdentityHandler.cpp
@@ -106,7 +106,7 @@ public:
 	{}
 
 protected:
-	virtual void gxsDoWork(Request &req, Response &resp)
+	virtual void gxsDoWork(Request &req, Response & /* resp */)
 	{
 		RsGxsIdGroup group;
 		std::string gxs_id;
@@ -545,7 +545,7 @@ ResponseTask* IdentityHandler::handleCreateIdentity(Request & /* req */, Respons
     return new CreateIdentityTask(mRsIdentity);
 }
 
-ResponseTask* IdentityHandler::handleDeleteIdentity(Request& req, Response& resp)
+ResponseTask* IdentityHandler::handleDeleteIdentity(Request& /* req */, Response& /* resp */)
 {
 	return new DeleteIdentityTask(mRsIdentity);
 }
diff --git a/libretroshare/src/chat/rschatitems.cc b/libretroshare/src/chat/rschatitems.cc
index 2b7dd67d8..dc46b759f 100644
--- a/libretroshare/src/chat/rschatitems.cc
+++ b/libretroshare/src/chat/rschatitems.cc
@@ -39,8 +39,8 @@ static const uint32_t RS_CHAT_SERIALIZER_FLAGS_NO_SIGNATURE = 0x0001;
 
 RsItem *RsChatSerialiser::create_item(uint16_t service_id,uint8_t item_sub_id) const
 {
-    if(service_id != RS_SERVICE_TYPE_CHAT)
-        return NULL ;
+	if (service_id != RS_SERVICE_TYPE_CHAT)
+		return NULL;
 
 	switch(item_sub_id)
 	{
@@ -97,12 +97,12 @@ void RsChatLobbyMsgItem::serial_process(RsGenericSerializer::SerializeJob j,RsGe
     RsChatLobbyBouncingObject::serial_process(j,ctx) ;
 }
 
-void RsChatLobbyListRequestItem::serial_process(RsGenericSerializer::SerializeJob j,RsGenericSerializer::SerializeContext& ctx)
+void RsChatLobbyListRequestItem::serial_process(RsGenericSerializer::SerializeJob /*j*/,RsGenericSerializer::SerializeContext& /*ctx*/)
 {
     // nothing to do. This is an empty item.
 }
 
-template<> void RsTypeSerializer::serial_process(RsGenericSerializer::SerializeJob j,RsGenericSerializer::SerializeContext& ctx,VisibleChatLobbyInfo& info,const std::string& name)
+template<> void RsTypeSerializer::serial_process(RsGenericSerializer::SerializeJob j,RsGenericSerializer::SerializeContext& ctx,VisibleChatLobbyInfo& info,const std::string& /*name*/)
 {
 	RsTypeSerializer::serial_process<uint64_t>(j,ctx,info.id,"info.id") ;
 
diff --git a/libretroshare/src/chat/rschatitems.h b/libretroshare/src/chat/rschatitems.h
index ddc0a2b86..ab511aab8 100644
--- a/libretroshare/src/chat/rschatitems.h
+++ b/libretroshare/src/chat/rschatitems.h
@@ -93,7 +93,7 @@ class RsChatItem: public RsItem
 		}
 
 		virtual ~RsChatItem() {}
-        virtual std::ostream& print(std::ostream &out, uint16_t indent = 0) { return out; }	// derived from RsItem, but should be removed
+		virtual std::ostream& print(std::ostream &out, uint16_t /*indent*/ = 0) { return out; }	// derived from RsItem, but should be removed
 
         virtual void clear() {}
 };
diff --git a/libretroshare/src/pqi/authssl.cc b/libretroshare/src/pqi/authssl.cc
index ccc176908..30f724a7e 100644
--- a/libretroshare/src/pqi/authssl.cc
+++ b/libretroshare/src/pqi/authssl.cc
@@ -815,7 +815,7 @@ X509 *AuthSSLimpl::SignX509ReqWithGPG(X509_REQ *req, long /*days*/)
         const EVP_MD *type = EVP_sha1();
 
         EVP_MD_CTX *ctx = EVP_MD_CTX_create();
-        unsigned char *p,*buf_in=NULL;
+        unsigned char *buf_in=NULL;
         unsigned char *buf_hashout=NULL,*buf_sigout=NULL;
         int inl=0,hashoutl=0;
         int sigoutl=0;
@@ -854,6 +854,7 @@ X509 *AuthSSLimpl::SignX509ReqWithGPG(X509_REQ *req, long /*days*/)
 #if OPENSSL_VERSION_NUMBER < 0x10100000L
         inl=i2d(data,NULL);
         buf_in=(unsigned char *)OPENSSL_malloc((unsigned int)inl);
+        unsigned char *p=NULL;
 #else
         inl=i2d_re_X509_tbs(x509,&buf_in) ;	// this does the i2d over x509->cert_info
 #endif
@@ -977,9 +978,9 @@ bool AuthSSLimpl::AuthX509WithGPG(X509 *x509,uint32_t& diagnostic)
 	/* verify GPG signature */
 
 	/*** NOW The Manual signing bit (HACKED FROM asn1/a_sign.c) ***/
-	int (*i2d)(X509_CINF*, unsigned char**) = i2d_X509_CINF;
 
 #if OPENSSL_VERSION_NUMBER < 0x10100000L
+	int (*i2d)(X509_CINF*, unsigned char**) = i2d_X509_CINF;
 	ASN1_BIT_STRING *signature = x509->signature;
 	X509_CINF *data = x509->cert_info;
 #else
@@ -993,7 +994,7 @@ bool AuthSSLimpl::AuthX509WithGPG(X509 *x509,uint32_t& diagnostic)
 	const EVP_MD *type = EVP_sha1();
 
 	EVP_MD_CTX *ctx = EVP_MD_CTX_create();
-	unsigned char *p,*buf_in=NULL;
+	unsigned char *buf_in=NULL;
 	unsigned char *buf_hashout=NULL,*buf_sigout=NULL;
 	int inl=0,hashoutl=0;
 	int sigoutl=0;
@@ -1002,6 +1003,7 @@ bool AuthSSLimpl::AuthX509WithGPG(X509 *x509,uint32_t& diagnostic)
 #if OPENSSL_VERSION_NUMBER < 0x10100000L
 	inl=i2d(data,NULL);
 	buf_in=(unsigned char *)OPENSSL_malloc((unsigned int)inl);
+	unsigned char *p=NULL;
 #else
 	inl=i2d_re_X509_tbs(x509,&buf_in) ;	// this does the i2d over x509->cert_info
 #endif
@@ -1026,13 +1028,13 @@ bool AuthSSLimpl::AuthX509WithGPG(X509 *x509,uint32_t& diagnostic)
 		diagnostic = RS_SSL_HANDSHAKE_DIAGNOSTIC_MALLOC_ERROR ;
 		goto err;
 	}
-	p=buf_in;
 
 #ifdef AUTHSSL_DEBUG
 	std::cerr << "Buffers Allocated" << std::endl;
 #endif
 
 #if OPENSSL_VERSION_NUMBER < 0x10100000L
+	p=buf_in;
 	i2d(data,&p);
 #endif
 	/* data in buf_in, ready to be hashed */
diff --git a/libretroshare/src/rsitems/rsconfigitems.cc b/libretroshare/src/rsitems/rsconfigitems.cc
index 15a8dd624..f6296bd04 100644
--- a/libretroshare/src/rsitems/rsconfigitems.cc
+++ b/libretroshare/src/rsitems/rsconfigitems.cc
@@ -192,7 +192,7 @@ void RsPeerStunItem::serial_process(RsGenericSerializer::SerializeJob j,RsGeneri
     RsTypeSerializer::serial_process<RsTlvItem>(j,ctx,stunList,"stunList") ;
 }
 
-template<> uint32_t RsTypeSerializer::serial_size(const PeerBandwidthLimits& s)
+template<> uint32_t RsTypeSerializer::serial_size(const PeerBandwidthLimits& /*s*/)
 {
     return 4+4 ;
 }
@@ -213,7 +213,7 @@ template<> bool RsTypeSerializer::deserialize(const uint8_t data[], uint32_t siz
     return ok;
 }
 
-template<> void RsTypeSerializer::print_data(const std::string& n, const PeerBandwidthLimits& s)
+template<> void RsTypeSerializer::print_data(const std::string& /*n*/, const PeerBandwidthLimits& s)
 {
     std::cerr << "  [Peer BW limit] " << s.max_up_rate_kbs << " / " << s.max_dl_rate_kbs << std::endl;
 }
diff --git a/libretroshare/src/serialiser/rstypeserializer.cc b/libretroshare/src/serialiser/rstypeserializer.cc
index 054db45a4..33c3a90e9 100644
--- a/libretroshare/src/serialiser/rstypeserializer.cc
+++ b/libretroshare/src/serialiser/rstypeserializer.cc
@@ -193,7 +193,7 @@ template<> void RsTypeSerializer::print_data(const std::string& n, uint16_t type
 //                                       TlvInt with subtype                                       //
 //=================================================================================================//
 
-template<> uint32_t RsTypeSerializer::serial_size(uint16_t /* type_subtype */,const uint32_t& s)
+template<> uint32_t RsTypeSerializer::serial_size(uint16_t /* type_subtype */,const uint32_t& /*s*/)
 {
 	return GetTlvUInt32Size() ;
 }
diff --git a/libretroshare/src/serialiser/rstypeserializer.h b/libretroshare/src/serialiser/rstypeserializer.h
index 333f1a364..fe97ff210 100644
--- a/libretroshare/src/serialiser/rstypeserializer.h
+++ b/libretroshare/src/serialiser/rstypeserializer.h
@@ -333,7 +333,7 @@ class RsTypeSerializer
 		//=================================================================================================//
 
 		template<int N>
-		static void serial_process(RsGenericSerializer::SerializeJob j,RsGenericSerializer::SerializeContext& ctx,t_RsFlags32<N>& v,const std::string& member_name)
+		static void serial_process(RsGenericSerializer::SerializeJob j,RsGenericSerializer::SerializeContext& ctx,t_RsFlags32<N>& v,const std::string& /*member_name*/)
 		{
 			switch(j)
 			{
diff --git a/libretroshare/src/util/rsrecogn.cc b/libretroshare/src/util/rsrecogn.cc
index 8580c7780..a372b9b2d 100644
--- a/libretroshare/src/util/rsrecogn.cc
+++ b/libretroshare/src/util/rsrecogn.cc
@@ -552,8 +552,8 @@ RsGxsRecognTagItem *RsRecogn::extractTag(const std::string &encoded)
     std::vector<uint8_t> buffer = Radix64::decode(encoded);
     pktsize = buffer.size();
 
-    if(buffer.empty())
-        return NULL ;
+	if( buffer.empty() )
+		return NULL;
 
 	RsGxsRecognSerialiser serialiser;
     RsItem *item = serialiser.deserialise(buffer.data(), &pktsize);
diff --git a/retroshare-gui/src/gui/Identity/IdDialog.cpp b/retroshare-gui/src/gui/Identity/IdDialog.cpp
index 755dab9c9..9b1901104 100644
--- a/retroshare-gui/src/gui/Identity/IdDialog.cpp
+++ b/retroshare-gui/src/gui/Identity/IdDialog.cpp
@@ -2472,8 +2472,8 @@ void IdDialog::copyRetroshareLink()
 
     RsIdentityDetails details ;
 
-    if(! rsIdentity->getIdDetails(gxs_id,details))
-        return ;
+	if(! rsIdentity->getIdDetails(gxs_id,details))
+		return ;
 
 	if (!mIdQueue)
 		return;
diff --git a/retroshare-gui/src/gui/RetroShareLink.cpp b/retroshare-gui/src/gui/RetroShareLink.cpp
index 28a2d09c6..c3d2c0450 100644
--- a/retroshare-gui/src/gui/RetroShareLink.cpp
+++ b/retroshare-gui/src/gui/RetroShareLink.cpp
@@ -600,16 +600,16 @@ void RetroShareLink::check()
 			if(!checkPGPId(_GPGid)) _valid = false ;
 			break ;
 
-        case TYPE_IDENTITY:
-        	if(_name.isNull())
-                _valid = false ;
+		case TYPE_IDENTITY:
+			if(_name.isNull())
+				_valid = false ;
 
-            if(_radix_group_data.isNull())
-                _valid = false ;
+			if(_radix_group_data.isNull())
+				_valid = false ;
 
-            if(_hash.isNull())
-                _valid = false ;
-        	break ;
+			if(_hash.isNull())
+				_valid = false ;
+		break ;
 
 		case TYPE_PERSON:
 			if(_size != 0)
@@ -858,8 +858,8 @@ QString RetroShareLink::niceName() const
 	if (type() == TYPE_PERSON)
 		return PeerDefs::rsid(name().toUtf8().constData(), RsPgpId(hash().toStdString()));
 
-    if(type() == TYPE_IDENTITY)
-        return QObject::tr("Identity link (name=%1, ID=%2)").arg(_name).arg(_hash) ;
+	if(type() == TYPE_IDENTITY)
+		return QObject::tr("Identity link (name=%1, ID=%2)").arg(_name).arg(_hash) ;
 
 	if(type() == TYPE_PUBLIC_MSG) {
 		RsPeerDetails detail;
diff --git a/retroshare-gui/src/gui/gxsforums/CreateGxsForumMsg.cpp b/retroshare-gui/src/gui/gxsforums/CreateGxsForumMsg.cpp
index aaab89231..61ecf0fbd 100644
--- a/retroshare-gui/src/gui/gxsforums/CreateGxsForumMsg.cpp
+++ b/retroshare-gui/src/gui/gxsforums/CreateGxsForumMsg.cpp
@@ -278,10 +278,10 @@ void  CreateGxsForumMsg::loadFormInformation()
     uint32_t fl = IDCHOOSER_ID_REQUIRED ;
 
 	if( (mForumMeta.mSignFlags & GXS_SERV::FLAG_AUTHOR_AUTHENTICATION_GPG) || (mForumMeta.mSignFlags & GXS_SERV::FLAG_AUTHOR_AUTHENTICATION_GPG_KNOWN))
-        fl |=  IDCHOOSER_NON_ANONYMOUS ;
+		fl |= IDCHOOSER_NON_ANONYMOUS;
 
-    if(!mPosterId.isNull())
-        fl |= IDCHOOSER_NO_CREATE;
+	if(!mPosterId.isNull())
+		fl |= IDCHOOSER_NO_CREATE;
 
 	ui.idChooser->setFlags(fl) ;