* Dotted filenames for package morphunits

packages/morphunits/namespaced/MorphApi.Agraphics.pas

@@ -0,0 +1,3 @@
+unit MorphApi.Agraphics;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i agraphics.pas}

packages/morphunits/namespaced/MorphApi.Ahi.pas

@@ -0,0 +1,3 @@
+unit MorphApi.Ahi;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i ahi.pas}

packages/morphunits/namespaced/MorphApi.Akeyboard.pas

@@ -0,0 +1,3 @@
+unit MorphApi.Akeyboard;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i akeyboard.pas}

packages/morphunits/namespaced/MorphApi.Amigados.pas

@@ -0,0 +1,3 @@
+unit MorphApi.Amigados;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i amigados.pas}

packages/morphunits/namespaced/MorphApi.Amigalib.pas

@@ -0,0 +1,3 @@
+unit MorphApi.Amigalib;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i amigalib.pas}

packages/morphunits/namespaced/MorphApi.Asl.pas

@@ -0,0 +1,3 @@
+unit MorphApi.Asl;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i asl.pas}

packages/morphunits/namespaced/MorphApi.Cgxvideo.pas

@@ -0,0 +1,3 @@
+unit MorphApi.Cgxvideo;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i cgxvideo.pas}

packages/morphunits/namespaced/MorphApi.Clipboard.pas

@@ -0,0 +1,3 @@
+unit MorphApi.Clipboard;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i clipboard.pas}

packages/morphunits/namespaced/MorphApi.Commodities.pas

@@ -0,0 +1,3 @@
+unit MorphApi.Commodities;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i commodities.pas}

packages/morphunits/namespaced/MorphApi.Console.pas

@@ -0,0 +1,3 @@
+unit MorphApi.Console;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i console.pas}

packages/morphunits/namespaced/MorphApi.Conunit.pas

@@ -0,0 +1,3 @@
+unit MorphApi.Conunit;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i conunit.pas}

packages/morphunits/namespaced/MorphApi.Cybergraphics.pas

@@ -0,0 +1,3 @@
+unit MorphApi.Cybergraphics;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i cybergraphics.pas}

packages/morphunits/namespaced/MorphApi.Datatypes.pas

@@ -0,0 +1,3 @@
+unit MorphApi.Datatypes;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i datatypes.pas}

packages/morphunits/namespaced/MorphApi.Diskfont.pas

@@ -0,0 +1,3 @@
+unit MorphApi.Diskfont;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i diskfont.pas}

packages/morphunits/namespaced/MorphApi.Exec.pas

@@ -0,0 +1,3 @@
+unit MorphApi.Exec;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i exec.pas}

packages/morphunits/namespaced/MorphApi.Gadtools.pas

@@ -0,0 +1,3 @@
+unit MorphApi.Gadtools;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i gadtools.pas}

packages/morphunits/namespaced/MorphApi.Get9.pas

@@ -0,0 +1,3 @@
+unit MorphApi.Get9;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i get9.pas}

packages/morphunits/namespaced/MorphApi.Hardware.pas

@@ -0,0 +1,3 @@
+unit MorphApi.Hardware;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i hardware.pas}

packages/morphunits/namespaced/MorphApi.Icon.pas

@@ -0,0 +1,3 @@
+unit MorphApi.Icon;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i icon.pas}

packages/morphunits/namespaced/MorphApi.Iffparse.pas

@@ -0,0 +1,3 @@
+unit MorphApi.Iffparse;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i iffparse.pas}

packages/morphunits/namespaced/MorphApi.Input.pas

@@ -0,0 +1,3 @@
+unit MorphApi.Input;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i input.pas}

packages/morphunits/namespaced/MorphApi.Inputevent.pas

@@ -0,0 +1,3 @@
+unit MorphApi.Inputevent;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i inputevent.pas}

packages/morphunits/namespaced/MorphApi.Intuition.pas

@@ -0,0 +1,3 @@
+unit MorphApi.Intuition;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i intuition.pas}

packages/morphunits/namespaced/MorphApi.Keymap.pas

