8 files changed, 40 insertions, 39 deletions
diff --git a/plugins/Actman/actman.dpr b/plugins/Actman/actman.dpr
index 2149485807..05c5494bea 100644
--- a/plugins/Actman/actman.dpr
+++ b/plugins/Actman/actman.dpr
@@ -240,17 +240,19 @@ end;
 exports
   Load, Unload;
 
+const PluginId: TGUID = '{9584DA04-FB4F-40C1-9325-E4F9CAAFCB5D}';
+
 begin
   DisableThreadLibraryCalls(hInstance);
 
-  PluginInfo.cbSize     :=SizeOf(TPLUGININFOEX);
-  PluginInfo.shortName  :='Action manager';
-  PluginInfo.version    :=$00030001;
-  PluginInfo.description:='Plugin for manage hotkeys to open contact window, insert text, '+
+  PluginInfo.cbSize     := SizeOf(TPLUGININFOEX);
+  PluginInfo.shortName  := 'Action manager';
+  PluginInfo.version    := $00030001;
+  PluginInfo.description:= 'Plugin for manage hotkeys to open contact window, insert text, '+
                           'run program and call services';
-  PluginInfo.author     :='Awkward';
-  PluginInfo.copyright  :='(c) 2007-13 Awkward';
-  PluginInfo.homepage   :='https://miranda-ng.org/p/Actman';
-  PluginInfo.flags      :=UNICODE_AWARE;
-  PluginInfo.uuid       :=MIID_ACTMAN;
+  PluginInfo.author     := 'Awkward';
+  PluginInfo.copyright  := '(c) 2007-13 Awkward';
+  PluginInfo.homepage   := 'https://miranda-ng.org/p/Actman';
+  PluginInfo.flags      := UNICODE_AWARE;
+  PluginInfo.uuid       := PluginId;
 end.
diff --git a/plugins/ExternalAPI/delphi/m_actman.inc b/plugins/ExternalAPI/delphi/m_actman.inc
index 757ce0965b..93757ee4e2 100644
--- a/plugins/ExternalAPI/delphi/m_actman.inc
+++ b/plugins/ExternalAPI/delphi/m_actman.inc
@@ -1,9 +1,6 @@
 {$IFNDEF M_ACTMAN}
 {$DEFINE M_ACTMAN}
 
-// defined in interfaces.inc
-//const MIID_ACTMANAGER:MUUID='{9584DA04-FB4F-40c1-9325-E4F9CAAFCB5D}';
-
 const
   AutoStartName:PWideChar = '#Autostart';
 
diff --git a/plugins/ExternalAPI/delphi/m_music.inc b/plugins/ExternalAPI/delphi/m_music.inc
index f1cf3540fc..c93d201862 100644
--- a/plugins/ExternalAPI/delphi/m_music.inc
+++ b/plugins/ExternalAPI/delphi/m_music.inc
@@ -1,9 +1,6 @@
 {$IFNDEF M_MUSIC}
 {$DEFINE M_MUSIC}
 
-// defined in interfaces.inc
-//const MIID_WATRACK:MUUID='{FC6C81F4-837E-4430-9601-A0AA43177AE3}';
-
 type
   pSongInfoA = ^tSongInfoA;
   tSongInfoA = record
diff --git a/plugins/ExternalAPI/delphi/m_radio.inc b/plugins/ExternalAPI/delphi/m_radio.inc
index d3c52c75ae..19dfe9f365 100644
--- a/plugins/ExternalAPI/delphi/m_radio.inc
+++ b/plugins/ExternalAPI/delphi/m_radio.inc
@@ -2,9 +2,6 @@
 {$DEFINE M_RADIO}
 {command codes}
 
-// defined in interfaces.inc
-//const MIID_MRADIO:MUUID='{EEBC474C-B0AD-470F-99A8-9DD9210CE233}';
-
 const
   MRC_STOP   = 0;
   MRC_PLAY   = 1; // lParam is radio contact handle
diff --git a/plugins/ExternalAPI/delphi/m_variables.inc b/plugins/ExternalAPI/delphi/m_variables.inc
index 9b02efcc29..4fdc844a7c 100644
--- a/plugins/ExternalAPI/delphi/m_variables.inc
+++ b/plugins/ExternalAPI/delphi/m_variables.inc
@@ -20,7 +20,7 @@
 {$IFNDEF M_VARS}
 {$DEFINE M_VARS}
 
-const MIID_VARIABLES:MUUID = '{630756DE-3681-440B-991E-77A4742DA595}';
+const MIID_VARIABLES : TGUID = '{630756DE-3681-440B-991E-77A4742DA595}';
 
 // --------------------------------------------------------------------------
 // String formatting
