diff --git a/components/callite/source/calendarlite.pas b/components/callite/source/calendarlite.pas
index 7dbe994ca..bebce69ba 100644
--- a/components/callite/source/calendarlite.pas
+++ b/components/callite/source/calendarlite.pas
@@ -1363,7 +1363,6 @@ var
   cell: TSize;
   Rm, Ry: TRect;
   sm: TCalSelMode;
-  newDate: TDate;
 begin
   sm := FOwner.SelMode(Shift);
   cell := GetCellAt(APoint);
diff --git a/components/exctrls/source/excheckctrls.pas b/components/exctrls/source/excheckctrls.pas
index 07d47bfd1..2faf1aa40 100644
--- a/components/exctrls/source/excheckctrls.pas
+++ b/components/exctrls/source/excheckctrls.pas
@@ -389,7 +389,6 @@ type
     property ButtonCount: Integer read GetButtonCount;
     property Buttons[AIndex: Integer]: TRadioButtonEx read GetButtons;
     property ItemEnabled;
-  published
     constructor Create(AOwner: TComponent); override;
     destructor Destroy; override;
   end;
diff --git a/components/exctrls/source/exshape.pas b/components/exctrls/source/exshape.pas
index 5ec26b4d9..76aae947a 100644
--- a/components/exctrls/source/exshape.pas
+++ b/components/exctrls/source/exshape.pas
@@ -5,7 +5,7 @@ unit ExShape;
 interface
 
 uses
-  LCLVersion, Types, Graphics, Classes, SysUtils, ExtCtrls;
+  LCLIntf, LCLType, LCLVersion, Types, Graphics, Classes, SysUtils, ExtCtrls;
 
 type
   {$IF LCL_FullVersion < 2020000}
@@ -73,9 +73,6 @@ type
 
 implementation
 
-uses
-  LCLIntf, LCLType;
-
 { TShapeText }
 
 constructor TShapeText.Create(AShape: TShape);
diff --git a/components/fpspreadsheet/source/visual/fpspreadsheetgrid.pas b/components/fpspreadsheet/source/visual/fpspreadsheetgrid.pas
index 63a6f710a..ae5e79b01 100644
--- a/components/fpspreadsheet/source/visual/fpspreadsheetgrid.pas
+++ b/components/fpspreadsheet/source/visual/fpspreadsheetgrid.pas
@@ -27,7 +27,7 @@ unit fpspreadsheetgrid;
 interface
 
 uses
-  Classes, SysUtils, LMessages, LResources, LCLVersion, Variants,
+  LCLType, LCLIntf, LCLVersion, Classes, SysUtils, LMessages, LResources, Variants,
   Forms, Controls, Graphics, Dialogs, Grids, StdCtrls, ExtCtrls,
   fpstypes, fpspreadsheet, fpspreadsheetctrls;
 
@@ -911,7 +911,7 @@ var
 implementation
 
 uses
-  Types, LCLType, LCLIntf, LCLProc, LazUTF8, Math, StrUtils,
+  Types, LazUTF8, Math, StrUtils,
   fpCanvas, {%H-}fpsPatches, fpsStrings, fpsUtils, fpsVisualUtils, fpsHTMLUtils,
   fpsImages, fpsNumFormat, fpsExprParser;
 
diff --git a/components/industrialstuff/industrial.lpk b/components/industrialstuff/industrial.lpk
index 3f4ab1bc0..b63eb1727 100644
--- a/components/industrialstuff/industrial.lpk
+++ b/components/industrialstuff/industrial.lpk
@@ -24,6 +24,11 @@
           <GenerateDebugInfo Value="False"/>
         </Debugging>
       </Linking>
+      <Other>
+        <CompilerMessages>
+          <IgnoredMessages idx6058="True"/>
+        </CompilerMessages>
+      </Other>
     </CompilerOptions>
     <Description Value="Industrial-themed components and gauges:
 - LED indicators
@@ -102,7 +107,7 @@
       </Item15>
       <Item16>
         <Filename Value="source\indlcddisplay_editor.pas"/>
-        <UnitName Value="indlcddisplay_editor"/>
+        <UnitName Value="indLCDDisplay_Editor"/>
       </Item16>
       <Item17>
         <Filename Value="source\indlcddisplay_editorform.pas"/>