@@ -0,0 +1,3 @@
+unit MorphApi.Keymap;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i keymap.pas}

packages/morphunits/namespaced/MorphApi.Layers.pas

@@ -0,0 +1,3 @@
+unit MorphApi.Layers;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i layers.pas}

packages/morphunits/namespaced/MorphApi.Locale.pas

@@ -0,0 +1,3 @@
+unit MorphApi.Locale;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i locale.pas}

packages/morphunits/namespaced/MorphApi.Mui.pas

@@ -0,0 +1,3 @@
+unit MorphApi.Mui;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i mui.pas}

packages/morphunits/namespaced/MorphApi.Serial.pas

@@ -0,0 +1,3 @@
+unit MorphApi.Serial;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i serial.pas}

packages/morphunits/namespaced/MorphApi.Timer.pas

@@ -0,0 +1,3 @@
+unit MorphApi.Timer;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i timer.pas}

packages/morphunits/namespaced/MorphApi.Tinygl.pas

@@ -0,0 +1,3 @@
+unit MorphApi.Tinygl;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i tinygl.pas}

packages/morphunits/namespaced/MorphApi.Utility.pas

@@ -0,0 +1,3 @@
+unit MorphApi.Utility;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i utility.pas}

packages/morphunits/namespaced/MorphApi.Workbench.pas

@@ -0,0 +1,3 @@
+unit MorphApi.Workbench;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i workbench.pas}

packages/morphunits/namespaces.lst

@@ -0,0 +1,34 @@
+src/tinygl.pas=namespaced/MorphApi.Tinygl.pas
+{s*:src/}=namespaced/
+{i+:src/}
+src/cgxvideo.pas=namespaced/MorphApi.Cgxvideo.pas
+src/gadtools.pas=namespaced/MorphApi.Gadtools.pas
+src/console.pas=namespaced/MorphApi.Console.pas
+src/utility.pas=namespaced/MorphApi.Utility.pas
+src/mui.pas=namespaced/MorphApi.Mui.pas
+src/datatypes.pas=namespaced/MorphApi.Datatypes.pas
+src/exec.pas=namespaced/MorphApi.Exec.pas
+src/workbench.pas=namespaced/MorphApi.Workbench.pas
+src/icon.pas=namespaced/MorphApi.Icon.pas
+src/hardware.pas=namespaced/MorphApi.Hardware.pas
+src/keymap.pas=namespaced/MorphApi.Keymap.pas
+src/akeyboard.pas=namespaced/MorphApi.Akeyboard.pas
+src/commodities.pas=namespaced/MorphApi.Commodities.pas
+src/serial.pas=namespaced/MorphApi.Serial.pas
+src/agraphics.pas=namespaced/MorphApi.Agraphics.pas
+src/conunit.pas=namespaced/MorphApi.Conunit.pas
+src/layers.pas=namespaced/MorphApi.Layers.pas
+src/diskfont.pas=namespaced/MorphApi.Diskfont.pas
+src/timer.pas=namespaced/MorphApi.Timer.pas
+src/iffparse.pas=namespaced/MorphApi.Iffparse.pas
+src/get9.pas=namespaced/MorphApi.Get9.pas
+src/input.pas=namespaced/MorphApi.Input.pas
+src/intuition.pas=namespaced/MorphApi.Intuition.pas
+src/asl.pas=namespaced/MorphApi.Asl.pas
+src/cybergraphics.pas=namespaced/MorphApi.Cybergraphics.pas
+src/ahi.pas=namespaced/MorphApi.Ahi.pas
+src/locale.pas=namespaced/MorphApi.Locale.pas
+src/inputevent.pas=namespaced/MorphApi.Inputevent.pas
+src/amigados.pas=namespaced/MorphApi.Amigados.pas
+src/clipboard.pas=namespaced/MorphApi.Clipboard.pas
+src/amigalib.pas=namespaced/MorphApi.Amigalib.pas

packages/morphunits/src/agraphics.pas

