9 files changed, 15 insertions, 31 deletions
diff --git a/include/delphi/m_skin.inc b/include/delphi/m_skin.inc
index 862b309305..5e9968c62d 100644
--- a/include/delphi/m_skin.inc
+++ b/include/delphi/m_skin.inc
@@ -89,11 +89,9 @@ const
   SKINICON_AUTH_GRANT          = 249;
   SKINICON_AUTH_REVOKE         = 250;
 
-function Skin_LoadIcon(iconId:int; big:byte) : HICON; stdcall;
-                 external AppDLL name 'Skin_LoadIcon';
+function Skin_LoadIcon(iconId:int; big:byte) : HICON; stdcall; external AppDLL;
 
-function Skin_GetIconHandle(iconId:int) : THANDLE; stdcall;
-                 external AppDLL name 'Skin_GetIconHandle';
+function Skin_GetIconHandle(iconId:int) : THANDLE; stdcall; external AppDLL;
 
 // status mode icons. NOTE: These are deprecated in favour of LoadSkinnedProtoIcon()
 const
@@ -106,17 +104,6 @@ const
   SKINICON_STATUS_FREE4CHAT  = 6;
   SKINICON_STATUS_INVISIBLE  = 7;
 
-function Skin_LoadProtoIcon(protoName:PAnsiChar; iconId:int; big:byte) : HICON; stdcall;
-                 external AppDLL name 'Skin_LoadProtoIcon';
-
-const
-  {
-    Affect : Load an icon from the user's custom skin lib, or from the exe
-             if there isn't one loaded, see notes
-    Return : HICON for the new icon, do *not* DestroyIcon() the return value
-             returns NULL(0) if ICON_ID is invalid, but always success for a valid ID.
-  }
-  MS_SKIN_LOADICON:PAnsiChar = 'Skin/Icons/Load';
-
+function Skin_LoadProtoIcon(protoName:PAnsiChar; iconId:int; big:byte) : HICON; stdcall; external AppDLL;
 
 {$ENDIF}
diff --git a/plugins/Actman/hooks/i_opt_dlg.inc b/plugins/Actman/hooks/i_opt_dlg.inc
index 23adcf0848..895ce51f21 100644
--- a/plugins/Actman/hooks/i_opt_dlg.inc
+++ b/plugins/Actman/hooks/i_opt_dlg.inc
@@ -256,22 +256,23 @@ begin
 
   ti.lpszText:=TranslateW('Help');
   ti.uId     :=GetDlgItem(Dialog,IDC_EVENT_HELP);
-  SendMessage(ti.uId,BM_SETIMAGE,IMAGE_ICON,
-      CallService(MS_SKIN_LOADICON,SKINICON_OTHER_HELP,0));
+  SendMessage(ti.uId,BM_SETIMAGE,IMAGE_ICON,Skin_LoadIcon(SKINICON_OTHER_HELP,0));
   SendMessageW(hwndTooltip,TTM_ADDTOOLW,0,LPARAM(@ti));
+
   ti.uId     :=GetDlgItem(Dialog,IDC_EVENT_CHELP);
-  SendMessage(ti.uId,BM_SETIMAGE,IMAGE_ICON,
-      CallService(MS_SKIN_LOADICON,SKINICON_OTHER_HELP,0));
+  SendMessage(ti.uId,BM_SETIMAGE,IMAGE_ICON,Skin_LoadIcon(SKINICON_OTHER_HELP,0));
   SendMessageW(hwndTooltip,TTM_ADDTOOLW,0,LPARAM(@ti));
   
   ti.uId     :=GetDlgItem(Dialog,IDC_HOOK_NEW);
   ti.lpszText:=TranslateW('New');
   SetButtonIcon(ti.uId,ACI_NEW);
   SendMessageW(hwndTooltip,TTM_ADDTOOLW,0,LPARAM(@ti));
+
   ti.uId     :=GetDlgItem(Dialog,IDC_HOOK_APPLY);
   ti.lpszText:=TranslateW('Apply');
   SetButtonIcon(ti.uId,ACI_APPLY);
   SendMessageW(hwndTooltip,TTM_ADDTOOLW,0,LPARAM(@ti));
+
   ti.uId     :=GetDlgItem(Dialog,IDC_HOOK_DELETE);
   ti.lpszText:=TranslateW('Delete');
   SetButtonIcon(ti.uId,ACI_DELETE);
diff --git a/plugins/Actman/i_opt_dlg2.inc b/plugins/Actman/i_opt_dlg2.inc
index e247b1c9c3..7dfaf13ced 100644
--- a/plugins/Actman/i_opt_dlg2.inc
+++ b/plugins/Actman/i_opt_dlg2.inc
@@ -782,8 +782,7 @@ begin
 
   ti.uId     :=GetDlgItem(Dialog,IDC_ACTION_HELP);
   ti.lpszText:=TranslateW('Help');
-  SendMessage(ti.uId,BM_SETIMAGE,IMAGE_ICON,
-      CallService(MS_SKIN_LOADICON,SKINICON_OTHER_HELP,0));
+  SendMessage(ti.uId,BM_SETIMAGE,IMAGE_ICON,Skin_LoadIcon(SKINICON_OTHER_HELP,0));
   SendMessageW(hwndTooltip,TTM_ADDTOOLW,0,lparam(@ti));
   
   ti.uId     :=GetDlgItem(Dialog,IDC_ACTION_NEW);
