Move unit GraphMath from LCL to LazUtils. It has no dependencies to GUI.

git-svn-id: trunk@64303 -
2026-01-06 15:40:33 +01:00 · 2020-12-29 22:56:40 +00:00 · 2020-12-29 22:56:40 +00:00 · 9219ea531d
commit 9219ea531d
parent 3feac99f06
68 changed files with 720 additions and 677 deletions
--- a/.gitattributes
+++ b/.gitattributes
@ -3392,6 +3392,7 @@ components/lazutils/fileutil.inc svneol=native#text/pascal
 components/lazutils/fileutil.pas svneol=native#text/pascal
 components/lazutils/fpcadds.pas svneol=native#text/pascal
 components/lazutils/fpmake.pp svneol=native#text/plain
+components/lazutils/graphmath.pp svneol=native#text/pascal
 components/lazutils/graphtype.pp svneol=native#text/pascal
 components/lazutils/html2textrender.pas svneol=native#text/pascal
 components/lazutils/integerlist.pas svneol=native#text/pascal
@ -9319,7 +9320,6 @@ lcl/forms/timepopup.lfm svneol=native#text/plain
 lcl/forms/timepopup.pas svneol=native#text/pascal
 lcl/fpmake.pp svneol=native#text/plain
 lcl/graphics.pp svneol=native#text/pascal
-lcl/graphmath.pp svneol=native#text/pascal
 lcl/graphutil.pp svneol=native#text/pascal
 lcl/grids.pas svneol=native#text/pascal
 lcl/groupededit.pp svneol=native#text/pascal
--- a/components/cairocanvas/cairocanvas.pas
+++ b/components/cairocanvas/cairocanvas.pas
@ -31,8 +31,13 @@ unit CairoCanvas;
 interface

 uses
-  Types, SysUtils, Classes, LCLType, LCLProc, Graphics, math, GraphMath,
-  Printers, Cairo
+  Types, SysUtils, Classes, LCLType, LCLProc, Graphics, math,
+  // LCL
+  Printers,
+  // LazUtils
+  GraphMath,
+  //CairoCanvas
+  Cairo
  {$ifdef pangocairo}
  ,Pango, PangoCairo, GLib2
  {$endif}
--- a/components/fpvectorial/fpvectorial.pas
+++ b/components/fpvectorial/fpvectorial.pas
@ -33,13 +33,13 @@ interface
 uses
  Classes, SysUtils, Math, TypInfo, contnrs, types,
  // FCL-Image
-  fpcanvas, fpimage, fpwritebmp,
+  FPCanvas, FPImage, FPWriteBMP,
  // lazutils
-  laz2_dom,
+  GraphType, Laz2_DOM,
  // LCL
-  lazutf8, lazregions
+  LazUTF8, LazRegions
  {$ifdef USE_LCL_CANVAS}
-  , Graphics, LCLIntf, LCLType, intfgraphics, graphtype, interfacebase
+  , Graphics, LCLIntf, LCLType, IntfGraphics, InterfaceBase
  {$endif}
  ;

--- a/components/fpvectorial/fpvectorial2aggpas.pas
+++ b/components/fpvectorial/fpvectorial2aggpas.pas
@ -27,14 +27,13 @@ unit fpvectorial2aggpas;
 interface

 uses
-  Classes, SysUtils, Math, TypInfo, contnrs, types,
+  Classes, SysUtils, Math, TypInfo, contnrs, Types,
  // FCL-Image
-  fpcanvas, fpimage, fpwritebmp,
+  FPCanvas, FPImage, FPWriteBMP,
  // lazutils
-  laz2_dom,
+  GraphType, LazUTF8, laz2_dom,
  // LCL
-  lazutf8, lazregions,
-  Graphics, LCLIntf, LCLType, intfgraphics, graphtype, interfacebase,
+  LazRegions, Graphics, LCLIntf, LCLType, IntfGraphics, InterfaceBase,
  // AggPas
  agg_fpimage, Agg_LCL,
  // fpvectorial
--- a/components/fpvectorial/fpvectorial2canvas.pas
+++ b/components/fpvectorial/fpvectorial2canvas.pas
@ -28,14 +28,13 @@ unit fpvectorial2canvas;
 interface

 uses
-  Classes, SysUtils, Math, TypInfo, contnrs, types,
+  Classes, SysUtils, Math, TypInfo, contnrs, Types,
  // FCL-Image
-  fpcanvas, fpimage, fpwritebmp,
+  FPCanvas, FPImage, FPWriteBMP,
  // lazutils
-  laz2_dom,
+  GraphType, LazUTF8, Laz2_DOM,
  // LCL
-  lazutf8, lazregions,
-  Graphics, LCLIntf, LCLType, intfgraphics, graphtype, interfacebase,
+  LazRegions, Graphics, LCLIntf, LCLType, intfgraphics, interfacebase,
  // fpvectorial
  fpvutils, fpvectorial;

--- a/components/ideintf/graphpropedits.pas
+++ b/components/ideintf/graphpropedits.pas
@ -18,10 +18,9 @@ interface
 uses
  Classes, TypInfo, SysUtils, Math,
  // LCL
-  LCLType, Forms, GraphType, Graphics, Buttons, Menus, Dialogs, Grids, ImgList,
-  EditBtn,
+  LCLType, Forms, Graphics, Buttons, Menus, Dialogs, Grids, ImgList, EditBtn,
  // LazUtils
-  UITypes, LazFileUtils,
+  GraphType, UITypes, LazFileUtils,
  // IdeIntf
  PropEdits, GraphicPropEdit; // defines TGraphicPropertyEditorForm

--- a/components/ideintf/imagelisteditor.pp
+++ b/components/ideintf/imagelisteditor.pp
@ -29,10 +29,10 @@ interface
 uses
  Classes, SysUtils, Math,
  // LCL
-  LCLIntf, LCLType, Forms, Controls, Graphics, GraphType, Dialogs, StdCtrls,
+  LCLIntf, LCLType, Forms, Controls, Graphics, Dialogs, StdCtrls,
  ExtCtrls, ExtDlgs, ColorBox, Buttons, ButtonPanel, ImgList, LCLTaskDialog,
  // LazUtils
-  LazLoggerBase,
+  GraphType, LazLoggerBase,
  // IdeIntf
  IDEDialogs, PropEdits, ComponentEditors, ObjInspStrConsts, IDEWindowIntf;

--- a/components/ideintf/objectinspector.pp
+++ b/components/ideintf/objectinspector.pp
@ -33,13 +33,12 @@ uses
  Classes, SysUtils, Types, TypInfo, math,
  // LCL
  LCLPlatformDef, InterfaceBase, LCLType, LCLIntf, Forms, Buttons, Graphics,
-  GraphType, StdCtrls, Controls, ComCtrls, ExtCtrls, Menus, Dialogs, Themes,
-  LMessages, ImgList,
+  StdCtrls, Controls, ComCtrls, ExtCtrls, Menus, Dialogs, Themes, LMessages, ImgList,
  // LazControls
  {$IFnDEF UseOINormalCheckBox} CheckBoxThemed, {$ENDIF}
  TreeFilterEdit, ListFilterEdit,
  // LazUtils
-  LazConfigStorage, LazLoggerBase,
+  GraphType, LazConfigStorage, LazLoggerBase,
  // IdeIntf
  IDEImagesIntf, IDEHelpIntf, ObjInspStrConsts,
  PropEdits, PropEditUtils, ComponentTreeView, OIFavoriteProperties,
--- a/components/ideintf/propedits.pp
+++ b/components/ideintf/propedits.pp
@ -25,14 +25,14 @@ uses
  // RTL / FCL
  Classes, TypInfo, SysUtils, types, RtlConsts, variants, Contnrs, strutils, FGL,
  // LCL
-  LCLType, LCLIntf, LCLProc, Forms, Controls, GraphType, ButtonPanel, Graphics,
+  LCLType, LCLIntf, LCLProc, Forms, Controls, ButtonPanel, Graphics,
  StdCtrls, Buttons, Menus, ExtCtrls, ComCtrls, Dialogs, EditBtn, Grids, ValEdit,
  FileCtrl, PropertyStorage, Themes,
  // LazControls
  {$IFnDEF UseOINormalCheckBox} CheckBoxThemed, {$ENDIF}
  // LazUtils
  FileUtil, StringHashList, LazMethodList, LazLoggerBase, LazUtilities, LazStringUtils,
-  UITypes, FPCAdds, // for StrToQWord in older fpc versions
+  GraphType, UITypes, FPCAdds, // for StrToQWord in older fpc versions
  // IdeIntf
  ObjInspStrConsts, PropEditUtils,
  // Forms with .lfm files
--- a/components/lazcontrols/dividerbevel.pas
+++ b/components/lazcontrols/dividerbevel.pas
@ -18,7 +18,9 @@ interface
 uses
  Classes, Types, Math,
  // LCL