@@ -20,12 +20,19 @@
  **********************************************************************}
 {$PACKRECORDS 2}
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit agraphics;
+{$ENDIF FPC_DOTTEDUNITS}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  Amiga.Core.Exec, Amiga.Core.Hardware, Amiga.Core.Utility;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   exec, hardware, utility;
+{$ENDIF FPC_DOTTEDUNITS}
 
 const
   BITSET = $8000;

packages/morphunits/src/ahi.pas

@@ -20,11 +20,17 @@
 **********************************************************************}
 
 {$PACKRECORDS 2}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit AHI;
+{$ENDIF FPC_DOTTEDUNITS}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses Amiga.Core.Exec, Amiga.Core.Utility;
+{$ELSE FPC_DOTTEDUNITS}
 uses exec, utility;
+{$ENDIF FPC_DOTTEDUNITS}
 
 var
   AHIBase: PLibrary = nil;

packages/morphunits/src/akeyboard.pas

@@ -13,7 +13,9 @@
 
 **********************************************************************}
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit akeyboard;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {
    Contents of this file is based on keyboard.h from the MorphOS SDK:
@@ -26,8 +28,13 @@ unit akeyboard;
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  Amiga.Core.Exec;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   exec;
+{$ENDIF FPC_DOTTEDUNITS}
 
 const
   KBD_READEVENT               = (CMD_NONSTD + 0);

packages/morphunits/src/amigados.pas

@@ -18,11 +18,17 @@
 {$INLINE ON}
 {$PACKRECORDS 2}
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit AmigaDOS;
+{$ENDIF FPC_DOTTEDUNITS}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses Amiga.Core.Exec, Amiga.Core.Timer;
+{$ELSE FPC_DOTTEDUNITS}
 uses Exec, Timer;
+{$ENDIF FPC_DOTTEDUNITS}
 
 var
   DosBase: Pointer;

packages/morphunits/src/amigalib.pas

@@ -17,7 +17,9 @@
  **********************************************************************}
 {$INLINE ON}
 unit amigalib
+{$IFNDEF FPC_DOTTEDUNITS}
   deprecated 'Unit will be removed. Functions are moved to intuition, utility unit.';
+{$ENDIF FPC_DOTTEDUNITS}
 
 interface
 
@@ -38,8 +40,13 @@ function HookEntry: PtrUInt;
 
 implementation
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  Amiga.Core.Exec, Amiga.Core.Intuition, Amiga.Core.Utility;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   exec, intuition, utility;
+{$ENDIF FPC_DOTTEDUNITS}
 
 function DoMethod(obj : longword; const msg : array of LongWord): longword; inline;
 begin

packages/morphunits/src/asl.pas

@@ -20,11 +20,17 @@
  **********************************************************************}
 
 {$PACKRECORDS 2}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit asl;
+{$ENDIF FPC_DOTTEDUNITS}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses Amiga.Core.Exec, Amiga.Core.Utility, Amiga.Core.Workbench, Amiga.Core.Agraphics;
+{$ELSE FPC_DOTTEDUNITS}
 uses exec, utility, workbench, agraphics;
+{$ENDIF FPC_DOTTEDUNITS}
 
 
 {************************************************************************}

packages/morphunits/src/cgxvideo.pas

@@ -17,12 +17,19 @@
 
 {$mode fpc}
 {$packrecords 2}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit cgxvideo;
+{$ENDIF FPC_DOTTEDUNITS}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  Amiga.Core.Exec, Amiga.Core.Intuition, Amiga.Core.Utility;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   exec, intuition, utility;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {
     Contents of this file is based on cgxvideo.h from the MorphOS SDK:

packages/morphunits/src/clipboard.pas

@@ -20,11 +20,17 @@
  **********************************************************************}
 {$PACKRECORDS 2}
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit clipboard;
+{$ENDIF FPC_DOTTEDUNITS}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses Amiga.Core.Exec;
+{$ELSE FPC_DOTTEDUNITS}
 uses exec;
+{$ENDIF FPC_DOTTEDUNITS}
 
 const
     CBD_POST            = CMD_NONSTD + 0;

packages/morphunits/src/commodities.pas

