diff --git a/components/jvcllaz/run/JvCore/JvExControls.pas b/components/jvcllaz/run/JvCore/JvExControls.pas
index e27101fc5..18c4bcccc 100644
--- a/components/jvcllaz/run/JvCore/JvExControls.pas
+++ b/components/jvcllaz/run/JvCore/JvExControls.pas
@@ -44,7 +44,7 @@ unit JvExControls;
 interface
 
 uses
-  Classes, types, Controls, Graphics, LCLIntf, LCLType, LMessages, Forms,
+  Classes, Controls, Graphics, LCLIntf, LCLType, LMessages, types, Forms,
   JvTypes;
 
 type
@@ -52,14 +52,14 @@ type
    (dcWantAllKeys, dcWantArrows, dcWantChars, dcButton, dcHasSetSel, dcWantTab,
     dcNative); // if dcNative is in the set the native allowed keys are used and GetDlgCode is ignored
   TDlgCodes = set of TDlgCode;
-
+                 (*
  {$IFDEF WINDOWS}
   TSmallPoint = Types.TSmallPoint;
  {$ENDIF}
  {$IFDEF LINUX}
   TSmallPoint = Classes.TSmallPoint;
  {$ENDIF}
-
+                   *)
 (******************** NOT CONVERTED
 const
   dcWantMessage = dcWantAllKeys;
@@ -664,8 +664,12 @@ begin
 end;
 
 function TJvExGraphicControl.HitTest(X, Y: Integer): Boolean;
+var
+  pt: Types.TSmallPoint;
 begin
-  Result := BaseWndProc(CM_HITTEST, 0, SmallPointToLong(PointToSmallPoint(Point(X, Y)))) <> 0;
+  pt.X := X;
+  pt.Y := Y;
+  Result := BaseWndProc(CM_HITTEST, 0, SmallPointToLong(pt)) <> 0;
 end;
 
 function TJvExGraphicControl.HintShow(var HintInfo: THintInfo): Boolean;
@@ -849,8 +853,12 @@ begin
 end;
 
 function TJvExCustomControl.HitTest(X, Y: Integer): Boolean;
+var
+  pt: Types.TSmallPoint;
 begin
-  Result := BaseWndProc(CM_HITTEST, 0, SmallPointToLong(PointToSmallPoint(Point(X, Y)))) <> 0;
+  pt.X := X;
+  pt.Y := Y;
+  Result := BaseWndProc(CM_HITTEST, 0, SmallPointToLong(pt)) <> 0;
 end;
 
 function TJvExCustomControl.HintShow(var HintInfo: THintInfo): Boolean;
diff --git a/components/jvcllaz/run/JvCore/JvExExtCtrls.pas b/components/jvcllaz/run/JvCore/JvExExtCtrls.pas
index b70f641f0..e46143a1b 100644
--- a/components/jvcllaz/run/JvCore/JvExExtCtrls.pas
+++ b/components/jvcllaz/run/JvCore/JvExExtCtrls.pas
@@ -153,6 +153,9 @@ type
 
 implementation
 
+uses
+  Types;
+
 //******************** NOT CONVERTED
 //CONTROL_IMPL_DEFAULT(Shape)
 
@@ -293,8 +296,12 @@ begin
 end;
 
 function TJvExSplitter.HitTest(X, Y: Integer): Boolean;
+var
+  pt: Types.TSmallPoint;
 begin
-  Result := BaseWndProc(CM_HITTEST, 0, SmallPointToLong(PointToSmallPoint(Point(X, Y)))) <> 0;
+  pt.X := X;
+  pt.Y := Y;
+  Result := BaseWndProc(CM_HITTEST, 0, SmallPointToLong(pt)) <> 0;
 end;
 
 function TJvExSplitter.HintShow(var HintInfo: THintInfo): Boolean;
diff --git a/components/jvcllaz/run/JvCore/JvJVCLUtils.pas b/components/jvcllaz/run/JvCore/JvJVCLUtils.pas
index 646174ebc..4677ba3e2 100644
--- a/components/jvcllaz/run/JvCore/JvJVCLUtils.pas
+++ b/components/jvcllaz/run/JvCore/JvJVCLUtils.pas
@@ -34,11 +34,11 @@ unit JvJVCLUtils;
 interface
 
 uses
- {$IFDEF WIN32}
-  Windows,
- {$ENDIF}
-  Classes, Graphics, Controls, ImgList,
+  {$IFDEF WIN32}
+   Windows,                 // before Types!
+  {$ENDIF}
   LCLType, LCLProc, LMessages, Types,
+  Classes, Graphics, Controls, ImgList,
   JvTypes;
 
 (******************** NOT CONVERTED