-  LCLType, LCLIntf, Controls, Graphics, GraphType, ComCtrls, ExtCtrls, Themes;
+  LCLType, LCLIntf, Controls, Graphics, ComCtrls, ExtCtrls, Themes,
+  // LazUtils
+  GraphType;

 type
  { TDividerBevel }
--- a/components/lazcontrols/lvlgraphctrl.pas
+++ b/components/lazcontrols/lvlgraphctrl.pas
@ -23,11 +23,10 @@ interface

 uses
  Classes, SysUtils, types, math, typinfo, FPimage, FPCanvas, Laz_AVL_Tree,
-  // LazUtils
-  LazLoggerBase, AvgLvlTree,
  // LCL
-  LMessages, LCLType, LCLIntf, GraphType, Graphics, Controls, ImgList,
-  Forms, Themes;
+  LMessages, LCLType, LCLIntf, Graphics, Controls, ImgList, Forms, Themes,
+  // LazUtils
+  GraphType, LazLoggerBase, AvgLvlTree;

 type
  TLazCtrlPalette = array of TFPColor;
--- a/components/lazutils/fpmake.pp
+++ b/components/lazutils/fpmake.pp
@ -3,7 +3,7 @@

   fpmake.pp for LazUtils 1.0

-   This file was generated on 11-11-2020
+   This file was generated on 21.12.2020
 }

 {$ifndef ALLPACKAGES} 
@ -56,6 +56,7 @@ begin
    t.Dependencies.AddUnit('filereferencelist');
    t.Dependencies.AddUnit('fileutil');
    t.Dependencies.AddUnit('fpcadds');
+    t.Dependencies.AddUnit('graphmath');
    t.Dependencies.AddUnit('graphtype');
    t.Dependencies.AddUnit('html2textrender');
    t.Dependencies.AddUnit('integerlist');
@ -120,6 +121,7 @@ begin
    T:=P.Targets.AddUnit('filereferencelist.pas');
    T:=P.Targets.AddUnit('fileutil.pas');
    T:=P.Targets.AddUnit('fpcadds.pas');
+    T:=P.Targets.AddUnit('graphmath.pp');
    T:=P.Targets.AddUnit('graphtype.pp');
    T:=P.Targets.AddUnit('html2textrender.pas');
    T:=P.Targets.AddUnit('integerlist.pas');
--- a/components/lazutils/graphmath.pp
+++ b/components/lazutils/graphmath.pp
@ -9,14 +9,14 @@
 ***************************************************************************/

 *****************************************************************************
-  This file is part of the Lazarus Component Library (LCL)
+  This file is part of LazUtils.

  See the file COPYING.modifiedLGPL.txt, included in this distribution,
  for details about the license.
 *****************************************************************************
 }
 {
-@abstract(A Set of Math Helper routines to simply Cross-Platfrom Canvas, 
+@abstract(A Set of Math Helper routines to simplify Cross-Platfrom Canvas,
 etc)
@author(Andrew Johnson <AJ_Genius@Hotmail.com>)
@created(2002)
@ -77,10 +77,10 @@ function LineEndPoint(const StartPoint : TPoint; Angle, Length : Extended) : TPo
 procedure PolyBezier2Polyline(Beziers: Array of TBezier;
  var Points : PPoint; var Count : Longint); Overload;
 procedure PolyBezier2Polyline(Beziers : Array of TPoint;
-  var Points : PPoint; var Count : Longint; 
+  var Points : PPoint; var Count : Longint;
  Continuous : Boolean); Overload; inline;
 procedure PolyBezier2Polyline(Beziers : PPoint; BCount : Longint;
-  var Points : PPoint; var Count : Longint; 
+  var Points : PPoint; var Count : Longint;
  Continuous : Boolean); Overload;

 procedure PolyBezierArcPoints(X, Y, Width, Height : Longint; Angle1,
@ -301,7 +301,7 @@ end;
  for Start and End Radial-Points, such as are used in the Windows API Arc
  Pie and Chord routines. The angles are 1/16th of a degree. For example, a
  full circle equals 5760 (16*360). Positive values of Angle and AngleLength
-  mean counter-clockwise while negative values mean clockwise direction. 
+  mean counter-clockwise while negative values mean clockwise direction.
  Zero degrees is at the 3'o clock position.

 ------------------------------------------------------------------------------}
@ -525,7 +525,6 @@ begin
  If (not Assigned(Points)) or (Count <= 0) then
  begin
    Count := 0;
-
    if Assigned(Points) then
      ReallocMem(Points, 0);
  end;
@ -569,11 +568,10 @@ begin
  If (not Assigned(Points)) or (Count <= 0) then
  begin
    Count := 0;
-    
    if Assigned(Points) then
      ReallocMem(Points, 0);
  end;
-  
+
  Arc2Bezier(X, Y, Width, Height, Angle1, Angle2, Rotation, B);
  Bezier2Polyline(B,Points,Count);
 end;
@ -839,9 +837,8 @@ end;
 ------------------------------------------------------------------------------}
 procedure PolyBezier2Polyline(Beziers : Array of TPoint; var Points : PPoint;
  var Count : Longint; Continuous : Boolean);
-begin  
-  PolyBezier2Polyline(@Beziers[0],High(Beziers) + 1, Points, Count, 
-    	              Continuous);
+begin
+  PolyBezier2Polyline(@Beziers[0],High(Beziers) + 1, Points, Count, Continuous);
 end;

 procedure PolyBezier2Polyline(Beziers : PPoint; BCount : Longint;
@ -874,7 +871,7 @@ begin
        Beziers[I*3+2],Beziers[I*3+3]), Points, Count);
  end;
 end;
-  
+
 {------------------------------------------------------------------------------
  Method:   PolyBezierArcPoints
  Params:   X, Y, Width, Height, Angle1, Angle2, Rotation, Points, Count
--- a/components/lazutils/graphtype.pp
+++ b/components/lazutils/graphtype.pp
@ -71,7 +71,7 @@ type
    riboLSBFirst, // least significant byte first
    riboMSBFirst  // most significant byte first
    );
