* Dotted filenames for package fcl-xml

packages/fcl-xml/namespaced/Html.Defs.pp

@@ -0,0 +1,3 @@
+unit Html.Defs;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i htmldefs.pp}

packages/fcl-xml/namespaced/Html.Dom.pp

@@ -0,0 +1,3 @@
+unit Html.Dom;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i dom_html.pp}

packages/fcl-xml/namespaced/Html.Sax.pp

@@ -0,0 +1,3 @@
+unit Html.Sax;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i sax_html.pp}

packages/fcl-xml/namespaced/Html.Writer.pp

@@ -0,0 +1,3 @@
+unit Html.Writer;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i htmlwriter.pp}

packages/fcl-xml/namespaced/Xml.Conf.pp

@@ -0,0 +1,3 @@
+unit Xml.Conf;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i xmlconf.pp}

packages/fcl-xml/namespaced/Xml.Config.pp

@@ -0,0 +1,3 @@
+unit Xml.Config;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i xmlcfg.pp}

packages/fcl-xml/namespaced/Xml.Dom.pp

@@ -0,0 +1,3 @@
+unit Xml.Dom;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i dom.pp}

packages/fcl-xml/namespaced/Xml.DtdModel.pp

@@ -0,0 +1,3 @@
+unit Xml.DtdModel;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i dtdmodel.pp}

packages/fcl-xml/namespaced/Xml.HtmWrite.pp

@@ -0,0 +1,3 @@
+unit Xml.HtmWrite;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i htmwrite.pp}

packages/fcl-xml/namespaced/Xml.HtmlElements.pp

@@ -0,0 +1,3 @@
+unit Xml.HtmlElements;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i htmlelements.pp}

packages/fcl-xml/namespaced/Xml.IConv.pas

@@ -0,0 +1,3 @@
+unit Xml.IConv;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i xmliconv.pas}

packages/fcl-xml/namespaced/Xml.Read.pp

@@ -0,0 +1,3 @@
+unit Xml.Read;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i xmlread.pp}

packages/fcl-xml/namespaced/Xml.Reader.pp

@@ -0,0 +1,3 @@
+unit Xml.Reader;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i xmlreader.pp}

packages/fcl-xml/namespaced/Xml.Sax.pp

@@ -0,0 +1,3 @@
+unit Xml.Sax;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i sax.pp}

packages/fcl-xml/namespaced/Xml.SimpleSax.pp

@@ -0,0 +1,3 @@
+unit Xml.SimpleSax;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i sax_xml.pp}

packages/fcl-xml/namespaced/Xml.Streaming.pp

@@ -0,0 +1,3 @@
+unit Xml.Streaming;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i xmlstreaming.pp}

packages/fcl-xml/namespaced/Xml.TextReader.pp

@@ -0,0 +1,3 @@
+unit Xml.TextReader;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i xmltextreader.pp}

packages/fcl-xml/namespaced/Xml.Utils.pp

@@ -0,0 +1,3 @@
+unit Xml.Utils;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i xmlutils.pp}

packages/fcl-xml/namespaced/Xml.Windows.IConv.pas

@@ -0,0 +1,3 @@
+unit Xml.Windows.IConv;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i xmliconv_windows.pas}

packages/fcl-xml/namespaced/Xml.Writer.pp

@@ -0,0 +1,3 @@
+unit Xml.Writer;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i xmlwrite.pp}

packages/fcl-xml/namespaced/Xml.XHtml.pp

@@ -0,0 +1,3 @@
+unit Xml.XHtml;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i xhtml.pp}

packages/fcl-xml/namespaced/Xml.XPath.pp

@@ -0,0 +1,3 @@
+unit Xml.XPath;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i xpath.pp}

packages/fcl-xml/namespaces.lst

