diff --git a/components/lazutils/fpmake.pp b/components/lazutils/fpmake.pp
index 19c6f5af3c..492eb5b98a 100644
--- a/components/lazutils/fpmake.pp
+++ b/components/lazutils/fpmake.pp
@@ -1,9 +1,10 @@
 {
    File generated automatically by Lazarus Package Manager
+   Created with the Fppkgpackagemanager package installed
 
    fpmake.pp for LazUtils 1.0
 
-   This file was generated on 21.12.2020
+   This file was generated on 27-08-21
 }
 
 {$ifndef ALLPACKAGES} 
@@ -43,137 +44,152 @@ begin
     P.Options.Add('-gl');
     P.Options.Add('-l');
     P.Options.Add('-vewnhibq');
+    P.Options.Add('-dFASTCGI_STDIN');
     P.UnitPath.Add('.');
+    D := P.Dependencies.Add('winunits-base');
+    D.OSes := AllWindowsOSes;
     T:=P.Targets.AddUnit('lazutils.pas');
-    t.Dependencies.AddUnit('avglvltree');
-    t.Dependencies.AddUnit('codepagesasian');
-    t.Dependencies.AddUnit('codepagescommon');
-    t.Dependencies.AddUnit('compwriterpas');
-    t.Dependencies.AddUnit('dynamicarray');
-    t.Dependencies.AddUnit('dynhasharray');
-    t.Dependencies.AddUnit('dynqueue');
-    t.Dependencies.AddUnit('extendedstrings');
-    t.Dependencies.AddUnit('filereferencelist');
-    t.Dependencies.AddUnit('fileutil');
-    t.Dependencies.AddUnit('fpcadds');
-    t.Dependencies.AddUnit('graphmath');
-    t.Dependencies.AddUnit('graphtype');
-    t.Dependencies.AddUnit('html2textrender');
-    t.Dependencies.AddUnit('integerlist');
-    t.Dependencies.AddUnit('laz2_dom');
-    t.Dependencies.AddUnit('laz2_xmlcfg');
-    t.Dependencies.AddUnit('laz2_xmlread');
-    t.Dependencies.AddUnit('laz2_xmlutils');
-    t.Dependencies.AddUnit('laz2_xmlwrite');
-    t.Dependencies.AddUnit('laz2_xpath');
-    t.Dependencies.AddUnit('laz_avl_tree');
-    t.Dependencies.AddUnit('laz_dom');
-    t.Dependencies.AddUnit('laz_xmlcfg');
-    t.Dependencies.AddUnit('laz_xmlread');
-    t.Dependencies.AddUnit('laz_xmlstreaming');
-    t.Dependencies.AddUnit('laz_xmlwrite');
-    t.Dependencies.AddUnit('lazclasses');
-    t.Dependencies.AddUnit('lazcollections');
-    t.Dependencies.AddUnit('lazconfigstorage');
-    t.Dependencies.AddUnit('lazdbglog');
-    t.Dependencies.AddUnit('lazfglhash');
-    t.Dependencies.AddUnit('lazfilecache');
-    t.Dependencies.AddUnit('lazfileutils');
-    t.Dependencies.AddUnit('lazlinkedlist');
-    t.Dependencies.AddUnit('lazlistclasses');
-    t.Dependencies.AddUnit('lazlogger');
-    t.Dependencies.AddUnit('lazloggerbase');
-    t.Dependencies.AddUnit('lazloggerdummy');
-    t.Dependencies.AddUnit('lazloggerprofiling');
-    t.Dependencies.AddUnit('lazmethodlist');
-    t.Dependencies.AddUnit('lazpasreadutil');
-    t.Dependencies.AddUnit('lazstringutils');
-    t.Dependencies.AddUnit('lazsysutils');
-    t.Dependencies.AddUnit('laztracer');
-    t.Dependencies.AddUnit('lazunicode');
-    t.Dependencies.AddUnit('lazutf16');
-    t.Dependencies.AddUnit('lazutf8');
-    t.Dependencies.AddUnit('lazutf8classes');
-    t.Dependencies.AddUnit('lazutf8sysutils');
-    t.Dependencies.AddUnit('lazutilities');
-    t.Dependencies.AddUnit('lazutilsstrconsts');
-    t.Dependencies.AddUnit('lazversion');
-    t.Dependencies.AddUnit('lconvencoding');
-    t.Dependencies.AddUnit('lcsvutils');
-    t.Dependencies.AddUnit('lookupstringlist');
-    t.Dependencies.AddUnit('maps');
-    t.Dependencies.AddUnit('masks');
-    t.Dependencies.AddUnit('objectlists');
-    t.Dependencies.AddUnit('stringhashlist');
-    t.Dependencies.AddUnit('textstrings');
-    t.Dependencies.AddUnit('translations');
-    t.Dependencies.AddUnit('uitypes');
-    t.Dependencies.AddUnit('utf8process');
-
-    T:=P.Targets.AddUnit('avglvltree.pas');
-    T:=P.Targets.AddUnit('codepagesasian.pas');
-    T:=P.Targets.AddUnit('codepagescommon.pas');
-    T:=P.Targets.AddUnit('compwriterpas.pas');
-    T:=P.Targets.AddUnit('dynamicarray.pas');
-    T:=P.Targets.AddUnit('dynhasharray.pp');
-    T:=P.Targets.AddUnit('dynqueue.pas');
-    T:=P.Targets.AddUnit('extendedstrings.pas');
-    T:=P.Targets.AddUnit('filereferencelist.pas');
-    T:=P.Targets.AddUnit('fileutil.pas');
-    T:=P.Targets.AddUnit('fpcadds.pas');
-    T:=P.Targets.AddUnit('graphmath.pp');
-    T:=P.Targets.AddUnit('graphtype.pp');
-    T:=P.Targets.AddUnit('html2textrender.pas');
-    T:=P.Targets.AddUnit('integerlist.pas');
-    T:=P.Targets.AddUnit('laz2_dom.pas');
-    T:=P.Targets.AddUnit('laz2_xmlcfg.pas');
-    T:=P.Targets.AddUnit('laz2_xmlread.pas');
-    T:=P.Targets.AddUnit('laz2_xmlutils.pas');
-    T:=P.Targets.AddUnit('laz2_xmlwrite.pas');
-    T:=P.Targets.AddUnit('laz2_xpath.pas');
-    T:=P.Targets.AddUnit('laz_avl_tree.pp');
-    T:=P.Targets.AddUnit('laz_dom.pas');
-    T:=P.Targets.AddUnit('laz_xmlcfg.pas');
-    T:=P.Targets.AddUnit('laz_xmlread.pas');
-    T:=P.Targets.AddUnit('laz_xmlstreaming.pas');
-    T:=P.Targets.AddUnit('laz_xmlwrite.pas');
-    T:=P.Targets.AddUnit('lazclasses.pas');
-    T:=P.Targets.AddUnit('lazcollections.pas');
-    T:=P.Targets.AddUnit('lazconfigstorage.pas');
-    T:=P.Targets.AddUnit('lazdbglog.pas');
-    T:=P.Targets.AddUnit('lazfglhash.pas');
-    T:=P.Targets.AddUnit('lazfilecache.pas');
-    T:=P.Targets.AddUnit('lazfileutils.pas');
-    T:=P.Targets.AddUnit('lazlinkedlist.pas');
-    T:=P.Targets.AddUnit('lazlistclasses.pas');
-    T:=P.Targets.AddUnit('lazlogger.pas');
-    T:=P.Targets.AddUnit('lazloggerbase.pas');
-    T:=P.Targets.AddUnit('lazloggerdummy.pas');
-    T:=P.Targets.AddUnit('lazloggerprofiling.pas');
-    T:=P.Targets.AddUnit('lazmethodlist.pas');
-    T:=P.Targets.AddUnit('lazpasreadutil.pas');
-    T:=P.Targets.AddUnit('lazstringutils.pas');
-    T:=P.Targets.AddUnit('lazsysutils.pas');
-    T:=P.Targets.AddUnit('laztracer.pas');
-    T:=P.Targets.AddUnit('lazunicode.pas');
-    T:=P.Targets.AddUnit('lazutf16.pas');
-    T:=P.Targets.AddUnit('lazutf8.pas');
-    T:=P.Targets.AddUnit('lazutf8classes.pas');
-    T:=P.Targets.AddUnit('lazutf8sysutils.pas');
-    T:=P.Targets.AddUnit('lazutilities.pas');
-    T:=P.Targets.AddUnit('lazutilsstrconsts.pas');
-    T:=P.Targets.AddUnit('lazversion.pas');
-    T:=P.Targets.AddUnit('lconvencoding.pas');
-    T:=P.Targets.AddUnit('lcsvutils.pas');
-    T:=P.Targets.AddUnit('lookupstringlist.pas');
-    T:=P.Targets.AddUnit('maps.pp');
-    T:=P.Targets.AddUnit('masks.pas');
-    T:=P.Targets.AddUnit('objectlists.pas');
-    T:=P.Targets.AddUnit('stringhashlist.pas');
-    T:=P.Targets.AddUnit('textstrings.pas');
-    T:=P.Targets.AddUnit('translations.pas');
-    T:=P.Targets.AddUnit('uitypes.pas');
-    T:=P.Targets.AddUnit('utf8process.pp');
+    D := T.Dependencies.AddInclude('LazLoggerImpl.inc');
+    D := T.Dependencies.AddInclude('LazLoggerIntf.inc');
+    D := T.Dependencies.AddInclude('asiancodepagefunctions.inc');
+    D := T.Dependencies.AddUnit('AvgLvlTree');
+    D := T.Dependencies.AddUnit('CodepagesAsian');
+    D := T.Dependencies.AddUnit('CodepagesCommon');
+    D := T.Dependencies.AddUnit('CompWriterPas');
+    D := T.Dependencies.AddUnit('DynamicArray');
+    D := T.Dependencies.AddUnit('DynHashArray');
+    D := T.Dependencies.AddUnit('DynQueue');
+    D := T.Dependencies.AddUnit('ExtendedStrings');
+    D := T.Dependencies.AddUnit('FileReferenceList');
+    D := T.Dependencies.AddUnit('FileUtil');
+    D := T.Dependencies.AddInclude('fileutil.inc');
+    D := T.Dependencies.AddUnit('FPCAdds');
+    D := T.Dependencies.AddUnit('GraphMath');
+    D := T.Dependencies.AddUnit('GraphType');
+    D := T.Dependencies.AddUnit('HTML2TextRender');
+    D := T.Dependencies.AddUnit('IntegerList');
+    D := T.Dependencies.AddUnit('Laz2_DOM');
+    D := T.Dependencies.AddInclude('laz2_names.inc');
+    D := T.Dependencies.AddUnit('Laz2_XMLCfg');
+    D := T.Dependencies.AddUnit('laz2_XMLRead');
+    D := T.Dependencies.AddUnit('laz2_xmlutils');
+    D := T.Dependencies.AddUnit('laz2_XMLWrite');
+    D := T.Dependencies.AddUnit('laz2_xpath');
+    D := T.Dependencies.AddUnit('Laz_AVL_Tree');
+    D := T.Dependencies.AddUnit('Laz_DOM');
+    D := T.Dependencies.AddUnit('Laz_XMLCfg');
+    D := T.Dependencies.AddUnit('Laz_XMLRead');
+    D := T.Dependencies.AddUnit('Laz_XMLStreaming');
+    D := T.Dependencies.AddUnit('Laz_XMLWrite');
+    D := T.Dependencies.AddUnit('LazClasses');
+    D := T.Dependencies.AddUnit('lazCollections');
+    D := T.Dependencies.AddUnit('LazConfigStorage');
+    D := T.Dependencies.AddUnit('LazDbgLog');
+    D := T.Dependencies.AddUnit('LazFglHash');
+    D := T.Dependencies.AddUnit('LazFileCache');
+    D := T.Dependencies.AddUnit('LazFileUtils');
+    D := T.Dependencies.AddInclude('lazfileutils.inc');
+    D := T.Dependencies.AddUnit('LazLinkedList');
+    D := T.Dependencies.AddUnit('LazListClasses');
+    D := T.Dependencies.AddUnit('LazLogger');
+    D := T.Dependencies.AddUnit('LazLoggerBase');
+    D := T.Dependencies.AddUnit('LazLoggerDummy');
+    D := T.Dependencies.AddUnit('LazLoggerProfiling');
+    D := T.Dependencies.AddUnit('LazMethodList');
+    D := T.Dependencies.AddUnit('LazPasReadUtil');
+    D := T.Dependencies.AddUnit('LazStringUtils');
+    D := T.Dependencies.AddUnit('LazSysUtils');
+    D := T.Dependencies.AddUnit('LazTracer');
+    D := T.Dependencies.AddUnit('LazUnicode');
+    D := T.Dependencies.AddUnit('LazUTF16');
+    D := T.Dependencies.AddUnit('LazUTF8');
+    D := T.Dependencies.AddUnit('LazUTF8Classes');
+    D := T.Dependencies.AddUnit('LazUTF8SysUtils');
+    D := T.Dependencies.AddUnit('LazUtilities');
+    D := T.Dependencies.AddInclude('lazutils_defines.inc');
+    D := T.Dependencies.AddUnit('LazUtilsStrConsts');
+    D := T.Dependencies.AddUnit('LazVersion');
+    D := T.Dependencies.AddUnit('LConvEncoding');
+    D := T.Dependencies.AddUnit('lcsvutils');
+    D := T.Dependencies.AddUnit('LookupStringList');
+    D := T.Dependencies.AddUnit('Maps');
+    D := T.Dependencies.AddUnit('Masks');
+    D := T.Dependencies.AddUnit('ObjectLists');
+    D := T.Dependencies.AddUnit('StringHashList');
+    D := T.Dependencies.AddUnit('TextStrings');
+    D := T.Dependencies.AddUnit('Translations');
+    D := T.Dependencies.AddUnit('UITypes');
+    D := T.Dependencies.AddInclude('unixfileutil.inc');
+    D := T.Dependencies.AddInclude('unixlazfileutils.inc');
+    D := T.Dependencies.AddInclude('unixlazutf8.inc');
+    D := T.Dependencies.AddUnit('UTF8Process');
+    D := T.Dependencies.AddInclude('winfileutil.inc');
+    D := T.Dependencies.AddInclude('winlazfileutils.inc');
+    D := T.Dependencies.AddInclude('winlazutf8.inc');
+    T := P.Targets.AddImplicitUnit('avglvltree.pas');
+    T := P.Targets.AddImplicitUnit('codepagesasian.pas');
+    T := P.Targets.AddImplicitUnit('codepagescommon.pas');
+    T := P.Targets.AddImplicitUnit('compwriterpas.pas');
+    T := P.Targets.AddImplicitUnit('dynamicarray.pas');
+    T := P.Targets.AddImplicitUnit('dynhasharray.pp');
+    T := P.Targets.AddImplicitUnit('dynqueue.pas');
+    T := P.Targets.AddImplicitUnit('extendedstrings.pas');
+    T := P.Targets.AddImplicitUnit('filereferencelist.pas');
+    T := P.Targets.AddImplicitUnit('fileutil.pas');
+    T := P.Targets.AddImplicitUnit('fpcadds.pas');
+    T := P.Targets.AddImplicitUnit('graphmath.pp');
+    T := P.Targets.AddImplicitUnit('graphtype.pp');
+    T := P.Targets.AddImplicitUnit('html2textrender.pas');
+    T := P.Targets.AddImplicitUnit('integerlist.pas');
+    T := P.Targets.AddImplicitUnit('laz2_dom.pas');
+    T := P.Targets.AddImplicitUnit('laz2_xmlcfg.pas');
+    T := P.Targets.AddImplicitUnit('laz2_xmlread.pas');
+    T := P.Targets.AddImplicitUnit('laz2_xmlutils.pas');
+    T := P.Targets.AddImplicitUnit('laz2_xmlwrite.pas');
+    T := P.Targets.AddImplicitUnit('laz2_xpath.pas');
+    T := P.Targets.AddImplicitUnit('laz_avl_tree.pp');
+    T := P.Targets.AddImplicitUnit('laz_dom.pas');
+    T := P.Targets.AddImplicitUnit('laz_xmlcfg.pas');
+    T := P.Targets.AddImplicitUnit('laz_xmlread.pas');
+    T := P.Targets.AddImplicitUnit('laz_xmlstreaming.pas');
+    T := P.Targets.AddImplicitUnit('laz_xmlwrite.pas');
+    T := P.Targets.AddImplicitUnit('lazclasses.pas');
+    T := P.Targets.AddImplicitUnit('lazcollections.pas');
+    T := P.Targets.AddImplicitUnit('lazconfigstorage.pas');
+    T := P.Targets.AddImplicitUnit('lazdbglog.pas');
+    T := P.Targets.AddImplicitUnit('lazfglhash.pas');
+    T := P.Targets.AddImplicitUnit('lazfilecache.pas');
+    T := P.Targets.AddImplicitUnit('lazfileutils.pas');
+    T := P.Targets.AddImplicitUnit('lazlinkedlist.pas');
+    T := P.Targets.AddImplicitUnit('lazlistclasses.pas');
+    T := P.Targets.AddImplicitUnit('lazlogger.pas');
+    T := P.Targets.AddImplicitUnit('lazloggerbase.pas');
+    T := P.Targets.AddImplicitUnit('lazloggerdummy.pas');
+    T := P.Targets.AddImplicitUnit('lazloggerprofiling.pas');
+    T := P.Targets.AddImplicitUnit('lazmethodlist.pas');
+    T := P.Targets.AddImplicitUnit('lazpasreadutil.pas');
+    T := P.Targets.AddImplicitUnit('lazstringutils.pas');
+    T := P.Targets.AddImplicitUnit('lazsysutils.pas');
+    T := P.Targets.AddImplicitUnit('laztracer.pas');
+    T := P.Targets.AddImplicitUnit('lazunicode.pas');
+    T := P.Targets.AddImplicitUnit('lazutf16.pas');
+    T := P.Targets.AddImplicitUnit('lazutf8.pas');
+    T := P.Targets.AddImplicitUnit('lazutf8classes.pas');
+    T := P.Targets.AddImplicitUnit('lazutf8sysutils.pas');
+    T := P.Targets.AddImplicitUnit('lazutilities.pas');
+    T := P.Targets.AddImplicitUnit('lazutilsstrconsts.pas');
+    T := P.Targets.AddImplicitUnit('lazversion.pas');
+    T := P.Targets.AddImplicitUnit('lconvencoding.pas');
+    T := P.Targets.AddImplicitUnit('lcsvutils.pas');
+    T := P.Targets.AddImplicitUnit('lookupstringlist.pas');
+    T := P.Targets.AddImplicitUnit('maps.pp');
+    T := P.Targets.AddImplicitUnit('masks.pas');
+    T := P.Targets.AddImplicitUnit('objectlists.pas');
+    T := P.Targets.AddImplicitUnit('stringhashlist.pas');
+    T := P.Targets.AddImplicitUnit('textstrings.pas');
+    T := P.Targets.AddImplicitUnit('translations.pas');
+    T := P.Targets.AddImplicitUnit('uitypes.pas');
+    T := P.Targets.AddImplicitUnit('utf8process.pp');
 
     // copy the compiled file, so the IDE knows how the package was compiled
     P.Sources.AddSrc('LazUtils.compiled');
