* Dotted filenames for package fcl-image

packages/fcl-image/fpmake.pp

@@ -291,19 +291,19 @@ begin
       AddUnit('fpqrcodegen');
       end;
     // qoi  
-    T:=P.Targets.AddUnit('qoicomn.pp');
+    T:=P.Targets.AddUnit('qoicomn.pas');
       with T.Dependencies do
         begin
           AddUnit('fpimage');
           AddUnit('fpimgcmn');
         end;
-    T:=P.Targets.AddUnit('fpreadqoi.pp');
+    T:=P.Targets.AddUnit('fpreadqoi.pas');
       with T.Dependencies do
         begin
           AddUnit('fpimage');
           AddUnit('qoicomn');
         end;
-    T:=P.Targets.AddUnit('fpwriteqoi.pp');
+    T:=P.Targets.AddUnit('fpwriteqoi.pas');
       with T.Dependencies do
         begin
           AddUnit('fpimage');

packages/fcl-image/namespaced/Api.Freetype.pp

@@ -0,0 +1,3 @@
+unit Api.Freetype;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i freetype.pp}

packages/fcl-image/namespaced/Api.Freetypeh.pp

@@ -0,0 +1,3 @@
+unit Api.Freetypeh;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i freetypeh.pp}

packages/fcl-image/namespaced/Api.Freetypehdyn.pp

@@ -0,0 +1,3 @@
+unit Api.Freetypehdyn;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i freetypehdyn.pp}

packages/fcl-image/namespaced/Api.Xwdfile.pp

@@ -0,0 +1,3 @@
+unit Api.Xwdfile;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i xwdfile.pp}

packages/fcl-image/namespaced/FpImage.BarCode.pp

@@ -0,0 +1,3 @@
+unit FpImage.BarCode;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i fpbarcode.pp}

packages/fcl-image/namespaced/FpImage.Canvas.pp

@@ -0,0 +1,3 @@
+unit FpImage.Canvas;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i fpcanvas.pp}

packages/fcl-image/namespaced/FpImage.Clipping.pp

@@ -0,0 +1,3 @@
+unit FpImage.Clipping;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i clipping.pp}

packages/fcl-image/namespaced/FpImage.ColorHash.pas

@@ -0,0 +1,3 @@
+unit FpImage.ColorHash;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i fpcolhash.pas}

packages/fcl-image/namespaced/FpImage.Common.Bitmap.pp

@@ -0,0 +1,3 @@
+unit FpImage.Common.Bitmap;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i bmpcomn.pp}

packages/fcl-image/namespaced/FpImage.Common.PCX.pas

@@ -0,0 +1,3 @@
+unit FpImage.Common.PCX;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i pcxcomn.pas}

packages/fcl-image/namespaced/FpImage.Common.PNG.pp

@@ -0,0 +1,3 @@
+unit FpImage.Common.PNG;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i pngcomn.pp}

packages/fcl-image/namespaced/FpImage.Common.QOI.pas

@@ -0,0 +1,3 @@
+unit FpImage.Common.QOI;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i qoicomn.pas}

packages/fcl-image/namespaced/FpImage.Common.TIFF.pas

@@ -0,0 +1,3 @@
+unit FpImage.Common.TIFF;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i fptiffcmn.pas}

packages/fcl-image/namespaced/FpImage.Common.Targa.pp

@@ -0,0 +1,3 @@
+unit FpImage.Common.Targa;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i targacmn.pp}

packages/fcl-image/namespaced/FpImage.Common.pp

@@ -0,0 +1,3 @@
+unit FpImage.Common;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i fpimgcmn.pp}

packages/fcl-image/namespaced/FpImage.Ditherer.pas

@@ -0,0 +1,3 @@
+unit FpImage.Ditherer;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i fpditherer.pas}

packages/fcl-image/namespaced/FpImage.Ellipses.pp

@@ -0,0 +1,3 @@
+unit FpImage.Ellipses;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i ellipses.pp}

packages/fcl-image/namespaced/FpImage.Extinterpolation.pp

@@ -0,0 +1,3 @@
+unit FpImage.Extinterpolation;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i extinterpolation.pp}

packages/fcl-image/namespaced/FpImage.Ftfont.pp

@@ -0,0 +1,3 @@
+unit FpImage.Ftfont;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i ftfont.pp}

packages/fcl-image/namespaced/FpImage.Gauss.pp

@@ -0,0 +1,3 @@
+unit FpImage.Gauss;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i fpimggauss.pp}

packages/fcl-image/namespaced/FpImage.ImageCanvas.pp

@@ -0,0 +1,3 @@
+unit FpImage.ImageCanvas;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i fpimgcanv.pp}

packages/fcl-image/namespaced/FpImage.ImgBarCode.pp

@@ -0,0 +1,3 @@
+unit FpImage.ImgBarCode;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i fpimgbarcode.pp}

packages/fcl-image/namespaced/FpImage.PixelCanvas.pp

@@ -0,0 +1,3 @@
+unit FpImage.PixelCanvas;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i fppixlcanv.pp}

packages/fcl-image/namespaced/FpImage.PixelTools.pp

@@ -0,0 +1,3 @@
+unit FpImage.PixelTools;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i pixtools.pp}

packages/fcl-image/namespaced/FpImage.Pscanvas.pp

@@ -0,0 +1,3 @@
+unit FpImage.Pscanvas;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i pscanvas.pp}

packages/fcl-image/namespaced/FpImage.QRCode.pp

@@ -0,0 +1,3 @@
+unit FpImage.QRCode;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i fpimgqrcode.pp}

packages/fcl-image/namespaced/FpImage.QRCodeGen.pp

@@ -0,0 +1,3 @@
+unit FpImage.QRCodeGen;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i fpqrcodegen.pp}

packages/fcl-image/namespaced/FpImage.Quantizer.pas

@@ -0,0 +1,3 @@
+unit FpImage.Quantizer;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i fpquantizer.pas}

packages/fcl-image/namespaced/FpImage.Reader.Bitmap.pp

@@ -0,0 +1,3 @@
+unit FpImage.Reader.Bitmap;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i fpreadbmp.pp}

packages/fcl-image/namespaced/FpImage.Reader.GIF.pas

@@ -0,0 +1,3 @@
+unit FpImage.Reader.GIF;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i fpreadgif.pas}

packages/fcl-image/namespaced/FpImage.Reader.JPEG.pas

