IdeIntf, BuildIntf, Packager: Clean up uses sections, adjust used units.

git-svn-id: trunk@62800 -

components/buildintf/fppkgintf.pas

@@ -7,6 +7,7 @@ interface
 uses
   Classes,
   SysUtils,
+  // BuildIntf
   PackageIntf;
 
 type

components/buildintf/macrodefintf.pas

@@ -16,7 +16,7 @@ unit MacroDefIntf;
 interface
 
 uses
-  Classes, SysUtils;
+  Classes;
 
 Type
   TTransferMacro = class;

components/buildintf/projectintf.pas

@@ -643,8 +643,7 @@ const
 
 function ProjectFlagsToStr(Flags: TProjectFlags): string;
 function StrToProjectSessionStorage(const s: string): TProjectSessionStorage;
-function CompilationExecutableTypeNameToType(const s: string
-                                             ): TCompilationExecutableType;
+function CompilationExecutableTypeNameToType(const s: string): TCompilationExecutableType;
 
 procedure RegisterProjectFileDescriptor(FileDesc: TProjectFileDescriptor);
 procedure RegisterProjectDescriptor(ProjDesc: TProjectDescriptor);
@@ -783,8 +782,7 @@ begin
   Result:=pssInProjectInfo;
 end;
 
-function CompilationExecutableTypeNameToType(const s: string
-  ): TCompilationExecutableType;
+function CompilationExecutableTypeNameToType(const s: string): TCompilationExecutableType;
 begin
   for Result:=Low(TCompilationExecutableType) to High(TCompilationExecutableType)
   do if CompareText(s,CompilationExecutableTypeNames[Result])=0 then exit;

components/ideintf/actionseditor.pas

@@ -26,7 +26,7 @@ interface
 uses
   Classes, SysUtils, contnrs,
   // LCL
-  LCLIntf, LCLType, LCLProc, Forms, Controls, Dialogs, ExtCtrls, StdCtrls,
+  LCLType, LCLProc, Forms, Controls, Dialogs, ExtCtrls, StdCtrls,
   Graphics, Menus, ComCtrls, DBActns, StdActns, ActnList,
   // IDEIntf
   ObjInspStrConsts, ComponentEditors, PropEdits, PropEditUtils, IDEWindowIntf,

components/ideintf/collectionpropeditform.pas

@@ -7,7 +7,9 @@ interface
 uses
   Classes, SysUtils,
   // LCL
-  LCLType, LCLProc, Forms, Controls, Dialogs, ComCtrls, StdCtrls, ActnList,
+  LCLType, Forms, Controls, Dialogs, ComCtrls, StdCtrls, ActnList,
+  // LazUtils
+  LazLoggerBase,
   // IdeIntf
   ObjInspStrConsts, PropEditUtils, IDEImagesIntf, IDEWindowIntf;
 

components/ideintf/columndlg.pp

@@ -13,8 +13,9 @@ interface
 uses
   Classes, SysUtils,
   // LCL
-  LCLProc, Forms, Controls, Graphics, Dialogs, LResources,
-  ComCtrls, StdCtrls, Buttons, ExtCtrls,
+  Forms, Controls, Dialogs, ComCtrls, StdCtrls, Buttons, ExtCtrls,
+  // LazUtils
+  LazLoggerBase,
   // IdeIntf
   ObjInspStrConsts;
 

components/ideintf/componenteditors.pas

@@ -21,14 +21,13 @@ interface
 uses
   Classes, SysUtils, TypInfo,
   // LCL
-  LCLProc, LResources, Forms, Controls, Menus, ExtCtrls, CustomTimer, Graphics,
-  Grids, CheckLst, Buttons, ComCtrls, Dialogs, GraphType,
+  LCLProc, Forms, Controls, Menus, ExtCtrls, CustomTimer,
+  Grids, CheckLst, ComCtrls, Dialogs,
   // LazUtils
-  Maps, LazMethodList, LazLoggerBase,
+  Maps, LazLoggerBase,
   // IdeIntf
   LazStringGridEdit, CheckListboxEditorDlg, CheckGroupEditorDlg,