@@ -0,0 +1,24 @@
+src/htmlelements.pp=namespaced/Xml.HtmlElements.pp
+{s*:src/}=namespaced/
+{i+:src/}
+src/xmliconv_windows.pas=namespaced/Xml.Windows.IConv.pas
+src/xmlreader.pp=namespaced/Xml.Reader.pp
+src/sax_xml.pp=namespaced/Xml.SimpleSax.pp
+src/xmlutils.pp=namespaced/Xml.Utils.pp
+src/xhtml.pp=namespaced/Xml.XHtml.pp
+src/xmlstreaming.pp=namespaced/Xml.Streaming.pp
+src/xmltextreader.pp=namespaced/Xml.TextReader.pp
+src/xmliconv.pas=namespaced/Xml.IConv.pas
+src/xmlconf.pp=namespaced/Xml.Conf.pp
+src/htmwrite.pp=namespaced/Xml.HtmWrite.pp
+src/sax.pp=namespaced/Xml.Sax.pp
+src/htmldefs.pp=namespaced/Html.Defs.pp
+src/dtdmodel.pp=namespaced/Xml.DtdModel.pp
+src/sax_html.pp=namespaced/Html.Sax.pp
+src/dom_html.pp=namespaced/Html.Dom.pp
+src/htmlwriter.pp=namespaced/Html.Writer.pp
+src/dom.pp=namespaced/Xml.Dom.pp
+src/xpath.pp=namespaced/Xml.XPath.pp
+src/xmlread.pp=namespaced/Xml.Read.pp
+src/xmlcfg.pp=namespaced/Xml.Config.pp
+src/xmlwrite.pp=namespaced/Xml.Writer.pp

packages/fcl-xml/src/dom.pp

@@ -29,7 +29,9 @@
 }
 
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit DOM;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$ifdef fpc}
 {$MODE objfpc}{$H+}
@@ -37,8 +39,13 @@ unit DOM;
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.SysUtils, System.Classes, Xml.Utils, Xml.DtdModel;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   SysUtils, Classes, xmlutils, dtdmodel;
+{$ENDIF FPC_DOTTEDUNITS}
 
 // -------------------------------------------------------
 //   DOMException
@@ -114,7 +121,7 @@ type
 //   DOMString
 // -------------------------------------------------------
 
-  TSetOfChar = xmlutils.TSetOfChar;  { to be removed: not used in DOM unit }
+  TSetOfChar = {$IFDEF FPC_DOTTEDUNITS}Xml.Utils{$ELSE}xmlutils{$ENDIF}.TSetOfChar;  { to be removed: not used in DOM unit }
   DOMString = XMLString;
   DOMPChar = PXMLChar;
   PDOMString = ^DOMString;
@@ -548,7 +555,7 @@ type
 //   Attr
 // -------------------------------------------------------
 
-  TAttrDataType = xmlutils.TAttrDataType;
+  TAttrDataType = {$IFDEF FPC_DOTTEDUNITS}Xml.Utils{$ELSE}xmlutils{$ENDIF}.TAttrDataType;
 
   TDOMNode_NS = class(TDOMNode_WithChildren)
   protected
@@ -808,8 +815,13 @@ function LoadElement(doc: TDOMDocument; src: PNodeData; attrCount: Integer): TDO
 
 implementation
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  Fcl.UriParser;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   UriParser;
+{$ENDIF FPC_DOTTEDUNITS}
 
 { a namespace-enabled NamedNodeMap }
 type

packages/fcl-xml/src/dom_html.pp

@@ -17,11 +17,17 @@
 {$mode objfpc}
 {$H+}
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit DOM_HTML;
+{$ENDIF FPC_DOTTEDUNITS}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses Xml.Dom, Html.Defs, Xml.Utils, System.SysUtils;
+{$ELSE FPC_DOTTEDUNITS}
 uses DOM, htmldefs, xmlutils, SysUtils;
+{$ENDIF FPC_DOTTEDUNITS}
 
 type
   THTMLDocument = class;

packages/fcl-xml/src/dtdmodel.pp

@@ -13,7 +13,9 @@
 
  **********************************************************************}
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit dtdmodel;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$ifdef fpc}
 {$MODE objfpc}{$H+}
@@ -21,8 +23,13 @@ unit dtdmodel;
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.Classes, System.SysUtils, Xml.Utils;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   Classes, SysUtils, xmlutils;
+{$ENDIF FPC_DOTTEDUNITS}
 
 type
   TCPType = (ctName, ctChoice, ctSeq);