diff --git a/components/industrialstuff/source/indlcddisplay.pas b/components/industrialstuff/source/indlcddisplay.pas
index c5ab79353..b5a631a35 100644
--- a/components/industrialstuff/source/indlcddisplay.pas
+++ b/components/industrialstuff/source/indlcddisplay.pas
@@ -622,7 +622,7 @@ begin
   Writer.WriteListEnd;
 end;
 
-
+(*
 { TLCDDisplayStrings }
 
 type
@@ -632,7 +632,7 @@ type
   public
     property OnChange: TNotifyEvent read FOnChange write FOnChange;
   end;
-
+*)
 
 { TLCDDisplay}
 
diff --git a/components/industrialstuff/source/indlcddisplay_editorform.pas b/components/industrialstuff/source/indlcddisplay_editorform.pas
index b3921d006..5dc64da36 100644
--- a/components/industrialstuff/source/indlcddisplay_editorform.pas
+++ b/components/industrialstuff/source/indlcddisplay_editorform.pas
@@ -5,8 +5,8 @@ unit indLCDDisplay_EditorForm;
 interface
 
 uses
-  Classes, SysUtils, Forms, Controls, Graphics, Dialogs, StdCtrls,
-  Grids, ExtCtrls, Buttons, indLCDDisplay, Types;
+  LCLIntf, Classes, SysUtils, Forms, Controls, Graphics, Dialogs, StdCtrls,
+  Grids, ExtCtrls, Buttons, indLCDDisplay;
 
 type
 
diff --git a/components/industrialstuff/source/switches.pas b/components/industrialstuff/source/switches.pas
index ac01f4f86..cd1d6f4d5 100644
--- a/components/industrialstuff/source/switches.pas
+++ b/components/industrialstuff/source/switches.pas
@@ -18,7 +18,7 @@ unit switches;
 interface
 
 uses
-  Graphics, Classes, SysUtils, Types, Controls, ExtCtrls;
+  LCLIntf, LCLType, Graphics, Classes, SysUtils, Types, Controls, ExtCtrls;
 
 type
   TSwitchBorderStyle = (bsNone, bsThin, bsThick, bsThin3D, bsThick3D);
@@ -148,7 +148,7 @@ type
 implementation
 
 uses
-  LCLIntf, LCLType, Math;
+  Math;
 
 function TintedColor(AColor: TColor; ADelta: Integer): TColor;
 var
diff --git a/components/jvcllaz/packages/jvcustomlazr.lpk b/components/jvcllaz/packages/jvcustomlazr.lpk
index 1fbc74018..27dc6227e 100644
--- a/components/jvcllaz/packages/jvcustomlazr.lpk
+++ b/components/jvcllaz/packages/jvcustomlazr.lpk
@@ -11,6 +11,11 @@
         <OtherUnitFiles Value="..\run\JvCustomControls"/>
         <UnitOutputDirectory Value="..\lib\$(TargetCPU)-$(TargetOS)\run\JvCustom"/>
       </SearchPaths>
+      <Other>
+        <CompilerMessages>
+          <IgnoredMessages idx6058="True"/>
+        </CompilerMessages>
+      </Other>
     </CompilerOptions>
     <Description Value="Custom components of the JVCL library (https://sourceforge.net/projects/jvcl/) (runtime code):
 TimeLine, OutlookBar, Thumbnail viewer, ImageViewer, ImageListViewer, OwnerDrawViewer"/>
@@ -63,7 +68,7 @@ TimeLine, OutlookBar, Thumbnail viewer, ImageViewer, ImageListViewer, OwnerDrawV
       </Item11>
       <Item12>
         <Filename Value="..\run\JvCustomControls\jvvalidateedit.pas"/>
-        <UnitName Value="jvvalidateedit"/>
+        <UnitName Value="JvValidateEdit"/>
       </Item12>
       <Item13>
         <Filename Value="..\run\JvCustomControls\jvgammapanel.pas"/>
diff --git a/components/jvcllaz/packages/jvdblazr.lpk b/components/jvcllaz/packages/jvdblazr.lpk
index 0764ad380..83c247ddf 100644
--- a/components/jvcllaz/packages/jvdblazr.lpk
+++ b/components/jvcllaz/packages/jvdblazr.lpk
@@ -11,6 +11,11 @@
         <OtherUnitFiles Value="..\run\JvDB"/>
         <UnitOutputDirectory Value="..\lib\$(TargetCPU)-$(TargetOS)\run\JvDB"/>
       </SearchPaths>
