diff --git a/components/jvcllaz/run/JvCtrls/jvgroupheader.pas b/components/jvcllaz/run/JvCtrls/jvgroupheader.pas
index b893dfe59..9a16fbd26 100644
--- a/components/jvcllaz/run/JvCtrls/jvgroupheader.pas
+++ b/components/jvcllaz/run/JvCtrls/jvgroupheader.pas
@@ -25,7 +25,7 @@ interface
 
 uses
   LCLIntf, LCLType,
-  Classes, Graphics, Controls, ExtCtrls,
+  Types, Classes, Graphics, Controls, ExtCtrls,
   JvComponent, JvTypes;
 
 type
diff --git a/components/jvcllaz/run/JvCustomControls/jvimagelistviewer.pas b/components/jvcllaz/run/JvCustomControls/jvimagelistviewer.pas
index 8cd1264fc..129f7c793 100644
--- a/components/jvcllaz/run/JvCustomControls/jvimagelistviewer.pas
+++ b/components/jvcllaz/run/JvCustomControls/jvimagelistviewer.pas
@@ -30,7 +30,7 @@ interface
 
 uses
   LCLVersion,
-  SysUtils, Classes, Controls, Graphics, ComCtrls, ImgList,
+  SysUtils, Types, Classes, Controls, Graphics, ComCtrls, ImgList,
   JvCustomItemViewer;
 
 type
diff --git a/components/jvcllaz/run/JvHMI/jvled.pas b/components/jvcllaz/run/JvHMI/jvled.pas
index 665292c24..ef1277895 100644
--- a/components/jvcllaz/run/JvHMI/jvled.pas
+++ b/components/jvcllaz/run/JvHMI/jvled.pas
@@ -35,8 +35,7 @@ interface
 
 uses
   LCLIntf,
-  //Windows, Messages,
-  Controls, Forms, Graphics, ExtCtrls, Classes,
+  Types, Controls, Forms, Graphics, ExtCtrls, Classes,
   JvComponent;
 
 type
diff --git a/components/jvcllaz/run/JvNet/jvstrtohtml.pas b/components/jvcllaz/run/JvNet/jvstrtohtml.pas
index 98be18342..7ea7b865a 100644
--- a/components/jvcllaz/run/JvNet/jvstrtohtml.pas
+++ b/components/jvcllaz/run/JvNet/jvstrtohtml.pas
@@ -488,5 +488,32 @@ begin
   SetLength(Result, CurrPos-1);
 end;
 
+{<<<<<<<<<<<<<< NOT CONVERTED
+function CharToHtml(Ch: Char): string;
+var
+  I: Integer;
+  W: Word;
+begin
+  if (Ord(Ch) >= 128) or not (AnsiChar(Ch) in ['A'..'Z', 'a'..'z', '0'..'9', '_']) then
+  begin
+    W := Word(Ch);
+    {$IFNDEF UNICODE}
+    if (W < 128) or (MultiByteToWideChar(CP_ACP, MB_ERR_INVALID_CHARS, @Ch, 1, PWideChar(@W), 1) <> 0) then
+    {$ENDIF ~UNICODE}
+    begin
+      I := 0;
+      while (I < Length(Conversions)) and (Conversions[I].Ch <> W) do
+        Inc(I);
+      if I < Length(Conversions) then
+      begin
+        Result := Conversions[I].Html;
+        Exit;
+      end;
+    end;
+  end;
+  Result := Ch;
+end;
+>>>>>>>>>>>>>>>>>>> }
+
 end.
 
diff --git a/components/jvcllaz/run/JvPageComps/jvnavigationpane.pas b/components/jvcllaz/run/JvPageComps/jvnavigationpane.pas
index d6bc226c7..b385b80f8 100644
--- a/components/jvcllaz/run/JvPageComps/jvnavigationpane.pas
+++ b/components/jvcllaz/run/JvPageComps/jvnavigationpane.pas
@@ -48,7 +48,7 @@ interface
 
 uses
   LCLIntf, LCLType, LMessages,
-  SysUtils, Classes, Controls, ExtCtrls, Graphics, ImgList, JvButton, Menus,
+  SysUtils, Types, Classes, Controls, ExtCtrls, Graphics, ImgList, JvButton, Menus,
   JvComponent, JvExExtCtrls, JvPageList, JvTypes;
 
 const
diff --git a/components/jvcllaz/run/JvRuntimeDesign/jvdesignimp.pas b/components/jvcllaz/run/JvRuntimeDesign/jvdesignimp.pas
index 475b13e2c..82bc11f8e 100644
--- a/components/jvcllaz/run/JvRuntimeDesign/jvdesignimp.pas
+++ b/components/jvcllaz/run/JvRuntimeDesign/jvdesignimp.pas
@@ -6,7 +6,7 @@ interface
 
 uses
   LCLProc, LCLType, LResources, LCLIntf, LMessages,
