diff --git a/packages/gnutls/namespaced/Api.GnuTls.pp b/packages/gnutls/namespaced/Api.GnuTls.pp
new file mode 100644
index 0000000000..942e8feb27
--- /dev/null
+++ b/packages/gnutls/namespaced/Api.GnuTls.pp
@@ -0,0 +1,3 @@
+unit Api.GnuTls;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i gnutls.pp}
diff --git a/packages/gnutls/namespaced/System.Net.Gnutlssockets.pp b/packages/gnutls/namespaced/System.Net.Gnutlssockets.pp
new file mode 100644
index 0000000000..cd657b432a
--- /dev/null
+++ b/packages/gnutls/namespaced/System.Net.Gnutlssockets.pp
@@ -0,0 +1,3 @@
+unit System.Net.Gnutlssockets;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i gnutlssockets.pp}
diff --git a/packages/gnutls/namespaces.lst b/packages/gnutls/namespaces.lst
new file mode 100644
index 0000000000..d0d970799e
--- /dev/null
+++ b/packages/gnutls/namespaces.lst
@@ -0,0 +1,4 @@
+src/gnutls.pp=namespaced/Api.GnuTls.pp
+{s*:src/}=namespaced/
+{i+:src/}
+src/gnutlssockets.pp=namespaced/System.Net.Gnutlssockets.pp
diff --git a/packages/gnutls/src/gnutls.pp b/packages/gnutls/src/gnutls.pp
index bbb15c205a..7167e034f2 100644
--- a/packages/gnutls/src/gnutls.pp
+++ b/packages/gnutls/src/gnutls.pp
@@ -16,11 +16,17 @@
 
 {$mode objfpc}
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit gnutls;
+{$ENDIF FPC_DOTTEDUNITS}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses System.CTypes;
+{$ELSE FPC_DOTTEDUNITS}
 uses ctypes;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {
   Automatically converted by H2Pas 1.0.0 from gnutls.c
@@ -2327,8 +2333,13 @@ Function GnuTLSloaded : Boolean;
 
 implementation
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.SysUtils, System.DynLibs;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   SysUtils, dynlibs;
+{$ENDIF FPC_DOTTEDUNITS}
 
 { was #define dname def_expr }
 function GNUTLS_X509_NO_WELL_DEFINED_EXPIRATION : Ttime_t;
diff --git a/packages/gnutls/src/gnutlssockets.pp b/packages/gnutls/src/gnutlssockets.pp
index 1074569574..ac8a01e109 100644
--- a/packages/gnutls/src/gnutlssockets.pp
+++ b/packages/gnutls/src/gnutlssockets.pp
@@ -1,12 +1,20 @@
+{$IFNDEF FPC_DOTTEDUNITS}
 unit gnutlssockets;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$mode objfpc}{$H+}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.Classes, System.SysUtils, System.Net.Sockets, System.Net.Ssockets, System.Net.Sslsockets, 
+  System.DateUtils, System.CTypes, System.Net.Sslbase, Api.GnuTls;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   Classes, SysUtils, sockets, ssockets, sslsockets, dateUtils,
   cTypes, sslbase, gnutls;
+{$ENDIF FPC_DOTTEDUNITS}
 
 Const
   DefCertSize = 8192;