IDE, LazUtils: Move unit FileReferenceList to LazUtils package. Order uses sections.

git-svn-id: trunk@64025 -

.gitattributes

@@ -3381,6 +3381,7 @@ components/lazutils/examples/LookupStringList/TDedupeDemo.lpr svneol=native#text
 components/lazutils/examples/LookupStringList/main.lfm svneol=native#text/plain
 components/lazutils/examples/LookupStringList/main.pas svneol=native#text/pascal
 components/lazutils/extendedstrings.pas svneol=native#text/pascal
+components/lazutils/filereferencelist.pas svneol=native#text/pascal
 components/lazutils/fileutil.inc svneol=native#text/pascal
 components/lazutils/fileutil.pas svneol=native#text/pascal
 components/lazutils/fpcadds.pas svneol=native#text/pascal
@@ -7265,7 +7266,6 @@ ide/exttooleditdlg.pas svneol=native#text/pascal
 ide/exttools.pas svneol=native#text/plain
 ide/exttoolsconsole.pas svneol=native#text/pascal
 ide/exttoolside.pas svneol=native#text/pascal
-ide/filereferencelist.pas svneol=native#text/pascal
 ide/findinfilesdlg.lfm svneol=native#text/plain
 ide/findinfilesdlg.pas svneol=native#text/pascal
 ide/findoverloadsdlg.lfm svneol=native#text/plain

components/lazutils/filereferencelist.pas

@@ -1,11 +1,4 @@
 {
- /***************************************************************************
-                            filereferencelist.pas
-                            ---------------------
-
-
- ***************************************************************************/
-
  ***************************************************************************
  *                                                                         *
  *   This source is free software; you can redistribute it and/or modify   *
@@ -39,10 +32,8 @@ interface
 
 uses
   Classes, SysUtils, Laz_AVL_Tree,
-  // Codetools
-  FileProcs,
   // LazUtils
-  LazFileUtils, LazTracer;
+  LazFileUtils, LazFileCache, LazTracer;
 
 type
   { TFileReference }
@@ -164,7 +155,7 @@ end;
 
 procedure TFileReferenceList.IncreaseTimeStamp;
 begin
-  CTIncreaseChangeStamp(FTimeStamp);
+  LUIncreaseChangeStamp(FTimeStamp);
   //DebugLn('TFileReferenceList.IncreaseTimeStamp ',dbgs(FTimeStamp));
 end;
 
@@ -180,7 +171,7 @@ end;
 
 constructor TFileReferenceList.Create;
 begin
-  FTimeStamp:=CTInvalidChangeStamp;
+  FTimeStamp:=LUInvalidChangeStamp;
 end;
 
 destructor TFileReferenceList.Destroy;

components/lazutils/fpmake.pp

@@ -3,7 +3,7 @@
 
    fpmake.pp for LazUtils 1.0
 
-   This file was generated on 24.07.2020
+   This file was generated on 15.10.2020
 }
 
 {$ifndef ALLPACKAGES} 
@@ -46,18 +46,26 @@ begin
     P.UnitPath.Add('.');
     T:=P.Targets.AddUnit('lazutils.pas');
     t.Dependencies.AddUnit('avglvltree');
+    t.Dependencies.AddUnit('codepagesasian');
+    t.Dependencies.AddUnit('codepagescommon');
+    t.Dependencies.AddUnit('compwriterpas');
     t.Dependencies.AddUnit('dynamicarray');
     t.Dependencies.AddUnit('dynhasharray');
     t.Dependencies.AddUnit('dynqueue');
     t.Dependencies.AddUnit('extendedstrings');
+    t.Dependencies.AddUnit('filereferencelist');
     t.Dependencies.AddUnit('fileutil');
     t.Dependencies.AddUnit('fpcadds');
+    t.Dependencies.AddUnit('graphtype');
+    t.Dependencies.AddUnit('html2textrender');
+    t.Dependencies.AddUnit('integerlist');
     t.Dependencies.AddUnit('laz2_dom');
     t.Dependencies.AddUnit('laz2_xmlcfg');
     t.Dependencies.AddUnit('laz2_xmlread');
     t.Dependencies.AddUnit('laz2_xmlutils');
     t.Dependencies.AddUnit('laz2_xmlwrite');
     t.Dependencies.AddUnit('laz2_xpath');
