Remove units from uses sections, especially LCLProc which now contains many wrappers to other non-LCL units.

2025-10-23 02:41:31 +02:00 · 2023-06-12 16:13:58 +03:00 · 2023-06-12 16:13:58 +03:00 · e045ba01d2
commit e045ba01d2
parent 4f1d9530d5
190 changed files with 457 additions and 381 deletions
--- a/components/anchordocking/design/anchordesktopoptions.pas
+++ b/components/anchordocking/design/anchordesktopoptions.pas
@ -9,9 +9,9 @@ interface
 uses
  Classes, SysUtils,
  // LCL
-  LCLProc, Forms, Controls, LCLType, LResources,
+  Forms, Controls, LResources,
  // LazUtils
-  LazFileUtils, LazConfigStorage, Laz2_XMLCfg, LazUTF8,
+  LazFileUtils, LazConfigStorage, LazLoggerBase, Laz2_XMLCfg, LazUTF8,
  // IdeIntf
  IDEOptionsIntf, LazIDEIntf, BaseIDEIntf,
  // AnchorDocking
--- a/components/anchordocking/design/registeranchordocking.pas
+++ b/components/anchordocking/design/registeranchordocking.pas
@ -38,9 +38,9 @@ interface
 uses
  Math, Classes, SysUtils,
  // LCL
-  LCLProc, Forms, Controls, Dialogs, StdCtrls,
+  Forms, Controls, Dialogs, StdCtrls,
  // LazUtils
-  LazFileCache, LazFileUtils,
+  LazFileCache, LazFileUtils, LazLoggerBase,
  // IdeIntf
  LCLIntf, IDEWindowIntf, IDEOptionsIntf, IDEOptEditorIntf, LazIDEIntf,
  // AnchorDocking
--- a/components/chmhelp/lhelp/lhelpcore.pas
+++ b/components/chmhelp/lhelp/lhelpcore.pas
@ -35,10 +35,10 @@ unit LHelpCore;
 interface

 uses
-  Classes, SysUtils, SimpleIPC, Laz2_XMLCfg,
+  Classes, SysUtils, Types, SimpleIPC, Laz2_XMLCfg,
  // LCL
-  Forms, Controls, Graphics, Dialogs, Buttons, ComCtrls, ExtCtrls, Menus, StdCtrls, Types,
-  LCLProc, LCLType, LCLIntf, DefaultTranslator,
+  Forms, Controls, Graphics, Dialogs, ComCtrls, ExtCtrls, Menus, StdCtrls,
+  LCLType, LCLIntf, DefaultTranslator,
  // LazUtils
  LazFileUtils, LazUTF8, LazLoggerBase,
  // ChmHelp
--- a/components/customdrawn/customdrawnextras.pas
+++ b/components/customdrawn/customdrawnextras.pas
@ -14,10 +14,10 @@ unit customdrawnextras;
 interface

 uses
-  Classes, SysUtils, Graphics, Controls, LCLType, LCLIntf, IntfGraphics,
-  Math, types, contnrs, componenteditors, LMessages, Messages,
-  LCLProc, PropEdits, ExtCtrls, ImgList, Forms, Menus, LResources,
+  Classes, SysUtils, Math, Types, Contnrs,
+  Graphics, Controls, ExtCtrls, ImgList, Forms, Menus, LCLType,
  customdrawncontrols,
+  componenteditors, PropEdits,
  // fpimage
  fpcanvas, fpimgcanv, fpimage
  {$ifdef CUSTOMDRAWN_USE_FREETYPE}
--- a/components/fppkg/src/fppkg_environmentoptions.pas
+++ b/components/fppkg/src/fppkg_environmentoptions.pas
@ -42,7 +42,7 @@ uses
  LazIDEIntf,
  LazFileCache,
  LazFileUtils,
-  LCLProc,
+  LazLoggerBase,
  XMLConf,
  StdCtrls,
  ExtCtrls,
--- a/components/fppkg/src/fppkg_initializeoptionsfrm.pas
+++ b/components/fppkg/src/fppkg_initializeoptionsfrm.pas
@ -5,9 +5,10 @@ unit fppkg_initializeoptionsfrm;
 interface

 uses
-  Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, ExtCtrls, StdCtrls, EditBtn,
-  ButtonPanel,
-  fpTemplate,
+  Classes, SysUtils, fpTemplate,
+  Forms, Controls, Graphics, Dialogs, ExtCtrls, StdCtrls, EditBtn, ButtonPanel,
+  // LazUtils
+  LazFileUtils,
  // IDEIntf
  IDEOptionsIntf,
  // fppkg
--- a/components/fppkg/src/lazfppkgmanagerintf.pas
+++ b/components/fppkg/src/lazfppkgmanagerintf.pas
@ -32,7 +32,8 @@ unit lazfppkgmanagerintf;
 interface

 uses
-  LCLtype, LResources, LCLProc,
+  LCLtype, LResources,
+  LazUtilities,
  fppkg_mainfrm, fppkg_const;

 procedure Register;
--- a/components/lazcontrols/checkboxthemed.pas
+++ b/components/lazcontrols/checkboxthemed.pas
@ -17,8 +17,7 @@ interface
 uses
  Classes, SysUtils, Types, Math,
  // LCL
-  Controls, StdCtrls, Graphics, ActnList, Forms,
-  LCLIntf, LMessages, LCLProc, LCLType, Themes,
+  Controls, StdCtrls, Graphics, ActnList, Forms, LCLIntf, LMessages, LCLType, Themes,
  // LazUtils
  LazMethodList;

--- a/components/lazcontrols/extendednotebook.pas
+++ b/components/lazcontrols/extendednotebook.pas
@ -26,7 +26,7 @@ uses
  Classes, sysutils, math,
  // LCL
  LCLIntf, LCLType, LMessages, Controls, ComCtrls
-  {$IFDEF ExtNBookDebug} , LCLProc {$ENDIF};
+  {$IFDEF ExtNBookDebug} , LazLoggerBase {$ENDIF};

 type

--- a/components/lazcontrols/spinex.pp
+++ b/components/lazcontrols/spinex.pp
@ -74,7 +74,7 @@ interface
 uses
  Classes, SysUtils, Math,
  // LCL
-  LCLType, LCLProc, Controls, ClipBrd, ComCtrls, GroupedEdit, LResources;
+  LCLType, Controls, ClipBrd, ComCtrls, GroupedEdit, LResources;


 {.$define debugspinex}
--- a/components/lazdebuggers/lazdebuggerfp/fpdebugvalueconvertors.pas
+++ b/components/lazdebuggers/lazdebuggerfp/fpdebugvalueconvertors.pas
@ -8,7 +8,7 @@ interface
 uses
  Classes, SysUtils, FpDbgInfo, FpdMemoryTools, FpDbgCallContextInfo,
  FpPascalBuilder, FpErrorMessages, FpDbgClasses, FpDbgUtil, DbgIntfBaseTypes,
-  LazClasses, LCLProc, Forms, StdCtrls, Controls, StrUtils, FpDebugDebuggerBase,
+  LazClasses, Forms, StdCtrls, Controls, StrUtils, FpDebugDebuggerBase,
  FpDebugStringConstants, LazDebuggerValueConverter, LazDebuggerIntfBaseTypes,
  LazDebuggerIntf;

--- a/components/lazsvnpkg/lazsvnintf.pas
+++ b/components/lazsvnpkg/lazsvnintf.pas
@ -23,7 +23,9 @@ unit LazSVNIntf;
 interface

 uses
-  SysUtils, LCLtype, LResources, LCLProc;
+  SysUtils,
+  LazLoggerBase,
+  LCLtype, LResources;

 procedure ProcSVNLog(Sender: TObject);
 procedure ProcSVNCommit(Sender: TObject);
--- a/components/lazsvnpkg/svnclasses.pas
+++ b/components/lazsvnpkg/svnclasses.pas
@ -23,8 +23,9 @@ unit SVNClasses;
 interface

 uses
