* Dotted filenames for package fcl-res

packages/fcl-res/namespaced/System.Resources.Accelerator.pp

@@ -0,0 +1,3 @@
+unit System.Resources.Accelerator;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i acceleratorsresource.pp}

packages/fcl-res/namespaced/System.Resources.Bitmap.pp

@@ -0,0 +1,3 @@
+unit System.Resources.Bitmap;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i bitmapresource.pp}

packages/fcl-res/namespaced/System.Resources.Coff.Consts.pp

@@ -0,0 +1,3 @@
+unit System.Resources.Coff.Consts;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i coffconsts.pp}

packages/fcl-res/namespaced/System.Resources.Coff.Reader.pp

@@ -0,0 +1,3 @@
+unit System.Resources.Coff.Reader;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i coffreader.pp}

packages/fcl-res/namespaced/System.Resources.Coff.Types.pp

@@ -0,0 +1,3 @@
+unit System.Resources.Coff.Types;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i cofftypes.pp}

packages/fcl-res/namespaced/System.Resources.Coff.Writer.pp

@@ -0,0 +1,3 @@
+unit System.Resources.Coff.Writer;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i coffwriter.pp}

packages/fcl-res/namespaced/System.Resources.DataStream.pp

@@ -0,0 +1,3 @@
+unit System.Resources.DataStream;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i resdatastream.pp}

packages/fcl-res/namespaced/System.Resources.Dfm.Reader.pp

@@ -0,0 +1,3 @@
+unit System.Resources.Dfm.Reader;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i dfmreader.pp}

packages/fcl-res/namespaced/System.Resources.Elf.Consts.pp

@@ -0,0 +1,3 @@
+unit System.Resources.Elf.Consts;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i elfconsts.pp}

packages/fcl-res/namespaced/System.Resources.Elf.Reader.pp

@@ -0,0 +1,3 @@
+unit System.Resources.Elf.Reader;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i elfreader.pp}

packages/fcl-res/namespaced/System.Resources.Elf.Types.pp

@@ -0,0 +1,3 @@
+unit System.Resources.Elf.Types;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i elftypes.pp}

packages/fcl-res/namespaced/System.Resources.Elf.Writer.pp

@@ -0,0 +1,3 @@
+unit System.Resources.Elf.Writer;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i elfwriter.pp}

packages/fcl-res/namespaced/System.Resources.External.Reader.pp

@@ -0,0 +1,3 @@
+unit System.Resources.External.Reader;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i externalreader.pp}

packages/fcl-res/namespaced/System.Resources.External.Types.pp

@@ -0,0 +1,3 @@
+unit System.Resources.External.Types;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i externaltypes.pp}

packages/fcl-res/namespaced/System.Resources.External.Writer.pp

@@ -0,0 +1,3 @@
+unit System.Resources.External.Writer;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i externalwriter.pp}

packages/fcl-res/namespaced/System.Resources.Factory.pp

@@ -0,0 +1,3 @@
+unit System.Resources.Factory;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i resfactory.pp}

packages/fcl-res/namespaced/System.Resources.Group.pp

@@ -0,0 +1,3 @@
+unit System.Resources.Group;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i groupresource.pp}

packages/fcl-res/namespaced/System.Resources.GroupCursor.pp

@@ -0,0 +1,3 @@
+unit System.Resources.GroupCursor;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i groupcursorresource.pp}

packages/fcl-res/namespaced/System.Resources.GroupIcon.pp

@@ -0,0 +1,3 @@
+unit System.Resources.GroupIcon;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i groupiconresource.pp}

packages/fcl-res/namespaced/System.Resources.GroupTypes.pp

@@ -0,0 +1,3 @@
+unit System.Resources.GroupTypes;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i icocurtypes.pp}

packages/fcl-res/namespaced/System.Resources.Macho.Consts.pp

@@ -0,0 +1,3 @@
+unit System.Resources.Macho.Consts;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i machoconsts.pp}

packages/fcl-res/namespaced/System.Resources.Macho.Reader.pp

@@ -0,0 +1,3 @@
+unit System.Resources.Macho.Reader;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i machoreader.pp}

packages/fcl-res/namespaced/System.Resources.Macho.Types.pp

@@ -0,0 +1,3 @@
+unit System.Resources.Macho.Types;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i machotypes.pp}

packages/fcl-res/namespaced/System.Resources.Macho.Writer.pp

@@ -0,0 +1,3 @@
+unit System.Resources.Macho.Writer;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i machowriter.pp}

packages/fcl-res/namespaced/System.Resources.Merger.pp

@@ -0,0 +1,3 @@
+unit System.Resources.Merger;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i resmerger.pp}

packages/fcl-res/namespaced/System.Resources.Rc.Parser.pp

@@ -0,0 +1,3 @@
+unit System.Resources.Rc.Parser;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i rcparser.pas}

