diff --git a/src/mysqlbackend.cpp b/src/mysqlbackend.cpp
index 67aa6508e3b904045ee3f726aeb97543cff025b4..f0769368e1cb887385074e38c91a1a3dc92d4d43 100644
--- a/src/mysqlbackend.cpp
+++ b/src/mysqlbackend.cpp
@@ -421,7 +421,7 @@ bool MySQLBackend::exec(const std::string &query) {
 void MySQLBackend::setUser(const UserInfo &user) {
 	std::string encrypted = user.password;
 	if (!CONFIG_STRING(m_config, "database.encryption_key").empty()) {
-		encrypted = Util::encryptPassword(encrypted, CONFIG_STRING(m_config, "database.encryption_key"));
+		encrypted = StorageBackend::encryptPassword(encrypted, CONFIG_STRING(m_config, "database.encryption_key"));
 	}
 	*m_setUser << user.jid << user.uin << encrypted << user.language << user.encoding << user.vip << user.uin << encrypted;
 	EXEC(m_setUser, setUser(user));
@@ -439,7 +439,7 @@ bool MySQLBackend::getUser(const std::string &barejid, UserInfo &user) {
 		*m_getUser >> user.id >> user.jid >> user.uin >> user.password >> user.encoding >> user.language >> user.vip;
 
 		if (!CONFIG_STRING(m_config, "database.encryption_key").empty()) {
-			user.password = Util::decryptPassword(user.password, CONFIG_STRING(m_config, "database.encryption_key"));
+			user.password = StorageBackend::decryptPassword(user.password, CONFIG_STRING(m_config, "database.encryption_key"));
 		}
 	}
 
@@ -467,7 +467,7 @@ bool MySQLBackend::getOnlineUsers(std::vector<std::string> &users) {
 
 long MySQLBackend::addBuddy(long userId, const BuddyInfo &buddyInfo) {
 // 	"INSERT INTO " + m_prefix + "buddies (user_id, uin, subscription, groups, nickname, flags) VALUES (?, ?, ?, ?, ?, ?)"
-	std::string groups = Util::serializeGroups(buddyInfo.groups);
+	std::string groups = StorageBackend::serializeGroups(buddyInfo.groups);
 	*m_addBuddy << userId << buddyInfo.legacyName << buddyInfo.subscription;
 	*m_addBuddy << groups;
 	*m_addBuddy << buddyInfo.alias << buddyInfo.flags;
@@ -517,7 +517,7 @@ void MySQLBackend::removeBuddy(long id) {
 
 void MySQLBackend::updateBuddy(long userId, const BuddyInfo &buddyInfo) {
 // 	"UPDATE " + m_prefix + "buddies SET groups=?, nickname=?, flags=?, subscription=? WHERE user_id=? AND uin=?"
-	std::string groups = Util::serializeGroups(buddyInfo.groups);
+	std::string groups = StorageBackend::serializeGroups(buddyInfo.groups);
 	*m_updateBuddy << groups;
 	*m_updateBuddy << buddyInfo.alias << buddyInfo.flags << buddyInfo.subscription;
 	*m_updateBuddy << userId << buddyInfo.legacyName;
@@ -547,7 +547,7 @@ bool MySQLBackend::getBuddies(long id, std::list<BuddyInfo> &roster) {
 		*m_getBuddies >> b.id >> b.legacyName >> b.subscription >> b.alias >> group >> b.flags;
 
 		if (!group.empty()) {
-			b.groups = Util::deserializeGroups(group);
+			b.groups = StorageBackend::deserializeGroups(group);
 		}
 
 		roster.push_back(b);