diff --git a/src/ifcwrap/IfcGeomWrapper.i b/src/ifcwrap/IfcGeomWrapper.i
index 206b40d166..b2361767cb 100644
--- a/src/ifcwrap/IfcGeomWrapper.i
+++ b/src/ifcwrap/IfcGeomWrapper.i
@@ -636,6 +636,10 @@ struct ShapeRTTI : public boost::static_visitor<PyObject*>
 	}
 %}
 
+%ignore hlr_writer;
+%ignore hlr_calc;
+%ignore occt_join;
+%ignore prefiltered_hlr;
 %ignore svgfill::svg_to_line_segments;
 %ignore svgfill::line_segments_to_polygons;
 
diff --git a/src/serializers/SvgSerializer.h b/src/serializers/SvgSerializer.h
index 22d00e6818..4c2cde130f 100644
--- a/src/serializers/SvgSerializer.h
+++ b/src/serializers/SvgSerializer.h
@@ -157,11 +157,11 @@ namespace {
 			throw std::runtime_error("");
 		}
 
-		void operator()(Handle(HLRBRep_Algo)& algo) const {
+		void operator()(opencascade::handle<HLRBRep_Algo>& algo) const {
 			algo->Add(shape_);
 		}
 
-		void operator()(Handle(HLRBRep_PolyAlgo)& algo) const {
+		void operator()(opencascade::handle<HLRBRep_PolyAlgo>& algo) const {
 			BRepMesh_IncrementalMesh(shape_, 0.10);
 			algo->Load(shape_);
 		}
@@ -216,7 +216,7 @@ namespace {
 			throw std::runtime_error("");
 		}
 
-		TopoDS_Shape operator()(Handle(HLRBRep_Algo)& algo) {
+		TopoDS_Shape operator()(opencascade::handle<HLRBRep_Algo>& algo) {
 			algo->Projector(projector_);
 			algo->Update();
 			algo->Hide();
@@ -224,7 +224,7 @@ namespace {
 			return occt_join(hlr_shapes.OutLineVCompound(), hlr_shapes.VCompound());
 		}
 
-		TopoDS_Shape operator()(Handle(HLRBRep_PolyAlgo)& algo) {
+		TopoDS_Shape operator()(opencascade::handle<HLRBRep_PolyAlgo>& algo) {
 			algo->Projector(projector_);
 			algo->Update();
 			HLRBRep_PolyHLRToShape hlr_shapes;