-  Classes, SysUtils, ComCtrls, FileUtil, UTF8Process, LCLProc, Controls,
-  XMLRead, DOM, Process, StdCtrls, Forms, fgl;
+  Classes, SysUtils, XMLRead, DOM, Process, fgl,
+  FileUtil, UTF8Process, LazLoggerBase,
+  ComCtrls, Controls, StdCtrls, Forms;

 resourcestring
  rsAction = 'Action';
--- a/components/lazsvnpkg/svncommitform.pas
+++ b/components/lazsvnpkg/svncommitform.pas
@ -5,8 +5,9 @@ unit SVNCommitForm;
 interface

 uses
-  Classes, SysUtils, FileUtil, LResources, Forms, Controls, Graphics, Dialogs,
-  ButtonPanel, StdCtrls, Process, LCLProc;
+  Classes, SysUtils, Process,
+  FileUtil,
+  LResources, Forms, Controls, Graphics, Dialogs, ButtonPanel, StdCtrls;

 type

--- a/components/lazsvnpkg/svnlogform.pas
+++ b/components/lazsvnpkg/svnlogform.pas
@ -23,9 +23,10 @@ unit SVNLogForm;
 interface

 uses
-  Classes, SysUtils, Forms, Dialogs, Controls, FileUtil, LazFileUtils,
-  ComCtrls, StdCtrls, ButtonPanel, ExtCtrls, Spin, DOM,
-  Menus, LCLProc, LazIDEIntf, fgl;
+  Classes, SysUtils, fgl, DOM,
+  LazFileUtils, LazLoggerBase,
+  Forms, Dialogs, Controls, ComCtrls, StdCtrls, ButtonPanel, ExtCtrls, Spin, Menus,
+  LazIDEIntf;

 type
  TActionItem = record
--- a/components/lazsvnpkg/svnstatusform.pas
+++ b/components/lazsvnpkg/svnstatusform.pas
@ -23,10 +23,10 @@ unit SVNStatusForm;
 interface

 uses
-  Classes, SysUtils, Process, LCLProc,
+  Classes, SysUtils, Process,
  Forms, Controls, Dialogs, ComCtrls, StdCtrls, ButtonPanel, ExtCtrls, Menus,
  // LazUtils
-  FileUtil, LazFileUtils, LazConfigStorage, UTF8Process,
+  LazFileUtils, LazConfigStorage, UTF8Process, LazLoggerBase,
  // IDEIntf
  LazIDEIntf, BaseIDEIntf,
  // LazSvn
--- a/components/lazsvnpkg/svnupdateform.pas
+++ b/components/lazsvnpkg/svnupdateform.pas
@ -23,8 +23,10 @@ unit SVNUpdateForm;
 interface

 uses
-  Classes, SysUtils, FileUtil, UTF8Process, LResources, Forms, Controls,
-  Graphics, Dialogs, ComCtrls, ButtonPanel, Process, Buttons, Menus, LCLProc,
+  Classes, SysUtils,
+  FileUtil, UTF8Process, LazLoggerBase,
+  LResources, Forms, Controls,
+  Graphics, Dialogs, ComCtrls, ButtonPanel, Process, Buttons, Menus,
  IDEImagesIntf;

 type
--- a/components/lclextensions/delphicompat.pas
+++ b/components/lclextensions/delphicompat.pas
@ -135,7 +135,7 @@ implementation

 uses
 {$i uses.inc}
-  maps, LazUTF8, LCLProc, LCLMessageGlue, Controls
+  maps, LazUTF8, LCLMessageGlue, Controls
  {$ifdef DEBUG_DELPHICOMPAT}
  ,multiloglcl, filechannel
  {$endif}
--- a/components/printers/unix/cupslcl.pas
+++ b/components/printers/unix/cupslcl.pas
@ -14,8 +14,8 @@ interface

 uses
  Classes, SysUtils,
+  {$ifdef DebugCUPS}LazLoggerBase,{$endif}
  // LCL
-  {$ifdef DebugCUPS}LCLProc,{$endif}
  StdCtrls, Printers,
  // Printers
  OsPrinters, CupsDyn, Printer4LazStrConst;
--- a/components/printers/unix/cupsprinters_h.inc
+++ b/components/printers/unix/cupsprinters_h.inc
@ -53,7 +53,9 @@
 {$ENDIF}

 uses
-  Classes, SysUtils, LCLProc, PostScriptCanvas, Printers, Dialogs, Controls,
+  Classes, SysUtils,
+  LazLoggerBase,
+  PostScriptCanvas, Printers, Dialogs,
  CUPSDyn
  {$IFDEF UseCairo}
  ,CairoCanvas
--- a/components/printers/unix/framepagesetup.pas
+++ b/components/printers/unix/framepagesetup.pas
@ -15,8 +15,7 @@ interface
 uses
  Classes, SysUtils,
  // LCL
-  LCLIntf, LCLProc, LResources, Controls, Graphics, Forms, ExtCtrls, StdCtrls,
-  Spin, Printers,
+  Graphics, Forms, ExtCtrls, StdCtrls, Spin, Printers,
  // Printers
  CupsLCL, Printer4LazStrConst;

--- a/components/printers/unix/udlgpropertiesprinter.pp
+++ b/components/printers/unix/udlgpropertiesprinter.pp
@ -30,8 +30,8 @@ interface
 uses
  Classes, SysUtils,
  // LCL
-  LResources, Forms, Controls, Graphics, Dialogs, ComCtrls, ExtCtrls, StdCtrls,
-  LCLProc, LCLType, ButtonPanel, Printers,
+  Forms, Controls, Graphics, Dialogs, ComCtrls, ExtCtrls, StdCtrls,
+  ButtonPanel, Printers,
  // Printers
  OSPrinters, CupsLCL, CupsDyn, Printer4LazStrConst;

--- a/components/printers/unix/udlgselectprinter.pp
+++ b/components/printers/unix/udlgselectprinter.pp
@ -39,8 +39,8 @@ interface
 uses
  Classes, SysUtils, Types,
  // LCL
-  LResources, Forms, Controls, Graphics, Dialogs, StdCtrls, Buttons, ExtCtrls,
-  Spin, ComCtrls, LCLType, LCLPlatformDef, InterfaceBase, Printers, LCLProc,
+  Forms, Controls, Graphics, Dialogs, StdCtrls, Buttons, ExtCtrls,
+  Spin, ComCtrls, LCLType, LCLPlatformDef, InterfaceBase, Printers,
  // Printers
  Printer4LazStrConst, OsPrinters, CUPSDyn;

--- a/components/synedit/lazsyntextarea.pp
+++ b/components/synedit/lazsyntextarea.pp
@ -8,7 +8,7 @@ interface
 uses
  Classes, SysUtils,
  // LCL
-  Graphics, Controls, LCLType, LCLIntf, LCLProc,
+  Graphics, Controls, LCLType, LCLIntf,
  // LazUtils
  LazMethodList,
  // SynEdit
--- a/components/synedit/synbeautifier.pas
+++ b/components/synedit/synbeautifier.pas
@ -41,7 +41,6 @@ interface

 uses
  Classes, SysUtils, StrUtils,
-  LCLProc,
  LazStringUtils,
  SynEditMiscClasses, SynEditMiscProcs, LazSynEditText, SynEditPointClasses,
  SynEditKeyCmds, SynEditTypes;
--- a/components/synedit/syncompletion.pas
+++ b/components/synedit/syncompletion.pas
@ -46,10 +46,10 @@ interface
 uses
  Classes, SysUtils, Types, Character,
  // LCL
-  LCLProc, LCLIntf, LCLType, LMessages, Graphics, Forms,
+  LCLIntf, LCLType, LMessages, Graphics, Forms,
  Controls, StdCtrls, ExtCtrls, Menus, Themes,
  // LazUtils
-  LazUTF8,
+  LazUTF8, LazLoggerBase,
  // SynEdit
  SynEditMiscProcs, SynEditKeyCmds, SynEdit, SynEditTypes, SynEditPlugins;

