diff --git a/packages/sdl/namespaced/Api.Sdl.Gfx.pas b/packages/sdl/namespaced/Api.Sdl.Gfx.pas
new file mode 100644
index 0000000000..c9a93702bf
--- /dev/null
+++ b/packages/sdl/namespaced/Api.Sdl.Gfx.pas
@@ -0,0 +1,3 @@
+unit Api.Sdl.Gfx;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i sdl_gfx.pas}
diff --git a/packages/sdl/namespaced/Api.Sdl.Image.pas b/packages/sdl/namespaced/Api.Sdl.Image.pas
new file mode 100644
index 0000000000..84bbdce9a1
--- /dev/null
+++ b/packages/sdl/namespaced/Api.Sdl.Image.pas
@@ -0,0 +1,3 @@
+unit Api.Sdl.Image;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i sdl_image.pas}
diff --git a/packages/sdl/namespaced/Api.Sdl.Logger.pas b/packages/sdl/namespaced/Api.Sdl.Logger.pas
new file mode 100644
index 0000000000..7f7f2c0753
--- /dev/null
+++ b/packages/sdl/namespaced/Api.Sdl.Logger.pas
@@ -0,0 +1,3 @@
+unit Api.Sdl.Logger;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i logger.pas}
diff --git a/packages/sdl/namespaced/Api.Sdl.Mixer.NoSMpeg.pas b/packages/sdl/namespaced/Api.Sdl.Mixer.NoSMpeg.pas
new file mode 100644
index 0000000000..ce75c559c1
--- /dev/null
+++ b/packages/sdl/namespaced/Api.Sdl.Mixer.NoSMpeg.pas
@@ -0,0 +1,3 @@
+unit Api.Sdl.Mixer.NoSMpeg;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i sdl_mixer_nosmpeg.pas}
diff --git a/packages/sdl/namespaced/Api.Sdl.Mixer.pas b/packages/sdl/namespaced/Api.Sdl.Mixer.pas
new file mode 100644
index 0000000000..9c896d0195
--- /dev/null
+++ b/packages/sdl/namespaced/Api.Sdl.Mixer.pas
@@ -0,0 +1,3 @@
+unit Api.Sdl.Mixer;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i sdl_mixer.pas}
diff --git a/packages/sdl/namespaced/Api.Sdl.Net.pas b/packages/sdl/namespaced/Api.Sdl.Net.pas
new file mode 100644
index 0000000000..d94f1678e0
--- /dev/null
+++ b/packages/sdl/namespaced/Api.Sdl.Net.pas
@@ -0,0 +1,3 @@
+unit Api.Sdl.Net;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i sdl_net.pas}
diff --git a/packages/sdl/namespaced/Api.Sdl.SMpeg.pas b/packages/sdl/namespaced/Api.Sdl.SMpeg.pas
new file mode 100644
index 0000000000..cc53670cc5
--- /dev/null
+++ b/packages/sdl/namespaced/Api.Sdl.SMpeg.pas
@@ -0,0 +1,3 @@
+unit Api.Sdl.SMpeg;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i smpeg.pas}
diff --git a/packages/sdl/namespaced/Api.Sdl.Ttf.pas b/packages/sdl/namespaced/Api.Sdl.Ttf.pas
new file mode 100644
index 0000000000..4643e32f0f
--- /dev/null
+++ b/packages/sdl/namespaced/Api.Sdl.Ttf.pas
@@ -0,0 +1,3 @@
+unit Api.Sdl.Ttf;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i sdl_ttf.pas}
diff --git a/packages/sdl/namespaced/Api.Sdl.Utils.pas b/packages/sdl/namespaced/Api.Sdl.Utils.pas
new file mode 100644
index 0000000000..bbb3183639
--- /dev/null
+++ b/packages/sdl/namespaced/Api.Sdl.Utils.pas
@@ -0,0 +1,3 @@
+unit Api.Sdl.Utils;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i sdlutils.pas}
diff --git a/packages/sdl/namespaced/Api.Sdl.XmlParser.pas b/packages/sdl/namespaced/Api.Sdl.XmlParser.pas
new file mode 100644
index 0000000000..f3f2cc3c73
--- /dev/null
+++ b/packages/sdl/namespaced/Api.Sdl.XmlParser.pas
@@ -0,0 +1,3 @@
+unit Api.Sdl.XmlParser;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i libxmlparser.pas}
diff --git a/packages/sdl/namespaced/Api.Sdl.pas b/packages/sdl/namespaced/Api.Sdl.pas
new file mode 100644
index 0000000000..2991756bea
--- /dev/null
+++ b/packages/sdl/namespaced/Api.Sdl.pas
@@ -0,0 +1,3 @@
+unit Api.Sdl;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i sdl.pas}
diff --git a/packages/sdl/namespaces.lst b/packages/sdl/namespaces.lst
new file mode 100644
index 0000000000..3f56dab6a4
--- /dev/null
+++ b/packages/sdl/namespaces.lst
@@ -0,0 +1,13 @@
+src/sdl.pas=namespaced/Api.Sdl.pas
+{s*:src/}=namespaced/
+{i+:src/}
+src/sdl_image.pas=namespaced/Api.Sdl.Image.pas
+src/sdl_ttf.pas=namespaced/Api.Sdl.Ttf.pas
+src/smpeg.pas=namespaced/Api.Sdl.SMpeg.pas
+src/sdl_net.pas=namespaced/Api.Sdl.Net.pas
+src/sdl_mixer.pas=namespaced/Api.Sdl.Mixer.pas
+src/sdlutils.pas=namespaced/Api.Sdl.Utils.pas
+src/sdl_gfx.pas=namespaced/Api.Sdl.Gfx.pas
+src/libxmlparser.pas=namespaced/Api.Sdl.XmlParser.pas
+src/sdl_mixer_nosmpeg.pas=namespaced/Api.Sdl.Mixer.NoSMpeg.pas
+src/logger.pas=namespaced/Api.Sdl.Logger.pas
diff --git a/packages/sdl/src/libxmlparser.pas b/packages/sdl/src/libxmlparser.pas
index 9201605caf..78c5451865 100644
--- a/packages/sdl/src/libxmlparser.pas
+++ b/packages/sdl/src/libxmlparser.pas
@@ -190,18 +190,29 @@ Date        Author Version Changes
                            those that don't.
 *)
 