@@ -0,0 +1,3 @@
+unit FpImage.Reader.JPEG;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i fpreadjpeg.pas}

packages/fcl-image/namespaced/FpImage.Reader.PCX.pas

@@ -0,0 +1,3 @@
+unit FpImage.Reader.PCX;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i fpreadpcx.pas}

packages/fcl-image/namespaced/FpImage.Reader.PNG.pp

@@ -0,0 +1,3 @@
+unit FpImage.Reader.PNG;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i fpreadpng.pp}

packages/fcl-image/namespaced/FpImage.Reader.PNM.pp

@@ -0,0 +1,3 @@
+unit FpImage.Reader.PNM;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i fpreadpnm.pp}

packages/fcl-image/namespaced/FpImage.Reader.PSD.pas

@@ -0,0 +1,3 @@
+unit FpImage.Reader.PSD;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i fpreadpsd.pas}

packages/fcl-image/namespaced/FpImage.Reader.QOI.pas

@@ -0,0 +1,3 @@
+unit FpImage.Reader.QOI;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i fpreadqoi.pas}

packages/fcl-image/namespaced/FpImage.Reader.TIFF.pas

@@ -0,0 +1,3 @@
+unit FpImage.Reader.TIFF;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i fpreadtiff.pas}

packages/fcl-image/namespaced/FpImage.Reader.Targa.pp

@@ -0,0 +1,3 @@
+unit FpImage.Reader.Targa;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i fpreadtga.pp}

packages/fcl-image/namespaced/FpImage.Reader.XPM.pp

@@ -0,0 +1,3 @@
+unit FpImage.Reader.XPM;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i fpreadxpm.pp}

packages/fcl-image/namespaced/FpImage.Reader.XWD.pas

@@ -0,0 +1,3 @@
+unit FpImage.Reader.XWD;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i fpreadxwd.pas}

packages/fcl-image/namespaced/FpImage.Writer.Bitmap.pp

@@ -0,0 +1,3 @@
+unit FpImage.Writer.Bitmap;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i fpwritebmp.pp}

packages/fcl-image/namespaced/FpImage.Writer.JPEG.pas

@@ -0,0 +1,3 @@
+unit FpImage.Writer.JPEG;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i fpwritejpeg.pas}

packages/fcl-image/namespaced/FpImage.Writer.PCX.pas

@@ -0,0 +1,3 @@
+unit FpImage.Writer.PCX;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i fpwritepcx.pas}

packages/fcl-image/namespaced/FpImage.Writer.PNG.pp

@@ -0,0 +1,3 @@
+unit FpImage.Writer.PNG;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i fpwritepng.pp}

packages/fcl-image/namespaced/FpImage.Writer.PNM.pp

@@ -0,0 +1,3 @@
+unit FpImage.Writer.PNM;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i fpwritepnm.pp}

packages/fcl-image/namespaced/FpImage.Writer.QOI.pas

@@ -0,0 +1,3 @@
+unit FpImage.Writer.QOI;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i fpwriteqoi.pas}

packages/fcl-image/namespaced/FpImage.Writer.TIFF.pas

@@ -0,0 +1,3 @@
+unit FpImage.Writer.TIFF;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i fpwritetiff.pas}

packages/fcl-image/namespaced/FpImage.Writer.Targa.pp

@@ -0,0 +1,3 @@
+unit FpImage.Writer.Targa;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i fpwritetga.pp}

packages/fcl-image/namespaced/FpImage.Writer.XPM.pp

@@ -0,0 +1,3 @@
+unit FpImage.Writer.XPM;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i fpwritexpm.pp}

packages/fcl-image/namespaces.lst

@@ -0,0 +1,51 @@
+src/fpwritepnm.pp=namespaced/FpImage.Writer.PNM.pp
+{s*:src/}=namespaced/
+{i+:src/}
+src/fppixlcanv.pp=namespaced/FpImage.PixelCanvas.pp
+src/fpqrcodegen.pp=namespaced/FpImage.QRCodeGen.pp
+src/fpimgqrcode.pp=namespaced/FpImage.QRCode.pp
+src/fpreadpnm.pp=namespaced/FpImage.Reader.PNM.pp
+src/fpreadtga.pp=namespaced/FpImage.Reader.Targa.pp
+src/fpreadpcx.pas=namespaced/FpImage.Reader.PCX.pas
+src/fpreadjpeg.pas=namespaced/FpImage.Reader.JPEG.pas
+src/fpwritebmp.pp=namespaced/FpImage.Writer.Bitmap.pp
+src/freetypeh.pp=namespaced/Api.Freetypeh.pp
+src/fpwritetga.pp=namespaced/FpImage.Writer.Targa.pp
+src/fpcolhash.pas=namespaced/FpImage.ColorHash.pas
+src/bmpcomn.pp=namespaced/FpImage.Common.Bitmap.pp
+src/xwdfile.pp=namespaced/Api.Xwdfile.pp
+src/fpwritepcx.pas=namespaced/FpImage.Writer.PCX.pas
+src/fpbarcode.pp=namespaced/FpImage.BarCode.pp
+src/pngcomn.pp=namespaced/FpImage.Common.PNG.pp
+src/fpreadqoi.pas=namespaced/FpImage.Reader.QOI.pas
+src/fpquantizer.pas=namespaced/FpImage.Quantizer.pas
+src/qoicomn.pas=namespaced/FpImage.Common.QOI.pas
+src/fpditherer.pas=namespaced/FpImage.Ditherer.pas
+src/pixtools.pp=namespaced/FpImage.PixelTools.pp
+src/freetypehdyn.pp=namespaced/Api.Freetypehdyn.pp
+src/freetype.pp=namespaced/Api.Freetype.pp
+src/fpwritexpm.pp=namespaced/FpImage.Writer.XPM.pp
+src/fpcanvas.pp=namespaced/FpImage.Canvas.pp
+src/pscanvas.pp=namespaced/FpImage.Pscanvas.pp
+src/fpwritejpeg.pas=namespaced/FpImage.Writer.JPEG.pas
+src/fptiffcmn.pas=namespaced/FpImage.Common.TIFF.pas
+src/targacmn.pp=namespaced/FpImage.Common.Targa.pp
+src/fpreadpng.pp=namespaced/FpImage.Reader.PNG.pp
+src/fpwritetiff.pas=namespaced/FpImage.Writer.TIFF.pas
+src/pcxcomn.pas=namespaced/FpImage.Common.PCX.pas
+src/fpimggauss.pp=namespaced/FpImage.Gauss.pp
+src/fpwritepng.pp=namespaced/FpImage.Writer.PNG.pp
+src/fpreadtiff.pas=namespaced/FpImage.Reader.TIFF.pas
+src/fpwriteqoi.pas=namespaced/FpImage.Writer.QOI.pas
+src/fpreadpsd.pas=namespaced/FpImage.Reader.PSD.pas
+src/extinterpolation.pp=namespaced/FpImage.Extinterpolation.pp
+src/fpreadgif.pas=namespaced/FpImage.Reader.GIF.pas
+src/fpreadxwd.pas=namespaced/FpImage.Reader.XWD.pas
+src/fpimgcmn.pp=namespaced/FpImage.Common.pp
+src/fpreadxpm.pp=namespaced/FpImage.Reader.XPM.pp
+src/fpimgbarcode.pp=namespaced/FpImage.ImgBarCode.pp
+src/fpreadbmp.pp=namespaced/FpImage.Reader.Bitmap.pp
+src/ellipses.pp=namespaced/FpImage.Ellipses.pp
+src/ftfont.pp=namespaced/FpImage.Ftfont.pp
+src/clipping.pp=namespaced/FpImage.Clipping.pp
+src/fpimgcanv.pp=namespaced/FpImage.ImageCanvas.pp