diff --git a/plugins/Actman/tasks/i_opt_dlg.inc b/plugins/Actman/tasks/i_opt_dlg.inc
index bf8d45f63c..3a130f7227 100644
--- a/plugins/Actman/tasks/i_opt_dlg.inc
+++ b/plugins/Actman/tasks/i_opt_dlg.inc
@@ -389,8 +389,7 @@ begin
 {
   ti.uId     :=GetDlgItem(Dialog,IDC_EVENT_HELP);
   ti.lpszText:=TranslateW('Help');
-  SendMessage(ti.uId,BM_SETIMAGE,IMAGE_ICON,
-      CallService(MS_SKIN_LOADICON,SKINICON_OTHER_HELP,0));
+  SendMessage(ti.uId,BM_SETIMAGE,IMAGE_ICON,Skin_LoadIcon(SKINICON_OTHER_HELP,0));
   SendMessageW(hwndTooltip,TTM_ADDTOOLW,0,LPARAM(@ti));
 }  
   ti.uId     :=GetDlgItem(Dialog,IDC_TASK_NEW);
diff --git a/plugins/Utils.pas/cbex.pas b/plugins/Utils.pas/cbex.pas
index 7c05478ae9..4af51b3682 100644
--- a/plugins/Utils.pas/cbex.pas
+++ b/plugins/Utils.pas/cbex.pas
@@ -47,7 +47,7 @@ begin
   begin
     if cnt=0 then
     begin
-      ImageList_AddIcon(il,CallService(MS_SKIN_LOADICON,SKINICON_OTHER_SMALLDOT,0));
+      ImageList_AddIcon(il,Skin_LoadIcon(SKINICON_OTHER_SMALLDOT,0));
       cbei.pszText:=TranslateW('None');
     end
     else
diff --git a/plugins/Utils.pas/mirevents.pas b/plugins/Utils.pas/mirevents.pas
index 5a92745602..1b5f1e3573 100644
--- a/plugins/Utils.pas/mirevents.pas
+++ b/plugins/Utils.pas/mirevents.pas
@@ -437,7 +437,7 @@ begin
   else
     idx:=0;
   end;
-  result:=CallService(MS_SKIN_LOADICON,idx,0);
+  result:=Skin_LoadIcon(idx,0);
 end;
 
 end.
diff --git a/plugins/Watrack/kolframe/frm_dlg2.inc b/plugins/Watrack/kolframe/frm_dlg2.inc
index 8f539c9dcb..29b9a71180 100644
--- a/plugins/Watrack/kolframe/frm_dlg2.inc
+++ b/plugins/Watrack/kolframe/frm_dlg2.inc
@@ -47,8 +47,7 @@ begin
         SetDlgItemTextW(Dialog,IDC_FRAME_TEXT,PWATFrameData(FrameCtrl.CustomData).Template);
       end;
 
-      SendDlgItemMessage(Dialog,IDC_MACRO_HELP,BM_SETIMAGE,IMAGE_ICON,
-          CallService(MS_SKIN_LOADICON,SKINICON_OTHER_HELP,0));
+      SendDlgItemMessage(Dialog,IDC_MACRO_HELP,BM_SETIMAGE,IMAGE_ICON,Skin_LoadIcon(SKINICON_OTHER_HELP,0));
 
       TemplateChanged:=false;
       DlgInited:=true;
diff --git a/plugins/Watrack/popup/pop_dlg.inc b/plugins/Watrack/popup/pop_dlg.inc
index 4e76a6c6ed..76873798d6 100644
--- a/plugins/Watrack/popup/pop_dlg.inc
+++ b/plugins/Watrack/popup/pop_dlg.inc
@@ -46,8 +46,7 @@ begin
       if PopupDelay<=0 then
         EnableWindow(GetDlgItem(Dialog,IDC_DELAY),false);
 
-      SendDlgItemMessage(Dialog,IDC_MACRO_HELP,BM_SETIMAGE,IMAGE_ICON,
-          CallService(MS_SKIN_LOADICON,SKINICON_OTHER_HELP,0));
+      SendDlgItemMessage(Dialog,IDC_MACRO_HELP,BM_SETIMAGE,IMAGE_ICON,Skin_LoadIcon(SKINICON_OTHER_HELP,0));
 
       fore:=GetDlgItem(Dialog,IDC_FORE);
       back:=GetDlgItem(Dialog,IDC_BACK);
diff --git a/plugins/Watrack/templates/i_tmpl_dlg.inc b/plugins/Watrack/templates/i_tmpl_dlg.inc
index c5534131ea..7e6455a826 100644
--- a/plugins/Watrack/templates/i_tmpl_dlg.inc
+++ b/plugins/Watrack/templates/i_tmpl_dlg.inc
@@ -13,7 +13,7 @@ begin
           CallService(MS_VARS_GETSKINITEM,0,VSI_HELPICON));
 
       SendDlgItemMessage(Dialog,IDC_MACRO_HELP,BM_SETIMAGE,IMAGE_ICON,
-          CallService(MS_SKIN_LOADICON,SKINICON_OTHER_HELP,0));
+          Skin_LoadIcon(SKINICON_OTHER_HELP,0));
 
       MakeHint(Dialog,IDC_REPLACESPC,
         'Replaces "_" (underscores) globally in pasted os status text,'+