@@ -13,12 +13,19 @@
 
  **********************************************************************}
 {$PACKRECORDS 2}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit commodities;
+{$ENDIF FPC_DOTTEDUNITS}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  Amiga.Core.Exec, Amiga.Core.Inputevent, Amiga.Core.Keymap;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   exec, inputevent, keymap;
+{$ENDIF FPC_DOTTEDUNITS}
 
 type
   CxObj = LongInt;

packages/morphunits/src/console.pas

@@ -21,12 +21,19 @@
     [email protected]  Nils Sjoholm
 }
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit console;
+{$ENDIF FPC_DOTTEDUNITS}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  Amiga.Core.Exec, Amiga.Core.Inputevent, Amiga.Core.Keymap;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   exec, inputevent, keymap;
+{$ENDIF FPC_DOTTEDUNITS}
 
 const
 

packages/morphunits/src/conunit.pas

@@ -14,12 +14,19 @@
 
  **********************************************************************}
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit conunit;
+{$ENDIF FPC_DOTTEDUNITS}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  Amiga.Core.Exec, Amiga.Core.Console, Amiga.Core.Keymap, Amiga.Core.Inputevent, Amiga.Core.Intuition, Amiga.Core.Agraphics;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   exec, console, keymap, inputevent, intuition, agraphics;
+{$ENDIF FPC_DOTTEDUNITS}
 
 const
 { ---- console unit numbers for OpenDevice() }

packages/morphunits/src/cybergraphics.pas

@@ -18,12 +18,19 @@
 {$mode fpc}
 {$packrecords 2}
 
+{$IFNDEF FPC_DOTTEDUNITS}
 UNIT CYBERGRAPHICS;
+{$ENDIF FPC_DOTTEDUNITS}
 
 INTERFACE
 
+{$IFDEF FPC_DOTTEDUNITS}
+USES
+  Amiga.Core.Exec,Amiga.Core.Agraphics,Amiga.Core.Utility;
+{$ELSE FPC_DOTTEDUNITS}
 USES
   exec,agraphics,utility;
+{$ENDIF FPC_DOTTEDUNITS}
 
 VAR CyberGfxBase : pLibrary = nil;
 

packages/morphunits/src/datatypes.pas

@@ -20,12 +20,19 @@
  **********************************************************************}
 {$INLINE ON}
 {$PACKRECORDS 2}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit datatypes;
+{$ENDIF FPC_DOTTEDUNITS}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses Amiga.Core.Exec, Amiga.Core.Amigados, Amiga.Core.Intuition, Amiga.Core.Utility,
+     Amiga.Core.Agraphics{, Amiga.Core.Iffparse, Amiga.Core.Amigaprinter, Amiga.Core.Prtbase};
+{$ELSE FPC_DOTTEDUNITS}
 uses exec, amigados, intuition, utility,
      agraphics{, iffparse, amigaprinter, prtbase};
+{$ENDIF FPC_DOTTEDUNITS}
 
 const
 {***************************************************************************}

packages/morphunits/src/diskfont.pas

@@ -18,12 +18,19 @@
 
 {$PACKRECORDS 2}
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit diskfont;
+{$ENDIF FPC_DOTTEDUNITS}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  Amiga.Core.Exec, Amiga.Core.Agraphics, Amiga.Core.Utility;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   exec, agraphics, utility;
+{$ENDIF FPC_DOTTEDUNITS}
 
 const
   MAXFONTPATH = 256;

packages/morphunits/src/exec.pas

@@ -16,7 +16,9 @@
 
  **********************************************************************}
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit exec;
+{$ENDIF FPC_DOTTEDUNITS}
 
 interface
 

packages/morphunits/src/gadtools.pas

@@ -16,11 +16,17 @@
 
 {$PACKRECORDS 2}
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit gadtools;
+{$ENDIF FPC_DOTTEDUNITS}
 
 INTERFACE
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses Amiga.Core.Exec, Amiga.Core.Intuition, Amiga.Core.Agraphics, Amiga.Core.Utility;
+{$ELSE FPC_DOTTEDUNITS}
 uses exec, intuition, agraphics, utility;
