6 files changed, 6 insertions, 16 deletions
diff --git a/protocols/FacebookRM/src/main.cpp b/protocols/FacebookRM/src/main.cpp
index ce64e172c7..709d91cbd6 100644
--- a/protocols/FacebookRM/src/main.cpp
+++ b/protocols/FacebookRM/src/main.cpp
@@ -93,9 +93,7 @@ static HANDLE g_hEvents[1];
 extern "C" int __declspec(dllexport) Load(void)
 {
 	mir_getLP(&pluginInfo);
-
-	pcli = reinterpret_cast<CLIST_INTERFACE*>( CallService(
-	    MS_CLIST_RETRIEVE_INTERFACE,0,reinterpret_cast<LPARAM>(g_hInstance)));
+	mir_getCLI();
 
 	PROTOCOLDESCRIPTOR pd = { sizeof(pd) };
 	pd.szName = "Facebook";
diff --git a/protocols/Gadu-Gadu/src/gg.cpp b/protocols/Gadu-Gadu/src/gg.cpp
index 74ba0ef628..1fb4216fc4 100644
--- a/protocols/Gadu-Gadu/src/gg.cpp
+++ b/protocols/Gadu-Gadu/src/gg.cpp
@@ -355,8 +355,7 @@ extern "C" int __declspec(dllexport) Load(void)
 {
 	mir_getXI(&xi);
 	mir_getLP(&pluginInfo);
-
-	pcli = (CLIST_INTERFACE*)CallService(MS_CLIST_RETRIEVE_INTERFACE, 0, (LPARAM)hInstance);
+	mir_getCLI();
 
 	// Hook system events
 	hHookModulesLoaded = HookEvent(ME_SYSTEM_MODULESLOADED, gg_modulesloaded);
@@ -375,7 +374,6 @@ extern "C" int __declspec(dllexport) Load(void)
 
 	// Instance list
 	g_Instances = NULL;
-
 	return 0;
 }
 
diff --git a/protocols/IcqOscarJ/src/init.cpp b/protocols/IcqOscarJ/src/init.cpp
index b7ca1ce204..017025ea03 100644
--- a/protocols/IcqOscarJ/src/init.cpp
+++ b/protocols/IcqOscarJ/src/init.cpp
@@ -98,12 +98,11 @@ int ModuleLoad(WPARAM wParam, LPARAM lParam)
 extern "C" int __declspec(dllexport) Load(void)
 {
 	mir_getLP( &pluginInfo );
+	mir_getCLI();
 
 	srand(time(NULL));
 	_tzset();
 
-	pcli = (CLIST_INTERFACE*)CallService(MS_CLIST_RETRIEVE_INTERFACE, 0, (LPARAM)hInst);
-
 	// Register the module
 	PROTOCOLDESCRIPTOR pd = { sizeof(pd) };
 	pd.szName   = ICQ_PROTOCOL_NAME;
diff --git a/protocols/JabberG/src/jabber.cpp b/protocols/JabberG/src/jabber.cpp
index 6b486a53c8..43190cdfd7 100644
--- a/protocols/JabberG/src/jabber.cpp
+++ b/protocols/JabberG/src/jabber.cpp
@@ -228,6 +228,7 @@ extern "C" int __declspec(dllexport) Load()
 	mir_getXI(&xi);
 	mir_getTMI(&tmi);
 	mir_getLP(&pluginInfo);
+	mir_getCLI();
 
 	WORD v[4];
 	CallService(MS_SYSTEM_GETFILEVERSION, 0, (LPARAM)v);
@@ -237,8 +238,6 @@ extern "C" int __declspec(dllexport) Load()
 
 	setlocale(LC_ALL, "");
 
-	pcli = (CLIST_INTERFACE*)CallService(MS_CLIST_RETRIEVE_INTERFACE, 0, (LPARAM)hInst);
-
 	// Register protocol module
 	PROTOCOLDESCRIPTOR pd = { sizeof(pd) };
 	pd.szName = "JABBER";
diff --git a/protocols/Omegle/src/main.cpp b/protocols/Omegle/src/main.cpp
index 6c8d5e20ba..04d22d4711 100644
--- a/protocols/Omegle/src/main.cpp
+++ b/protocols/Omegle/src/main.cpp
@@ -91,11 +91,8 @@ static HANDLE g_hEvents[1];
 
 extern "C" int __declspec(dllexport) Load(void)
 {
-
 	mir_getLP(&pluginInfo);
-
-	pcli = reinterpret_cast<CLIST_INTERFACE*>( CallService(
-	    MS_CLIST_RETRIEVE_INTERFACE,0,reinterpret_cast<LPARAM>(g_hInstance)));
+	mir_getCLI();
 
 	PROTOCOLDESCRIPTOR pd = { sizeof(pd) };
 	pd.szName = "Omegle";
diff --git a/protocols/Twitter/src/main.cpp b/protocols/Twitter/src/main.cpp
index 5f84e69c7e..e2c023bada 100644
--- a/protocols/Twitter/src/main.cpp
+++ b/protocols/Twitter/src/main.cpp
@@ -88,8 +88,7 @@ static HANDLE g_hEvents[1];
 extern "C" int __declspec(dllexport) Load(void)
 {
 	mir_getLP(&pluginInfo);
-
-	pcli = reinterpret_cast<CLIST_INTERFACE*>( CallService(MS_CLIST_RETRIEVE_INTERFACE,0,reinterpret_cast<LPARAM>(g_hInstance)));
+	mir_getCLI();
 
 	PROTOCOLDESCRIPTOR pd = {sizeof(pd)};
 	pd.szName = "Twitter";