+    t.Dependencies.AddUnit('laz_avl_tree');
     t.Dependencies.AddUnit('laz_dom');
     t.Dependencies.AddUnit('laz_xmlcfg');
     t.Dependencies.AddUnit('laz_xmlread');
@@ -77,51 +85,52 @@ begin
     t.Dependencies.AddUnit('lazloggerdummy');
     t.Dependencies.AddUnit('lazloggerprofiling');
     t.Dependencies.AddUnit('lazmethodlist');
+    t.Dependencies.AddUnit('lazpasreadutil');
+    t.Dependencies.AddUnit('lazstringutils');
+    t.Dependencies.AddUnit('lazsysutils');
+    t.Dependencies.AddUnit('laztracer');
     t.Dependencies.AddUnit('lazunicode');
     t.Dependencies.AddUnit('lazutf16');
     t.Dependencies.AddUnit('lazutf8');
     t.Dependencies.AddUnit('lazutf8classes');
-    t.Dependencies.AddUnit('lazsysutils');
+    t.Dependencies.AddUnit('lazutf8sysutils');
     t.Dependencies.AddUnit('lazutilities');
     t.Dependencies.AddUnit('lazutilsstrconsts');
+    t.Dependencies.AddUnit('lazversion');
     t.Dependencies.AddUnit('lconvencoding');
     t.Dependencies.AddUnit('lcsvutils');
     t.Dependencies.AddUnit('lookupstringlist');
     t.Dependencies.AddUnit('maps');
     t.Dependencies.AddUnit('masks');
+    t.Dependencies.AddUnit('objectlists');
     t.Dependencies.AddUnit('paswstring');
     t.Dependencies.AddUnit('stringhashlist');
     t.Dependencies.AddUnit('textstrings');
     t.Dependencies.AddUnit('translations');
-    t.Dependencies.AddUnit('utf8process');
-    t.Dependencies.AddUnit('html2textrender');
-    t.Dependencies.AddUnit('laz_avl_tree');
-    t.Dependencies.AddUnit('compwriterpas');
-    t.Dependencies.AddUnit('lazpasreadutil');
-    t.Dependencies.AddUnit('integerlist');
-    t.Dependencies.AddUnit('lazversion');
     t.Dependencies.AddUnit('uitypes');
-    t.Dependencies.AddUnit('graphtype');
+    t.Dependencies.AddUnit('utf8process');
-    t.Dependencies.AddUnit('laztracer');
-    t.Dependencies.AddUnit('lazstringutils');
-    t.Dependencies.AddUnit('lazutf8sysutils');
-    t.Dependencies.AddUnit('objectlists');
-    t.Dependencies.AddUnit('codepagesasian');
-    t.Dependencies.AddUnit('codepagescommon');
 
     T:=P.Targets.AddUnit('avglvltree.pas');
+    T:=P.Targets.AddUnit('codepagesasian.pas');
+    T:=P.Targets.AddUnit('codepagescommon.pas');
+    T:=P.Targets.AddUnit('compwriterpas.pas');
     T:=P.Targets.AddUnit('dynamicarray.pas');
     T:=P.Targets.AddUnit('dynhasharray.pp');
     T:=P.Targets.AddUnit('dynqueue.pas');
     T:=P.Targets.AddUnit('extendedstrings.pas');
+    T:=P.Targets.AddUnit('filereferencelist.pas');
     T:=P.Targets.AddUnit('fileutil.pas');
     T:=P.Targets.AddUnit('fpcadds.pas');
+    T:=P.Targets.AddUnit('graphtype.pp');
+    T:=P.Targets.AddUnit('html2textrender.pas');
+    T:=P.Targets.AddUnit('integerlist.pas');
     T:=P.Targets.AddUnit('laz2_dom.pas');
     T:=P.Targets.AddUnit('laz2_xmlcfg.pas');
     T:=P.Targets.AddUnit('laz2_xmlread.pas');
     T:=P.Targets.AddUnit('laz2_xmlutils.pas');
     T:=P.Targets.AddUnit('laz2_xmlwrite.pas');
     T:=P.Targets.AddUnit('laz2_xpath.pas');