+{$ENDIF FPC_DOTTEDUNITS}
 
 
 {------------------------------------------------------------------------}

packages/morphunits/src/get9.pas

@@ -15,11 +15,17 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
  **********************************************************************}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit get9;
+{$ENDIF FPC_DOTTEDUNITS}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses Amiga.Core.Exec;
+{$ELSE FPC_DOTTEDUNITS}
 uses exec;
+{$ENDIF FPC_DOTTEDUNITS}
 
 var
   Get9Base: Pointer = nil;

packages/morphunits/src/hardware.pas

@@ -17,11 +17,17 @@
  **********************************************************************}
 
 {$PACKRECORDS 2}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit hardware;
+{$ENDIF FPC_DOTTEDUNITS}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses Amiga.Core.Exec;
+{$ELSE FPC_DOTTEDUNITS}
 uses exec;
+{$ENDIF FPC_DOTTEDUNITS}
 
 
 

packages/morphunits/src/icon.pas

@@ -51,12 +51,18 @@
     [email protected]
 }
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit icon;
+{$ENDIF FPC_DOTTEDUNITS}
 
 INTERFACE
 
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses Amiga.Core.Exec, Amiga.Core.Workbench,Amiga.Core.Utility,Amiga.Core.Amigados,Amiga.Core.Agraphics,Amiga.Core.Intuition,Amiga.Core.Datatypes;
+{$ELSE FPC_DOTTEDUNITS}
 uses exec, workbench,utility,amigados,agraphics,intuition,datatypes;
+{$ENDIF FPC_DOTTEDUNITS}
 
     const
     ICONA_Dummy = TAG_USER + $9000;

packages/morphunits/src/iffparse.pas

@@ -20,11 +20,17 @@
  **********************************************************************}
 {$PACKRECORDS 2}
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit iffparse;
+{$ENDIF FPC_DOTTEDUNITS}
 
 INTERFACE
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses Amiga.Core.Exec, Amiga.Core.Clipboard, Amiga.Core.Utility;
+{$ELSE FPC_DOTTEDUNITS}
 uses exec, clipboard, utility;
+{$ENDIF FPC_DOTTEDUNITS}
 
 
 const

packages/morphunits/src/input.pas

@@ -14,7 +14,9 @@
 **********************************************************************}
 
 {$MODE FPC}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit input;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {
    Contents of this file is based on input.h from the MorphOS SDK:
@@ -27,8 +29,13 @@ unit input;
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  Amiga.Core.Exec;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   exec;
+{$ENDIF FPC_DOTTEDUNITS}
 
 const
   IND_ADDHANDLER    = CMD_NONSTD + 0;

packages/morphunits/src/inputevent.pas

@@ -17,11 +17,17 @@
  **********************************************************************}
 
 {$PACKRECORDS 2}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit inputevent;
+{$ENDIF FPC_DOTTEDUNITS}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses Amiga.Core.Exec, Amiga.Core.Utility, Amiga.Core.Timer;
+{$ELSE FPC_DOTTEDUNITS}
 uses exec, utility, timer;
+{$ENDIF FPC_DOTTEDUNITS}
 
 
 { * input.device event definitions

packages/morphunits/src/intuition.pas

@@ -20,12 +20,19 @@
  **********************************************************************}
 {$PACKRECORDS 2}
 {$INLINE ON}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit intuition;
+{$ENDIF FPC_DOTTEDUNITS}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  Amiga.Core.Exec, Amiga.Core.Agraphics, Amiga.Core.Utility, Amiga.Core.Inputevent, Amiga.Core.Timer, Amiga.Core.Layers;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   exec, agraphics, utility, inputevent, timer, layers;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$define INTUI_V36_NAMES_ONLY}
 

packages/morphunits/src/keymap.pas

@@ -14,12 +14,19 @@
 
  **********************************************************************}
 {$PACKRECORDS 2}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit keymap;