-  PropEdits, PropEditUtils, ComponentReg,
-  ObjInspStrConsts;
+  PropEdits, PropEditUtils, ComponentReg, ObjInspStrConsts;
 
 type
   { TComponentEditorDesigner }

components/ideintf/componentreg.pas

@@ -26,9 +26,9 @@ interface
 uses
   Classes, SysUtils, typinfo, Laz_AVL_Tree, fgl,
   // LCL
-  Controls, LCLProc,
+  Controls,
   // LazUtils
-  Laz2_XMLCfg, LazMethodList;
+  LazLoggerBase, Laz2_XMLCfg, LazMethodList;
 
 type
   TComponentPriorityCategory = (

components/ideintf/componenttreeview.pas

@@ -26,9 +26,9 @@ interface
 uses
   Classes, SysUtils, TypInfo, Laz_AVL_Tree,
   // LazUtils
-  LazLoggerBase,
+  LazUtilities, LazLoggerBase, LazTracer,
   // LCL
-  LCLProc, Dialogs, Forms, Controls, ComCtrls, Graphics,
+  Dialogs, Forms, Controls, ComCtrls,
   // IdeIntf
   ObjInspStrConsts, PropEdits, PropEditUtils, ComponentEditors, IDEImagesIntf;
   

components/ideintf/dbgridcolumnspropeditform.pas

@@ -7,9 +7,11 @@ interface
 uses
   Classes, SysUtils, typinfo, db,
   // LCL
-  Controls, Dialogs, LCLProc, Forms, ComCtrls, StdCtrls, ActnList, LCLType, DBGrids,
+  LCLType, Dialogs, Forms, ComCtrls, StdCtrls, ActnList, DBGrids,
+  // LazUtils
+  UITypes, LazLoggerBase,
   // IdeIntf
-  IDEImagesIntf, ObjInspStrConsts, PropEdits, PropEditUtils;
+  ObjInspStrConsts, IDEImagesIntf, PropEdits, PropEditUtils;
 
 type
   { TDBGridColumnsPropertyEditorForm }

components/ideintf/dbpropedits.pas

@@ -19,7 +19,7 @@ interface
 uses
   Classes, SysUtils, TypInfo, DB,
   // LCL
-  Dialogs, DbCtrls, DBGrids, Forms, LCLProc,
+  Dialogs, Forms, DbCtrls, DBGrids,
   // IdeIntf
   PropEdits, PropEditUtils, ComponentEditors, DBGridColumnsPropEditForm,
   ObjInspStrConsts;

components/ideintf/fieldseditor.pas

@@ -16,7 +16,7 @@ unit fieldseditor;
 interface
 
 uses
-  Classes, SysUtils, types, db,
+  Classes, SysUtils, db,
   // LCL
   LCLType, Forms, Controls, Menus, Dialogs, ComCtrls, ActnList, StdCtrls,
   // IdeIntf

components/ideintf/filefilterpropeditor.pas

@@ -5,9 +5,9 @@ unit FileFilterPropEditor;
 interface
 
 uses
-  Classes, SysUtils,
+  Classes,
   // LCL
-  Forms, Controls, ButtonPanel, Grids, Buttons,
+  Forms, ButtonPanel, Grids, Buttons,
   // IdeIntf
   ObjInspStrConsts, IDEImagesIntf, IDEWindowIntf;
 

components/ideintf/formeditingintf.pas

@@ -16,13 +16,13 @@ unit FormEditingIntf;
 interface
 
 uses
-  Classes, SysUtils, TypInfo, types, Math,
+  Classes, TypInfo, types, Math,
   // LCL
-  LCLProc, LCLClasses, Forms, Controls,
+  LCLClasses, Forms, Controls,
   // LazUtils
-  CompWriterPas,
+  CompWriterPas, LazLoggerBase,
   // IdeIntf
-  ProjectIntf, ComponentEditors, ObjectInspector, UnitResources;
+  ComponentEditors, ObjectInspector, UnitResources;
   
 const
   ComponentPaletteImageWidth = 24;

components/ideintf/graphpropedits.pas

@@ -16,10 +16,14 @@ unit GraphPropEdits;
 interface
 
 uses
-  Classes, TypInfo, SysUtils, LCLProc, Forms, Controls, LCLType, GraphType,
-  LazFileUtils, Graphics, Buttons, Menus, ExtCtrls, Dialogs, Grids,
-  LCLIntf, PropEdits, PropEditUtils, ImgList, EditBtn, Math,
-  GraphicPropEdit; // defines TGraphicPropertyEditorForm
+  Classes, TypInfo, SysUtils, Math,
+  // LCL
+  LCLType, Forms, GraphType, Graphics, Buttons, Menus, Dialogs, Grids, ImgList,
+  EditBtn,
+  // LazUtils
+  UITypes, LazFileUtils,
+  // IdeIntf
+  PropEdits, GraphicPropEdit; // defines TGraphicPropertyEditorForm
 
 type
 { TGraphicPropertyEditor

components/ideintf/headercontrolpropedit.pp

@@ -14,7 +14,7 @@ unit HeaderControlPropEdit;
 interface
 
 uses
-  Classes, SysUtils,
+  Classes,
   // LCL
   ComCtrls,
   // IdeIntf

components/ideintf/helpfpdoc.pas

@@ -22,9 +22,9 @@ interface
 uses
   Classes, SysUtils,
   // LazUtils,
-  LazFileUtils,
+  LazFileUtils, LazLoggerBase,
   // LCL
-  LCLProc, HelpIntfs, LazHelpIntf, LazHelpHTML,
+  HelpIntfs, LazHelpIntf, LazHelpHTML,
   // BuildIntf
   MacroIntf;
 

components/ideintf/idecommands.pas

@@ -34,9 +34,9 @@ uses
   // LCL
   LCLProc, LCLType, LCLIntf, Forms, Menus,
   // LazUtils
-  LazMethodList, LazLoggerBase,
+  LazLoggerBase, LazTracer,
   // IdeIntf
-  PropEdits, IDEImagesIntf;
+  IDEImagesIntf;
   
 const
   { editor commands constants. see syneditkeycmds.pp for more

components/ideintf/idedialogs.pas

@@ -17,7 +17,7 @@ unit IDEDialogs;
 interface
 
 uses
-  Classes, SysUtils,
+  Classes,
   // LCL
   Dialogs,
   // LazUtils

components/ideintf/idehelpintf.pas

@@ -17,7 +17,7 @@ unit IDEHelpIntf;
 interface
 
 uses
-  Classes, Types, SysUtils,
+  Classes, SysUtils,
   // LCL
   LMessages, LCLType, LCLIntf, Forms, Controls, Graphics, HelpIntfs, LazHelpIntf,
   // IdeIntf

components/ideintf/idemsgintf.pas

@@ -18,9 +18,9 @@ interface
 uses
   Classes, SysUtils, contnrs,
   // LCL
-  Forms, Menus,
+  Forms,
   // LazUtils
-  IDEExternToolIntf, LazFileUtils, LazLoggerBase,
+  IDEExternToolIntf, LazLoggerBase,
   // IdeIntf
   MenuIntf;
 

components/ideintf/ideopteditorintf.pas

@@ -27,7 +27,7 @@ interface
 uses
   Classes, SysUtils,
   // LCL
-  LCLProc, Controls, Buttons, Forms, StdCtrls, Graphics, ComCtrls, Grids,
+  Controls, Buttons, Forms, StdCtrls, Graphics, ComCtrls, Grids,
   // BuildIntf
   IDEOptionsIntf,
   // IdeIntf

components/ideintf/idetextconverter.pas

@@ -23,9 +23,9 @@ interface
 uses
   Classes, SysUtils, TypInfo,
   // LCL
-  LCLProc, Controls, Forms,
+  LCLProc,
   // LazUtils
-  FileUtil, LazFileUtils, LazUTF8, LazUTF8Classes, LazLoggerBase,
+  UITypes, FileUtil, LazFileUtils, LazUTF8, LazUTF8Classes, LazLoggerBase,
   // IdeIntf
   SrcEditorIntf, PropEdits, ObjInspStrConsts;
   
@@ -650,8 +650,7 @@ begin
   if not SupportsType(aTextType) then RaiseNotSupported;
 end;
 
-function TIDETextConverter.SupportsType(aTextType: TTextConverterType
-  ): boolean;
+function TIDETextConverter.SupportsType(aTextType: TTextConverterType): boolean;
 begin
   Result:=(aTextType in [tctSource,tctFile,tctStrings])
       or ((TextConverterToolClasses<>nil)
@@ -833,8 +832,7 @@ end;
 
 { TCustomTextReplaceTool }
 
-procedure TCustomTextReplaceTool.SetOptions(
-  const AValue: TTextReplaceToolOptions);
+procedure TCustomTextReplaceTool.SetOptions(const AValue: TTextReplaceToolOptions);
 begin
   if FOptions=AValue then exit;
   FOptions:=AValue;
@@ -852,8 +850,7 @@ begin
   FSearchFor:=AValue;
 end;
 
-function TCustomTextReplaceTool.Execute(aText: TIDETextConverter
-  ): TModalResult;
+function TCustomTextReplaceTool.Execute(aText: TIDETextConverter): TModalResult;
 var
   Source: String;
   Flags: TSrcEditSearchOptions;

components/ideintf/idewindowintf.pas

@@ -19,9 +19,9 @@ interface
 uses
   Math, Classes, SysUtils,
   // LCL
-  LCLProc, LCLIntf, Forms, Controls, LCLType,
+  LCLIntf, LCLType, Forms, Controls,
   // LazUtils
-  LazConfigStorage, LazUTF8, LazMethodList,
+  LazConfigStorage, LazUTF8, LazMethodList, LazLoggerBase,
   // BuildIntf
   IDEOptionsIntf;
 

components/ideintf/imagelisteditor.pp

@@ -27,11 +27,12 @@ unit ImageListEditor;
 interface
 
 uses
-  Classes, SysUtils, Types, Math,
+  Classes, SysUtils, Math,
   // LCL
-  LCLProc, Forms, Controls, Graphics, GraphType, Dialogs, StdCtrls,
+  LCLIntf, LCLType, Forms, Controls, Graphics, GraphType, Dialogs, StdCtrls,
   ExtCtrls, ExtDlgs, ColorBox, Buttons, ButtonPanel, ImgList, LCLTaskDialog,
-  LCLIntf, LCLType,
+  // LazUtils
+  LazLoggerBase,
   // IdeIntf
   IDEDialogs, PropEdits, ComponentEditors, ObjInspStrConsts, IDEWindowIntf;
 

components/ideintf/lazideintf.pas

@@ -18,9 +18,9 @@ interface
 uses
   Classes, SysUtils,
   // LCL
-  LCLProc, Forms, Controls, Dialogs, LazHelpHTML,
+  Forms, Controls, LazHelpHTML,
   // LazUtils
-  LazMethodList,
+  UITypes, LazMethodList,
   // BuildIntf
   BaseIDEIntf, IDEOptionsIntf, CompOptsIntf, ProjectIntf, IDEExternToolIntf,
   // IdeIntf

components/ideintf/lazstringgridedit.pas

@@ -11,7 +11,7 @@ unit LazStringGridEdit;
 interface
 
 uses
-  Classes, SysUtils,
+  Classes,
   // LCL
   Forms, Controls, Dialogs, Arrow, StdCtrls, Buttons, Grids, ExtCtrls,
   // IdeIntf

components/ideintf/menuintf.pas

@@ -20,11 +20,11 @@ interface
 uses
   Classes, SysUtils,
   // LCL
-  LCLType, LCLProc, Menus, ImgList, Graphics,
+  LCLProc, LCLType, Menus, ImgList, Graphics,
   // LazUtils
-  LazMethodList, LazLoggerBase,
+  LazLoggerBase, LazTracer,
   // IdeIntf
-  IDECommands, IDEImagesIntf;
+  IDECommands;
   
 type
   TIDEMenuItem = class;

components/ideintf/objectinspector.pp

@@ -30,11 +30,11 @@ uses
   // IMPORTANT: the object inspector is a tool and can be used in other programs
   //            too. Don't put Lazarus IDE specific things here.
   // RTL / FCL
-  SysUtils, Types, Classes, TypInfo, math, FPCanvas,
+  Classes, SysUtils, Types, TypInfo, math,
   // LCL
   LCLPlatformDef, InterfaceBase, LCLType, LCLIntf, Forms, Buttons, Graphics,
   GraphType, StdCtrls, Controls, ComCtrls, ExtCtrls, Menus, Dialogs, Themes,
-  LMessages, LCLProc,
+  LMessages, ImgList,
   // LazControls
   {$IFnDEF UseOINormalCheckBox} CheckBoxThemed, {$ENDIF}
   TreeFilterEdit, ListFilterEdit,
@@ -43,7 +43,7 @@ uses
   // IdeIntf
   IDEImagesIntf, IDEHelpIntf, ObjInspStrConsts,
   PropEdits, PropEditUtils, ComponentTreeView, OIFavoriteProperties,
-  ComponentEditors, ChangeParentDlg, ImgList;
+  ComponentEditors, ChangeParentDlg;
 
 const
   OIOptionsFileVersion = 3;

components/ideintf/oifavoriteproperties.pas

@@ -12,11 +12,11 @@ interface
 
 uses
   // FCL
-  SysUtils, Classes,
+  Classes, SysUtils,
   // LCL
-  LCLProc, LCLPlatformDef,
+  LCLPlatformDef,
   // LazUtils
-  LazConfigStorage,
+  LazUtilities, LazConfigStorage, LazLoggerBase,
   // IdeIntf
   PropEdits;
 
@@ -521,8 +521,7 @@ begin
           and (AClass.InheritsFrom(BaseClass));
 end;
 
-function TOIFavoriteProperty.Compare(AFavorite: TOIFavoriteProperty
-  ): integer;
+function TOIFavoriteProperty.Compare(AFavorite: TOIFavoriteProperty): integer;
 
   function CompareBaseClass: integer;
   begin

components/ideintf/srceditorintf.pas

@@ -14,11 +14,11 @@ unit SrcEditorIntf;
 interface
 
 uses
-  Classes, SysUtils,
+  Classes,
   // LCL
   LCLType, Forms, Controls, Graphics,
   // LazUtils
-  FileUtil, Laz2_XMLCfg, LazStringUtils,
+  Laz2_XMLCfg, LazStringUtils,
   // BuildIntf
   ProjectIntf,
   // IdeIntf

components/ideintf/statusbarpropedit.pp

@@ -14,7 +14,7 @@ unit StatusBarPropEdit;
 interface
 
 uses
-  Classes, SysUtils,
+  Classes,
   // LCL
   ComCtrls,
   // IdeIntf

components/ideintf/toolbarintf.pas

@@ -16,9 +16,9 @@ unit ToolBarIntf;
 interface
 
 uses
-  Classes, SysUtils,
+  Classes,
   // LCL
-  Controls, ComCtrls, Menus, Forms, LCLType,
+  Controls, ComCtrls, Menus,
   // IdeIntf
   IDECommands, MenuIntf, IDEImagesIntf, SrcEditorIntf;
 

components/ideintf/unitresources.pas

@@ -21,7 +21,9 @@ interface
 uses
   Classes, SysUtils,
   // LCL
-  LCLMemManager, Forms, LResources;
+  LCLMemManager, Forms, LResources,
+  // LazUtils
+  UITypes;
 
 type
 

ide/idehelpmanager.pas

@@ -36,16 +36,15 @@ uses
   Classes, SysUtils, Laz_AVL_Tree,
   // LCL
   LCLProc, LCLIntf, LCLType, FileProcs, Forms, Controls, ComCtrls, StdCtrls,
-  Dialogs, Graphics, Buttons, ButtonPanel,
+  Dialogs, Graphics, Buttons, ButtonPanel, LazHelpHTML, HelpIntfs,
   // LazUtils
   LConvEncoding, LazUTF8Classes, LazFileUtils, HTML2TextRender,
   // CodeTools
   BasicCodeTools, CodeToolManager, CodeCache, CustomCodeTool, CodeTree,
   PascalParserTool, FindDeclarationTool,
   // IDEIntf
-  PropEdits, ObjectInspector, TextTools,
-  IDEDialogs, LazHelpIntf, LazHelpHTML, HelpFPDoc, MacroIntf, IDEWindowIntf,
-  IDEMsgIntf, PackageIntf, LazIDEIntf, HelpIntfs, IDEHelpIntf,
+  PropEdits, ObjectInspector, TextTools, IDEDialogs, LazHelpIntf, MacroIntf,
+  IDEWindowIntf, IDEMsgIntf, PackageIntf, LazIDEIntf, HelpFPDoc, IDEHelpIntf,
   IDEExternToolIntf, IDEImagesIntf,
   // IDE
   LazarusIDEStrConsts, DialogProcs, ObjInspExt, EnvironmentOpts, AboutFrm,

packager/packagedefs.pas

@@ -40,16 +40,17 @@ uses
   // FCL
   Classes, SysUtils, contnrs, typinfo, Laz_AVL_Tree,
   // LCL
-  LCLType, LResources, Graphics, Controls, Forms, Dialogs,
+  Forms,
   // Codetools
-  FileProcs, LazConfigStorage, BasicCodeTools, DefineTemplates, CodeToolManager,
+  LazConfigStorage, DefineTemplates, CodeToolManager,
   CodeCache, CodeToolsCfgScript, CodeToolsStructs,
   // LazUtils
-  FileUtil, LazFileUtils, LazFileCache, LazUTF8, LazTracer, LazUtilities,
-  Laz2_XMLCfg, AvgLvlTree,
+  FileUtil, LazFileUtils, LazUtilities, LazFileCache, LazUTF8,
+  LazTracer, LazLoggerBase, UITypes, Laz2_XMLCfg, AvgLvlTree,
+  // BuildIntf
+  MacroIntf, MacroDefIntf, IDEOptionsIntf, PackageDependencyIntf, PackageIntf,
   // IDEIntf
-  PropEdits, LazIDEIntf, MacroIntf, MacroDefIntf, IDEOptionsIntf, IDEOptEditorIntf,
-  PackageDependencyIntf, PackageIntf, IDEDialogs, ComponentReg, IDEImagesIntf,
+  LazIDEIntf, IDEOptEditorIntf, IDEDialogs, ComponentReg, IDEImagesIntf,
   // IDE
   EditDefineTree, CompilerOptions, CompOptsModes, IDEOptionDefs, ProjPackCommon,
   LazarusIDEStrConsts, IDEProcs, TransferMacros, FileReferenceList,
@@ -1425,7 +1426,7 @@ begin
   ForcePathDelims(NewFilename);
   if Filename=NewFilename then exit;
   fFilename:=NewFilename;
-  fFullFilenameStamp:=CTInvalidChangeStamp;
+  fFullFilenameStamp:=LUInvalidChangeStamp;
   OldDirectory:=FDirectory;
   FDirectory:=ExtractFilePath(Filename);
   if OldDirectory<>FDirectory then begin
@@ -2450,7 +2451,7 @@ begin
     FDirectory:=FFilename
   else
     FDirectory:=ExtractFilePath(FFilename);
-  FDirectoryExpandedChangeStamp:=CTInvalidChangeStamp;
+  FDirectoryExpandedChangeStamp:=LUInvalidChangeStamp;
   FHasDirectory:=(FDirectory<>'') and (FDirectory[length(FDirectory)]=PathDelim);
   FHasStaticDirectory:=FHasDirectory and FilenameIsAbsolute(FDirectory);
   FUsageOptions.BaseDirectory:=FDirectory;
@@ -2718,7 +2719,7 @@ begin
     CompilerOptions.Clear;
     FDescription:='';
     FDirectory:='';
-    FDirectoryExpandedChangeStamp:=CTInvalidChangeStamp;
+    FDirectoryExpandedChangeStamp:=LUInvalidChangeStamp;
     FEnableI18N:=false;
     FEnableI18NForLFM:=false;
     FPOOutputDirectory:='';
@@ -4043,7 +4044,7 @@ begin
   Result:=PkgFile.Unit_Name;
   // compare with RTTI unit name
   if ComponentClass<>nil then begin
-    TIUnitName:=GetClassUnitName(ComponentClass);
+    TIUnitName:=ComponentClass.UnitName;
     if SysUtils.CompareText(TIUnitName,Result)<>0 then
       Result:=TIUnitName;
   end;
@@ -4371,7 +4372,7 @@ constructor TLazPackageDefineTemplates.Create(AOwner: IProjPack);
 begin
   inherited Create(AOwner);
   Include(FFlags, ptfIsPackageTemplate);
-  fLastSourceDirStamp:=CTInvalidChangeStamp;
+  fLastSourceDirStamp:=LUInvalidChangeStamp;
 end;
 
 destructor TLazPackageDefineTemplates.Destroy;

packager/packageeditor.pas

@@ -36,10 +36,10 @@ uses
   Classes, SysUtils, contnrs,
   // LCL
   Forms, Controls, StdCtrls, ComCtrls, Buttons, Graphics, Menus, Dialogs,
-  ExtCtrls, LCLType, LCLProc, LCLIntf,
+  ExtCtrls, ImgList, LCLType, LCLIntf,
   TreeFilterEdit,
   // LazUtils
-  FileUtil, LazFileUtils, LazFileCache, AvgLvlTree,
+  FileUtil, LazFileUtils, LazFileCache, AvgLvlTree, LazLoggerBase, LazTracer,
   // IDEIntf
   IDEImagesIntf, MenuIntf, LazIDEIntf, ProjectIntf,
   FormEditingIntf, PackageDependencyIntf, PackageIntf, IDEHelpIntf, IDEOptionsIntf,
@@ -48,7 +48,7 @@ uses
   MainBase, IDEProcs, LazarusIDEStrConsts, IDEDefs, CompilerOptions,
   EnvironmentOpts, DialogProcs, InputHistory, PackageDefs, AddToPackageDlg,
   AddPkgDependencyDlg, AddFPMakeDependencyDlg, ProjPackChecks, PkgVirtualUnitEditor,
-  MissingPkgFilesDlg, PackageSystem, CleanPkgDeps, ImgList;
+  MissingPkgFilesDlg, PackageSystem, CleanPkgDeps;
   
 const
   PackageEditorMenuRootName = 'PackageEditor';

packager/packagesystem.pas

@@ -54,10 +54,13 @@ uses
   // codetools
   FileProcs, DefineTemplates, CodeToolManager, CodeCache, DirectoryCacher,
   BasicCodeTools, NonPascalCodeTools, SourceChanger,
-  // IDEIntf,
-  IDEExternToolIntf, IDEDialogs, IDEMsgIntf, CompOptsIntf, LazIDEIntf,
-  MacroDefIntf, ProjectIntf, FppkgIntf,
-  PackageDependencyIntf, PackageLinkIntf, PackageIntf, LazarusPackageIntf,
+  // BuildIntf
+  IDEExternToolIntf, MacroDefIntf, ProjectIntf, CompOptsIntf, FppkgIntf,
+  PackageDependencyIntf, PackageLinkIntf, PackageIntf,
+  // IDEIntf
+  IDEDialogs, IDEMsgIntf, LazIDEIntf,
+  // Package registration
+  LazarusPackageIntf,
   // IDE
   LazarusIDEStrConsts, IDECmdLine, EnvironmentOpts, IDEProcs, LazConf,
   TransferMacros, DialogProcs, IDETranslations, CompilerOptions, PackageLinks,