diff --git a/packages/libxml/namespaced/Api.XML.Xml2.pas b/packages/libxml/namespaced/Api.XML.Xml2.pas
new file mode 100644
index 0000000000..b8efedff6a
--- /dev/null
+++ b/packages/libxml/namespaced/Api.XML.Xml2.pas
@@ -0,0 +1,3 @@
+unit Api.XML.Xml2;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i xml2.pas}
diff --git a/packages/libxml/namespaced/Api.XML.Xsd.pas b/packages/libxml/namespaced/Api.XML.Xsd.pas
new file mode 100644
index 0000000000..0764d384a2
--- /dev/null
+++ b/packages/libxml/namespaced/Api.XML.Xsd.pas
@@ -0,0 +1,3 @@
+unit Api.XML.Xsd;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i xmlxsd.pas}
diff --git a/packages/libxml/namespaced/Api.XML.Xsdparser.pas b/packages/libxml/namespaced/Api.XML.Xsdparser.pas
new file mode 100644
index 0000000000..ba6c56404c
--- /dev/null
+++ b/packages/libxml/namespaced/Api.XML.Xsdparser.pas
@@ -0,0 +1,3 @@
+unit Api.XML.Xsdparser;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i xmlxsdparser.pas}
diff --git a/packages/libxml/namespaces.lst b/packages/libxml/namespaces.lst
new file mode 100644
index 0000000000..59d1308282
--- /dev/null
+++ b/packages/libxml/namespaces.lst
@@ -0,0 +1,5 @@
+src/xmlxsdparser.pas=namespaced/Api.XML.Xsdparser.pas
+{s*:src/}=namespaced/
+{i+:src/}
+src/xml2.pas=namespaced/Api.XML.Xml2.pas
+src/xmlxsd.pas=namespaced/Api.XML.Xsd.pas
diff --git a/packages/libxml/src/xml2.pas b/packages/libxml/src/xml2.pas
index e686dfc004..6bc3813e7f 100644
--- a/packages/libxml/src/xml2.pas
+++ b/packages/libxml/src/xml2.pas
@@ -3,7 +3,9 @@
   Copyright (C) 2008 by Ivo Steinmann
 }
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit xml2;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$mode objfpc}
 {$H+}
@@ -14,9 +16,15 @@ unit xml2;
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.DynLibs,
+  System.CTypes;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   dynlibs,
   ctypes;
+{$ENDIF FPC_DOTTEDUNITS}
 
 const
 {$IF Defined(WINDOWS)}
diff --git a/packages/libxml/src/xmlxsd.pas b/packages/libxml/src/xmlxsd.pas
index a66de869e4..20b2c92ecd 100644
--- a/packages/libxml/src/xmlxsd.pas
+++ b/packages/libxml/src/xmlxsd.pas
@@ -3,13 +3,25 @@
   Copyright (C) 2008 by Ivo Steinmann
 }
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit xmlxsd;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$mode objfpc}
 {$H+}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.CTypes,
+  Api.XML.Xml2,
+  Api.XML.Xsdparser,
+  System.Math,
+  System.Classes,
+  System.DateUtils,
+  System.SysUtils;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   ctypes,
   xml2,
@@ -18,6 +30,7 @@ uses
   Classes,
   DateUtils,
   SysUtils;
+{$ENDIF FPC_DOTTEDUNITS}
 
 resourcestring
   SChildNotFound = 'child %s not found';
diff --git a/packages/libxml/src/xmlxsdparser.pas b/packages/libxml/src/xmlxsdparser.pas
index eed7e9b701..2a43dc8830 100644
--- a/packages/libxml/src/xmlxsdparser.pas
+++ b/packages/libxml/src/xmlxsdparser.pas
@@ -5,13 +5,24 @@
   Copyright (C) 2011 by Ivo Steinmann
 }
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit xmlxsdparser;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$mode objfpc}
 {$H+}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  {$IFDEF MSWINDOWS}WinApi.Windows,{$ENDIF}
+  {$IFDEF UNIX}UnixApi.Unix,{$ENDIF}
+  System.SysUtils,
+  System.DateUtils,
+  System.Math,
+  System.Classes;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   {$IFDEF MSWINDOWS}windows,{$ENDIF}
   {$IFDEF UNIX}unix,{$ENDIF}
@@ -19,6 +30,7 @@ uses
   dateutils,
   math,
   Classes;
+{$ENDIF FPC_DOTTEDUNITS}
 
 resourcestring
   SXsdParserError = 'parsing "%s" as "%s" failed';