diff --git a/code/nel/tools/pacs/build_rbank/build_surf.cpp b/code/nel/tools/pacs/build_rbank/build_surf.cpp
index 7e873f15f..465f5f94f 100644
--- a/code/nel/tools/pacs/build_rbank/build_surf.cpp
+++ b/code/nel/tools/pacs/build_rbank/build_surf.cpp
@@ -671,7 +671,7 @@ bool	NLPACS::CComputableSurface::checkConsistency()
 		CComputableSurfaceBorder&	border = (*BorderKeeper)[BorderIds[i]];
 		
 		for (j=0; j+1<border.Vertices.size(); ++j)
-			edges.push_back(std::make_pair<NLMISC::CVectorD, NLMISC::CVectorD>(border.Vertices[j], border.Vertices[j+1]));
+			edges.push_back(std::make_pair(border.Vertices[j], border.Vertices[j+1]));
 	}
 
 	for (i=0; i+1<edges.size(); ++i)
diff --git a/code/ryzom/server/src/ags_test/command_event_manager.h b/code/ryzom/server/src/ags_test/command_event_manager.h
index 06d97c726..d66361e9f 100644
--- a/code/ryzom/server/src/ags_test/command_event_manager.h
+++ b/code/ryzom/server/src/ags_test/command_event_manager.h
@@ -70,7 +70,7 @@ public:
 		/// Set the value of a var
 		const std::string	&set(const std::string &var, const std::string &value)
 		{
-			std::pair<TVarMap::iterator, bool>	res = _Map.insert(std::make_pair<std::string, std::string>(var, value));
+			std::pair<TVarMap::iterator, bool>	res = _Map.insert(std::make_pair(var, value));
 			if (!res.second)
 				(*(res.first)).second = value;
 			return (*(res.first)).second;
diff --git a/code/ryzom/server/src/ags_test/move_manager.h b/code/ryzom/server/src/ags_test/move_manager.h
index 9987b0169..ab78cecd4 100644
--- a/code/ryzom/server/src/ags_test/move_manager.h
+++ b/code/ryzom/server/src/ags_test/move_manager.h
@@ -95,7 +95,7 @@ public:
 	{
 		if (PrimZoneMap.find(primZone.getName()) == PrimZoneMap.end())
 		{
-			PrimZoneMap.insert(std::make_pair<std::string, NLLIGO::CPrimZone>(primZone.getName(), primZone));
+			PrimZoneMap.insert(std::make_pair(primZone.getName(), primZone));
 			nlinfo("Using PrimZone '%s'", primZone.getName().c_str());
 		}
 		else
diff --git a/code/ryzom/server/src/entity_view_service/entity_view_service.h b/code/ryzom/server/src/entity_view_service/entity_view_service.h
index 2b7e47ca1..5656d86eb 100644
--- a/code/ryzom/server/src/entity_view_service/entity_view_service.h
+++ b/code/ryzom/server/src/entity_view_service/entity_view_service.h
@@ -179,7 +179,7 @@ public:
 	{
 		nlinfo("Create entity %s", id.toString().c_str());
 
-		std::pair<TEntityMap::iterator,bool>	res = _Entities.insert(std::make_pair<NLMISC::CEntityId,CEntity>(id, CEntity()));
+		std::pair<TEntityMap::iterator,bool>	res = _Entities.insert(std::make_pair(id, CEntity()));
 		TEntityMap::iterator	ite = res.first;
 		nlassert(ite != _Entities.end() && res.second);
 
diff --git a/code/ryzom/tools/pd_parser/parser.cpp b/code/ryzom/tools/pd_parser/parser.cpp
index e1c564c33..d4ae04508 100644
--- a/code/ryzom/tools/pd_parser/parser.cpp
+++ b/code/ryzom/tools/pd_parser/parser.cpp
@@ -4512,11 +4512,11 @@ void	CDeclarationNode::generateSetContent(CCallContext *context)
 	if (useReference)
 	{
 		FetchId.add(Type+"*\t"+objectVariable+" = static_cast<"+Type+"*>("+pdslibFunc("create")+"(tableIndex));");
-		FetchId.add(cppName()+".insert(std::make_pair<"+keyType->getName()+","+Type+"*>("+keyVariable+", "+objectVariable+"));");
+		FetchId.add(cppName()+".insert(std::make_pair("+keyVariable+", "+objectVariable+"));");
 	}
 	else
 	{
-		FetchId.add(cppName()+".insert(std::make_pair<"+keyType->getName()+","+Type+">("+keyVariable+", "+Type+"()));");
+		FetchId.add(cppName()+".insert(std::make_pair("+keyVariable+", "+Type+"()));");
 		FetchId.add(Type+"*\t"+objectVariable+" = &("+cppName()+"["+keyVariable+"]);");
 	}
 	FetchId.add(pdslibFunc("setRowIndex")+"(rowIndex, "+objectVariable+");");
diff --git a/code/ryzom/tools/pd_parser/parser_rules.h b/code/ryzom/tools/pd_parser/parser_rules.h
index 9fbc28899..01d7310e6 100644
--- a/code/ryzom/tools/pd_parser/parser_rules.h
+++ b/code/ryzom/tools/pd_parser/parser_rules.h
@@ -161,7 +161,7 @@ CParseNode	*parse##nodename(CTokenizer &tokenizer)	\
 			PARSE_FAIL	\
 		CTokenizer::CToken	t2 = tokenizer.currentToken();	\
 		tokenizer.next();	\
-		main->savein.push_back(std::make_pair<std::string, std::string>(tokenizer.get(t1), tokenizer.get(t2)));	\
+		main->savein.push_back(std::make_pair(tokenizer.get(t1), tokenizer.get(t2)));	\
 	}
 
 /*