3 files changed, 5 insertions, 8 deletions
diff --git a/protocols/Xfire/src/all_statusmsg.cpp b/protocols/Xfire/src/all_statusmsg.cpp
index f5910b2df5..42936c9df0 100644
--- a/protocols/Xfire/src/all_statusmsg.cpp
+++ b/protocols/Xfire/src/all_statusmsg.cpp
@@ -57,7 +57,7 @@ BOOL BackupStatusMsg() {
 	oltostatus = new vector < unsigned int > ;
 
 	//alle protokolle durchgehen und den status in den vector sichern
-	CallService(MS_PROTO_ENUMACCOUNTS, (WPARAM)&anz, (LPARAM)&temp);
+	Proto_EnumAccounts(&anz, &temp);
 	for (int i = 0; i < anz; i++)
 	{
 		statusid = CallProtoService(temp[i]->szModuleName, PS_GETSTATUS, 0, 0);
@@ -225,7 +225,7 @@ BOOL SetGameStatusMsg()
 		statusMsg = statusmsg;
 	}
 
-	CallService(MS_PROTO_ENUMACCOUNTS, (WPARAM)&anz, (LPARAM)&temp);
+	Proto_EnumAccounts(&anz, &temp);
 	for (int i = 0; i < anz; i++)
 	{
 		if (olstatus->at(i) != -1)
@@ -290,7 +290,7 @@ BOOL SetOldStatusMsg()
 	if (olstatusmsg == NULL)
 		return FALSE;
 
-	CallService(MS_PROTO_ENUMACCOUNTS, (WPARAM)&anz, (LPARAM)&temp);
+	Proto_EnumAccounts(&anz, &temp);
 	for (int i = 0; i < anz; i++)
 	{
 		if (olstatus->at(i) != -1)
diff --git a/protocols/Xfire/src/main.cpp b/protocols/Xfire/src/main.cpp
index 9a2e1f51f0..fd04b1f76e 100644
--- a/protocols/Xfire/src/main.cpp
+++ b/protocols/Xfire/src/main.cpp
@@ -1053,8 +1053,7 @@ extern "C" __declspec(dllexport) int  Load(void)
 	PROTOCOLDESCRIPTOR pd = { PROTOCOLDESCRIPTOR_V3_SIZE };
 	pd.szName = protocolname;
 	pd.type = PROTOTYPE_PROTOCOL;
-	CallService(MS_PROTO_REGISTERMODULE, 0, (LPARAM)&pd);
-
+	Proto_RegisterModule(&pd);
 
 	hLogEvent = CreateHookableEvent("XFireProtocol/Log");
 
@@ -1592,7 +1591,7 @@ MCONTACT CList_AddContact(XFireContact xfc, bool InList, bool SetOnline, int cla
 	// here we create a new one since no one is to be found
 	hContact = (MCONTACT)CallService(MS_DB_CONTACT_ADD, 0, 0);
 	if (hContact) {
-		CallService(MS_PROTO_ADDTOCONTACT, hContact, (LPARAM)protocolname);
+		Proto_AddToContact(hContact, protocolname);
 
 		if (InList)
 			db_unset(hContact, "CList", "NotOnList");
diff --git a/protocols/Xfire/src/stdafx.h b/protocols/Xfire/src/stdafx.h
index eb20af3e4d..f6cd6313c2 100644
--- a/protocols/Xfire/src/stdafx.h
+++ b/protocols/Xfire/src/stdafx.h
@@ -53,11 +53,9 @@
 #include <m_clui.h>
 #include <m_skin.h>
 #include <m_langpack.h>
-#include <m_protomod.h>
 #include <m_database.h>
 #include <m_system.h>
 #include <m_protocols.h>
-#include <m_protomod.h>
 #include <m_protosvc.h>
 #include <m_protoint.h>
 #include <m_userinfo.h>