diff --git a/src/pymod/distutils_src/klayout/db/__init__.py b/src/pymod/distutils_src/klayout/db/__init__.py
index c3270bfb8..ed86dcf86 100644
--- a/src/pymod/distutils_src/klayout/db/__init__.py
+++ b/src/pymod/distutils_src/klayout/db/__init__.py
@@ -1,3 +1,6 @@
+import klayout.dbcore
 from klayout.dbcore import *
 
 from klayout.db.pcell_declaration_helper import PCellDeclarationHelper
+
+__all__ = klayout.dbcore.__all__ + ['PCellDeclarationHelper']
diff --git a/src/pymod/distutils_src/klayout/db/pcell_declaration_helper.py b/src/pymod/distutils_src/klayout/db/pcell_declaration_helper.py
index 9367f787f..e351a818b 100644
--- a/src/pymod/distutils_src/klayout/db/pcell_declaration_helper.py
+++ b/src/pymod/distutils_src/klayout/db/pcell_declaration_helper.py
@@ -276,5 +276,3 @@ for k in dir(PCellParameterDeclaration):
 
 # Inject the PCellDeclarationHelper into pya module for consistency:
 PCellDeclarationHelper = _PCellDeclarationHelper
-
-__all__ = ['PCellDeclarationHelper']
diff --git a/src/pymod/distutils_src/klayout/rdb.py b/src/pymod/distutils_src/klayout/rdb.py
index 217207310..eb48ea888 100644
--- a/src/pymod/distutils_src/klayout/rdb.py
+++ b/src/pymod/distutils_src/klayout/rdb.py
@@ -1 +1,4 @@
+import klayout.rdbcore
 from klayout.rdbcore import *
+
+__all__ = klayout.rdbcore.__all__
diff --git a/src/pymod/distutils_src/klayout/tl.py b/src/pymod/distutils_src/klayout/tl.py
index 0645f506f..a4c4287e9 100644
--- a/src/pymod/distutils_src/klayout/tl.py
+++ b/src/pymod/distutils_src/klayout/tl.py
@@ -1 +1,4 @@
+import klayout.tlcore
 from klayout.tlcore import *
+
+__all__ = klayout.tlcore.__all__