packages/fcl-res/namespaced/System.Resources.Rc.Reader.pp

@@ -0,0 +1,3 @@
+unit System.Resources.Rc.Reader;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i rcreader.pp}

packages/fcl-res/namespaced/System.Resources.Reader.pp

@@ -0,0 +1,3 @@
+unit System.Resources.Reader;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i resreader.pp}

packages/fcl-res/namespaced/System.Resources.Resource.pp

@@ -0,0 +1,3 @@
+unit System.Resources.Resource;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i resource.pp}

packages/fcl-res/namespaced/System.Resources.StringTable.Types.pp

@@ -0,0 +1,3 @@
+unit System.Resources.StringTable.Types;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i strtable.pp}

packages/fcl-res/namespaced/System.Resources.StringTable.pp

@@ -0,0 +1,3 @@
+unit System.Resources.StringTable;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i stringtableresource.pp}

packages/fcl-res/namespaced/System.Resources.Tlb.Reader.pp

@@ -0,0 +1,3 @@
+unit System.Resources.Tlb.Reader;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i tlbreader.pp}

packages/fcl-res/namespaced/System.Resources.Tree.pp

@@ -0,0 +1,3 @@
+unit System.Resources.Tree;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i resourcetree.pp}

packages/fcl-res/namespaced/System.Resources.Types.pp

@@ -0,0 +1,3 @@
+unit System.Resources.Types;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i fpcrestypes.pp}

packages/fcl-res/namespaced/System.Resources.Version.pp

@@ -0,0 +1,3 @@
+unit System.Resources.Version;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i versionresource.pp}

packages/fcl-res/namespaced/System.Resources.VersionConsts.pp

@@ -0,0 +1,3 @@
+unit System.Resources.VersionConsts;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i versionconsts.pp}

packages/fcl-res/namespaced/System.Resources.VersionTypes.pp

@@ -0,0 +1,3 @@
+unit System.Resources.VersionTypes;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i versiontypes.pp}

packages/fcl-res/namespaced/System.Resources.WinPeImage.Reader.pp

@@ -0,0 +1,3 @@
+unit System.Resources.WinPeImage.Reader;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i winpeimagereader.pp}

packages/fcl-res/namespaced/System.Resources.Writer.pp

@@ -0,0 +1,3 @@
+unit System.Resources.Writer;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i reswriter.pp}

packages/fcl-res/namespaced/System.Resources.XCoff.Writer.pp

@@ -0,0 +1,3 @@
+unit System.Resources.XCoff.Writer;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i xcoffwriter.pp}

packages/fcl-res/namespaces.lst

@@ -0,0 +1,42 @@
+src/reswriter.pp=namespaced/System.Resources.Writer.pp
+{s*:src/}=namespaced/
+{i+:src/}
+src/fpcrestypes.pp=namespaced/System.Resources.Types.pp
+src/rcparser.pas=namespaced/System.Resources.Rc.Parser.pas
+src/versionresource.pp=namespaced/System.Resources.Version.pp
+src/coffreader.pp=namespaced/System.Resources.Coff.Reader.pp
+src/cofftypes.pp=namespaced/System.Resources.Coff.Types.pp
+src/resdatastream.pp=namespaced/System.Resources.DataStream.pp
+src/externaltypes.pp=namespaced/System.Resources.External.Types.pp
+src/bitmapresource.pp=namespaced/System.Resources.Bitmap.pp
+src/elftypes.pp=namespaced/System.Resources.Elf.Types.pp
+src/rcreader.pp=namespaced/System.Resources.Rc.Reader.pp
+src/xcoffwriter.pp=namespaced/System.Resources.XCoff.Writer.pp
+src/winpeimagereader.pp=namespaced/System.Resources.WinPeImage.Reader.pp
+src/machotypes.pp=namespaced/System.Resources.Macho.Types.pp
+src/externalreader.pp=namespaced/System.Resources.External.Reader.pp
+src/resreader.pp=namespaced/System.Resources.Reader.pp
+src/groupresource.pp=namespaced/System.Resources.Group.pp
+src/resmerger.pp=namespaced/System.Resources.Merger.pp
+src/coffwriter.pp=namespaced/System.Resources.Coff.Writer.pp
+src/resourcetree.pp=namespaced/System.Resources.Tree.pp
+src/groupiconresource.pp=namespaced/System.Resources.GroupIcon.pp
+src/groupcursorresource.pp=namespaced/System.Resources.GroupCursor.pp
+src/machoconsts.pp=namespaced/System.Resources.Macho.Consts.pp
+src/versionconsts.pp=namespaced/System.Resources.VersionConsts.pp
+src/strtable.pp=namespaced/System.Resources.StringTable.Types.pp
+src/externalwriter.pp=namespaced/System.Resources.External.Writer.pp
+src/elfwriter.pp=namespaced/System.Resources.Elf.Writer.pp
+src/dfmreader.pp=namespaced/System.Resources.Dfm.Reader.pp
+src/acceleratorsresource.pp=namespaced/System.Resources.Accelerator.pp
+src/tlbreader.pp=namespaced/System.Resources.Tlb.Reader.pp
+src/icocurtypes.pp=namespaced/System.Resources.GroupTypes.pp
+src/coffconsts.pp=namespaced/System.Resources.Coff.Consts.pp
+src/elfconsts.pp=namespaced/System.Resources.Elf.Consts.pp
+src/elfreader.pp=namespaced/System.Resources.Elf.Reader.pp
+src/machoreader.pp=namespaced/System.Resources.Macho.Reader.pp
+src/versiontypes.pp=namespaced/System.Resources.VersionTypes.pp
+src/stringtableresource.pp=namespaced/System.Resources.StringTable.pp
+src/machowriter.pp=namespaced/System.Resources.Macho.Writer.pp
+src/resource.pp=namespaced/System.Resources.Resource.pp
+src/resfactory.pp=namespaced/System.Resources.Factory.pp