--- a/components/synedit/syneditautocomplete.pp
+++ b/components/synedit/syneditautocomplete.pp
@ -45,7 +45,7 @@ interface

 uses
  Classes, SysUtils, StrUtils,
-  LCLIntf, LCLType, Controls, LCLProc,
+  LCLIntf, LCLType, Controls,
  LazStringUtils, LazUTF8,
  SynEdit, SynEditKeyCmds, SynEditPlugins;

--- a/components/synedit/syneditexport.pas
+++ b/components/synedit/syneditexport.pas
@ -48,10 +48,9 @@ unit SynEditExport;
 interface

 uses
-  Classes,
-  SysUtils,
+  Classes, SysUtils,
  SynEditHighlighter, SynEditTextBase, SynEditTextBuffer,
-  FileUtil, LazUTF8, FPCAdds, LCLType, LCLProc,
+  FileUtil, LazUTF8, FPCAdds, LCLType,
  Graphics, Clipbrd,
  SynEditMiscProcs, SynEditStrConst;

--- a/components/synedit/syneditfoldedview.pp
+++ b/components/synedit/syneditfoldedview.pp
@ -46,7 +46,7 @@ interface
 uses
  Classes, SysUtils,
  // LCL
-  LCLProc, Graphics, LCLType,
+  Graphics, LCLType,
  // LazUtils
  LazLoggerBase, LazMethodList,
  // SynEdit
--- a/components/synedit/synedithighlighter.pp
+++ b/components/synedit/synedithighlighter.pp
@ -34,7 +34,7 @@ interface
 uses
  SysUtils, Classes, Registry, IniFiles,
  // LCL
-  LCLProc, LCLIntf, LCLType, Graphics,
+  LCLType, Graphics,
  // LazUtils
  LazUTF8, LazMethodList,
  // SynEdit
--- a/components/synedit/synedithighlighterfoldbase.pas
+++ b/components/synedit/synedithighlighterfoldbase.pas
@ -58,10 +58,8 @@ interface

 uses
  SysUtils, Classes, math, Laz_AVL_Tree,
-  // LCL
-  LCLProc,
  // LazUtils
-  LazClasses, LazLoggerBase,
+  LazClasses, LazLoggerBase, LazTracer,
  // SynEdit
  SynEditHighlighter, SynEditTypes, LazSynEditText;

--- a/components/synedit/syneditmarks.pp
+++ b/components/synedit/syneditmarks.pp
@ -11,8 +11,8 @@ unit SynEditMarks;
 interface

 uses
-  Classes, Controls, SysUtils, math, SynEditMiscClasses, LazSynEditText,
-  LCLProc, ImgList;
+  Classes, Controls, SysUtils, Math, SynEditMiscClasses, LazSynEditText,
+  ImgList;

 type

--- a/components/synedit/syneditmarkup.pp
+++ b/components/synedit/syneditmarkup.pp
@ -26,8 +26,8 @@ unit SynEditMarkup;
 interface

 uses
-  Classes, SysUtils, Graphics, SynEditTypes, LazSynEditText, SynEditPointClasses,
-  SynEditMiscClasses, Controls, SynEditHighlighter, SynEditMiscProcs, LCLProc;
+  Classes, SysUtils, Graphics, Controls, LazLoggerBase, SynEditTypes,
+  LazSynEditText, SynEditPointClasses, SynEditMiscClasses, SynEditHighlighter;

 type
  TLazSynDisplayRtlInfo = record
--- a/components/synedit/syneditmarkupbracket.pp
+++ b/components/synedit/syneditmarkupbracket.pp
@ -26,7 +26,7 @@ unit SynEditMarkupBracket;
 interface

 uses