packages/fcl-image/src/bmpcomn.pp

@@ -14,7 +14,9 @@
 }
 {*****************************************************************************}
 {$mode objfpc}{$h+}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit BMPcomn;
+{$ENDIF FPC_DOTTEDUNITS}
 
 interface
 
@@ -91,7 +93,11 @@ procedure SwapBMPInfoHeader(var BFI : TBitMapInfoHeader);
 
 implementation
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses FpImage.Common;
+{$ELSE FPC_DOTTEDUNITS}
 uses FPImgCmn;
+{$ENDIF FPC_DOTTEDUNITS}
 
 procedure SwapBMPFileHeader(var BFH : TBitMapFileHeader);
 begin

packages/fcl-image/src/clipping.pp

@@ -13,11 +13,17 @@
 
  **********************************************************************}
 {$mode objfpc}{$h+}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit Clipping;
+{$ENDIF FPC_DOTTEDUNITS}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses System.Classes;
+{$ELSE FPC_DOTTEDUNITS}
 uses classes;
+{$ENDIF FPC_DOTTEDUNITS}
 
 procedure SortRect (var rect : TRect);
 procedure SortRect (var left,top, right,bottom : integer);

packages/fcl-image/src/ellipses.pp

@@ -13,11 +13,17 @@
 
  **********************************************************************}
 {$mode objfpc}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit Ellipses;
+{$ENDIF FPC_DOTTEDUNITS}
 
 interface
 
-uses classes, FPImage, FPCanvas;
+{$IFDEF FPC_DOTTEDUNITS}
+uses System.Classes, FpImage, FpImage.Canvas;
+{$ELSE FPC_DOTTEDUNITS}
+uses classes, FpImage, FPCanvas;
+{$ENDIF FPC_DOTTEDUNITS}
 
 procedure DrawSolidEllipse (Canv:TFPCustomCanvas; const Bounds:TRect; const c:TFPColor);
 procedure DrawSolidEllipse (Canv:TFPCustomCanvas; const Bounds:TRect; Width:integer; const c:TFPColor);

packages/fcl-image/src/extinterpolation.pp

@@ -12,7 +12,9 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
  **********************************************************************}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit extinterpolation;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {
 Some more interpolation filters for TFPCanvas.StretchDraw:
@@ -25,8 +27,13 @@ of Bessel and Sinc are windowed with Blackman filter.
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
 uses
-  Math, Classes, SysUtils, FPImage, FPCanvas;
+  System.Math, System.Classes, System.SysUtils, FpImage, FpImage.Canvas;
+{$ELSE FPC_DOTTEDUNITS}
+uses
+  Math, Classes, SysUtils, FpImage, FPCanvas;
+{$ENDIF FPC_DOTTEDUNITS}
 
 type
 

packages/fcl-image/src/fpbarcode.pp

@@ -14,14 +14,21 @@
 
  **********************************************************************}
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit fpbarcode;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$mode objfpc}{$H+}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.SysUtils;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   sysutils;
+{$ENDIF FPC_DOTTEDUNITS}
 
 Type
   // Various encodings. Sorted

packages/fcl-image/src/fpcanvas.pp

@@ -13,11 +13,17 @@
 
  **********************************************************************}
 {$mode objfpc}{$h+}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit FPCanvas;
+{$ENDIF FPC_DOTTEDUNITS}
 
 interface
 
-uses Math, sysutils, classes, FPImage, Types;
+{$IFDEF FPC_DOTTEDUNITS}
+uses System.Math, System.SysUtils, System.Classes, FpImage, System.Types;
+{$ELSE FPC_DOTTEDUNITS}
+uses Math, sysutils, classes, FpImage, Types;
+{$ENDIF FPC_DOTTEDUNITS}
 
 const
   PatternBitCount = sizeof(longword) * 8;
@@ -458,7 +464,11 @@ procedure IncRect (var rect : TRect);
 
 implementation
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses FpImage.Clipping;
+{$ELSE FPC_DOTTEDUNITS}
 uses clipping;
+{$ENDIF FPC_DOTTEDUNITS}
 
 const
   EFont = 'Font';

packages/fcl-image/src/fpcolhash.pas

@@ -14,11 +14,17 @@
 }
 {*****************************************************************************}
 {$mode objfpc}{$h+}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit FPColHash;
+{$ENDIF FPC_DOTTEDUNITS}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses System.SysUtils, System.Classes, FpImage;
+{$ELSE FPC_DOTTEDUNITS}
 uses sysutils, classes, fpimage;
+{$ENDIF FPC_DOTTEDUNITS}
 
 type TFPColorHashException = class(Exception);
 

packages/fcl-image/src/fpditherer.pas

@@ -15,11 +15,17 @@
 {*****************************************************************************}
 
 {$mode objfpc}{$h+}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit FPDitherer;
+{$ENDIF FPC_DOTTEDUNITS}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses System.SysUtils, System.Classes, FpImage, FpImage.ColorHash;
+{$ELSE FPC_DOTTEDUNITS}
 uses sysutils, classes, fpimage, fpcolhash;