packages/fcl-res/src/acceleratorsresource.pp

@@ -13,14 +13,21 @@
 
  **********************************************************************}
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit acceleratorsresource;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$MODE OBJFPC}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.Classes, System.SysUtils, System.Resources.Resource;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   Classes, SysUtils, resource;
+{$ENDIF FPC_DOTTEDUNITS}
 
 const
   FVirtKey  =  1;
@@ -72,8 +79,13 @@ type
 
 implementation
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.Resources.Factory;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   resfactory;
+{$ENDIF FPC_DOTTEDUNITS}
 
 { TAcceleratorsResource }
 

packages/fcl-res/src/bitmapresource.pp

@@ -13,14 +13,21 @@
 
  **********************************************************************}
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit bitmapresource;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$MODE OBJFPC}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.Classes, System.SysUtils, System.Resources.Resource;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   Classes, SysUtils, resource;
+{$ENDIF FPC_DOTTEDUNITS}
 
 type
 
@@ -50,8 +57,13 @@ type
 
 implementation
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.Resources.Factory, System.Resources.DataStream;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   resfactory, resdatastream;
+{$ENDIF FPC_DOTTEDUNITS}
 
 type
   TBitmapFileHeader = packed record

packages/fcl-res/src/coffconsts.pp

@@ -13,7 +13,9 @@
 
  **********************************************************************}
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit coffconsts;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$MODE OBJFPC}
 

packages/fcl-res/src/coffreader.pp

@@ -13,14 +13,21 @@
 
  **********************************************************************}
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit coffreader;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$MODE OBJFPC} {$H+}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.Classes, System.SysUtils, System.Resources.Resource, System.Resources.Tree, System.Resources.Coff.Types;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   Classes, SysUtils, resource, resourcetree, cofftypes;
+{$ENDIF FPC_DOTTEDUNITS}
 
 type
 
@@ -58,7 +65,11 @@ type
 
 implementation
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses System.Resources.Coff.Consts, System.Resources.DataStream;
+{$ELSE FPC_DOTTEDUNITS}
 uses coffconsts, resdatastream;
+{$ENDIF FPC_DOTTEDUNITS}
 
 { TCoffResourceReader }
 

packages/fcl-res/src/cofftypes.pp

@@ -13,7 +13,9 @@
 
  **********************************************************************}
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit cofftypes;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$MODE OBJFPC}
 

packages/fcl-res/src/coffwriter.pp

@@ -13,14 +13,21 @@
 
  **********************************************************************}
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit coffwriter;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$MODE OBJFPC} {$H+}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.Classes, System.SysUtils, System.Resources.Resource, System.Resources.Tree, System.Resources.Coff.Types;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   Classes, SysUtils, resource, resourcetree, cofftypes;
+{$ENDIF FPC_DOTTEDUNITS}
 
 type
 
@@ -144,7 +151,11 @@ type
 
 implementation
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses System.Resources.Coff.Consts;
+{$ELSE FPC_DOTTEDUNITS}
 uses coffconsts;
+{$ENDIF FPC_DOTTEDUNITS}
 
 { TCoffStringTable }
 

packages/fcl-res/src/dfmreader.pp

@@ -13,14 +13,21 @@
 
  **********************************************************************}
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit dfmreader;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$MODE OBJFPC} {$H+}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.Classes, System.SysUtils, System.Resources.Resource;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   Classes, SysUtils, resource;
+{$ENDIF FPC_DOTTEDUNITS}
 
 type
 
@@ -59,8 +66,13 @@ type
 
 implementation
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.Resources.DataStream, System.Resources.Factory;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   resdatastream, resfactory;
+{$ENDIF FPC_DOTTEDUNITS}
 
 type
   TSignature = array[0..3] of AnsiChar;

