diff --git a/components/lazutils/fileutil.inc b/components/lazutils/fileutil.inc
index 50e77cc84a..a8899c8238 100644
--- a/components/lazutils/fileutil.inc
+++ b/components/lazutils/fileutil.inc
@@ -54,6 +54,11 @@ begin
   Result := LazFileUtils.FileExistsUTF8(FileName);
 end;
 
+function DirectoryExistsUTF8(const Directory: string): Boolean; inline;
+begin
+  Result := LazFileUtils.DirectoryExistsUTF8(Directory);
+end;
+
 {$IFDEF darwin}
 function GetDarwinSystemFilename(Filename: string): string;
 var
diff --git a/components/lazutils/fileutil.pas b/components/lazutils/fileutil.pas
index a854dbaee1..db08de4d92 100644
--- a/components/lazutils/fileutil.pas
+++ b/components/lazutils/fileutil.pas
@@ -215,7 +215,7 @@ function UTF8ToConsole(const s: string): string;// converts UTF8 string to conso
 // file operations
 function FileExistsUTF8(const Filename: string): boolean; inline;
 function FileAgeUTF8(const FileName: string): Longint;
-function DirectoryExistsUTF8(const Directory: string): Boolean;
+function DirectoryExistsUTF8(const Directory: string): Boolean; inline;
 function ExpandFileNameUTF8(const FileName: string): string; inline;
 function ExpandUNCFileNameUTF8(const FileName: string): string;
 function ExtractShortPathNameUTF8(Const FileName : String) : String;
diff --git a/components/lazutils/unixfileutil.inc b/components/lazutils/unixfileutil.inc
index 16d12a9dc4..d8e9b582bd 100644
--- a/components/lazutils/unixfileutil.inc
+++ b/components/lazutils/unixfileutil.inc
@@ -366,11 +366,6 @@ begin
   Result:=SysUtils.RemoveDir(UTF8ToSys(Dir));
 end;
 
-function DirectoryExistsUTF8(const Directory: string): Boolean;
-begin
-  Result:=SysUtils.DirectoryExists(UTF8ToSys(Directory));
-end;
-
 
 function ExtractShortPathNameUTF8(const FileName: String): String;
 begin
diff --git a/components/lazutils/winfileutil.inc b/components/lazutils/winfileutil.inc
index 886e6b1aea..6e7390efae 100644
--- a/components/lazutils/winfileutil.inc
+++ b/components/lazutils/winfileutil.inc
@@ -624,16 +624,7 @@ end;
 
 
 
-function DirectoryExistsUTF8(const Directory: string): boolean;
-var
-  Attr: Longint;
-begin
-  Attr:=FileGetAttrUTF8(Directory);
-  if Attr <> -1 then
-    Result:= (Attr and FILE_ATTRIBUTE_DIRECTORY) > 0
-  else
-    Result:=False;
-end;
+