-  Classes, SysUtils, Graphics, SynEditMarkup, SynEditMiscClasses, SynEditTypes, Controls, LCLProc;
+  Classes, SysUtils, Graphics, Controls, SynEditMarkup, SynEditMiscClasses, SynEditTypes;

 type
  TSynEditBracketHighlightStyle = (
--- a/components/synedit/syneditmarkupctrlmouselink.pp
+++ b/components/synedit/syneditmarkupctrlmouselink.pp
@ -26,8 +26,8 @@ unit SynEditMarkupCtrlMouseLink;
 interface

 uses
-  Classes, SysUtils, Graphics, SynEditMarkup, SynEditMiscClasses,
-  SynEditMouseCmds, LazSynEditText, SynEditTypes, Controls, LCLProc;
+  Classes, SysUtils, Graphics, Controls, SynEditMarkup, SynEditMiscClasses,
+  SynEditMouseCmds, LazSynEditText, SynEditTypes;

 type

--- a/components/synedit/syneditmarkupfoldcoloring.pas
+++ b/components/synedit/syneditmarkupfoldcoloring.pas
@ -49,8 +49,9 @@ unit SynEditMarkupFoldColoring;
 interface

 uses
-  Classes, SysUtils, Graphics, SynEditMarkup, SynEditMiscClasses, Controls,
-  LCLProc, LCLType, SynEditHighlighter,
+  Classes, SysUtils, Graphics, Controls,
+  SynEditMarkup, SynEditMiscClasses,
+  SynEditHighlighter,
  SynEditHighlighterFoldBase, LazSynEditText, SynEditTextBase, SynEditTypes,
  {$IFDEF WithSynMarkupFoldColorDebugGutter}SynGutterBase, SynTextDrawer,{$ENDIF}
  SynEditMiscProcs,
--- a/components/synedit/syneditmarkupguttermark.pp
+++ b/components/synedit/syneditmarkupguttermark.pp
@ -26,7 +26,7 @@ unit SynEditMarkupGutterMark;
 interface

 uses
-  Classes, SysUtils, Graphics, Controls, LCLProc,
+  Classes, SysUtils, Graphics, Controls,
  SynEditMarkup, SynEditMiscClasses, SynEditMarks;

 type
--- a/components/synedit/syneditmarkupselection.pp
+++ b/components/synedit/syneditmarkupselection.pp
@ -26,7 +26,7 @@ unit SynEditMarkupSelection;
 interface

 uses
-  Classes, SysUtils, Graphics, Controls, LCLProc,
+  Classes, SysUtils, Graphics, Controls,
  SynEditMarkup, SynEditMiscClasses, SynEditPointClasses, SynEditTypes;

 type
--- a/components/synedit/syneditmarkupspecialchar.pp
+++ b/components/synedit/syneditmarkupspecialchar.pp
@ -26,7 +26,7 @@ unit SynEditMarkupSpecialChar;
 interface

 uses
-  Classes, SysUtils, Graphics, Controls, LCLProc,
+  Classes, SysUtils, Graphics, Controls,
  SynEditMarkup, SynEditTypes, SynEditMiscClasses;

 type
--- a/components/synedit/syneditmarkupspecialline.pp
+++ b/components/synedit/syneditmarkupspecialline.pp
@ -26,7 +26,7 @@ unit SynEditMarkupSpecialLine;
 interface

 uses
-  Classes, SysUtils, Graphics, SynEditMarkup, SynEditMiscClasses, Controls, LCLProc;
+  Classes, SysUtils, Graphics, SynEditMarkup, SynEditMiscClasses;

 type

--- a/components/synedit/syneditmarkupwordgroup.pp
+++ b/components/synedit/syneditmarkupwordgroup.pp
@ -27,7 +27,7 @@ interface

 uses
  Classes, SysUtils, Graphics, SynEditMarkup, SynEditMiscClasses, Controls,
-  LCLProc, SynEditHighlighter, SynEditHighlighterFoldBase;
+  SynEditHighlighter, SynEditHighlighterFoldBase;

 type

--- a/components/synedit/syneditmousecmds.pp
+++ b/components/synedit/syneditmousecmds.pp
@ -37,7 +37,7 @@ interface
 uses
  Classes, SysUtils,
  // LCL
-  LCLProc, Controls, Dialogs, Menus,
+  Controls, Dialogs, Menus,
  // LazUtils
  LazMethodList,
  // SynEdit
--- a/components/synedit/synedittextbase.pas
+++ b/components/synedit/synedittextbase.pas
@ -38,8 +38,6 @@ interface

 uses
  Classes, SysUtils,
-  // LCL
-  LCLProc,
  // LazUtils
  LazMethodList,
  // SynEdit
--- a/components/synedit/synedittextbuffer.pp
+++ b/components/synedit/synedittextbuffer.pp
@ -47,7 +47,7 @@ unit SynEditTextBuffer;
 interface

 uses
-  Classes, SysUtils, Graphics, LCLProc, LCLIntf, LCLType,
+  Classes, SysUtils, Graphics, LCLProc,
  SynEditTypes, LazSynEditText, SynEditTextBase, SynEditMiscProcs, SynEditMiscClasses,
  SynEditHighlighter;

--- a/components/synedit/synedittexttabexpander.pas
+++ b/components/synedit/synedittexttabexpander.pas
@ -26,7 +26,7 @@ unit SynEditTextTabExpander;
 interface

 uses
-  LCLProc, Classes, SysUtils, math, LazSynEditText, SynEditTextBase;
+  Classes, SysUtils, Math, LazSynEditText, SynEditTextBase;

 type

--- a/components/synedit/synedittexttrimmer.pas
+++ b/components/synedit/synedittexttrimmer.pas
@ -27,7 +27,6 @@ unit SynEditTextTrimmer;
 interface

 uses
-LCLProc,
  Classes, SysUtils, LazSynEditText, SynEditTextBase, SynEditTypes, SynEditHighlighter,
  SynEditPointClasses, SynEditMiscProcs;

--- a/components/synedit/synexporthtml.pas
+++ b/components/synedit/synexporthtml.pas
@ -45,9 +45,9 @@ unit SynExportHTML;
 interface

 uses
-  Classes,
+  Classes, SysUtils,
  LCLIntf, LCLType, Graphics, ClipBrd,
-  SynEditHighlighter, SynEditExport, LCLProc, LazUtf8, SysUtils, SynEditStrConst;
+  SynEditHighlighter, SynEditExport, LazUtf8, SynEditStrConst;

 type
  THTMLFontSize = (fs01, fs02, fs03, fs04, fs05, fs06, fs07, fsDefault);        //eb 2000-10-12
--- a/components/synedit/syngutter.pp
+++ b/components/synedit/syngutter.pp
@ -5,7 +5,7 @@ unit SynGutter;
 interface

 uses
-  SysUtils, Classes, Controls, Graphics, LCLType, LCLIntf, LCLProc, Menus,
+  SysUtils, Classes, Controls, Graphics, LCLType, LCLIntf, Menus,
  SynEditMarks, SynEditTypes, SynEditMiscClasses, SynEditMiscProcs, LazSynTextArea,
  SynTextDrawer, SynGutterBase, SynGutterLineNumber, SynGutterCodeFolding,
  SynGutterMarks, SynGutterChanges, SynEditMouseCmds, SynGutterLineOverview;
--- a/components/synedit/syngutterbase.pp
+++ b/components/synedit/syngutterbase.pp
@ -7,7 +7,7 @@ interface
 uses
  Classes, SysUtils, math,
  // LCL
-  LCLProc, Graphics, Controls, Menus, LCLIntf, LCLType,
+  Graphics, Controls, Menus, LCLIntf, LCLType,
  // LazUtils
  LazMethodList,
  // SynEdit
--- a/components/synedit/synguttercodefolding.pp
+++ b/components/synedit/synguttercodefolding.pp
@ -29,7 +29,7 @@ interface
 uses
  SysUtils, Classes, Controls, Graphics, Menus, LCLIntf, SynGutterBase,
  SynEditMiscProcs, SynEditFoldedView, SynEditMouseCmds,
-  SynEditHighlighterFoldBase, LCLProc, LCLType, ImgList, Forms;
+  SynEditHighlighterFoldBase, LCLType, ImgList, Forms;

 type

--- a/components/synedit/synguttermarks.pp
+++ b/components/synedit/synguttermarks.pp
@ -5,7 +5,7 @@ unit SynGutterMarks;
 interface

 uses
-  Classes, SysUtils, Graphics, LCLType, LCLIntf, LCLProc, Controls, ImgList,
+  Classes, SysUtils, Graphics, LCLType, LCLIntf, Controls, ImgList,
  SynGutterBase, SynEditMiscClasses, SynEditMarks, LazSynEditText,
  SynEditMiscProcs;

--- a/components/synedit/synhighlightermulti.pas
+++ b/components/synedit/synhighlightermulti.pas
@ -51,7 +51,7 @@ unit SynHighlighterMulti;
 interface

 uses
-  Classes, Graphics, SysUtils, LCLProc, math, RegExpr,
+  Classes, Graphics, SysUtils, Math, RegExpr,
  SynEditStrConst, SynEditTypes, SynEditTextBase,
  SynEditHighlighter,
  {$IFDEF SynDebugMultiHL}LazLoggerBase{$ELSE}LazLoggerDummy{$ENDIF}, LazUTF8
--- a/components/synedit/synhighlighterpas.pp
+++ b/components/synedit/synhighlighterpas.pp
@ -51,8 +51,7 @@ unit SynHighlighterPas;
 interface

 uses
-  SysUtils, LCLProc,
-  Classes, Registry, Graphics, SynEditHighlighterFoldBase, SynEditMiscProcs,
+  SysUtils, Classes, Registry, Graphics, SynEditHighlighterFoldBase, SynEditMiscProcs,
  SynEditTypes, SynEditHighlighter, SynEditTextBase, SynEditStrConst, SynEditMiscClasses;

 type
--- a/components/synedit/synpluginsyncronizededitbase.pp
+++ b/components/synedit/synpluginsyncronizededitbase.pp
@ -26,7 +26,7 @@ unit SynPluginSyncronizedEditBase;
 interface

 uses
-  Classes, SysUtils, Graphics, LCLProc,
+  Classes, SysUtils, Graphics,
  SynEditMiscClasses, SynEdit, SynEditMarkup, SynEditMiscProcs, LazSynEditText,
  SynEditTextTrimmer, SynEditKeyCmds, SynEditTextBase;

--- a/components/synedit/synplugintemplateedit.pp
+++ b/components/synedit/synplugintemplateedit.pp
@ -27,8 +27,7 @@ interface

 uses
  Classes, SysUtils, Graphics, LCLType,
-  SynPluginSyncronizedEditBase, SynEditKeyCmds, SynEdit, SynEditMiscProcs,
-  LCLProc;
+  SynPluginSyncronizedEditBase, SynEditKeyCmds, SynEdit, SynEditMiscProcs;

 type

--- a/components/synedit/test/SynTest.lpi
+++ b/components/synedit/test/SynTest.lpi
@ -552,7 +552,7 @@
      <Modes>
        <Mode Name="default">
          <local>
-            <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T &apos;Lazarus Run Output&apos; -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
+            <LaunchingApplication PathPlusParams="\usr\X11R6\bin\xterm -T &apos;Lazarus Run Output&apos; -e $(LazarusDir)\tools\runwait.sh $(TargetCmdLine)"/>
          </local>
        </Mode>
      </Modes>
--- a/components/synedit/test/testbookmarks.pas
+++ b/components/synedit/test/testbookmarks.pas
@ -7,7 +7,7 @@ unit TestBookMarks;
 interface

 uses
-  Classes, SysUtils, testregistry, TestBase, LCLProc,
+  Classes, SysUtils, testregistry, TestBase,
  SynEdit, SynEditMarks, SynEditKeyCmds;

 type
--- a/components/synedit/test/testfoldedview.pas
+++ b/components/synedit/test/testfoldedview.pas
@ -12,7 +12,7 @@ interface

 uses
  Classes, SysUtils, math, testregistry, TestBase, TestHighlightPas, Forms,
-  LCLProc, SynEdit, SynHighlighterPas, SynEditFoldedView,
+  LazLoggerBase, SynEdit, SynHighlighterPas, SynEditFoldedView,
  SynEditHighlighterFoldBase, SynGutterCodeFolding, SynEditKeyCmds,
  SynEditTypes, SynEditMiscProcs;

--- a/components/synedit/test/testhighlightmulti.pas
+++ b/components/synedit/test/testhighlightmulti.pas
@ -5,7 +5,7 @@ unit TestHighlightMulti;
 interface

 uses
-  Classes, SysUtils, math, LCLProc, testregistry, TestBase, Forms, SynEditHighlighter,
+  Classes, SysUtils, Math, testregistry, TestBase, Forms, SynEditHighlighter,
  SynHighlighterMulti, SynHighlighterLFM, SynHighlighterXML, SynHighlighterPas, SynEditKeyCmds,
  LazSynEditText, SynEditTextBuffer, SynEditTypes, LazLoggerBase;

--- a/components/synedit/test/testhighlightpas.pas
+++ b/components/synedit/test/testhighlightpas.pas
@ -5,7 +5,7 @@ unit TestHighlightPas;
 interface

 uses
-  Classes, SysUtils, testregistry, TestBase, Forms, LCLProc,
+  Classes, SysUtils, testregistry, TestBase, Forms, LazLoggerBase,
  TestHighlightFoldBase, SynEdit, SynEditTypes, SynHighlighterPas,
  SynEditHighlighterFoldBase, SynEditHighlighter;

--- a/components/synedit/test/testmarkupfoldcoloring.pas
+++ b/components/synedit/test/testmarkupfoldcoloring.pas
@ -6,7 +6,7 @@ interface

 uses
  Classes, SysUtils, math, testregistry, TestBase, TestHighlightPas, Forms,
-  LCLProc, LCLType, SynEdit, SynHighlighterPas, SynEditMarkupFoldColoring,
+  LCLType, SynEdit, SynHighlighterPas, SynEditMarkupFoldColoring,
  SynEditMiscClasses, SynEditMarkup, SynEditHighlighterFoldBase;

 type
--- a/components/synedit/test/testmarkuphighall.pas
+++ b/components/synedit/test/testmarkuphighall.pas
@ -5,8 +5,8 @@ unit TestMarkupHighAll;
 interface

 uses
-  Classes, SysUtils, testregistry, TestBase, LCLProc, Controls,
-  Graphics, SynEdit, SynEditMarkupHighAll;
+  Classes, SysUtils, testregistry, TestBase, Controls, Graphics, LazLoggerBase,
+  SynEdit, SynEditMarkupHighAll;

 type

--- a/components/synedit/test/testmarkupifdef.pas
+++ b/components/synedit/test/testmarkupifdef.pas
@ -5,7 +5,7 @@ unit TestMarkupIfDef;
 interface

 uses
-  Classes, SysUtils, testregistry, TestBase, TestHighlightFoldBase, LCLProc,
+  Classes, SysUtils, testregistry, TestBase, TestHighlightFoldBase, LazLoggerBase,
  SynEdit, SynEditMarkupIfDef, SynHighlighterPas, SynEditHighlighterFoldBase,
  SynEditMiscClasses, SynEditFoldedView;

--- a/components/synedit/test/testmarkupwordgroup.pas
+++ b/components/synedit/test/testmarkupwordgroup.pas
@ -5,7 +5,7 @@ unit TestMarkupwordGroup;
 interface

 uses
-  Classes, SysUtils, testregistry, TestBase, TestHighlightPas, Forms, LCLProc,
+  Classes, SysUtils, testregistry, TestBase, TestHighlightPas, Forms,
  SynEdit, SynHighlighterPas, SynEditMarkupWordGroup;

 type
--- a/components/synedit/test/testsynbeautifier.pas
+++ b/components/synedit/test/testsynbeautifier.pas
@ -7,7 +7,7 @@ interface
 uses
  Classes, SysUtils, testregistry, TestBase, TestHighlightPas,
  SynEdit, SynEditTextTrimmer, SynEditKeyCmds, SynBeautifier, SynEditTypes, SynBeautifierPascal,
-  LCLType, LCLProc;
+  LCLType, LazLoggerBase;

 type

--- a/components/synedit/test/testsyncroedit.pas
+++ b/components/synedit/test/testsyncroedit.pas
@ -5,7 +5,7 @@ unit TestSyncroEdit;
 interface

 uses
-  Classes, SysUtils, math, testregistry, LCLProc, LCLType, Forms, TestBase,
+  Classes, SysUtils, Math, testregistry, LCLType, LazLoggerBase, Forms, TestBase,
  SynEdit, SynPluginSyncroEdit, SynEditKeyCmds, SynPluginTemplateEdit,
  SynPluginSyncronizedEditBase, SynEditTypes;

--- a/components/synedit/test/testsynselection.pas
+++ b/components/synedit/test/testsynselection.pas
@ -19,7 +19,7 @@ interface
 uses
  Classes, SysUtils, testregistry, TestBase, Forms,
  SynEdit, SynEditTypes, SynEditTextTrimmer, SynEditKeyCmds,
-  LCLType, LCLProc;
+  LCLType, LazLoggerBase;

 type

--- a/components/synedit/test/testsynsharededits.pas
+++ b/components/synedit/test/testsynsharededits.pas
@ -7,7 +7,7 @@ unit TestSynSharedEdits;
 interface

 uses
-  Classes, SysUtils, testregistry, TestBase, LCLProc,
+  Classes, SysUtils, testregistry, TestBase,
  SynEdit, SynEditMarks, SynEditKeyCmds;

 type
--- a/components/synedit/test/testtrimspace.pas
+++ b/components/synedit/test/testtrimspace.pas
@ -16,7 +16,7 @@ or between two empty lines
 *)

 uses
