diff --git a/lcl/interfaces/customdrawn/customdrawnint.pas b/lcl/interfaces/customdrawn/customdrawnint.pas
index 049453025d..0e75d3a6b1 100644
--- a/lcl/interfaces/customdrawn/customdrawnint.pas
+++ b/lcl/interfaces/customdrawn/customdrawnint.pas
@@ -38,7 +38,7 @@ uses
   {$endif}
   {$ifdef WinCE}aygshell,{$endif}
   // LazUtils
-  fileutil, lazutf8,
+  LazFileUtils, lazutf8,
   {$ifndef CD_UseNativeText}
   // LazFreeType
   LazFreeTypeIntfDrawer, LazFreeType, EasyLazFreeType, IniFiles,
diff --git a/lcl/interfaces/customdrawn/customdrawnproc.pas b/lcl/interfaces/customdrawn/customdrawnproc.pas
index be90956dcc..8176380a1a 100644
--- a/lcl/interfaces/customdrawn/customdrawnproc.pas
+++ b/lcl/interfaces/customdrawn/customdrawnproc.pas
@@ -10,7 +10,7 @@ uses
   Types, Classes, SysUtils,
   fpimage, fpcanvas, Math,
   // LazUtils
-  fileutil,
+  LazFileUtils,
   {$ifndef CD_UseNativeText}
   // LazFreeType
   TTTypes, LazFreeTypeIntfDrawer, LazFreeType, EasyLazFreeType, IniFiles,
@@ -534,8 +534,8 @@ begin
         lControlStateEx.Font := lWinControl.Font;
         lControlStateEx.Caption := lWinControl.Caption;
         lControlStateEx.ParentRGBColor := lWinControl.GetRGBColorResolvingParent();
-        GetDefaultDrawer().DrawGroupBox(lControlCanvas, Size(lWinControl.Width, lWinControl.Height),
-          [], lControlStateEx);
+        GetDefaultDrawer().DrawGroupBox(lControlCanvas, Point(0,0),
+          Size(lWinControl.Width, lWinControl.Height), [], lControlStateEx);
       finally
         lControlStateEx.Free;
         lControlCanvas.RestoreState(-1);
diff --git a/lcl/interfaces/customdrawn/customdrawnwinapi.inc b/lcl/interfaces/customdrawn/customdrawnwinapi.inc
index 90f8b9b40b..5dfbfce783 100644
--- a/lcl/interfaces/customdrawn/customdrawnwinapi.inc
+++ b/lcl/interfaces/customdrawn/customdrawnwinapi.inc
@@ -1136,7 +1136,7 @@ begin
         end
         else if (DFCS_BUTTONPUSH and uState) <> 0 then
         begin
-          GetDefaultDrawer().DrawButton(LazDC, lSize, lState, TCDButtonStateEx(lControlStateEx));
+          GetDefaultDrawer().DrawButton(LazDC, Point(0,0), lSize, lState, TCDButtonStateEx(lControlStateEx));
         end
         else if (DFCS_BUTTONRADIOIMAGE and uState) <> 0 then
         begin
diff --git a/lcl/interfaces/customdrawn/customdrawnwinapi_x11.inc b/lcl/interfaces/customdrawn/customdrawnwinapi_x11.inc
index f70a7c5e90..0f75e6e1d3 100644
--- a/lcl/interfaces/customdrawn/customdrawnwinapi_x11.inc
+++ b/lcl/interfaces/customdrawn/customdrawnwinapi_x11.inc
@@ -619,7 +619,7 @@ begin
   XFreeFontPath(lXFontPath);
 
   // Paths from the global config file
-  if FileUtil.FileExistsUTF8(GlobalFontsConfFile) then
+  if LazFileUtils.FileExistsUTF8(GlobalFontsConfFile) then
   begin
     try
       ReadXMLFile(Doc, GlobalFontsConfFile);