diff --git a/code/ryzom/client/src/login_patch.cpp b/code/ryzom/client/src/login_patch.cpp
index 908f12977..a21f7cab1 100644
--- a/code/ryzom/client/src/login_patch.cpp
+++ b/code/ryzom/client/src/login_patch.cpp
@@ -48,6 +48,7 @@
 #include "nel/misc/big_file.h"
 #include "nel/misc/i18n.h"
 #include "nel/misc/cmd_args.h"
+#include "nel/misc/seven_zip.h"
 
 #include "game_share/bg_downloader_msg.h"
 
@@ -55,7 +56,6 @@
 #include "login.h"
 #include "user_agent.h"
 
-#include "seven_zip/seven_zip.h"
 
 #ifndef RY_BG_DOWNLOADER
 	#include "client_cfg.h"
diff --git a/code/ryzom/common/src/game_share/bnp_patch.cpp b/code/ryzom/common/src/game_share/bnp_patch.cpp
index baac733e8..72c484c84 100644
--- a/code/ryzom/common/src/game_share/bnp_patch.cpp
+++ b/code/ryzom/common/src/game_share/bnp_patch.cpp
@@ -74,7 +74,7 @@ bool CBNPFileVersion::setup(const std::string &fileName, uint32 versionNumber)
 	BOMB_IF(!NLMISC::CFile::fileExists(fileName),("File not found: "+fileName).c_str(),return false);
 
 	// generate a hash key for the file and store it in a vector of uint32
-	CHashKey hashKey= getSHA1(fileName);
+	NLMISC::CHashKey hashKey= NLMISC::getSHA1(fileName);
 	nlassert(hashKey.HashKeyString.size()==20);
 	_HashKey.clear();
 	for (uint32 i=0;i<5;++i)
@@ -137,10 +137,10 @@ uint32 CBNPFileVersion::getPatchSize() const
 	return _PatchSize;
 }
 
-CHashKey CBNPFileVersion::getHashKey() const
+NLMISC::CHashKey CBNPFileVersion::getHashKey() const
 {
 	nlassert(_HashKey.size()==5);
-	CHashKey hashKey;
+	NLMISC::CHashKey hashKey;
 	for (uint32 i=0;i<5;++i)
 	{
 		*(uint32*)&hashKey.HashKeyString[4*i]=_HashKey[i];
diff --git a/code/ryzom/common/src/game_share/bnp_patch.h b/code/ryzom/common/src/game_share/bnp_patch.h
index 395727bf0..b2d602194 100644
--- a/code/ryzom/common/src/game_share/bnp_patch.h
+++ b/code/ryzom/common/src/game_share/bnp_patch.h
@@ -72,7 +72,7 @@ public:
 	uint32 get7ZFileSize() const;
 	uint32 getFileSize() const;
 	uint32 getPatchSize() const;
-	CHashKey getHashKey() const;
+	NLMISC::CHashKey getHashKey() const;
 
 	// == operator
 	bool operator==(const CBNPFileVersion& other) const;