-  Classes, SysUtils, Forms, testregistry, TestBase, LCLProc, LCLType,
+  Classes, SysUtils, Forms, testregistry, TestBase, LCLType,
  SynEdit, SynEditKeyCmds, SynEditTextTrimmer, SynEditTypes;

 type
--- a/converter/chgencodingdlg.pas
+++ b/converter/chgencodingdlg.pas
@ -33,7 +33,7 @@ uses
  // RTL + FCL
  Classes, SysUtils, RegExpr, Laz_AVL_Tree,
  // LCL
-  LCLProc, Forms, Controls, ExtCtrls, StdCtrls, ComCtrls, Buttons,
+  Forms, Controls, ExtCtrls, StdCtrls, ComCtrls, Buttons,
  // CodeTools
  CodeCache, CodeToolManager, FileProcs,
  // LazUtils
--- a/converter/convertdelphi.pas
+++ b/converter/convertdelphi.pas
@ -35,11 +35,12 @@ uses
  // RTL + FCL
  Classes, SysUtils, contnrs, IniFiles,
  // LCL
-  LCLProc, Forms, Controls, Dialogs,
+  Forms, Controls, Dialogs,
  // CodeTools
-  CodeToolManager, DefineTemplates, CodeCache, LinkScanner, FileProcs,
+  CodeToolManager, DefineTemplates, CodeCache, LinkScanner,
  // LazUtils
-  LConvEncoding, FileUtil, LazFileUtils, LazUTF8, LazStringUtils, AvgLvlTree,
+  LConvEncoding, FileUtil, LazFileUtils, LazUTF8, LazStringUtils, LazLoggerBase,
+  AvgLvlTree,
  // IDEIntf
  ComponentReg, IDEDialogs, LazIDEIntf, PackageIntf, ProjectIntf,
  IDEExternToolIntf, IDEOptEditorIntf,
--- a/converter/lazxmlforms.pas
+++ b/converter/lazxmlforms.pas
@ -36,8 +36,8 @@ unit LazXMLForms;
 interface

 uses