packages/fcl-res/src/elfconsts.pp

@@ -13,7 +13,9 @@
 
  **********************************************************************}
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit elfconsts;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$MODE OBJFPC}
 

packages/fcl-res/src/elfreader.pp

@@ -13,14 +13,21 @@
 
  **********************************************************************}
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit elfreader;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$MODE OBJFPC} {$H+}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.Classes, System.SysUtils, System.Resources.Resource, System.Resources.Elf.Consts, System.Resources.Elf.Types;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   Classes, SysUtils, resource, elfconsts, elftypes;
+{$ENDIF FPC_DOTTEDUNITS}
 
 type
   EElfResourceReaderException = class(EResourceReaderException);
@@ -57,7 +64,11 @@ type
 
 implementation
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses System.Resources.DataStream, System.Resources.Factory, System.Resources.Tree, System.Resources.StringTable.Types, System.Resources.Types;
+{$ELSE FPC_DOTTEDUNITS}
 uses resdatastream, resfactory, resourcetree, strtable, fpcrestypes;
+{$ENDIF FPC_DOTTEDUNITS}
 
 type
 

packages/fcl-res/src/elftypes.pp

@@ -13,7 +13,9 @@
 
  **********************************************************************}
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit elftypes;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$MODE OBJFPC}
 

packages/fcl-res/src/elfwriter.pp

@@ -13,14 +13,21 @@
 
  **********************************************************************}
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit elfwriter;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$MODE OBJFPC} {$H+}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.Classes, System.SysUtils, System.Resources.Resource, System.Resources.Elf.Consts, System.Resources.Elf.Types;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   Classes, SysUtils, resource, elfconsts, elftypes;
+{$ENDIF FPC_DOTTEDUNITS}
 
 type
   EElfResourceWriterException = class(EResourceWriterException);
@@ -58,7 +65,11 @@ type
 
 implementation
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses System.Resources.Tree, System.Resources.StringTable.Types, System.Resources.Types;
+{$ELSE FPC_DOTTEDUNITS}
 uses resourcetree, strtable, fpcrestypes;
+{$ENDIF FPC_DOTTEDUNITS}
 
 type
 

packages/fcl-res/src/externalreader.pp

@@ -13,14 +13,21 @@
 
  **********************************************************************}
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit externalreader;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$MODE OBJFPC} {$H+}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.Classes, System.SysUtils, System.Resources.Resource, System.Resources.Tree, System.Resources.External.Types;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   Classes, SysUtils, resource, resourcetree, externaltypes;
+{$ENDIF FPC_DOTTEDUNITS}
   
 type
 
@@ -56,8 +63,13 @@ type
 
 implementation
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.Resources.DataStream, System.Resources.Factory;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   resdatastream, resfactory;
+{$ENDIF FPC_DOTTEDUNITS}
 
 { TExternalResourceReader }
 

packages/fcl-res/src/externaltypes.pp

@@ -13,7 +13,9 @@
 
  **********************************************************************}
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit externaltypes;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$MODE OBJFPC} {$H+}
 

packages/fcl-res/src/externalwriter.pp

@@ -13,14 +13,21 @@
 
  **********************************************************************}
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit externalwriter;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$MODE OBJFPC} {$H+}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.Classes, System.SysUtils, System.Resources.Resource, System.Resources.Tree, System.Resources.External.Types, System.Resources.StringTable.Types;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   Classes, SysUtils, resource, resourcetree, externaltypes, strtable;
+{$ENDIF FPC_DOTTEDUNITS}
   
 type
   EExternalResourceWriterException = class(EResourceWriterException);

packages/fcl-res/src/fpcrestypes.pp

@@ -13,7 +13,9 @@
 
  **********************************************************************}
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit fpcrestypes;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$MODE OBJFPC}
 

packages/fcl-res/src/groupcursorresource.pp

@@ -13,14 +13,21 @@
 
  **********************************************************************}
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit groupcursorresource;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$MODE OBJFPC}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.Classes, System.SysUtils, System.Resources.Resource, System.Resources.Group;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   Classes, SysUtils, resource, groupresource;
+{$ENDIF FPC_DOTTEDUNITS}
   
 type
 
@@ -48,8 +55,13 @@ type
 
 implementation
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.Resources.Factory, System.Resources.DataStream, System.Resources.GroupTypes;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   resfactory, resdatastream, icocurtypes;
+{$ENDIF FPC_DOTTEDUNITS}
   
 type
   TCurInfo = record

packages/fcl-res/src/groupiconresource.pp

@@ -13,14 +13,21 @@
 
  **********************************************************************}
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit groupiconresource;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$MODE OBJFPC}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.Classes, System.SysUtils, System.Resources.Resource, System.Resources.Group;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   Classes, SysUtils, resource, groupresource;
+{$ENDIF FPC_DOTTEDUNITS}
   
 type
 
