3 files changed, 4 insertions, 14 deletions
diff --git a/include/delphi/m_clistint.inc b/include/delphi/m_clistint.inc
index 2568903f6c..f472cd2775 100644
--- a/include/delphi/m_clistint.inc
+++ b/include/delphi/m_clistint.inc
@@ -256,14 +256,6 @@ const
   TIM_CALLBACK     = WM_USER+1857;
   TIM_CREATE       = WM_USER+1858;
 
-const
-{
-  Miranda 0.4.3.0+
-  retrieves the pointer to a CLIST_INTERFACE structure
-  NOTE: valid only for the clist clone building, not for the regular use
-}
-  MS_CLIST_RETRIEVE_INTERFACE:PansiChar = 'CList/RetrieveInterface';
-
   {**************************************************************************
    * CLIST_INTERFACE structure definition
    ************************************************************************** }
@@ -525,6 +517,8 @@ type
     pfnSetContactCheckboxes:procedure(cc:PClcContact; checked:int); cdecl;
   end;
 
+function Clist_GetInterface : PCLIST_INTERFACE; stdcall; external AppDll;
+
 var
   cli : PCLIST_INTERFACE;
 
diff --git a/include/delphi/m_helpers.inc b/include/delphi/m_helpers.inc
index 98173a3242..0e51727d89 100644
--- a/include/delphi/m_helpers.inc
+++ b/include/delphi/m_helpers.inc
@@ -542,6 +542,6 @@ begin
 end;
 
 initialization
-   cli:=PCLIST_INTERFACE(CallService(MS_CLIST_RETRIEVE_INTERFACE,0,0));
+   cli := Clist_GetInterface();
 
 {$ENDIF}
diff --git a/include/m_clistint.h b/include/m_clistint.h
index daa37cc59e..648eb84dda 100644
--- a/include/m_clistint.h
+++ b/include/m_clistint.h
@@ -496,13 +496,9 @@ struct CLIST_INTERFACE
 // retrieves the pointer to a CLIST_INTERFACE structure
 // NOTE: valid only for the clist clone building, not for the regular use
 
-#define MS_CLIST_RETRIEVE_INTERFACE "CList/RetrieveInterface"
+EXTERN_C MIR_APP_DLL(CLIST_INTERFACE*) Clist_GetInterface(void);
 
 #ifndef MIR_APP_EXPORTS
 	extern CLIST_INTERFACE *pcli;
-
-	__forceinline void mir_getCLI()
-	{	pcli = (CLIST_INTERFACE*)CallService(MS_CLIST_RETRIEVE_INTERFACE, 0, 0);
-	}
 #endif
 #endif // M_CLISTINT_H__