-  Classes, SysUtils, LCLProc,
-  laz2_DOM, Laz2_XMLCfg, Laz_XMLStreaming;
+  Classes, SysUtils,
+  laz2_DOM, Laz2_XMLCfg, Laz_XMLStreaming, LazLoggerBase;

 function CreateXMLWriter(ADoc: TDOMDocument; const Path: string;
  Append: Boolean; var DestroyDriver: boolean): TWriter;
--- a/converter/missingpropertiesdlg.pas
+++ b/converter/missingpropertiesdlg.pas
@ -33,10 +33,10 @@ interface

 uses
  // FCL+LCL
-  Classes, SysUtils, contnrs,
-  LCLProc, Forms, Controls, Grids, LResources, Dialogs, Buttons, StdCtrls, ExtCtrls,
+  Classes, SysUtils, Contnrs,
+  Forms, Controls, Grids, LResources, Dialogs, Buttons, StdCtrls, ExtCtrls,
  // LazUtils
-  LazFileUtils, LazUTF8, AvgLvlTree,
+  LazFileUtils, LazUTF8, LazLoggerBase, AvgLvlTree,
  // components
  SynHighlighterLFM, SynEdit, SynEditMiscClasses,
  // codetools
--- a/converter/missingunits.pas
+++ b/converter/missingunits.pas
@ -34,10 +34,7 @@ uses
  // FCL
  Classes, SysUtils,
  // LCL
-  LCLProc, LResources, Forms, Controls, Graphics, Dialogs, Buttons, StdCtrls,
-  CheckLst, Menus, ExtCtrls,
-  // LazUtils
-  FileUtil,
+  Forms, Controls, Graphics, Dialogs, Buttons, StdCtrls, CheckLst, Menus, ExtCtrls,
  // CodeTools
  DefineTemplates,
  // IdeIntf
--- a/debugger/frames/debugger_class_options.pas
+++ b/debugger/frames/debugger_class_options.pas
@ -40,10 +40,9 @@ uses
  // IdeDebugger
  Debugger, IdeDebuggerOpts, EnvDebuggerOptions,
  // IdeConfig
-  EnvironmentOpts,
+  EnvironmentOpts, TransferMacros,
  // IDE
-  TransferMacros, LazarusIDEStrConsts, PathEditorDlg, DialogProcs,
-  Project, EnvGuiOptions;
+  LazarusIDEStrConsts, PathEditorDlg, DialogProcs, Project, EnvGuiOptions;

 type

--- a/designer/changeclassdialog.pas
+++ b/designer/changeclassdialog.pas
@ -37,7 +37,9 @@ interface
 uses
  Classes, SysUtils, AvgLvlTree,
  // LCL
-  LCLProc, LCLType, LResources, Forms, Controls, Dialogs, StdCtrls, ButtonPanel,
+  LCLType, Forms, Controls, Dialogs, StdCtrls, ButtonPanel,
+  // LazUtils
+  LazLoggerBase,
  // Codetools
  LFMTrees, CodeCache, CodeToolManager,
  // IdeIntf
--- a/designer/controlselection.pp
+++ b/designer/controlselection.pp
@ -39,7 +39,7 @@ interface
 uses
  Types, Classes, SysUtils, Math, FPCanvas,
  // LCL
-  LCLIntf, LCLType, LCLProc, Controls, Forms, Graphics, Menus, ComCtrls,
+  LCLIntf, LCLProc, Controls, Forms, Graphics, Menus, ComCtrls,
  // LazUtils
  GraphType, GraphMath,
  // IDEIntf
--- a/ide/abstractsmethodsdlg.pas
+++ b/ide/abstractsmethodsdlg.pas
@ -33,8 +33,9 @@ unit AbstractsMethodsDlg;
 interface

 uses
-  Classes, SysUtils, LCLProc, Forms, Controls, Graphics, Dialogs,
-  CheckLst, StdCtrls, ExtCtrls, Buttons,
+  Classes, SysUtils,
+  Forms, Controls, Graphics, Dialogs, CheckLst, StdCtrls, ExtCtrls, Buttons,
+  LazLoggerBase,
  CodeTree, PascalParserTool, CodeCache, CodeToolManager,
  LazIDEIntf, SrcEditorIntf, IDEDialogs,
  IdeIntfStrConsts, LazarusIDEStrConsts;
--- a/ide/allcompileroptions.pas
+++ b/ide/allcompileroptions.pas
@ -28,9 +28,14 @@ unit AllCompilerOptions;
 interface

 uses
-  Classes, SysUtils, math, contnrs,
+  Classes, SysUtils, Math, Contnrs,
+  // LCL
  Forms, Controls, StdCtrls, Buttons, ButtonPanel, EditBtn, ExtCtrls,
-  LCLProc, LazUTF8, Compiler, IDEImagesIntf, LazarusIDEStrConsts;
+  // LazUtils
+  LazUTF8, LazLoggerBase,
+  // IdeIntf
+  IDEImagesIntf,
+  Compiler, LazarusIDEStrConsts;

 type

--- a/ide/buildfiledlg.pas
+++ b/ide/buildfiledlg.pas
@ -9,17 +9,17 @@ interface
 uses
  Classes, SysUtils,
  // LCL
-  LCLProc, LCLType, Forms, Controls, Graphics, ComCtrls, Dialogs, StdCtrls, ButtonPanel,
+  LCLType, Forms, Controls, Graphics, ComCtrls, Dialogs, StdCtrls, ButtonPanel,
  // LazUtils
-  LazFileUtils, LazStringUtils,
+  LazFileUtils, LazStringUtils, LazTracer,
  // CodeTools
  BasicCodeTools,
  // IdeIntf
  IdeIntfStrConsts, IDEHelpIntf, MacroDefIntf, LazIDEIntf, IDEUtils, InputHistory,
  // IdeConfig
-  EnvironmentOpts,
+  EnvironmentOpts, TransferMacros,
  // IDE
-  LazarusIDEStrConsts, TransferMacros;
+  LazarusIDEStrConsts;

 type

--- a/ide/buildlazdialog.pas
+++ b/ide/buildlazdialog.pas
@ -48,7 +48,7 @@ uses
  {$IFDEF Windows}
  Windows,
  {$ENDIF}
-  LCLProc, Forms, Controls, LCLType, StdCtrls, ExtCtrls, Buttons, Dialogs,
+  Forms, Controls, StdCtrls, ExtCtrls, Buttons, Dialogs,
  LCLPlatformDef, CheckLst, Menus, ComCtrls,
  // LazUtils
  FPCAdds, FileUtil, LazFileUtils, LazUTF8, LazLoggerBase, LazFileCache,
@ -59,9 +59,10 @@ uses
  // IDEIntf
  IdeIntfStrConsts, LazIDEIntf, IDEMsgIntf, IDEHelpIntf, IDEImagesIntf, IDEWindowIntf,
  PackageIntf, IDEExternToolIntf, IDEDialogs, IDEUtils,
+  // IdeConfig
+  EnvironmentOpts, LazConf, TransferMacros,
  // IDE
-  LazarusIDEStrConsts, TransferMacros, LazConf, DialogProcs,
-  MainBar, EnvironmentOpts,
+  LazarusIDEStrConsts, DialogProcs, MainBar,
  ApplicationBundle, ModeMatrixOpts, CompilerOptions, BuildProfileManager,
  GenericListEditor, GenericCheckList, PackageSystem, PackageDefs;

--- a/ide/buildmodesmanager.pas
+++ b/ide/buildmodesmanager.pas
@ -34,16 +34,17 @@ uses
  Classes, SysUtils,
  {$IF FPC_FULLVERSION >= 30200}System.{$ENDIF}UITypes,
  // LCL
-  Forms, Controls, Dialogs, StdCtrls, Grids, Menus, ComCtrls, ButtonPanel, LCLProc,
+  Forms, Dialogs, StdCtrls, Grids, Menus, ComCtrls, ButtonPanel,
  // LazUtils
  LazFileUtils, LazLoggerBase,
  // IdeIntf
  IDEDialogs, CompOptsIntf, IDEOptionsIntf, LazIDEIntf, IDEImagesIntf,