+    T:=P.Targets.AddUnit('laz_avl_tree.pp');
     T:=P.Targets.AddUnit('laz_dom.pas');
     T:=P.Targets.AddUnit('laz_xmlcfg.pas');
     T:=P.Targets.AddUnit('laz_xmlread.pas');
@@ -141,37 +150,30 @@ begin
     T:=P.Targets.AddUnit('lazloggerdummy.pas');
     T:=P.Targets.AddUnit('lazloggerprofiling.pas');
     T:=P.Targets.AddUnit('lazmethodlist.pas');
+    T:=P.Targets.AddUnit('lazpasreadutil.pas');
+    T:=P.Targets.AddUnit('lazstringutils.pas');
+    T:=P.Targets.AddUnit('lazsysutils.pas');
+    T:=P.Targets.AddUnit('laztracer.pas');
     T:=P.Targets.AddUnit('lazunicode.pas');
     T:=P.Targets.AddUnit('lazutf16.pas');
     T:=P.Targets.AddUnit('lazutf8.pas');
     T:=P.Targets.AddUnit('lazutf8classes.pas');
-    T:=P.Targets.AddUnit('lazsysutils.pas');
+    T:=P.Targets.AddUnit('lazutf8sysutils.pas');
     T:=P.Targets.AddUnit('lazutilities.pas');
     T:=P.Targets.AddUnit('lazutilsstrconsts.pas');
+    T:=P.Targets.AddUnit('lazversion.pas');
     T:=P.Targets.AddUnit('lconvencoding.pas');
     T:=P.Targets.AddUnit('lcsvutils.pas');
     T:=P.Targets.AddUnit('lookupstringlist.pas');
     T:=P.Targets.AddUnit('maps.pp');
     T:=P.Targets.AddUnit('masks.pas');
+    T:=P.Targets.AddUnit('objectlists.pas');
     T:=P.Targets.AddUnit('paswstring.pas');
     T:=P.Targets.AddUnit('stringhashlist.pas');
     T:=P.Targets.AddUnit('textstrings.pas');
     T:=P.Targets.AddUnit('translations.pas');
-    T:=P.Targets.AddUnit('utf8process.pp');
-    T:=P.Targets.AddUnit('html2textrender.pas');
-    T:=P.Targets.AddUnit('laz_avl_tree.pp');
-    T:=P.Targets.AddUnit('compwriterpas.pas');
-    T:=P.Targets.AddUnit('lazpasreadutil.pas');
-    T:=P.Targets.AddUnit('integerlist.pas');
-    T:=P.Targets.AddUnit('lazversion.pas');
     T:=P.Targets.AddUnit('uitypes.pas');
-    T:=P.Targets.AddUnit('graphtype.pp');
+    T:=P.Targets.AddUnit('utf8process.pp');
-    T:=P.Targets.AddUnit('laztracer.pas');
-    T:=P.Targets.AddUnit('lazstringutils.pas');
-    T:=P.Targets.AddUnit('lazutf8sysutils.pas');
-    T:=P.Targets.AddUnit('objectlists.pas');
-    T:=P.Targets.AddUnit('codepagesasian.pas');
-    T:=P.Targets.AddUnit('codepagescommon.pas');
 
     // copy the compiled file, so the IDE knows how the package was compiled
     P.Sources.AddSrc('LazUtils.compiled');

components/lazutils/lazutils.lpk

@@ -46,6 +46,18 @@
         <Filename Value="avglvltree.pas"/>
         <UnitName Value="AvgLvlTree"/>
       </Item>
+      <Item>
+        <Filename Value="codepagesasian.pas"/>
+        <UnitName Value="CodepagesAsian"/>
+      </Item>
+      <Item>
+        <Filename Value="codepagescommon.pas"/>
+        <UnitName Value="CodepagesCommon"/>
+      </Item>
+      <Item>
+        <Filename Value="compwriterpas.pas"/>
+        <UnitName Value="CompWriterPas"/>
+      </Item>
       <Item>
         <Filename Value="dynamicarray.pas"/>
         <UnitName Value="DynamicArray"/>