diff --git a/components/lazutils/lazutils.lpk b/components/lazutils/lazutils.lpk
index 8068635fe6..6fe207a5be 100644
--- a/components/lazutils/lazutils.lpk
+++ b/components/lazutils/lazutils.lpk
@@ -176,7 +176,7 @@
       </Item>
       <Item>
         <Filename Value="lazfglhash.pas"/>
-        <UnitName Value="lazfglhash"/>
+        <UnitName Value="LazFglHash"/>
       </Item>
       <Item>
         <Filename Value="lazfilecache.pas"/>
@@ -359,8 +359,17 @@
     <PublishOptions>
       <Version Value="2"/>
     </PublishOptions>
-    <CustomOptions Items="ExternHelp" Version="2">
+    <CustomOptions Items="ExternHelp/Fppkg" Version="2">
       <_ExternHelp Items="Count"/>
+      <_Fppkg Items="CustomCodeCount/CustomCodeItem1/CustomCodeItem2">
+        <_CustomCodeCount Value="2"/>
+        <_CustomCodeItem1 Items="Value">
+          <_Value Value="    D := P.Dependencies.Add(&apos;winunits-base&apos;);"/>
+        </_CustomCodeItem1>
+        <_CustomCodeItem2 Items="Value">
+          <_Value Value="    D.OSes := AllWindowsOSes;"/>
+        </_CustomCodeItem2>
+      </_Fppkg>
     </CustomOptions>
   </Package>
 </CONFIG>