+{$ENDIF FPC_DOTTEDUNITS}
 
 type
   FPDithererException = class (exception);
@@ -541,4 +547,4 @@ begin
 end;
 
 
-end.
+end.

packages/fcl-image/src/fpimage.pp

@@ -2,7 +2,7 @@
     This file is part of the Free Pascal run time library.
     Copyright (c) 2003 by the Free Pascal development team
 
-    FPImage base definitions.
+    FpImage base definitions.
 
     See the file COPYING.FPC, included in this distribution,
     for details about the copyright.
@@ -13,11 +13,15 @@
 
  **********************************************************************}
 {$mode objfpc}{$h+}
-unit FPImage;
+unit FpImage;
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses System.SysUtils, System.Classes;
+{$ELSE FPC_DOTTEDUNITS}
 uses sysutils, classes;
+{$ENDIF FPC_DOTTEDUNITS}
 
 type
 
@@ -577,7 +581,7 @@ begin
   raise FPImageException.Create (ErrorText[Fmt]);
 end;
 
-{$i FPImage.inc}
+{$i FpImage.inc}
 {$i FPHandler.inc}
 {$i FPPalette.inc}
 {$i FPColCnv.inc}

packages/fcl-image/src/fpimgbarcode.pp

@@ -13,18 +13,25 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
  **********************************************************************}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit FPImgBarCode;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$mode objfpc}{$H+}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.Classes, System.SysUtils, FpImage.Canvas, FpImage, System.Types, FpImage.BarCode;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   Classes, SysUtils, fpcanvas, fpimage, types, fpbarcode;
+{$ENDIF FPC_DOTTEDUNITS}
 
 Type
   // So people don't need to include fpBarcode
-  TBarcodeEncoding = fpbarcode.TBarcodeEncoding;
+  TBarcodeEncoding = {$IFDEF FPC_DOTTEDUNITS}FpImage.BarCode{$ELSE}fpbarcode{$ENDIF}.TBarcodeEncoding;
 
   { TFPDrawBarCode }
 
@@ -81,8 +88,13 @@ Function DrawBarCode(Img : TFPCustomImage; Rect : TRect; S : String; E : TBarcod
 
 implementation
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  FpImage.ImageCanvas;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   FPImgCanv;
+{$ENDIF FPC_DOTTEDUNITS}
 
 Function DrawBarCode(Img : TFPCustomImage; S : String; E : TBarcodeEncoding; aWidth : Integer = 1; AWeight : Double = 2.0) : Boolean;
 

packages/fcl-image/src/fpimgcanv.pp

@@ -13,11 +13,17 @@
 
  **********************************************************************}
 {$mode objfpc}{$h+}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit FPImgCanv;
+{$ENDIF FPC_DOTTEDUNITS}
 
 interface
 
-uses FPPixlCanv, FPImage, classes;
+{$IFDEF FPC_DOTTEDUNITS}
+uses FpImage.PixelCanvas, FpImage, System.Classes;
+{$ELSE FPC_DOTTEDUNITS}
+uses FPPixlCanv, FpImage, classes;
+{$ENDIF FPC_DOTTEDUNITS}
 
 type
   TFPImageCanvas = class (TFPPixelCanvas)
@@ -37,7 +43,11 @@ type
 
 implementation
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses FpImage.Clipping;
+{$ELSE FPC_DOTTEDUNITS}
 uses clipping;
+{$ENDIF FPC_DOTTEDUNITS}
 
 constructor TFPImageCanvas.create (AnImage : TFPCustomImage);
 begin

packages/fcl-image/src/fpimgcmn.pp

@@ -12,8 +12,12 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
  **********************************************************************}
-{$mode objfpc}{$h+}
+{$mode objfpc}
+{$h+}
+
+{$IFNDEF FPC_DOTTEDUNITS}
 unit FPImgCmn;
+{$ENDIF FPC_DOTTEDUNITS}
 
 interface
 
@@ -27,7 +31,11 @@ function CalculateCRC (CRC:longword; var data; alength:integer) : longword;
 
 implementation
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses System.SysUtils;
+{$ELSE FPC_DOTTEDUNITS}
 uses sysutils;
+{$ENDIF FPC_DOTTEDUNITS}
 
 function Swap(This : Word): Word;
 var

packages/fcl-image/src/fpimggauss.pp

@@ -15,14 +15,21 @@
 
 }
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit FPImgGauss;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$mode objfpc}{$H+}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.Math, System.Classes, FpImage;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   Math, Classes, FPimage;
+{$ENDIF FPC_DOTTEDUNITS}
 
 { Fast Gaussian blur to Area (excluding Area.Right and Area.Bottom)
   Pixels outside the image are treated as having the same color as the edge.

packages/fcl-image/src/fpimgqrcode.pp

@@ -12,14 +12,21 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
  **********************************************************************}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit FPImgQRCode;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$mode objfpc}{$H+}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.Classes, System.SysUtils, FpImage, FpImage.QRCodeGen;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   Classes, SysUtils, fpImage, fpqrcodegen;
+{$ENDIF FPC_DOTTEDUNITS}
 
 type
 

packages/fcl-image/src/fppixlcanv.pp

@@ -13,11 +13,17 @@
 
  **********************************************************************}
 {$mode objfpc}{$h+}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit FPPixlCanv;
+{$ENDIF FPC_DOTTEDUNITS}
 
 interface
 
-uses Sysutils, classes, FPImage, FPCanvas, PixTools, ellipses;
+{$IFDEF FPC_DOTTEDUNITS}
+uses System.SysUtils, System.Classes, FpImage, FpImage.Canvas, FpImage.PixelTools, FpImage.Ellipses;
+{$ELSE FPC_DOTTEDUNITS}
+uses Sysutils, classes, FpImage, FPCanvas, PixTools, ellipses;
+{$ENDIF FPC_DOTTEDUNITS}
 
 type
 
@@ -67,7 +73,11 @@ const
 
 implementation
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses FpImage.Clipping;
+{$ELSE FPC_DOTTEDUNITS}
 uses Clipping;
+{$ENDIF FPC_DOTTEDUNITS}
 
 const
   DefaultHashWidth = 15;

packages/fcl-image/src/fpqrcodegen.pp