-  SysUtils, Classes, Controls, Graphics, Forms, ExtCtrls, Contnrs,
+  SysUtils, Types, Classes, Controls, Graphics, Forms, ExtCtrls, Contnrs,
   JvDesignUtils, JvDesignSurface;
 
 const
diff --git a/components/jvcllaz/run/JvStdCtrls/jvbutton.pas b/components/jvcllaz/run/JvStdCtrls/jvbutton.pas
index 878f5b2ca..0adc21078 100644
--- a/components/jvcllaz/run/JvStdCtrls/jvbutton.pas
+++ b/components/jvcllaz/run/JvStdCtrls/jvbutton.pas
@@ -35,7 +35,7 @@ interface
 
 uses
   LMessages,
-  Classes, Controls, Graphics, Menus,
+  Classes, Types, Controls, Graphics, Menus,
   JvComponent, JvConsts, JvTypes;
 
 type
diff --git a/components/jvcllaz/run/JvTimeFramework/jvtfglancetextviewer.pas b/components/jvcllaz/run/JvTimeFramework/jvtfglancetextviewer.pas
index 32fe4e454..c0b81c827 100644
--- a/components/jvcllaz/run/JvTimeFramework/jvtfglancetextviewer.pas
+++ b/components/jvcllaz/run/JvTimeFramework/jvtfglancetextviewer.pas
@@ -32,7 +32,7 @@ interface
 
 uses
   LCLIntf, LCLType, LMessages,
-  SysUtils, Classes, Graphics, Controls, Forms, Dialogs, StdCtrls,
+  SysUtils, Types, Classes, Graphics, Controls, Forms, Dialogs, StdCtrls,
   JvComponent,
   JvTFManager, JvTFGlance, JvTFUtils;
 
diff --git a/components/jvcllaz/run/JvTimeFramework/jvtfmanager.pas b/components/jvcllaz/run/JvTimeFramework/jvtfmanager.pas
index ac537e94c..da7e98307 100644
--- a/components/jvcllaz/run/JvTimeFramework/jvtfmanager.pas
+++ b/components/jvcllaz/run/JvTimeFramework/jvtfmanager.pas
@@ -32,7 +32,7 @@ interface
 
 uses
   LCLIntf, LCLType,
-  Classes, SysUtils, Controls,
+  Classes, SysUtils, Types, Controls,
   Graphics, ImgList, ExtCtrls, Printers, Forms,
   //JvComponentBase,
   JvComponent, JvTypes, JvTFUtils;
diff --git a/components/jvcllaz/run/JvValidators/jverrorindicator.pas b/components/jvcllaz/run/JvValidators/jverrorindicator.pas
index febbd6521..404e7fad7 100644
--- a/components/jvcllaz/run/JvValidators/jverrorindicator.pas
+++ b/components/jvcllaz/run/JvValidators/jverrorindicator.pas
@@ -41,7 +41,7 @@ unit JvErrorIndicator;
 interface
 
 uses
-  Classes, Graphics, Controls, ImgList;
+  Classes, Graphics, Types, Controls, ImgList;
 
 type
   IJvErrorIndicatorClient = interface;
diff --git a/components/jvcllaz/run/JvWizard/jvwizardroutemapnodes.pas b/components/jvcllaz/run/JvWizard/jvwizardroutemapnodes.pas
index 677a3e12f..25b81c2cf 100644
--- a/components/jvcllaz/run/JvWizard/jvwizardroutemapnodes.pas
+++ b/components/jvcllaz/run/JvWizard/jvwizardroutemapnodes.pas
@@ -44,7 +44,8 @@ unit JvWizardRouteMapNodes;
 interface
 
 uses
-  Graphics, Classes, Controls, LCLIntf, LCLType,
+  LCLIntf, LCLType,
+  Graphics, Types, Classes, Controls,
   JvWizard;
 
 type
diff --git a/components/jvcllaz/run/JvWizard/jvwizardroutemapsteps.pas b/components/jvcllaz/run/JvWizard/jvwizardroutemapsteps.pas
index 679314ecd..31a1f1e7f 100644
--- a/components/jvcllaz/run/JvWizard/jvwizardroutemapsteps.pas
+++ b/components/jvcllaz/run/JvWizard/jvwizardroutemapsteps.pas
@@ -36,7 +36,8 @@ unit JvWizardRouteMapSteps;
 interface
 
 uses
-  SysUtils, Classes, Graphics, Controls, Forms, LCLIntf, LCLType,
+  LCLIntf, LCLType,
+  SysUtils, Types, Classes, Graphics, Controls, Forms,
   JvWizard;
 
 type