-    
+
  TRawImageBitOrder = (
    riboBitsInOrder, // Bit 0 is pixel 0
    riboReversedBits // Bit 0 is pixel 7 (Bit 1 is pixel 6, ...)
--- a/components/lazutils/lazutils.lpk
+++ b/components/lazutils/lazutils.lpk
@ -90,6 +90,10 @@
        <Filename Value="fpcadds.pas"/>
        <UnitName Value="FPCAdds"/>
      </Item>
+      <Item>
+        <Filename Value="graphmath.pp"/>
+        <UnitName Value="GraphMath"/>
+      </Item>
      <Item>
        <Filename Value="graphtype.pp"/>
        <UnitName Value="GraphType"/>
--- a/components/lazutils/lazutils.pas
+++ b/components/lazutils/lazutils.pas
@ -10,12 +10,12 @@ interface
 uses
  AvgLvlTree, CodepagesAsian, CodepagesCommon, CompWriterPas, DynamicArray, 
  DynHashArray, DynQueue, ExtendedStrings, FileReferenceList, FileUtil, 
-  FPCAdds, GraphType, HTML2TextRender, IntegerList, Laz2_DOM, Laz2_XMLCfg, 
-  laz2_XMLRead, laz2_xmlutils, laz2_XMLWrite, laz2_xpath, Laz_AVL_Tree, 
-  Laz_DOM, Laz_XMLCfg, Laz_XMLRead, Laz_XMLStreaming, Laz_XMLWrite, 
-  LazClasses, lazCollections, LazConfigStorage, LazDbgLog, lazfglhash, 
-  LazFileCache, LazFileUtils, LazLinkedList, LazListClasses, LazLogger, 
-  LazLoggerBase, LazLoggerDummy, LazLoggerProfiling, LazMethodList, 
+  FPCAdds, GraphMath, GraphType, HTML2TextRender, IntegerList, Laz2_DOM, 
+  Laz2_XMLCfg, laz2_XMLRead, laz2_xmlutils, laz2_XMLWrite, laz2_xpath, 
+  Laz_AVL_Tree, Laz_DOM, Laz_XMLCfg, Laz_XMLRead, Laz_XMLStreaming, 
+  Laz_XMLWrite, LazClasses, lazCollections, LazConfigStorage, LazDbgLog, 
+  lazfglhash, LazFileCache, LazFileUtils, LazLinkedList, LazListClasses, 
+  LazLogger, LazLoggerBase, LazLoggerDummy, LazLoggerProfiling, LazMethodList, 
  LazPasReadUtil, LazStringUtils, LazSysUtils, LazTracer, LazUnicode, 
  LazUTF16, LazUTF8, LazUTF8Classes, LazUTF8SysUtils, LazUtilities, 
  LazUtilsStrConsts, LazVersion, LConvEncoding, lcsvutils, LookupStringList, 
--- a/designer/controlselection.pp
+++ b/designer/controlselection.pp
@ -39,7 +39,9 @@ interface
 uses
  Classes, SysUtils, Math, types,
  // LCL
-  LCLIntf, LCLType, LCLProc, Controls, Forms, GraphType, Graphics, Menus, ComCtrls,
+  LCLIntf, LCLType, LCLProc, Controls, Forms, Graphics, Menus, ComCtrls,
+  // LazUtils
+  GraphType,
  // IDEIntf
  PropEditUtils, ComponentEditors, FormEditingIntf,
  // IDE
--- a/designer/designer.pp
+++ b/designer/designer.pp
@ -41,9 +41,9 @@ uses
  Types, Classes, Math, SysUtils, Variants, TypInfo,
  // LCL
  LCLProc, LCLType, LResources, LCLIntf, LMessages, InterfaceBase,
-  Forms, Controls, GraphType, Graphics, Dialogs, ExtCtrls, Menus, ClipBrd,
+  Forms, Controls, Graphics, Dialogs, ExtCtrls, Menus, ClipBrd,
  // LazUtils
-  LazFileUtils, LazFileCache, LazLoggerBase,
+  GraphType, LazFileUtils, LazFileCache, LazLoggerBase,
  // IDEIntf
  IDEDialogs, PropEdits, PropEditUtils, ComponentEditors, MenuIntf,
  IDEImagesIntf, FormEditingIntf, ComponentReg, IDECommands, LazIDEIntf,
--- a/designer/framedesigner.pas
+++ b/designer/framedesigner.pas
@ -32,7 +32,9 @@ interface
 uses
  Classes, SysUtils, Math,
  // LCL
-  LCLProc, Graphics, GraphType, Forms, Controls,
+  Graphics, Forms, Controls,
+  // LazUtils
+  GraphType, LazLoggerBase,
  // IdeIntf
  FormEditingIntf,
  // IDE
--- a/ide/charactermapdlg.pas
+++ b/ide/charactermapdlg.pas
@ -37,11 +37,17 @@ unit CharacterMapDlg;
 interface

 uses
-  Classes, SysUtils, Forms, Controls, Graphics, Dialogs, Buttons,
-  StdCtrls, LCLType, LCLUnicodeData, GraphType, Grids, ButtonPanel, ComCtrls,
-  IDEHelpIntf, LazUTF8, Math,
-  {$ifdef WINDOWS}Windows,{$endif} lconvencoding,
-  LazarusIDEStrConsts, IDEImagesIntf, EditorOptions, EnvironmentOpts;
+  {$ifdef WINDOWS}Windows,{$endif}
+  Classes, SysUtils, Math,
+  // LCL
+  Controls, Graphics, Dialogs, Buttons, StdCtrls, Forms,
+  LCLType, LCLUnicodeData, Grids, ButtonPanel, ComCtrls,
+  // LazUtils
+  GraphType, LazUTF8, LConvEncoding,
+  // IdeIntf
+  IDEHelpIntf, IDEImagesIntf,
+  // IDE
+  LazarusIDEStrConsts, EditorOptions, EnvironmentOpts;

 type
  TOnInsertCharacterEvent = procedure (const C: TUTF8Char) of object;
--- a/ide/etmessageframe.pas
+++ b/ide/etmessageframe.pas
@ -35,9 +35,10 @@ uses
  Math, strutils, Classes, SysUtils, Laz_AVL_Tree,
  // LCL
  Forms, Buttons, ExtCtrls, Controls, LMessages, LCLType, LCLIntf,
-  Graphics, Themes, ImgList, GraphType, Menus, Clipbrd, Dialogs, StdCtrls,
+  Graphics, Themes, ImgList, Menus, Clipbrd, Dialogs, StdCtrls,
  // LazUtils
-  UTF8Process, FileProcs, LazFileCache, LazUTF8Classes, LazFileUtils, LazUTF8,
+  GraphType, UTF8Process, FileProcs, LazFileCache, LazFileUtils,
+  LazUTF8Classes, LazUTF8,
  // SynEdit
  SynEdit, SynEditMarks,
  // IDEIntf
--- a/ide/lazarus.lpi
+++ b/ide/lazarus.lpi
@ -322,6 +322,7 @@
      <Unit40>
        <Filename Value="../designer/designerprocs.pas"/>
        <IsPartOfProject Value="True"/>
+        <UnitName Value="DesignerProcs"/>
      </Unit40>
      <Unit41>
        <Filename Value="codebrowser.pas"/>
@ -921,6 +922,7 @@
        <Filename Value="searchfrm.pas"/>
        <IsPartOfProject Value="True"/>
        <HasResources Value="True"/>
+        <UnitName Value="SearchFrm"/>
      </Unit143>
      <Unit144>
        <Filename Value="codemacroselect.pas"/>
@ -1342,6 +1344,7 @@
        <Filename Value="charactermapdlg.pas"/>
        <IsPartOfProject Value="True"/>
        <HasResources Value="True"/>
+        <UnitName Value="CharacterMapDlg"/>
      </Unit225>
      <Unit226>
        <Filename Value="idedefs.pas"/>
--- a/ide/main.pp
+++ b/ide/main.pp
@ -62,8 +62,7 @@ uses
  Math, Classes, SysUtils, TypInfo, types, strutils, Contnrs, process, Laz_AVL_Tree,
  // LCL
  LCLProc, LCLType, LCLIntf, LResources, HelpIntfs, InterfaceBase, LCLPlatformDef,
-  ComCtrls, Forms, Buttons, Menus, Controls, GraphType, Graphics, ExtCtrls,
-  Dialogs, LclStrConsts,
+  ComCtrls, Forms, Buttons, Menus, Controls, Graphics, ExtCtrls, Dialogs, LclStrConsts,
  // CodeTools
  FileProcs, FindDeclarationTool, LinkScanner, BasicCodeTools, CodeToolsStructs,
  CodeToolManager, CodeCache, DefineTemplates, KeywordFuncLists, CodeTree,
@ -72,7 +71,7 @@ uses
  // use lazutf8, lazfileutils and lazfilecache after FileProcs and FileUtil
  FileUtil, LazFileUtils, LazUtilities, LazUTF8, LazUTF8Classes, UTF8Process,
  LConvEncoding, Laz2_XMLCfg, LazLoggerBase, LazLogger, LazFileCache, AvgLvlTree,
-  LazStringUtils,
+  GraphType, LazStringUtils,
  LCLExceptionStacktrace,
  // SynEdit
  SynEdit, AllSynEdit, SynEditKeyCmds, SynEditMarks, SynEditHighlighter,
--- a/lcl/Makefile
+++ b/lcl/Makefile
@ -970,307 +970,307 @@ ifeq ($(FULL_TARGET),z80-msxdos)
 override TARGET_UNITS+=alllclunits
 endif
 ifeq ($(FULL_TARGET),i386-linux)
-override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphmath graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
+override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
 endif
 ifeq ($(FULL_TARGET),i386-go32v2)
-override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphmath graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
+override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
 endif
 ifeq ($(FULL_TARGET),i386-win32)
-override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphmath graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
+override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
 endif
 ifeq ($(FULL_TARGET),i386-os2)
-override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphmath graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
+override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
 endif
 ifeq ($(FULL_TARGET),i386-freebsd)
-override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphmath graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
+override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
 endif
 ifeq ($(FULL_TARGET),i386-beos)
-override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphmath graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
+override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
 endif
 ifeq ($(FULL_TARGET),i386-haiku)
-override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphmath graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
+override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
 endif
 ifeq ($(FULL_TARGET),i386-netbsd)
-override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphmath graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
+override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
 endif
 ifeq ($(FULL_TARGET),i386-solaris)
-override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphmath graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
+override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
 endif
 ifeq ($(FULL_TARGET),i386-netware)
-override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphmath graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
+override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
 endif
 ifeq ($(FULL_TARGET),i386-openbsd)
-override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphmath graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
+override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
 endif
 ifeq ($(FULL_TARGET),i386-wdosx)
-override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphmath graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
+override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
 endif
 ifeq ($(FULL_TARGET),i386-darwin)
-override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphmath graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
+override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
 endif
 ifeq ($(FULL_TARGET),i386-emx)
-override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphmath graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
+override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
 endif
 ifeq ($(FULL_TARGET),i386-watcom)
-override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphmath graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
+override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
 endif
 ifeq ($(FULL_TARGET),i386-netwlibc)
-override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphmath graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
+override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
 endif
 ifeq ($(FULL_TARGET),i386-wince)
-override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphmath graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
+override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
 endif
 ifeq ($(FULL_TARGET),i386-embedded)
-override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphmath graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
+override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
 endif
 ifeq ($(FULL_TARGET),i386-symbian)
-override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphmath graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
+override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
 endif
 ifeq ($(FULL_TARGET),i386-nativent)
-override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphmath graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
+override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
 endif
 ifeq ($(FULL_TARGET),i386-iphonesim)
-override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphmath graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
+override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
 endif
 ifeq ($(FULL_TARGET),i386-android)
-override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphmath graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
+override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
 endif
 ifeq ($(FULL_TARGET),i386-aros)
-override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphmath graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
+override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
 endif
 ifeq ($(FULL_TARGET),m68k-linux)
-override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphmath graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
+override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
 endif
 ifeq ($(FULL_TARGET),m68k-netbsd)
-override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphmath graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
+override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
 endif
 ifeq ($(FULL_TARGET),m68k-amiga)
-override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphmath graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
+override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
 endif
 ifeq ($(FULL_TARGET),m68k-atari)
-override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphmath graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
+override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
 endif
 ifeq ($(FULL_TARGET),m68k-palmos)
-override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphmath graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
+override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
 endif
 ifeq ($(FULL_TARGET),m68k-macos)
-override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphmath graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
+override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
 endif
 ifeq ($(FULL_TARGET),m68k-embedded)
-override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphmath graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
+override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
 endif
 ifeq ($(FULL_TARGET),powerpc-linux)
-override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphmath graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
+override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
 endif
 ifeq ($(FULL_TARGET),powerpc-netbsd)
-override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphmath graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
+override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
 endif
 ifeq ($(FULL_TARGET),powerpc-amiga)
-override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphmath graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
+override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
 endif
 ifeq ($(FULL_TARGET),powerpc-macos)
-override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphmath graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
+override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
 endif
 ifeq ($(FULL_TARGET),powerpc-darwin)
-override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphmath graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
+override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
 endif
 ifeq ($(FULL_TARGET),powerpc-morphos)
-override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphmath graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
+override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
 endif
 ifeq ($(FULL_TARGET),powerpc-embedded)
-override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphmath graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
+override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
 endif
 ifeq ($(FULL_TARGET),powerpc-wii)
-override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphmath graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
+override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
 endif
 ifeq ($(FULL_TARGET),powerpc-aix)
-override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphmath graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
+override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
 endif
 ifeq ($(FULL_TARGET),sparc-linux)
-override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphmath graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
+override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
 endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
-override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphmath graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
+override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
 endif
 ifeq ($(FULL_TARGET),sparc-solaris)
-override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphmath graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
+override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
 endif
 ifeq ($(FULL_TARGET),sparc-embedded)
-override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphmath graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
+override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
-override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphmath graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
+override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
 endif
 ifeq ($(FULL_TARGET),x86_64-freebsd)
-override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphmath graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
+override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
 endif
 ifeq ($(FULL_TARGET),x86_64-haiku)
-override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphmath graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
+override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
 endif
 ifeq ($(FULL_TARGET),x86_64-netbsd)
-override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphmath graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
+override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
 endif
 ifeq ($(FULL_TARGET),x86_64-solaris)
-override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphmath graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
+override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
 endif
 ifeq ($(FULL_TARGET),x86_64-openbsd)
-override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphmath graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
+override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
 endif
 ifeq ($(FULL_TARGET),x86_64-darwin)
-override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphmath graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
+override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
 endif
 ifeq ($(FULL_TARGET),x86_64-win64)
-override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphmath graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
+override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
 endif
 ifeq ($(FULL_TARGET),x86_64-embedded)
-override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphmath graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
+override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
 endif
 ifeq ($(FULL_TARGET),x86_64-iphonesim)
-override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphmath graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
+override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
 endif
 ifeq ($(FULL_TARGET),x86_64-android)
-override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphmath graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
+override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
 endif
 ifeq ($(FULL_TARGET),x86_64-aros)
-override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphmath graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
+override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
 endif
 ifeq ($(FULL_TARGET),x86_64-dragonfly)
-override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphmath graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
+override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
 endif
 ifeq ($(FULL_TARGET),arm-linux)
-override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphmath graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
+override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
 endif
 ifeq ($(FULL_TARGET),arm-netbsd)
-override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphmath graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
+override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
 endif
 ifeq ($(FULL_TARGET),arm-palmos)
-override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphmath graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
+override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
 endif
 ifeq ($(FULL_TARGET),arm-darwin)
-override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphmath graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
+override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
 endif
 ifeq ($(FULL_TARGET),arm-wince)
-override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphmath graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
+override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
 endif
 ifeq ($(FULL_TARGET),arm-gba)
-override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphmath graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
+override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
 endif
 ifeq ($(FULL_TARGET),arm-nds)
-override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphmath graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
+override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
 endif
 ifeq ($(FULL_TARGET),arm-embedded)
-override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphmath graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
+override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
 endif
 ifeq ($(FULL_TARGET),arm-symbian)
-override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphmath graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
+override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
 endif
 ifeq ($(FULL_TARGET),arm-android)
-override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphmath graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
+override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
 endif
 ifeq ($(FULL_TARGET),arm-aros)
-override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphmath graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
+override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
 endif
 ifeq ($(FULL_TARGET),arm-freertos)
-override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphmath graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
+override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
 endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
-override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphmath graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
+override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
 endif
 ifeq ($(FULL_TARGET),powerpc64-darwin)
-override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphmath graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
+override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
 endif
 ifeq ($(FULL_TARGET),powerpc64-embedded)
-override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphmath graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
+override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
 endif
 ifeq ($(FULL_TARGET),powerpc64-aix)
-override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphmath graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
+override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
 endif
 ifeq ($(FULL_TARGET),avr-embedded)
-override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphmath graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
+override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
 endif
 ifeq ($(FULL_TARGET),armeb-linux)
-override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphmath graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
+override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
 endif
 ifeq ($(FULL_TARGET),armeb-embedded)
-override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphmath graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
+override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
 endif
 ifeq ($(FULL_TARGET),mips-linux)
-override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphmath graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
+override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
 endif
 ifeq ($(FULL_TARGET),mipsel-linux)
-override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphmath graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
+override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
 endif
 ifeq ($(FULL_TARGET),mipsel-embedded)
-override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphmath graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
+override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
 endif
 ifeq ($(FULL_TARGET),mipsel-android)
-override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphmath graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
+override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
 endif
 ifeq ($(FULL_TARGET),mips64el-linux)
-override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphmath graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
+override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
 endif
 ifeq ($(FULL_TARGET),jvm-java)
-override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphmath graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
+override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
 endif
 ifeq ($(FULL_TARGET),jvm-android)
-override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphmath graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
+override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
 endif
 ifeq ($(FULL_TARGET),i8086-embedded)
-override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphmath graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
+override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
 endif
 ifeq ($(FULL_TARGET),i8086-msdos)
-override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphmath graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
+override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
 endif
 ifeq ($(FULL_TARGET),i8086-win16)
-override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphmath graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
+override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
 endif
 ifeq ($(FULL_TARGET),aarch64-linux)
-override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphmath graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
+override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
 endif
 ifeq ($(FULL_TARGET),aarch64-darwin)
-override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphmath graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
+override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
 endif
 ifeq ($(FULL_TARGET),aarch64-win64)
-override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphmath graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
+override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
 endif
 ifeq ($(FULL_TARGET),aarch64-android)
-override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphmath graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
+override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
 endif
 ifeq ($(FULL_TARGET),wasm-wasm)
-override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphmath graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
+override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
 endif
 ifeq ($(FULL_TARGET),sparc64-linux)
-override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphmath graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
+override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
 endif
 ifeq ($(FULL_TARGET),riscv32-linux)
-override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphmath graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
+override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
 endif
 ifeq ($(FULL_TARGET),riscv32-embedded)
-override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphmath graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
+override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
 endif
 ifeq ($(FULL_TARGET),riscv64-linux)
-override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphmath graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
+override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
 endif
 ifeq ($(FULL_TARGET),riscv64-embedded)
-override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphmath graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
+override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
 endif
 ifeq ($(FULL_TARGET),xtensa-linux)
-override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphmath graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
+override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
 endif
 ifeq ($(FULL_TARGET),xtensa-embedded)
-override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphmath graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
+override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
 endif
 ifeq ($(FULL_TARGET),xtensa-freertos)
-override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphmath graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
+override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
 endif
 ifeq ($(FULL_TARGET),z80-embedded)
-override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphmath graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
+override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
 endif
 ifeq ($(FULL_TARGET),z80-zxspectrum)
-override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphmath graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
+override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
 endif
 ifeq ($(FULL_TARGET),z80-msxdos)
-override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphmath graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
+override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
 endif
 ifeq ($(FULL_TARGET),i386-linux)
 override TARGET_RSTS+=lclstrconsts
--- a/lcl/Makefile.fpc
+++ b/lcl/Makefile.fpc
@ -33,7 +33,6 @@ implicitunits= \
  forms \
  fpcadds \
  graphics \
-  graphmath \
  graphtype \
  grids \
  imglist \
--- a/lcl/alllclunits.pp
+++ b/lcl/alllclunits.pp
@ -10,25 +10,24 @@ interface
 uses
  CheckLst, Clipbrd, ColorBox, ComCtrls, Controls, CustomTimer, DBActns, 
  DBCtrls, DBGrids, DefaultTranslator, Dialogs, ExtCtrls, ExtDlgs, 
-  ExtGraphics, FileCtrl, Forms, Graphics, GraphMath, GraphUtil, Grids, 
-  HelpIntfs, IcnsTypes, ImageListCache, ImgList, IniPropStorage, 
-  InterfaceBase, IntfGraphics, LazHelpHTML, LazHelpIntf, LCLClasses, LCLIntf, 
-  LCLMemManager, LCLMessageGlue, LCLProc, LCLResCache, LCLStrConsts, LCLType, 
-  Menus, LCLUnicodeData, LCLVersion, LMessages, LResources, MaskEdit, 
-  PairSplitter, PopupNotifier, PostScriptCanvas, PostScriptPrinter, 
-  PostScriptUnicode, Printers, PropertyStorage, RubberBand, ShellCtrls, Spin, 
-  StdActns, StdCtrls, Themes, TmSchema, Toolwin, UTrace, XMLPropStorage, 
-  TimePopup, Messages, WSButtons, WSCalendar, WSCheckLst, WSComCtrls, 
-  WSControls, WSDesigner, WSDialogs, WSExtCtrls, WSExtDlgs, WSFactory, 
-  WSForms, WSGrids, WSImgList, WSLCLClasses, WSMenus, WSPairSplitter, WSProc, 
-  WSReferences, WSSpin, WSStdCtrls, WSToolwin, ActnList, AsyncProcess, 
-  ButtonPanel, Buttons, Calendar, RegisterLCL, ValEdit, LazCanvas, LazDialogs, 
-  LazRegions, CustomDrawn_Common, CustomDrawnControls, CustomDrawnDrawers, 
-  LazDeviceApis, LDockTree, LazFreeTypeIntfDrawer, CustomDrawn_WinXP, 
-  CustomDrawn_Android, Arrow, EditBtn, ComboEx, DBExtCtrls, CustomDrawn_Mac, 
-  CalcForm, LCLTranslator, GroupedEdit, LCLTaskDialog, WSLazDeviceAPIS, 
-  LCLPlatformDef, IndustrialBase, JSONPropStorage, LCLExceptionStackTrace, 
-  LazarusPackageIntf;
+  ExtGraphics, FileCtrl, Forms, Graphics, GraphUtil, Grids, HelpIntfs, 
+  IcnsTypes, ImageListCache, ImgList, IniPropStorage, InterfaceBase, 
+  IntfGraphics, LazHelpHTML, LazHelpIntf, LCLClasses, LCLIntf, LCLMemManager, 
+  LCLMessageGlue, LCLProc, LCLResCache, LCLStrConsts, LCLType, Menus, 
+  LCLUnicodeData, LCLVersion, LMessages, LResources, MaskEdit, PairSplitter, 
+  PopupNotifier, PostScriptCanvas, PostScriptPrinter, PostScriptUnicode, 
+  Printers, PropertyStorage, RubberBand, ShellCtrls, Spin, StdActns, StdCtrls, 
+  Themes, TmSchema, Toolwin, UTrace, XMLPropStorage, TimePopup, Messages, 
+  WSButtons, WSCalendar, WSCheckLst, WSComCtrls, WSControls, WSDesigner, 
+  WSDialogs, WSExtCtrls, WSExtDlgs, WSFactory, WSForms, WSGrids, WSImgList, 
+  WSLCLClasses, WSMenus, WSPairSplitter, WSProc, WSReferences, WSSpin, 
+  WSStdCtrls, WSToolwin, ActnList, AsyncProcess, ButtonPanel, Buttons, 
+  Calendar, RegisterLCL, ValEdit, LazCanvas, LazDialogs, LazRegions, 
+  CustomDrawn_Common, CustomDrawnControls, CustomDrawnDrawers, LazDeviceApis, 
+  LDockTree, LazFreeTypeIntfDrawer, CustomDrawn_WinXP, CustomDrawn_Android, 
+  Arrow, EditBtn, ComboEx, DBExtCtrls, CustomDrawn_Mac, CalcForm, 
+  LCLTranslator, GroupedEdit, LCLTaskDialog, WSLazDeviceAPIS, LCLPlatformDef, 
+  IndustrialBase, JSONPropStorage, LCLExceptionStackTrace, LazarusPackageIntf;

 implementation

--- a/lcl/buttonpanel.pas
+++ b/lcl/buttonpanel.pas
@ -13,8 +13,11 @@ unit ButtonPanel;
 interface

 uses
-  Math, Types, SysUtils, Classes, LCLProc,Controls, ExtCtrls, StdCtrls, Buttons,
-  Forms, GraphType, Graphics, LMessages, Themes, LCLType;
+  Math, Types, SysUtils, Classes,
+  // LCL
+  LCLType, LMessages, Controls, ExtCtrls, StdCtrls, Buttons, Forms, Graphics, Themes,
+  // LazUtils
+  GraphType;

 type
  TButtonOrder  = (boDefault, boCloseCancelOK, boCloseOKCancel);
--- a/lcl/buttons.pp
+++ b/lcl/buttons.pp
@ -33,11 +33,10 @@ interface
 uses
  Types, Classes, SysUtils, Math,
  // LCL
-  LCLType, LCLProc, LCLIntf, LCLStrConsts,
-  GraphType, Graphics, ImgList, ActnList, Controls, StdCtrls, LMessages, Forms,
-  Themes, Menus, LResources, ImageListCache,
+  LCLType, LCLProc, LCLIntf, LCLStrConsts, LResources, Graphics, ImgList, ActnList,
+  Controls, StdCtrls, LMessages, Forms, Themes, Menus, ImageListCache,
  // LazUtils
-  LazUtilities;
+  GraphType, LazUtilities;

 type
  TButtonLayout =
--- a/lcl/checklst.pas
+++ b/lcl/checklst.pas
@ -21,8 +21,11 @@ unit CheckLst;
 interface

 uses
-  Classes, SysUtils, Math, LCLProc, LCLType, GraphType, Graphics, LMessages,
-  LResources, Controls, StdCtrls, LCLIntf;
+  Classes, SysUtils, Math,
+  // LCL
+  LCLType, LCLIntf, Graphics, LMessages, LResources, Controls, StdCtrls,
+  // LazUtils
+  GraphType;
  

 type
--- a/lcl/comctrls.pp
+++ b/lcl/comctrls.pp
@ -30,12 +30,12 @@ interface

 uses
  SysUtils, Types, Classes, Math, Laz_AVL_Tree,
-  // LazUtils
-  LazUTF8, LazUTF8Classes, LazLoggerBase, LazUtilities,
  // LCL
-  LCLStrConsts, LResources, LCLIntf, LCLType, LMessages, WSLCLClasses,
-  WSReferences, LCLProc, GraphType, Graphics, ImgList, ActnList, Themes, Menus,
-  Controls, Forms, StdCtrls, ExtCtrls, ToolWin, Buttons;
+  LCLStrConsts, LResources, LCLIntf, LCLType, LCLProc, LMessages, WSLCLClasses,
+  WSReferences, Graphics, ImgList, ActnList, Themes, Menus,
+  Controls, Forms, StdCtrls, ExtCtrls, ToolWin, Buttons,
+  // LazUtils
+  GraphType, LazUTF8, LazUTF8Classes, LazLoggerBase, LazUtilities;

 type
  THitTest = (htAbove, htBelow, htNowhere, htOnItem, htOnButton, htOnIcon,
--- a/lcl/controls.pp
+++ b/lcl/controls.pp
@ -39,11 +39,10 @@ interface
 uses
  Classes, SysUtils, TypInfo, Types, Laz_AVL_Tree,
  // LCL
-  LCLStrConsts, LCLType, LCLProc, GraphType, Graphics, LMessages, LCLIntf,
-  InterfaceBase, ImgList, PropertyStorage, Menus, ActnList, LCLClasses,
-  LResources, LCLPlatformDef,
+  LCLStrConsts, LCLType, LCLProc, Graphics, LMessages, LCLIntf, InterfaceBase,
+  ImgList, PropertyStorage, Menus, ActnList, LCLClasses, LResources, LCLPlatformDef,
  // LazUtils
-  LazMethodList, LazLoggerBase, LazUtilities, UITypes;
+  GraphType, UITypes, LazMethodList, LazLoggerBase, LazTracer, LazUtilities;

 {$I controlconsts.inc}

--- a/lcl/dbctrls.pp
+++ b/lcl/dbctrls.pp
@ -31,11 +31,11 @@ interface

 uses
  Types, Classes, SysUtils, DB, Variants,
-  // LazUtils
-  LazTracer, LazUtilities,
  // LCL
-  LCLStrConsts, LMessages, LCLType, LCLIntf, LResources, GraphType, Controls, Graphics,
-  Dialogs, StdCtrls, Buttons, MaskEdit, ExtCtrls, Calendar, ImgList;
+  LCLStrConsts, LMessages, LCLType, LCLIntf, LResources, Controls, Graphics,
+  Dialogs, StdCtrls, Buttons, MaskEdit, ExtCtrls, Calendar, ImgList,
+  // LazUtils
+  GraphType, LazTracer, LazUtilities;

 Type
  { TFieldDataLink }
--- a/lcl/dialogs.pp
+++ b/lcl/dialogs.pp
@ -25,10 +25,10 @@ uses
  Types, typinfo, Classes, SysUtils,
  // LCL
  LMessages, LResources, LCLIntf, InterfaceBase, LCLStrConsts, LCLType,
-  Forms, Controls, Themes, GraphType, Graphics, Buttons, ButtonPanel, StdCtrls,
+  Forms, Controls, Themes, Graphics, Buttons, ButtonPanel, StdCtrls,
  ExtCtrls, LCLClasses, ClipBrd, Menus, LCLTaskDialog,
  // LazUtils
-  UITypes, FileUtil, LazFileUtils, LazStringUtils, LazLoggerBase;
+  GraphType, UITypes, FileUtil, LazFileUtils, LazStringUtils, LazLoggerBase;

 type
  // Aliases for types in UITypes.
--- a/lcl/extctrls.pp
+++ b/lcl/extctrls.pp
@ -29,10 +29,10 @@ uses
  SysUtils, Types, Classes, contnrs, FGL,
  // LCL
  LCLStrConsts, LCLType, LCLProc, LResources, LMessages, Controls, Forms,
-  StdCtrls, GraphType, Graphics, LCLIntf, CustomTimer, Themes, LCLClasses, Menus,
+  StdCtrls, Graphics, LCLIntf, CustomTimer, Themes, LCLClasses, Menus,
  PopupNotifier, ImgList,
  // LazUtils
-  LazLoggerBase, LazUtilities;
+  GraphType, LazLoggerBase, LazTracer, LazUtilities;

 type

--- a/lcl/extdlgs.pas
+++ b/lcl/extdlgs.pas
@ -21,10 +21,12 @@ unit ExtDlgs;
 interface

 uses
-  Types, Classes, SysUtils, LCLProc, LResources, LCLType, LCLStrConsts,
-  InterfaceBase, LCLPlatformDef,
-  FileUtil, LazFileUtils, Controls, Dialogs, GraphType, Graphics, ExtCtrls,
-  StdCtrls, Forms, Calendar, Buttons, Masks, CalcForm;
+  Types, Classes, SysUtils,
+  // LCL
+  LResources, LCLType, LCLStrConsts, LCLPlatformDef, InterfaceBase, Controls,
+  Dialogs, Graphics, ExtCtrls, StdCtrls, Forms, Calendar, Buttons, Masks, CalcForm,
+  // LazUtils
+  GraphType, FileUtil, LazFileUtils;

 type

--- a/lcl/extgraphics.pas
+++ b/lcl/extgraphics.pas
@ -22,9 +22,9 @@ interface
 uses
  Types, Classes, Math,
  // LazUtils
-  LazUtilities,
+  LazUtilities, GraphMath,
  // LCL
-  Graphics, GraphMath;
+  Graphics;

 type
  TShapeDirection = (atUp, atDown, atLeft, atRight);
--- a/lcl/forms.pp
+++ b/lcl/forms.pp
@ -36,11 +36,11 @@ uses
  Classes, SysUtils, Types, TypInfo, Math, CustApp,
  // LCL
  LCLStrConsts, LCLType, LCLProc, LCLIntf, LCLVersion, LCLClasses, InterfaceBase,
-  LResources, GraphType, Graphics, Menus, LMessages, CustomTimer, ActnList,
+  LResources, Graphics, Menus, LMessages, CustomTimer, ActnList,
  ClipBrd, HelpIntfs, Controls, ImgList, Themes,
  // LazUtils
  LazFileUtils, LazUTF8, Maps, IntegerList, LazMethodList, LazLoggerBase,
-  LazUtilities, UITypes
+  LazUtilities, GraphType, UITypes
  {$ifndef wince},gettext{$endif}// remove ifdefs when gettext is fixed and a new fpc is released
  ;

--- a/lcl/fpmake.pp
+++ b/lcl/fpmake.pp
@ -74,7 +74,6 @@ begin
    D := T.Dependencies.AddUnit('FileCtrl');
    D := T.Dependencies.AddUnit('Forms');
    D := T.Dependencies.AddUnit('Graphics');
-    D := T.Dependencies.AddUnit('GraphMath');
    D := T.Dependencies.AddUnit('GraphUtil');
    D := T.Dependencies.AddUnit('Grids');
    D := T.Dependencies.AddUnit('HelpIntfs');
@ -356,7 +355,6 @@ begin
    T := P.Targets.AddImplicitUnit('filectrl.pp');
    T := P.Targets.AddImplicitUnit('forms.pp');
    T := P.Targets.AddImplicitUnit('graphics.pp');
-    T := P.Targets.AddImplicitUnit('graphmath.pp');
    T := P.Targets.AddImplicitUnit('graphutil.pp');
    T := P.Targets.AddImplicitUnit('grids.pas');
    T := P.Targets.AddImplicitUnit('helpintfs.pas');
--- a/lcl/graphics.pp
+++ b/lcl/graphics.pp
@ -55,11 +55,11 @@ uses
  {$IFNDEF DisableLCLGIF}
  FPReadGif,
  {$ENDIF}
-  // LazUtils
-  FPCAdds, LazUTF8Classes, LazLoggerBase, LazUtilities,
  // LCL
  LCLVersion, LCLStrConsts, LCLType, LCLProc, LMessages, LResources, LCLResCache,
-  IntfGraphics, GraphType, IcnsTypes, GraphMath, WSReferences;
+  IntfGraphics, IcnsTypes, WSReferences,
+  // LazUtils
+  GraphType, GraphMath, FPCAdds, LazUTF8Classes, LazLoggerBase, LazTracer, LazUtilities;

 type
  PColor = ^TColor;
--- a/lcl/graphutil.pp
+++ b/lcl/graphutil.pp
@ -1,7 +1,7 @@
 { $Id$ }
 {
 /***************************************************************************
-                                graphtype.pp
+                                graphutil.pp
                                ------------
                          Graphic utility functions.

@ -22,7 +22,10 @@ interface

 uses
  Types, Math,
-  Graphics, GraphType, LCLType, LCLIntf;
+  // LCL
+  Graphics, LCLType, LCLIntf,
+  // LazUtils
+  GraphType;

 function ColorToGray(const AColor: TColor): Byte;
 procedure ColorToHLS(const AColor: TColor; out H, L, S: Byte);
--- a/lcl/imglist.pp
+++ b/lcl/imglist.pp
@ -46,14 +46,13 @@ interface

 uses
  // RTL + FCL
-  Types, math, SysUtils, Classes, FPReadBMP, FPimage, FPImgCanv, FPCanvas,
-  Contnrs, zstream, Laz_AVL_Tree,
-  // LazUtils
-  FPCAdds, LazLoggerBase, LazUtilities, AvgLvlTree,
+  Types, math, SysUtils, Classes, RtlConsts, Contnrs, zstream, Laz_AVL_Tree,
+  FPReadBMP, FPimage, FPImgCanv, FPCanvas,
  // LCL
-  LCLStrConsts, LCLIntf, LResources, LCLType, LCLProc, Graphics, GraphType,
-  LCLClasses, IntfGraphics,
-  WSReferences, RtlConsts;
+  LCLStrConsts, LCLIntf, LResources, LCLType, LCLProc, LCLClasses,
+  Graphics, IntfGraphics, WSReferences,
+  // LazUtils
+  GraphType, FPCAdds, LazLoggerBase, LazTracer, LazUtilities, AvgLvlTree;

 type
  TImageIndex = type integer;
--- a/lcl/interfacebase.pp
+++ b/lcl/interfacebase.pp
@ -28,10 +28,10 @@ interface

 uses
  Types, Classes, SysUtils, Math, FPImage,
-  // LazUtils
-  LazUTF8, IntegerList, LazUtilities, LazLoggerBase, GraphType,
  // LCL
-  LCLProc, LCLType, LMessages, LCLPlatformDef, GraphMath, IntfGraphics, Themes;
+  LCLProc, LCLType, LMessages, LCLPlatformDef, IntfGraphics, Themes,
+  // LazUtils
+  LazUTF8, IntegerList, LazUtilities, LazLoggerBase, GraphType, GraphMath;

 type
  PEventHandler = type Pointer;
--- a/lcl/interfaces/fpgui/fpguiint.pp
+++ b/lcl/interfaces/fpgui/fpguiint.pp
@ -27,7 +27,9 @@ uses
  Classes, Types, SysUtils, Math,
  // LCL
  LCLPlatformDef, InterfaceBase, LCLProc, LCLType, LMessages,
-  Controls, ExtCtrls, Forms, Dialogs, StdCtrls, Comctrls, LCLIntf, GraphType, Themes,
+  Controls, ExtCtrls, Forms, Dialogs, StdCtrls, Comctrls, LCLIntf, Themes,
+  // LazUtils
+  GraphType,
  // Bindings
  fpg_main, fpg_form, fpguiproc, fpg_base, fpg_dialogs,// fpg_stylemanager, fpg_style_win8,
  // Widgetset
--- a/lcl/interfaces/fpgui/fpguiwsbuttons.pp
+++ b/lcl/interfaces/fpgui/fpguiwsbuttons.pp
@ -26,7 +26,9 @@ uses
  // RTL
  SysUtils,
  // LCL
-  Buttons, LCLType, Controls, Graphics, GraphType, ImgList,
+  Buttons, LCLType, Controls, Graphics, ImgList,
+  // LazUtils
+  GraphType,
  // Widgetset
  WSButtons, WSLCLClasses;

--- a/lcl/interfaces/gtk2/gtk2def.pp
+++ b/lcl/interfaces/gtk2/gtk2def.pp
@ -28,11 +28,10 @@ uses
  // RTL
  Classes, SysUtils, glib2, gdk2pixbuf, pango, gdk2, gtk2,
  // LazUtils
-  DynHashArray, LazLoggerBase, LazTracer, LazUtilities,
+  GraphType, DynHashArray, LazLoggerBase, LazTracer, LazUtilities,
  // LCL
-  Gtk2Extra,
-  LCLIntf, LCLType, LCLMemManager,
-  GraphType, Gtk2Globals, Graphics {for TColor};
+  Gtk2Extra, Gtk2Globals,
+  LCLIntf, LCLType, LCLMemManager, Graphics {for TColor};

 {$ifdef TraceGdiCalls}
 const
--- a/lcl/interfaces/gtk2/gtk2int.pas
+++ b/lcl/interfaces/gtk2/gtk2int.pas
@ -38,17 +38,15 @@ uses
    {$EndIf}
  {$EndIf}
  gdk2pixbuf, gtk2, gdk2, glib2, Pango,
-  // LazUtils
-  LazFileUtils, LazUTF8, DynHashArray, Maps, IntegerList,
-  LazLoggerBase, LazTracer, LazUtilities, LazStringUtils,
  // LCL
-  Dialogs, Controls, Forms, LCLStrConsts,
-  LMessages, LCLProc, LCLIntf, LCLType, GraphType, GraphMath,
+  LMessages, LCLProc, LCLIntf, LCLType, Dialogs, Controls, Forms, LCLStrConsts,
  Graphics, Menus, Themes, Buttons, StdCtrls, CheckLst, ComCtrls, ExtCtrls,
  LCLPlatformDef, InterfaceBase,
  WSLCLClasses, WSControls,
-  Gtk2WinApiWindow, Gtk2Globals, Gtk2Proc, Gtk2Def, Gtk2FontCache, Gtk2Extra,
-  Gtk2MsgQueue;
+  Gtk2WinApiWindow, Gtk2Globals, Gtk2Proc, Gtk2Def, Gtk2FontCache, Gtk2Extra, Gtk2MsgQueue,
+  // LazUtils
+  GraphType, GraphMath, LazFileUtils, LazUTF8, DynHashArray, Maps, IntegerList,
+  LazLoggerBase, LazTracer, LazUtilities, LazStringUtils;

 type

@ -64,8 +62,7 @@ type
    constructor Create; overload;
    destructor Destroy; override;
    function GetWidgetFrame: TRect;
-    function ShowDummyWidget(const ALeft, ATop, AWidth,
-      AHeight: integer): boolean;
+    function ShowDummyWidget(const ALeft, ATop, AWidth, AHeight: integer): boolean;
    procedure SendToBack;
    procedure HideWidget;
    property Widget: PGtkWidget read FWidget write FWidget;
--- a/lcl/interfaces/gtk2/gtk2proc.pp
+++ b/lcl/interfaces/gtk2/gtk2proc.pp
@ -45,12 +45,12 @@ uses
  Math, // Math after gtk to get the correct Float type
  Types,
  // LCL
-  LMessages, LCLProc, LCLIntf, LCLType, GraphType, Graphics,
+  LMessages, LCLProc, LCLIntf, LCLType, Graphics,
  LResources, Controls, Forms, Buttons, Menus, StdCtrls, ComCtrls, ExtCtrls,
  Dialogs, ExtDlgs, ImgList, LCLMessageGlue,
  // LazUtils
  FileUtil, LazFileUtils, LazStringUtils, LazUtilities, LazLoggerBase, LazTracer,
-  Masks, LazUTF8, DynHashArray,
+  GraphType, Masks, LazUTF8, DynHashArray,
  // Gtk2
  Gtk2FontCache, Gtk2Globals, Gtk2Def, Gtk2Extra, {%H-}Gtk2Debug;

--- a/lcl/interfaces/gtk2/gtk2wsbuttons.pp
+++ b/lcl/interfaces/gtk2/gtk2wsbuttons.pp
@ -21,14 +21,15 @@ interface

 uses
  // RTL
-  glib2, gtk2, gdk2, gdk2pixbuf,
+  Classes, glib2, gtk2, gdk2, gdk2pixbuf,
  // LCL
-////////////////////////////////////////////////////
-  LCLType, Controls, Buttons, Graphics, GraphType, ImgList, Classes,
+  LCLType, Controls, Buttons, Graphics, ImgList,
+  // LazUtils
+  GraphType,
  {$IFDEF DebugLCLComponents}
  LazLoggerBase,
  {$ENDIF}
-////////////////////////////////////////////////////
+  // WS
  WSButtons, WSLCLClasses, WSProc,
  Gtk2Def;

--- a/lcl/interfaces/nogui/noguiint.pp
+++ b/lcl/interfaces/nogui/noguiint.pp
@ -27,7 +27,9 @@ uses
  InterfaceBase,
  // LCL
  Dialogs, Controls, Forms,
-  LCLProc, LCLIntf, LCLType, LCLPlatformDef, GraphType, Graphics, Menus, Themes,
+  LCLProc, LCLIntf, LCLType, LCLPlatformDef, Graphics, Menus, Themes,
+  // LazUtils
+  GraphType,
  // widgetset
  WSLCLClasses;

--- a/lcl/interfaces/qt/qtint.pp
+++ b/lcl/interfaces/qt/qtint.pp
@ -38,11 +38,11 @@ uses
  // FPC
  Classes, SysUtils, Math, Types,
  // LazUtils
-  LazUTF8, Maps, LazUtilities, LazStringUtils,
+  GraphType, LazUTF8, Maps, LazUtilities, LazStringUtils,
  // LCL
  LCLPlatformDef, InterfaceBase, LCLProc, LCLType, LCLIntf,
  LMessages, LCLMessageGlue, LCLStrConsts,
-  Controls, ExtCtrls, Forms, StdCtrls, GraphType, GraphUtil, Themes,
+  Controls, ExtCtrls, Forms, StdCtrls, GraphUtil, Themes,
  // WS
  {$IFDEF HASX11}
  qtx11dummywidget,
--- a/lcl/interfaces/qt/qtwsbuttons.pp
+++ b/lcl/interfaces/qt/qtwsbuttons.pp
@ -29,8 +29,9 @@ uses
  // RTL
  SysUtils, Types,
  // LCL
-  Controls, LCLType, Forms, InterfaceBase, Buttons, Graphics, GraphType,
-  ImgList,
+  Controls, LCLType, Forms, InterfaceBase, Buttons, Graphics, ImgList,
+  // LazUtils
+  GraphType,
  // Widgetset
  WSProc, WSButtons, WSLCLClasses;

--- a/lcl/interfaces/qt/qtwscontrols.pp
+++ b/lcl/interfaces/qt/qtwscontrols.pp
@ -26,8 +26,12 @@ uses
  // Bindings
  qt4,
  qtwidgets, qtobjects, qtproc, qtint,
+  // RTL
+  SysUtils, Classes, Types,
  // LCL
-  SysUtils, Classes, Types, Controls, LCLType, LazUTF8, Forms, Graphics,
+  Controls, LCLType, Forms, Graphics,
+  // LazUtils
+  LazUTF8,
  // Widgetset
  InterfaceBase, WSProc, WSControls, WSLCLClasses;

--- a/lcl/interfaces/qt5/qtint.pp
+++ b/lcl/interfaces/qt5/qtint.pp
@ -35,13 +35,13 @@ uses
  // Bindings - qt5 must come first to avoid type redefinition problems
  qt5,
  // FPC
-  Classes, SysUtils, Math, Types, maps,
-  // LazUtils
-  LazStringUtils, LazUtilities, LazLoggerBase,
+  Classes, SysUtils, Math, Types,
  // LCL
-  InterfaceBase, LCLPlatformDef, LazUTF8, LCLProc, LCLType, LMessages,
+  InterfaceBase, LCLPlatformDef, LCLProc, LCLType, LMessages,
  LCLMessageGlue, LCLStrConsts, Controls, ExtCtrls, Forms,
-  Dialogs, StdCtrls, LCLIntf, GraphType, GraphUtil, Themes,
+  Dialogs, StdCtrls, LCLIntf, GraphUtil, Themes,
+  // LazUtils
+  GraphType, LazStringUtils, LazUtilities, LazLoggerBase, LazUTF8, Maps,
  // WS
  {$IFDEF HASX11}
  qtx11dummywidget,
@ -94,7 +94,6 @@ type
    FWindowManagerName: String; // Track various incompatibilities between WM. Initialized at WS start.
    {$ENDIF}

-
    // qt style does not have pixel metric for themed menubar (menu) height
    // so we must calculate it somehow.
    FCachedMenuBarHeight: Integer;
--- a/lcl/interfaces/qt5/qtwsbuttons.pp
+++ b/lcl/interfaces/qt5/qtwsbuttons.pp
@ -28,8 +28,9 @@ uses
  // RTL
  SysUtils, Types,
  // LCL
-  Controls, LCLType, Forms, InterfaceBase, Buttons, Graphics, GraphType,
-  ImgList,
+  Controls, LCLType, Forms, InterfaceBase, Buttons, Graphics, ImgList,
+  // LazUtils
+  GraphType,
  // Widgetset
  WSProc, WSButtons, WSLCLClasses;

--- a/lcl/interfaces/win32/win32int.pp
+++ b/lcl/interfaces/win32/win32int.pp
@ -36,10 +36,10 @@ uses
  {$ENDIF}
  // LCL
  LCLPlatformDef, InterfaceBase, LCLIntf, LclProc, LCLType, LMessages,
-  Controls, Buttons, Forms, Dialogs, GraphMath, GraphType, StdCtrls,
+  Controls, Buttons, Forms, Dialogs, StdCtrls,
  Graphics, Menus, ComCtrls, Themes, Win32Def, Spin,
  // LazUtils
-  LazUTF8, Translations;
+  GraphType, GraphMath, LazUTF8, Translations;
  {, Win32Debug}

 const
--- a/lcl/interfaces/wince/winceint.pp
+++ b/lcl/interfaces/wince/winceint.pp
@ -44,10 +44,10 @@ uses
  Windows, Classes,
  // LCL
  LCLIntf, LCLType, ComCtrls, Controls, Buttons, Dialogs,
-  ExtCtrls, Forms, GraphMath, GraphType, LCLPlatformDef, InterfaceBase,
+  ExtCtrls, Forms, LCLPlatformDef, InterfaceBase,
  LMessages, StdCtrls, SysUtils, Graphics, Menus, Themes,
  // LazUtils
-  LazUTF8, DynHashArray,
+  GraphType, GraphMath, LazUTF8, DynHashArray,
  // Widgetset
  WinCEProc, WinCEExtra, WinExt, WinCEDef;

--- a/lcl/interfaces/wince/wincewsbuttons.pp
+++ b/lcl/interfaces/wince/wincewsbuttons.pp
@ -26,7 +26,9 @@ uses
  // RTL
  SysUtils, Classes,
  // LCL
-  Controls, Buttons, Graphics, GraphType, LCLType, LCLProc, LazUTF8,
+  Controls, Buttons, Graphics, LCLType, LCLProc, LazUTF8,
+  // LazUtils
+  GraphType,
  // Widgetset
  WSButtons, WSLCLClasses, WinCEWSControls, WinCEWSImgList, WinCEProc;

--- a/lcl/interfaces/wince/wincewsimglist.pp
+++ b/lcl/interfaces/wince/wincewsimglist.pp
@ -25,7 +25,9 @@ uses
  Windows,
  commctrl,
  // RTL, LCL
-  SysUtils, Classes, ImgList, GraphType, Graphics, LCLType,
+  SysUtils, Classes, ImgList, Graphics, LCLType,
+  // LazUtils
+  GraphType,
  // Widgetset
  WinCEExtra, WinCEInt, WinCEProc, InterfaceBase,
  WSImgList, WSLCLClasses, WSProc, WSReferences;
--- a/lcl/interfaces/wince/wincewsmenus.pp
+++ b/lcl/interfaces/wince/wincewsmenus.pp
@ -21,8 +21,10 @@ interface

 uses
  // LCL
-  Graphics, GraphType, ImgList, Menus, Forms, LCLIntf, {keep before Windows }
+  Graphics, ImgList, Menus, Forms, LCLIntf, {keep before Windows }
  Controls,  InterfaceBase, LCLProc, LazUTF8,
+  // LazUtils
+  GraphType,
  // RTL, FCL
  Windows, Classes, SysUtils,
  commctrl,
--- a/lcl/intfgraphics.pas
+++ b/lcl/intfgraphics.pas
@ -34,9 +34,9 @@ uses
  {$ENDIF}
  Laz_AVL_Tree,
  // LazUtils
-  FPCAdds, LazLoggerBase, LazTracer,
+  GraphType, FPCAdds, LazLoggerBase, LazTracer,
  // LCL
-  LCLType, LCLversion, GraphType, IcnsTypes;
+  LCLType, LCLversion, IcnsTypes;

 type
  { TLazIntfImage }
--- a/lcl/lazfreetypeintfdrawer.pas
+++ b/lcl/lazfreetypeintfdrawer.pas
@ -7,9 +7,9 @@ interface
 uses
  Classes, SysUtils, FPimage,
  // LazUtils
-  EasyLazFreeType,
+  GraphType, EasyLazFreeType,
  // LCL
-  GraphType, Graphics, IntfGraphics;
+  Graphics, IntfGraphics;

 type
  TLazIntfImageGetPixelAtProc = procedure(p: pointer; out Color: TFPColor);
--- a/lcl/lclbase.lpk
+++ b/lcl/lclbase.lpk
--- a/lcl/lclintf.pas
+++ b/lcl/lclintf.pas
@ -52,9 +52,9 @@ uses
  {$IFDEF Darwin}MacOSAll, CocoaAll,{$ENDIF}
  Math, Classes, SysUtils, Types,
  // LCL
-  LCLType, LCLProc, LMessages, LCLStrConsts, GraphType, InterfaceBase,
+  LCLType, LCLProc, LMessages, LCLStrConsts, InterfaceBase,
  // LazUtils
-  FileUtil, LazFileUtils, UTF8Process, LazUTF8, LazSysUtils, Maps;
+  GraphType, FileUtil, LazFileUtils, UTF8Process, LazUTF8, LazSysUtils, Maps;

 {$ifdef Trace}
  {$ASSERTIONS ON}
--- a/lcl/lmessages.pp
+++ b/lcl/lmessages.pp
@ -26,7 +26,9 @@ interface
 uses
  Classes, SysUtils, Types,
  // LCL
-  LCLType, GraphType
+  LCLType,
+  // LazUtils
+  GraphType
  {$ifdef WINDOWS}
  ,messages
  {$endif WINDOWS}
--- a/lcl/postscriptcanvas.pas
+++ b/lcl/postscriptcanvas.pas
@ -45,10 +45,10 @@ uses
  // RTL + FCL
  Classes, SysUtils, strutils, Math, Types, FPImage,
  // LCL
-  Graphics, Forms, GraphMath, GraphType, IntfGraphics, Printers,
-  LCLType, LCLIntf, LCLProc, PostScriptUnicode,
+  LCLType, LCLIntf, LCLProc,
+  Graphics, Forms, IntfGraphics, Printers, PostScriptUnicode,
  // LazUtils
-  LazFileUtils, IntegerList, LazUTF8, LazUTF8Classes;
+  GraphType, GraphMath, LazFileUtils, IntegerList, LazUTF8, LazUTF8Classes;
  
 Type

--- a/lcl/postscriptprinter.pas
+++ b/lcl/postscriptprinter.pas
@ -25,7 +25,11 @@ unit PostScriptPrinter;
 interface

 uses
-  Classes, SysUtils, LCLProc, Graphics, GraphMath, LCLIntf, Forms;
+  Classes, SysUtils,
+  // LCL
+  LCLIntf, Graphics, Forms,
+  // LazUtils
+  GraphMath, LazLoggerBase;
  
  // uses lcllinux or winapi for RGB conversions and FORMS for application object
  
--- a/lcl/themes.pas
+++ b/lcl/themes.pas
@ -48,7 +48,9 @@ interface
 uses
  Classes, SysUtils, Types, Math,
  // LCL  -  Controls cannot be used here to prevent circular references
-  LCLProc, LCLType, GraphType, Graphics, TmSchema;
+  LCLProc, LCLType, Graphics, TmSchema,
+  // LazUtils
+  GraphType;
  
 type
  // These are all elements which can be themed.
--- a/lcl/toolwin.pp
+++ b/lcl/toolwin.pp
@ -35,8 +35,11 @@ interface
 {$endif}

 uses
-  Classes, LCLProc, Controls, SysUtils, GraphType, Graphics, LCLType, LCLIntf,
-  StdCtrls;
+  Classes, SysUtils,
+  // LCL
+  LCLType, LCLIntf, Controls, Graphics, StdCtrls,
+  // LazUtils
+  GraphType;

 type