@@ -62,6 +74,10 @@
         <Filename Value="extendedstrings.pas"/>
         <UnitName Value="ExtendedStrings"/>
       </Item>
+      <Item>
+        <Filename Value="filereferencelist.pas"/>
+        <UnitName Value="FileReferenceList"/>
+      </Item>
       <Item>
         <Filename Value="fileutil.pas"/>
         <UnitName Value="FileUtil"/>
@@ -74,6 +90,18 @@
         <Filename Value="fpcadds.pas"/>
         <UnitName Value="FPCAdds"/>
       </Item>
+      <Item>
+        <Filename Value="graphtype.pp"/>
+        <UnitName Value="GraphType"/>
+      </Item>
+      <Item>
+        <Filename Value="html2textrender.pas"/>
+        <UnitName Value="HTML2TextRender"/>
+      </Item>
+      <Item>
+        <Filename Value="integerlist.pas"/>
+        <UnitName Value="IntegerList"/>
+      </Item>
       <Item>
         <Filename Value="laz2_dom.pas"/>
         <UnitName Value="Laz2_DOM"/>
@@ -102,6 +130,10 @@
         <Filename Value="laz2_xpath.pas"/>
         <UnitName Value="laz2_xpath"/>
       </Item>
+      <Item>
+        <Filename Value="laz_avl_tree.pp"/>
+        <UnitName Value="Laz_AVL_Tree"/>
+      </Item>
       <Item>
         <Filename Value="laz_dom.pas"/>
         <UnitName Value="Laz_DOM"/>
@@ -182,6 +214,22 @@
         <Filename Value="lazmethodlist.pas"/>
         <UnitName Value="LazMethodList"/>
       </Item>
+      <Item>
+        <Filename Value="lazpasreadutil.pas"/>
+        <UnitName Value="LazPasReadUtil"/>
+      </Item>
+      <Item>
+        <Filename Value="lazstringutils.pas"/>
+        <UnitName Value="LazStringUtils"/>
+      </Item>
+      <Item>
+        <Filename Value="lazsysutils.pas"/>
+        <UnitName Value="LazSysUtils"/>
+      </Item>
+      <Item>
+        <Filename Value="laztracer.pas"/>
+        <UnitName Value="LazTracer"/>
+      </Item>
       <Item>
         <Filename Value="lazunicode.pas"/>
         <UnitName Value="LazUnicode"/>
@@ -199,8 +247,8 @@
         <UnitName Value="LazUTF8Classes"/>
       </Item>
       <Item>
-        <Filename Value="lazsysutils.pas"/>
+        <Filename Value="lazutf8sysutils.pas"/>
-        <UnitName Value="LazSysUtils"/>
+        <UnitName Value="LazUTF8SysUtils"/>
       </Item>
       <Item>
         <Filename Value="lazutilities.pas"/>
@@ -214,6 +262,10 @@
         <Filename Value="lazutilsstrconsts.pas"/>
         <UnitName Value="LazUtilsStrConsts"/>
       </Item>
+      <Item>
+        <Filename Value="lazversion.pas"/>
+        <UnitName Value="LazVersion"/>
+      </Item>
       <Item>
         <Filename Value="lconvencoding.pas"/>
         <UnitName Value="LConvEncoding"/>
@@ -234,6 +286,10 @@
         <Filename Value="masks.pas"/>
         <UnitName Value="Masks"/>
       </Item>
+      <Item>
+        <Filename Value="objectlists.pas"/>
+        <UnitName Value="ObjectLists"/>
+      </Item>
       <Item>
         <Filename Value="paswstring.pas"/>
         <UnitName Value="PasWString"/>
@@ -250,6 +306,10 @@
         <Filename Value="translations.pas"/>
         <UnitName Value="Translations"/>
       </Item>
+      <Item>
+        <Filename Value="uitypes.pas"/>
+        <UnitName Value="UITypes"/>
+      </Item>
       <Item>
         <Filename Value="unixfileutil.inc"/>
         <Type Value="Include"/>
@@ -278,62 +338,6 @@
         <Filename Value="winlazutf8.inc"/>
         <Type Value="Include"/>
       </Item>