@@ -1,5 +1,5 @@
 { **********************************************************************
-    This file is part of the Free Pascal class library FCL.
+    This file is part of the Free Pascal class library Fcl.
     Pascal translation and additions (c) 2017 by Michael Van Canneyt,
     member of the Free Pascal development team.
 
@@ -17,11 +17,17 @@
     https://www.nayuki.io/page/qr-code-generator-library
   **********************************************************************}
 {$mode objfpc}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit FPQRCodeGen;
+{$ENDIF FPC_DOTTEDUNITS}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses System.SysUtils;
+{$ELSE FPC_DOTTEDUNITS}
 uses sysutils;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {---- Enum and struct types----}
 

packages/fcl-image/src/fpquantizer.pas

@@ -15,11 +15,17 @@
 {*****************************************************************************}
 
 {$mode objfpc}{$h+}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit FPQuantizer;
+{$ENDIF FPC_DOTTEDUNITS}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses System.SysUtils, System.Classes, FpImage, FpImage.ColorHash;
+{$ELSE FPC_DOTTEDUNITS}
 uses sysutils, classes, fpimage, fpcolhash;
+{$ENDIF FPC_DOTTEDUNITS}
 
 type
   FPQuantizerException = class (exception);
@@ -784,4 +790,4 @@ begin
   end;
 end;
 
-end.
+end.

packages/fcl-image/src/fpreadbmp.pp

@@ -23,11 +23,17 @@
 {$mode objfpc}
 {$h+}
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit FPReadBMP;
+{$ENDIF FPC_DOTTEDUNITS}
 
 interface
 
-uses FPImage, classes, sysutils, BMPcomn;
+{$IFDEF FPC_DOTTEDUNITS}
+uses FpImage, System.Classes, System.SysUtils, FpImage.Common.Bitmap;
+{$ELSE FPC_DOTTEDUNITS}
+uses FpImage, classes, sysutils, BMPcomn;
+{$ENDIF FPC_DOTTEDUNITS}
 
 type
   TFPReaderBMP = class (TFPCustomImageReader)

packages/fcl-image/src/fpreadgif.pas

@@ -15,14 +15,21 @@
 
   ToDo: read further images
 }
+{$IFNDEF FPC_DOTTEDUNITS}
 unit FPReadGif;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$mode objfpc}{$H+}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.Classes, System.SysUtils, FpImage;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   Classes, SysUtils, FPimage;
+{$ENDIF FPC_DOTTEDUNITS}
 
 type
   TGifRGB = packed record

packages/fcl-image/src/fpreadjpeg.pas

@@ -17,19 +17,26 @@
   ToDo:
     - palette
 }
+{$IFNDEF FPC_DOTTEDUNITS}
 unit FPReadJPEG;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$mode objfpc}
 {$H+}
 {$openstrings on}
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
 uses
-  Classes, SysUtils, Types, FPImage, JPEGLib, JdAPImin, JDataSrc, JdAPIstd, JmoreCfg;
+  System.Classes, System.SysUtils, System.Types, FpImage, System.Jpeg.Jpeglib, System.Jpeg.Jdapimin, System.Jpeg.Jdatasrc, System.Jpeg.Jdapistd, System.Jpeg.Jmorecfg;
+{$ELSE FPC_DOTTEDUNITS}
+uses
+  Classes, SysUtils, Types, FpImage, JPEGLib, JdAPImin, JDataSrc, JdAPIstd, JmoreCfg;
+{$ENDIF FPC_DOTTEDUNITS}
 
 type
   { TFPReaderJPEG }
-  { This is a FPImage reader for jpeg images. }
+  { This is a FpImage reader for jpeg images. }
 
   TFPReaderJPEG = class;
 

packages/fcl-image/src/fpreadpcx.pas

@@ -17,13 +17,19 @@
   Load all format compressed or not
 }
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit FPReadPCX;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$mode objfpc}{$H+}
 
 interface
 
-uses FPImage, Classes, SysUtils, pcxcomn;
+{$IFDEF FPC_DOTTEDUNITS}
+uses FpImage, System.Classes, System.SysUtils, FpImage.Common.PCX;
+{$ELSE FPC_DOTTEDUNITS}
+uses FpImage, Classes, SysUtils, pcxcomn;
+{$ENDIF FPC_DOTTEDUNITS}
 
 type
 

packages/fcl-image/src/fpreadpng.pp

@@ -13,12 +13,19 @@
 
  **********************************************************************}
 {$mode objfpc}{$h+}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit FPReadPNG;
+{$ENDIF FPC_DOTTEDUNITS}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
 uses
-  SysUtils,Classes, FPImage, FPImgCmn, PNGComn, ZStream;
+  System.SysUtils,System.Classes, FpImage, FpImage.Common, FpImage.Common.PNG, System.ZLib.Zstream;
+{$ELSE FPC_DOTTEDUNITS}
+uses
+  SysUtils,Classes, FpImage, FPImgCmn, PNGComn, ZStream;
+{$ENDIF FPC_DOTTEDUNITS}
 
 Type
 

packages/fcl-image/src/fpreadpnm.pp

@@ -22,11 +22,17 @@ The PNM (Portable aNyMaps) is a generic name for :
 There is normally no file format associated  with PNM itself.}
 
 {$mode objfpc}{$h+}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit FPReadPNM;
+{$ENDIF FPC_DOTTEDUNITS}
 
 interface
 
-uses FPImage, classes, sysutils;
+{$IFDEF FPC_DOTTEDUNITS}
+uses FpImage, System.Classes, System.SysUtils;
+{$ELSE FPC_DOTTEDUNITS}
+uses FpImage, classes, sysutils;
+{$ENDIF FPC_DOTTEDUNITS}
 
 Const
   BufSize = 1024;

packages/fcl-image/src/fpreadpsd.pas

@@ -15,14 +15,21 @@
 
   ToDo: read further images
 }
+{$IFNDEF FPC_DOTTEDUNITS}
 unit FPReadPSD;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$mode objfpc}{$H+}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.Classes, System.SysUtils, FpImage;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   Classes, SysUtils, FPimage;
+{$ENDIF FPC_DOTTEDUNITS}
 
 type
   TRGB = packed record

packages/fcl-image/src/fpreadqoi.pas

@@ -13,11 +13,17 @@
 
  **********************************************************************}
 {$mode objfpc}{$h+}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit FPReadQoi;
+{$ENDIF FPC_DOTTEDUNITS}
 
 interface
 