+{$ENDIF FPC_DOTTEDUNITS}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  Amiga.Core.Exec, Amiga.Core.Inputevent;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   exec, inputevent;
+{$ENDIF FPC_DOTTEDUNITS}
 
 type
   PKeyMap = ^TKeyMap;

packages/morphunits/src/layers.pas

@@ -20,11 +20,17 @@
  **********************************************************************}
 
 {$PACKRECORDS 2}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit layers;
+{$ENDIF FPC_DOTTEDUNITS}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses Amiga.Core.Exec, Amiga.Core.Agraphics, Amiga.Core.Utility;
+{$ELSE FPC_DOTTEDUNITS}
 uses exec, agraphics, utility;
+{$ENDIF FPC_DOTTEDUNITS}
 
 const
   LAYERSIMPLE          = 1;

packages/morphunits/src/locale.pas

@@ -14,12 +14,19 @@
  **********************************************************************}
 {$PACKRECORDS 2}
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit locale;
+{$ENDIF FPC_DOTTEDUNITS}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  Amiga.Core.Exec, Amiga.Core.Amigados, Amiga.Core.Utility;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   exec, amigados, utility;
+{$ENDIF FPC_DOTTEDUNITS}
 
 const
   // Internal String-Numbers GetLocaleStr()

packages/morphunits/src/mui.pas

@@ -21,7 +21,9 @@
 {$mode objfpc}
 {$packrecords 2}
 {$inline on}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit mui;
+{$ENDIF FPC_DOTTEDUNITS}
 
 interface
 
@@ -129,7 +131,11 @@ interface
      Items marked with "Custom Class" are for use in custom classes only!
   }
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses Amiga.Core.Exec, Amiga.Core.Intuition,Amiga.Core.Utility,Amiga.Core.Agraphics{,Amiga.Core.Iffparse};
+{$ELSE FPC_DOTTEDUNITS}
 uses exec, intuition,utility,agraphics{,iffparse};
+{$ENDIF FPC_DOTTEDUNITS}
 {$WARNING IffParse required, look for FIX ME!!!}
 
 var

packages/morphunits/src/serial.pas

@@ -14,13 +14,20 @@
 
  **********************************************************************}
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit serial;
+{$ENDIF FPC_DOTTEDUNITS}
 
 interface
 {$PACKRECORDS 2}
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  Amiga.Core.Exec;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   exec;
+{$ENDIF FPC_DOTTEDUNITS}
 
 type
 

packages/morphunits/src/timer.pas

@@ -16,12 +16,19 @@
 
  **********************************************************************}
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit timer;
+{$ENDIF FPC_DOTTEDUNITS}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  Amiga.Core.Exec;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   exec;
+{$ENDIF FPC_DOTTEDUNITS}
 
 var
   TimerBase : Pointer;

packages/morphunits/src/tinygl.pas

@@ -18,12 +18,19 @@
 
 {$MODE FPC} { fsck Delphi mode }
 {$INLINE ON}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit tinygl;
+{$ENDIF FPC_DOTTEDUNITS}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  Amiga.Core.Exec;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   exec;
+{$ENDIF FPC_DOTTEDUNITS}
 
 const
   TINYGLNAME : PAnsiChar = 'tinygl.library';

packages/morphunits/src/utility.pas

@@ -16,12 +16,19 @@
 
  **********************************************************************}
 {$inline on}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit utility;
+{$ENDIF FPC_DOTTEDUNITS}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  Amiga.Core.Exec;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   exec;
+{$ENDIF FPC_DOTTEDUNITS}
 
 var
   UtilityBase: Pointer;

packages/morphunits/src/workbench.pas

@@ -15,12 +15,19 @@
  **********************************************************************}
 {$PACKRECORDS 2}
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit workbench;
+{$ENDIF FPC_DOTTEDUNITS}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  Amiga.Core.Exec, Amiga.Core.Amigados, Amiga.Core.Utility, Amiga.Core.Intuition, Amiga.Core.Agraphics;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   exec, amigados, utility, intuition, agraphics;
+{$ENDIF FPC_DOTTEDUNITS}
 
 // wb startup defines
 type