-      <Item>
-        <Filename Value="html2textrender.pas"/>
-        <UnitName Value="HTML2TextRender"/>
-      </Item>
-      <Item>
-        <Filename Value="laz_avl_tree.pp"/>
-        <UnitName Value="Laz_AVL_Tree"/>
-      </Item>
-      <Item>
-        <Filename Value="compwriterpas.pas"/>
-        <UnitName Value="CompWriterPas"/>
-      </Item>
-      <Item>
-        <Filename Value="lazpasreadutil.pas"/>
-        <UnitName Value="LazPasReadUtil"/>
-      </Item>
-      <Item>
-        <Filename Value="integerlist.pas"/>
-        <UnitName Value="IntegerList"/>
-      </Item>
-      <Item>
-        <Filename Value="lazversion.pas"/>
-        <UnitName Value="LazVersion"/>
-      </Item>
-      <Item>
-        <Filename Value="uitypes.pas"/>
-        <UnitName Value="UITypes"/>
-      </Item>
-      <Item>
-        <Filename Value="graphtype.pp"/>
-        <UnitName Value="GraphType"/>
-      </Item>
-      <Item>
-        <Filename Value="laztracer.pas"/>
-        <UnitName Value="LazTracer"/>
-      </Item>
-      <Item>
-        <Filename Value="lazstringutils.pas"/>
-        <UnitName Value="LazStringUtils"/>
-      </Item>
-      <Item>
-        <Filename Value="lazutf8sysutils.pas"/>
-        <UnitName Value="LazUTF8SysUtils"/>
-      </Item>
-      <Item>
-        <Filename Value="objectlists.pas"/>
-        <UnitName Value="ObjectLists"/>
-      </Item>
-      <Item>
-        <Filename Value="codepagesasian.pas"/>
-        <UnitName Value="CodepagesAsian"/>
-      </Item>
-      <Item>
-        <Filename Value="codepagescommon.pas"/>
-        <UnitName Value="CodepagesCommon"/>
-      </Item>
     </Files>
     <LazDoc Paths="../../docs/xml/lazutils"/>
     <i18n>

components/lazutils/lazutils.pas

@@ -8,18 +8,19 @@ unit LazUtils;
 interface
 
 uses
-  AvgLvlTree, DynamicArray, DynHashArray, DynQueue, ExtendedStrings, FileUtil, 
+  AvgLvlTree, CodepagesAsian, CodepagesCommon, CompWriterPas, DynamicArray, 
-  FPCAdds, Laz2_DOM, Laz2_XMLCfg, laz2_XMLRead, laz2_xmlutils, laz2_XMLWrite, 
+  DynHashArray, DynQueue, ExtendedStrings, FileReferenceList, FileUtil, 
-  laz2_xpath, Laz_DOM, Laz_XMLCfg, Laz_XMLRead, Laz_XMLStreaming, 
+  FPCAdds, GraphType, HTML2TextRender, IntegerList, Laz2_DOM, Laz2_XMLCfg, 
-  Laz_XMLWrite, LazClasses, lazCollections, LazConfigStorage, LazDbgLog, 
+  laz2_XMLRead, laz2_xmlutils, laz2_XMLWrite, laz2_xpath, Laz_AVL_Tree, 
-  lazfglhash, LazFileCache, LazFileUtils, LazLinkedList, LazListClasses, 
+  Laz_DOM, Laz_XMLCfg, Laz_XMLRead, Laz_XMLStreaming, Laz_XMLWrite, 
-  LazLogger, LazLoggerBase, LazLoggerDummy, LazLoggerProfiling, LazMethodList, 
+  LazClasses, lazCollections, LazConfigStorage, LazDbgLog, lazfglhash, 
-  LazUnicode, LazUTF16, LazUTF8, LazUTF8Classes, LazSysUtils, LazUtilities, 
+  LazFileCache, LazFileUtils, LazLinkedList, LazListClasses, LazLogger, 
-  LazUtilsStrConsts, LConvEncoding, lcsvutils, LookupStringList, Maps, Masks, 
+  LazLoggerBase, LazLoggerDummy, LazLoggerProfiling, LazMethodList, 
-  PasWString, StringHashList, TextStrings, Translations, UTF8Process, 
+  LazPasReadUtil, LazStringUtils, LazSysUtils, LazTracer, LazUnicode, 
-  HTML2TextRender, Laz_AVL_Tree, CompWriterPas, LazPasReadUtil, IntegerList, 
+  LazUTF16, LazUTF8, LazUTF8Classes, LazUTF8SysUtils, LazUtilities, 
-  LazVersion, UITypes, GraphType, LazTracer, LazStringUtils, LazUTF8SysUtils, 
+  LazUtilsStrConsts, LazVersion, LConvEncoding, lcsvutils, LookupStringList, 
-  ObjectLists, CodepagesAsian, CodepagesCommon, LazarusPackageIntf;
+  Maps, Masks, ObjectLists, PasWString, StringHashList, TextStrings, 
+  Translations, UITypes, UTF8Process, LazarusPackageIntf;
 
 implementation
 