-uses FPImage, classes, sysutils, QoiComn;
+{$IFDEF FPC_DOTTEDUNITS}
+uses FpImage, System.Classes, System.SysUtils, FpImage.Common.QOI;
+{$ELSE FPC_DOTTEDUNITS}
+uses FpImage, classes, sysutils, QoiComn;
+{$ENDIF FPC_DOTTEDUNITS}
 
 type
   TFPReaderQoi = class (TFPCustomImageReader)

packages/fcl-image/src/fpreadtga.pp

@@ -19,11 +19,17 @@
 {$mode objfpc}
 {$h+}
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit FPReadTGA;
+{$ENDIF FPC_DOTTEDUNITS}
 
 interface
 
-uses FPImage, classes, sysutils, targacmn;
+{$IFDEF FPC_DOTTEDUNITS}
+uses FpImage, System.Classes, System.SysUtils, FpImage.Common.Targa;
+{$ELSE FPC_DOTTEDUNITS}
+uses FpImage, classes, sysutils, targacmn;
+{$ENDIF FPC_DOTTEDUNITS}
 
 const
   TARGA_EMPTY_IMAGE = 0;

packages/fcl-image/src/fpreadtiff.pas

@@ -38,7 +38,9 @@
    Separate mask (deprecated)
 
 }
+{$IFNDEF FPC_DOTTEDUNITS}
 unit FPReadTiff;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$mode objfpc}{$H+}
 
@@ -46,8 +48,13 @@ unit FPReadTiff;
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.Math, System.Classes, System.SysUtils, System.CTypes, System.ZLib.Zinflate, System.ZLib.Zbase, FpImage, FpImage.Common.TIFF;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   Math, Classes, SysUtils, ctypes, zinflate, zbase, FPimage, FPTiffCmn;
+{$ENDIF FPC_DOTTEDUNITS}
 
 type
   TFPReaderTiff = class;

packages/fcl-image/src/fpreadxpm.pp

@@ -13,11 +13,17 @@
 
  **********************************************************************}
 {$mode objfpc}{$h+}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit FPReadXPM;
+{$ENDIF FPC_DOTTEDUNITS}
 
 interface
 
-uses FPImage, classes, sysutils;
+{$IFDEF FPC_DOTTEDUNITS}
+uses FpImage, System.Classes, System.SysUtils;
+{$ELSE FPC_DOTTEDUNITS}
+uses FpImage, classes, sysutils;
+{$ENDIF FPC_DOTTEDUNITS}
 
 type
   TFPReaderXPM = class (TFPCustomImageReader)

packages/fcl-image/src/fpreadxwd.pas

@@ -23,11 +23,17 @@
 {$mode objfpc}
 {$h+}
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit FPReadXWD;
+{$ENDIF FPC_DOTTEDUNITS}
 
 interface
 
-uses FPImage, classes, sysutils, xwdfile;
+{$IFDEF FPC_DOTTEDUNITS}
+uses FpImage, System.Classes, System.SysUtils, Api.Xwdfile;
+{$ELSE FPC_DOTTEDUNITS}
+uses FpImage, classes, sysutils, xwdfile;
+{$ENDIF FPC_DOTTEDUNITS}
 
 type
   TXWDColors = array of TXWDColor;

packages/fcl-image/src/fptiffcmn.pas

@@ -13,14 +13,21 @@
 
  **********************************************************************
 }
+{$IFNDEF FPC_DOTTEDUNITS}
 unit FPTiffCmn;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$mode objfpc}{$H+}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.Classes, System.SysUtils, FpImage;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   Classes, sysutils, FPimage;
+{$ENDIF FPC_DOTTEDUNITS}
 
 type
   TTiffRational = packed record
@@ -201,7 +208,7 @@ var
   i: Integer;
 begin
   for i:=Img.ExtraCount-1 downto 0 do
-    if SysUtils.CompareText(copy(Img.ExtraKey[i],1,4),'Tiff')=0 then
+    if CompareText(copy(Img.ExtraKey[i],1,4),'Tiff')=0 then
       Img.RemoveExtra(Img.ExtraKey[i]);
 end;
 
@@ -211,7 +218,7 @@ var
 begin
   ClearTiffExtras(DestImg);
   for i:=SrcImg.ExtraCount-1 downto 0 do
-    if SysUtils.CompareText(copy(SrcImg.ExtraKey[i],1,4),'Tiff')=0 then
+    if CompareText(copy(SrcImg.ExtraKey[i],1,4),'Tiff')=0 then
       DestImg.Extra[SrcImg.ExtraKey[i]]:=SrcImg.ExtraValue[i];
 end;
 

packages/fcl-image/src/fpwritebmp.pp

@@ -21,11 +21,17 @@
 }
 
 {$mode objfpc}{$h+}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit FPWriteBMP;
+{$ENDIF FPC_DOTTEDUNITS}
 
 interface
 
-uses FPImage, classes, sysutils, BMPComn;
+{$IFDEF FPC_DOTTEDUNITS}
+uses FpImage, System.Classes, System.SysUtils, FpImage.Common.Bitmap;
+{$ELSE FPC_DOTTEDUNITS}
+uses FpImage, classes, sysutils, BMPComn;
+{$ENDIF FPC_DOTTEDUNITS}
 
 type
 

packages/fcl-image/src/fpwritejpeg.pas

@@ -14,7 +14,9 @@
   along with this library; if not, write to the Free Software Foundation, Inc.,
   51 Franklin Street, Fifth Floor, Boston, MA 02111-1301, USA.
 }
+{$IFNDEF FPC_DOTTEDUNITS}
 unit FPWriteJPEG;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$mode objfpc}
 {$H+}
@@ -22,9 +24,15 @@ unit FPWriteJPEG;
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
 uses
-  Classes, SysUtils, FPImage, JPEGLib, FPReadJPEG, JcAPIstd, JcAPImin, JDataDst,
+  System.Classes, System.SysUtils, FpImage, System.Jpeg.Jpeglib, FpImage.Reader.JPEG, System.Jpeg.Jcapistd, System.Jpeg.Jcapimin, System.Jpeg.Jdatadst,
+  System.Jpeg.Jcparam, System.Jpeg.Jerror;
+{$ELSE FPC_DOTTEDUNITS}
+uses
+  Classes, SysUtils, FpImage, JPEGLib, FPReadJPEG, JcAPIstd, JcAPImin, JDataDst,
   JcParam, JError;
