4 files changed, 8 insertions, 10 deletions
diff --git a/plugins/Clist_nicer/src/Include/commonheaders.h b/plugins/Clist_nicer/src/Include/commonheaders.h
index 1ffcc2ac76..383ad487d8 100644
--- a/plugins/Clist_nicer/src/Include/commonheaders.h
+++ b/plugins/Clist_nicer/src/Include/commonheaders.h
@@ -84,6 +84,7 @@
 #include <m_fontservice.h>
 #include <m_metacontacts.h>
 #include <m_cln_skinedit.h>
+#include <m_xstatus.h>
 #include <m_extraicons.h>
 
 #include "extbackg.h"
diff --git a/plugins/Clist_nicer/src/clcitems.cpp b/plugins/Clist_nicer/src/clcitems.cpp
index 4099b03c08..160bc97112 100644
--- a/plugins/Clist_nicer/src/clcitems.cpp
+++ b/plugins/Clist_nicer/src/clcitems.cpp
@@ -31,7 +31,6 @@
  */
 
 #include <commonheaders.h>
-#include <m_icq.h>
 
 extern int ( *saveAddContactToGroup )(struct ClcData *dat, ClcGroup *group, HANDLE hContact);
 extern int ( *saveAddInfoItemToGroup )(ClcGroup *group, int flags, const TCHAR *pszText);
@@ -301,10 +300,10 @@ BYTE GetCachedStatusMsg(int iExtraCacheEntry, char *szProto)
 			TCHAR xStatusName[128];
 			char szServiceName[128];
 
-			mir_snprintf(szServiceName, 128, "%s%s", szProto, PS_ICQ_GETCUSTOMSTATUSEX);
+			mir_snprintf(szServiceName, 128, "%s%s", szProto, PS_GETCUSTOMSTATUSEX);
 
-			ICQ_CUSTOM_STATUS cst = {0};
-			cst.cbSize = sizeof(ICQ_CUSTOM_STATUS);
+			CUSTOM_STATUS cst = {0};
+			cst.cbSize = sizeof(CUSTOM_STATUS);
 			cst.flags = CSSF_MASK_STATUS;
 			cst.status = &xStatus;
 			if (ServiceExists(szServiceName) && !CallService(szServiceName, (WPARAM)hContact, (LPARAM)&cst) && xStatus > 0) {
diff --git a/plugins/Clist_nicer/src/clui.cpp b/plugins/Clist_nicer/src/clui.cpp
index d39e996e73..c283da5058 100644
--- a/plugins/Clist_nicer/src/clui.cpp
+++ b/plugins/Clist_nicer/src/clui.cpp
@@ -32,7 +32,6 @@
 
 #include <commonheaders.h>
 #include <m_findadd.h>
-#include <m_icq.h>
 #include "../cluiframes/cluiframes.h"
 #include "../coolsb/coolscroll.h"
 
@@ -1787,16 +1786,16 @@ buttons_done:
 						mir_snprintf(szBuffer, 128, "%s_conn", pd->RealName);
 						hIcon = Skin_GetIcon(szBuffer);
 					} else if (cfg::dat.bShowXStatusOnSbar && status > ID_STATUS_OFFLINE) {
-						ICQ_CUSTOM_STATUS cst = {0};
+						CUSTOM_STATUS cst = {0};
 						char szServiceName[128];
 						int xStatus;
 
-						mir_snprintf(szServiceName, 128, "%s%s", pd->RealName, PS_ICQ_GETCUSTOMSTATUSEX);
-						cst.cbSize = sizeof(ICQ_CUSTOM_STATUS);
+						mir_snprintf(szServiceName, 128, "%s%s", pd->RealName, PS_GETCUSTOMSTATUSEX);
+						cst.cbSize = sizeof(CUSTOM_STATUS);
 						cst.flags = CSSF_MASK_STATUS;
 						cst.status = &xStatus;
 						if (ServiceExists(szServiceName) && !CallService(szServiceName, 0, (LPARAM)&cst) && xStatus > 0) {
-							hIcon = (HICON)CallProtoService(pd->RealName, PS_ICQ_GETCUSTOMSTATUSICON, 0, LR_SHARED);	// get OWN xStatus icon (if set)
+							hIcon = (HICON)CallProtoService(pd->RealName, PS_GETCUSTOMSTATUSICON, 0, LR_SHARED);	// get OWN xStatus icon (if set)
 						} else
 							hIcon = LoadSkinnedProtoIcon(szProto, status);
 					} else
diff --git a/plugins/Clist_nicer/src/cluiservices.cpp b/plugins/Clist_nicer/src/cluiservices.cpp
index 6bba347513..2d8c2e0db8 100644
--- a/plugins/Clist_nicer/src/cluiservices.cpp
+++ b/plugins/Clist_nicer/src/cluiservices.cpp
@@ -25,7 +25,6 @@ UNICODE done
 */
 #include <commonheaders.h>
 #include "../cluiframes/cluiframes.h"
-#include <m_icq.h>
 
 extern HIMAGELIST hCListImages;
 extern ButtonItem *g_ButtonItems;