+  // IdeConfig
+  EnvironmentOpts, TransferMacros, SearchPathProcs,
  // IDE
  MainBase, MainBar, BasePkgManager, PackageDefs, Project, CompilerOptions,
-  EnvironmentOpts, TransferMacros, BaseBuildManager, Compiler_ModeMatrix,
-  BuildModeDiffDlg, GenericCheckList, IDEProcs, LazarusIDEStrConsts,
-  SearchPathProcs;
+  BaseBuildManager, Compiler_ModeMatrix, BuildModeDiffDlg, GenericCheckList,
+  LazarusIDEStrConsts;

 type

--- a/ide/buildprofilemanager.pas
+++ b/ide/buildprofilemanager.pas
@ -40,10 +40,11 @@ uses
  // Codetools
  DefineTemplates,
  // IdeIntf
-  IDEImagesIntf, IDEHelpIntf, IDEDialogs,
+  IdeIntfStrConsts, IDEImagesIntf, IDEHelpIntf, IDEDialogs,
+  // IdeConfig
+  EnvironmentOpts, TransferMacros, IdeXmlConfigProcs,
  // IDE
-  LazarusIDEStrConsts, IdeIntfStrConsts, IDEProcs, TransferMacros, EnvironmentOpts,
-  IdeXmlConfigProcs;
+  LazarusIDEStrConsts, IDEProcs;

 type

--- a/ide/checkcompileropts.pas
+++ b/ide/checkcompileropts.pas
@ -42,9 +42,11 @@ uses
  // IDEIntf
  ProjectIntf, MacroIntf, IDEExternToolIntf, LazIDEIntf, IDEDialogs,
  PackageIntf, IDEMsgIntf,
+  // IdeConfig
+  TransferMacros, SearchPathProcs,
  // IDE
  Project, PackageSystem, IDEProcs, LazarusIDEStrConsts, PackageDefs,