@@ -49,8 +56,13 @@ type
 
 implementation
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.Resources.Factory, System.Resources.DataStream, System.Resources.GroupTypes;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   resfactory, resdatastream, icocurtypes;
+{$ENDIF FPC_DOTTEDUNITS}
 
 type
   TIconInfo = record

packages/fcl-res/src/groupresource.pp

@@ -13,14 +13,21 @@
 
  **********************************************************************}
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit groupresource;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$MODE OBJFPC}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.Classes, System.SysUtils, System.Resources.Resource, System.Resources.DataStream;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   Classes, SysUtils, resource, resdatastream;
+{$ENDIF FPC_DOTTEDUNITS}
 
 type
 
@@ -73,8 +80,13 @@ type
 
 implementation
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.Resources.GroupTypes;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   icocurtypes;
+{$ENDIF FPC_DOTTEDUNITS}
 
 { TGroupResource }
 

packages/fcl-res/src/icocurtypes.pp

@@ -13,7 +13,9 @@
 
  **********************************************************************}
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit icocurtypes;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$MODE OBJFPC}
 

packages/fcl-res/src/machoconsts.pp

@@ -13,14 +13,21 @@
 
  **********************************************************************}
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit machoconsts;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$MODE OBJFPC}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.Resources.Macho.Types;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   machotypes;
+{$ENDIF FPC_DOTTEDUNITS}
 
 const
   DataSegName     : TSegSectName = '__DATA'+#0+#0+#0+#0+#0+#0+#0+#0+#0+#0;

packages/fcl-res/src/machoreader.pp

@@ -13,14 +13,21 @@
 
  **********************************************************************}
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit machoreader;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$MODE OBJFPC} {$H+}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.Classes, System.SysUtils, System.Resources.Resource, System.Resources.Macho.Types;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   Classes, SysUtils, resource, machotypes;
+{$ENDIF FPC_DOTTEDUNITS}
   
 type
 
@@ -56,7 +63,11 @@ type
 
 implementation
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses System.CTypes, System.Resources.Macho.Consts, System.Resources.Factory, System.Resources.Tree, System.Resources.DataStream, System.Resources.Types;
+{$ELSE FPC_DOTTEDUNITS}
 uses ctypes, machoconsts, resfactory, resourcetree, resdatastream, fpcrestypes;
+{$ENDIF FPC_DOTTEDUNITS}
 
 type
 

packages/fcl-res/src/machotypes.pp

@@ -13,14 +13,21 @@
 
  **********************************************************************}
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit machotypes;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$MODE OBJFPC}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.CTypes;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   ctypes;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$packrecords c}
 
@@ -196,8 +203,13 @@ type
 
 implementation
 
+{$IFDEF FPC_DOTTEDUNITS}
+  uses
+    System.Resources.Macho.Consts;
+{$ELSE FPC_DOTTEDUNITS}
   uses
     machoconsts;
+{$ENDIF FPC_DOTTEDUNITS}
 
   function MachOMachineTypesToPas(mach: tmach_cpu_type; sub: tmach_cpu_subtype; out machPas: TMachOMachineType; out subPas: TMachOSubMachineType): boolean;
     begin

packages/fcl-res/src/machowriter.pp

@@ -13,14 +13,21 @@
 
  **********************************************************************}
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit machowriter;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$MODE OBJFPC} {$H+}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.Classes, System.SysUtils, System.Resources.Resource, System.Resources.Macho.Types;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   Classes, SysUtils, resource, machotypes;
+{$ENDIF FPC_DOTTEDUNITS}
 
 type
   EMachOResourceWriterException = class(EResourceWriterException);
@@ -58,7 +65,11 @@ type
 
 implementation
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses System.Resources.Tree, System.Resources.Macho.Consts, System.Resources.StringTable.Types, System.Resources.Types;
+{$ELSE FPC_DOTTEDUNITS}
 uses resourcetree, machoconsts, strtable, fpcrestypes;
+{$ENDIF FPC_DOTTEDUNITS}
 
 type
 

packages/fcl-res/src/rcparser.pas

@@ -7,7 +7,9 @@
 Vorspann
  ****************************************************************************)
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit rcparser;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$I rcparserfn.inc}
 
@@ -2835,6 +2837,6 @@ end(*yyparse*);
 {$I rclex.inc}
 begin
   bufptr:= 0;
-  lexlib.get_char:= @rc_get_char;
-  lexlib.unget_char:= @rc_unget_char;
+  {$IFDEF FPC_DOTTEDUNITS}Pascal.{$ENDIF}lexlib.get_char:= @rc_get_char;
+  {$IFDEF FPC_DOTTEDUNITS}Pascal.{$ENDIF}lexlib.unget_char:= @rc_unget_char;
 end.

