diff --git a/packages/ami-extra/namespaced/AmigaApi.Amsgbox.pas b/packages/ami-extra/namespaced/AmigaApi.Amsgbox.pas
new file mode 100644
index 0000000000..91e8d2f4d8
--- /dev/null
+++ b/packages/ami-extra/namespaced/AmigaApi.Amsgbox.pas
@@ -0,0 +1,3 @@
+unit AmigaApi.Amsgbox;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i amsgbox.pas}
diff --git a/packages/ami-extra/namespaced/AmigaApi.Cliputils.pas b/packages/ami-extra/namespaced/AmigaApi.Cliputils.pas
new file mode 100644
index 0000000000..9927f9f7fe
--- /dev/null
+++ b/packages/ami-extra/namespaced/AmigaApi.Cliputils.pas
@@ -0,0 +1,3 @@
+unit AmigaApi.Cliputils;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i cliputils.pas}
diff --git a/packages/ami-extra/namespaced/AmigaApi.Muihelper.pas b/packages/ami-extra/namespaced/AmigaApi.Muihelper.pas
new file mode 100644
index 0000000000..43c930df16
--- /dev/null
+++ b/packages/ami-extra/namespaced/AmigaApi.Muihelper.pas
@@ -0,0 +1,3 @@
+unit AmigaApi.Muihelper;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i muihelper.pas}
diff --git a/packages/ami-extra/namespaced/AmigaApi.Pcq.pas b/packages/ami-extra/namespaced/AmigaApi.Pcq.pas
new file mode 100644
index 0000000000..729edc2574
--- /dev/null
+++ b/packages/ami-extra/namespaced/AmigaApi.Pcq.pas
@@ -0,0 +1,3 @@
+unit AmigaApi.Pcq;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i pcq.pas}
diff --git a/packages/ami-extra/namespaces.lst b/packages/ami-extra/namespaces.lst
new file mode 100644
index 0000000000..512a64a399
--- /dev/null
+++ b/packages/ami-extra/namespaces.lst
@@ -0,0 +1,6 @@
+src/pcq.pas=namespaced/AmigaApi.Pcq.pas
+{s*:src/}=namespaced/
+{i+:src/}
+src/amsgbox.pas=namespaced/AmigaApi.Amsgbox.pas
+src/muihelper.pas=namespaced/AmigaApi.Muihelper.pas
+src/cliputils.pas=namespaced/AmigaApi.Cliputils.pas
diff --git a/packages/ami-extra/src/amsgbox.pas b/packages/ami-extra/src/amsgbox.pas
index 4ad90f396f..55f17bdc9b 100644
--- a/packages/ami-extra/src/amsgbox.pas
+++ b/packages/ami-extra/src/amsgbox.pas
@@ -22,7 +22,9 @@
     nils.sjoholm@mailbox.swipnet.se Nils Sjoholm
 }
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit AMsgBox;
+{$ENDIF FPC_DOTTEDUNITS}
 
 interface
 
@@ -33,8 +35,13 @@ function MessageBox(const tit,txt,gad:PAnsiChar): LongInt;
 
 implementation
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  Amiga.Core.Intuition;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   intuition;
+{$ENDIF FPC_DOTTEDUNITS}
 
 FUNCTION MessageBox(const tit,txt,gad:RawByteString): LongInt;
 begin
diff --git a/packages/ami-extra/src/cliputils.pas b/packages/ami-extra/src/cliputils.pas
index 662f555d43..9d25830dfb 100644
--- a/packages/ami-extra/src/cliputils.pas
+++ b/packages/ami-extra/src/cliputils.pas
@@ -15,7 +15,9 @@
 
 {$MODE OBJFPC}
 {$H+}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit cliputils;
+{$ENDIF FPC_DOTTEDUNITS}
 
 interface
 
@@ -24,8 +26,13 @@ function PutTextToClip(ClipUnit: Byte; Text: AnsiString): Boolean;
 
 implementation
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  Amiga.Core.Exec, Amiga.Core.Clipboard, Amiga.Core.Iffparse;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   exec, clipboard, iffparse;
+{$ENDIF FPC_DOTTEDUNITS}
 
 const
   ID_FTXT = 1179932756;
diff --git a/packages/ami-extra/src/muihelper.pas b/packages/ami-extra/src/muihelper.pas
index aa953a5a16..18c55e203f 100644
--- a/packages/ami-extra/src/muihelper.pas
+++ b/packages/ami-extra/src/muihelper.pas
@@ -19,12 +19,19 @@
 
  **********************************************************************}
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit muihelper;
+{$ENDIF FPC_DOTTEDUNITS}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  Amiga.Core.Exec, Amiga.Core.Intuition, Amiga.Other.Mui, Amiga.Core.Amigados, Amiga.Core.Utility;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   exec, intuition, mui, amigados, utility;
+{$ENDIF FPC_DOTTEDUNITS}
 
 type
   THookFunc = function(Hook: PHook; Obj: PObject_; Msg: Pointer): PtrInt;
diff --git a/packages/ami-extra/src/pcq.pas b/packages/ami-extra/src/pcq.pas
index b8d6089205..b89a0ad278 100644
--- a/packages/ami-extra/src/pcq.pas
+++ b/packages/ami-extra/src/pcq.pas
@@ -14,7 +14,9 @@
 
  **********************************************************************}
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit pcq;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {
 
@@ -54,7 +56,11 @@ unit pcq;
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses Amiga.Core.Exec,System.Strings;
+{$ELSE FPC_DOTTEDUNITS}
 uses exec,strings;
+{$ENDIF FPC_DOTTEDUNITS}
 
 function CheckBreak: boolean;