diff --git a/src/db/db/gsiDeclDbPCellDeclaration.cc b/src/db/db/gsiDeclDbPCellDeclaration.cc
index ecbabe2b4..206f3bfe9 100644
--- a/src/db/db/gsiDeclDbPCellDeclaration.cc
+++ b/src/db/db/gsiDeclDbPCellDeclaration.cc
@@ -35,12 +35,14 @@ namespace gsi
 //  db::PCellParameterPageBase binding
 
 //  Provide a binding for db::PCellDeclaration for native PCell implementations
-DB_PUBLIC Class<db::PCellParametersPageBase> decl_dbPCellParametersPageBase ("db", "PCellParametersPageBase",
+Class<db::PCellParametersPageBase> pcell_parameter_page_base_decl ("db", "PCellParametersPageBase",
   gsi::Methods (),
   "@hide.\n"
   "This abstract base class for PCell parameter pages has been introduced in version 0.30.11.\n"
 );
 
+DB_PUBLIC Class<db::PCellParametersPageBase> &decl_dbPCellParametersPageBase () { return pcell_parameter_page_base_decl; }
+
 // ---------------------------------------------------------------
 //  db::PCellDeclaration binding
 
diff --git a/src/edt/edt/gsiDeclEdtPCellParametersPage.cc b/src/edt/edt/gsiDeclEdtPCellParametersPage.cc
index af6b696ad..1e8eb089f 100644
--- a/src/edt/edt/gsiDeclEdtPCellParametersPage.cc
+++ b/src/edt/edt/gsiDeclEdtPCellParametersPage.cc
@@ -107,9 +107,9 @@ public:
 };
 
 //  borrowed from the db module
-extern gsi::Class<db::PCellParametersPageBase> decl_dbPCellParametersPageBase;
+DB_PUBLIC gsi::Class<db::PCellParametersPageBase> &decl_dbPCellParametersPageBase ();
 
-gsi::Class<edt::PCellParametersPageBase> decl_PCellParametersPage_Native (decl_dbPCellParametersPageBase, "lay", "PCellParametersPage_Native",
+gsi::Class<edt::PCellParametersPageBase> decl_PCellParametersPage_Native (decl_dbPCellParametersPageBase (), "lay", "PCellParametersPage_Native",
   gsi::method ("dense", &edt::PCellParametersPageBase::dense,
     "@brief Gets a value indicating whether a dense layout is requested.\n"
     "A dense alyout is requested when the page is needed for an embedded PCell parameter page, for\n"