packages/fcl-res/src/rcparserfn.inc

@@ -19,10 +19,17 @@ interface
 {$COPERATORS ON}
 {$GOTO ON}
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.SysUtils, System.Classes, System.StrUtils, System.FGL, Pascal.Lexlib, Pascal.Yacclib, System.Resources.Resource,
+  System.Resources.Accelerator, System.Resources.GroupIcon, System.Resources.StringTable,
+  System.Resources.Bitmap, System.Resources.Version, System.Resources.VersionTypes, System.Resources.GroupCursor;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   SysUtils, Classes, StrUtils, fgl, lexlib, yacclib, resource,
   acceleratorsresource, groupiconresource, stringtableresource,
   bitmapresource, versionresource, versiontypes, groupcursorresource;
+{$ENDIF FPC_DOTTEDUNITS}
 
 type
   TStringHashTable = specialize TFPGMap<AnsiString, AnsiString>;

packages/fcl-res/src/rcreader.pp

@@ -13,14 +13,21 @@
 
  **********************************************************************}
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit rcreader;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$MODE OBJFPC} {$H+}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.Classes, System.SysUtils, System.Resources.Resource;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   Classes, SysUtils, resource;
+{$ENDIF FPC_DOTTEDUNITS}
 
 type
 
@@ -47,8 +54,13 @@ type
 
 implementation
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.Streamio, System.Resources.DataStream, System.Resources.Factory, Pascal.Lexlib, System.Resources.Rc.Parser;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   StreamIO, resdatastream, resfactory, lexlib, rcparser;
+{$ENDIF FPC_DOTTEDUNITS}
 
 { TRCResourceReader }
 
@@ -88,26 +100,26 @@ procedure TRCResourceReader.ReadRCFile(aResources: TResources; aLocation: String
 var
   i: Integer;
 begin
-  AssignStream(lexlib.yyinput, aStream);
-  Reset(lexlib.yyinput);
+  AssignStream({$IFDEF FPC_DOTTEDUNITS}Pascal.{$ENDIF}Lexlib.yyinput, aStream);
+  Reset({$IFDEF FPC_DOTTEDUNITS}Pascal.{$ENDIF}Lexlib.yyinput);
   try
-    rcparser.yyfilename:= '#MAIN.RC';
-    rcparser.SetDefaults;
-    SetTextCodePage(lexlib.yyinput, rcparser.opt_code_page);
-    rcparser.yinclude:= tyinclude.Create;
-    rcparser.yinclude.WorkDir:= aLocation;
-    rcparser.yinclude.SearchPaths.Assign(fRCIncludeDirs);
-    rcparser.ypreproc:= typreproc.Create;
-    rcparser.ypreproc.Defines.Add('RC_INVOKED', '');
+    {$IFDEF FPC_DOTTEDUNITS}System.Resources.Rc.Parser.{$ELSE}rcparser.{$ENDIF}yyfilename:= '#MAIN.RC';
+    {$IFDEF FPC_DOTTEDUNITS}System.Resources.Rc.Parser.{$ELSE}rcparser.{$ENDIF}SetDefaults;
+    SetTextCodePage({$IFDEF FPC_DOTTEDUNITS}Pascal.{$ENDIF}Lexlib.yyinput, {$IFDEF FPC_DOTTEDUNITS}System.Resources.Rc.Parser.{$ELSE}rcparser.{$ENDIF}opt_code_page);
+    {$IFDEF FPC_DOTTEDUNITS}System.Resources.Rc.Parser.{$ELSE}rcparser.{$ENDIF}yinclude:= tyinclude.Create;
+    {$IFDEF FPC_DOTTEDUNITS}System.Resources.Rc.Parser.{$ELSE}rcparser.{$ENDIF}yinclude.WorkDir:= aLocation;
+    {$IFDEF FPC_DOTTEDUNITS}System.Resources.Rc.Parser.{$ELSE}rcparser.{$ENDIF}yinclude.SearchPaths.Assign(fRCIncludeDirs);
+    {$IFDEF FPC_DOTTEDUNITS}System.Resources.Rc.Parser.{$ELSE}rcparser.{$ENDIF}ypreproc:= typreproc.Create;
+    {$IFDEF FPC_DOTTEDUNITS}System.Resources.Rc.Parser.{$ELSE}rcparser.{$ENDIF}ypreproc.Defines.Add('RC_INVOKED', '');
     for i:= 0 to fRCDefines.Count-1 do
-      rcparser.ypreproc.Defines.KeyData[fRCDefines.Names[i]]:= fRCDefines.ValueFromIndex[i];
-    rcparser.aktresources:= aResources;
-    if rcparser.yyparse <> 0 then
+      {$IFDEF FPC_DOTTEDUNITS}System.Resources.Rc.Parser.{$ELSE}rcparser.{$ENDIF}ypreproc.Defines.KeyData[fRCDefines.Names[i]]:= fRCDefines.ValueFromIndex[i];
+    {$IFDEF FPC_DOTTEDUNITS}System.Resources.Rc.Parser.{$ELSE}rcparser.{$ENDIF}aktresources:= aResources;
+    if {$IFDEF FPC_DOTTEDUNITS}System.Resources.Rc.Parser.{$ELSE}rcparser.{$ENDIF}yyparse <> 0 then
       raise EReadError.Create('Parse Error');
   finally
-    rcparser.DisposePools;
-    FreeAndNil(rcparser.ypreproc);
-    FreeAndNil(rcparser.yinclude);
+    {$IFDEF FPC_DOTTEDUNITS}System.Resources.Rc.Parser.{$ELSE}rcparser.{$ENDIF}DisposePools;
+    FreeAndNil({$IFDEF FPC_DOTTEDUNITS}System.Resources.Rc.Parser.{$ELSE}rcparser.{$ENDIF}ypreproc);
+    FreeAndNil({$IFDEF FPC_DOTTEDUNITS}System.Resources.Rc.Parser.{$ELSE}rcparser.{$ENDIF}yinclude);
   end;
 end;
 

packages/fcl-res/src/resdatastream.pp

@@ -13,13 +13,19 @@
 
  **********************************************************************}
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit resdatastream;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$MODE OBJFPC}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses System.Classes, System.SysUtils, System.Resources.Resource;
+{$ELSE FPC_DOTTEDUNITS}
 uses Classes, SysUtils, resource;