diff --git a/components/jvcllaz/run/JvXPCtrls/jvxpcontainer.pas b/components/jvcllaz/run/JvXPCtrls/jvxpcontainer.pas
index 95edce2f5..df1b32d63 100644
--- a/components/jvcllaz/run/JvXPCtrls/jvxpcontainer.pas
+++ b/components/jvcllaz/run/JvXPCtrls/jvxpcontainer.pas
@@ -34,7 +34,7 @@ interface
 
 uses
   LCLIntf, LCLProc, LCLType,
-  TypInfo, Classes, Controls, Graphics, ExtCtrls,
+  Types, TypInfo, Classes, Controls, Graphics, ExtCtrls,
   JvXPCore, JvXPCoreUtils;
 
 type
diff --git a/components/jvcllaz/run/JvXPCtrls/jvxpcoreutils.pas b/components/jvcllaz/run/JvXPCtrls/jvxpcoreutils.pas
index 93e69d382..4f11ca6ac 100644
--- a/components/jvcllaz/run/JvXPCtrls/jvxpcoreutils.pas
+++ b/components/jvcllaz/run/JvXPCtrls/jvxpcoreutils.pas
@@ -35,7 +35,7 @@ interface
 
 uses
   LCLIntf, LCLType, SysUtils,
-  Classes, Controls, Graphics, TypInfo,
+  Types, Classes, Controls, Graphics, TypInfo,
   JvXPCore;
 
 function JvXPMethodsEqual(const Method1, Method2: TMethod): Boolean;
diff --git a/components/mbColorLib/mbColorPalette.pas b/components/mbColorLib/mbColorPalette.pas
index b9166f22b..a815b3bc7 100644
--- a/components/mbColorLib/mbColorPalette.pas
+++ b/components/mbColorLib/mbColorPalette.pas
@@ -6,8 +6,8 @@ unit mbColorPalette;
 interface
 
 uses
-  LCLIntf, LCLType, LMessages, SysUtils, Classes, Controls, Graphics,
-  Forms, Dialogs, Themes,
+  LCLIntf, LCLType, LMessages,
+  SysUtils, Classes, Types, Controls, Graphics, Forms, Dialogs, Themes,
   HTMLColors, PalUtils, mbBasicPicker;
 
 type
diff --git a/components/tvplanit/source/vpbasepainter.pas b/components/tvplanit/source/vpbasepainter.pas
index 272546fe2..0faa14352 100644
--- a/components/tvplanit/source/vpbasepainter.pas
+++ b/components/tvplanit/source/vpbasepainter.pas
@@ -3,7 +3,7 @@ unit VpBasePainter;
 interface
 
 uses
-  Classes, Graphics, LCLType,
+  Classes, Types, Graphics, LCLType,
   VPBase;
 
 type
diff --git a/components/tvplanit/source/vpcalendarpainter.pas b/components/tvplanit/source/vpcalendarpainter.pas
index 221074215..8194074a8 100644
--- a/components/tvplanit/source/vpcalendarpainter.pas
+++ b/components/tvplanit/source/vpcalendarpainter.pas
@@ -5,7 +5,7 @@ unit VpCalendarPainter;
 interface
 
 uses
-  SysUtils, Classes, Graphics, Controls,
+  SysUtils, Classes, Types, Graphics, Controls,
   VpBase, VpMisc, VpBasePainter, VpCalendar;
 
 type
diff --git a/components/tvplanit/source/vpmisc.pas b/components/tvplanit/source/vpmisc.pas
index 106d89d94..d6c94b338 100644
--- a/components/tvplanit/source/vpmisc.pas
+++ b/components/tvplanit/source/vpmisc.pas
@@ -39,7 +39,7 @@ uses
   {$ELSE}
   Windows, Consts, Messages,
   {$ENDIF}
-  SysUtils, Buttons, Classes, Controls, StdCtrls, ExtCtrls, Forms, Graphics, Menus,
+  SysUtils, Graphics, Types, Classes, Controls, StdCtrls, ExtCtrls, Buttons, Forms, Menus,
   VpBase, VpData, VpConst;
 
 type
diff --git a/components/tvplanit/source/vpnavbarpainter.pas b/components/tvplanit/source/vpnavbarpainter.pas
index faa19aa28..610a57787 100644
--- a/components/tvplanit/source/vpnavbarpainter.pas
+++ b/components/tvplanit/source/vpnavbarpainter.pas
@@ -10,7 +10,7 @@ uses
   {$ELSE}
   Windows, Messages, MMSystem,
   {$ENDIF}
-  Graphics, Classes, SysUtils, Controls, Buttons,
+  Graphics, Types, Classes, SysUtils, Controls, Buttons,
   VpNavBar;
 
 type