Change order of used units so that "deprecated" warnings are not triggered.

git-svn-id: trunk@49612 -

components/codetools/ccodeparsertool.pas

@@ -110,9 +110,13 @@ uses
   {$IFDEF MEM_CHECK}
   MemCheck,
   {$ENDIF}
-  Classes, SysUtils, LazFileUtils, FileProcs, CodeToolsStructs, BasicCodeTools,
-  KeywordFuncLists, LinkScanner, CodeCache, AVL_Tree,
-  CodeTree, NonPascalCodeTools;
+  // RTL + FCL
+  Classes, SysUtils, AVL_Tree,
+  // CodeTools
+  FileProcs, CodeToolsStructs, BasicCodeTools, KeywordFuncLists, LinkScanner,
+  CodeCache, CodeTree, NonPascalCodeTools,
+  // LazUtils
+  LazFileUtils;
 
 type
   TCCodeNodeDesc = word;

components/codetools/codebeautifier.pas

@@ -92,8 +92,9 @@ interface
 {$ENDIF}
 
 uses
-  Classes, SysUtils, AVL_Tree, LazUtilities, FileProcs, KeywordFuncLists,
-  CodeCache, BasicCodeTools;
+  Classes, SysUtils, AVL_Tree,
+  FileProcs, KeywordFuncLists, CodeCache, BasicCodeTools,
+  LazUtilities;
   
 type
   TWordPolicy = (

components/codetools/codecompletiontool.pas

@@ -82,14 +82,18 @@ uses
   {$IFDEF MEM_CHECK}
   MemCheck,
   {$ENDIF}
-  Classes, SysUtils, LazFileUtils, FileProcs, CodeToolsStrConsts,
+  // RTL + FCL
+  Classes, SysUtils, contnrs, AVL_Tree,
+  // CodeTools
+  FileProcs, CodeToolsStrConsts, StdCodeTools,
   CodeTree, CodeAtom, CodeCache, CustomCodeTool, PascalParserTool, MethodJumpTool,
   FindDeclarationTool, KeywordFuncLists, CodeToolsStructs, BasicCodeTools,
-  LinkScanner, SourceChanger, CodeGraph, AVL_Tree, contnrs, LazDbgLog,
+  LinkScanner, SourceChanger, CodeGraph,
   {$IFDEF EnableCodeCompleteTemplates}
   CodeCompletionTemplater,
   {$ENDIF}
-  StdCodeTools;
+  // LazUtils
+  LazFileUtils, LazDbgLog;
 
 type
   TNewClassPart = (ncpPrivateProcs, ncpPrivateVars,

components/codetools/definetemplates.pas

@@ -52,10 +52,14 @@ unit DefineTemplates;
 interface
 
 uses
-  Classes, SysUtils, LazUTF8, CodeToolsStrConsts, ExprEval, DirectoryCacher,
-  BasicCodeTools, Laz2_XMLCfg, lazutf8classes, LazFileUtils, AVL_Tree, process,
-  CodeToolsStructs, UTF8Process, LazFileCache, KeywordFuncLists, LinkScanner,
-  FileProcs, LazUtilities, LazDbgLog;
+  // RTL + FCL
+  Classes, SysUtils, AVL_Tree, process,
+  // CodeTools
+  CodeToolsStrConsts, ExprEval, DirectoryCacher, BasicCodeTools,
+  CodeToolsStructs, KeywordFuncLists, LinkScanner, FileProcs,
+  // LazUtils
+  LazUtilities, LazUTF8, LazUTF8Classes, LazFileUtils, UTF8Process,
+  LazFileCache, LazDbgLog, Laz2_XMLCfg;
 
 const
   ExternalMacroStart = ExprEval.ExternalMacroStart;

components/codetools/directorycacher.pas

@@ -35,8 +35,12 @@ unit DirectoryCacher;
 interface
 
 uses
-  Classes, SysUtils, LazUTF8, LazFileCache, FileProcs, LazFileUtils, LazUtilities,
-  LazDbgLog, AVL_Tree, CodeToolsStructs;
+  // RTL + FCL
+  Classes, SysUtils, AVL_Tree,
+  // CodeTools
+  CodeToolsStructs, FileProcs,
+  // LazUtils
+  LazUTF8, LazFileCache, LazFileUtils, LazUtilities, LazDbgLog;
 
 // verbosity
 { $DEFINE CTDEBUG}

components/codetools/fileprocs.pas

@@ -39,8 +39,13 @@ uses
   {$IFDEF Windows}
   Windows,
   {$ENDIF}
-  Classes, SysUtils, LazUtilities, LazDbgLog, LazLogger, LazUTF8, LazFileCache,
-  LazFileUtils, LazUTF8Classes, AVL_Tree, CodeToolsStrConsts;
+  // RTL + FCL
+  Classes, SysUtils, AVL_Tree,
+  // CodeTools
+  CodeToolsStrConsts,
+  // LazUtils
+  LazUtilities, LazDbgLog, LazLogger, LazUTF8, LazFileCache,
+  LazFileUtils, LazUTF8Classes;
 
 type
   TFPCStreamSeekType = int64;
@@ -186,8 +191,8 @@ function ClearFile(const Filename: string; RaiseOnError: boolean): boolean;
 function GetTempFilename(const Path, Prefix: string): string;
 function SearchFileInDir(const Filename, BaseDirectory: string;
                          SearchCase: TCTSearchFileCase): string; // not thread-safe
-function SearchFileInPath(const Filename, BasePath, SearchPath,
-                      Delimiter: string; SearchCase: TCTSearchFileCase): string; // not thread-safe
+function SearchFileInPath(const Filename, BasePath, SearchPath, Delimiter: string;
+                         SearchCase: TCTSearchFileCase): string; overload; // not thread-safe
 function FindDiskFilename(const Filename: string): string;
 {$IFDEF darwin}
 function GetDarwinSystemFilename(Filename: string): string;

components/codetools/linkscanner.pas

@@ -46,9 +46,13 @@ uses
   {$IFDEF MEM_CHECK}
   MemCheck,
   {$ENDIF}
-  Classes, SysUtils, math, CodeToolsStrConsts, CodeToolMemManager,
-  LazFileUtils, FileProcs, LazUtilities, AVL_Tree, ExprEval, SourceLog, LazDbgLog,
-  KeywordFuncLists, BasicCodeTools;
+  // RTL + FCL
+  Classes, SysUtils, math, AVL_Tree,
+  // CodeTools
+  CodeToolsStrConsts, CodeToolMemManager, FileProcs, ExprEval, SourceLog,
+  KeywordFuncLists, BasicCodeTools,
+  // LazUtils
+  LazFileUtils, LazUtilities, LazDbgLog;
 
 const
   PascalCompilerDefine = ExternalMacroStart+'Compiler';

components/lazreport/source/addons/lrEmailExport/lrEmailExportFilter.pas

@@ -5,7 +5,11 @@ unit lrEmailExportFilter;
 interface
 
 uses
-  Classes, SysUtils, LR_Class, lr_PreviewToolsAbstract, UTF8Process;
+  Classes, SysUtils, Forms, Controls,
+  // LazUtils
+  LazFileUtils, LazUTF8, UTF8Process,
+  // LazReport
+  LR_Class, lr_PreviewToolsAbstract;
 
 type
   TEmailApp = class;
@@ -91,8 +95,7 @@ resourcestring
 
 
 implementation
-uses Forms, lrEmailExportFilterSetup, Controls, LCLProc, FileUtil,
-  lrEmailAppFreeSoft
+uses lrEmailExportFilterSetup, lrEmailAppFreeSoft
   {$IFDEF WINDOWS}
     , lrEmailAppTheBat, lrEmailAppMS
   {$ENDIF}

components/lazreport/source/lr_class.pas

@@ -15,12 +15,16 @@ interface
 {$I LR_Vers.inc}
 
 uses
-  SysUtils, Math, {$IFDEF UNIX}CLocale,{$ENDIF}
-  Classes, MaskUtils, Controls, LazFileUtils, Forms,
-  Dialogs, Menus, Variants, DB, Graphics, Printers, osPrinters, LazUTF8, DOM,
-  XMLWrite, XMLRead, XMLConf, LCLType, LCLIntf, TypInfo, LR_View, LR_Pars,
-  LR_Intrp, LR_DSet, LR_DBSet, LR_DBRel, LR_Const, DbCtrls, LazUtf8Classes,
-  LCLProc;
+  SysUtils, Math, strutils, DateUtils, {$IFDEF UNIX}CLocale,{$ENDIF}
+  Classes, TypInfo, MaskUtils, Variants, DB, DOM, XMLWrite, XMLRead, XMLConf,
+  Controls, Forms, Dialogs, Menus, Graphics, LCLProc, LCLType, LCLIntf,
+  Printers, osPrinters,
+  // LazUtils
+  LazFileUtils, LazUTF8, LazUTF8Classes,
+  // IDEIntf
+  PropEdits,
+  // LazReport
+  LR_View, LR_Pars, LR_Intrp, LR_DSet, LR_DBSet, LR_DBRel, LR_Const, DbCtrls;
 
 const
   lrMaxBandsInReport       = 256; //temp fix. in future need remove this limit
@@ -1544,7 +1548,7 @@ var
 implementation
 
 uses
-  strutils, LR_Fmted, LR_Prntr, LR_Progr, LR_Utils, DateUtils, PropEdits
+  LR_Fmted, LR_Prntr, LR_Progr, LR_Utils
   {$IFDEF JPEG}, JPEG {$ENDIF}, lr_hyphen;
 
 type

components/lazsvnpkg/svnstatusform.pas

@@ -23,9 +23,14 @@ unit SVNStatusForm;
 interface
 
 uses
-  Classes, SysUtils, FileUtil, LazFileUtils, Forms, Controls, Dialogs,
-  ComCtrls, StdCtrls, ButtonPanel, ExtCtrls, LCLProc, Process,
-  SVNClasses, Menus, LazIDEIntf, BaseIDEIntf, LazConfigStorage;
+  Classes, SysUtils, Process, LCLProc,
+  Forms, Controls, Dialogs, ComCtrls, StdCtrls, ButtonPanel, ExtCtrls, Menus,
+  // LazUtils
+  FileUtil, LazFileUtils, LazConfigStorage,
+  // IDEIntf
+  LazIDEIntf, BaseIDEIntf,
+  // LazSvn
+  SVNClasses;
 
 type
   { TSVNStatusFrm }
@@ -224,7 +229,7 @@ begin
         CmdLine := CmdLine + ' "' + StatusItem.Path + '"';
   end;
 
-  FileName := GetTempFileName('','');
+  FileName := GetTempFileNameUTF8('','');
   SVNCommitMsgMemo.Lines.SaveToFile(FileName);
   CmdLine := CmdLine + ' --file ' + FileName;
 

components/lazutils/fileutil.inc

@@ -199,7 +199,7 @@ end;
 
 function ExpandFileNameUTF8(const FileName: string): string;
 begin
-  Result := LazFileUtils.ExpandFileNameUtf8(Filename);
+  Result := LazFileUtils.ExpandFileNameUTF8(Filename);
 end;
 
 function CompareFileExt(const Filename, Ext: string; CaseSensitive: boolean): integer;

components/lazutils/fileutil.pas

@@ -32,7 +32,8 @@ unit FileUtil;
 interface
 
 uses
-  Classes, SysUtils, Masks, LazUTF8, LazFileUtils;
+  Classes, SysUtils,
+  Masks, LazUTF8, LazFileUtils;
   
 {$if defined(Windows) or defined(darwin)}
 {$define CaseInsensitiveFilenames}
@@ -94,7 +95,7 @@ function ForceDirectoriesUTF8(const Dir: string): Boolean; inline; deprecated 'U
 function FileOpenUTF8(Const FileName : string; Mode : Integer) : THandle; inline; deprecated 'Use the function in LazFileUtils unit';
 function FileCreateUTF8(Const FileName : string) : THandle; overload; inline; deprecated 'Use the function in LazFileUtils unit';
 function FileCreateUTF8(Const FileName : string; Rights: Cardinal) : THandle; overload; inline; deprecated 'Use the function in LazFileUtils unit';
-function GetTempFilename(const Directory, Prefix: string): string; inline; deprecated 'Use the function in LazFileUtils unit';
+function GetTempFilename(const Directory, Prefix: string): string; inline; deprecated 'Use the function GetTempFileNameUTF8 in LazFileUtils unit';
 // file names, attributes and states
 function CleanAndExpandFilename(const Filename: string): string; inline; deprecated 'Use the function in LazFileUtils unit';
 function CleanAndExpandDirectory(const Filename: string): string; inline; deprecated 'Use the function in LazFileUtils unit';
@@ -163,7 +164,7 @@ type
   TSearchFileInPathFlags = set of TSearchFileInPathFlag;
 
 function SearchFileInPath(const Filename, BasePath, SearchPath,
-  Delimiter: string; Flags: TSearchFileInPathFlags): string;
+  Delimiter: string; Flags: TSearchFileInPathFlags): string; overload;
 function SearchAllFilesInPath(const Filename, BasePath, SearchPath,
   Delimiter: string; Flags: TSearchFileInPathFlags): TStrings;
 function FindDiskFilename(const Filename: string): string;

components/lazutils/lazfileutils.pas

@@ -22,7 +22,7 @@ uses
   {$DEFINE NotLiteralFilenames} // e.g. HFS+ normalizes file names
 {$ENDIF}
 
-function CompareFilenames(const Filename1, Filename2: string): integer;
+function CompareFilenames(const Filename1, Filename2: string): integer; overload;
 function CompareFilenamesIgnoreCase(const Filename1, Filename2: string): integer;
 function CompareFileExt(const Filename, Ext: string;
                         CaseSensitive: boolean): integer; overload;
@@ -30,7 +30,7 @@ function CompareFileExt(const Filename, Ext: string): integer; overload;
 
 function CompareFilenameStarts(const Filename1, Filename2: string): integer;
 function CompareFilenames(Filename1: PChar; Len1: integer;
-  Filename2: PChar; Len2: integer): integer;
+  Filename2: PChar; Len2: integer): integer; overload;
 function CompareFilenamesP(Filename1, Filename2: PChar;
   IgnoreCase: boolean = false // false = use default
   ): integer;

