5 files changed, 2 insertions, 5 deletions
diff --git a/protocols/Yahoo/src/main.cpp b/protocols/Yahoo/src/main.cpp
index 74d61a4fbc..ea336f0fd9 100644
--- a/protocols/Yahoo/src/main.cpp
+++ b/protocols/Yahoo/src/main.cpp
@@ -105,7 +105,7 @@ extern "C" int __declspec(dllexport)Load(void)
 	pd.type = PROTOTYPE_PROTOCOL;
 	pd.fnInit = (pfnInitProto)yahooProtoInit;
 	pd.fnUninit = (pfnUninitProto)yahooProtoUninit;
-	CallService(MS_PROTO_REGISTERMODULE, 0, (LPARAM)&pd);
+	Proto_RegisterModule(&pd);
 
 	NETLIBUSER nlu = { 0 };
 	nlu.cbSize = sizeof(nlu);
diff --git a/protocols/Yahoo/src/services.cpp b/protocols/Yahoo/src/services.cpp
index d77b172cd6..5900aea998 100644
--- a/protocols/Yahoo/src/services.cpp
+++ b/protocols/Yahoo/src/services.cpp
@@ -13,7 +13,6 @@
 
 #include "yahoo.h"
 
-#include <m_protomod.h>
 #include <m_protosvc.h>
 #include <m_langpack.h>
 #include <m_skin.h>
diff --git a/protocols/Yahoo/src/util.cpp b/protocols/Yahoo/src/util.cpp
index 030599d82a..098eae59e7 100644
--- a/protocols/Yahoo/src/util.cpp
+++ b/protocols/Yahoo/src/util.cpp
@@ -13,7 +13,6 @@
 #include "yahoo.h"
 #include <windowsx.h>
 #include <m_popup.h>
-#include <m_protomod.h>
 #include <m_protosvc.h>
 #include <m_langpack.h>
 #include <m_skin.h>
diff --git a/protocols/Yahoo/src/yahoo.cpp b/protocols/Yahoo/src/yahoo.cpp
index 394e979589..7e98c01909 100644
--- a/protocols/Yahoo/src/yahoo.cpp
+++ b/protocols/Yahoo/src/yahoo.cpp
@@ -262,7 +262,7 @@ MCONTACT CYahooProto::add_buddy(const char *yahoo_id, const char *yahoo_name, in
 	//not already there: add
 	LOG(("[add_buddy] Adding buddy id: %s (Nick: %s), flags: %lu", yid, yahoo_name, flags));
 	hContact = (MCONTACT)CallService(MS_DB_CONTACT_ADD, 0, 0);
-	CallService(MS_PROTO_ADDTOCONTACT, hContact, (LPARAM)m_szModuleName);
+	Proto_AddToContact(hContact, m_szModuleName);
 	setString(hContact, YAHOO_LOGINID, yid);
 	Set_Protocol(hContact, protocol);
 
diff --git a/protocols/Yahoo/src/yahoo.h b/protocols/Yahoo/src/yahoo.h
index 97c38e77ae..d90d1abcb7 100644
--- a/protocols/Yahoo/src/yahoo.h
+++ b/protocols/Yahoo/src/yahoo.h
@@ -35,7 +35,6 @@
 
 #include <m_system_cpp.h>
 #include <m_database.h>
-#include <m_protomod.h>
 #include <m_netlib.h>
 #include <m_idle.h>
 #include <m_clist.h>