diff --git a/scripts/mkqtdecl_common/produce.rb b/scripts/mkqtdecl_common/produce.rb
index 1d2034066..51afe05ab 100755
--- a/scripts/mkqtdecl_common/produce.rb
+++ b/scripts/mkqtdecl_common/produce.rb
@@ -1521,7 +1521,9 @@ END
           m.each do |bd|
 
             vis = bd.visibility
-            if vis == :public || (vis == :protected && needs_adaptor)
+            is_signal = conf.event_args(cls, bd.sig(cls))
+
+            if vis == :public || (vis == :protected && needs_adaptor) || is_signal
 
               # don't consider dropped methods
               conf.target_name(cls, bd, mn) || next
diff --git a/src/db/db/gsiDeclDbBox.cc b/src/db/db/gsiDeclDbBox.cc
index a30915fdf..fd074a21e 100644
--- a/src/db/db/gsiDeclDbBox.cc
+++ b/src/db/db/gsiDeclDbBox.cc
@@ -480,7 +480,7 @@ static db::DBox box_to_dbox (const db::Box *b, double dbu)
   return db::DBox (*b) * dbu;
 }
 
-Class<db::Box> decl_Box ("Box", 
+Class<db::Box> decl_Box ("db", "Box",
   constructor ("new|#from_dbox", &box_from_dbox, gsi::arg ("dbox"),
     "@brief Creates an integer coordinate box from a floating-point coordinate box\n"
     "\n"
@@ -535,7 +535,7 @@ static db::Box dbox_to_box (const db::DBox *b, double dbu)
   return db::Box (*b * (1.0 / dbu));
 }
 
-Class<db::DBox> decl_DBox ("DBox",
+Class<db::DBox> decl_DBox ("db", "DBox",
   constructor ("new|#from_ibox", &dbox_from_ibox, gsi::arg ("box"),
     "@brief Creates a floating-point coordinate box from an integer coordinate box\n"
     "\n"
diff --git a/src/db/db/gsiDeclDbCell.cc b/src/db/db/gsiDeclDbCell.cc
index d7b83f654..cb046d98e 100644
--- a/src/db/db/gsiDeclDbCell.cc
+++ b/src/db/db/gsiDeclDbCell.cc
@@ -1701,7 +1701,7 @@ static db::Cell::touching_iterator cell_begin_touching_inst_um (const db::Cell *
   return cell->begin_touching (dbu_trans.inverted () * db);
 }
 
-Class<db::Cell> decl_Cell ("Cell",
+Class<db::Cell> decl_Cell ("db", "Cell",
   gsi::method ("name", &db::Cell::get_basic_name,
     "@brief Gets the cell's name\n"
     "\n"
@@ -3676,7 +3676,7 @@ db::DBox inst_dbbox_per_layer (const db::Instance *inst, unsigned int layer_inde
   return inst_bbox_per_layer (inst, layer_index) * inst_dbu (inst);
 }
 
-Class<db::Instance> decl_Instance ("Instance",
+Class<db::Instance> decl_Instance ("db", "Instance",
   method ("prop_id", &db::Instance::prop_id,
     "@brief Gets the properties ID associated with the instance\n"
   ) +
@@ -4219,7 +4219,7 @@ Class<db::Instance> decl_Instance ("Instance",
 // ---------------------------------------------------------------
 //  db::ParentInstRep binding (to "ParentInstArray")
 
-Class<db::ParentInstRep> decl_ParentInstArray ("ParentInstArray", 
+Class<db::ParentInstRep> decl_ParentInstArray ("db", "ParentInstArray",
   method ("parent_cell_index", &db::ParentInstRep::parent_cell_index,
     "@brief Gets the index of the parent cell\n"
   ) +
@@ -4262,7 +4262,7 @@ static db::CellInstArray::box_type cell_inst_array_bbox_per_layer (const db::Cel
   return a->bbox (bc);
 }
 
-Class<db::CellInstArray> decl_CellInstArray ("CellInstArray",
+Class<db::CellInstArray> decl_CellInstArray ("db", "CellInstArray",
   cell_inst_array_defs<db::CellInstArray>::methods (false /*old version*/) +
   gsi::method_ext ("bbox_per_layer", &cell_inst_array_bbox_per_layer, gsi::arg ("layout"), gsi::arg ("layer_index"),
     "@brief Gets the bounding box of the array with respect to one layer\n"
@@ -4324,7 +4324,7 @@ static db::DBox cell_dinst_array_bbox_per_layer (const db::DCellInstArray *a, co
   return a->bbox (bc);
 }
 
-Class<db::DCellInstArray> decl_DCellInstArray ("DCellInstArray",
+Class<db::DCellInstArray> decl_DCellInstArray ("db", "DCellInstArray",
   cell_inst_array_defs<db::DCellInstArray>::methods (true /*new version*/) +
   gsi::method_ext ("bbox_per_layer", &cell_dinst_array_bbox_per_layer, gsi::arg ("layout"), gsi::arg ("layer_index"),
     "@brief Gets the bounding box of the array with respect to one layer\n"
diff --git a/src/db/db/gsiDeclDbCellMapping.cc b/src/db/db/gsiDeclDbCellMapping.cc
index 3106812fa..82454184e 100644
--- a/src/db/db/gsiDeclDbCellMapping.cc
+++ b/src/db/db/gsiDeclDbCellMapping.cc
@@ -36,7 +36,7 @@ static db::cell_index_type drop_cell_const ()
   return db::DropCell;
 }
 
-Class<db::CellMapping> decl_CellMapping ("CellMapping", 
+Class<db::CellMapping> decl_CellMapping ("db", "CellMapping",
   gsi::method ("DropCell", &drop_cell_const,
     "@brief A constant indicating the reques to drop a cell\n"
     "\n"
diff --git a/src/db/db/gsiDeclDbEdge.cc b/src/db/db/gsiDeclDbEdge.cc
index 89fee56c0..99e2c8ad5 100644
--- a/src/db/db/gsiDeclDbEdge.cc
+++ b/src/db/db/gsiDeclDbEdge.cc
@@ -597,7 +597,7 @@ static db::DEdge edge_to_dedge (const db::Edge *e, double dbu)
   return db::DEdge (*e * dbu);
 }
 
-Class<db::Edge> decl_Edge ("Edge", 
+Class<db::Edge> decl_Edge ("db", "Edge",
   constructor ("new|#from_dedge", &edge_from_dedge, gsi::arg ("dedge"),
     "@brief Creates an integer coordinate edge from a floating-point coordinate edge\n"
     "\n"
@@ -646,7 +646,7 @@ static db::Edge dedge_to_edge (const db::DEdge *e, double dbu)
   return db::Edge (*e * (1.0 / dbu));
 }
 
-Class<db::DEdge> decl_DEdge ("DEdge",
+Class<db::DEdge> decl_DEdge ("db", "DEdge",
   constructor ("new|#from_iedge", &dedge_from_iedge, gsi::arg ("edge"),
     "@brief Creates a floating-point coordinate edge from an integer coordinate edge\n"
     "\n"
diff --git a/src/db/db/gsiDeclDbEdgePair.cc b/src/db/db/gsiDeclDbEdgePair.cc
index b1552c26a..3ecd0f37e 100644
--- a/src/db/db/gsiDeclDbEdgePair.cc
+++ b/src/db/db/gsiDeclDbEdgePair.cc
@@ -201,7 +201,7 @@ static db::DEdgePair edge_pair_to_dedge_pair (const db::EdgePair *e, double dbu)
   return db::DEdgePair (*e * dbu);
 }
 
-Class<db::EdgePair> decl_EdgePair ("EdgePair",
+Class<db::EdgePair> decl_EdgePair ("db", "EdgePair",
   constructor ("new", &edge_pair_from_dedge_pair, gsi::arg ("dedge_pair"),
     "@brief Creates an integer coordinate edge pair from a floating-point coordinate edge pair\n"
     "\n"
@@ -250,7 +250,7 @@ static db::EdgePair dedge_pair_to_edge_pair (const db::DEdgePair *e, double dbu)
   return db::EdgePair (*e * (1.0 / dbu));
 }
 
-Class<db::DEdgePair> decl_DEdgePair ("DEdgePair",
+Class<db::DEdgePair> decl_DEdgePair ("db", "DEdgePair",
   constructor ("new", &dedge_pair_from_iedge_pair, gsi::arg ("edge_pair"),
     "@brief Creates a floating-point coordinate edge pair from an integer coordinate edge\n"
     "\n"
diff --git a/src/db/db/gsiDeclDbEdgePairs.cc b/src/db/db/gsiDeclDbEdgePairs.cc
index d9b7a80e9..34eda041e 100644
--- a/src/db/db/gsiDeclDbEdgePairs.cc
+++ b/src/db/db/gsiDeclDbEdgePairs.cc
@@ -138,7 +138,7 @@ static void insert_e (db::EdgePairs *e, const db::EdgePairs &a)
   }
 }
 
-Class<db::EdgePairs> decl_EdgePairs ("EdgePairs", 
+Class<db::EdgePairs> decl_EdgePairs ("db", "EdgePairs",
   constructor ("new", &new_v, 
     "@brief Default constructor\n"
     "\n"
diff --git a/src/db/db/gsiDeclDbEdgeProcessor.cc b/src/db/db/gsiDeclDbEdgeProcessor.cc
index 7a73c4b5a..3352a8eb9 100644
--- a/src/db/db/gsiDeclDbEdgeProcessor.cc
+++ b/src/db/db/gsiDeclDbEdgeProcessor.cc
@@ -182,7 +182,7 @@ static int mode_xor () { return int (db::BooleanOp::Xor); }
 static int mode_anotb () { return int (db::BooleanOp::ANotB); }
 static int mode_bnota () { return int (db::BooleanOp::BNotA); }
 
-Class<db::EdgeProcessor> decl_EdgeProcessor ("EdgeProcessor", 
+Class<db::EdgeProcessor> decl_EdgeProcessor ("db", "EdgeProcessor",
   method_ext ("simple_merge_p2e|#simple_merge", &gsi::simple_merge1,
     "@brief Merge the given polygons in a simple \"non-zero wrapcount\" fashion\n"
     "@args in\n"
diff --git a/src/db/db/gsiDeclDbEdges.cc b/src/db/db/gsiDeclDbEdges.cc
index a62c5cd74..85b22a2f8 100644
--- a/src/db/db/gsiDeclDbEdges.cc
+++ b/src/db/db/gsiDeclDbEdges.cc
@@ -362,7 +362,7 @@ static void insert_s (db::Edges *e, const db::Shapes &a)
   insert_st (e, a, db::UnitTrans ());
 }
 
-Class<db::Edges> dec_Edges ("Edges", 
+Class<db::Edges> dec_Edges ("db", "Edges",
   constructor ("new", &new_v, 
     "@brief Default constructor\n"
     "\n"
diff --git a/src/db/db/gsiDeclDbGlyphs.cc b/src/db/db/gsiDeclDbGlyphs.cc
index 32948d0fe..e04b07bd7 100644
--- a/src/db/db/gsiDeclDbGlyphs.cc
+++ b/src/db/db/gsiDeclDbGlyphs.cc
@@ -64,7 +64,7 @@ static std::vector<const db::TextGenerator *> generators ()
   return gg;
 }
 
-Class<db::TextGenerator> decl_TextGenerator ("TextGenerator",
+Class<db::TextGenerator> decl_TextGenerator ("db", "TextGenerator",
   method ("load_from_resource", &db::TextGenerator::load_from_resource, arg ("resource_path"),
     "@brief Loads the given resource data (as layout data) into the generator\n"
     "See the description of the class how the layout data is read."
diff --git a/src/db/db/gsiDeclDbInstElement.cc b/src/db/db/gsiDeclDbInstElement.cc
index 66b87591b..137400574 100644
--- a/src/db/db/gsiDeclDbInstElement.cc
+++ b/src/db/db/gsiDeclDbInstElement.cc
@@ -88,7 +88,7 @@ static db::InstElement *new_iab (const db::Instance &i, unsigned long na, unsign
   }
 }
 
-Class<db::InstElement> decl_InstElement ("InstElement", 
+Class<db::InstElement> decl_InstElement ("db", "InstElement",
   gsi::constructor ("new", &new_v,
     "@brief Default constructor"
   ) +
diff --git a/src/db/db/gsiDeclDbLayerMapping.cc b/src/db/db/gsiDeclDbLayerMapping.cc
index 063d024e8..a960b9850 100644
--- a/src/db/db/gsiDeclDbLayerMapping.cc
+++ b/src/db/db/gsiDeclDbLayerMapping.cc
@@ -30,7 +30,7 @@
 namespace gsi
 {
 
-Class<db::LayerMapping> decl_LayerMapping ("LayerMapping", 
+Class<db::LayerMapping> decl_LayerMapping ("db", "LayerMapping",
   gsi::method ("create", &db::LayerMapping::create, 
     "@brief Initialize the layer mapping from two layouts\n"
     "\n"
diff --git a/src/db/db/gsiDeclDbLayout.cc b/src/db/db/gsiDeclDbLayout.cc
index 2016fca89..3c0f309a9 100644
--- a/src/db/db/gsiDeclDbLayout.cc
+++ b/src/db/db/gsiDeclDbLayout.cc
@@ -119,7 +119,7 @@ size_t hash_value (const db::LayerProperties *l)
 }
 
 //  since there already exists a "LayerProperties" object, we call this one "LayerInfo"
-Class<db::LayerProperties> decl_LayerInfo ("LayerInfo", 
+Class<db::LayerProperties> decl_LayerInfo ("db", "LayerInfo",
   gsi::constructor ("new", &ctor_layer_info_default, 
     "@brief The default constructor.\n"
     "Creates a default \\LayerInfo object.\n"
@@ -828,7 +828,7 @@ static const std::string &layout_meta_get_description (const db::MetaInfo *mi)
   return mi->description;
 }
 
-Class<db::MetaInfo> decl_LayoutMetaInfo ("LayoutMetaInfo",
+Class<db::MetaInfo> decl_LayoutMetaInfo ("db", "LayoutMetaInfo",
   gsi::constructor ("new", &layout_meta_info_ctor, gsi::arg ("name"), gsi::arg ("value"), gsi::arg ("description", std::string ()),
     "@brief Creates a layout meta info object\n"
     "@param name The name\n"
@@ -879,7 +879,7 @@ static void dtransform_cplx (db::Layout *layout, const db::DCplxTrans &trans)
   layout->transform (dbu_trans.inverted () * trans * dbu_trans);
 }
 
-Class<db::Layout> decl_Layout ("Layout",
+Class<db::Layout> decl_Layout ("db", "Layout",
   gsi::constructor ("new", &layout_ctor_with_manager,
     "@brief Creates a layout object attached to a manager\n"
     "@args manager\n"
@@ -2005,7 +2005,7 @@ static bool set_format_from_filename (db::SaveLayoutOptions *opt, const std::str
   return true;
 }
 
-Class<db::SaveLayoutOptions> decl_SaveLayoutOptions ("SaveLayoutOptions", 
+Class<db::SaveLayoutOptions> decl_SaveLayoutOptions ("db", "SaveLayoutOptions",
   gsi::constructor ("new", &new_v,
     "@brief Default constructor\n"
     "\n"
diff --git a/src/db/db/gsiDeclDbLayoutDiff.cc b/src/db/db/gsiDeclDbLayoutDiff.cc
index 10f3a58f0..5b515f139 100644
--- a/src/db/db/gsiDeclDbLayoutDiff.cc
+++ b/src/db/db/gsiDeclDbLayoutDiff.cc
@@ -431,7 +431,7 @@ static unsigned int f_no_text_details () {
   return db::layout_diff::f_no_text_details;
 }
 
-gsi::Class<LayoutDiff> decl_LayoutDiff ("LayoutDiff",
+gsi::Class<LayoutDiff> decl_LayoutDiff ("db", "LayoutDiff",
   gsi::constant ("Silent", &f_silent,
     "@brief Silent compare - just report whether the layouts are identical\n"
     "Silent mode will not issue any signals, but instead the return value of the \\LayoutDiff#compare method "
diff --git a/src/db/db/gsiDeclDbLayoutQuery.cc b/src/db/db/gsiDeclDbLayoutQuery.cc
index 514f1b48c..19f21da6b 100644
--- a/src/db/db/gsiDeclDbLayoutQuery.cc
+++ b/src/db/db/gsiDeclDbLayoutQuery.cc
@@ -142,7 +142,7 @@ char parent_cell_query_property_name[]        = "parent_cell";
 char initial_cell_index_query_property_name[] = "initial_cell_index";
 char initial_cell_query_property_name[]       = "initial_cell";
 
-Class<db::LayoutQueryIterator> decl_LayoutQueryIterator ("LayoutQueryIterator",
+Class<db::LayoutQueryIterator> decl_LayoutQueryIterator ("db", "LayoutQueryIterator",
   gsi::method ("layout", &db::LayoutQueryIterator::layout,
     "@brief Gets the layout the query acts on\n"
   ) +
@@ -177,7 +177,7 @@ Class<db::LayoutQueryIterator> decl_LayoutQueryIterator ("LayoutQueryIterator",
   "The LayoutQueryIterator class has been introduced in version 0.25."
 );
 
-Class<db::LayoutQuery> decl_LayoutQuery ("LayoutQuery",
+Class<db::LayoutQuery> decl_LayoutQuery ("db", "LayoutQuery",
   gsi::constructor ("new", &new_query, gsi::arg ("query"),
     "@brief Creates a new query object from the given query string\n"
   ) +
diff --git a/src/db/db/gsiDeclDbLibrary.cc b/src/db/db/gsiDeclDbLibrary.cc
index d86f5633a..7f9e7965c 100644
--- a/src/db/db/gsiDeclDbLibrary.cc
+++ b/src/db/db/gsiDeclDbLibrary.cc
@@ -68,7 +68,7 @@ static void delete_lib (db::Library *lib)
   db::LibraryManager::instance ().delete_lib (lib);
 }
 
-Class<db::Library> decl_Library ("Library", 
+Class<db::Library> decl_Library ("db", "Library",
   gsi::constructor ("new", &new_lib,
     "@brief Creates a new, empty library"
   ) +
@@ -168,7 +168,7 @@ static db::pcell_parameters_type coerce_parameters_native (const db::PCellDeclar
 }
 
 //  Provide a binding for db::PCellDeclaration for native PCell implementations
-Class<db::PCellDeclaration> decl_PCellDeclaration_Native ("PCellDeclaration_Native", 
+Class<db::PCellDeclaration> decl_PCellDeclaration_Native ("db", "PCellDeclaration_Native",
   gsi::method_ext ("get_layers", &get_layer_declarations_native) +
   gsi::method ("get_parameters", &db::PCellDeclaration::get_parameter_declarations) +
   gsi::method ("produce", &db::PCellDeclaration::produce) +
@@ -327,7 +327,7 @@ public:
   gsi::Callback cb_get_display_name;
 };
 
-Class<PCellDeclarationImpl> decl_PCellDeclaration (decl_PCellDeclaration_Native, "PCellDeclaration", 
+Class<PCellDeclarationImpl> decl_PCellDeclaration (decl_PCellDeclaration_Native, "db", "PCellDeclaration",
   //  fallback implementations to reroute Ruby calls to the base class:
   gsi::method ("get_parameters", &PCellDeclarationImpl::get_parameter_declarations_fb, "@hide") +
   gsi::method ("produce", &PCellDeclarationImpl::produce_fb, "@hide") +
@@ -538,7 +538,7 @@ db::PCellParameterDeclaration *ctor_pcell_parameter_3 (const std::string &name,
   return pd;
 }
 
-Class<db::PCellParameterDeclaration> decl_PCellParameterDeclaration ("PCellParameterDeclaration", 
+Class<db::PCellParameterDeclaration> decl_PCellParameterDeclaration ("db", "PCellParameterDeclaration",
   gsi::constructor ("new", &ctor_pcell_parameter, 
     "@brief Create a new parameter declaration with the given name and type\n"
     "@args name, type, description\n"
diff --git a/src/db/db/gsiDeclDbManager.cc b/src/db/db/gsiDeclDbManager.cc
index b47299c5f..ff41107d7 100644
--- a/src/db/db/gsiDeclDbManager.cc
+++ b/src/db/db/gsiDeclDbManager.cc
@@ -57,7 +57,7 @@ static db::Manager::transaction_id_t transaction2(db::Manager *manager, const st
   return manager->transaction (description, id);
 }
 
-Class<db::Manager> decl_Manager ("Manager", 
+Class<db::Manager> decl_Manager ("db", "Manager",
   gsi::method_ext ("transaction", &transaction1,
     "@brief Begin a transaction\n"
     "\n"
diff --git a/src/db/db/gsiDeclDbMatrix.cc b/src/db/db/gsiDeclDbMatrix.cc
index a70bfce12..659f24251 100644
--- a/src/db/db/gsiDeclDbMatrix.cc
+++ b/src/db/db/gsiDeclDbMatrix.cc
@@ -101,7 +101,7 @@ static double coeff_m (const db::Matrix2d *m, int i, int j)
   }
 }
 
-gsi::Class<db::Matrix2d> decl_Matrix2d ("Matrix2d", 
+gsi::Class<db::Matrix2d> decl_Matrix2d ("db", "Matrix2d",
   gsi::constructor ("new", &new_matrix2d,
     "@brief Create a new Matrix2d representing a unit transformation"
   ) +
@@ -369,7 +369,7 @@ static int adjust_all ()
   return db::MatrixAdjustFlags::All;
 }
 
-gsi::Class<db::Matrix3d> decl_Matrix3d ("Matrix3d", 
+gsi::Class<db::Matrix3d> decl_Matrix3d ("db", "Matrix3d",
   gsi::constructor ("new", &new_matrix3d,
     "@brief Create a new Matrix3d representing a unit transformation"
   ) +
diff --git a/src/db/db/gsiDeclDbPath.cc b/src/db/db/gsiDeclDbPath.cc
index 1899a94a3..d8f88129d 100644
--- a/src/db/db/gsiDeclDbPath.cc
+++ b/src/db/db/gsiDeclDbPath.cc
@@ -353,7 +353,7 @@ static db::Path path_round_corners (const db::Path *p, double radius, int npoint
   return db::round_path_corners (*p, radius, npoints);
 }
 
-Class<db::Path> decl_Path ("Path",
+Class<db::Path> decl_Path ("db", "Path",
   constructor ("new|#from_dpath", &path_from_dpath, gsi::arg ("dpath"),
     "@brief Creates an integer coordinate path from a floating-point coordinate path\n"
     "\n"
@@ -419,7 +419,7 @@ static db::DPath dpath_round_corners (const db::DPath *p, double radius, int npo
   return db::round_path_corners (*p, radius, npoints, accuracy);
 }
 
-Class<db::DPath> decl_DPath ("DPath",
+Class<db::DPath> decl_DPath ("db", "DPath",
   constructor ("new|#from_ipath", &dpath_from_ipath, gsi::arg ("path"),
     "@brief Creates a floating-point coordinate path from an integer coordinate path\n"
     "\n"
diff --git a/src/db/db/gsiDeclDbPoint.cc b/src/db/db/gsiDeclDbPoint.cc
index 27950ab94..d80b36959 100644
--- a/src/db/db/gsiDeclDbPoint.cc
+++ b/src/db/db/gsiDeclDbPoint.cc
@@ -227,7 +227,7 @@ static db::Point dpoint_to_point (const db::DPoint *p, double dbu)
   return db::Point (*p * (1.0 / dbu));
 }
 
-Class<db::DPoint> decl_DPoint ("DPoint",
+Class<db::DPoint> decl_DPoint ("db", "DPoint",
   constructor ("new|#from_ipoint", &dpoint_from_ipoint, gsi::arg ("point"),
     "@brief Creates a floating-point coordinate point from an integer coordinate point\n"
     "\n"
@@ -263,7 +263,7 @@ static db::DPoint point_to_dpoint (const db::Point *p, double dbu)
   return db::DPoint (*p * dbu);
 }
 
-Class<db::Point> decl_Point ("Point",
+Class<db::Point> decl_Point ("db", "Point",
   constructor ("new|#from_dpoint", &point_from_dpoint, gsi::arg ("dpoint"),
     "@brief Creates an integer coordinate point from a floating-point coordinate point\n"
     "\n"
diff --git a/src/db/db/gsiDeclDbPolygon.cc b/src/db/db/gsiDeclDbPolygon.cc
index 4ca38ba06..9365e903f 100644
--- a/src/db/db/gsiDeclDbPolygon.cc
+++ b/src/db/db/gsiDeclDbPolygon.cc
@@ -611,7 +611,7 @@ static db::DSimplePolygon spolygon_to_dspolygon (const db::SimplePolygon *p, dou
   return db::DSimplePolygon (*p * dbu, false);
 }
 
-Class<db::SimplePolygon> decl_SimplePolygon ("SimplePolygon",
+Class<db::SimplePolygon> decl_SimplePolygon ("db", "SimplePolygon",
   constructor ("new|#from_dpoly", &spolygon_from_dspolygon, gsi::arg ("dpolygon"),
     "@brief Creates an integer coordinate polygon from a floating-point coordinate polygon\n"
     "\n"
@@ -732,7 +732,7 @@ static db::SimplePolygon transformed_vplx_sp (const db::DSimplePolygon *p, const
   return p->transformed (t, false /*no compression*/);
 }
 
-Class<db::DSimplePolygon> decl_DSimplePolygon ("DSimplePolygon",
+Class<db::DSimplePolygon> decl_DSimplePolygon ("db", "DSimplePolygon",
   constructor ("new|#from_ipoly", &dspolygon_from_ispolygon, gsi::arg ("polygon"),
     "@brief Creates a floating-point coordinate polygon from an integer coordinate polygon"
     "\n"
@@ -1719,7 +1719,7 @@ static gsi::Methods make_td_constants ()
     );
 }
 
-Class<db::Polygon> decl_Polygon ("Polygon",
+Class<db::Polygon> decl_Polygon ("db", "Polygon",
   constructor ("new|#from_dpoly", &polygon_from_dpolygon, gsi::arg ("dpolygon"),
     "@brief Creates an integer coordinate polygon from a floating-point coordinate polygon\n"
     "\n"
@@ -1935,7 +1935,7 @@ static db::Polygon transformed_vcplx_dp (const db::DPolygon *p, const db::VCplxT
   return p->transformed (t, false /*don't compress*/);
 }
 
-Class<db::DPolygon> decl_DPolygon ("DPolygon",
+Class<db::DPolygon> decl_DPolygon ("db", "DPolygon",
   constructor ("new|#from_ipoly", &dpolygon_from_ipolygon, gsi::arg ("polygon"),
     "@brief Creates a floating-point coordinate polygon from an integer coordinate polygon\n"
     "\n"
diff --git a/src/db/db/gsiDeclDbReader.cc b/src/db/db/gsiDeclDbReader.cc
index 46f3a3902..65d62ee2d 100644
--- a/src/db/db/gsiDeclDbReader.cc
+++ b/src/db/db/gsiDeclDbReader.cc
@@ -82,7 +82,7 @@ namespace gsi
     layer_map->map_expr (s, l);
   }
 
-  Class<db::LayerMap> decl_LayerMap ("LayerMap", 
+  Class<db::LayerMap> decl_LayerMap ("db", "LayerMap",
     gsi::method_ext ("is_mapped?", &lm_is_mapped, 
       "@brief Check, if a given physical layer is mapped\n"
       "@args layer\n"
@@ -234,7 +234,7 @@ namespace gsi
   );
 
   //  NOTE: the contribution comes from format specific extensions.
-  Class<db::LoadLayoutOptions> decl_LoadLayoutOptions ("LoadLayoutOptions", 
+  Class<db::LoadLayoutOptions> decl_LoadLayoutOptions ("db", "LoadLayoutOptions",
     gsi::Methods (),
     "@brief Layout reader options\n"
     "\n"
diff --git a/src/db/db/gsiDeclDbRecursiveShapeIterator.cc b/src/db/db/gsiDeclDbRecursiveShapeIterator.cc
index ebc238861..a46081de5 100644
--- a/src/db/db/gsiDeclDbRecursiveShapeIterator.cc
+++ b/src/db/db/gsiDeclDbRecursiveShapeIterator.cc
@@ -119,7 +119,7 @@ static db::Region complex_region (const db::RecursiveShapeIterator *iter)
   }
 }
 
-Class<db::RecursiveShapeIterator> decl_RecursiveShapeIterator ("RecursiveShapeIterator", 
+Class<db::RecursiveShapeIterator> decl_RecursiveShapeIterator ("db", "RecursiveShapeIterator",
   gsi::constructor ("new", &new_si1, 
     "@brief Creates a recursive, single-layer shape iterator.\n"
     "@args layout, cell, layer\n"
diff --git a/src/db/db/gsiDeclDbRegion.cc b/src/db/db/gsiDeclDbRegion.cc
index 829974aca..ec18a94f5 100644
--- a/src/db/db/gsiDeclDbRegion.cc
+++ b/src/db/db/gsiDeclDbRegion.cc
@@ -712,7 +712,7 @@ static Container *decompose_trapezoids (const db::Region *r, int mode)
 int td_simple ();
 int po_any ();
 
-Class<db::Region> decl_Region ("Region", 
+Class<db::Region> decl_Region ("db", "Region",
   constructor ("new", &new_v, 
     "@brief Default constructor\n"
     "\n"
diff --git a/src/db/db/gsiDeclDbShape.cc b/src/db/db/gsiDeclDbShape.cc
index 443c1be83..43b4d3b96 100644
--- a/src/db/db/gsiDeclDbShape.cc
+++ b/src/db/db/gsiDeclDbShape.cc
@@ -1103,7 +1103,7 @@ static int t_textPtrArray ()                { return db::Shape::TextPtrArray; }
 static int t_textPtrArrayMember ()          { return db::Shape::TextPtrArrayMember; }
 static int t_userObject ()                  { return db::Shape::UserObject; }
 
-Class<db::Shape> decl_Shape ("Shape", 
+Class<db::Shape> decl_Shape ("db", "Shape",
   gsi::method ("prop_id", (db::properties_id_type (db::Shape::*) () const) &db::Shape::prop_id,
     "@brief Gets the properties ID associated with the shape\n"
     "\n"
diff --git a/src/db/db/gsiDeclDbShapeProcessor.cc b/src/db/db/gsiDeclDbShapeProcessor.cc
index 60194f8ea..b9b36f3a8 100644
--- a/src/db/db/gsiDeclDbShapeProcessor.cc
+++ b/src/db/db/gsiDeclDbShapeProcessor.cc
@@ -175,7 +175,7 @@ size_to_polygon2n (db::ShapeProcessor *processor, const std::vector<db::Shape> &
 }
 
 
-Class<db::ShapeProcessor> decl_ShapeProcessor ("ShapeProcessor", 
+Class<db::ShapeProcessor> decl_ShapeProcessor ("db", "ShapeProcessor",
   method ("merge", (void (db::ShapeProcessor::*) (const db::Layout &, const db::Cell &, unsigned int, db::Shapes &, bool, unsigned int, bool, bool)) &db::ShapeProcessor::merge, 
     "@brief Merge the given shapes from a layout into a shapes container\n"
     "@args layout, cell, layer, out, hierarchical, min_wc, resolve_holes, min_coherence\n"
diff --git a/src/db/db/gsiDeclDbShapes.cc b/src/db/db/gsiDeclDbShapes.cc
index fbc5e5167..b3fc549f7 100644
--- a/src/db/db/gsiDeclDbShapes.cc
+++ b/src/db/db/gsiDeclDbShapes.cc
@@ -389,7 +389,7 @@ static unsigned int s_paths ()               { return db::ShapeIterator::Paths;
 static unsigned int s_texts ()               { return db::ShapeIterator::Texts; }
 static unsigned int s_user_objects ()        { return db::ShapeIterator::UserObjects; }
 
-Class<db::Shapes> decl_Shapes ("Shapes", 
+Class<db::Shapes> decl_Shapes ("db", "Shapes",
   gsi::method ("insert", (db::Shape (db::Shapes::*)(const db::Shape &)) &db::Shapes::insert,
     "@brief Inserts a shape from a shape reference into the shapes list\n"
     "@args shape\n"
diff --git a/src/db/db/gsiDeclDbText.cc b/src/db/db/gsiDeclDbText.cc
index bcbd33925..2918e1104 100644
--- a/src/db/db/gsiDeclDbText.cc
+++ b/src/db/db/gsiDeclDbText.cc
@@ -382,7 +382,7 @@ static db::DText text_to_dtext (const db::Text *t, double dbu)
   return db::DText (*t * dbu);
 }
 
-Class<db::Text> decl_Text ("Text",
+Class<db::Text> decl_Text ("db", "Text",
   constructor ("new", &text_from_dtext, gsi::arg ("dtext"),
     "@brief Creates an integer coordinate text from a floating-point coordinate text"
     "\n"
@@ -431,7 +431,7 @@ static db::Text dtext_to_text (const db::DText *t, double dbu)
   return db::Text (*t * (1.0 / dbu));
 }
 
-Class<db::DText> decl_DText ("DText",
+Class<db::DText> decl_DText ("db", "DText",
   constructor ("new", &dtext_from_itext, gsi::arg ("Text"),
     "@brief Creates a floating-point coordinate text from an integer coordinate text\n"
     "\n"
diff --git a/src/db/db/gsiDeclDbTilingProcessor.cc b/src/db/db/gsiDeclDbTilingProcessor.cc
index 26c1133d3..56a99b177 100644
--- a/src/db/db/gsiDeclDbTilingProcessor.cc
+++ b/src/db/db/gsiDeclDbTilingProcessor.cc
@@ -153,7 +153,7 @@ private:
   bool m_mt_mode;
 };
 
-gsi::Class<db::TileOutputReceiver> decl_TileOutputReceiverBase ("TileOutputReceiverBase",
+gsi::Class<db::TileOutputReceiver> decl_TileOutputReceiverBase ("db", "TileOutputReceiverBase",
   gsi::method ("processor", &TileOutputReceiver_Impl::processor,
     "@brief Gets the processor the receiver is attached to\n"
     "\n"
@@ -171,7 +171,7 @@ gsi::Class<db::TileOutputReceiver> &dbdecl_TileOutputReceiverBase ()
   return decl_TileOutputReceiverBase;
 }
 
-gsi::Class<TileOutputReceiver_Impl> decl_TileOutputReceiver (decl_TileOutputReceiverBase, "TileOutputReceiver",
+gsi::Class<TileOutputReceiver_Impl> decl_TileOutputReceiver (decl_TileOutputReceiverBase, "db", "TileOutputReceiver",
   gsi::callback ("begin", &TileOutputReceiver_Impl::begin, &TileOutputReceiver_Impl::begin_cb,
     "@brief Initiates the delivery\n"
     "@args nx, ny, p0, dx, dy, frame\n"
@@ -334,7 +334,7 @@ static void tp_input11 (db::TilingProcessor *proc, const std::string &name, cons
   proc->input (name, it.first, trans * it.second, false /*not as polygons*/, edges.merged_semantics ());
 }
 
-Class<db::TilingProcessor> decl_TilingProcessor ("TilingProcessor", 
+Class<db::TilingProcessor> decl_TilingProcessor ("db", "TilingProcessor",
   method_ext ("input", &tp_input2,
     "@brief Specifies input for the tiling processor\n"
     "@args name, iter\n"
diff --git a/src/db/db/gsiDeclDbTrans.cc b/src/db/db/gsiDeclDbTrans.cc
index 8c229ec45..89d533ec9 100644
--- a/src/db/db/gsiDeclDbTrans.cc
+++ b/src/db/db/gsiDeclDbTrans.cc
@@ -433,7 +433,7 @@ static db::DTrans trans_to_dtrans (const db::Trans *t, double dbu)
   return f;
 }
 
-Class<db::Trans> decl_Trans ("Trans",
+Class<db::Trans> decl_Trans ("db", "Trans",
   constructor ("new|#from_dtrans", &trans_from_dtrans, gsi::arg ("dtrans"),
     "@brief Creates an integer coordinate transformation from a floating-point coordinate transformation\n"
     "\n"
@@ -483,7 +483,7 @@ static db::Trans dtrans_to_trans (const db::DTrans *t, double dbu)
   return f;
 }
 
-Class<db::DTrans> decl_DTrans ("DTrans",
+Class<db::DTrans> decl_DTrans ("db", "DTrans",
   constructor ("new|#from_itrans", &dtrans_from_itrans, gsi::arg ("trans"),
     "@brief Creates a floating-point coordinate transformation from an integer coordinate transformation\n"
     "\n"
@@ -989,7 +989,7 @@ static F cplxtrans_to_dcplxtrans (const I *t, double dbu)
   return f;
 }
 
-Class<db::DCplxTrans> decl_DCplxTrans ("DCplxTrans",
+Class<db::DCplxTrans> decl_DCplxTrans ("db", "DCplxTrans",
   constructor ("new|#from_itrans", &cplxtrans_from_cplxtrans<db::DCplxTrans, db::CplxTrans>, gsi::arg ("trans"),
     "@brief Creates a floating-point coordinate transformation from another coordinate flavour\n"
     "\n"
@@ -1069,7 +1069,7 @@ Class<db::DCplxTrans> decl_DCplxTrans ("DCplxTrans",
   "database objects."
 );
 
-Class<db::CplxTrans> decl_CplxTrans ("CplxTrans", 
+Class<db::CplxTrans> decl_CplxTrans ("db", "CplxTrans",
   constructor ("new|#from_dtrans", &cplxtrans_from_cplxtrans<db::CplxTrans, db::DCplxTrans>, gsi::arg ("trans"),
     "@brief Creates a floating-point coordinate transformation from another coordinate flavour\n"
     "\n"
@@ -1161,7 +1161,7 @@ Class<db::CplxTrans> decl_CplxTrans ("CplxTrans",
   "database objects."
 );
 
-Class<db::ICplxTrans> decl_ICplxTrans ("ICplxTrans", 
+Class<db::ICplxTrans> decl_ICplxTrans ("db", "ICplxTrans",
   constructor ("new|#from_dtrans", &cplxtrans_from_cplxtrans<db::ICplxTrans, db::DCplxTrans>, gsi::arg ("trans"),
     "@brief Creates a floating-point coordinate transformation from another coordinate flavour\n"
     "\n"
@@ -1240,7 +1240,7 @@ Class<db::ICplxTrans> decl_ICplxTrans ("ICplxTrans",
   "database objects."
 );
 
-Class<db::VCplxTrans> decl_VCplxTrans ("VCplxTrans",
+Class<db::VCplxTrans> decl_VCplxTrans ("db", "VCplxTrans",
   constructor ("new", &cplxtrans_from_cplxtrans<db::VCplxTrans, db::DCplxTrans>, gsi::arg ("trans"),
     "@brief Creates a floating-point coordinate transformation from another coordinate flavour\n"
   ) +
diff --git a/src/db/db/gsiDeclDbVector.cc b/src/db/db/gsiDeclDbVector.cc
index 943944acb..49cf76bb0 100644
--- a/src/db/db/gsiDeclDbVector.cc
+++ b/src/db/db/gsiDeclDbVector.cc
@@ -260,7 +260,7 @@ static db::Vector dvector_to_vector (const db::DVector *v, double dbu)
   return db::Vector (*v * (1.0 / dbu));
 }
 
-Class<db::DVector> decl_DVector ("DVector",
+Class<db::DVector> decl_DVector ("db", "DVector",
   constructor ("new", &dvector_from_ivector, gsi::arg ("vector"),
     "@brief Creates a floating-point coordinate vector from an integer coordinate vector\n"
   ) +
@@ -296,7 +296,7 @@ static db::DVector vector_to_dvector (const db::Vector *v, double dbu)
   return db::DVector (*v * dbu);
 }
 
-Class<db::Vector> decl_Vector ("Vector",
+Class<db::Vector> decl_Vector ("db", "Vector",
   constructor ("new", &vector_from_dvector, gsi::arg ("dvector"),
     "@brief Creates an integer coordinate vector from a floating-point coordinate vector\n"
   ) +
diff --git a/src/gsi/gsi/gsiDeclInternal.cc b/src/gsi/gsi/gsiDeclInternal.cc
index f8cf62092..e8bd7022a 100644
--- a/src/gsi/gsi/gsiDeclInternal.cc
+++ b/src/gsi/gsi/gsiDeclInternal.cc
@@ -301,6 +301,9 @@ Class<ClassBase> decl_Class ("tl", "Class",
   gsi::method ("name", &ClassBase::name,
     "@brief The name of the class\n"
   ) +
+  gsi::method ("module", &ClassBase::module,
+    "@brief The name of module where the class lives\n"
+  ) +
   gsi::method ("base", &ClassBase::base,
     "@brief The base class or nil if the class does not have a base class\n"
     "\n"
diff --git a/src/gsi/unit_tests/gsiTest.cc b/src/gsi/unit_tests/gsiTest.cc
index 644c73be6..65b444507 100644
--- a/src/gsi/unit_tests/gsiTest.cc
+++ b/src/gsi/unit_tests/gsiTest.cc
@@ -749,15 +749,15 @@ void SE::trigger_s2 (const QString &s)
 // ----------------------------------------------------------------
 //  GSI declarations
 
-static gsi::Enum<Enum> decl_enum ("Enum", 
+static gsi::Enum<Enum> decl_enum ("", "Enum",
   gsi::enum_const ("a", Enum_a) +
   gsi::enum_const ("b", Enum_b) +
   gsi::enum_const ("c", Enum_c) 
 );
 
-static gsi::QFlagsClass<Enum> decl_qflags_enum ("Enums");
+static gsi::QFlagsClass<Enum> decl_qflags_enum ("", "Enums");
 
-static gsi::Class<A> decl_a ("", A",
+static gsi::Class<A> decl_a ("", "A",
   gsi::constructor ("new_a|new", &a_ctor) +
   gsi::method ("br", &A::br) +
   gsi::method ("get_e", &A::get_e) +
diff --git a/src/gsiqt/qt4/QtCore/gsiDeclQBuffer.cc b/src/gsiqt/qt4/QtCore/gsiDeclQBuffer.cc
index c2f2805fd..4646a7a16 100644
--- a/src/gsiqt/qt4/QtCore/gsiDeclQBuffer.cc
+++ b/src/gsiqt/qt4/QtCore/gsiDeclQBuffer.cc
@@ -28,11 +28,9 @@
 */
 
 #include <QBuffer>
-#include <QChildEvent>
 #include <QEvent>
 #include <QObject>
 #include <QThread>
-#include <QTimerEvent>
 #include "gsiQt.h"
 #include "gsiQtCoreCommon.h"
 #include "gsiDeclQtCoreTypeTraits.h"
diff --git a/src/gsiqt/qt4/QtCore/gsiDeclQFile.cc b/src/gsiqt/qt4/QtCore/gsiDeclQFile.cc
index fc0f45aa8..9da87101e 100644
--- a/src/gsiqt/qt4/QtCore/gsiDeclQFile.cc
+++ b/src/gsiqt/qt4/QtCore/gsiDeclQFile.cc
@@ -28,11 +28,9 @@
 */
 
 #include <QFile>
-#include <QChildEvent>
 #include <QEvent>
 #include <QObject>
 #include <QThread>
-#include <QTimerEvent>
 #include "gsiQt.h"
 #include "gsiQtCoreCommon.h"
 #include "gsiDeclQtCoreTypeTraits.h"
diff --git a/src/gsiqt/qt4/QtCore/gsiDeclQIODevice.cc b/src/gsiqt/qt4/QtCore/gsiDeclQIODevice.cc
index e6710cc8e..9c48ea408 100644
--- a/src/gsiqt/qt4/QtCore/gsiDeclQIODevice.cc
+++ b/src/gsiqt/qt4/QtCore/gsiDeclQIODevice.cc
@@ -28,11 +28,9 @@
 */
 
 #include <QIODevice>
-#include <QChildEvent>
 #include <QEvent>
 #include <QObject>
 #include <QThread>
-#include <QTimerEvent>
 #include "gsiQt.h"
 #include "gsiQtCoreCommon.h"
 #include "gsiDeclQtCoreTypeTraits.h"
diff --git a/src/gsiqt/qt4/QtCore/gsiDeclQProcess.cc b/src/gsiqt/qt4/QtCore/gsiDeclQProcess.cc
index d4ad4c0df..6d9d3f979 100644
--- a/src/gsiqt/qt4/QtCore/gsiDeclQProcess.cc
+++ b/src/gsiqt/qt4/QtCore/gsiDeclQProcess.cc
@@ -28,12 +28,10 @@
 */
 
 #include <QProcess>
-#include <QChildEvent>
 #include <QEvent>
 #include <QObject>
 #include <QProcessEnvironment>
 #include <QThread>
-#include <QTimerEvent>
 #include "gsiQt.h"
 #include "gsiQtCoreCommon.h"
 #include "gsiDeclQtCoreTypeTraits.h"
diff --git a/src/gsiqt/qt4/QtCore/gsiDeclQTemporaryFile.cc b/src/gsiqt/qt4/QtCore/gsiDeclQTemporaryFile.cc
index 584dfb2da..91c7f1265 100644
--- a/src/gsiqt/qt4/QtCore/gsiDeclQTemporaryFile.cc
+++ b/src/gsiqt/qt4/QtCore/gsiDeclQTemporaryFile.cc
@@ -28,12 +28,10 @@
 */
 
 #include <QTemporaryFile>
-#include <QChildEvent>
 #include <QEvent>
 #include <QFile>
 #include <QObject>
 #include <QThread>
-#include <QTimerEvent>
 #include "gsiQt.h"
 #include "gsiQtCoreCommon.h"
 #include "gsiDeclQtCoreTypeTraits.h"
diff --git a/src/gsiqt/qt4/QtDesigner/gsiDeclQAbstractFormBuilder.cc b/src/gsiqt/qt4/QtDesigner/gsiDeclQAbstractFormBuilder.cc
index 72eedeaf7..9acd310cb 100644
--- a/src/gsiqt/qt4/QtDesigner/gsiDeclQAbstractFormBuilder.cc
+++ b/src/gsiqt/qt4/QtDesigner/gsiDeclQAbstractFormBuilder.cc
@@ -28,30 +28,8 @@
 */
 
 #include <QAbstractFormBuilder>
-#include <QAbstractButton>
-#include <QAbstractItemView>
-#include <QAction>
-#include <QActionGroup>
-#include <QBrush>
-#include <QButtonGroup>
-#include <QComboBox>
 #include <QDir>
-#include <QFormScriptRunner>
 #include <QIODevice>
-#include <QIcon>
-#include <QLayout>
-#include <QLayoutItem>
-#include <QListWidget>
-#include <QMetaEnum>
-#include <QMetaObject>
-#include <QObject>
-#include <QPalette>
-#include <QPixmap>
-#include <QResourceBuilder>
-#include <QSpacerItem>
-#include <QTableWidget>
-#include <QTextBuilder>
-#include <QTreeWidget>
 #include <QWidget>
 #include "gsiQt.h"
 #include "gsiQtDesignerCommon.h"
diff --git a/src/gsiqt/qt4/QtDesigner/gsiDeclQFormBuilder.cc b/src/gsiqt/qt4/QtDesigner/gsiDeclQFormBuilder.cc
index 4cc1f144d..f5fea2a53 100644
--- a/src/gsiqt/qt4/QtDesigner/gsiDeclQFormBuilder.cc
+++ b/src/gsiqt/qt4/QtDesigner/gsiDeclQFormBuilder.cc
@@ -28,30 +28,8 @@
 */
 
 #include <QFormBuilder>
-#include <QAbstractButton>
-#include <QAbstractItemView>
-#include <QAction>
-#include <QActionGroup>
-#include <QBrush>
-#include <QButtonGroup>
-#include <QComboBox>
 #include <QDir>
-#include <QFormScriptRunner>
 #include <QIODevice>
-#include <QIcon>
-#include <QLayout>
-#include <QLayoutItem>
-#include <QListWidget>
-#include <QMetaEnum>
-#include <QMetaObject>
-#include <QObject>
-#include <QPalette>
-#include <QPixmap>
-#include <QResourceBuilder>
-#include <QSpacerItem>
-#include <QTableWidget>
-#include <QTextBuilder>
-#include <QTreeWidget>
 #include <QWidget>
 #include "gsiQt.h"
 #include "gsiQtDesignerCommon.h"
diff --git a/src/gsiqt/qt4/QtGui/gsiDeclQClipboard.cc b/src/gsiqt/qt4/QtGui/gsiDeclQClipboard.cc
index 0d5a6d7fb..388588c8e 100644
--- a/src/gsiqt/qt4/QtGui/gsiDeclQClipboard.cc
+++ b/src/gsiqt/qt4/QtGui/gsiDeclQClipboard.cc
@@ -28,14 +28,12 @@
 */
 
 #include <QClipboard>
-#include <QChildEvent>
 #include <QEvent>
 #include <QImage>
 #include <QMimeData>
 #include <QObject>
 #include <QPixmap>
 #include <QThread>
-#include <QTimerEvent>
 #include "gsiQt.h"
 #include "gsiQtGuiCommon.h"
 #include "gsiDeclQtGuiTypeTraits.h"
diff --git a/src/gsiqt/qt4/QtNetwork/gsiDeclQAbstractSocket.cc b/src/gsiqt/qt4/QtNetwork/gsiDeclQAbstractSocket.cc
index c825166d3..9b7d877ee 100644
--- a/src/gsiqt/qt4/QtNetwork/gsiDeclQAbstractSocket.cc
+++ b/src/gsiqt/qt4/QtNetwork/gsiDeclQAbstractSocket.cc
@@ -29,13 +29,11 @@
 
 #include <QAbstractSocket>
 #include <QAuthenticator>
-#include <QChildEvent>
 #include <QEvent>
 #include <QHostAddress>
 #include <QNetworkProxy>
 #include <QObject>
 #include <QThread>
-#include <QTimerEvent>
 #include "gsiQt.h"
 #include "gsiQtNetworkCommon.h"
 #include "gsiDeclQtNetworkTypeTraits.h"
diff --git a/src/gsiqt/qt4/QtNetwork/gsiDeclQLocalSocket.cc b/src/gsiqt/qt4/QtNetwork/gsiDeclQLocalSocket.cc
index 8e1e07066..542adad36 100644
--- a/src/gsiqt/qt4/QtNetwork/gsiDeclQLocalSocket.cc
+++ b/src/gsiqt/qt4/QtNetwork/gsiDeclQLocalSocket.cc
@@ -28,11 +28,9 @@
 */
 
 #include <QLocalSocket>
-#include <QChildEvent>
 #include <QEvent>
 #include <QObject>
 #include <QThread>
-#include <QTimerEvent>
 #include "gsiQt.h"
 #include "gsiQtNetworkCommon.h"
 #include "gsiDeclQtNetworkTypeTraits.h"
diff --git a/src/gsiqt/qt4/QtNetwork/gsiDeclQNetworkReply.cc b/src/gsiqt/qt4/QtNetwork/gsiDeclQNetworkReply.cc
index cf72dc1a6..af4129daa 100644
--- a/src/gsiqt/qt4/QtNetwork/gsiDeclQNetworkReply.cc
+++ b/src/gsiqt/qt4/QtNetwork/gsiDeclQNetworkReply.cc
@@ -28,7 +28,6 @@
 */
 
 #include <QNetworkReply>
-#include <QChildEvent>
 #include <QEvent>
 #include <QNetworkAccessManager>
 #include <QNetworkRequest>
@@ -36,7 +35,6 @@
 #include <QSslConfiguration>
 #include <QSslError>
 #include <QThread>
-#include <QTimerEvent>
 #include <QUrl>
 #include "gsiQt.h"
 #include "gsiQtNetworkCommon.h"
diff --git a/src/gsiqt/qt4/QtNetwork/gsiDeclQSslSocket.cc b/src/gsiqt/qt4/QtNetwork/gsiDeclQSslSocket.cc
index 9ec94adec..bea58b715 100644
--- a/src/gsiqt/qt4/QtNetwork/gsiDeclQSslSocket.cc
+++ b/src/gsiqt/qt4/QtNetwork/gsiDeclQSslSocket.cc
@@ -29,7 +29,6 @@
 
 #include <QSslSocket>
 #include <QAuthenticator>
-#include <QChildEvent>
 #include <QEvent>
 #include <QHostAddress>
 #include <QNetworkProxy>
@@ -40,7 +39,6 @@
 #include <QSslError>
 #include <QSslKey>
 #include <QThread>
-#include <QTimerEvent>
 #include "gsiQt.h"
 #include "gsiQtNetworkCommon.h"
 #include "gsiDeclQtNetworkTypeTraits.h"
diff --git a/src/gsiqt/qt4/QtNetwork/gsiDeclQTcpSocket.cc b/src/gsiqt/qt4/QtNetwork/gsiDeclQTcpSocket.cc
index 1498e944b..14df55eb5 100644
--- a/src/gsiqt/qt4/QtNetwork/gsiDeclQTcpSocket.cc
+++ b/src/gsiqt/qt4/QtNetwork/gsiDeclQTcpSocket.cc
@@ -29,13 +29,11 @@
 
 #include <QTcpSocket>
 #include <QAuthenticator>
-#include <QChildEvent>
 #include <QEvent>
 #include <QHostAddress>
 #include <QNetworkProxy>
 #include <QObject>
 #include <QThread>
-#include <QTimerEvent>
 #include "gsiQt.h"
 #include "gsiQtNetworkCommon.h"
 #include "gsiDeclQtNetworkTypeTraits.h"
diff --git a/src/gsiqt/qt4/QtNetwork/gsiDeclQUdpSocket.cc b/src/gsiqt/qt4/QtNetwork/gsiDeclQUdpSocket.cc
index 2e5715daf..ed377dd3f 100644
--- a/src/gsiqt/qt4/QtNetwork/gsiDeclQUdpSocket.cc
+++ b/src/gsiqt/qt4/QtNetwork/gsiDeclQUdpSocket.cc
@@ -29,13 +29,11 @@
 
 #include <QUdpSocket>
 #include <QAuthenticator>
-#include <QChildEvent>
 #include <QEvent>
 #include <QHostAddress>
 #include <QNetworkProxy>
 #include <QObject>
 #include <QThread>
-#include <QTimerEvent>
 #include "gsiQt.h"
 #include "gsiQtNetworkCommon.h"
 #include "gsiDeclQtNetworkTypeTraits.h"