+      <Other>
+        <CompilerMessages>
+          <IgnoredMessages idx6058="True"/>
+        </CompilerMessages>
+      </Other>
     </CompilerOptions>
     <Description Value="Database controls of the JVCL library (https://sourceforge.net/projects/jvcl/) (runtime code):
 - Search edit, Calc edit
diff --git a/components/jvcllaz/packages/jvpascalinterpreterr.lpk b/components/jvcllaz/packages/jvpascalinterpreterr.lpk
index 198724960..52a5affdf 100644
--- a/components/jvcllaz/packages/jvpascalinterpreterr.lpk
+++ b/components/jvcllaz/packages/jvpascalinterpreterr.lpk
@@ -11,6 +11,11 @@
         <OtherUnitFiles Value="..\run\JvPascalInterpreter"/>
         <UnitOutputDirectory Value="..\lib\$(TargetCPU)-$(TargetOS)\run\JvPascalInterpreter"/>
       </SearchPaths>
+      <Other>
+        <CompilerMessages>
+          <IgnoredMessages idx6058="True"/>
+        </CompilerMessages>
+      </Other>
     </CompilerOptions>
     <Description Value="Pascal scripting engine of the JVCL library (https://sourceforge.net/projects/jvcl/) (runtime code)
 "/>
diff --git a/components/jvcllaz/run/JvCmp/jvprofilerform.pas b/components/jvcllaz/run/JvCmp/jvprofilerform.pas
index 7f605dda6..bed0ebf38 100644
--- a/components/jvcllaz/run/JvCmp/jvprofilerform.pas
+++ b/components/jvcllaz/run/JvCmp/jvprofilerform.pas
@@ -204,6 +204,7 @@ function GetComputerName : string;
 var
   len : cardinal;
 begin
+  Result := '';
   len := MAX_COMPUTERNAME_LENGTH + 1;
   SetLength(result, len);
   if Windows.GetComputerName(PChar(result), len) then begin
diff --git a/components/jvcllaz/run/JvCore/jvjvclutils.pas b/components/jvcllaz/run/JvCore/jvjvclutils.pas
index f1a730af3..965c67d7a 100644
--- a/components/jvcllaz/run/JvCore/jvjvclutils.pas
+++ b/components/jvcllaz/run/JvCore/jvjvclutils.pas
@@ -37,8 +37,8 @@ uses
  {$IFDEF WINDOWS}
   Windows,          // before Types!
  {$ENDIF}
+  LCLType, LCLVersion, LMessages,
   Classes, Graphics, Controls, ImgList, Menus, Forms, Types,