ide/buildmanager.pas

@@ -44,13 +44,15 @@ uses
   // LazUtils
   LConvEncoding, FileUtil, LazFileUtils, LazFileCache, LazUTF8, Laz2_XMLCfg,
   LazUtilities, LazStringUtils, LazMethodList,
+  // BuildIntf
+  BaseIDEIntf, IDEOptionsIntf, ProjectIntf, MacroIntf, PublishModuleIntf,
+  IDEExternToolIntf, CompOptsIntf, MacroDefIntf,
   // IDEIntf
-  BaseIDEIntf, IDEOptionsIntf, ProjectIntf, MacroIntf, IDEDialogs, IDEExternToolIntf,
+  IDEDialogs, LazIDEIntf, IDEMsgIntf,
-  CompOptsIntf, LazIDEIntf, MacroDefIntf, IDEMsgIntf,
   // IDE
   IDECmdLine, LazarusIDEStrConsts, DialogProcs, IDEProcs,
   InputHistory, EditDefineTree, ProjectResources, MiscOptions, LazConf,
-  EnvironmentOpts, TransferMacros, CompilerOptions, PublishModuleIntf,
+  EnvironmentOpts, TransferMacros, CompilerOptions,
   ExtTools, etMakeMsgParser, etFPCMsgParser, etPas2jsMsgParser,
   Compiler, FPCSrcScan, PackageDefs, PackageSystem, Project, ProjectIcon,
   ModeMatrixOpts, BaseBuildManager, ApplicationBundle, RunParamsOpts;

ide/fpmake.pp

@@ -438,8 +438,6 @@ begin
     T:=P.Targets.AddUnit('environmentopts.pp');
     T:=P.Targets.AddUnit('compileroptions.pp');
     T:=P.Targets.AddUnit('../packager/projpackcommon.pas');
-    T.Dependencies.AddUnit('filereferencelist');
-    T:=P.Targets.AddUnit('filereferencelist.pas');
 
     // copy the compiled file, so the IDE knows how the package was compiled
     P.InstallFiles.Add('ide.compiled',AllOSes,'$(unitinstalldir)');

ide/project.pp

@@ -55,7 +55,7 @@ uses
   LinkScanner, CodeToolManager, CodeCache, CodeTree, FileProcs, StdCodeTools,
   // LazUtils
   FPCAdds, LazUtilities, FileUtil, LazFileUtils, LazFileCache, LazMethodList,
-  LazLoggerBase, LazUTF8, Laz2_XMLCfg, Maps,
+  LazLoggerBase, FileReferenceList, LazUTF8, Laz2_XMLCfg, Maps,
   // IDEIntf
   PropEdits, UnitResources, EditorSyntaxHighlighterDef,
   CompOptsIntf, ProjectIntf, MacroIntf, MacroDefIntf, SrcEditorIntf,
@@ -63,7 +63,7 @@ uses
   // IDE
   CompOptsModes, ProjectResources, LazConf, ProjectIcon,
   IDECmdLine, IDEProcs, CompilerOptions, RunParamsOpts, ModeMatrixOpts,
