3 files changed, 45 insertions, 7 deletions
diff --git a/include/m_clist.h b/include/m_clist.h
index b4d2ae16e5..86c98c8326 100644
--- a/include/m_clist.h
+++ b/include/m_clist.h
@@ -35,7 +35,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 extern int hLangpack;
 
-#if defined _STATIC
+#if defined MIR_APP_EXPORTS
 	typedef struct _tagIntMenuItem* HGENMENU;
 #else
 	DECLARE_HANDLE(HGENMENU);
diff --git a/include/m_core.h b/include/m_core.h
index 1d5639ed75..788d82e96d 100644
--- a/include/m_core.h
+++ b/include/m_core.h
@@ -40,6 +40,14 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #define MIR_CORE_DLL(T) MIR_CORE_EXPORT T __stdcall
 #define MIR_C_CORE_DLL(T) MIR_CORE_EXPORT T __cdecl
 
+#ifdef MIR_APP_EXPORTS
+	#define MIR_APP_EXPORT
+#else
+	#define MIR_APP_EXPORT __declspec(dllimport)
+#endif
+
+#define MIR_APP_DLL(T) MIR_APP_EXPORT T __stdcall
+
 #pragma warning(disable:4201 4127 4706)
 
 #if defined(__cplusplus)
@@ -113,11 +121,9 @@ MIR_CORE_DLL(int)     CallFunctionAsync(void (__stdcall *func)(void *), void *ar
 MIR_CORE_DLL(void)    KillModuleServices(HINSTANCE hInst);
 MIR_CORE_DLL(void)    KillObjectServices(void* pObject);
 
-#if !defined(_STATIC)
-MIR_C_CORE_DLL(int)     ProtoServiceExists(LPCSTR szModule, const char *szService);
-MIR_C_CORE_DLL(INT_PTR) CallContactService(MCONTACT, const char *, WPARAM, LPARAM);
-MIR_C_CORE_DLL(INT_PTR) CallProtoService(LPCSTR szModule, const char *szService, WPARAM wParam, LPARAM lParam);
-#endif
+MIR_APP_DLL(int)      ProtoServiceExists(LPCSTR szModule, const char *szService);
+MIR_APP_DLL(INT_PTR)  CallContactService(MCONTACT, const char*, WPARAM, LPARAM);
+MIR_APP_DLL(INT_PTR)  CallProtoService(LPCSTR szModule, const char *szService, WPARAM wParam, LPARAM lParam);
 
 ///////////////////////////////////////////////////////////////////////////////
 // exceptions
@@ -722,6 +728,8 @@ MIR_CORE_DLL(BOOL)    IsFullScreen();
 MIR_CORE_DLL(BOOL)    IsWorkstationLocked();
 MIR_CORE_DLL(BOOL)    IsScreenSaverRunning();
 
+MIR_APP_DLL(int)      GetPluginLangByInstance(HINSTANCE hInstance);
+
 ///////////////////////////////////////////////////////////////////////////////
 
 MIR_CORE_DLL(void) UnloadCoreModule(void);
@@ -760,11 +768,19 @@ inline int mir_vsnwprintf(wchar_t(&buffer)[_Size], const wchar_t* fmt, va_list v
 #endif
 
 #ifndef MIR_CORE_EXPORTS
-	#if !defined( _WIN64 )
+	#if !defined(_WIN64)
 		#pragma comment(lib, "mir_core.lib")
 	#else
 		#pragma comment(lib, "mir_core64.lib")
 	#endif
 #endif
 
+#ifndef MIR_APP_EXPORTS
+	#if !defined(_WIN64)
+		#pragma comment(lib, "mir_app.lib")
+	#else
+		#pragma comment(lib, "mir_app64.lib")
+	#endif
+#endif
+
 #endif // M_CORE_H
diff --git a/include/m_icolib.h b/include/m_icolib.h
index de1c388b53..e738df1d89 100644
--- a/include/m_icolib.h
+++ b/include/m_icolib.h
@@ -27,6 +27,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 extern int hLangpack;
 
+#ifndef M_CORE_H__
+#include <m_core.h>
+#endif
+
 ///////////////////////////////////////////////////////////////////////////////
 // WARNING: do not use Translate(TS) for p(t)szSection or p(t)szDescription as they
 // are translated by the core, which may lead to double translation.
@@ -58,6 +62,24 @@ typedef struct {
   #define SIDF_ALL_TCHAR  0
 #endif
 
+MIR_APP_DLL(HICON)  LoadSkinProtoIcon(const char *szProto, int status, bool big = false);
+MIR_APP_DLL(HICON)  LoadSkinIcon(int idx, bool big = false);
+MIR_APP_DLL(HANDLE) GetSkinIconHandle(int idx);
+
+MIR_APP_DLL(HANDLE) IcoLib_AddNewIcon(int hLangpack, SKINICONDESC *sid);
+MIR_APP_DLL(HICON)  IcoLib_GetIcon(const char* pszIconName, bool big);
+MIR_APP_DLL(HANDLE) IcoLib_GetIconHandle(const char* pszIconName);
+MIR_APP_DLL(HICON)  IcoLib_GetIconByHandle(HANDLE hItem, bool big);
+MIR_APP_DLL(HANDLE) IcoLib_IsManaged(HICON hIcon);
+MIR_APP_DLL(int)    IcoLib_ReleaseIcon(HICON hIcon, char* szIconName, bool big = false);
+
+MIR_APP_DLL(void)   Button_SetIcon_IcoLib(HWND hDlg, int itemId, int iconId, const char* tooltip);
+MIR_APP_DLL(void)   Button_FreeIcon_IcoLib(HWND hDlg, int itemId);
+
+MIR_APP_DLL(void)   Window_SetIcon_IcoLib(HWND hWnd, int iconId);
+MIR_APP_DLL(void)   Window_SetProtoIcon_IcoLib(HWND hWnd, const char *szProto, int iconId);
+MIR_APP_DLL(void)   Window_FreeIcon_IcoLib(HWND hWnd);
+
 ///////////////////////////////////////////////////////////////////////////////
 //  Adds an icon into options UI
 //