diff --git a/plugins/HistoryPlusPlus/historypp.dpr b/plugins/HistoryPlusPlus/historypp.dpr
index a7b5d36f14..928a2e94e7 100644
--- a/plugins/HistoryPlusPlus/historypp.dpr
+++ b/plugins/HistoryPlusPlus/historypp.dpr
@@ -111,11 +111,15 @@ function OnEventDeleted(wParam: WPARAM; lParam: LPARAM): Integer; cdecl; forward
 function OnMetaDefaultChanged(wParam: WPARAM; lParam: LPARAM): Integer; cdecl; forward;
 function OnPreshutdown(wParam: WPARAM; lParam: LPARAM): Integer; cdecl; forward;
 
+const
+  MIID_LAST: TGUID = '{00000000-0000-0000-0000-000000000000}';
+  MIID_UIHISTORY: TGUID = '{7F7E3D98-CE1F-4962-8284-968550F1D3D9}';
+
 var
   PluginInterfaces: array[0..1] of TGUID;
 
 // tell Miranda about supported interfaces
-function MirandaPluginInterfaces:PMUUID; cdecl;
+function MirandaPluginInterfaces : PGUID; cdecl;
 begin
   PluginInterfaces[0]:=MIID_UIHISTORY;
   PluginInterfaces[1]:=MIID_LAST;
diff --git a/plugins/Watrack/watrack.dpr b/plugins/Watrack/watrack.dpr
index 827d671714..1818cec5dc 100644
--- a/plugins/Watrack/watrack.dpr
+++ b/plugins/Watrack/watrack.dpr
@@ -660,19 +660,21 @@ begin
   result:=0;
 end;
 
+const PluginId: TGUID = '{FC6C81F4-837E-4430-9601-A0AA43177AE3}';
+
 exports
   Load, Unload;
 
 begin
   DisableThreadLibraryCalls(hInstance);
 
-  PluginInfo.cbSize     :=SizeOf(TPLUGININFOEX);
-  PluginInfo.shortName  :=PluginName;
-  PluginInfo.version    :=$0000060C;
-  PluginInfo.description:='Paste played music info into message window or status text';
-  PluginInfo.author     :='Awkward';
-  PluginInfo.copyright  :='(c) 2005-12 Awkward';
-  PluginInfo.homepage   :='https://miranda-ng.org/p/Watrack';
-  PluginInfo.flags      :=UNICODE_AWARE;
-  PluginInfo.uuid       :=MIID_WATRACK;
+  PluginInfo.cbSize     := SizeOf(TPLUGININFOEX);
+  PluginInfo.shortName  := PluginName;
+  PluginInfo.version    := $0000060C;
+  PluginInfo.description:= 'Paste played music info into message window or status text';
+  PluginInfo.author     := 'Awkward';
+  PluginInfo.copyright  := '(c) 2005-12 Awkward';
+  PluginInfo.homepage   := 'https://miranda-ng.org/p/Watrack';
+  PluginInfo.flags      := UNICODE_AWARE;
+  PluginInfo.uuid       := PluginId;
 end.
diff --git a/plugins/mRadio/mradio.dpr b/plugins/mRadio/mradio.dpr
index eb57882511..ca70a5b1a4 100644
--- a/plugins/mRadio/mradio.dpr
+++ b/plugins/mRadio/mradio.dpr
@@ -173,6 +173,8 @@ begin
   Result:=0;
 end;
 
+const PluginId: TGUID = '{EEBC474C-B0AD-470F-99A8-9DD9210CE233}';
+
 exports
   Load, Unload;
 
@@ -183,14 +185,14 @@ begin
 
   DisableThreadLibraryCalls(hInstance);
 
-  PluginInfo.cbSize     :=SizeOf(TPLUGININFOEX);
-  PluginInfo.shortName  :='mRadio Mod';
-  PluginInfo.version    :=$00000204;
-  PluginInfo.description:='This plugin plays and records Internet radio streams.'+
-                          ' Also local media files can be played.';
-  PluginInfo.author     :='Awkward';
-  PluginInfo.copyright  :='(c) 2007-14 Awkward';
-  PluginInfo.homepage   :='https://miranda-ng.org/p/MRadio';
-  PluginInfo.flags      :=UNICODE_AWARE;
-  PluginInfo.uuid       :=MIID_MRADIO;
+  PluginInfo.cbSize     := SizeOf(TPLUGININFOEX);
+  PluginInfo.shortName  := 'mRadio Mod';
+  PluginInfo.version    := $00000204;
+  PluginInfo.description:= 'This plugin plays and records Internet radio streams.'+
+                           ' Also local media files can be played.';
+  PluginInfo.author     := 'Awkward';
+  PluginInfo.copyright  := '(c) 2007-14 Awkward';
+  PluginInfo.homepage   := 'https://miranda-ng.org/p/MRadio';
+  PluginInfo.flags      := UNICODE_AWARE;
+  PluginInfo.uuid       := PluginId;
 end.