-  TransferMacros, ProjectDefs, FileReferenceList, EditDefineTree,
+  TransferMacros, ProjectDefs, EditDefineTree,
   LazarusIDEStrConsts, InputHistory, ProjPackCommon, PackageDefs, PackageSystem;
 
 type

ide/projectdefs.pas

@@ -44,10 +44,8 @@ uses
   FileProcs,
   // LazUtils
   LazFileUtils, LazUTF8, Laz2_XMLCfg,
-  // IdeIntf
+  // BuildIntf
-  ProjectIntf,
+  ProjectIntf, PublishModuleIntf;
-  // IDE
-  PublishModuleIntf;
 
 type
   TOnLoadSaveFilename = procedure(var Filename:string; Load:boolean) of object;

ide/publishmoduledlg.pas

@@ -34,14 +34,15 @@ interface
 uses
   Classes, SysUtils, StrUtils, Zipper,
   // LCL
-  LCLType, Forms, Controls, StdCtrls, Dialogs, Buttons, ButtonPanel,
+  LCLType, Forms, Controls, StdCtrls, Dialogs, Buttons, ButtonPanel, LCLIntf,
   // LazUtils
   FileUtil, LazFileUtils, LazLoggerBase,
+  // BuildIntf
+  ProjPackIntf, CompOptsIntf, PublishModuleIntf,
   // IdeIntf
-  IDEWindowIntf, IDEHelpIntf, IDEDialogs, IDEImagesIntf, ProjPackIntf, CompOptsIntf,
+  IDEWindowIntf, IDEHelpIntf, IDEDialogs, IDEImagesIntf, LazIDEIntf,
-  LazIDEIntf, LCLIntf,
   // IDE
-  ProjectDefs, Project, PackageDefs, PublishModuleIntf, IDEOptionDefs, InputHistory,
+  ProjectDefs, Project, PackageDefs, IDEOptionDefs, InputHistory,
   LazarusIDEStrConsts, IDEProcs, EnvironmentOpts, CompilerOptions;
 
 type

packager/fppkghelper.pas

@@ -12,10 +12,8 @@ uses
   fprepos,
   LazarusIDEStrConsts,
   {$ENDIF}
-  LazLogger,
+  // LazUtils
-  LazFileCache,
+  LazLogger, LazFileCache, FileUtil, LazFileUtils;
-  FileUtil,
-  LazFileUtils;
 
 type
 

packager/packagedefs.pas

@@ -45,16 +45,16 @@ uses
   LazConfigStorage, DefineTemplates, CodeToolManager,
   CodeCache, CodeToolsCfgScript, CodeToolsStructs,
   // LazUtils
-  FileUtil, LazFileUtils, LazUtilities, LazFileCache, LazUTF8,
+  FileUtil, LazFileUtils, LazUtilities, LazFileCache, LazUTF8, FileReferenceList,
   LazTracer, LazLoggerBase, UITypes, Laz2_XMLCfg, AvgLvlTree,
   // BuildIntf
-  MacroIntf, MacroDefIntf, IDEOptionsIntf, PackageDependencyIntf, PackageIntf, FppkgIntf,
+  MacroIntf, MacroDefIntf, IDEOptionsIntf, PublishModuleIntf,
+  PackageDependencyIntf, PackageIntf, FppkgIntf,
   // IDEIntf
   LazIDEIntf, IDEOptEditorIntf, IDEDialogs, ComponentReg, IDEImagesIntf,
   // IDE
   EditDefineTree, CompilerOptions, CompOptsModes, IDEOptionDefs, ProjPackCommon,
-  LazarusIDEStrConsts, IDEProcs, TransferMacros, FileReferenceList,
+  LazarusIDEStrConsts, IDEProcs, TransferMacros, FppkgHelper;
-  PublishModuleIntf, FppkgHelper;
 
 type
   TLazPackage = class;

packager/projpackcommon.pas

@@ -8,11 +8,11 @@ interface
 uses
   Classes, SysUtils,
   // LazUtils
-  LazTracer,
+  LazTracer, FileReferenceList,
   // Codetools
   DefineTemplates, CodeToolManager,
   // IDE
-  CompilerOptions, FileReferenceList;
+  CompilerOptions;
 
 type