-  CompilerOptions, TransferMacros, SearchPathProcs;
+  CompilerOptions;

 type
  TCompilerOptionsTest = (
--- a/ide/checkcompoptsfornewunitdlg.pas
+++ b/ide/checkcompoptsfornewunitdlg.pas
@ -31,11 +31,13 @@ unit CheckCompOptsForNewUnitDlg;
 interface

 uses
-  Classes, SysUtils, LCLProc, FileUtil, Forms, Controls, Graphics, Dialogs,
-  StdCtrls, ExtCtrls, ButtonPanel,
-  CodeToolManager, BasicCodeTools, DefineTemplates,
-  CompOptsIntf, ProjectIntf, IDEDialogs,
-  InputHistory, TransferMacros, Project, IdeIntfStrConsts, LazarusIDEStrConsts;
+  SysUtils,
+  Forms, Controls, Dialogs, StdCtrls, ButtonPanel,
+  BasicCodeTools, DefineTemplates,
+  CompOptsIntf,
+  IDEDialogs, InputHistory, IdeIntfStrConsts,
+  TransferMacros,
+  Project, LazarusIDEStrConsts;

 type

--- a/ide/checklfmdlg.pas
+++ b/ide/checklfmdlg.pas
@ -34,9 +34,9 @@ uses
  // FCL
  Classes, SysUtils, Math, TypInfo, contnrs,
  // LCL
-  LCLProc, LResources, Forms, Controls, Dialogs, Buttons, StdCtrls, ExtCtrls,
+  LResources, Forms, Controls, Dialogs, Buttons, StdCtrls, ExtCtrls,
  // LazUtils
-  LazStringUtils, AvgLvlTree,
+  LazStringUtils, LazLoggerBase, LazTracer, AvgLvlTree,
  // CodeTools
  BasicCodeTools, CodeCache, CodeToolManager, LFMTrees,
  // SynEdit
--- a/ide/cleandirdlg.pas
+++ b/ide/cleandirdlg.pas
@ -32,15 +32,15 @@ interface
 uses
  Classes, SysUtils, RegExpr,
  // LCL
-  LCLProc, Forms, Controls, Graphics, Dialogs, StdCtrls, ButtonPanel,
+  Forms, Controls, Graphics, Dialogs, StdCtrls, ButtonPanel,
  // LazUtils
-  FileUtil, LazFileUtils, Laz2_XMLCfg, LazStringUtils,
+  FileUtil, LazFileUtils, Laz2_XMLCfg, LazStringUtils, LazLoggerBase,
  // IdeIntf
  IdeIntfStrConsts, IDEWindowIntf, IDEHelpIntf, IDEDialogs, InputHistory,
  // IdeConfig
-  RecentListProcs, LazConf, EnvironmentOpts,
+  RecentListProcs, LazConf, EnvironmentOpts, TransferMacros,
  // IDE
-  LazarusIDEStrConsts, TransferMacros, ShowDeletingFilesDlg;
+  LazarusIDEStrConsts, ShowDeletingFilesDlg;

 type

--- a/ide/codebrowser.pas
+++ b/ide/codebrowser.pas
@ -47,9 +47,9 @@ interface

 uses
  // RTL + FCL
-  Classes, SysUtils, types, Laz_AVL_Tree,
+  Classes, SysUtils, Types, Laz_AVL_Tree,
  // LCL
-  LCLProc, Forms, Controls, Graphics, Dialogs, Clipbrd, StdCtrls,
+  Forms, Controls, Graphics, Dialogs, Clipbrd, StdCtrls,
  ExtCtrls, ComCtrls, Buttons, Menus, HelpIntfs,
  // CodeTools
  BasicCodeTools, DefineTemplates, CodeTree, CodeCache, CodeToolManager,
--- a/ide/codeexplopts.pas
+++ b/ide/codeexplopts.pas
@ -37,11 +37,11 @@ uses
  // RTL + FCL
  Classes, SysUtils, Laz_AVL_Tree,
  // LCL
-  LCLProc, Forms, Controls, Graphics, Dialogs, Buttons,
+  Forms, Controls, Graphics, Dialogs, Buttons,
  // CodeTools
-  BasicCodeTools, FileProcs,
+  BasicCodeTools,
  // LazUtils
-  AvgLvlTree, Laz2_XMLCfg, LazFileUtils, LazFileCache,
+  AvgLvlTree, Laz2_XMLCfg, LazFileUtils, LazFileCache, LazLoggerBase,
  // IDEIntf
  IDEOptionsIntf, IDEOptEditorIntf,
  // IDE
--- a/ide/codehelp.pas
+++ b/ide/codehelp.pas
@ -55,9 +55,11 @@ uses
  // IDEIntf
  IDECommands, IDEMsgIntf, MacroIntf, PackageIntf, LazHelpIntf, ProjectIntf,
  IDEDialogs, IDEHelpIntf, LazIDEIntf, IDEExternToolIntf,
+  // IdeConfig
+  EnvironmentOpts, TransferMacros,
  // IDE
-  EditorOptions, LazarusIDEStrConsts, IDEProcs, PackageDefs, EnvironmentOpts,
-  TransferMacros, PackageSystem, DialogProcs, KeyMapping, SearchPathProcs;
+  EditorOptions, LazarusIDEStrConsts, IDEProcs, PackageDefs, PackageSystem,
+  DialogProcs, KeyMapping, SearchPathProcs;

 const
  IDEProjectName = 'Lazarus';
--- a/ide/codemacroprompt.pas
+++ b/ide/codemacroprompt.pas
@ -31,10 +31,12 @@ unit CodeMacroPrompt;
 interface

 uses
-  Classes, SysUtils, LCLProc, Forms, Controls, Graphics, Dialogs,
+  Classes, SysUtils,
+  Forms, Controls, Graphics, Dialogs,
+  LazUTF8, LazLoggerBase,
  BasicCodeTools, CodeToolManager,
  SynEditAutoComplete, SynPluginTemplateEdit, SynPluginSyncronizedEditBase, SynEdit, SynEditTypes,
-  LazIDEIntf, SrcEditorIntf, LazUTF8;
+  LazIDEIntf, SrcEditorIntf;

 type
  TCodeMacroPromptDlg = class(TForm)
--- a/ide/codetoolsdefines.pas
+++ b/ide/codetoolsdefines.pas
@ -56,9 +56,11 @@ uses
  CodeToolManager, DefineTemplates,
  // IdeIntf
  IdeIntfStrConsts, IDEWindowIntf, IDEImagesIntf, IDEDialogs,
+  // IdeConfig
+  LazConf, TransferMacros,
  // IDE
-  LazarusIDEStrConsts, CodeToolsOptions, CodeToolsDefPreview, TransferMacros,
-  EditorOptions, InputFileDialog, LazConf, IDEProcs, EditDefineTree, CompilerOptions;
+  LazarusIDEStrConsts, CodeToolsOptions, CodeToolsDefPreview,
+  EditorOptions, InputFileDialog, IDEProcs, EditDefineTree, CompilerOptions;

 type

--- a/ide/codetoolsoptions.pas
+++ b/ide/codetoolsoptions.pas
@ -37,15 +37,15 @@ interface
 uses
  Classes, SysUtils,
  // LazUtils
-  LazFileUtils, Laz2_XMLCfg, LazUTF8, LazFileCache, LazStringUtils,
-  // LCL
-  LCLProc, LCLType,
+  LazFileUtils, Laz2_XMLCfg, LazUTF8, LazFileCache, LazStringUtils, LazLoggerBase,
  // CodeTools
  CodeToolManager, DefineTemplates, SourceChanger,
  // IdeIntf
  IDEOptionsIntf, IDEOptEditorIntf, MacroIntf,
+  // LazConfig
+  LazConf,
  // IDE
-  LazConf, LazarusIDEStrConsts;
+  LazarusIDEStrConsts;

 const
  DefaultIndentationFilename = 'laz_indentation.pas'; // in directory GetPrimaryConfigPath
--- a/ide/compatibilityrestrictions.pas
+++ b/ide/compatibilityrestrictions.pas
@ -36,9 +36,9 @@ interface
 uses
  Classes, SysUtils,
  // LCL
-  Forms, LCLProc, LCLPlatformDef,
+  Forms, LCLPlatformDef,
  // LazUtils
-  Laz2_DOM, Laz2_XMLRead, Laz2_XMLWrite, StringHashList,
+  Laz2_DOM, Laz2_XMLRead, Laz2_XMLWrite, StringHashList, LazLoggerBase,
  // IdeIntf
  OIFavoriteProperties, PackageIntf, ComponentReg,
  // IDE
--- a/ide/compiler.pp
+++ b/ide/compiler.pp
@ -43,11 +43,13 @@ uses
  // LazUtils
  FPCAdds, LazUTF8, LazFileUtils, LazUtilities, LazLoggerBase,
  // Codetools
-  DefineTemplates, LinkScanner, CodeToolManager, TransferMacros,
+  DefineTemplates, LinkScanner, CodeToolManager,
  // BuildIntf
  IDEExternToolIntf,
  // IdeIntf
  IDEMsgIntf, LazIDEIntf,
+  // IdeConfig
+  TransferMacros,
  // IDE
  IDECmdLine, LazarusIDEStrConsts, CompilerOptions, Project;

--- a/ide/compoptsmodes.pas
+++ b/ide/compoptsmodes.pas
@ -38,8 +38,11 @@ unit CompOptsModes;
 interface

 uses
-  Classes, SysUtils, LCLProc, ExprEval,
-  IDEProcs, ProjectIntf;
+  Classes, SysUtils,
+  ExprEval,
+  LazLoggerBase,
+  ProjectIntf,
+  IDEProcs;

 type

--- a/ide/dialogprocs.pas
+++ b/ide/dialogprocs.pas
@ -37,16 +37,17 @@ interface

 uses
  Classes, SysUtils,
+  {$IF FPC_FULLVERSION >= 30200}System.{$ENDIF}UITypes,
  // LCL
-  LCLProc, LResources, Forms, Controls, Dialogs, ComCtrls,
+  LResources, Dialogs, ComCtrls,
  // LazUtils
-  FileUtil, LazFileUtils, LazFileCache, Laz2_XMLCfg,
+  FileUtil, LazFileUtils, LazFileCache, Laz2_XMLCfg, LazLoggerBase,
  // CodeTools
-  FileProcs, CodeToolsConfig, CodeCache, CodeToolManager,
+  CodeToolsConfig, CodeCache, CodeToolManager,
  // IdeIntf
  LazIDEIntf, IDEDialogs,
  // IDE
-  IDEProcs, LazarusIDEStrConsts;
+  LazarusIDEStrConsts;

 type
  // load buffer flags
--- a/ide/diskdiffsdialog.pas
+++ b/ide/diskdiffsdialog.pas
@ -32,17 +32,19 @@ uses
  Classes, SysUtils,
  {$IF FPC_FULLVERSION >= 30200}System.{$ENDIF}UITypes,
  // LCL
-  LCLProc, LCLType, Forms, StdCtrls, ExtCtrls, CheckLst, ButtonPanel, Buttons,
+  Forms, StdCtrls, ExtCtrls, CheckLst, ButtonPanel, Buttons,
  // CodeTools
-  FileProcs, CodeCache,
+  CodeCache,
  // LazUtils
-  LazFileUtils, LazFileCache,
+  LazFileUtils, LazFileCache, LazLoggerBase,
  // IdeIntf
  IDEImagesIntf,
  // SynEdit
  SynEdit, SynHighlighterDiff,
+  // IdeConfig
+  EnvironmentOpts,
  // IDE
-  Project, PackageDefs, DiffPatch, LazarusIDEStrConsts, EnvironmentOpts, EditorOptions;
+  Project, PackageDefs, DiffPatch, LazarusIDEStrConsts, EditorOptions;

 type
  PDiffItem = ^TDiffItem;
--- a/ide/editorfilemanager.pas
+++ b/ide/editorfilemanager.pas
@ -5,10 +5,13 @@ unit EditorFileManager;
 interface

 uses
-  Classes, sysutils, Forms, Controls, CheckLst, ButtonPanel, StdCtrls, Buttons,
-  ExtCtrls, Menus, LCLProc, LCLType, IDEImagesIntf, LazIDEIntf, IDEHelpIntf,
-  SrcEditorIntf, IDEWindowIntf, SourceEditor, LazarusIDEStrConsts,
-  ListFilterEdit, IDEOptionDefs;
+  Classes, sysutils,
+  Forms, Controls, CheckLst, ButtonPanel, StdCtrls, Buttons, ExtCtrls, Menus, LCLType,
+  LazLoggerBase,
+  ListFilterEdit,
+  IDEImagesIntf, LazIDEIntf, IDEHelpIntf, SrcEditorIntf, IDEWindowIntf,
+  IDEOptionDefs,
+  SourceEditor, LazarusIDEStrConsts;

 type

--- a/ide/editoroptions.pp
+++ b/ide/editoroptions.pp
@ -42,9 +42,9 @@ uses
  // RTL, FCL
  Classes, SysUtils, typinfo, resource,
  // LCL
-  Graphics, LCLProc, LResources, Forms, Dialogs, ComCtrls, LCLType, Controls,
+  Graphics, LResources, Forms, Dialogs, ComCtrls, LCLType, Controls,
  // LazUtils
-  FileUtil, LazFileUtils, LazUTF8, LazClasses, Laz2_XMLCfg, LazStringUtils,
+  FileUtil, LazFileUtils, LazUTF8, LazClasses, Laz2_XMLCfg, LazStringUtils, LazLoggerBase,
  // Synedit
  SynEdit, SynEditAutoComplete, SynEditKeyCmds, SynEditTypes,
  SynEditMiscClasses, SynBeautifier, SynEditTextTrimmer, SynEditMouseCmds,
--- a/Show More
+++ b/Show More