+{$ENDIF FPC_DOTTEDUNITS}
 
 type
   { TFPWriterJPEG }
@@ -106,7 +114,7 @@ var
   begin
     FillChar(FInfo, sizeof(FInfo), 0);
     FError := jpeg_std_error;
-    FInfo.err := jerror.jpeg_std_error(FError);
+    FInfo.err := {$IFDEF FPC_DOTTEDUNITS}System.Jpeg.{$ENDIF}jerror.jpeg_std_error(FError);
 
     jpeg_create_compress(@FInfo);
     FProgressMgr.pub.progress_monitor := @ProgressCallback;

packages/fcl-image/src/fpwritepcx.pas

@@ -17,13 +17,19 @@
   Save in format 24 bits compressed or not
 }
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit FPWritePCX;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$mode objfpc}{$H+}
 
 interface
 
-uses FPImage, Classes, SysUtils;
+{$IFDEF FPC_DOTTEDUNITS}
+uses FpImage, System.Classes, System.SysUtils;
+{$ELSE FPC_DOTTEDUNITS}
+uses FpImage, Classes, SysUtils;
+{$ENDIF FPC_DOTTEDUNITS}
 
 type
 
@@ -40,7 +46,11 @@ type
 
 implementation
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses FpImage.Common.PCX;
+{$ELSE FPC_DOTTEDUNITS}
 uses pcxcomn;
+{$ENDIF FPC_DOTTEDUNITS}
 
 function TFPWriterPCX.SaveHeader(Stream: TStream; Img: TFPCustomImage): boolean;
 var

packages/fcl-image/src/fpwritepng.pp

@@ -13,11 +13,17 @@
 
  **********************************************************************}
 {$mode objfpc}{$h+}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit FPWritePNG;
+{$ENDIF FPC_DOTTEDUNITS}
 
 interface
 
-uses sysutils, classes, FPImage, FPImgCmn, PNGComn, ZStream;
+{$IFDEF FPC_DOTTEDUNITS}
+uses System.SysUtils, System.Classes, FpImage, FpImage.Common, FpImage.Common.PNG, System.ZLib.Zstream;
+{$ELSE FPC_DOTTEDUNITS}
+uses sysutils, classes, FpImage, FPImgCmn, PNGComn, ZStream;
+{$ENDIF FPC_DOTTEDUNITS}
 
 type
 

packages/fcl-image/src/fpwritepnm.pp

@@ -18,11 +18,17 @@
     * PGM (P2,P5) : Portable GrayMap format : 8 bits per pixel for P2 (ASCII), 8 or 16 bit for P5 (binary)
     * PPM (P3,P6) : Portable PixelMap format : 24 bits per pixel for P3 (ASCII), 24 or 48 bit for P6 (binary)}
 {$mode objfpc}{$h+}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit FPWritePNM;
+{$ENDIF FPC_DOTTEDUNITS}
 
 interface
 
-uses FPImage, classes, sysutils;
+{$IFDEF FPC_DOTTEDUNITS}
+uses FpImage, System.Classes, System.SysUtils;
+{$ELSE FPC_DOTTEDUNITS}
+uses FpImage, classes, sysutils;
+{$ENDIF FPC_DOTTEDUNITS}
 
 type
   TPNMColorDepth = (pcdAuto,pcdBlackWhite, pcdGrayscale, pcdRGB);

packages/fcl-image/src/fpwriteqoi.pas

@@ -13,10 +13,16 @@
 
  **********************************************************************}
 {$mode objfpc}{$h+}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit fpwriteqoi;
+{$ENDIF FPC_DOTTEDUNITS}
 interface
 
-uses FPImage, classes, sysutils, QoiComn;
+{$IFDEF FPC_DOTTEDUNITS}
+uses FpImage, System.Classes, System.SysUtils, FpImage.Common.QOI;
+{$ELSE FPC_DOTTEDUNITS}
+uses FpImage, classes, sysutils, QoiComn;
+{$ENDIF FPC_DOTTEDUNITS}
 
 type
 

packages/fcl-image/src/fpwritetga.pp

@@ -14,11 +14,17 @@
 }
 {*****************************************************************************}
 {$mode objfpc}{$h+}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit FPWriteTGA;
+{$ENDIF FPC_DOTTEDUNITS}
 
 interface
 
-uses FPImage, classes, sysutils;
+{$IFDEF FPC_DOTTEDUNITS}
+uses FpImage, System.Classes, System.SysUtils;
+{$ELSE FPC_DOTTEDUNITS}
+uses FpImage, classes, sysutils;
+{$ENDIF FPC_DOTTEDUNITS}
 
 type
 
@@ -31,7 +37,11 @@ type
 
 implementation
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses FpImage.Common.Targa;
+{$ELSE FPC_DOTTEDUNITS}
 uses targacmn;
+{$ENDIF FPC_DOTTEDUNITS}
 
 function TFPWriterTarga.SaveHeader(Stream:TStream; Img : TFPCustomImage):boolean;
 

packages/fcl-image/src/fpwritetiff.pas

@@ -31,14 +31,21 @@
    endian - currently using system endianess
    orientation with rotation
 }
+{$IFNDEF FPC_DOTTEDUNITS}
 unit FPWriteTiff;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$mode objfpc}{$H+}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.Math, System.Classes, System.SysUtils, System.ZLib.Zbase, System.ZLib.Zdeflate, FpImage, FpImage.Common.TIFF;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   Math, Classes, SysUtils, zbase, zdeflate, FPimage, FPTiffCmn;
+{$ENDIF FPC_DOTTEDUNITS}
 
 type
 

packages/fcl-image/src/fpwritexpm.pp

@@ -13,11 +13,17 @@
 
  **********************************************************************}
 {$mode objfpc}{$h+}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit FPWriteXPM;
+{$ENDIF FPC_DOTTEDUNITS}
 
 interface
 
-uses FPImage, classes, sysutils;
+{$IFDEF FPC_DOTTEDUNITS}
+uses FpImage, System.Classes, System.SysUtils;
+{$ELSE FPC_DOTTEDUNITS}
+uses FpImage, classes, sysutils;
+{$ENDIF FPC_DOTTEDUNITS}
 
 type
 

packages/fcl-image/src/freetype.pp