+{$IFNDEF FPC_DOTTEDUNITS}
 UNIT libxmlparser;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$I jedi-sdl.inc}
 
 INTERFACE
 
+{$IFDEF FPC_DOTTEDUNITS}
+USES
+  System.SysUtils, System.Classes,
+  (*$IFDEF HAS_CONTNRS_UNIT *)  // The System.Contnrs Unit was introduced in Delphi 5
+  System.Contnrs,
+  (*$ENDIF*)
+  System.Math;
+{$ELSE FPC_DOTTEDUNITS}
 USES
   SysUtils, Classes,
   (*$IFDEF HAS_CONTNRS_UNIT *)  // The Contnrs Unit was introduced in Delphi 5
   Contnrs,
   (*$ENDIF*)
   Math;
+{$ENDIF FPC_DOTTEDUNITS}
 
 CONST
   CVersion = '1.0.17';  // This variable will be updated for every release
diff --git a/packages/sdl/src/logger.pas b/packages/sdl/src/logger.pas
index 4c6ea7a4b0..bf7f43d100 100644
--- a/packages/sdl/src/logger.pas
+++ b/packages/sdl/src/logger.pas
@@ -1,4 +1,6 @@
+{$IFNDEF FPC_DOTTEDUNITS}
 unit logger;
+{$ENDIF FPC_DOTTEDUNITS}
 {
   $Id: logger.pas,v 1.2 2006/11/26 16:58:04 savage Exp $
 
@@ -78,9 +80,15 @@ unit logger;
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.Classes,
+  System.SysUtils;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   Classes,
   SysUtils;
+{$ENDIF FPC_DOTTEDUNITS}
 
 type
   TLogger = class
@@ -186,4 +194,4 @@ begin
 end;
 
 end.
- 
\ No newline at end of file
+ 
diff --git a/packages/sdl/src/sdl.pas b/packages/sdl/src/sdl.pas
index 060ce333dd..d00247e21b 100644
--- a/packages/sdl/src/sdl.pas
+++ b/packages/sdl/src/sdl.pas
@@ -1,4 +1,6 @@
+{$IFNDEF FPC_DOTTEDUNITS}
 unit sdl;
+{$ENDIF FPC_DOTTEDUNITS}
 {
   $Id: sdl.pas,v 1.31 2007/05/29 21:30:48 savage Exp $
 
@@ -279,6 +281,57 @@ unit sdl;
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+{$IFDEF __GPC__}
+  system,
+  {$IFDEF Windows}
+  WinApi.WinTypes,
+  {$ELSE}
+  {$ENDIF}
+  gpc;
+{$ENDIF}
+
+{$IFDEF HAS_TYPES}
+  System.Types{$IFNDEF NDS},{$ELSE};{$ENDIF}
+{$ENDIF}
+
+{$IFDEF Windows}
+  WinApi.Windows;
+{$ENDIF}
+
+{$IFDEF OS2}
+  OS2Api.doscalls;
+{$ENDIF OS2}
+
+{$IFDEF Unix}
+  {$IFDEF FPC}
+  UnixApi.Pthreads,
+  UnixApi.Types,
+  UnixApi.Base,
+  {$IFNDEF GP2X}    
+  UnixApi.Unix,
+  {$ELSE}
+  UnixApi.Unix;
+  {$ENDIF}
+  {$IFNDEF GP2X}
+  Api.X11.X,
+  Api.X11.Xlib;
+  {$ENDIF}
+  {$ELSE}
+  Api.Libc,
+  Xlib;
+  {$ENDIF}
+{$ENDIF}
+
+{$IFDEF __MACH__}
+  GPCMacOSAll;
+{$ENDIF}
+
+{$IFDEF MORPHOS}
+  Amiga.Core.Exec;
+{$ENDIF}
+{$ELSE FPC_DOTTEDUNITS}
 uses
 {$IFDEF __GPC__}
   system,
@@ -328,6 +381,7 @@ uses
 {$IFDEF MORPHOS}
   exec;
 {$ENDIF}
+{$ENDIF FPC_DOTTEDUNITS}
 
 const
 {$IFDEF WINDOWS}
@@ -2260,13 +2314,13 @@ PSDL_semaphore = ^TSDL_semaphore;
 
   PPoint = ^TPoint;
   {$IFDEF HAS_TYPES}
-  TPoint = Types.TPoint;
+  TPoint = {$IFDEF FPC_DOTTEDUNITS}System.{$ENDIF}Types.TPoint;
   {$ELSE}
     {$IFDEF WINDOWS}
       {$IFDEF __GPC__}
-      TPoint = wintypes.TPoint;
+      TPoint = {$IFDEF FPC_DOTTEDUNITS}WinApi.{$ENDIF}wintypes.TPoint;
       {$ELSE}
-      TPoint = Windows.TPoint;
+      TPoint = {$IFDEF FPC_DOTTEDUNITS}WinApi.{$ENDIF}Windows.TPoint;
       {$ENDIF}
     {$ELSE}
       //Can't define TPoint : neither Types nor Windows unit available.
@@ -2275,13 +2329,13 @@ PSDL_semaphore = ^TSDL_semaphore;
 
   PRect = ^TRect;
   {$IFDEF HAS_TYPES}
-  TRect = Types.TRect;
+  TRect = {$IFDEF FPC_DOTTEDUNITS}System.{$ENDIF}Types.TRect;
   {$ELSE}
     {$IFDEF WINDOWS}
       {$IFDEF __GPC__}
-      TRect = wintypes.TRect;
+      TRect = {$IFDEF FPC_DOTTEDUNITS}WinApi.{$ENDIF}wintypes.TRect;
       {$ELSE}
-      TRect = Windows.TRect;
+      TRect = {$IFDEF FPC_DOTTEDUNITS}WinApi.{$ENDIF}Windows.TRect;
       {$ENDIF}
     {$ELSE}
       //Can't define TRect: neither Types nor Windows unit available.
diff --git a/packages/sdl/src/sdl_gfx.pas b/packages/sdl/src/sdl_gfx.pas
index 28d73662ae..c6a6f82907 100644
--- a/packages/sdl/src/sdl_gfx.pas
+++ b/packages/sdl/src/sdl_gfx.pas
@@ -1,4 +1,6 @@
+{$IFNDEF FPC_DOTTEDUNITS}
 unit sdl_gfx;
+{$ENDIF FPC_DOTTEDUNITS}
 {
   $Id: sdl_gfx.pas,v 1.3 2007/05/29 21:31:04 savage Exp $
 
@@ -22,11 +24,19 @@ unit sdl_gfx;
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+{$IFDEF MORPHOS}
+  Amiga.Core.Exec,
+{$ENDIF}
+  Api.Sdl;
+{$ELSE FPC_DOTTEDUNITS}
 uses
 {$IFDEF MORPHOS}
   exec,
 {$ENDIF}
   sdl;
+{$ENDIF FPC_DOTTEDUNITS}
 
 const
 {$IFDEF WINDOWS}
@@ -701,4 +711,4 @@ cdecl; external {$IFDEF __GPC__}name 'zoomSurfaceSize'{$ELSE} SDLgfxLibName{$END
 
 implementation
 
-end.
\ No newline at end of file
+end.
diff --git a/packages/sdl/src/sdl_image.pas b/packages/sdl/src/sdl_image.pas
index f8e2075de3..f0b36e594a 100644
--- a/packages/sdl/src/sdl_image.pas
+++ b/packages/sdl/src/sdl_image.pas
@@ -1,4 +1,6 @@
+{$IFNDEF FPC_DOTTEDUNITS}
 unit sdl_image;
+{$ENDIF FPC_DOTTEDUNITS}
 {
   $Id: sdl_image.pas,v 1.14 2007/05/29 21:31:13 savage Exp $
   
@@ -133,6 +135,16 @@ unit sdl_image;
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+{$IFDEF __GPC__}
+  gpc,
+{$ENDIF}
+{$IFDEF MORPHOS}
+  Amiga.Core.Exec,
+{$ENDIF}
+  Api.Sdl;
+{$ELSE FPC_DOTTEDUNITS}
 uses
 {$IFDEF __GPC__}
   gpc,
@@ -141,6 +153,7 @@ uses
   exec,
 {$ENDIF}
   sdl;
+{$ENDIF FPC_DOTTEDUNITS}
 
 const
 {$IFDEF WINDOWS}
diff --git a/packages/sdl/src/sdl_mixer.pas b/packages/sdl/src/sdl_mixer.pas
index 4cb5f2e603..fbce4e6ea3 100644
--- a/packages/sdl/src/sdl_mixer.pas
+++ b/packages/sdl/src/sdl_mixer.pas
@@ -1,4 +1,6 @@
+{$IFNDEF FPC_DOTTEDUNITS}
 unit sdl_mixer;
+{$ENDIF FPC_DOTTEDUNITS}
 {******************************************************************************}
 {
   $Id: sdl_mixer.pas,v 1.18 2007/05/29 21:31:44 savage Exp $
@@ -153,6 +155,21 @@ unit sdl_mixer;
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+{$IFDEF __GPC__}
+  gpc,
+{$ENDIF}
+{$IFNDEF DARWIN}
+{$IFNDEF no_smpeg}
+  Api.Sdl.SMpeg,
+{$ENDIF}
+{$ENDIF}
+{$IFDEF MORPHOS}
+  Amiga.Core.Exec,
+{$ENDIF}
+  Api.Sdl;
+{$ELSE FPC_DOTTEDUNITS}
 uses
 {$IFDEF __GPC__}
   gpc,
@@ -166,6 +183,7 @@ uses
   exec,
 {$ENDIF}
   sdl;
+{$ENDIF FPC_DOTTEDUNITS}
 
 const
 {$IFDEF WINDOWS}
@@ -1145,4 +1163,4 @@ begin
   result := SDL_GetError;
 end;
 
-end.
\ No newline at end of file
+end.
diff --git a/packages/sdl/src/sdl_mixer_nosmpeg.pas b/packages/sdl/src/sdl_mixer_nosmpeg.pas
index 0e78ecec4c..f8a900b728 100644
--- a/packages/sdl/src/sdl_mixer_nosmpeg.pas
+++ b/packages/sdl/src/sdl_mixer_nosmpeg.pas
@@ -1,4 +1,6 @@
+{$IFNDEF FPC_DOTTEDUNITS}
 unit sdl_mixer_nosmpeg;
+{$ENDIF FPC_DOTTEDUNITS}
 {******************************************************************************}
 { Copy of SDL_Mixer without smpeg dependency and mp3 support                    }
 {******************************************************************************}
@@ -7,6 +9,16 @@ unit sdl_mixer_nosmpeg;
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+{$IFDEF __GPC__}
+  gpc,
+{$ENDIF}
+{$IFDEF MORPHOS}
+  Amiga.Core.Exec,
+{$ENDIF}
+  Api.Sdl;
+{$ELSE FPC_DOTTEDUNITS}
 uses
 {$IFDEF __GPC__}
   gpc,
@@ -15,6 +27,7 @@ uses
   exec,
 {$ENDIF}
   sdl;
+{$ENDIF FPC_DOTTEDUNITS}
 
 const
 {$IFDEF WINDOWS}
diff --git a/packages/sdl/src/sdl_net.pas b/packages/sdl/src/sdl_net.pas
index bc8755812b..7a9802e941 100644
--- a/packages/sdl/src/sdl_net.pas
+++ b/packages/sdl/src/sdl_net.pas
@@ -1,4 +1,6 @@
+{$IFNDEF FPC_DOTTEDUNITS}
 unit sdl_net;
+{$ENDIF FPC_DOTTEDUNITS}
 {******************************************************************************}
 {
   $Id: sdl_net.pas,v 1.7 2005/01/01 02:14:21 savage Exp $
@@ -115,6 +117,23 @@ unit sdl_net;
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+{$IFDEF __GPC__}
+  gpc,
+{$ENDIF}
+
+{$IFDEF Windows}
+{$IFNDEF __GPC__}
+  WinApi.Windows,
+{$ENDIF}
+{$ENDIF}
+
+{$IFDEF MORPHOS}
+  Amiga.Core.Exec,
+{$ENDIF}
+  Api.Sdl;
+{$ELSE FPC_DOTTEDUNITS}
 uses
 {$IFDEF __GPC__}
   gpc,
@@ -130,6 +149,7 @@ uses
   exec,
 {$ENDIF}
   sdl;
+{$ENDIF FPC_DOTTEDUNITS}
 
 const
 {$IFDEF windows}
diff --git a/packages/sdl/src/sdl_ttf.pas b/packages/sdl/src/sdl_ttf.pas
index 3c75150180..6c727e966e 100644
--- a/packages/sdl/src/sdl_ttf.pas
+++ b/packages/sdl/src/sdl_ttf.pas
@@ -1,4 +1,6 @@
+{$IFNDEF FPC_DOTTEDUNITS}
 unit sdl_ttf;
+{$ENDIF FPC_DOTTEDUNITS}
 {
   $Id: sdl_ttf.pas,v 1.18 2007/06/01 11:16:33 savage Exp $
 
@@ -162,6 +164,22 @@ unit sdl_ttf;
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+{$IFDEF __GPC__}
+  gpc,
+{$ENDIF}
+
+{$IFDEF Windows}
+  {$IFNDEF __GPC__}
+  WinApi.Windows,
+  {$ENDIF}
+{$ENDIF}
+{$IFDEF MORPHOS}
+  Amiga.Core.Exec,
+{$ENDIF}
+  Api.Sdl;
+{$ELSE FPC_DOTTEDUNITS}
 uses
 {$IFDEF __GPC__}
   gpc,
@@ -176,6 +194,7 @@ uses
   exec,
 {$ENDIF}
   sdl;
+{$ENDIF FPC_DOTTEDUNITS}
 
 const
 {$IFDEF WINDOWS}
diff --git a/packages/sdl/src/sdlutils.pas b/packages/sdl/src/sdlutils.pas
index 01f67685b4..31966febb7 100644
--- a/packages/sdl/src/sdlutils.pas
+++ b/packages/sdl/src/sdlutils.pas
@@ -1,4 +1,6 @@
+{$IFNDEF FPC_DOTTEDUNITS}
 unit sdlutils;
+{$ENDIF FPC_DOTTEDUNITS}
 {
   $Id: sdlutils.pas,v 1.5 2006/11/19 18:56:44 savage Exp $
 
@@ -129,6 +131,17 @@ interface
 
 {$I jedi-sdl.inc}
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+{$IFDEF Unix}
+  System.Types,
+{$IFNDEF DARWIN}
+  Api.X11.Xlib,
+{$ENDIF}
+{$ENDIF}
+  System.SysUtils,
+  Api.Sdl;
+{$ELSE FPC_DOTTEDUNITS}
 uses
 {$IFDEF UNIX}
   Types,
@@ -138,6 +151,7 @@ uses
 {$ENDIF}
   SysUtils,
   sdl;
+{$ENDIF FPC_DOTTEDUNITS}
 
 type
   TGradientStyle = ( gsHorizontal, gsVertical );
@@ -251,8 +265,13 @@ function SDL_ClipLine( var x1, y1, x2, y2 : Integer; ClipRect : PSDL_Rect ) : bo
 
 implementation
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.Math;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   Math;
+{$ENDIF FPC_DOTTEDUNITS}
 
 function SDL_PixelTest( SrcSurface1 : PSDL_Surface; SrcRect1 : PSDL_Rect; SrcSurface2 :
   PSDL_Surface; SrcRect2 : PSDL_Rect; Left1, Top1, Left2, Top2 : integer ) : boolean;
diff --git a/packages/sdl/src/smpeg.pas b/packages/sdl/src/smpeg.pas
index 4b0623aaf1..b4e29be252 100644
--- a/packages/sdl/src/smpeg.pas
+++ b/packages/sdl/src/smpeg.pas
@@ -1,4 +1,6 @@
+{$IFNDEF FPC_DOTTEDUNITS}
 unit smpeg;
+{$ENDIF FPC_DOTTEDUNITS}
 {******************************************************************************}
 {
   $Id: smpeg.pas,v 1.7 2004/08/14 22:54:30 savage Exp $
@@ -130,6 +132,16 @@ unit smpeg;
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+{$IFDEF __GPC__}
+  gpc,
+{$ENDIF}
+{$IFDEF MORPHOS}
+  Amiga.Core.Exec,
+{$ENDIF}
+  Api.Sdl;
+{$ELSE FPC_DOTTEDUNITS}
 uses
 {$IFDEF __GPC__}
   gpc,
@@ -138,6 +150,7 @@ uses
   exec,
 {$ENDIF}
   sdl;
+{$ENDIF FPC_DOTTEDUNITS}
 
 const
 {$IFDEF windows}