packages/fcl-xml/src/htmldefs.pp

@@ -16,7 +16,9 @@
  **********************************************************************}
 
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit HTMLDefs;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$MODE objfpc}
 {$H+}
@@ -402,7 +404,11 @@ function IsAutoClose(NewTag, OldTag: THTMLElementTag): Boolean;
 
 implementation
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses System.SysUtils;
+{$ELSE FPC_DOTTEDUNITS}
 uses SysUtils;
+{$ENDIF FPC_DOTTEDUNITS}
 
 { Define which elements auto-close other elements, modelled after libxml2.
   This is an array of variable-length lists, each terminated by etUnknown.

packages/fcl-xml/src/htmlelements.pp

@@ -11,14 +11,21 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
  **********************************************************************}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit htmlelements;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$mode objfpc}{$H+}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.Classes, System.SysUtils, Xml.Dom, Html.Defs, System.StrUtils;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   Classes, SysUtils, DOM, HtmlDefs, strutils;
+{$ENDIF FPC_DOTTEDUNITS}
 
 type
 

packages/fcl-xml/src/htmlwriter.pp

@@ -11,14 +11,21 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
  **********************************************************************}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit htmlwriter; 
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$mode objfpc}{$H+}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.Classes, System.SysUtils, Xml.Dom, Xml.HtmlElements;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   Classes, SysUtils, DOM, htmlelements;
+{$ENDIF FPC_DOTTEDUNITS}
 
 type
 
@@ -73,7 +80,11 @@ type
 
 implementation
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses Html.Defs;
+{$ELSE FPC_DOTTEDUNITS}
 uses HTMLDefs;
+{$ENDIF FPC_DOTTEDUNITS}
 
 resourcestring
   sErrNoCorespondingParent = 'No open element found with tag "%s"';

packages/fcl-xml/src/htmwrite.pp

@@ -15,14 +15,20 @@
  **********************************************************************}
 
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit HTMWrite;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$MODE objfpc}
 {$H+}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses System.Classes, Xml.Dom;
+{$ELSE FPC_DOTTEDUNITS}
 uses Classes, DOM;
+{$ENDIF FPC_DOTTEDUNITS}
 
 procedure WriteHTMLFile(doc: TXMLDocument; const AFileName: String);
 procedure WriteHTMLFile(doc: TXMLDocument; var AFile: Text);
@@ -37,7 +43,11 @@ procedure WriteHTML(Element: TDOMNode; AStream: TStream);
 
 implementation
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses System.SysUtils, Html.Defs, Xml.Utils;
+{$ELSE FPC_DOTTEDUNITS}
 uses SysUtils, HTMLDefs, xmlutils;
+{$ENDIF FPC_DOTTEDUNITS}
 
 type
   TSpecialCharCallback = procedure(c: WideChar) of object;

packages/fcl-xml/src/sax.pp

@@ -15,7 +15,9 @@
  **********************************************************************}
 
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit SAX;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$MODE objfpc}
 {$H+}
@@ -23,7 +25,11 @@ unit SAX;
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses System.SysUtils, System.Classes, Xml.Utils;
+{$ELSE FPC_DOTTEDUNITS}
 uses SysUtils, Classes, xmlutils;
+{$ENDIF FPC_DOTTEDUNITS}
 
 resourcestring
   SSAXAttributeIndexError = 'Invalid attribute index %d';

packages/fcl-xml/src/sax_html.pp

@@ -27,11 +27,17 @@
 {$mode objfpc}
 {$H+}
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit SAX_HTML;
+{$ENDIF FPC_DOTTEDUNITS}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses System.SysUtils, System.Classes, Xml.Sax, Xml.Dom, Html.Dom, Html.Defs,Xml.Utils;
+{$ELSE FPC_DOTTEDUNITS}
 uses SysUtils, Classes, SAX, DOM, DOM_HTML,htmldefs,xmlutils;
+{$ENDIF FPC_DOTTEDUNITS}
 
 type
 