-  LCLType, LCLProc, LCLVersion, LMessages,
   JvTypes;
 
 (******************** NOT CONVERTED
diff --git a/components/jvcllaz/run/JvCtrls/jvhtcontrols.pas b/components/jvcllaz/run/JvCtrls/jvhtcontrols.pas
index cdba1fdea..579b77afe 100644
--- a/components/jvcllaz/run/JvCtrls/jvhtcontrols.pas
+++ b/components/jvcllaz/run/JvCtrls/jvhtcontrols.pas
@@ -107,8 +107,8 @@ unit JvHtControls;
 interface
 
 uses
-  LCLType, {LMessages,} Types,
-  SysUtils, Classes, Graphics, {Contnrs,} Controls, StdCtrls, Dialogs,
+  LCLIntf, LCLType, {LMessages,} Types,
+  SysUtils, Classes, Graphics, {Contnrs,} Controls, StdCtrls, Dialogs, Forms,
   JvJVCLUtils {JvDataSourceIntf, JvExStdCtrls} ;
 
 const
@@ -429,9 +429,6 @@ function PrepareText(const A: string): string; deprecated;
 
 implementation
 
-uses
-  LCLProc, LCLIntf, Forms;
-
 const
   cMAILTO = 'MAILTO:';
   cURLTYPE = '://';
diff --git a/components/jvcllaz/run/JvCustomControls/jvcustomitemviewer.pas b/components/jvcllaz/run/JvCustomControls/jvcustomitemviewer.pas
index 46f79fe32..251d3dc02 100644
--- a/components/jvcllaz/run/JvCustomControls/jvcustomitemviewer.pas
+++ b/components/jvcllaz/run/JvCustomControls/jvcustomitemviewer.pas
@@ -37,7 +37,7 @@ unit JvCustomItemViewer;
 interface
 
 uses
-  LMessages, LCLVersion,
+  LCLIntf, LCLVersion, LMessages,
   Classes, Graphics, Contnrs, Controls, Forms, ComCtrls,
   ExtCtrls, JvConsts, Types, LCLType;
 
@@ -369,7 +369,7 @@ function CenterRect(InnerRect, OuterRect: TRect): TRect;
 implementation
 
 uses
-  SysUtils, Math, Themes, LCLIntf,
+  SysUtils, Math, Themes,
   JvJCLUtils;
 //  JvJVCLUtils, ;
 
diff --git a/components/jvcllaz/run/JvCustomControls/jvimagelistviewer.pas b/components/jvcllaz/run/JvCustomControls/jvimagelistviewer.pas
index 129f7c793..f9fbb6261 100644
--- a/components/jvcllaz/run/JvCustomControls/jvimagelistviewer.pas
+++ b/components/jvcllaz/run/JvCustomControls/jvimagelistviewer.pas
@@ -29,7 +29,7 @@ interface
 {$MODE OBJFPC}{$H+}
 
 uses
-  LCLVersion,
+  LCLType, LCLIntf, LCLVersion,
   SysUtils, Types, Classes, Controls, Graphics, ComCtrls, ImgList,
   JvCustomItemViewer;
 
@@ -158,7 +158,6 @@ type
 implementation
 
 uses
-  LCLType, LCLProc, LCLIntf,
   Math,
   JvJCLUtils, JvJVCLUtils;
 
diff --git a/components/jvcllaz/run/JvCustomControls/jvtmtimeline.pas b/components/jvcllaz/run/JvCustomControls/jvtmtimeline.pas
index 532105fcb..2bb1d0c18 100644
--- a/components/jvcllaz/run/JvCustomControls/jvtmtimeline.pas
+++ b/components/jvcllaz/run/JvCustomControls/jvtmtimeline.pas
@@ -1294,6 +1294,7 @@ var
   I: Integer;
   UTF8Value: UTF8String = '';
 begin
+  Result := '';
   I := ReadInt(Stream);
   SetLength(Result, I);
   if I > 0 then
diff --git a/components/jvcllaz/run/JvCustomControls/jvvalidateedit.pas b/components/jvcllaz/run/JvCustomControls/jvvalidateedit.pas
index f841d6461..39f215a4e 100644
--- a/components/jvcllaz/run/JvCustomControls/jvvalidateedit.pas
+++ b/components/jvcllaz/run/JvCustomControls/jvvalidateedit.pas
@@ -1025,6 +1025,7 @@ var
   I: Integer;
   L: Integer;
 begin
+  Result := '';
   SetLength(Result, Length(ParseString));
   L := 0;
   for I := 1 to Length(ParseString) do
diff --git a/components/jvcllaz/run/JvDB/jvdblookup.pas b/components/jvcllaz/run/JvDB/jvdblookup.pas
index fd8686119..a05d277ea 100644
--- a/components/jvcllaz/run/JvDB/jvdblookup.pas
+++ b/components/jvcllaz/run/JvDB/jvdblookup.pas
@@ -39,7 +39,7 @@ unit JvDBLookup;
 interface
 
 uses
-  LCLType, LCLIntf, LCLProc, LMessages, LCLVersion,
+  LCLType, LCLIntf, LMessages, LCLVersion,
   Variants, Classes, Graphics, Controls, Forms, DB, DBCtrls, Themes,
   JvThemes, JvDBUtils;
 
diff --git a/components/jvcllaz/run/JvDB/jvdbtreeview.pas b/components/jvcllaz/run/JvDB/jvdbtreeview.pas
index 5bf50673e..14c61fe57 100644
--- a/components/jvcllaz/run/JvDB/jvdbtreeview.pas
+++ b/components/jvcllaz/run/JvDB/jvdbtreeview.pas
@@ -1551,7 +1551,7 @@ end;
 procedure TJvCustomDBTreeView.CreateWnd;
 var
   Node: TTreeNode;
-  temp: string;
+  temp: string = '';
   strLength: Integer = 0;
   HasChildren: Byte = 0;
 begin
diff --git a/components/jvcllaz/run/JvMM/jvid3v2base.pas b/components/jvcllaz/run/JvMM/jvid3v2base.pas
index cc727144c..c195dcfc3 100644
--- a/components/jvcllaz/run/JvMM/jvid3v2base.pas
+++ b/components/jvcllaz/run/JvMM/jvid3v2base.pas
@@ -1822,7 +1822,7 @@ var
   //P, ContentPtr: PWideChar;
   //S: WideString;
   P, ContentPtr: PChar;
-  S: String;
+  S: String = '';
 begin
   //ContentPtr := PWideChar(Content);
   ContentPtr := PChar(Content);
@@ -1869,7 +1869,7 @@ procedure ExtractStrings(Separator: WideChar; const Content: String;
 var
   EOS: Boolean;
   Tail: PChar;
-  S: String;
+  S: String = '';
   ContentPtr: PChar;
 {
   Tail: PWideChar;
@@ -5922,7 +5922,7 @@ const
   CMinimalHeaderSize: array [Boolean] of Byte = (6, 10);
 var
   Frame: TJvID3Frame;
-  FrameIDStr: AnsiString;
+  FrameIDStr: AnsiString = '';
   FrameID: TJvID3FrameID;
 
   LFrameIDLength: Byte;
@@ -8280,6 +8280,8 @@ var
   P: PChar;
   S: string;
 begin
+  Result := '';
+
   LCount := GetCount;
   Size := 0;
   SepLen := Length(Separator);
diff --git a/components/jvcllaz/run/JvMM/jvid3v2types.pas b/components/jvcllaz/run/JvMM/jvid3v2types.pas
index 76f1c4ae3..8ed8669e7 100644
--- a/components/jvcllaz/run/JvMM/jvid3v2types.pas
+++ b/components/jvcllaz/run/JvMM/jvid3v2types.pas
@@ -27,7 +27,7 @@ Known Issues:
 
 unit JvId3v2Types;
 
-
+{$WARN 6058 off : Call to subroutine "$1" marked as inline is not inlined}
 interface
 
 uses
diff --git a/components/jvcllaz/run/JvNet/jvstrtohtml.pas b/components/jvcllaz/run/JvNet/jvstrtohtml.pas
index 7ea7b865a..d9fd26a3a 100644
--- a/components/jvcllaz/run/JvNet/jvstrtohtml.pas
+++ b/components/jvcllaz/run/JvNet/jvstrtohtml.pas
@@ -488,7 +488,7 @@ begin
   SetLength(Result, CurrPos-1);
 end;
 
-{<<<<<<<<<<<<<< NOT CONVERTED
+(*<<<<<<<<<<<<<< NOT CONVERTED
 function CharToHtml(Ch: Char): string;
 var
   I: Integer;
@@ -513,7 +513,7 @@ begin
   end;
   Result := Ch;
 end;
->>>>>>>>>>>>>>>>>>> }
+>>>>>>>>>>>>>>>>>>> *)
 
 end.
 
diff --git a/components/jvcllaz/run/JvPascalInterpreter/JvInterpreter.pas b/components/jvcllaz/run/JvPascalInterpreter/JvInterpreter.pas
index b91b29a55..055814abf 100644
--- a/components/jvcllaz/run/JvPascalInterpreter/JvInterpreter.pas
+++ b/components/jvcllaz/run/JvPascalInterpreter/JvInterpreter.pas
@@ -193,7 +193,7 @@ end.
 interface
 
 uses
-  LCLType, LCLIntf, LCLProc, dynlibs,
+  LCLType, LCLIntf, dynlibs,
   SysUtils, Classes, Variants,
   JvJCLUtils, JvInterpreterParser;
 
diff --git a/components/jvcllaz/run/JvRuntimeDesign/jvdesignclip.pas b/components/jvcllaz/run/JvRuntimeDesign/jvdesignclip.pas
index df01cd7a3..6e98268fe 100644
--- a/components/jvcllaz/run/JvRuntimeDesign/jvdesignclip.pas
+++ b/components/jvcllaz/run/JvRuntimeDesign/jvdesignclip.pas
@@ -5,7 +5,7 @@ unit JvDesignClip;
 interface
 
 uses
-  LCLProc, LCLType, LResources, LCLIntf, Classes;
+  LCLType, LResources, LCLIntf, Classes;
 
 type
   TJvDesignComponentClipboard = class(TObject)
diff --git a/components/jvcllaz/run/JvRuntimeDesign/jvdesignimp.pas b/components/jvcllaz/run/JvRuntimeDesign/jvdesignimp.pas
index 82bc11f8e..285b7b8f7 100644
--- a/components/jvcllaz/run/JvRuntimeDesign/jvdesignimp.pas
+++ b/components/jvcllaz/run/JvRuntimeDesign/jvdesignimp.pas
@@ -5,7 +5,7 @@ unit JvDesignImp;
 interface
 
 uses
-  LCLProc, LCLType, LResources, LCLIntf, LMessages,
+  LCLType, LCLIntf, LMessages, LResources,
   SysUtils, Types, Classes, Controls, Graphics, Forms, ExtCtrls, Contnrs,
   JvDesignUtils, JvDesignSurface;
 
diff --git a/components/jvcllaz/run/JvRuntimeDesign/jvdesignsurface.pas b/components/jvcllaz/run/JvRuntimeDesign/jvdesignsurface.pas
index 1460b460e..e2b321f43 100644
--- a/components/jvcllaz/run/JvRuntimeDesign/jvdesignsurface.pas
+++ b/components/jvcllaz/run/JvRuntimeDesign/jvdesignsurface.pas
@@ -40,7 +40,7 @@ interface
 
 uses
   Classes, SysUtils,
-  LCLProc, LCLType, LResources, LCLIntf, LMessages,
+  LCLType, LResources, LCLIntf, LMessages,
   Forms, Controls, Graphics, Dialogs, ExtCtrls;
 
 type
@@ -543,6 +543,7 @@ function TJvDesignSurface.GetSelected: TJvDesignObjectArray;
 var
   I: Integer;
 begin
+  Result := nil;
   SetLength(Result, Count);
   for I := 0 to Count - 1 do
     Result[I] := Selector.Selection[I];
diff --git a/components/jvcllaz/run/JvRuntimeDesign/jvdesignutils.pas b/components/jvcllaz/run/JvRuntimeDesign/jvdesignutils.pas
index ea6d20470..b4ba751e0 100644
--- a/components/jvcllaz/run/JvRuntimeDesign/jvdesignutils.pas
+++ b/components/jvcllaz/run/JvRuntimeDesign/jvdesignutils.pas
@@ -6,7 +6,7 @@ unit JvDesignUtils;
 
 interface
 uses
-  SysUtils, LCLProc, LCLType, LResources, LCLIntf, LMessages,
+  SysUtils, LCLType, LResources, LCLIntf, LMessages,
   Classes, Controls, Graphics, Forms, dialogs;
 
 type
diff --git a/components/jvcllaz/run/JvStdCtrls/jvbutton.pas b/components/jvcllaz/run/JvStdCtrls/jvbutton.pas
index 0adc21078..7578be9e8 100644
--- a/components/jvcllaz/run/JvStdCtrls/jvbutton.pas
+++ b/components/jvcllaz/run/JvStdCtrls/jvbutton.pas
@@ -34,8 +34,7 @@ unit JvButton;
 interface
 
 uses
-  LMessages,
-  Classes, Types, Controls, Graphics, Menus,
+  LCLIntf, LCLType, LMessages, SysUtils, Classes, Types, Controls, Graphics, Menus,
   JvComponent, JvConsts, JvTypes;
 
 type
@@ -176,7 +175,7 @@ type
 implementation
 
 uses
-  Forms, JvJVCLUtils, LCLIntf, LCLType, SysUtils;
+  Forms, JvJVCLUtils;
 
 (******************** NOT CONVERTED
 const
diff --git a/components/jvcllaz/run/JvValidators/jverrorindicator.pas b/components/jvcllaz/run/JvValidators/jverrorindicator.pas
index 404e7fad7..48607bda4 100644
--- a/components/jvcllaz/run/JvValidators/jverrorindicator.pas
+++ b/components/jvcllaz/run/JvValidators/jverrorindicator.pas
@@ -217,7 +217,6 @@ implementation
 
 uses
   //CommCtrl,
-  LCLProc,
   SysUtils,
   JvResources, JvJVCLUtils;
 
diff --git a/components/jvcllaz/run/JvWizard/jvwizard.pas b/components/jvcllaz/run/JvWizard/jvwizard.pas
index af96e682a..43ebd0f63 100644
--- a/components/jvcllaz/run/JvWizard/jvwizard.pas
+++ b/components/jvcllaz/run/JvWizard/jvwizard.pas
@@ -336,9 +336,8 @@ unit JvWizard;
 interface
 
 uses
-  SysUtils, Classes,
-  Controls, Forms, Graphics, Buttons, ImgList, Types,
-  LMessages, LCLType, LCLIntf, LCLVersion,
+  LCLType, LCLIntf, LCLVersion, LMessages,
+  SysUtils, Classes, Controls, Forms, Graphics, Buttons, ImgList, Types,
   JvWizardCommon, JvComponent;
 
 type
diff --git a/components/jvcllaz/run/JvWizard/jvwizardcommon.pas b/components/jvcllaz/run/JvWizard/jvwizardcommon.pas
index a7b5763ac..3ba7e283b 100644
--- a/components/jvcllaz/run/JvWizard/jvwizardcommon.pas
+++ b/components/jvcllaz/run/JvWizard/jvwizardcommon.pas
@@ -43,7 +43,7 @@ unit JvWizardCommon;
 interface
 
 uses
-  Controls, Graphics, Types, Classes, SysUtils, LCLIntf, LCLType,
+  LCLIntf, LCLType, SysUtils, Controls, Graphics, Types, Classes,
   JvResources;
 
 type
diff --git a/components/jvcllaz/run/JvXPCtrls/jvxpbar.pas b/components/jvcllaz/run/JvXPCtrls/jvxpbar.pas
index a349307dd..7bc6c6a67 100644
--- a/components/jvcllaz/run/JvXPCtrls/jvxpbar.pas
+++ b/components/jvcllaz/run/JvXPCtrls/jvxpbar.pas
@@ -51,7 +51,7 @@ unit JvXPBar;
 interface
 
 uses
-  LCLIntf, LCLProc, LCLType, LMessages, LResources,
+  LCLIntf, LCLType, LCLProc, LMessages, LResources,
   SysUtils, Classes, Controls, Graphics, ExtCtrls, Forms, ImgList, ActnList,
   JvXPCore, JvXPCoreUtils;
 
diff --git a/components/jvcllaz/run/JvXPCtrls/jvxpbuttons.pas b/components/jvcllaz/run/JvXPCtrls/jvxpbuttons.pas
index c9acc29af..46a78f763 100644
--- a/components/jvcllaz/run/JvXPCtrls/jvxpbuttons.pas
+++ b/components/jvcllaz/run/JvXPCtrls/jvxpbuttons.pas
@@ -31,7 +31,7 @@ unit JvXPButtons;
 interface
 
 uses
-  Classes, TypInfo, LCLIntf, LCLType, LCLProc, LMessages, Types, Graphics,
+  Classes, TypInfo, LCLIntf, LCLType, LMessages, Types, Graphics,
   Controls, Forms, ActnList, ImgList, Menus,
   JvXPCore, JvXPCoreUtils;
 
diff --git a/components/jvcllaz/run/JvXPCtrls/jvxpcheckctrls.pas b/components/jvcllaz/run/JvXPCtrls/jvxpcheckctrls.pas
index 842dc1302..8cec8db4e 100644
--- a/components/jvcllaz/run/JvXPCtrls/jvxpcheckctrls.pas
+++ b/components/jvcllaz/run/JvXPCtrls/jvxpcheckctrls.pas
@@ -33,7 +33,7 @@ unit JvXPCheckCtrls;
 interface
 
 uses
-  Classes, LCLIntf, LCLProc, LCLType, LResources, Graphics, Controls, StdCtrls,
+  Classes, LCLIntf, LCLType, LResources, Graphics, Controls, StdCtrls,
   JvXPCore, JvXPCoreUtils;
 
 type
diff --git a/components/jvcllaz/run/JvXPCtrls/jvxpcontainer.pas b/components/jvcllaz/run/JvXPCtrls/jvxpcontainer.pas
index df1b32d63..6137fba21 100644
--- a/components/jvcllaz/run/JvXPCtrls/jvxpcontainer.pas
+++ b/components/jvcllaz/run/JvXPCtrls/jvxpcontainer.pas
@@ -33,7 +33,7 @@ unit JvXPContainer;
 interface
 
 uses
-  LCLIntf, LCLProc, LCLType,
+  LCLIntf, LCLType,
   Types, TypInfo, Classes, Controls, Graphics, ExtCtrls,
   JvXPCore, JvXPCoreUtils;