diff --git a/packages/oracle/namespaced/Api.Oracle.Oci.pp b/packages/oracle/namespaced/Api.Oracle.Oci.pp
new file mode 100644
index 0000000000..c9b9594f30
--- /dev/null
+++ b/packages/oracle/namespaced/Api.Oracle.Oci.pp
@@ -0,0 +1,3 @@
+unit Api.Oracle.Oci;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i oci.pp}
diff --git a/packages/oracle/namespaced/Api.Oracle.OciDyn.pp b/packages/oracle/namespaced/Api.Oracle.OciDyn.pp
new file mode 100644
index 0000000000..21820ae977
--- /dev/null
+++ b/packages/oracle/namespaced/Api.Oracle.OciDyn.pp
@@ -0,0 +1,3 @@
+unit Api.Oracle.OciDyn;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i ocidyn.pp}
diff --git a/packages/oracle/namespaced/Api.Oracle.OraOci.pp b/packages/oracle/namespaced/Api.Oracle.OraOci.pp
new file mode 100644
index 0000000000..625f185dea
--- /dev/null
+++ b/packages/oracle/namespaced/Api.Oracle.OraOci.pp
@@ -0,0 +1,3 @@
+unit Api.Oracle.OraOci;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i oraoci.pp}
diff --git a/packages/oracle/namespaced/Api.Oracle.Types.pp b/packages/oracle/namespaced/Api.Oracle.Types.pp
new file mode 100644
index 0000000000..5894eee710
--- /dev/null
+++ b/packages/oracle/namespaced/Api.Oracle.Types.pp
@@ -0,0 +1,3 @@
+unit Api.Oracle.Types;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i oratypes.pp}
diff --git a/packages/oracle/namespaces.lst b/packages/oracle/namespaces.lst
new file mode 100644
index 0000000000..373f597ab4
--- /dev/null
+++ b/packages/oracle/namespaces.lst
@@ -0,0 +1,6 @@
+src/oratypes.pp=namespaced/Api.Oracle.Types.pp
+{s*:src/}=namespaced/
+{i+:src/}
+src/oci.pp=namespaced/Api.Oracle.Oci.pp
+src/oraoci.pp=namespaced/Api.Oracle.OraOci.pp
+src/ocidyn.pp=namespaced/Api.Oracle.OciDyn.pp
diff --git a/packages/oracle/src/oci.inc b/packages/oracle/src/oci.inc
index 65c0dd5c46..a76f00b890 100644
--- a/packages/oracle/src/oci.inc
+++ b/packages/oracle/src/oci.inc
@@ -4,12 +4,21 @@
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses System.CTypes,
+{$IFDEF LinkDynamically}
+ System.SysUtils,
+{$ENDIF}
+    System.DynLibs, // always for sharedsuffix
+    Api.Oracle.Types;
+{$ELSE FPC_DOTTEDUNITS}
 uses ctypes,
 {$IFDEF LinkDynamically}
  sysutils,
 {$ENDIF}
     Dynlibs, // always for sharedsuffix
     oratypes;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {
   Automatically converted by H2Pas 1.0.0 from oci.h
diff --git a/packages/oracle/src/oci.pp b/packages/oracle/src/oci.pp
index fa2c17089f..ea634849cc 100644
--- a/packages/oracle/src/oci.pp
+++ b/packages/oracle/src/oci.pp
@@ -1,4 +1,6 @@
+{$IFNDEF FPC_DOTTEDUNITS}
 unit oci;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$UNDEF LinkDynamically}
 
diff --git a/packages/oracle/src/ocidyn.pp b/packages/oracle/src/ocidyn.pp
index 0aa4c4c667..2c4357ae4d 100644
--- a/packages/oracle/src/ocidyn.pp
+++ b/packages/oracle/src/ocidyn.pp
@@ -1,4 +1,6 @@
+{$IFNDEF FPC_DOTTEDUNITS}
 unit OCIdyn;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$DEFINE LinkDynamically}
 
diff --git a/packages/oracle/src/oraoci.pp b/packages/oracle/src/oraoci.pp
index a28818204d..f9fabb3a52 100644
--- a/packages/oracle/src/oraoci.pp
+++ b/packages/oracle/src/oraoci.pp
@@ -12,7 +12,9 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
  **********************************************************************}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit OraOCI;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$MODE FPC}
 {$linklib clntsh}
diff --git a/packages/oracle/src/oratypes.pp b/packages/oracle/src/oratypes.pp
index 4d8b5a3437..83f9eb1c9a 100644
--- a/packages/oracle/src/oratypes.pp
+++ b/packages/oracle/src/oratypes.pp
@@ -1,5 +1,7 @@
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit oratypes;
+{$ENDIF FPC_DOTTEDUNITS}
 interface
 
 {