diff --git a/packages/libnettle/namespaced/Api.Libnettle.pp b/packages/libnettle/namespaced/Api.Libnettle.pp
new file mode 100644
index 0000000000..0d2ac234f7
--- /dev/null
+++ b/packages/libnettle/namespaced/Api.Libnettle.pp
@@ -0,0 +1,3 @@
+unit Api.Libnettle;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i libnettle.pp}
diff --git a/packages/libnettle/namespaces.lst b/packages/libnettle/namespaces.lst
new file mode 100644
index 0000000000..37391d9af5
--- /dev/null
+++ b/packages/libnettle/namespaces.lst
@@ -0,0 +1,3 @@
+src/libnettle.pp=namespaced/Api.Libnettle.pp
+{s*:src/}=namespaced/
+{i+:src/}
diff --git a/packages/libnettle/src/libnettle.pp b/packages/libnettle/src/libnettle.pp
index 1fd0fa19d6..126606df22 100644
--- a/packages/libnettle/src/libnettle.pp
+++ b/packages/libnettle/src/libnettle.pp
@@ -14,13 +14,20 @@
  **********************************************************************}
 
 {$mode objfpc}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit libnettle;
+{$ENDIF FPC_DOTTEDUNITS}
 
 interface
 
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.CTypes, Api.Libgmp;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   ctypes, libgmp;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {
   Automatically converted by H2Pas 1.0.0 from libnettle.c
@@ -1769,7 +1776,11 @@ Var
 
 implementation
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses System.SysUtils, System.DynLibs;
+{$ELSE FPC_DOTTEDUNITS}
 uses sysUtils, dynlibs;
+{$ENDIF FPC_DOTTEDUNITS}
 
 var
   hlibnettle,hlibhogweed : tlibhandle;