diff --git a/components/ideintf/lazideintf.pas b/components/ideintf/lazideintf.pas
index 7cddb5b5c0..9b0c4adbec 100644
--- a/components/ideintf/lazideintf.pas
+++ b/components/ideintf/lazideintf.pas
@@ -17,7 +17,11 @@ interface
 
 uses
   Classes, SysUtils, LCLProc, Forms, Controls, Dialogs, PropEdits, LazHelpHTML,
-  IDEOptionsIntf, CompOptsIntf, ProjectIntf, SrcEditorIntf;
+  IDEOptionsIntf, CompOptsIntf, ProjectIntf,
+  {$IFDEF EnableNewExtTools}
+  IDEExternToolIntf,
+  {$ENDIF}
+  SrcEditorIntf;
 
 type
   // open file flags
diff --git a/ide/buildlazdialog.pas b/ide/buildlazdialog.pas
index 3325f2f94d..7797a0c315 100644
--- a/ide/buildlazdialog.pas
+++ b/ide/buildlazdialog.pas
@@ -740,7 +740,7 @@ begin
       debugln(['CreateAppleBundle CreateAppBundleSymbolicLink failed']);
       if IDEMessagesWindow<>nil then
         {$IFDEF EnableNewExtTools}
-        IDEMessagesWindow.AddCustomMessage(mluError,'to create application bundle symlink to '+TargetFile);
+        IDEMessagesWindow.AddCustomMessage(mluError,'failed to create application bundle symlink to '+fTargetFilename);
         {$ELSE}
         IDEMessagesWindow.AddMsg('Error: failed to create application bundle symlink to '+fTargetFilename,fTargetDir,-1);
         {$ENDIF}
diff --git a/ide/environmentopts.pp b/ide/environmentopts.pp
index 8fe9a99ab9..c58ced0732 100644
--- a/ide/environmentopts.pp
+++ b/ide/environmentopts.pp
@@ -180,7 +180,7 @@ type
   end;
   TExternalToolMenuItemsClass = class of TBaseExternalToolMenuItems;
 var
-  ExternalToolMenuItemsClass: TExternalToolMenuItemsClass; // set by ExtToolDialog
+  ExternalToolMenuItemsClass: TExternalToolMenuItemsClass; // set by ExtToolEditDlg to TExternalToolMenuItems
 {$ELSE}
 type
   TBaseExternalToolList = class(TList)
@@ -353,7 +353,7 @@ type
     
     // external tools
     {$IFDEF EnableNewExtTools}
-    fExternalToolMenuItems: TBaseExternalToolMenuItems;
+    fExternalToolMenuItems: TBaseExternalToolMenuItems; // see ExtToolEditDlg.TExternalToolMenuItems
     {$ELSE}
     fExternalTools: TBaseExternalToolList;
     {$ENDIF}
@@ -959,6 +959,7 @@ begin
   // external tools
   {$IFDEF EnableNewExtTools}
   fExternalToolMenuItems:=ExternalToolMenuItemsClass.Create;
+  debugln(['TEnvironmentOptions.Create ',DbgSName(fExternalToolMenuItems),' Class=',DbgSName(ExternalToolMenuItemsClass)]);
   {$ELSE}
   fExternalTools:=ExternalToolListClass.Create;
   {$ENDIF}
diff --git a/ide/exttooleditdlg.pas b/ide/exttooleditdlg.pas
index c06210e88c..58b0839d0d 100644
--- a/ide/exttooleditdlg.pas
+++ b/ide/exttooleditdlg.pas
@@ -42,11 +42,11 @@ uses
   {$IFDEF IDE_MEM_CHECK}
   MemCheck,
   {$ENDIF}
-  Classes, SysUtils, FileUtil, LazUTF8, LCLType,
-  Controls, Forms, Buttons, StdCtrls, Dialogs, ExtCtrls, LCLProc, ButtonPanel,
-  IDEMsgIntf, IDEExternToolIntf, IDEHelpIntf, PropEdits, IDEDialogs,
-  IDECommands, FileProcs, TransferMacros, LazarusIDEStrConsts, EnvironmentOpts,
-  KeyMapping, IDEProcs
+  Classes, SysUtils, FileUtil, LazUTF8, LCLType, Controls, Forms, Buttons,
+  StdCtrls, Dialogs, ExtCtrls, LCLProc, ButtonPanel, IDEMsgIntf,
+  IDEExternToolIntf, IDEHelpIntf, PropEdits, IDEDialogs, IDECommands, IDEUtils,
+  FileProcs, TransferMacros, LazarusIDEStrConsts, EnvironmentOpts, KeyMapping,
+  IDEProcs
   {$IFDEF EnableNewExtTools}
   ,LazConfigStorage, contnrs
   {$ELSE}
@@ -997,4 +997,9 @@ begin
   end;
 end;
 
+initialization
+  {$IFDEF EnableNewExtTools}
+  ExternalToolMenuItemsClass := TExternalToolMenuItems;
+  {$ENDIF}
+
 end.
diff --git a/ide/projectuserresources.pas b/ide/projectuserresources.pas
index f4292a729f..09784866db 100644
--- a/ide/projectuserresources.pas
+++ b/ide/projectuserresources.pas
@@ -35,10 +35,14 @@ unit ProjectUserResources;
 interface
 
 uses
-  Classes, SysUtils, FileUtil, Laz2_XMLCfg, Process, LCLProc,
-  Controls, Graphics, Forms, CodeToolManager, FileProcs, LazConf, LResources,
-  ProjectIntf, ProjectResourcesIntf, IDEMsgIntf, MacroIntf, LazarusIDEStrConsts,
-  resource, bitmapresource, groupresource, groupiconresource, groupcursorresource;
+  Classes, SysUtils, FileUtil, Laz2_XMLCfg, Process, LCLProc, Controls,
+  Graphics, Forms, CodeToolManager, FileProcs, LazConf, LResources, ProjectIntf,
+  ProjectResourcesIntf, IDEMsgIntf, MacroIntf,
+  {$IFDEF EnableNewExtTools}
+  IDEExternToolIntf,
+  {$ENDIF}
+  LazarusIDEStrConsts, resource, bitmapresource, groupresource,
+  groupiconresource, groupcursorresource;
    
 type
   TUserResourceType = (