@@ -15,13 +15,19 @@
 {$mode objfpc}
 {$h+}
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit freetype;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$DEFINE DYNAMIC}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses System.SysUtils, System.Classes, {$IFDEF DYNAMIC}Api.Freetypehdyn{$ELSE}Api.Freetypeh{$ENDIF}, FpImage.Common;
+{$ELSE FPC_DOTTEDUNITS}
 uses sysutils, classes, {$IFDEF DYNAMIC}freetypehdyn{$ELSE}freetypeh{$ENDIF}, FPImgCmn;
+{$ENDIF FPC_DOTTEDUNITS}
 
 { TODO : take resolution in account to find the size }
 { TODO : speed optimization: search glyphs with a hash-function/tree/binary search/... }

packages/fcl-image/src/freetypeh.pp

@@ -13,7 +13,9 @@
 
  **********************************************************************}
 {$mode objfpc}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit freetypeh;
+{$ENDIF FPC_DOTTEDUNITS}
 
 interface
 

packages/fcl-image/src/freetypehdyn.pp

@@ -13,11 +13,17 @@
 
  **********************************************************************}
 {$mode objfpc}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit freetypehdyn;
+{$ENDIF FPC_DOTTEDUNITS}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses System.SysUtils, System.DynLibs;
+{$ELSE FPC_DOTTEDUNITS}
 uses sysutils, dynlibs;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$DEFINE DYNAMIC}
 

packages/fcl-image/src/ftfont.pp

@@ -13,16 +13,25 @@
 
  **********************************************************************}
 {$mode objfpc}{$h+}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit ftfont;
+{$ENDIF FPC_DOTTEDUNITS}
 
 interface
 
 {$DEFINE DYNAMIC}
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.SysUtils, System.Classes, FpImage.Canvas, FpImage.Common, System.Math,
+  {$IFDEF DYNAMIC}Api.Freetypehdyn{$ELSE} Api.Freetypeh{$ENDIF},
+  Api.Freetype;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   SysUtils, Classes, FPCanvas, fpimgcmn, math,
   {$IFDEF DYNAMIC}freetypehdyn{$ELSE} freetypeh{$ENDIF},
   freetype;
+{$ENDIF FPC_DOTTEDUNITS}
 
 type
 
@@ -82,7 +91,11 @@ procedure DoneEngine;
 
 implementation
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses FpImage;
+{$ELSE FPC_DOTTEDUNITS}
 uses fpimage;
+{$ENDIF FPC_DOTTEDUNITS}
 
 procedure InitEngine;
 
@@ -377,11 +390,11 @@ procedure TFreeTypeFont.DrawChar (x,y:integer; data:PByteArray; pitch, width, he
     case canv.DrawingMode of
       dmOpaque:
       begin
-        pixelcolor := FPImage.FPColor(c.red, c.green,c.blue, (t+1) shl 8 - 1); // opaque: ignore c.Alpha
+        pixelcolor := FpImage.FPColor(c.red, c.green,c.blue, (t+1) shl 8 - 1); // opaque: ignore c.Alpha
         canv.colors[x,y] := AlphaBlend(canv.colors[x,y], pixelcolor);
       end;
     else
-      pixelcolor := FPImage.FPColor(c.red, c.green,c.blue, ((t+1) shl 8 - 1) * c.Alpha div $ffff); // apply c.Alpha
+      pixelcolor := FpImage.FPColor(c.red, c.green,c.blue, ((t+1) shl 8 - 1) * c.Alpha div $ffff); // apply c.Alpha
       canv.DrawPixel(x,y,pixelcolor);
     end;
   end;

packages/fcl-image/src/pcxcomn.pas

@@ -12,7 +12,9 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
  **********************************************************************}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit pcxcomn;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$mode objfpc}{$H+}
 

packages/fcl-image/src/pixtools.pp

@@ -13,11 +13,17 @@
 
  **********************************************************************}
 {$mode objfpc}{$h+}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit PixTools;
+{$ENDIF FPC_DOTTEDUNITS}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses System.Classes, FpImage.Canvas, FpImage;
+{$ELSE FPC_DOTTEDUNITS}
 uses classes, FPCanvas, FPimage;
+{$ENDIF FPC_DOTTEDUNITS}
 
 procedure DrawSolidLine (Canv : TFPCustomCanvas; x1,y1, x2,y2:integer; const color:TFPColor);
 procedure DrawPatternLine (Canv:TFPCustomCanvas; x1,y1, x2,y2:integer; Pattern:TPenPattern; const color:TFPColor);
@@ -60,7 +66,11 @@ procedure FillFloodImageRel (Canv:TFPCustomCanvas; x,y :integer; const Image:TFP
 
 implementation
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses FpImage.Clipping;
+{$ELSE FPC_DOTTEDUNITS}
 uses clipping;
+{$ENDIF FPC_DOTTEDUNITS}
 
 procedure FillRectangleColor (Canv:TFPCustomCanvas; x1,y1, x2,y2:integer);
 begin

packages/fcl-image/src/pngcomn.pp

@@ -13,11 +13,17 @@
 
  **********************************************************************}
 {$mode objfpc}{$h+}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit PNGComn;
+{$ENDIF FPC_DOTTEDUNITS}
 
 interface
 
-uses SysUtils, FPImage, FPImgCmn;
+{$IFDEF FPC_DOTTEDUNITS}
+uses System.SysUtils, FpImage, FpImage.Common;
+{$ELSE FPC_DOTTEDUNITS}
+uses SysUtils, FpImage, FPImgCmn;
+{$ENDIF FPC_DOTTEDUNITS}
 
 type
 

packages/fcl-image/src/pscanvas.pp

@@ -22,12 +22,19 @@
 {$mode objfpc}
 {$H+}
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit pscanvas;
+{$ENDIF FPC_DOTTEDUNITS}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.Classes, System.SysUtils,FpImage,FpImage.Canvas;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   Classes, SysUtils,fpimage,fpcanvas;
+{$ENDIF FPC_DOTTEDUNITS}
 
 type
   TPostScript = class;

packages/fcl-image/src/qoicomn.pas

@@ -13,7 +13,9 @@
 
  **********************************************************************}
 {$mode objfpc}{$h+}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit qoicomn;
+{$ENDIF FPC_DOTTEDUNITS}
 
 interface
 

packages/fcl-image/src/targacmn.pp

@@ -16,7 +16,9 @@
 
 {$mode objfpc}
 {$h+}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit targacmn;
+{$ENDIF FPC_DOTTEDUNITS}
 
 interface