packages/fcl-xml/src/sax_xml.pp

@@ -17,11 +17,17 @@
 {$mode objfpc}
 {$h+}
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit SAX_XML;
+{$ENDIF FPC_DOTTEDUNITS}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses System.SysUtils, System.Classes, Xml.Sax, Xml.Dom;
+{$ELSE FPC_DOTTEDUNITS}
 uses SysUtils, Classes, SAX, DOM;
+{$ENDIF FPC_DOTTEDUNITS}
 
 type
 
@@ -108,9 +114,15 @@ procedure ReadXMLFragment(AParentNode: TDOMNode; f: TStream);
 
 implementation
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  Xml.Utils,
+  Html.Defs; // for entities...
+{$ELSE FPC_DOTTEDUNITS}
 uses
   xmlutils,
   htmldefs; // for entities...
+{$ENDIF FPC_DOTTEDUNITS}
 
 const
   WhitespaceChars = [#9, #10, #13, ' '];

packages/fcl-xml/src/xhtml.pp

@@ -15,14 +15,20 @@
  **********************************************************************}
 
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit XHTML;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$MODE objfpc}
 {$H+}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses Xml.Dom, Html.Dom;
+{$ELSE FPC_DOTTEDUNITS}
 uses DOM, DOM_HTML;
+{$ENDIF FPC_DOTTEDUNITS}
 
 type
 

packages/fcl-xml/src/xmlcfg.pp

@@ -24,15 +24,23 @@
 { This unit is deprecated because it doesn't work well with non-ascii data.
   Attempts to change its behavior will likely cause problems with existing
   config files, so it is superseded altogether by xmlconf unit. }
+{$IFNDEF FPC_DOTTEDUNITS}
 unit XMLCfg deprecated;
+{$ENDIF FPC_DOTTEDUNITS}
 
 interface
 
 {off $DEFINE MEM_CHECK}
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  {$IFDEF MEM_CHECK}MemCheck,{$ENDIF}
+  System.SysUtils, System.Classes, Xml.Dom, Xml.Read, Xml.Writer;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   {$IFDEF MEM_CHECK}MemCheck,{$ENDIF}
   SysUtils, Classes, DOM, XMLRead, XMLWrite;
+{$ENDIF FPC_DOTTEDUNITS}
 
 resourcestring
   SMissingPathName = 'A part of the pathname is invalid (missing)';

packages/fcl-xml/src/xmlconf.pp

@@ -24,12 +24,19 @@
 {$H+}
 {$ENDIF}
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit XMLConf;
+{$ENDIF FPC_DOTTEDUNITS}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.SysUtils, System.Classes, Xml.Dom, Xml.Read, Xml.Writer;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   SysUtils, Classes, DOM, XMLRead, XMLWrite;
+{$ENDIF FPC_DOTTEDUNITS}
 
 resourcestring
   SWrongRootName = 'XML file has wrong root element name: expected "%s" but was "%s"';

packages/fcl-xml/src/xmliconv.pas

@@ -12,14 +12,24 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
  **********************************************************************}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit xmliconv;
+{$ENDIF FPC_DOTTEDUNITS}
+
+{$mode objfpc}
+{$h+}
 
 interface
 
 implementation
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  Xml.Read, UnixApi.Iconvenc, UnixApi.Types, UnixApi.Base, System.InitC;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   xmlread, iconvenc, unixtype, baseunix, initc;
+{$ENDIF FPC_DOTTEDUNITS}
 
 const
 {$ifdef FPC_LITTLE_ENDIAN}

packages/fcl-xml/src/xmliconv_windows.pas

@@ -14,14 +14,23 @@
 
  **********************************************************************}
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit xmliconv_windows;
+{$ENDIF FPC_DOTTEDUNITS}
+{$mode objfpc}
+{$h+}
 
 interface
 
 implementation
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  Xml.Read;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   xmlread;
+{$ENDIF FPC_DOTTEDUNITS}
 
 type
   iconv_t = Pointer;

packages/fcl-xml/src/xmlread.pp