+{$ENDIF FPC_DOTTEDUNITS}
 
 type
 

packages/fcl-res/src/resfactory.pp

@@ -13,14 +13,21 @@
 
  **********************************************************************}
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit resfactory;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$MODE OBJFPC}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.Classes, System.SysUtils, System.Resources.Resource;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   Classes, SysUtils, resource;
+{$ENDIF FPC_DOTTEDUNITS}
 
 type
   EResourceFactoryException = class(EResourceException);

packages/fcl-res/src/resmerger.pp

@@ -13,12 +13,23 @@
 
  **********************************************************************}
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit resmerger;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$MODE OBJFPC}{$H+}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.Classes, System.SysUtils, System.Resources.Resource,
+  System.Resources.StringTable,
+
+  //these two System.Resources.Resource System.Types know how to do it on their own... add them so that
+  //they got registered
+  System.Resources.GroupIcon, System.Resources.GroupCursor;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   Classes, SysUtils, resource,
   stringtableresource,
@@ -26,6 +37,7 @@ uses
   //these two resource types know how to do it on their own... add them so that
   //they got registered
   groupiconresource, groupcursorresource;
+{$ENDIF FPC_DOTTEDUNITS}
 
 type
 

packages/fcl-res/src/resource.pp

@@ -13,14 +13,21 @@
 
  **********************************************************************}
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit resource;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$MODE OBJFPC} {$H+}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.Classes, System.SysUtils;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   Classes, Sysutils;
+{$ENDIF FPC_DOTTEDUNITS}
 
 const
   RT_CURSOR       =  1;  //Hardware-dependent cursor resource.
@@ -318,7 +325,11 @@ type
 
 implementation
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses System.Resources.DataStream, System.Resources.Tree, System.Resources.Merger;
+{$ELSE FPC_DOTTEDUNITS}
 uses resdatastream, resourcetree, resmerger;
+{$ENDIF FPC_DOTTEDUNITS}
 
 type
   PRegisteredStreamerEntry = ^TRegisteredStreamerEntry;

packages/fcl-res/src/resourcetree.pp

@@ -13,14 +13,21 @@
 
  **********************************************************************}
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit resourcetree;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$MODE OBJFPC}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.Classes, System.SysUtils, System.Resources.Resource;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   Classes, SysUtils, resource;
+{$ENDIF FPC_DOTTEDUNITS}
 
 type
 
@@ -82,7 +89,11 @@ type
 
 implementation
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses System.Resources.Factory;
+{$ELSE FPC_DOTTEDUNITS}
 uses resfactory;
+{$ENDIF FPC_DOTTEDUNITS}
 
   { TTypeResTreeNode }
 

packages/fcl-res/src/resreader.pp

@@ -13,14 +13,21 @@
 
  **********************************************************************}
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit resreader;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$MODE OBJFPC} {$H+}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.Classes, System.SysUtils, System.Resources.Resource;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   Classes, SysUtils, resource;
+{$ENDIF FPC_DOTTEDUNITS}
 
 type
 
@@ -49,7 +56,11 @@ type
 
 implementation
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses System.Resources.DataStream, System.Resources.Factory;
+{$ELSE FPC_DOTTEDUNITS}
 uses resdatastream, resfactory;