components/leakview/heaptrcview.pas

@@ -5,9 +5,14 @@ unit HeapTrcView;
 interface
 
 uses
-  Classes, SysUtils, FileUtil, LResources, Forms, Controls, Graphics, Dialogs,
-  StdCtrls, ComCtrls, ExtCtrls, LeakInfo, LazIDEIntf, MenuIntf, contnrs, Clipbrd,
-  XMLConf, LCLProc;
+  Classes, SysUtils, XMLConf, contnrs, Clipbrd, LCLProc,
+  LResources, Forms, Controls, Graphics, Dialogs, StdCtrls, ComCtrls, ExtCtrls,
+  // LazUtils
+  FileUtil, LazFileUtils,
+  // IDEIntf
+  LazIDEIntf, MenuIntf,
+  // LeakView
+  LeakInfo;
 
 type
   TJumpProc = procedure (Sender: TObject; const SourceName: string;

components/leakview/leakinfo.pas

@@ -7,8 +7,15 @@ unit leakinfo;
 interface
 
 uses
-  Classes, SysUtils, FileUtil, LazClasses, LazLoggerBase, DbgInfoReader,
-  TextTools, LazIDEIntf, ProjectIntf, CodeToolManager, CodeCache;
+  Classes, SysUtils,
+  // CodeTools
+  CodeToolManager, CodeCache,
+  // LazUtils
+  FileUtil, LazFileUtils, LazClasses,
+  // IDEIntf
+  TextTools,
+  // LeakView
+  DbgInfoReader;
 
 type
   { TStackLine }

components/synedit/syntextdrawer.pp

@@ -67,7 +67,7 @@ unit SynTextDrawer;
 interface
 
 uses
-  LCLProc, LCLType, LCLIntf, SysUtils, Classes, Graphics, GraphUtil, Types,
+  Classes, Types, SysUtils, LCLProc, LCLType, LCLIntf, Graphics, GraphUtil,
   SynEditTypes, SynEditMiscProcs;
 
 type

converter/chgencodingdlg.pas

@@ -30,11 +30,17 @@ unit ChgEncodingDlg;
 interface
 
 uses
+  // RTL + FCL + LCL
   Classes, SysUtils, AVL_Tree,
   LCLProc, Forms, Controls, ExtCtrls, StdCtrls, ComCtrls, Buttons,
-  LConvEncoding, LazFileUtils, LazFileCache,
-  IDEWindowIntf, SrcEditorIntf, IDEHelpIntf, SynRegExpr,
+  // CodeTools
   CodeCache, CodeToolsStructs, CodeToolManager, FileProcs,
+  // LazUtils
+  LConvEncoding, LazFileUtils, LazFileCache,
+  // IDEIntf
+  IDEWindowIntf, SrcEditorIntf, IDEHelpIntf,
+  // SynEdit
+  SynRegExpr,
   // IDE
   IDEProcs, PackageDefs, PackageSystem, Project, LazarusIDEStrConsts;
 

converter/convcodetool.pas

@@ -31,16 +31,17 @@ unit ConvCodeTool;
 interface
 
 uses
-  // LCL+FCL
+  // RTL + FCL + LCL
   Classes, SysUtils, contnrs, strutils, Forms, Controls, Dialogs,
-  // IDE
-  LazarusIDEStrConsts, LazIDEIntf, FormEditor, IDEExternToolIntf,
-  LazFileUtils,
-  // codetools
+  // CodeTools
   CodeToolManager, StdCodeTools, CodeTree, CodeAtom, FileProcs,
   FindDeclarationTool, LFMTrees,
   ExprEval, KeywordFuncLists, BasicCodeTools, LinkScanner,
   CodeCache, SourceChanger, CustomCodeTool, CodeToolsStructs,
+  // LazUtils
+  LazFileUtils,
+  // IDE
+  LazIDEIntf, IDEExternToolIntf, FormEditor, LazarusIDEStrConsts,
   // Converter
   ConverterTypes, ConvertSettings, ReplaceNamesUnit, ReplaceFuncsUnit;
 

converter/convertdelphi.pas

@@ -32,15 +32,18 @@ unit ConvertDelphi;
 interface
 
 uses
-  // LCL+FCL
+  // RTL + FCL + LCL
   Classes, SysUtils, contnrs, IniFiles, LCLProc, Forms, Controls, Dialogs,
-  LConvEncoding, FileUtil, LazFileUtils, LazUTF8, LazUTF8Classes,
-  // codetools
+  // CodeTools
   CodeToolManager, DefineTemplates, CodeCache, LinkScanner, FileProcs, CodeToolsStructs,
+  // LazUtils
+  LConvEncoding, FileUtil, LazFileUtils, LazUTF8, LazUTF8Classes,
   // IDEIntf
   ComponentReg, LazIDEIntf, PackageIntf, ProjectIntf,
+  // IDEIntf
+  IDEDialogs,
   // IDE
-  IDEProcs, DialogProcs, IDEDialogs, EditorOptions, CompilerOptions,
+  IDEProcs, DialogProcs, EditorOptions, CompilerOptions,
   ProjPackBase, Project, ProjectDefs, PackageDefs, PackageSystem, PackageEditor,
   BasePkgManager, LazarusIDEStrConsts,
   // Converter

designer/designer.pp

@@ -37,20 +37,20 @@ interface
 {off $DEFINE VerboseDesignerSelect}
 
 uses
-  // FCL + LCL
+  // RTL + FCL + LCL
   Types, Classes, Math, SysUtils, variants, TypInfo,
   LCLProc, LCLType, LResources, LCLIntf, LMessages, InterfaceBase,
-  Forms, Controls, GraphType, Graphics, Dialogs, ExtCtrls, Menus,
-  ClipBrd,
+  Forms, Controls, GraphType, Graphics, Dialogs, ExtCtrls, Menus, ClipBrd,
+  // LazUtils
+  LazFileUtils, LazFileCache,
   // IDEIntf
   IDEDialogs, PropEdits, PropEditUtils, ComponentEditors, MenuIntf, IDEImagesIntf,
-  FormEditingIntf, ComponentReg,
+  FormEditingIntf, ComponentReg, IDECommands, LazIDEIntf, ProjectIntf,
   // IDE
-  LazarusIDEStrConsts, EnvironmentOpts, IDECommands, LazIDEIntf, ProjectIntf,
-  LazFileUtils, LazFileCache, AlignCompsDlg,
-  SizeCompsDlg, ScaleCompsDlg, TabOrderDlg, AnchorEditor, DesignerProcs,
-  CustomFormEditor, AskCompNameDlg, ControlSelection, ChangeClassDialog,
-  EditorOptions;
+  LazarusIDEStrConsts, EnvironmentOpts, EditorOptions,
+  // Designer
+  AlignCompsDlg, SizeCompsDlg, ScaleCompsDlg, TabOrderDlg, AnchorEditor, DesignerProcs,
+  CustomFormEditor, AskCompNameDlg, ControlSelection, ChangeClassDialog;
 
 type
   TDesigner = class;

ide/buildmanager.pas

@@ -34,13 +34,15 @@ unit BuildManager;
 interface
 
 uses
+  // RTL + FCL + LCL
   Classes, SysUtils, AVL_Tree,
-  // LCL
-  LConvEncoding, InterfaceBase, LCLProc, Dialogs, FileUtil, Laz2_XMLCfg,
-  LazUTF8, LazFileUtils, LazFileCache, Forms, Controls,
-  // codetools
+  InterfaceBase, LCLProc, Dialogs, Forms, Controls,
+  // CodeTools
   ExprEval, BasicCodeTools, CodeToolManager, DefineTemplates, CodeCache,
   FileProcs, CodeToolsCfgScript,
+  // LazUtils
+  LConvEncoding, FileUtil, LazFileUtils, LazUtilities, LazFileCache, LazUTF8,
+  Laz2_XMLCfg,
   // IDEIntf
   IDEOptionsIntf, ProjectIntf, MacroIntf, IDEDialogs, IDEExternToolIntf,
   CompOptsIntf, LazIDEIntf, MacroDefIntf, IDEMsgIntf,

ide/codebrowser.pas

@@ -45,21 +45,23 @@ unit CodeBrowser;
 interface
 
 uses
-  Classes, SysUtils, types, LCLProc, LResources, Forms, Controls, Graphics,
-  Dialogs, Clipbrd, LCLIntf, AVL_Tree, StdCtrls, ExtCtrls, ComCtrls, Buttons,
-  Menus, HelpIntfs, LazFileUtils, LazUtilities,
-  // codetools
+  // RTL + FCL + LCL
+  Classes, SysUtils, types, AVL_Tree,
+  LCLProc, LResources, Forms, Controls, Graphics, Dialogs, Clipbrd, StdCtrls,
+  ExtCtrls, ComCtrls, Buttons, Menus, HelpIntfs, LCLIntf,
+  // CodeTools
   BasicCodeTools, DefineTemplates, CodeTree, CodeCache,
   CodeToolsStructs, CodeToolManager, PascalParserTool, LinkScanner, FileProcs,
   CodeIndex, StdCodeTools, SourceLog, CustomCodeTool,
+  // LazUtils
+  LazFileUtils, LazUtilities,
   // IDEIntf
   IDEWindowIntf, SrcEditorIntf, IDEMsgIntf, IDEDialogs, LazConfigStorage,
   IDEHelpIntf, PackageIntf, IDECommands, LazIDEIntf,
   IDEExternToolIntf,
   // IDE
   Project, DialogProcs, PackageSystem, PackageDefs, LazarusIDEStrConsts,
-  IDEOptionDefs, etFPCMsgParser, BasePkgManager,
-  EnvironmentOpts;
+  IDEOptionDefs, etFPCMsgParser, BasePkgManager, EnvironmentOpts;
 
 
 type

ide/codeexplopts.pas

@@ -34,10 +34,17 @@ unit CodeExplOpts;
 interface
 
 uses
-  Classes, SysUtils, LCLProc, Forms, Controls, Graphics, Dialogs, Buttons,
-  AvgLvlTree, Laz2_XMLCfg, LazFileUtils, LazFileCache,
+  // RTL + FCL + LCL
+  Classes, SysUtils,
+  LCLProc, Forms, Controls, Graphics, Dialogs, Buttons,
+  // CodeTools
   BasicCodeTools, FileProcs,
-  LazConf, IDEProcs, IDEOptionsIntf, LazarusIDEStrConsts;
+  // LazUtils
+  AvgLvlTree, Laz2_XMLCfg, LazFileUtils, LazFileCache,
+  // IDEIntf
+  IDEOptionsIntf,
+  // IDE
+  LazConf, IDEProcs, LazarusIDEStrConsts;
 
 type
   { TCodeExplorerOptions }

ide/codehelp.pas

@@ -39,14 +39,15 @@ unit CodeHelp;
 interface
 
 uses
-  Classes, SysUtils, LazFileCache, LCLProc, Forms, Controls, FileUtil, Dialogs,
-  AvgLvlTree, LCLType, LazUTF8,
-  Laz2_DOM, Laz2_XMLRead, Laz2_XMLWrite,
-  // codetools
+  // RTL + FCL + LCL
+  Classes, SysUtils, LCLType, LCLProc, Forms, Controls, FileUtil, Dialogs,
+  // CodeTools
   CodeAtom, CodeTree, CodeToolManager, FindDeclarationTool, BasicCodeTools,
   KeywordFuncLists, PascalParserTool, CodeCache, CacheCodeTools, CustomCodeTool,
-  FileProcs, LazFileUtils, DefineTemplates, CodeToolsStructs,
-  // synedit
+  FileProcs, DefineTemplates, CodeToolsStructs,
+  // LazUtils
+  AvgLvlTree, LazFileUtils, LazUTF8, LazFileCache, Laz2_DOM, Laz2_XMLRead, Laz2_XMLWrite,
+  // SynEdit
   SynHighlighterPas,
   // IDEIntf
   IDECommands, IDEMsgIntf, MacroIntf, PackageIntf, LazHelpIntf, ProjectIntf,

ide/diskdiffsdialog.pas

@@ -32,9 +32,15 @@ unit DiskDiffsDialog;
 interface
 
 uses
-  Classes, SysUtils, LCLProc, Forms, Controls, StdCtrls, ExtCtrls,
-  LCLType, lazutf8classes, LazFileUtils,
-  SynEdit, SynHighlighterDiff, FileProcs, CodeCache,
+  // RTL + FCL + LCL
+  Classes, SysUtils, LCLProc, Forms, Controls, StdCtrls, ExtCtrls, LCLType,
+  // CodeTools
+  FileProcs, CodeCache,
+  // LazUtils
+  LazUTF8Classes, LazFileUtils,
+  // SynEdit
+  SynEdit, SynHighlighterDiff,
+  // IDE
   Project, DiffPatch, LazarusIDEStrConsts, EnvironmentOpts, EditorOptions,
   PackageDefs;
 

ide/etfpcmsgparser.pas

@@ -32,13 +32,17 @@ unit etFPCMsgParser;
 interface
 
 uses
+  // RTL
   Classes, SysUtils, strutils, math,
-  LazUTF8, LConvEncoding, LazFileUtils, FileUtil,
-  IDEExternToolIntf, PackageIntf, LazIDEIntf, ProjectIntf,
-  MacroIntf,
-  IDEUtils, FileProcs, LazFileCache,
-  KeywordFuncLists, CodeToolsFPCMsgs, CodeToolsStructs, CodeCache,
+  // CodeTools
+  KeywordFuncLists, CodeToolsFPCMsgs, CodeToolsStructs, CodeCache, FileProcs,
   CodeToolManager, DirectoryCacher, BasicCodeTools, DefineTemplates, SourceLog,
+  // LazUtils
+  LConvEncoding, LazUTF8, FileUtil, LazFileUtils,
+  // IDEIntf
+  IDEExternToolIntf, PackageIntf, LazIDEIntf, ProjectIntf, MacroIntf,
+  IDEUtils, LazFileCache,
+  // IDE
   IDECmdLine, LazarusIDEStrConsts, EnvironmentOpts, LazConf, TransferMacros,
   etMakeMsgParser;
 

ide/etmakemsgparser.pas

@@ -30,8 +30,14 @@ unit etMakeMsgParser;
 interface
 
 uses
-  Classes, SysUtils, IDEExternToolIntf, CodeToolsStructs, KeywordFuncLists,
-  LazFileUtils, FileUtil;
+  // RTL
+  Classes, SysUtils,
+  // CodeTools
+  CodeToolsStructs, KeywordFuncLists,
+  // LazUtils
+  FileUtil, LazFileUtils,
+  // IDEIntf
+  IDEExternToolIntf;
 
 const
   MakeMsgIDEnteringDirectory = 1;

ide/exttools.pas

@@ -34,12 +34,13 @@ unit ExtTools;
 interface
 
 uses
-  Classes, SysUtils, math, process, Pipes, UTF8Process,
-  LazFileUtils, LazUTF8,
-  // Codetools
+  // RTL + FCL + LCL
+  Classes, SysUtils, math, process, Pipes,
+  LCLIntf, Forms, Dialogs,
+  // CodeTools
   FileProcs, CodeToolsStructs,
-  // LCL
-  LCLIntf, Forms, Dialogs, FileUtil, AvgLvlTree,
+  // LazUtils
+  FileUtil, AvgLvlTree, LazFileUtils, UTF8Process, LazUTF8,
   // IDEIntf
   IDEExternToolIntf, BaseIDEIntf, MacroIntf, IDEMsgIntf, IDEDialogs,
   PackageIntf, LazIDEIntf,

ide/findrenameidentifier.pas

@@ -30,11 +30,13 @@ unit FindRenameIdentifier;
 interface
 
 uses
+  // RTL + FCL + LCL
   Classes, SysUtils, AVL_Tree, LCLProc, Forms, Controls, Dialogs,
   StdCtrls, ExtCtrls, ComCtrls, ButtonPanel,
-  laz2_DOM, LazFileUtils, LazFileCache,
-  // codetools
+  // CodeTools
   FileProcs, CTUnitGraph, CodeTree, CodeCache, CodeToolManager, CodeToolsStructs,
+  // LazUtils
+  LazFileUtils, LazFileCache, laz2_DOM,
   // IDE
   LazarusIDEStrConsts, IDEProcs, IDEWindowIntf, MiscOptions, DialogProcs,
   LazIDEIntf, IDEDialogs, InputHistory, SearchResultView, CodeHelp;

ide/frames/compiler_compilation_options.pas

@@ -5,9 +5,16 @@ unit compiler_compilation_options;
 interface
 
 uses
-  Classes, sysutils, Controls, StdCtrls, Dialogs, FileUtil, LazFileUtils,
+  // RTL + FCL + LCL
+  Classes, sysutils,
+  Controls, StdCtrls, Dialogs,
+  // CodeTools
   FileProcs, DefineTemplates, CodeToolManager,
+  // LazUtils
+  FileUtil, LazFileUtils,
+  // IDEIntf
   IDEOptionsIntf, CompOptsIntf, IDEDialogs, IDEUtils,
+  // IDE
   Project, CompilerOptions, PackageDefs, LazarusIDEStrConsts, EnvironmentOpts,
   LazConf, IDEProcs, DialogProcs, InputHistory, InitialSetupProc;
 

ide/frames/compiler_path_options.pas

@@ -356,7 +356,7 @@ var
   p: Integer;
   CurPath: String;
   Duplicates: TStringList;
-  i: PtrInt;
+  i: PtrUInt;
   OldUnparsedSrcPath: String;
   NewUnparsedSrcPath: String;
   j: Integer;

ide/idefpcinfo.pas

@@ -30,9 +30,15 @@ unit IDEFPCInfo;
 interface
 
 uses
-  Classes, SysUtils, Forms, Controls, Graphics, Dialogs, StdCtrls, ComCtrls,
-  ButtonPanel, lazutf8classes, LazFileUtils, LazUTF8, FileProcs,
-  DefineTemplates, CodeToolManager, IDEWindowIntf, LazIDEIntf, BaseBuildManager,
+  // RTL + LCL
+  Classes, SysUtils,
+  Forms, Controls, Graphics, Dialogs, StdCtrls, ComCtrls, ButtonPanel,
+  // CodeTools
+  DefineTemplates, CodeToolManager, FileProcs,
+  // LazUtils
+  LazUTF8Classes, LazFileUtils, LazUTF8,
+  // Other
+  IDEWindowIntf, LazIDEIntf, BaseBuildManager,
   Project, EnvironmentOpts, LazarusIDEStrConsts, AboutFrm, TransferMacros;
 
 type

ide/ideprocs.pp

@@ -30,9 +30,15 @@ unit IDEProcs;
 interface
 
 uses
-  Classes, SysUtils, FileUtil, LCLProc, AvgLvlTree, Laz2_XMLCfg, LazUTF8,
-  lazutf8classes, LazFileUtils, LazFileCache, StdCtrls, ExtCtrls, SourceLog,
-  FileProcs, CodeToolManager, CodeToolsConfig, CodeCache, LazConf;
+  // RTL + LCL
+  Classes, SysUtils, LCLProc, StdCtrls, ExtCtrls,
+  // CodeTools
+  SourceLog, FileProcs, CodeToolManager, CodeToolsConfig, CodeCache,
+  // LazUtils
+  FileUtil, LazFileUtils, LazFileCache, LazUTF8, lazutf8classes,
+  AvgLvlTree, Laz2_XMLCfg,
+  // IDE
+  LazConf;
 
 type
   // comments

ide/initialsetupdlgs.pas

@@ -40,10 +40,14 @@ unit InitialSetupDlgs;
 interface
 
 uses
-  Classes, SysUtils, Forms, Controls, Buttons, Dialogs, Graphics, ComCtrls,
-  ExtCtrls, StdCtrls, LCLProc,
+  // RTL + FCL + LCL
+  Classes, SysUtils,
+  Forms, Controls, Buttons, Dialogs, Graphics, ComCtrls, ExtCtrls, StdCtrls, LCLProc,
+  // CodeTools
+  FileProcs, CodeToolManager, DefineTemplates,
+  // LazUtils
   FileUtil, LazUTF8, LazUTF8Classes, LazFileUtils, LazFileCache, LazLogger,
-  CodeToolManager, DefineTemplates, FileProcs,
+  // Other
   MacroDefIntf, GDBMIDebugger, DbgIntfDebuggerBase,
   TransferMacros, LazarusIDEStrConsts, LazConf, EnvironmentOpts,
   AboutFrm, IDETranslations, BaseBuildManager, InitialSetupProc;

ide/initialsetupproc.pas

@@ -32,10 +32,15 @@ unit InitialSetupProc;
 interface
 
 uses
-  Classes, SysUtils, strutils, LazFileCache, LazUTF8Classes, LazFileUtils,
-  LazLoggerBase, LazUTF8, Laz2_XMLCfg, LazLogger, DefineTemplates,
-  CodeToolManager, FileProcs, LazarusIDEStrConsts, LazConf, EnvironmentOpts,
-  IDEProcs, contnrs;
+  // RTL + FCL + LCL
+  Classes, SysUtils, strutils, contnrs,
+  // CodeTools
+  DefineTemplates, CodeToolManager, FileProcs,
+  // LazUtils
+  LazFileCache, LazUTF8, LazUTF8Classes, LazFileUtils,
+  LazLoggerBase, LazLogger, Laz2_XMLCfg,
+  // IDE
+  LazarusIDEStrConsts, LazConf, EnvironmentOpts, IDEProcs;
 
 type
   TSDFilenameQuality = (

ide/inspectchksumchangeddlg.pas

@@ -40,10 +40,13 @@ unit InspectChksumChangedDlg;
 interface
 
 uses
-  Classes, SysUtils, contnrs, LCLProc, Forms, Controls, StdCtrls, ExtCtrls,
-  ComCtrls, ButtonPanel, LazFileUtils, LazFileCache,
-  // codetools
+  // RTL + FCL + LCL
+  Classes, SysUtils, contnrs,
+  LCLProc, Forms, Controls, StdCtrls, ExtCtrls, ComCtrls, ButtonPanel,
+  // CodeTools
   CodeToolManager, FileProcs, DirectoryCacher, DefineTemplates,
+  // LazUtils
+  LazFileUtils, LazFileCache,
   // IDEIntf
   TextTools, IDEMsgIntf, PackageIntf, ProjectIntf, IDEExternToolIntf,
   // IDE

ide/main.pp

@@ -63,18 +63,18 @@ uses
 {$IFDEF UseAsyncProcess}
   AsyncProcess,
 {$ENDIF}
-  // lazutils
-  Laz2_XMLCfg, UTF8Process, LazLogger, LazUTF8Classes,
-  // lcl
-  LCLProc, LCLType, LCLIntf, LConvEncoding, ComCtrls,
-  FileUtil, LResources, Forms, Buttons, Menus, Controls, GraphType,
-  HelpIntfs, Graphics, ExtCtrls, Dialogs, InterfaceBase,
-  // codetools
+  // LCL
+  LCLProc, LCLType, LCLIntf, LResources, ComCtrls, HelpIntfs, InterfaceBase,
+  Forms, Buttons, Menus, Controls, GraphType, Graphics, ExtCtrls, Dialogs,
+  // CodeTools
   FileProcs, FindDeclarationTool, LinkScanner, BasicCodeTools, CodeToolsStructs,
   CodeToolManager, CodeCache, DefineTemplates, KeywordFuncLists, CodeTree,
   StdCodeTools,
-  LazUTF8, LazFileUtils, LazFileCache, // use lazutf8, lazfileutils and lazfilecache after FileProcs and FileUtil
-  // synedit
+  // LazUtils
+  // use lazutf8, lazfileutils and lazfilecache after FileProcs and FileUtil
+  FileUtil, LazFileUtils, LazFileCache, LazUTF8, LazUTF8Classes, UTF8Process,
+  LConvEncoding, Laz2_XMLCfg, LazLogger,
+  // SynEdit
   AllSynEdit, SynEditKeyCmds, SynEditMarks,
   // IDE interface
   IDEIntf, ObjectInspector, PropEdits, PropEditUtils,
@@ -8036,8 +8036,8 @@ begin
   end;
 end;
 
-procedure TMainIDE.DoShowDesignerFormOfSrc(AEditor: TSourceEditorInterface; out
-  AForm: TCustomForm);
+procedure TMainIDE.DoShowDesignerFormOfSrc(AEditor: TSourceEditorInterface;
+  out AForm: TCustomForm);
 var
   ActiveUnitInfo: TUnitInfo;
   UnitCodeBuf: TCodeBuffer;

ide/project.pp

@@ -46,16 +46,17 @@ uses
 {$IFDEF IDE_MEM_CHECK}
   MemCheck,
 {$ENDIF}
-  Classes, SysUtils, TypInfo, FPCAdds, LCLProc, Forms,
-  FileUtil, Laz2_XMLCfg, Controls, Dialogs, maps, LazFileUtils, LazFileCache,
-  LazUTF8,
-  // codetools
+  // RTL + FCL + LCL
+  Classes, SysUtils, TypInfo, LCLProc, Forms, Controls, Dialogs, maps,
+  // CodeTools
   CodeToolsConfig, ExprEval, DefineTemplates,
   BasicCodeTools, CodeToolsCfgScript, CodeToolManager, CodeCache, FileProcs,
+  // LazUtils
+  FPCAdds, FileUtil, LazFileUtils, LazFileCache, LazUTF8, Laz2_XMLCfg,
   // IDEIntf
   PropEdits, CompOptsIntf, ProjectIntf, MacroIntf, MacroDefIntf, UnitResources,
   PackageIntf, SrcEditorIntf, IDEOptionsIntf, IDEDialogs, LazIDEIntf,
-  // synedit
+  // SynEdit
   SynEdit,
   // IDE
   CompOptsModes, ProjectResources, LazConf, W32Manifest, ProjectIcon,

ide/searchfrm.pas

@@ -31,11 +31,13 @@ unit SearchFrm;
 interface
 
 uses
-  // LCL
+  // RTL + FCL + LCL
   Classes, SysUtils, types, LCLProc, LCLIntf, Forms, Controls, ComCtrls,
-  Dialogs, ExtCtrls, StdCtrls, Buttons, LazFileUtils, LazFileCache, FileUtil,
-  // synedit, codetools
+  Dialogs, ExtCtrls, StdCtrls, Buttons,
+  // SynEdit, CodeTools
   SynRegExpr, SourceLog, KeywordFuncLists, BasicCodeTools, FileProcs,
+  // LazUtils
+  FileUtil, LazFileUtils, LazFileCache,
   // IDEIntf
   IDEWindowIntf, LazIDEIntf, SrcEditorIntf, IDEDialogs,
   // ide

ide/unitdependencies.pas

@@ -35,14 +35,19 @@ unit UnitDependencies;
 interface
 
 uses
+  // RTL + FCL + LCL
   Classes, SysUtils, types, math, AVL_Tree,
   Forms, Controls, ExtCtrls, ComCtrls, StdCtrls, Buttons, Dialogs, Menus, Clipbrd,
+  // CodeTools
+  CodeToolManager, DefineTemplates, CodeToolsStructs, CTUnitGraph, CTUnitGroupGraph,
+  FileProcs, CodeCache,
+  // LazUtils
   LazLogger, LazFileUtils, LazFileCache, LazUtilities, LazUTF8, LvlGraphCtrl,
+  // IDE interface
   LazIDEIntf, ProjectIntf, IDEWindowIntf, PackageIntf, SrcEditorIntf, IDEImagesIntf,
   IDEMsgIntf, IDEExternToolIntf, IDECommands, IDEDialogs,
-  CodeToolManager, DefineTemplates, CodeToolsStructs,
-  IDEOptionDefs, CTUnitGraph, CTUnitGroupGraph, FileProcs, CodeCache,
-  LazarusIDEStrConsts, UnusedUnitsDlg;
+  // IDE
+  IDEOptionDefs, LazarusIDEStrConsts, UnusedUnitsDlg;
 
 const
   GroupPrefixProject = '-Project-';

ide/unitinfodlg.pp

@@ -27,9 +27,14 @@ unit UnitInfoDlg;
 interface
 
 uses
-  SysUtils, LCLProc, Controls, StdCtrls, Forms, Buttons,
-  ComCtrls, LazFileUtils, LazarusIDEStrConsts,
-  CodeToolsDefPreview, CodeToolManager, FileProcs;
+  // LCL + FCL
+  SysUtils, LCLProc, Controls, StdCtrls, Forms, Buttons, ComCtrls,
+  // CodeTools
+  CodeToolsDefPreview, CodeToolManager, FileProcs,
+  // LazUtils
+  LazFileUtils,
+  // IDE
+  LazarusIDEStrConsts;
 
 type
 

lcl/dialogs.pp

@@ -21,10 +21,13 @@ unit Dialogs;
 interface
 
 uses
-  Types, typinfo, Classes, LResources, SysUtils, LazFileUtils,
-  LCLIntf, InterfaceBase, FileUtil, LCLStrConsts, LCLType, LCLProc, Forms,
+  // RTL + FCL + LCL
+  Types, typinfo, Classes, SysUtils,
+  LResources, LCLIntf, InterfaceBase, LCLStrConsts, LCLType, LCLProc, Forms,
   Controls, Themes, GraphType, Graphics, Buttons, ButtonPanel, StdCtrls,
-  ExtCtrls, LCLClasses, ClipBrd;
+  ExtCtrls, LCLClasses, ClipBrd,
+  // LazUtils
+  FileUtil, LazFileUtils;
 
 
 type

lcl/interfaces/gtk2/gtk2proc.pp

@@ -43,11 +43,14 @@ uses
     {$endif}
   // Other units
   Math, // Math after gtk to get the correct Float type
-  LMessages, LCLProc, LazUTF8, LCLIntf, LCLType, DynHashArray, Masks,
-  GraphType, Graphics, LResources, Controls, Forms,
-  Buttons, Menus, StdCtrls, ComCtrls, ExtCtrls, Dialogs, ExtDlgs,
-  ImgList, Gtk2FontCache, Gtk2Globals, Gtk2Def, Gtk2Extra, {%H-}Gtk2Debug,
-  FileUtil, LazFileUtils, LCLMessageGlue;
+  // LCL
+  LMessages, LCLProc, LCLIntf, LCLType, DynHashArray, GraphType, Graphics,
+  LResources, Controls, Forms, Buttons, Menus, StdCtrls, ComCtrls, ExtCtrls,
+  Dialogs, ExtDlgs, ImgList, LCLMessageGlue,
+  // LazUtils
+  Masks, FileUtil, LazFileUtils, LazUTF8,
+  // Gtk2
+  Gtk2FontCache, Gtk2Globals, Gtk2Def, Gtk2Extra, {%H-}Gtk2Debug;
 
 const
   GtkListItemGtkListTag = 'GtkList';

lcl/interfaces/qt/qtsystemtrayicon.pas

@@ -20,7 +20,7 @@ interface
 {$i qtdefines.inc}
 
 uses
-  Classes, Controls, ExtCtrls, Graphics, Forms, types, LCLType, LazUTF8, LCLProc,
+  Classes, types, Controls, ExtCtrls, Graphics, Forms, LCLType, LCLProc, LazUTF8,
   qtobjects, qt4, qtproc, qtint;
 
 type

packager/interpkgconflictfiles.pas

@@ -53,13 +53,15 @@ unit InterPkgConflictFiles;
 interface
 
 uses
-  Classes, SysUtils, types, math, contnrs, InterfaceBase, Forms, ComCtrls,
-  Controls, ButtonPanel, Themes, Graphics, StdCtrls, Buttons,
-  LazFileUtils, LazFileCache, AvgLvlTree,
+  // RTL + FCL + LCL
+  Classes, SysUtils, types, math, contnrs, InterfaceBase,
+  Forms, ComCtrls, Controls, ButtonPanel, Themes, Graphics, StdCtrls, Buttons,
+  // CodeTools
   BasicCodeTools, DefineTemplates, CodeToolManager, FileProcs,
+  // LazUtils
+  LazFileUtils, LazFileCache, AvgLvlTree,
   // IDEIntf
-  ProjectIntf, CompOptsIntf, IDEWindowIntf, LazIDEIntf,
-  IDEMsgIntf, IDEExternToolIntf,
+  ProjectIntf, CompOptsIntf, IDEWindowIntf, LazIDEIntf, IDEMsgIntf, IDEExternToolIntf,
   // IDE
   CompilerOptions, EnvironmentOpts, IDEProcs, DialogProcs, LazarusIDEStrConsts,
   TransferMacros, LazConf, PackageDefs, PackageSystem;