@@ -14,7 +14,9 @@
 
  **********************************************************************}
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit XMLRead;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$ifdef fpc}
 {$MODE objfpc}{$H+}
@@ -22,18 +24,23 @@ unit XMLRead;
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.SysUtils, System.Classes, Xml.Dom, Xml.Utils, Xml.Reader, Xml.TextReader;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   SysUtils, Classes, DOM, xmlutils, xmlreader, xmltextreader;
+{$ENDIF FPC_DOTTEDUNITS}
 
 type
-  TErrorSeverity = xmlreader.TErrorSeverity;
-  EXMLReadError = xmlreader.EXMLReadError;
-  TXMLInputSource = xmlreader.TXMLInputSource;
+  TErrorSeverity = {$IFDEF FPC_DOTTEDUNITS}Xml.Reader{$ELSE}xmlreader{$ENDIF}.TErrorSeverity;
+  EXMLReadError = {$IFDEF FPC_DOTTEDUNITS}Xml.Reader{$ELSE}xmlreader{$ENDIF}.EXMLReadError;
+  TXMLInputSource = {$IFDEF FPC_DOTTEDUNITS}Xml.Reader{$ELSE}xmlreader{$ENDIF}.TXMLInputSource;
 
 const
-  esWarning = xmlreader.esWarning;
-  esError = xmlreader.esError;
-  esFatal = xmlreader.esFatal;
+  esWarning = {$IFDEF FPC_DOTTEDUNITS}Xml.Reader{$ELSE}xmlreader{$ENDIF}.esWarning;
+  esError = {$IFDEF FPC_DOTTEDUNITS}Xml.Reader{$ELSE}xmlreader{$ENDIF}.esError;
+  esFatal = {$IFDEF FPC_DOTTEDUNITS}Xml.Reader{$ELSE}xmlreader{$ENDIF}.esFatal;
 
 procedure ReadXMLFile(out ADoc: TXMLDocument; const AFilename: String); overload;
 procedure ReadXMLFile(out ADoc: TXMLDocument; var f: Text); overload;
@@ -51,8 +58,8 @@ procedure ReadDTDFile(out ADoc: TXMLDocument; f: TStream); overload;
 procedure ReadDTDFile(out ADoc: TXMLDocument; f: TStream; const ABaseURI: String); overload;
 
 type
-  TXMLErrorEvent = xmlreader.TXMLErrorEvent;
-  TDOMParseOptions = xmlreader.TXMLReaderSettings;
+  TXMLErrorEvent = {$IFDEF FPC_DOTTEDUNITS}Xml.Reader{$ELSE}xmlreader{$ENDIF}.TXMLErrorEvent;
+  TDOMParseOptions = {$IFDEF FPC_DOTTEDUNITS}Xml.Reader{$ELSE}xmlreader{$ENDIF}.TXMLReaderSettings;
 
   // NOTE: DOM 3 LS ACTION_TYPE enumeration starts at 1
   TXMLContextAction = (
@@ -78,8 +85,8 @@ type
     property OnError: TXMLErrorEvent read GetOnError write SetOnError;
   end;
 
-  TDecoder = xmltextreader.TDecoder;
-  TGetDecoderProc = xmltextreader.TGetDecoderProc;
+  TDecoder = {$IFDEF FPC_DOTTEDUNITS}Xml.TextReader{$ELSE}xmltextreader{$ENDIF}.TDecoder;
+  TGetDecoderProc = {$IFDEF FPC_DOTTEDUNITS}Xml.TextReader{$ELSE}xmltextreader{$ENDIF}.TGetDecoderProc;
 
 procedure RegisterDecoder(Proc: TGetDecoderProc);
 
@@ -87,8 +94,13 @@ procedure RegisterDecoder(Proc: TGetDecoderProc);
 
 implementation
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  Fcl.UriParser, Xml.DtdModel;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   UriParser, dtdmodel;
+{$ENDIF FPC_DOTTEDUNITS}
 
 type
   TLoader = object
@@ -106,7 +118,7 @@ type
 
 procedure RegisterDecoder(Proc: TGetDecoderProc);
 begin
-  xmltextreader.RegisterDecoder(Proc);
+  {$IFDEF FPC_DOTTEDUNITS}Xml.TextReader{$ELSE}xmltextreader{$ENDIF}.RegisterDecoder(Proc);
 end;
 
 { TDOMParser }

packages/fcl-xml/src/xmlreader.pp

@@ -13,14 +13,21 @@
 
  **********************************************************************}
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit XmlReader;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$mode objfpc}{$H+}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.Classes, System.SysUtils, Xml.Utils;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   Classes, SysUtils, xmlutils;
+{$ENDIF FPC_DOTTEDUNITS}
 
 type
   TErrorSeverity = (esWarning, esError, esFatal);

