diff --git a/packages/postgres/namespaced/Api.Dllist.pp b/packages/postgres/namespaced/Api.Dllist.pp
new file mode 100644
index 0000000000..5b10fd9ef5
--- /dev/null
+++ b/packages/postgres/namespaced/Api.Dllist.pp
@@ -0,0 +1,3 @@
+unit Api.Dllist;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i dllist.pp}
diff --git a/packages/postgres/namespaced/Api.Dllistdyn.pp b/packages/postgres/namespaced/Api.Dllistdyn.pp
new file mode 100644
index 0000000000..2e02374316
--- /dev/null
+++ b/packages/postgres/namespaced/Api.Dllistdyn.pp
@@ -0,0 +1,3 @@
+unit Api.Dllistdyn;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i dllistdyn.pp}
diff --git a/packages/postgres/namespaced/Api.Postgres.pp b/packages/postgres/namespaced/Api.Postgres.pp
new file mode 100644
index 0000000000..b00e563e24
--- /dev/null
+++ b/packages/postgres/namespaced/Api.Postgres.pp
@@ -0,0 +1,3 @@
+unit Api.Postgres;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i postgres.pp}
diff --git a/packages/postgres/namespaced/Api.Postgres3.pp b/packages/postgres/namespaced/Api.Postgres3.pp
new file mode 100644
index 0000000000..85dec31bb3
--- /dev/null
+++ b/packages/postgres/namespaced/Api.Postgres3.pp
@@ -0,0 +1,3 @@
+unit Api.Postgres3;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i postgres3.pp}
diff --git a/packages/postgres/namespaced/Api.Postgres3dyn.pp b/packages/postgres/namespaced/Api.Postgres3dyn.pp
new file mode 100644
index 0000000000..577284671c
--- /dev/null
+++ b/packages/postgres/namespaced/Api.Postgres3dyn.pp
@@ -0,0 +1,3 @@
+unit Api.Postgres3dyn;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i postgres3dyn.pp}
diff --git a/packages/postgres/namespaces.lst b/packages/postgres/namespaces.lst
new file mode 100644
index 0000000000..153839854c
--- /dev/null
+++ b/packages/postgres/namespaces.lst
@@ -0,0 +1,7 @@
+src/postgres.pp=namespaced/Api.Postgres.pp
+{s*:src/}=namespaced/
+{i+:src/}
+src/postgres3dyn.pp=namespaced/Api.Postgres3dyn.pp
+src/dllist.pp=namespaced/Api.Dllist.pp
+src/dllistdyn.pp=namespaced/Api.Dllistdyn.pp
+src/postgres3.pp=namespaced/Api.Postgres3.pp
diff --git a/packages/postgres/src/dllist.pp b/packages/postgres/src/dllist.pp
index 3e0e3e786f..59c04cb1c6 100644
--- a/packages/postgres/src/dllist.pp
+++ b/packages/postgres/src/dllist.pp
@@ -1,4 +1,6 @@
+{$IFNDEF FPC_DOTTEDUNITS}
 unit dllist;
+{$ENDIF FPC_DOTTEDUNITS}
 
 interface
 
diff --git a/packages/postgres/src/dllistdyn.pp b/packages/postgres/src/dllistdyn.pp
index 245e0c8e1b..ff459292e2 100644
--- a/packages/postgres/src/dllistdyn.pp
+++ b/packages/postgres/src/dllistdyn.pp
@@ -3,14 +3,21 @@
   when finished.
 }
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit DllistDyn;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$mode objfpc}{$H+}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.DynLibs, System.SysUtils;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   dynlibs, SysUtils;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$PACKRECORDS C}
 
diff --git a/packages/postgres/src/postgres.pp b/packages/postgres/src/postgres.pp
index 72808a0145..d2d1ee900b 100644
--- a/packages/postgres/src/postgres.pp
+++ b/packages/postgres/src/postgres.pp
@@ -1,8 +1,14 @@
+{$IFNDEF FPC_DOTTEDUNITS}
 unit postgres;
+{$ENDIF FPC_DOTTEDUNITS}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses Api.Dllist;
+{$ELSE FPC_DOTTEDUNITS}
 uses dllist;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$linklib pq}
 {$linklib c}
diff --git a/packages/postgres/src/postgres3.pp b/packages/postgres/src/postgres3.pp
index 84965a6dca..29134b72e9 100644
--- a/packages/postgres/src/postgres3.pp
+++ b/packages/postgres/src/postgres3.pp
@@ -5,11 +5,17 @@
   It is for postgreSQL version 7.4 and higher with support for the v3.0
   connection-protocol
 }
+{$IFNDEF FPC_DOTTEDUNITS}
 unit postgres3;
+{$ENDIF FPC_DOTTEDUNITS}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses Api.Dllist;
+{$ELSE FPC_DOTTEDUNITS}
 uses dllist;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$PACKRECORDS C}
 
diff --git a/packages/postgres/src/postgres3dyn.pp b/packages/postgres/src/postgres3dyn.pp
index c5069f1730..5c433274a0 100644
--- a/packages/postgres/src/postgres3dyn.pp
+++ b/packages/postgres/src/postgres3dyn.pp
@@ -5,14 +5,21 @@
   when finished.
 }
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit postgres3dyn;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$mode objfpc}{$H+}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.DynLibs, System.SysUtils, Api.Dllistdyn, System.CTypes;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   dynlibs, SysUtils, dllistdyn, ctypes;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$IFDEF Unix}
   const