+{$ENDIF FPC_DOTTEDUNITS}
 
 //This exception is raised when end of stream is detected and expected,
 //that is, before reading a new resource header. It's not an error.

packages/fcl-res/src/reswriter.pp

@@ -13,14 +13,21 @@
 
  **********************************************************************}
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit reswriter;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$MODE OBJFPC} {$H+}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.Classes, System.SysUtils, System.Resources.Resource;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   Classes, SysUtils, resource;
+{$ENDIF FPC_DOTTEDUNITS}
   
 type
 

packages/fcl-res/src/stringtableresource.pp

@@ -13,14 +13,21 @@
 
  **********************************************************************}
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit stringtableresource;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$MODE OBJFPC}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.Classes, System.SysUtils, System.Resources.Resource;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   Classes, SysUtils, resource;
+{$ENDIF FPC_DOTTEDUNITS}
 
 type
   EStringTableResourceException = class(EResourceException);
@@ -72,8 +79,13 @@ type
 
 implementation
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.Resources.Factory;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   resfactory;
+{$ENDIF FPC_DOTTEDUNITS}
 
 { TStringTableResource }
 

packages/fcl-res/src/strtable.pp

@@ -13,14 +13,21 @@
 
  **********************************************************************}
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit strtable;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$MODE OBJFPC} {$H+}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.Classes;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   Classes;
+{$ENDIF FPC_DOTTEDUNITS}
 
 type
 

packages/fcl-res/src/tlbreader.pp

@@ -13,14 +13,21 @@
 
  **********************************************************************}
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit tlbreader;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$MODE OBJFPC} {$H+}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.Classes, System.SysUtils, System.Resources.Resource;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   Classes, SysUtils, resource;
+{$ENDIF FPC_DOTTEDUNITS}
 
 type
 
@@ -43,8 +50,13 @@ type
 
 implementation
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.Resources.DataStream, System.Resources.Factory;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   resdatastream, resfactory;
+{$ENDIF FPC_DOTTEDUNITS}
 
 type
   TSignature = array[0..3] of AnsiChar;

packages/fcl-res/src/versionconsts.pp

@@ -13,7 +13,9 @@
 
  **********************************************************************}
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit versionconsts;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$MODE OBJFPC}
 

packages/fcl-res/src/versionresource.pp

@@ -13,14 +13,21 @@
 
  **********************************************************************}
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit versionresource;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$MODE OBJFPC}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.SysUtils, System.Classes, System.Resources.Resource, System.Resources.VersionTypes;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   SysUtils, Classes, resource, versiontypes;
+{$ENDIF FPC_DOTTEDUNITS}
 
 type
   TVerBlockHeader = packed record
@@ -83,8 +90,13 @@ type
 
 implementation
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.Resources.Factory;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   resfactory;
+{$ENDIF FPC_DOTTEDUNITS}
   
 type
   TVSFixedFileInfo = packed record

packages/fcl-res/src/versiontypes.pp

@@ -13,14 +13,21 @@
 
  **********************************************************************}
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit versiontypes;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$MODE OBJFPC}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.Classes, System.SysUtils, System.Resources.Resource;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   Classes, SysUtils, resource;
+{$ENDIF FPC_DOTTEDUNITS}
   
 type
   EVersionStringTableException = class(Exception);
@@ -141,8 +148,13 @@ type
 
 implementation
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.Resources.VersionConsts;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   versionconsts;
+{$ENDIF FPC_DOTTEDUNITS}
 
 { TVersionStringTable }
 

packages/fcl-res/src/winpeimagereader.pp

@@ -13,14 +13,21 @@
 
  **********************************************************************}
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit winpeimagereader;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$MODE OBJFPC} {$H+}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.Classes, System.SysUtils, System.Resources.Resource, System.Resources.Coff.Reader;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   Classes, SysUtils, resource, coffreader;
+{$ENDIF FPC_DOTTEDUNITS}
 
 type
 

packages/fcl-res/src/xcoffwriter.pp

@@ -13,14 +13,22 @@
 
  **********************************************************************}
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit xcoffwriter;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$MODE OBJFPC} {$H+}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.Classes, System.SysUtils, System.Resources.StringTable.Types, System.Resources.Resource, System.Resources.Tree,  
+  System.Resources.Coff.Types, System.Resources.Coff.Writer;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   Classes, SysUtils, strtable, resource, resourcetree, cofftypes, coffwriter;
+{$ENDIF FPC_DOTTEDUNITS}
 
 type
   { TXCoffResourceWriter }
@@ -52,7 +60,11 @@ type
 
 implementation
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses System.Resources.Coff.Consts, System.Resources.Types;
+{$ELSE FPC_DOTTEDUNITS}
 uses coffconsts,fpcrestypes;
+{$ENDIF FPC_DOTTEDUNITS}
 
 type
   // Todo: 64 bit