packages/fcl-xml/src/xmlstreaming.pp

@@ -14,14 +14,20 @@
  **********************************************************************}
 
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit XMLStreaming;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$MODE objfpc}
 {$H+}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses System.SysUtils, System.Classes, Xml.Dom;
+{$ELSE FPC_DOTTEDUNITS}
 uses SysUtils, Classes, DOM;
+{$ENDIF FPC_DOTTEDUNITS}
 
 type
 

packages/fcl-xml/src/xmltextreader.pp

@@ -14,13 +14,20 @@
 
  **********************************************************************}
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit xmltextreader;
+{$ENDIF FPC_DOTTEDUNITS}
 {$mode objfpc}{$h+}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.SysUtils, System.Classes, Xml.Utils, Xml.Reader, Xml.DtdModel;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   SysUtils, Classes, xmlutils, xmlreader, dtdmodel;
+{$ENDIF FPC_DOTTEDUNITS}
 
 type
   TDecoder = record
@@ -314,8 +321,13 @@ procedure RegisterDecoder(Proc: TGetDecoderProc);
 
 implementation
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  Fcl.UriParser;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   UriParser;
+{$ENDIF FPC_DOTTEDUNITS}
 
 type
   TXMLDecodingSource = class(TXMLCharSource)

packages/fcl-xml/src/xmlutils.pp

@@ -12,15 +12,22 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
  **********************************************************************}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit xmlutils;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$ifdef fpc}{$mode objfpc}{$endif}
 {$H+}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.SysUtils, System.Classes;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   SysUtils, Classes;
+{$ENDIF FPC_DOTTEDUNITS}
 
 type
   TXMLVersion = (xmlVersionUnknown, xmlVersion10, xmlVersion11);

packages/fcl-xml/src/xmlwrite.pp

@@ -15,14 +15,20 @@
  **********************************************************************}
 
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit XMLWrite;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$ifdef fpc}{$MODE objfpc}{$endif}
 {$H+}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses System.Classes, Xml.Dom, Xml.Utils;
+{$ELSE FPC_DOTTEDUNITS}
 uses Classes, DOM, xmlutils;
+{$ENDIF FPC_DOTTEDUNITS}
 
 Type
   TXMLWriter = Class;
@@ -124,7 +130,11 @@ procedure WriteXML(Element: TDOMNode; AStream: TStream); overload;
 
 implementation
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses System.SysUtils;
+{$ELSE FPC_DOTTEDUNITS}
 uses SysUtils;
+{$ENDIF FPC_DOTTEDUNITS}
 
 type
   PAttrFixup = ^TAttrFixup;

packages/fcl-xml/src/xpath.pp

@@ -17,11 +17,17 @@
 {$MODE objfpc}
 {$H+}
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit XPath;
+{$ENDIF FPC_DOTTEDUNITS}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses System.SysUtils, System.Classes, Xml.Dom;
+{$ELSE FPC_DOTTEDUNITS}
 uses SysUtils, Classes, DOM;
+{$ENDIF FPC_DOTTEDUNITS}
 
 resourcestring
   { XPath variables type names }
@@ -504,7 +510,11 @@ function EvaluateXPathExpression(const AExpressionString: DOMString;
 
 implementation
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses System.Math, Xml.Utils;
+{$ELSE FPC_DOTTEDUNITS}
 uses Math, xmlutils;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$i xpathkw.inc}