diff --git a/src/buddies/src/bd/strmxor.cc b/src/buddies/src/bd/strmxor.cc
index b520f65d7..6741f773b 100644
--- a/src/buddies/src/bd/strmxor.cc
+++ b/src/buddies/src/bd/strmxor.cc
@@ -308,7 +308,7 @@ BD_PUBLIC int strmxor (int argc, char *argv[])
     l2l_map.insert (std::make_pair (*(*l).second, std::make_pair (-1, -1))).first->second.second = (*l).first;
   }
 
-  std::auto_ptr<db::Layout> output_layout;
+  std::unique_ptr<db::Layout> output_layout;
   db::cell_index_type output_top = 0;
 
   if (! output.empty ()) {
diff --git a/src/db/db/dbAsIfFlatEdgePairs.cc b/src/db/db/dbAsIfFlatEdgePairs.cc
index 5c90356fb..47e54c130 100644
--- a/src/db/db/dbAsIfFlatEdgePairs.cc
+++ b/src/db/db/dbAsIfFlatEdgePairs.cc
@@ -81,7 +81,7 @@ AsIfFlatEdgePairs::in (const EdgePairs &other, bool invert) const
     op.insert (*o);
   }
 
-  std::auto_ptr<FlatEdgePairs> new_edge_pairs (new FlatEdgePairs ());
+  std::unique_ptr<FlatEdgePairs> new_edge_pairs (new FlatEdgePairs ());
 
   for (EdgePairsIterator o (begin ()); ! o.at_end (); ++o) {
     if ((op.find (*o) == op.end ()) == invert) {
@@ -140,7 +140,7 @@ void AsIfFlatEdgePairs::invalidate_bbox ()
 RegionDelegate *
 AsIfFlatEdgePairs::processed_to_polygons (const EdgePairToPolygonProcessorBase &filter) const
 {
-  std::auto_ptr<FlatRegion> region (new FlatRegion ());
+  std::unique_ptr<FlatRegion> region (new FlatRegion ());
 
   if (filter.result_must_not_be_merged ()) {
     region->set_merged_semantics (false);
@@ -162,7 +162,7 @@ AsIfFlatEdgePairs::processed_to_polygons (const EdgePairToPolygonProcessorBase &
 EdgesDelegate *
 AsIfFlatEdgePairs::processed_to_edges (const EdgePairToEdgeProcessorBase &filter) const
 {
-  std::auto_ptr<FlatEdges> edges (new FlatEdges ());
+  std::unique_ptr<FlatEdges> edges (new FlatEdges ());
 
   if (filter.result_must_not_be_merged ()) {
     edges->set_merged_semantics (false);
@@ -184,7 +184,7 @@ AsIfFlatEdgePairs::processed_to_edges (const EdgePairToEdgeProcessorBase &filter
 EdgePairsDelegate *
 AsIfFlatEdgePairs::filtered (const EdgePairFilterBase &filter) const
 {
-  std::auto_ptr<FlatEdgePairs> new_edge_pairs (new FlatEdgePairs ());
+  std::unique_ptr<FlatEdgePairs> new_edge_pairs (new FlatEdgePairs ());
 
   for (EdgePairsIterator p (begin ()); ! p.at_end (); ++p) {
     if (filter.selected (*p)) {
@@ -198,7 +198,7 @@ AsIfFlatEdgePairs::filtered (const EdgePairFilterBase &filter) const
 RegionDelegate *
 AsIfFlatEdgePairs::polygons (db::Coord e) const
 {
-  std::auto_ptr<FlatRegion> output (new FlatRegion ());
+  std::unique_ptr<FlatRegion> output (new FlatRegion ());
 
   for (EdgePairsIterator ep (begin ()); ! ep.at_end (); ++ep) {
     db::Polygon poly = ep->normalized ().to_polygon (e);
@@ -213,7 +213,7 @@ AsIfFlatEdgePairs::polygons (db::Coord e) const
 EdgesDelegate *
 AsIfFlatEdgePairs::edges () const
 {
-  std::auto_ptr<FlatEdges> output (new FlatEdges ());
+  std::unique_ptr<FlatEdges> output (new FlatEdges ());
 
   for (EdgePairsIterator ep (begin ()); ! ep.at_end (); ++ep) {
     output->insert (ep->first ());
@@ -226,7 +226,7 @@ AsIfFlatEdgePairs::edges () const
 EdgesDelegate *
 AsIfFlatEdgePairs::first_edges () const
 {
-  std::auto_ptr<FlatEdges> output (new FlatEdges ());
+  std::unique_ptr<FlatEdges> output (new FlatEdges ());
 
   for (EdgePairsIterator ep (begin ()); ! ep.at_end (); ++ep) {
     output->insert (ep->first ());
@@ -238,7 +238,7 @@ AsIfFlatEdgePairs::first_edges () const
 EdgesDelegate *
 AsIfFlatEdgePairs::second_edges () const
 {
-  std::auto_ptr<FlatEdges> output (new FlatEdges ());
+  std::unique_ptr<FlatEdges> output (new FlatEdges ());
 
   for (EdgePairsIterator ep (begin ()); ! ep.at_end (); ++ep) {
     output->insert (ep->second ());
@@ -253,7 +253,7 @@ AsIfFlatEdgePairs::add (const EdgePairs &other) const
   FlatEdgePairs *other_flat = dynamic_cast<FlatEdgePairs *> (other.delegate ());
   if (other_flat) {
 
-    std::auto_ptr<FlatEdgePairs> new_edge_pairs (new FlatEdgePairs (*other_flat));
+    std::unique_ptr<FlatEdgePairs> new_edge_pairs (new FlatEdgePairs (*other_flat));
     new_edge_pairs->invalidate_cache ();
 
     size_t n = new_edge_pairs->raw_edge_pairs ().size () + count ();
@@ -268,7 +268,7 @@ AsIfFlatEdgePairs::add (const EdgePairs &other) const
 
   } else {
 
-    std::auto_ptr<FlatEdgePairs> new_edge_pairs (new FlatEdgePairs ());
+    std::unique_ptr<FlatEdgePairs> new_edge_pairs (new FlatEdgePairs ());
 
     size_t n = count () + other.count ();
 
diff --git a/src/db/db/dbAsIfFlatEdges.cc b/src/db/db/dbAsIfFlatEdges.cc
index 3d00ee51c..5d01e11b8 100644
--- a/src/db/db/dbAsIfFlatEdges.cc
+++ b/src/db/db/dbAsIfFlatEdges.cc
@@ -116,7 +116,7 @@ AsIfFlatEdges::selected_interacting_generic (const Region &other, bool inverse)
     scanner.insert2 (p.operator-> (), 1);
   }
 
-  std::auto_ptr<FlatEdges> output (new FlatEdges (true));
+  std::unique_ptr<FlatEdges> output (new FlatEdges (true));
 
   if (! inverse) {
 
@@ -157,7 +157,7 @@ AsIfFlatEdges::selected_interacting_generic (const Edges &edges, bool inverse) c
     scanner.insert (ee.operator-> (), 1);
   }
 
-  std::auto_ptr<FlatEdges> output (new FlatEdges (true));
+  std::unique_ptr<FlatEdges> output (new FlatEdges (true));
 
   if (! inverse) {
 
@@ -198,7 +198,7 @@ AsIfFlatEdges::pull_generic (const Edges &edges) const
     scanner.insert (ee.operator-> (), 0);
   }
 
-  std::auto_ptr<FlatEdges> output (new FlatEdges (true));
+  std::unique_ptr<FlatEdges> output (new FlatEdges (true));
   edge_interaction_filter<FlatEdges> filter (*output);
   scanner.process (filter, 1, db::box_convert<db::Edge> ());
 
@@ -227,7 +227,7 @@ AsIfFlatEdges::pull_generic (const Region &other) const
     scanner.insert2 (p.operator-> (), 1);
   }
 
-  std::auto_ptr<FlatRegion> output (new FlatRegion (true));
+  std::unique_ptr<FlatRegion> output (new FlatRegion (true));
 
   edge_to_region_interaction_filter<FlatRegion> filter (*output);
   scanner.process (filter, 1, db::box_convert<db::Edge> (), db::box_convert<db::Polygon> ());
@@ -300,7 +300,7 @@ AsIfFlatEdges::extended (coord_type ext_b, coord_type ext_e, coord_type ext_o, c
 {
   if (join) {
 
-    std::auto_ptr<FlatRegion> output (new FlatRegion ());
+    std::unique_ptr<FlatRegion> output (new FlatRegion ());
     db::ShapeGenerator sg (output->raw_polygons (), false);
     JoinEdgesClusterCollector cluster_collector (&sg, ext_b, ext_e, ext_o, ext_i);
 
@@ -321,7 +321,7 @@ AsIfFlatEdges::extended (coord_type ext_b, coord_type ext_e, coord_type ext_o, c
 
   } else {
 
-    std::auto_ptr<FlatRegion> output (new FlatRegion ());
+    std::unique_ptr<FlatRegion> output (new FlatRegion ());
     for (EdgesIterator e (begin_merged ()); ! e.at_end (); ++e) {
       output->insert (extended_edge (*e, ext_b, ext_e, ext_o, ext_i));
     }
@@ -339,7 +339,7 @@ AsIfFlatEdges::in (const Edges &other, bool invert) const
     op.insert (*o);
   }
 
-  std::auto_ptr<FlatEdges> new_region (new FlatEdges (false));
+  std::unique_ptr<FlatEdges> new_region (new FlatEdges (false));
 
   for (EdgesIterator o (begin_merged ()); ! o.at_end (); ++o) {
     if ((op.find (*o) == op.end ()) == invert) {
@@ -434,7 +434,7 @@ void AsIfFlatEdges::invalidate_bbox ()
 EdgesDelegate *
 AsIfFlatEdges::processed (const EdgeProcessorBase &filter) const
 {
-  std::auto_ptr<FlatEdges> edges (new FlatEdges ());
+  std::unique_ptr<FlatEdges> edges (new FlatEdges ());
 
   if (filter.result_must_not_be_merged ()) {
     edges->set_merged_semantics (false);
@@ -456,7 +456,7 @@ AsIfFlatEdges::processed (const EdgeProcessorBase &filter) const
 EdgePairsDelegate *
 AsIfFlatEdges::processed_to_edge_pairs (const EdgeToEdgePairProcessorBase &filter) const
 {
-  std::auto_ptr<FlatEdgePairs> edge_pairs (new FlatEdgePairs ());
+  std::unique_ptr<FlatEdgePairs> edge_pairs (new FlatEdgePairs ());
 
   if (filter.result_must_not_be_merged ()) {
     edge_pairs->set_merged_semantics (false);
@@ -478,7 +478,7 @@ AsIfFlatEdges::processed_to_edge_pairs (const EdgeToEdgePairProcessorBase &filte
 RegionDelegate *
 AsIfFlatEdges::processed_to_polygons (const EdgeToPolygonProcessorBase &filter) const
 {
-  std::auto_ptr<FlatRegion> region (new FlatRegion ());
+  std::unique_ptr<FlatRegion> region (new FlatRegion ());
 
   if (filter.result_must_not_be_merged ()) {
     region->set_merged_semantics (false);
@@ -500,7 +500,7 @@ AsIfFlatEdges::processed_to_polygons (const EdgeToPolygonProcessorBase &filter)
 EdgesDelegate *
 AsIfFlatEdges::filtered (const EdgeFilterBase &filter) const
 {
-  std::auto_ptr<FlatEdges> new_region (new FlatEdges ());
+  std::unique_ptr<FlatEdges> new_region (new FlatEdges ());
 
   for (EdgesIterator p (begin_merged ()); ! p.at_end (); ++p) {
     if (filter.selected (*p)) {
@@ -514,7 +514,7 @@ AsIfFlatEdges::filtered (const EdgeFilterBase &filter) const
 EdgePairsDelegate *
 AsIfFlatEdges::run_check (db::edge_relation_type rel, const Edges *other, db::Coord d, const db::EdgesCheckOptions &options) const
 {
-  std::auto_ptr<FlatEdgePairs> result (new FlatEdgePairs ());
+  std::unique_ptr<FlatEdgePairs> result (new FlatEdgePairs ());
 
   db::box_scanner<db::Edge, size_t> scanner (report_progress (), progress_desc ());
   scanner.reserve (count () + (other ? other->count () : 0));
@@ -554,7 +554,7 @@ AsIfFlatEdges::run_check (db::edge_relation_type rel, const Edges *other, db::Co
 EdgesDelegate * 
 AsIfFlatEdges::boolean (const Edges *other, EdgeBoolOp op) const
 {
-  std::auto_ptr<FlatEdges> output (new FlatEdges (true));
+  std::unique_ptr<FlatEdges> output (new FlatEdges (true));
   EdgeBooleanClusterCollectorToShapes cluster_collector (&output->raw_edges (), op);
 
   db::box_scanner<db::Edge, size_t> scanner (report_progress (), progress_desc ());
@@ -610,7 +610,7 @@ AsIfFlatEdges::edge_region_op (const Region &other, bool outside, bool include_b
     ep.insert (*e, 1);
   }
 
-  std::auto_ptr<FlatEdges> output (new FlatEdges (false));
+  std::unique_ptr<FlatEdges> output (new FlatEdges (false));
   db::EdgeShapeGenerator cc (output->raw_edges (), true /*clear*/);
   db::EdgePolygonOp op (outside, include_borders);
   ep.process (cc, op);
@@ -624,7 +624,7 @@ AsIfFlatEdges::add (const Edges &other) const
   FlatEdges *other_flat = dynamic_cast<FlatEdges *> (other.delegate ());
   if (other_flat) {
 
-    std::auto_ptr<FlatEdges> new_edges (new FlatEdges (*other_flat));
+    std::unique_ptr<FlatEdges> new_edges (new FlatEdges (*other_flat));
     new_edges->set_is_merged (false);
     new_edges->invalidate_cache ();
 
@@ -640,7 +640,7 @@ AsIfFlatEdges::add (const Edges &other) const
 
   } else {
 
-    std::auto_ptr<FlatEdges> new_edges (new FlatEdges (false /*not merged*/));
+    std::unique_ptr<FlatEdges> new_edges (new FlatEdges (false /*not merged*/));
 
     size_t n = count () + other.count ();
 
diff --git a/src/db/db/dbAsIfFlatRegion.cc b/src/db/db/dbAsIfFlatRegion.cc
index cf9f3e78e..8881e454f 100644
--- a/src/db/db/dbAsIfFlatRegion.cc
+++ b/src/db/db/dbAsIfFlatRegion.cc
@@ -129,7 +129,7 @@ AsIfFlatRegion::to_string (size_t nmax) const
 EdgesDelegate *
 AsIfFlatRegion::edges (const EdgeFilterBase *filter) const
 {
-  std::auto_ptr<FlatEdges> result (new FlatEdges ());
+  std::unique_ptr<FlatEdges> result (new FlatEdges ());
 
   size_t n = 0;
   for (RegionIterator p (begin_merged ()); ! p.at_end (); ++p) {
@@ -156,7 +156,7 @@ AsIfFlatRegion::in (const Region &other, bool invert) const
     op.insert (*o);
   }
 
-  std::auto_ptr<FlatRegion> new_region (new FlatRegion (false));
+  std::unique_ptr<FlatRegion> new_region (new FlatRegion (false));
 
   for (RegionIterator o (begin_merged ()); ! o.at_end (); ++o) {
     if ((op.find (*o) == op.end ()) == invert) {
@@ -298,7 +298,7 @@ void AsIfFlatRegion::invalidate_bbox ()
 RegionDelegate *
 AsIfFlatRegion::filtered (const PolygonFilterBase &filter) const
 {
-  std::auto_ptr<FlatRegion> new_region (new FlatRegion ());
+  std::unique_ptr<FlatRegion> new_region (new FlatRegion ());
 
   for (RegionIterator p (begin_merged ()); ! p.at_end (); ++p) {
     if (filter.selected (*p)) {
@@ -312,7 +312,7 @@ AsIfFlatRegion::filtered (const PolygonFilterBase &filter) const
 RegionDelegate *
 AsIfFlatRegion::processed (const PolygonProcessorBase &filter) const
 {
-  std::auto_ptr<FlatRegion> new_region (new FlatRegion ());
+  std::unique_ptr<FlatRegion> new_region (new FlatRegion ());
   if (filter.result_must_not_be_merged ()) {
     new_region->set_merged_semantics (false);
   }
@@ -335,7 +335,7 @@ AsIfFlatRegion::processed (const PolygonProcessorBase &filter) const
 EdgesDelegate *
 AsIfFlatRegion::processed_to_edges (const PolygonToEdgeProcessorBase &filter) const
 {
-  std::auto_ptr<FlatEdges> new_edges (new FlatEdges ());
+  std::unique_ptr<FlatEdges> new_edges (new FlatEdges ());
   if (filter.result_must_not_be_merged ()) {
     new_edges->set_merged_semantics (false);
   }
@@ -358,7 +358,7 @@ AsIfFlatRegion::processed_to_edges (const PolygonToEdgeProcessorBase &filter) co
 EdgePairsDelegate *
 AsIfFlatRegion::processed_to_edge_pairs (const PolygonToEdgePairProcessorBase &filter) const
 {
-  std::auto_ptr<FlatEdgePairs> new_edge_pairs (new FlatEdgePairs ());
+  std::unique_ptr<FlatEdgePairs> new_edge_pairs (new FlatEdgePairs ());
   if (filter.result_must_not_be_merged ()) {
     new_edge_pairs->set_merged_semantics (false);
   }
@@ -407,7 +407,7 @@ AsIfFlatRegion::selected_interacting_generic (const Edges &other, bool inverse,
   std::vector<generic_shape_iterator<db::Edge> > others;
   others.push_back (counting ? other.begin_merged () : other.begin ());
 
-  std::auto_ptr<FlatRegion> output (new FlatRegion (merged_semantics ()));
+  std::unique_ptr<FlatRegion> output (new FlatRegion (merged_semantics ()));
   std::vector<db::Shapes *> results;
   results.push_back (&output->raw_polygons ());
 
@@ -423,7 +423,7 @@ AsIfFlatRegion::selected_interacting_generic (const Edges &other, bool inverse,
   scanner.reserve1 (count ());
   scanner.reserve2 (other.count ());
 
-  std::auto_ptr<FlatRegion> output (new FlatRegion (false));
+  std::unique_ptr<FlatRegion> output (new FlatRegion (false));
   region_to_edge_interaction_filter<db::Polygon, db::Edge, ResultCountingInserter> filter (inserter, false, counting /*get all in counting mode*/);
 
   AddressablePolygonDelivery p (begin_merged ());
@@ -483,7 +483,7 @@ AsIfFlatRegion::selected_interacting_generic (const Texts &other, bool inverse,
   std::vector<generic_shape_iterator<db::Text> > others;
   others.push_back (other.begin ());
 
-  std::auto_ptr<FlatRegion> output (new FlatRegion (merged_semantics ()));
+  std::unique_ptr<FlatRegion> output (new FlatRegion (merged_semantics ()));
   std::vector<db::Shapes *> results;
   results.push_back (&output->raw_polygons ());
 
@@ -522,7 +522,7 @@ AsIfFlatRegion::selected_interacting_generic (const Texts &other, bool inverse,
 
   //  select hits based on their count
 
-  std::auto_ptr<FlatRegion> output (new FlatRegion (true));
+  std::unique_ptr<FlatRegion> output (new FlatRegion (true));
 
   for (std::unordered_map<const db::Polygon *, size_t, std::ptr_hash_from_value<db::Polygon> >::const_iterator r = counted_results.begin (); r != counted_results.end (); ++r) {
     bool hit = r->second >= min_count && r->second <= max_count;
@@ -568,7 +568,7 @@ AsIfFlatRegion::selected_interacting_generic (const Region &other, int mode, boo
   std::vector<generic_shape_iterator<db::Polygon> > others;
   others.push_back ((mode < 0 || counting) ? other.begin_merged () : other.begin ());
 
-  std::auto_ptr<FlatRegion> output (new FlatRegion (merged_semantics ()));
+  std::unique_ptr<FlatRegion> output (new FlatRegion (merged_semantics ()));
   std::vector<db::Shapes *> results;
   results.push_back (&output->raw_polygons ());
 
@@ -658,7 +658,7 @@ AsIfFlatRegion::selected_interacting_generic (const Region &other, int mode, boo
   ep.process (es, id);
   id.finish ();
 
-  std::auto_ptr<FlatRegion> output (new FlatRegion (false));
+  std::unique_ptr<FlatRegion> output (new FlatRegion (false));
 
   std::map <size_t, size_t> interaction_counts;
   for (db::InteractionDetector::iterator i = id.begin (); i != id.end () ; ++i) {
@@ -706,7 +706,7 @@ AsIfFlatRegion::pull_generic (const Edges &other) const
   std::vector<generic_shape_iterator<db::Edge> > others;
   others.push_back (other.begin_merged ());
 
-  std::auto_ptr<FlatEdges> output (new FlatEdges (merged_semantics ()));
+  std::unique_ptr<FlatEdges> output (new FlatEdges (merged_semantics ()));
   std::vector<db::Shapes *> results;
   results.push_back (&output->raw_edges ());
 
@@ -720,7 +720,7 @@ AsIfFlatRegion::pull_generic (const Edges &other) const
   scanner.reserve1 (count ());
   scanner.reserve2 (other.count ());
 
-  std::auto_ptr<FlatEdges> output (new FlatEdges (false));
+  std::unique_ptr<FlatEdges> output (new FlatEdges (false));
   region_to_edge_interaction_filter<db::Polygon, db::Edge, db::Shapes, db::Edge> filter (output->raw_edges (), false);
 
   AddressablePolygonDelivery p (begin ());
@@ -756,7 +756,7 @@ AsIfFlatRegion::pull_generic (const Texts &other) const
   std::vector<generic_shape_iterator<db::Text> > others;
   others.push_back (other.begin ());
 
-  std::auto_ptr<FlatTexts> output (new FlatTexts ());
+  std::unique_ptr<FlatTexts> output (new FlatTexts ());
   std::vector<db::Shapes *> results;
   results.push_back (&output->raw_texts ());
 
@@ -775,7 +775,7 @@ AsIfFlatRegion::pull_generic (const Texts &other) const
   scanner.reserve1 (count ());
   scanner.reserve2 (other.count ());
 
-  std::auto_ptr<FlatTexts> output (new FlatTexts (false));
+  std::unique_ptr<FlatTexts> output (new FlatTexts (false));
   region_to_text_interaction_filter<db::Polygon, db::Text, db::Shapes, db::Text> filter (output->raw_texts (), false);
 
   AddressablePolygonDelivery p (begin ());
@@ -811,7 +811,7 @@ AsIfFlatRegion::pull_generic (const Region &other, int mode, bool touching) cons
   std::vector<generic_shape_iterator<db::Polygon> > others;
   others.push_back (other.begin_merged ());
 
-  std::auto_ptr<FlatRegion> output (new FlatRegion (merged_semantics ()));
+  std::unique_ptr<FlatRegion> output (new FlatRegion (merged_semantics ()));
   std::vector<db::Shapes *> results;
   results.push_back (&output->raw_polygons ());
 
@@ -849,7 +849,7 @@ AsIfFlatRegion::pull_generic (const Region &other, int mode, bool touching) cons
   ep.process (es, id);
   id.finish ();
 
-  std::auto_ptr<FlatRegion> output (new FlatRegion (false));
+  std::unique_ptr<FlatRegion> output (new FlatRegion (false));
 
   n = 0;
   std::set <size_t> selected;
@@ -914,7 +914,7 @@ AsIfFlatRegion::grid_check (db::Coord gx, db::Coord gy) const
     return new EmptyEdgePairs ();
   }
 
-  std::auto_ptr<db::FlatEdgePairs> res (new db::FlatEdgePairs ());
+  std::unique_ptr<db::FlatEdgePairs> res (new db::FlatEdgePairs ());
 
   for (RegionIterator p (begin_merged ()); ! p.at_end (); ++p) {
     produce_markers_for_grid_check (*p, db::UnitTrans (), gx, gy, res->raw_edge_pairs ());
@@ -984,7 +984,7 @@ template void AsIfFlatRegion::produce_markers_for_angle_check<db::UnitTrans> (co
 EdgePairsDelegate *
 AsIfFlatRegion::angle_check (double min, double max, bool inverse) const
 {
-  std::auto_ptr<db::FlatEdgePairs> res (new db::FlatEdgePairs ());
+  std::unique_ptr<db::FlatEdgePairs> res (new db::FlatEdgePairs ());
 
   for (RegionIterator p (begin_merged ()); ! p.at_end (); ++p) {
     produce_markers_for_angle_check (*p, db::UnitTrans (), min, max, inverse, res->raw_edge_pairs ());
@@ -1000,7 +1000,7 @@ AsIfFlatRegion::snapped (db::Coord gx, db::Coord gy)
     throw tl::Exception (tl::to_string (tr ("Grid snap requires a positive grid value")));
   }
 
-  std::auto_ptr<FlatRegion> new_region (new FlatRegion (merged_semantics ()));
+  std::unique_ptr<FlatRegion> new_region (new FlatRegion (merged_semantics ()));
 
   gx = std::max (db::Coord (1), gx);
   gy = std::max (db::Coord (1), gy);
@@ -1025,7 +1025,7 @@ AsIfFlatRegion::scaled_and_snapped (db::Coord gx, db::Coord mx, db::Coord dx, db
     throw tl::Exception (tl::to_string (tr ("Scale and snap requires positive and non-null magnification or divisor values")));
   }
 
-  std::auto_ptr<FlatRegion> new_region (new FlatRegion (merged_semantics ()));
+  std::unique_ptr<FlatRegion> new_region (new FlatRegion (merged_semantics ()));
 
   gx = std::max (db::Coord (1), gx);
   gy = std::max (db::Coord (1), gy);
@@ -1073,7 +1073,7 @@ void region_cop_impl (AsIfFlatRegion *region, db::Shapes *output_to, db::Compoun
 EdgePairsDelegate *
 AsIfFlatRegion::cop_to_edge_pairs (db::CompoundRegionOperationNode &node)
 {
-  std::auto_ptr<FlatEdgePairs> output (new FlatEdgePairs ());
+  std::unique_ptr<FlatEdgePairs> output (new FlatEdgePairs ());
   region_cop_impl<db::EdgePair> (this, &output->raw_edge_pairs (), node);
   return output.release ();
 }
@@ -1081,7 +1081,7 @@ AsIfFlatRegion::cop_to_edge_pairs (db::CompoundRegionOperationNode &node)
 RegionDelegate *
 AsIfFlatRegion::cop_to_region (db::CompoundRegionOperationNode &node)
 {
-  std::auto_ptr<FlatRegion> output (new FlatRegion ());
+  std::unique_ptr<FlatRegion> output (new FlatRegion ());
   region_cop_impl<db::Polygon> (this, &output->raw_polygons (), node);
   return output.release ();
 }
@@ -1089,7 +1089,7 @@ AsIfFlatRegion::cop_to_region (db::CompoundRegionOperationNode &node)
 EdgesDelegate *
 AsIfFlatRegion::cop_to_edges (db::CompoundRegionOperationNode &node)
 {
-  std::auto_ptr<FlatEdges> output (new FlatEdges ());
+  std::unique_ptr<FlatEdges> output (new FlatEdges ());
   region_cop_impl<db::Edge> (this, &output->raw_edges (), node);
   return output.release ();
 }
@@ -1188,7 +1188,7 @@ AsIfFlatRegion::run_check (db::edge_relation_type rel, bool different_polygons,
 
   db::check_local_operation<db::Polygon, db::Polygon> op (check, different_polygons, has_other, other_is_merged, options);
 
-  std::auto_ptr<FlatEdgePairs> output (new FlatEdgePairs ());
+  std::unique_ptr<FlatEdgePairs> output (new FlatEdgePairs ());
   std::vector<db::Shapes *> results;
   results.push_back (&output->raw_edge_pairs ());
 
@@ -1200,7 +1200,7 @@ AsIfFlatRegion::run_check (db::edge_relation_type rel, bool different_polygons,
   //  not supported in this implementation
   tl_assert (! m_options.no_opposite);
 
-  std::auto_ptr<FlatEdgePairs> result (new FlatEdgePairs ());
+  std::unique_ptr<FlatEdgePairs> result (new FlatEdgePairs ());
 
   db::box_scanner<db::Polygon, size_t> scanner (report_progress (), progress_desc ());
   scanner.reserve (count () + (other ? other->count () : 0));
@@ -1248,7 +1248,7 @@ AsIfFlatRegion::run_check (db::edge_relation_type rel, bool different_polygons,
 EdgePairsDelegate *
 AsIfFlatRegion::run_single_polygon_check (db::edge_relation_type rel, db::Coord d, const RegionCheckOptions &options) const
 {
-  std::auto_ptr<FlatEdgePairs> result (new FlatEdgePairs ());
+  std::unique_ptr<FlatEdgePairs> result (new FlatEdgePairs ());
 
   EdgeRelationFilter check (rel, d, options.metrics);
   check.set_include_zero (false);
@@ -1307,7 +1307,7 @@ AsIfFlatRegion::merged (bool min_coherence, unsigned int min_wc) const
       ep.insert (*p, n);
     }
 
-    std::auto_ptr<FlatRegion> new_region (new FlatRegion (true));
+    std::unique_ptr<FlatRegion> new_region (new FlatRegion (true));
 
     //  and run the merge step
     db::MergeOp op (min_wc);
@@ -1355,7 +1355,7 @@ AsIfFlatRegion::sized (coord_type dx, coord_type dy, unsigned int mode) const
   } else if (! merged_semantics () || is_merged ()) {
 
     //  Generic case
-    std::auto_ptr<FlatRegion> new_region (new FlatRegion (false /*output isn't merged*/));
+    std::unique_ptr<FlatRegion> new_region (new FlatRegion (false /*output isn't merged*/));
 
     db::ShapeGenerator pc (new_region->raw_polygons (), false);
     db::PolygonGenerator pg (pc, false, true);
@@ -1385,7 +1385,7 @@ AsIfFlatRegion::sized (coord_type dx, coord_type dy, unsigned int mode) const
       ep.insert (*p, n);
     }
 
-    std::auto_ptr<FlatRegion> new_region (new FlatRegion (false /*output isn't merged*/));
+    std::unique_ptr<FlatRegion> new_region (new FlatRegion (false /*output isn't merged*/));
     db::ShapeGenerator pc (new_region->raw_polygons (), true /*clear*/);
     db::PolygonGenerator pg2 (pc, false /*don't resolve holes*/, true /*min. coherence*/);
     db::SizingPolygonFilter siz (pg2, dx, dy, mode);
@@ -1417,7 +1417,7 @@ AsIfFlatRegion::and_with (const Region &other) const
 
     //  map AND with box to clip ..
     db::Box b = bbox ();
-    std::auto_ptr<FlatRegion> new_region (new FlatRegion (false));
+    std::unique_ptr<FlatRegion> new_region (new FlatRegion (false));
 
     std::vector<db::Polygon> clipped;
     for (RegionIterator p (other.begin ()); ! p.at_end (); ++p) {
@@ -1432,7 +1432,7 @@ AsIfFlatRegion::and_with (const Region &other) const
 
     //  map AND with box to clip ..
     db::Box b = other.bbox ();
-    std::auto_ptr<FlatRegion> new_region (new FlatRegion (false));
+    std::unique_ptr<FlatRegion> new_region (new FlatRegion (false));
 
     std::vector<db::Polygon> clipped;
     for (RegionIterator p (begin ()); ! p.at_end (); ++p) {
@@ -1474,7 +1474,7 @@ AsIfFlatRegion::and_with (const Region &other) const
       ep.insert (*p, n);
     }
 
-    std::auto_ptr<FlatRegion> new_region (new FlatRegion (true));
+    std::unique_ptr<FlatRegion> new_region (new FlatRegion (true));
     db::BooleanOp op (db::BooleanOp::And);
     db::ShapeGenerator pc (new_region->raw_polygons (), true /*clear*/);
     db::PolygonGenerator pg (pc, false /*don't resolve holes*/, min_coherence ());
@@ -1529,7 +1529,7 @@ AsIfFlatRegion::not_with (const Region &other) const
       ep.insert (*p, n);
     }
 
-    std::auto_ptr<FlatRegion> new_region (new FlatRegion (true));
+    std::unique_ptr<FlatRegion> new_region (new FlatRegion (true));
     db::BooleanOp op (db::BooleanOp::ANotB);
     db::ShapeGenerator pc (new_region->raw_polygons (), true /*clear*/);
     db::PolygonGenerator pg (pc, false /*don't resolve holes*/, min_coherence ());
@@ -1585,12 +1585,12 @@ AsIfFlatRegion::andnot_with (const Region &other) const
       ep.insert (*p, n);
     }
 
-    std::auto_ptr<FlatRegion> new_region1 (new FlatRegion (true));
+    std::unique_ptr<FlatRegion> new_region1 (new FlatRegion (true));
     db::BooleanOp op1 (db::BooleanOp::And);
     db::ShapeGenerator pc1 (new_region1->raw_polygons (), true /*clear*/);
     db::PolygonGenerator pg1 (pc1, false /*don't resolve holes*/, min_coherence ());
 
-    std::auto_ptr<FlatRegion> new_region2 (new FlatRegion (true));
+    std::unique_ptr<FlatRegion> new_region2 (new FlatRegion (true));
     db::BooleanOp op2 (db::BooleanOp::ANotB);
     db::ShapeGenerator pc2 (new_region2->raw_polygons (), true /*clear*/);
     db::PolygonGenerator pg2 (pc2, false /*don't resolve holes*/, min_coherence ());
@@ -1647,7 +1647,7 @@ AsIfFlatRegion::xor_with (const Region &other) const
       ep.insert (*p, n);
     }
 
-    std::auto_ptr<FlatRegion> new_region (new FlatRegion (true));
+    std::unique_ptr<FlatRegion> new_region (new FlatRegion (true));
     db::BooleanOp op (db::BooleanOp::Xor);
     db::ShapeGenerator pc (new_region->raw_polygons (), true /*clear*/);
     db::PolygonGenerator pg (pc, false /*don't resolve holes*/, min_coherence ());
@@ -1701,7 +1701,7 @@ AsIfFlatRegion::or_with (const Region &other) const
       ep.insert (*p, n);
     }
 
-    std::auto_ptr<FlatRegion> new_region (new FlatRegion (true));
+    std::unique_ptr<FlatRegion> new_region (new FlatRegion (true));
     db::BooleanOp op (db::BooleanOp::Or);
     db::ShapeGenerator pc (new_region->raw_polygons (), true /*clear*/);
     db::PolygonGenerator pg (pc, false /*don't resolve holes*/, min_coherence ());
@@ -1718,7 +1718,7 @@ AsIfFlatRegion::add (const Region &other) const
   FlatRegion *other_flat = dynamic_cast<FlatRegion *> (other.delegate ());
   if (other_flat) {
 
-    std::auto_ptr<FlatRegion> new_region (new FlatRegion (*other_flat));
+    std::unique_ptr<FlatRegion> new_region (new FlatRegion (*other_flat));
     new_region->set_is_merged (false);
     new_region->invalidate_cache ();
 
@@ -1734,7 +1734,7 @@ AsIfFlatRegion::add (const Region &other) const
 
   } else {
 
-    std::auto_ptr<FlatRegion> new_region (new FlatRegion (false /*not merged*/));
+    std::unique_ptr<FlatRegion> new_region (new FlatRegion (false /*not merged*/));
 
     size_t n = count () + other.count ();
 
diff --git a/src/db/db/dbAsIfFlatTexts.cc b/src/db/db/dbAsIfFlatTexts.cc
index 736e3a4c0..02e8e0da3 100644
--- a/src/db/db/dbAsIfFlatTexts.cc
+++ b/src/db/db/dbAsIfFlatTexts.cc
@@ -94,7 +94,7 @@ AsIfFlatTexts::in (const Texts &other, bool invert) const
     op.insert (*o);
   }
 
-  std::auto_ptr<FlatTexts> new_texts (new FlatTexts ());
+  std::unique_ptr<FlatTexts> new_texts (new FlatTexts ());
 
   for (TextsIterator o (begin ()); ! o.at_end (); ++o) {
     if ((op.find (*o) == op.end ()) == invert) {
@@ -153,7 +153,7 @@ void AsIfFlatTexts::invalidate_bbox ()
 TextsDelegate *
 AsIfFlatTexts::filtered (const TextFilterBase &filter) const
 {
-  std::auto_ptr<FlatTexts> new_texts (new FlatTexts ());
+  std::unique_ptr<FlatTexts> new_texts (new FlatTexts ());
 
   for (TextsIterator p (begin ()); ! p.at_end (); ++p) {
     if (filter.selected (*p)) {
@@ -167,7 +167,7 @@ AsIfFlatTexts::filtered (const TextFilterBase &filter) const
 RegionDelegate *
 AsIfFlatTexts::processed_to_polygons (const TextToPolygonProcessorBase &filter) const
 {
-  std::auto_ptr<FlatRegion> region (new FlatRegion ());
+  std::unique_ptr<FlatRegion> region (new FlatRegion ());
 
   if (filter.result_must_not_be_merged ()) {
     region->set_merged_semantics (false);
@@ -189,7 +189,7 @@ AsIfFlatTexts::processed_to_polygons (const TextToPolygonProcessorBase &filter)
 RegionDelegate *
 AsIfFlatTexts::polygons (db::Coord e) const
 {
-  std::auto_ptr<FlatRegion> output (new FlatRegion ());
+  std::unique_ptr<FlatRegion> output (new FlatRegion ());
 
   for (TextsIterator tp (begin ()); ! tp.at_end (); ++tp) {
     db::Box box = tp->box ();
@@ -203,7 +203,7 @@ AsIfFlatTexts::polygons (db::Coord e) const
 EdgesDelegate *
 AsIfFlatTexts::edges () const
 {
-  std::auto_ptr<FlatEdges> output (new FlatEdges ());
+  std::unique_ptr<FlatEdges> output (new FlatEdges ());
 
   for (TextsIterator tp (begin ()); ! tp.at_end (); ++tp) {
     db::Box box = tp->box ();
@@ -219,7 +219,7 @@ AsIfFlatTexts::add (const Texts &other) const
   FlatTexts *other_flat = dynamic_cast<FlatTexts *> (other.delegate ());
   if (other_flat) {
 
-    std::auto_ptr<FlatTexts> new_texts (new FlatTexts (*other_flat));
+    std::unique_ptr<FlatTexts> new_texts (new FlatTexts (*other_flat));
     new_texts->invalidate_cache ();
 
     size_t n = new_texts->raw_texts ().size () + count ();
@@ -234,7 +234,7 @@ AsIfFlatTexts::add (const Texts &other) const
 
   } else {
 
-    std::auto_ptr<FlatTexts> new_texts (new FlatTexts ());
+    std::unique_ptr<FlatTexts> new_texts (new FlatTexts ());
 
     size_t n = count () + other.count ();
 
@@ -342,7 +342,7 @@ AsIfFlatTexts::selected_interacting_generic (const Region &other, bool inverse)
     scanner.insert2 (p.operator-> (), 1);
   }
 
-  std::auto_ptr<FlatTexts> output (new FlatTexts ());
+  std::unique_ptr<FlatTexts> output (new FlatTexts ());
 
   if (! inverse) {
 
@@ -388,7 +388,7 @@ AsIfFlatTexts::pull_generic (const Region &other) const
     scanner.insert2 (p.operator-> (), 1);
   }
 
-  std::auto_ptr<FlatRegion> output (new FlatRegion (true));
+  std::unique_ptr<FlatRegion> output (new FlatRegion (true));
 
   text_to_region_interaction_filter<FlatRegion, db::Text> filter (*output);
   scanner.process (filter, 1, db::box_convert<db::Text> (), db::box_convert<db::Polygon> ());
diff --git a/src/db/db/dbBoxScanner.h b/src/db/db/dbBoxScanner.h
index 5a8d8ea55..628122ce9 100644
--- a/src/db/db/dbBoxScanner.h
+++ b/src/db/db/dbBoxScanner.h
@@ -354,7 +354,7 @@ private:
       iterator_type current = m_pp.begin ();
       iterator_type future = m_pp.begin ();
 
-      std::auto_ptr<tl::RelativeProgress> progress (0);
+      std::unique_ptr<tl::RelativeProgress> progress;
       if (m_report_progress) {
         if (m_progress_desc.empty ()) {
           progress.reset (new tl::RelativeProgress (tl::to_string (tr ("Processing")), m_pp.size (), 1000));
@@ -767,7 +767,7 @@ private:
       iterator_type2 current2 = m_pp2.begin ();
       iterator_type2 future2 = m_pp2.begin ();
 
-      std::auto_ptr<tl::RelativeProgress> progress (0);
+      std::unique_ptr<tl::RelativeProgress> progress;
       if (m_report_progress) {
         if (m_progress_desc.empty ()) {
           progress.reset (new tl::RelativeProgress (tl::to_string (tr ("Processing")), m_pp1.size () + m_pp2.size (), 1000));
diff --git a/src/db/db/dbDeepEdges.cc b/src/db/db/dbDeepEdges.cc
index b996e9bb2..a6d9daea3 100644
--- a/src/db/db/dbDeepEdges.cc
+++ b/src/db/db/dbDeepEdges.cc
@@ -598,7 +598,7 @@ DeepEdges::apply_filter (const EdgeFilterBase &filter) const
 {
   const db::DeepLayer &edges = filter.requires_raw_input () ? deep_layer () : merged_deep_layer ();
 
-  std::auto_ptr<VariantsCollectorBase> vars;
+  std::unique_ptr<VariantsCollectorBase> vars;
   if (filter.vars ()) {
 
     vars.reset (new db::VariantsCollectorBase (filter.vars ()));
@@ -614,7 +614,7 @@ DeepEdges::apply_filter (const EdgeFilterBase &filter) const
   db::Layout &layout = const_cast<db::Layout &> (edges.layout ());
   std::map<db::cell_index_type, std::map<db::ICplxTrans, db::Shapes> > to_commit;
 
-  std::auto_ptr<db::DeepEdges> res (new db::DeepEdges (edges.derived ()));
+  std::unique_ptr<db::DeepEdges> res (new db::DeepEdges (edges.derived ()));
   for (db::Layout::iterator c = layout.begin (); c != layout.end (); ++c) {
 
     const db::Shapes &s = c->shapes (edges.layer ());
@@ -681,7 +681,7 @@ EdgesDelegate *DeepEdges::merged () const
 
   db::Layout &layout = const_cast<db::Layout &> (m_merged_edges.layout ());
 
-  std::auto_ptr<db::DeepEdges> res (new db::DeepEdges (m_merged_edges.derived ()));
+  std::unique_ptr<db::DeepEdges> res (new db::DeepEdges (m_merged_edges.derived ()));
   for (db::Layout::iterator c = layout.begin (); c != layout.end (); ++c) {
     c->shapes (res->deep_layer ().layer ()) = c->shapes (m_merged_edges.layer ());
   }
@@ -972,7 +972,7 @@ RegionDelegate *DeepEdges::extended (coord_type ext_b, coord_type ext_e, coord_t
 {
   const db::DeepLayer &edges = merged_deep_layer ();
 
-  std::auto_ptr<db::DeepRegion> res (new db::DeepRegion (edges.derived ()));
+  std::unique_ptr<db::DeepRegion> res (new db::DeepRegion (edges.derived ()));
 
   db::Layout &layout = const_cast<db::Layout &> (edges.layout ());
   db::Cell &top_cell = const_cast<db::Cell &> (edges.initial_cell ());
@@ -1358,7 +1358,7 @@ public:
 EdgesDelegate *
 DeepEdges::selected_interacting_generic (const Region &other, bool inverse) const
 {
-  std::auto_ptr<db::DeepRegion> dr_holder;
+  std::unique_ptr<db::DeepRegion> dr_holder;
   const db::DeepRegion *other_deep = dynamic_cast<const db::DeepRegion *> (other.delegate ());
   if (! other_deep) {
     //  if the other region isn't deep, turn into a top-level only deep region to facilitate re-hierarchisation
@@ -1384,7 +1384,7 @@ DeepEdges::selected_interacting_generic (const Region &other, bool inverse) cons
 EdgesDelegate *
 DeepEdges::selected_interacting_generic (const Edges &other, bool inverse) const
 {
-  std::auto_ptr<db::DeepEdges> dr_holder;
+  std::unique_ptr<db::DeepEdges> dr_holder;
   const db::DeepEdges *other_deep = dynamic_cast<const db::DeepEdges *> (other.delegate ());
   if (! other_deep) {
     //  if the other edge collection isn't deep, turn into a top-level only deep edge collection to facilitate re-hierarchisation
@@ -1409,7 +1409,7 @@ DeepEdges::selected_interacting_generic (const Edges &other, bool inverse) const
 
 RegionDelegate *DeepEdges::pull_generic (const Region &other) const
 {
-  std::auto_ptr<db::DeepRegion> dr_holder;
+  std::unique_ptr<db::DeepRegion> dr_holder;
   const db::DeepRegion *other_deep = dynamic_cast<const db::DeepRegion *> (other.delegate ());
   if (! other_deep) {
     //  if the other region isn't deep, turn into a top-level only deep region to facilitate re-hierarchisation
@@ -1435,7 +1435,7 @@ RegionDelegate *DeepEdges::pull_generic (const Region &other) const
 
 EdgesDelegate *DeepEdges::pull_generic (const Edges &other) const
 {
-  std::auto_ptr<db::DeepEdges> dr_holder;
+  std::unique_ptr<db::DeepEdges> dr_holder;
   const db::DeepEdges *other_deep = dynamic_cast<const db::DeepEdges *> (other.delegate ());
   if (! other_deep) {
     //  if the other edge collection isn't deep, turn into a top-level only deep edge collection to facilitate re-hierarchisation
@@ -1572,7 +1572,7 @@ DeepEdges::run_check (db::edge_relation_type rel, const Edges *other, db::Coord
   check.set_min_projection (options.min_projection);
   check.set_max_projection (options.max_projection);
 
-  std::auto_ptr<db::DeepEdgePairs> res (new db::DeepEdgePairs (edges.derived ()));
+  std::unique_ptr<db::DeepEdgePairs> res (new db::DeepEdgePairs (edges.derived ()));
 
   db::EdgesCheckLocalOperation op (check, other_deep != 0);
 
diff --git a/src/db/db/dbDeepRegion.cc b/src/db/db/dbDeepRegion.cc
index 77cdd68d6..ee3fb5892 100644
--- a/src/db/db/dbDeepRegion.cc
+++ b/src/db/db/dbDeepRegion.cc
@@ -869,7 +869,7 @@ DeepRegion::grid_check (db::Coord gx, db::Coord gy) const
   vars.collect (layout, polygons.initial_cell ());
 
   std::map<db::cell_index_type, std::map<db::ICplxTrans, db::Shapes> > to_commit;
-  std::auto_ptr<db::DeepEdgePairs> res (new db::DeepEdgePairs (polygons.derived ()));
+  std::unique_ptr<db::DeepEdgePairs> res (new db::DeepEdgePairs (polygons.derived ()));
 
   for (db::Layout::iterator c = layout.begin (); c != layout.end (); ++c) {
 
@@ -910,7 +910,7 @@ DeepRegion::angle_check (double min, double max, bool inverse) const
   const db::DeepLayer &polygons = merged_deep_layer ();
   db::Layout &layout = const_cast<db::Layout &> (polygons.layout ());
 
-  std::auto_ptr<db::DeepEdgePairs> res (new db::DeepEdgePairs (polygons.derived ()));
+  std::unique_ptr<db::DeepEdgePairs> res (new db::DeepEdgePairs (polygons.derived ()));
 
   for (db::Layout::iterator c = layout.begin (); c != layout.end (); ++c) {
 
@@ -956,7 +956,7 @@ DeepRegion::snapped (db::Coord gx, db::Coord gy)
   db::Layout &layout = const_cast<db::Layout &> (polygons.layout ());
   std::vector<db::Point> heap;
 
-  std::auto_ptr<db::DeepRegion> res (new db::DeepRegion (polygons.derived ()));
+  std::unique_ptr<db::DeepRegion> res (new db::DeepRegion (polygons.derived ()));
   for (db::Layout::iterator c = layout.begin (); c != layout.end (); ++c) {
 
     const std::map<db::ICplxTrans, size_t> &v = vars.variants (c->cell_index ());
@@ -987,7 +987,7 @@ DeepRegion::edges (const EdgeFilterBase *filter) const
 {
   const db::DeepLayer &polygons = merged_deep_layer ();
 
-  std::auto_ptr<VariantsCollectorBase> vars;
+  std::unique_ptr<VariantsCollectorBase> vars;
 
   if (filter && filter->vars ()) {
 
@@ -1002,7 +1002,7 @@ DeepRegion::edges (const EdgeFilterBase *filter) const
 
   db::Layout &layout = const_cast<db::Layout &> (polygons.layout ());
 
-  std::auto_ptr<db::DeepEdges> res (new db::DeepEdges (polygons.derived ()));
+  std::unique_ptr<db::DeepEdges> res (new db::DeepEdges (polygons.derived ()));
   for (db::Layout::iterator c = layout.begin (); c != layout.end (); ++c) {
 
     db::ICplxTrans tr;
@@ -1078,7 +1078,7 @@ DeepRegion::apply_filter (const PolygonFilterBase &filter) const
 {
   const db::DeepLayer &polygons = filter.requires_raw_input () ? deep_layer () : merged_deep_layer ();
 
-  std::auto_ptr<VariantsCollectorBase> vars;
+  std::unique_ptr<VariantsCollectorBase> vars;
   if (filter.vars ()) {
 
     vars.reset (new db::VariantsCollectorBase (filter.vars ()));
@@ -1094,7 +1094,7 @@ DeepRegion::apply_filter (const PolygonFilterBase &filter) const
   db::Layout &layout = const_cast<db::Layout &> (polygons.layout ());
   std::map<db::cell_index_type, std::map<db::ICplxTrans, db::Shapes> > to_commit;
 
-  std::auto_ptr<db::DeepRegion> res (new db::DeepRegion (polygons.derived ()));
+  std::unique_ptr<db::DeepRegion> res (new db::DeepRegion (polygons.derived ()));
   for (db::Layout::iterator c = layout.begin (); c != layout.end (); ++c) {
 
     const db::Shapes &s = c->shapes (polygons.layer ());
@@ -1174,7 +1174,7 @@ DeepRegion::merged () const
 
   db::Layout &layout = const_cast<db::Layout &> (m_merged_polygons.layout ());
 
-  std::auto_ptr<db::DeepRegion> res (new db::DeepRegion (m_merged_polygons.derived ()));
+  std::unique_ptr<db::DeepRegion> res (new db::DeepRegion (m_merged_polygons.derived ()));
   for (db::Layout::iterator c = layout.begin (); c != layout.end (); ++c) {
     c->shapes (res->deep_layer ().layer ()) = c->shapes (m_merged_polygons.layer ());
   }
@@ -1242,7 +1242,7 @@ DeepRegion::sized (coord_type d, unsigned int mode) const
   //  NOTE: m_merged_polygons is mutable, so why is the const_cast needed?
   const_cast<db::DeepLayer &> (polygons).separate_variants (vars);
 
-  std::auto_ptr<db::DeepRegion> res (new db::DeepRegion (polygons.derived ()));
+  std::unique_ptr<db::DeepRegion> res (new db::DeepRegion (polygons.derived ()));
   for (db::Layout::iterator c = layout.begin (); c != layout.end (); ++c) {
 
     const std::map<db::ICplxTrans, size_t> &v = vars.variants (c->cell_index ());
@@ -1297,7 +1297,7 @@ DeepRegion::sized (coord_type dx, coord_type dy, unsigned int mode) const
   //  NOTE: m_merged_polygons is mutable, so why is the const_cast needed?
   const_cast<db::DeepLayer &> (polygons).separate_variants (vars);
 
-  std::auto_ptr<db::DeepRegion> res (new db::DeepRegion (polygons.derived ()));
+  std::unique_ptr<db::DeepRegion> res (new db::DeepRegion (polygons.derived ()));
   for (db::Layout::iterator c = layout.begin (); c != layout.end (); ++c) {
 
     const std::map<db::ICplxTrans, size_t> &v = vars.variants (c->cell_index ());
@@ -1384,7 +1384,7 @@ Output *region_cop_impl (DeepRegion *region, db::CompoundRegionOperationNode &no
 
   }
 
-  std::auto_ptr<Output> res (new Output (polygons.derived ()));
+  std::unique_ptr<Output> res (new Output (polygons.derived ()));
   compound_local_operation<db::PolygonRef, db::PolygonRef, TR> op (&node);
   proc.run (&op, polygons.layer (), other_layers, res->deep_layer ().layer ());
 
@@ -1453,7 +1453,7 @@ DeepRegion::run_check (db::edge_relation_type rel, bool different_polygons, cons
   check.set_min_projection (options.min_projection);
   check.set_max_projection (options.max_projection);
 
-  std::auto_ptr<db::DeepEdgePairs> res (new db::DeepEdgePairs (polygons.derived ()));
+  std::unique_ptr<db::DeepEdgePairs> res (new db::DeepEdgePairs (polygons.derived ()));
 
   db::CheckLocalOperation op (check, different_polygons, other_deep != 0, other_is_merged, options);
 
@@ -1486,7 +1486,7 @@ DeepRegion::run_single_polygon_check (db::edge_relation_type rel, db::Coord d, c
 
   db::Layout &layout = const_cast<db::Layout &> (polygons.layout ());
 
-  std::auto_ptr<db::DeepEdgePairs> res (new db::DeepEdgePairs (polygons.derived ()));
+  std::unique_ptr<db::DeepEdgePairs> res (new db::DeepEdgePairs (polygons.derived ()));
   for (db::Layout::iterator c = layout.begin (); c != layout.end (); ++c) {
 
     const db::Shapes &shapes = c->shapes (polygons.layer ());
@@ -1519,7 +1519,7 @@ DeepRegion::selected_interacting_generic (const Region &other, int mode, bool to
   //  with these flag set to true, the resulting polygons are broken again.
   bool split_after = false;
 
-  std::auto_ptr<db::DeepRegion> dr_holder;
+  std::unique_ptr<db::DeepRegion> dr_holder;
   const db::DeepRegion *other_deep = dynamic_cast<const db::DeepRegion *> (other.delegate ());
   if (! other_deep) {
     //  if the other region isn't deep, turn into a top-level only deep region to facilitate re-hierarchisation
@@ -1560,7 +1560,7 @@ DeepRegion::selected_interacting_generic (const Edges &other, bool inverse, size
   //  with these flag set to true, the resulting polygons are broken again.
   bool split_after = false;
 
-  std::auto_ptr<db::DeepEdges> dr_holder;
+  std::unique_ptr<db::DeepEdges> dr_holder;
   const db::DeepEdges *other_deep = dynamic_cast<const db::DeepEdges *> (other.delegate ());
   if (! other_deep) {
     //  if the other region isn't deep, turn into a top-level only deep region to facilitate re-hierarchisation
@@ -1597,7 +1597,7 @@ DeepRegion::pull_generic (const Region &other, int mode, bool touching) const
   //  with these flag set to true, the resulting polygons are broken again.
   bool split_after = false;
 
-  std::auto_ptr<db::DeepRegion> dr_holder;
+  std::unique_ptr<db::DeepRegion> dr_holder;
   const db::DeepRegion *other_deep = dynamic_cast<const db::DeepRegion *> (other.delegate ());
   if (! other_deep) {
     //  if the other region isn't deep, turn into a top-level only deep region to facilitate re-hierarchisation
@@ -1633,7 +1633,7 @@ DeepRegion::pull_generic (const Region &other, int mode, bool touching) const
 EdgesDelegate *
 DeepRegion::pull_generic (const Edges &other) const
 {
-  std::auto_ptr<db::DeepEdges> dr_holder;
+  std::unique_ptr<db::DeepEdges> dr_holder;
   const db::DeepEdges *other_deep = dynamic_cast<const db::DeepEdges *> (other.delegate ());
   if (! other_deep) {
     //  if the other region isn't deep, turn into a top-level only deep region to facilitate re-hierarchisation
@@ -1662,7 +1662,7 @@ DeepRegion::pull_generic (const Edges &other) const
 TextsDelegate *
 DeepRegion::pull_generic (const Texts &other) const
 {
-  std::auto_ptr<db::DeepTexts> dr_holder;
+  std::unique_ptr<db::DeepTexts> dr_holder;
   const db::DeepTexts *other_deep = dynamic_cast<const db::DeepTexts *> (other.delegate ());
   if (! other_deep) {
     //  if the other region isn't deep, turn into a top-level only deep region to facilitate re-hierarchisation
@@ -1694,7 +1694,7 @@ DeepRegion::selected_interacting_generic (const Texts &other, bool inverse, size
   //  with these flag set to true, the resulting polygons are broken again.
   bool split_after = false;
 
-  std::auto_ptr<db::DeepTexts> dr_holder;
+  std::unique_ptr<db::DeepTexts> dr_holder;
   const db::DeepTexts *other_deep = dynamic_cast<const db::DeepTexts *> (other.delegate ());
   if (! other_deep) {
     //  if the other region isn't deep, turn into a top-level only deep region to facilitate re-hierarchisation
diff --git a/src/db/db/dbDeepTexts.cc b/src/db/db/dbDeepTexts.cc
index 2b1bacda5..1cffe1fdf 100644
--- a/src/db/db/dbDeepTexts.cc
+++ b/src/db/db/dbDeepTexts.cc
@@ -302,7 +302,7 @@ DeepTexts *DeepTexts::apply_filter (const TextFilterBase &filter) const
 {
   const db::DeepLayer &texts = deep_layer ();
 
-  std::auto_ptr<VariantsCollectorBase> vars;
+  std::unique_ptr<VariantsCollectorBase> vars;
   if (filter.vars ()) {
 
     vars.reset (new db::VariantsCollectorBase (filter.vars ()));
@@ -318,7 +318,7 @@ DeepTexts *DeepTexts::apply_filter (const TextFilterBase &filter) const
   db::Layout &layout = const_cast<db::Layout &> (texts.layout ());
   std::map<db::cell_index_type, std::map<db::ICplxTrans, db::Shapes> > to_commit;
 
-  std::auto_ptr<db::DeepTexts> res (new db::DeepTexts (texts.derived ()));
+  std::unique_ptr<db::DeepTexts> res (new db::DeepTexts (texts.derived ()));
   for (db::Layout::iterator c = layout.begin (); c != layout.end (); ++c) {
 
     const db::Shapes &s = c->shapes (texts.layer ());
@@ -610,7 +610,7 @@ public:
 TextsDelegate *
 DeepTexts::selected_interacting_generic (const Region &other, bool inverse) const
 {
-  std::auto_ptr<db::DeepRegion> dr_holder;
+  std::unique_ptr<db::DeepRegion> dr_holder;
   const db::DeepRegion *other_deep = dynamic_cast<const db::DeepRegion *> (other.delegate ());
   if (! other_deep) {
     //  if the other region isn't deep, turn into a top-level only deep region to facilitate re-hierarchisation
@@ -635,7 +635,7 @@ DeepTexts::selected_interacting_generic (const Region &other, bool inverse) cons
 
 RegionDelegate *DeepTexts::pull_generic (const Region &other) const
 {
-  std::auto_ptr<db::DeepRegion> dr_holder;
+  std::unique_ptr<db::DeepRegion> dr_holder;
   const db::DeepRegion *other_deep = dynamic_cast<const db::DeepRegion *> (other.delegate ());
   if (! other_deep) {
     //  if the other region isn't deep, turn into a top-level only deep region to facilitate re-hierarchisation
diff --git a/src/db/db/dbEdgeProcessor.cc b/src/db/db/dbEdgeProcessor.cc
index 16d8a9b02..80dbd794d 100644
--- a/src/db/db/dbEdgeProcessor.cc
+++ b/src/db/db/dbEdgeProcessor.cc
@@ -2162,7 +2162,7 @@ EdgeProcessor::process (const std::vector<std::pair<db::EdgeSink *, db::EdgeEval
 
   size_t todo_max = 1000000;
 
-  std::auto_ptr<tl::AbsoluteProgress> progress (0);
+  std::unique_ptr<tl::AbsoluteProgress> progress;
   if (m_report_progress) {
     if (m_progress_desc.empty ()) {
       progress.reset (new tl::AbsoluteProgress (tl::to_string (tr ("Processing")), 1000));
diff --git a/src/db/db/dbFlatEdgePairs.cc b/src/db/db/dbFlatEdgePairs.cc
index 223f63b42..60a79f167 100644
--- a/src/db/db/dbFlatEdgePairs.cc
+++ b/src/db/db/dbFlatEdgePairs.cc
@@ -119,7 +119,7 @@ FlatEdgePairs::filter_in_place (const EdgePairFilterBase &filter)
 
 EdgePairsDelegate *FlatEdgePairs::add (const EdgePairs &other) const
 {
-  std::auto_ptr<FlatEdgePairs> new_edge_pairs (new FlatEdgePairs (*this));
+  std::unique_ptr<FlatEdgePairs> new_edge_pairs (new FlatEdgePairs (*this));
   new_edge_pairs->invalidate_cache ();
 
   FlatEdgePairs *other_flat = dynamic_cast<FlatEdgePairs *> (other.delegate ());
diff --git a/src/db/db/dbFlatEdges.cc b/src/db/db/dbFlatEdges.cc
index d7adffd9e..689cc5e93 100644
--- a/src/db/db/dbFlatEdges.cc
+++ b/src/db/db/dbFlatEdges.cc
@@ -242,7 +242,7 @@ FlatEdges::filter_in_place (const EdgeFilterBase &filter)
 
 EdgesDelegate *FlatEdges::add (const Edges &other) const
 {
-  std::auto_ptr<FlatEdges> new_region (new FlatEdges (*this));
+  std::unique_ptr<FlatEdges> new_region (new FlatEdges (*this));
   new_region->invalidate_cache ();
   new_region->set_is_merged (false);
 
diff --git a/src/db/db/dbFlatRegion.cc b/src/db/db/dbFlatRegion.cc
index 5c240729c..01f3a954a 100644
--- a/src/db/db/dbFlatRegion.cc
+++ b/src/db/db/dbFlatRegion.cc
@@ -327,7 +327,7 @@ RegionDelegate *FlatRegion::merged () const
 
 RegionDelegate *FlatRegion::add (const Region &other) const
 {
-  std::auto_ptr<FlatRegion> new_region (new FlatRegion (*this));
+  std::unique_ptr<FlatRegion> new_region (new FlatRegion (*this));
   new_region->invalidate_cache ();
   new_region->set_is_merged (false);
 
diff --git a/src/db/db/dbFlatTexts.cc b/src/db/db/dbFlatTexts.cc
index 81916f447..8fc167004 100644
--- a/src/db/db/dbFlatTexts.cc
+++ b/src/db/db/dbFlatTexts.cc
@@ -119,7 +119,7 @@ FlatTexts::filter_in_place (const TextFilterBase &filter)
 
 TextsDelegate *FlatTexts::add (const Texts &other) const
 {
-  std::auto_ptr<FlatTexts> new_texts (new FlatTexts (*this));
+  std::unique_ptr<FlatTexts> new_texts (new FlatTexts (*this));
   new_texts->invalidate_cache ();
 
   FlatTexts *other_flat = dynamic_cast<FlatTexts *> (other.delegate ());
diff --git a/src/db/db/dbHierNetworkProcessor.cc b/src/db/db/dbHierNetworkProcessor.cc
index d20ff4ab8..07b88bf11 100644
--- a/src/db/db/dbHierNetworkProcessor.cc
+++ b/src/db/db/dbHierNetworkProcessor.cc
@@ -2304,7 +2304,7 @@ hier_clusters<T>::build_hier_connections (cell_clusters_box_converter<T> &cbc, c
 
   //  NOTE: this is a receiver for both the child-to-child and
   //  local to child interactions.
-  std::auto_ptr<hc_receiver<T> > rec (new hc_receiver<T> (layout, cell, local, *this, cbc, conn, breakout_cells, &instance_interaction_cache));
+  std::unique_ptr<hc_receiver<T> > rec (new hc_receiver<T> (layout, cell, local, *this, cbc, conn, breakout_cells, &instance_interaction_cache));
   cell_inst_clusters_box_converter<T> cibc (cbc);
 
   //  The box scanner needs pointers so we have to first store the instances
diff --git a/src/db/db/dbHierProcessor.cc b/src/db/db/dbHierProcessor.cc
index ab05402bf..6b534eabb 100644
--- a/src/db/db/dbHierProcessor.cc
+++ b/src/db/db/dbHierProcessor.cc
@@ -1669,7 +1669,7 @@ local_processor<TS, TI, TR>::compute_results (local_processor_contexts<TS, TI, T
 
   if (m_nthreads > 0) {
 
-    std::auto_ptr<tl::Job<local_processor_result_computation_worker<TS, TI, TR> > > rc_job (new tl::Job<local_processor_result_computation_worker<TS, TI, TR> > (m_nthreads));
+    std::unique_ptr<tl::Job<local_processor_result_computation_worker<TS, TI, TR> > > rc_job (new tl::Job<local_processor_result_computation_worker<TS, TI, TR> > (m_nthreads));
 
     //  schedule computation jobs in "waves": we need to make sure they are executed
     //  bottom-up. So we identify a new bunch of cells each time we pass through the cell set
diff --git a/src/db/db/dbHierProcessor.h b/src/db/db/dbHierProcessor.h
index 88ec91ac0..71ecdb311 100644
--- a/src/db/db/dbHierProcessor.h
+++ b/src/db/db/dbHierProcessor.h
@@ -494,7 +494,7 @@ private:
   size_t m_max_vertex_count;
   double m_area_ratio;
   int m_base_verbosity;
-  mutable std::auto_ptr<tl::Job<local_processor_context_computation_worker<TS, TI, TR> > > mp_cc_job;
+  mutable std::unique_ptr<tl::Job<local_processor_context_computation_worker<TS, TI, TR> > > mp_cc_job;
   mutable size_t m_progress;
   mutable tl::Progress *mp_progress;
 
diff --git a/src/db/db/dbLayoutQuery.cc b/src/db/db/dbLayoutQuery.cc
index 559b40465..ed72fa29a 100644
--- a/src/db/db/dbLayoutQuery.cc
+++ b/src/db/db/dbLayoutQuery.cc
@@ -1379,7 +1379,7 @@ private:
   NameFilter m_pattern;
   const db::Cell *mp_parent;
   db::Layout::top_down_const_iterator m_cell, m_cell_end;
-  std::auto_ptr<db::CellCounter> m_cell_counter;
+  std::unique_ptr<db::CellCounter> m_cell_counter;
   bool m_reading;
   db::cell_index_type m_cell_index;
 };
@@ -2222,7 +2222,7 @@ parse_cell_name_filter_element (tl::Extractor &ex, LayoutQuery *q, ChildCellFilt
 
   } else if (ex.test ("(")) {
 
-    std::auto_ptr<FilterBracket> b (new FilterBracket (q));
+    std::unique_ptr<FilterBracket> b (new FilterBracket (q));
     do {
       parse_cell_name_filter_seq (ex, q, b.get (), instance_mode, reading);
     } while (ex.test (",") || ex.test ("or"));
@@ -2276,7 +2276,7 @@ parse_cell_name_filter_element (tl::Extractor &ex, LayoutQuery *q, ChildCellFilt
       ++ex;
     }
 
-    std::auto_ptr<FilterBracket> b (new ChildCellFilter (q, NameFilterArgument ("*"), instance_mode, reading));
+    std::unique_ptr<FilterBracket> b (new ChildCellFilter (q, NameFilterArgument ("*"), instance_mode, reading));
     b->set_loopmin (0);
     b->set_loopmax (std::numeric_limits<unsigned int>::max ());
     return b.release ();
@@ -2360,7 +2360,7 @@ parse_cell_filter (tl::Extractor &ex, LayoutQuery *q, FilterBracket *bracket, bo
 
   } else {
 
-    std::auto_ptr<FilterBracket> b (new FilterBracket (q));
+    std::unique_ptr<FilterBracket> b (new FilterBracket (q));
 
     if (ex.test ("instances")) {
       (ex.test ("of") || ex.test ("from")) && (ex.test ("cells") || ex.test ("cell"));
@@ -2437,7 +2437,7 @@ parse_filter (tl::Extractor &ex, LayoutQuery *q, FilterBracket *bracket, bool re
 
     ex.test ("of") || ex.test ("from");
 
-    std::auto_ptr<FilterBracket> b (new FilterBracket (q));
+    std::unique_ptr<FilterBracket> b (new FilterBracket (q));
     parse_cell_filter (ex, q, b.get (), false, reading);
 
     FilterBase *f = 0, *fl = 0;
@@ -2482,7 +2482,7 @@ parse_statement (tl::Extractor &ex, LayoutQuery *q, FilterBracket *bracket, bool
 
     ex.expect ("from");
 
-    std::auto_ptr<FilterBracket> b (new FilterBracket (q));
+    std::unique_ptr<FilterBracket> b (new FilterBracket (q));
     parse_filter (ex, q, b.get (), true);
 
     bool unique = false;
@@ -2506,7 +2506,7 @@ parse_statement (tl::Extractor &ex, LayoutQuery *q, FilterBracket *bracket, bool
 
   } else if (! reading && ex.test ("with")) {
 
-    std::auto_ptr<FilterBracket> b (new FilterBracket (q));
+    std::unique_ptr<FilterBracket> b (new FilterBracket (q));
     parse_filter (ex, q, b.get (), false);
 
     ex.expect ("do");
@@ -2527,7 +2527,7 @@ parse_statement (tl::Extractor &ex, LayoutQuery *q, FilterBracket *bracket, bool
 
   } else if (! reading && ex.test ("delete")) {
 
-    std::auto_ptr<FilterBracket> b (new FilterBracket (q));
+    std::unique_ptr<FilterBracket> b (new FilterBracket (q));
     parse_filter (ex, q, b.get (), false);
 
     bool transparent = ex.test ("pass");
@@ -2550,7 +2550,7 @@ parse_statement (tl::Extractor &ex, LayoutQuery *q, FilterBracket *bracket, bool
 LayoutQuery::LayoutQuery (const std::string &query)
   : mp_root (0)
 {
-  std::auto_ptr<FilterBracket> r (new FilterBracket (this));
+  std::unique_ptr<FilterBracket> r (new FilterBracket (this));
 
   tl::Extractor ex (query.c_str ());
   parse_statement (ex, this, r.get (), false);
diff --git a/src/db/db/dbLayoutToNetlist.cc b/src/db/db/dbLayoutToNetlist.cc
index 5c8fb0ecc..56eb28675 100644
--- a/src/db/db/dbLayoutToNetlist.cc
+++ b/src/db/db/dbLayoutToNetlist.cc
@@ -153,7 +153,7 @@ db::Region *LayoutToNetlist::make_layer (const std::string &n)
   db::RecursiveShapeIterator si (m_iter);
   si.shape_flags (db::ShapeIterator::Nothing);
 
-  std::auto_ptr <db::Region> region (new db::Region (si, dss ()));
+  std::unique_ptr <db::Region> region (new db::Region (si, dss ()));
   if (! n.empty ()) {
     register_layer (*region, n);
   }
@@ -166,7 +166,7 @@ db::Region *LayoutToNetlist::make_layer (unsigned int layer_index, const std::st
   si.set_layer (layer_index);
   si.shape_flags (db::ShapeIterator::All);
 
-  std::auto_ptr <db::Region> region (new db::Region (si, dss ()));
+  std::unique_ptr <db::Region> region (new db::Region (si, dss ()));
   if (! n.empty ()) {
     register_layer (*region, n);
   }
@@ -179,7 +179,7 @@ db::Texts *LayoutToNetlist::make_text_layer (unsigned int layer_index, const std
   si.set_layer (layer_index);
   si.shape_flags (db::ShapeIterator::Texts);
 
-  std::auto_ptr <db::Texts> texts (new db::Texts (si, dss ()));
+  std::unique_ptr <db::Texts> texts (new db::Texts (si, dss ()));
   if (! n.empty ()) {
     register_layer (*texts, n);
   }
@@ -192,7 +192,7 @@ db::Region *LayoutToNetlist::make_polygon_layer (unsigned int layer_index, const
   si.set_layer (layer_index);
   si.shape_flags (db::ShapeIterator::Paths | db::ShapeIterator::Polygons | db::ShapeIterator::Boxes);
 
-  std::auto_ptr <db::Region> region (new db::Region (si, dss ()));
+  std::unique_ptr <db::Region> region (new db::Region (si, dss ()));
   if (! n.empty ()) {
     register_layer (*region, n);
   }
@@ -773,7 +773,7 @@ db::Region *LayoutToNetlist::shapes_of_net (const db::Net &net, const db::Region
   const db::Circuit *circuit = net.circuit ();
   tl_assert (circuit != 0);
 
-  std::auto_ptr<db::Region> res (new db::Region ());
+  std::unique_ptr<db::Region> res (new db::Region ());
   std::map<unsigned int, db::Region *> lmap;
   lmap [lid] = res.get ();
 
@@ -1313,7 +1313,7 @@ void LayoutToNetlist::load (const std::string &path)
 
 db::LayoutToNetlist *LayoutToNetlist::create_from_file (const std::string &path)
 {
-  std::auto_ptr<db::LayoutToNetlist> db;
+  std::unique_ptr<db::LayoutToNetlist> db;
 
   //  TODO: generic concept to detect format
   std::string first_line;
diff --git a/src/db/db/dbLayoutToNetlist.h b/src/db/db/dbLayoutToNetlist.h
index 2b56423a9..7faf276ec 100644
--- a/src/db/db/dbLayoutToNetlist.h
+++ b/src/db/db/dbLayoutToNetlist.h
@@ -816,12 +816,12 @@ private:
   std::string m_original_file;
   std::string m_filename;
   db::RecursiveShapeIterator m_iter;
-  std::auto_ptr<db::DeepShapeStore> mp_internal_dss;
+  std::unique_ptr<db::DeepShapeStore> mp_internal_dss;
   tl::weak_ptr<db::DeepShapeStore> mp_dss;
   unsigned int m_layout_index;
   db::Connectivity m_conn;
   db::hier_clusters<db::NetShape> m_net_clusters;
-  std::auto_ptr<db::Netlist> mp_netlist;
+  std::unique_ptr<db::Netlist> mp_netlist;
   std::set<db::DeepLayer> m_dlrefs;
   std::map<std::string, db::DeepLayer> m_named_regions;
   std::map<unsigned int, std::string> m_name_of_layer;
diff --git a/src/db/db/dbLayoutToNetlistReader.cc b/src/db/db/dbLayoutToNetlistReader.cc
index c08287ab4..2ef9ed8fd 100644
--- a/src/db/db/dbLayoutToNetlistReader.cc
+++ b/src/db/db/dbLayoutToNetlistReader.cc
@@ -219,7 +219,7 @@ void LayoutToNetlistStandardReader::read_netlist (db::Netlist *netlist, db::Layo
         read_word_or_quoted (lspec);
       }
 
-      std::auto_ptr<db::Region> region (l2n->make_layer (layer));
+      std::unique_ptr<db::Region> region (l2n->make_layer (layer));
       if (! lspec.empty ()) {
         unsigned int layer_index = l2n->layer_of (*region);
         tl::Extractor ex (lspec.c_str ());
@@ -683,7 +683,7 @@ LayoutToNetlistStandardReader::read_device (db::Netlist *netlist, db::LayoutToNe
 
   std::pair<db::DeviceAbstract *, const db::DeviceClass *> dm = device_model_by_name (netlist, dmname);
 
-  std::auto_ptr<db::Device> device (new db::Device ());
+  std::unique_ptr<db::Device> device (new db::Device ());
   device->set_device_class (const_cast<db::DeviceClass *> (dm.second));
   device->set_device_abstract (dm.first);
 
@@ -936,7 +936,7 @@ LayoutToNetlistStandardReader::read_subcircuit (db::Netlist *netlist, db::Layout
     throw tl::Exception (tl::to_string (tr ("Not a valid device circuit name: ")) + xname);
   }
 
-  std::auto_ptr<db::SubCircuit> subcircuit (new db::SubCircuit (circuit_ref));
+  std::unique_ptr<db::SubCircuit> subcircuit (new db::SubCircuit (circuit_ref));
 
   db::DCplxTrans trans;
 
diff --git a/src/db/db/dbLayoutVsSchematicReader.cc b/src/db/db/dbLayoutVsSchematicReader.cc
index 282eb5bb2..576e42a66 100644
--- a/src/db/db/dbLayoutVsSchematicReader.cc
+++ b/src/db/db/dbLayoutVsSchematicReader.cc
@@ -87,7 +87,7 @@ void LayoutVsSchematicStandardReader::read_netlist (db::LayoutVsSchematic *lvs)
     } else if (test (skeys::reference_key) || test (lkeys::reference_key)) {
 
       Brace br (this);
-      std::auto_ptr<db::Netlist> netlist (new db::Netlist ());
+      std::unique_ptr<db::Netlist> netlist (new db::Netlist ());
       LayoutToNetlistStandardReader::read_netlist (netlist.get (), 0, true /*nested*/, &m_map_per_circuit_b);
       lvs->set_reference_netlist (netlist.release ());
       br.done ();
diff --git a/src/db/db/dbLocalOperation.cc b/src/db/db/dbLocalOperation.cc
index e3f360bab..1e1d3140d 100644
--- a/src/db/db/dbLocalOperation.cc
+++ b/src/db/db/dbLocalOperation.cc
@@ -50,7 +50,7 @@ void local_operation<TS, TI, TR>::compute_local (db::Layout *layout, const shape
 
   } else {
 
-    std::auto_ptr<tl::RelativeProgress> progress;
+    std::unique_ptr<tl::RelativeProgress> progress;
     if (report_progress) {
       progress.reset (new tl::RelativeProgress (progress_desc, interactions.size ()));
     }
diff --git a/src/db/db/dbNetlistCompare.h b/src/db/db/dbNetlistCompare.h
index da40f3f17..97f6efa23 100644
--- a/src/db/db/dbNetlistCompare.h
+++ b/src/db/db/dbNetlistCompare.h
@@ -354,9 +354,9 @@ protected:
 
   mutable NetlistCompareLogger *mp_logger;
   std::map<std::pair<const db::Circuit *, const db::Circuit *>, std::vector<std::pair<const Net *, const Net *> > > m_same_nets;
-  std::auto_ptr<CircuitPinMapper> mp_circuit_pin_mapper;
-  std::auto_ptr<DeviceCategorizer> mp_device_categorizer;
-  std::auto_ptr<CircuitCategorizer> mp_circuit_categorizer;
+  std::unique_ptr<CircuitPinMapper> mp_circuit_pin_mapper;
+  std::unique_ptr<DeviceCategorizer> mp_device_categorizer;
+  std::unique_ptr<CircuitCategorizer> mp_circuit_categorizer;
   double m_cap_threshold;
   double m_res_threshold;
   size_t m_max_n_branch;
diff --git a/src/db/db/dbNetlistDeviceExtractor.cc b/src/db/db/dbNetlistDeviceExtractor.cc
index f8de59c23..7c97d1782 100644
--- a/src/db/db/dbNetlistDeviceExtractor.cc
+++ b/src/db/db/dbNetlistDeviceExtractor.cc
@@ -483,7 +483,7 @@ void NetlistDeviceExtractor::extract_devices (const std::vector<db::Region> & /*
 
 void NetlistDeviceExtractor::register_device_class (DeviceClass *device_class)
 {
-  std::auto_ptr<DeviceClass> holder (device_class);
+  std::unique_ptr<DeviceClass> holder (device_class);
   tl_assert (device_class != 0);
   tl_assert (m_netlist.get () != 0);
 
diff --git a/src/db/db/dbNetlistSpiceReader.cc b/src/db/db/dbNetlistSpiceReader.cc
index b33dac111..9f42043ca 100644
--- a/src/db/db/dbNetlistSpiceReader.cc
+++ b/src/db/db/dbNetlistSpiceReader.cc
@@ -274,7 +274,7 @@ bool NetlistSpiceReaderDelegate::element (db::Circuit *circuit, const std::strin
 static const char *allowed_name_chars = "_.:,!+$/&\\#[]|<>";
 
 NetlistSpiceReader::NetlistSpiceReader (NetlistSpiceReaderDelegate *delegate)
-  : mp_netlist (0), mp_stream (0), mp_delegate (delegate)
+  : mp_netlist (0), mp_stream (), mp_delegate (delegate)
 {
   static NetlistSpiceReaderDelegate std_delegate;
   if (! delegate) {
@@ -978,7 +978,7 @@ void NetlistSpiceReader::read_circuit (tl::Extractor &ex, const std::string &nc)
   }
   m_circuits_read.insert (cc);
 
-  std::auto_ptr<std::map<std::string, db::Net *> > n2n (mp_nets_by_name.release ());
+  std::unique_ptr<std::map<std::string, db::Net *> > n2n (mp_nets_by_name.release ());
   mp_nets_by_name.reset (0);
 
   std::swap (cc, mp_circuit);
diff --git a/src/db/db/dbNetlistSpiceReader.h b/src/db/db/dbNetlistSpiceReader.h
index 0ca7c94d6..5af74b90e 100644
--- a/src/db/db/dbNetlistSpiceReader.h
+++ b/src/db/db/dbNetlistSpiceReader.h
@@ -125,10 +125,10 @@ private:
   db::Netlist *mp_netlist;
   db::Circuit *mp_circuit;
   db::Circuit *mp_anonymous_top_circuit;
-  std::auto_ptr<tl::TextInputStream> mp_stream;
+  std::unique_ptr<tl::TextInputStream> mp_stream;
   tl::weak_ptr<NetlistSpiceReaderDelegate> mp_delegate;
   std::vector<std::pair<tl::InputStream *, tl::TextInputStream *> > m_streams;
-  std::auto_ptr<std::map<std::string, db::Net *> > mp_nets_by_name;
+  std::unique_ptr<std::map<std::string, db::Net *> > mp_nets_by_name;
   std::string m_stored_line;
   std::map<std::string, bool> m_captured;
   std::vector<std::string> m_global_nets;
diff --git a/src/db/db/dbRecursiveShapeIterator.h b/src/db/db/dbRecursiveShapeIterator.h
index a0a1f2695..0afdd5423 100644
--- a/src/db/db/dbRecursiveShapeIterator.h
+++ b/src/db/db/dbRecursiveShapeIterator.h
@@ -733,7 +733,7 @@ private:
   const shapes_type *mp_shapes;
 
   box_type m_region;
-  std::auto_ptr<region_type> mp_complex_region;
+  std::unique_ptr<region_type> mp_complex_region;
   db::box_convert<db::CellInst> m_box_convert;
 
   mutable inst_iterator m_inst;
diff --git a/src/db/db/dbRegion.cc b/src/db/db/dbRegion.cc
index acfc8d259..85c793917 100644
--- a/src/db/db/dbRegion.cc
+++ b/src/db/db/dbRegion.cc
@@ -507,7 +507,7 @@ Region::texts_as_dots (const std::string &pat, bool pattern) const
     si.first.shape_flags (si.first.shape_flags () & db::ShapeIterator::Texts);
   }
 
-  std::auto_ptr<db::FlatEdges> res (new db::FlatEdges ());
+  std::unique_ptr<db::FlatEdges> res (new db::FlatEdges ());
   res->set_merged_semantics (false);
 
   fill_texts (si.first, pat, pattern, dot_delivery<db::FlatEdges> (), res.get (), si.second, dr);
@@ -529,7 +529,7 @@ Region::texts_as_dots (const std::string &pat, bool pattern, db::DeepShapeStore
   if (! si.first.layout ()) {
 
     //  flat fallback if the source isn't a deep or original layer
-    std::auto_ptr<db::FlatEdges> res (new db::FlatEdges ());
+    std::unique_ptr<db::FlatEdges> res (new db::FlatEdges ());
     res->set_merged_semantics (false);
 
     fill_texts (si.first, pat, pattern, dot_delivery<db::FlatEdges> (), res.get (), si.second, dr);
@@ -560,7 +560,7 @@ Region::texts_as_boxes (const std::string &pat, bool pattern, db::Coord enl) con
     si.first.shape_flags (si.first.shape_flags () & db::ShapeIterator::Texts);
   }
 
-  std::auto_ptr<db::FlatRegion> res (new db::FlatRegion ());
+  std::unique_ptr<db::FlatRegion> res (new db::FlatRegion ());
   res->set_merged_semantics (false);
 
   fill_texts (si.first, pat, pattern, box_delivery<db::FlatRegion> (enl), res.get (), si.second, dr);
@@ -582,7 +582,7 @@ Region::texts_as_boxes (const std::string &pat, bool pattern, db::Coord enl, db:
   if (! si.first.layout ()) {
 
     //  flat fallback if the source isn't a deep or original layer
-    std::auto_ptr<db::FlatRegion> res (new db::FlatRegion ());
+    std::unique_ptr<db::FlatRegion> res (new db::FlatRegion ());
     res->set_merged_semantics (false);
 
     fill_texts (si.first, pat, pattern, box_delivery<db::FlatRegion> (enl), res.get (), si.second, dr);
diff --git a/src/db/db/dbShapeCollectionUtils.h b/src/db/db/dbShapeCollectionUtils.h
index eb417b03e..94cfe61f7 100644
--- a/src/db/db/dbShapeCollectionUtils.h
+++ b/src/db/db/dbShapeCollectionUtils.h
@@ -169,7 +169,7 @@ DB_PUBLIC_TEMPLATE
 OutputContainer *
 shape_collection_processed_impl (const db::DeepLayer &input, const shape_collection_processor<Shape, Result> &filter)
 {
-  std::auto_ptr<VariantsCollectorBase> vars;
+  std::unique_ptr<VariantsCollectorBase> vars;
   if (filter.vars ()) {
 
     vars.reset (new db::VariantsCollectorBase (filter.vars ()));
@@ -187,7 +187,7 @@ shape_collection_processed_impl (const db::DeepLayer &input, const shape_collect
   std::vector<Result> heap;
   std::map<db::cell_index_type, std::map<db::ICplxTrans, db::Shapes> > to_commit;
 
-  std::auto_ptr<OutputContainer> res (new OutputContainer (input.derived ()));
+  std::unique_ptr<OutputContainer> res (new OutputContainer (input.derived ()));
   if (filter.result_must_not_be_merged ()) {
     res->set_merged_semantics (false);
   }
diff --git a/src/db/db/dbStream.h b/src/db/db/dbStream.h
index 0cb6ed2d9..d3d034c91 100644
--- a/src/db/db/dbStream.h
+++ b/src/db/db/dbStream.h
@@ -199,7 +199,7 @@ public:
 
   void operator () (HOST &options, tl::XMLReaderState &reader) const
   {
-    std::auto_ptr<OPT> opt (new OPT ());
+    std::unique_ptr<OPT> opt (new OPT ());
 
     tl::XMLObjTag<OPT> tag;
     *opt = *reader.back (tag);
diff --git a/src/db/db/dbTechnology.cc b/src/db/db/dbTechnology.cc
index 74d83e8d8..8ad9a3a86 100644
--- a/src/db/db/dbTechnology.cc
+++ b/src/db/db/dbTechnology.cc
@@ -67,7 +67,7 @@ Technologies::operator= (const Technologies &other)
   return *this;
 }
 
-static std::auto_ptr<db::Technologies> sp_technologies;
+static std::unique_ptr<db::Technologies> sp_technologies;
 
 db::Technologies *
 Technologies::instance ()
@@ -128,7 +128,7 @@ Technologies::add_tech (Technology *tech, bool replace_same)
     return;
   }
 
-  std::auto_ptr<Technology> tech_ptr (tech);
+  std::unique_ptr<Technology> tech_ptr (tech);
 
   Technology *t = 0;
   for (tl::stable_vector<Technology>::iterator i = m_technologies.begin (); !t && i != m_technologies.end (); ++i) {
diff --git a/src/db/db/gsiDeclDbBox.cc b/src/db/db/gsiDeclDbBox.cc
index 8918004cf..e6c8c8a0a 100644
--- a/src/db/db/gsiDeclDbBox.cc
+++ b/src/db/db/gsiDeclDbBox.cc
@@ -44,7 +44,7 @@ struct box_defs
   static C *from_string (const char *s)
   {
     tl::Extractor ex (s);
-    std::auto_ptr<C> c (new C ());
+    std::unique_ptr<C> c (new C ());
     ex.read (*c.get ());
     return c.release ();
   }
diff --git a/src/db/db/gsiDeclDbEdge.cc b/src/db/db/gsiDeclDbEdge.cc
index 57c55a936..df95fb0b9 100644
--- a/src/db/db/gsiDeclDbEdge.cc
+++ b/src/db/db/gsiDeclDbEdge.cc
@@ -47,7 +47,7 @@ struct edge_defs
   static C *from_string (const char *s)
   {
     tl::Extractor ex (s);
-    std::auto_ptr<C> c (new C ());
+    std::unique_ptr<C> c (new C ());
     ex.read (*c.get ());
     return c.release ();
   }
diff --git a/src/db/db/gsiDeclDbEdgePair.cc b/src/db/db/gsiDeclDbEdgePair.cc
index 4f72cfe4c..fdcc00c66 100644
--- a/src/db/db/gsiDeclDbEdgePair.cc
+++ b/src/db/db/gsiDeclDbEdgePair.cc
@@ -44,7 +44,7 @@ struct edge_pair_defs
   static C *from_string (const char *s)
   {
     tl::Extractor ex (s);
-    std::auto_ptr<C> c (new C ());
+    std::unique_ptr<C> c (new C ());
     ex.read (*c.get ());
     return c.release ();
   }
diff --git a/src/db/db/gsiDeclDbPath.cc b/src/db/db/gsiDeclDbPath.cc
index ec8de60c9..5062999f4 100644
--- a/src/db/db/gsiDeclDbPath.cc
+++ b/src/db/db/gsiDeclDbPath.cc
@@ -53,7 +53,7 @@ struct path_defs
   static C *from_string (const char *s)
   {
     tl::Extractor ex (s);
-    std::auto_ptr<C> c (new C ());
+    std::unique_ptr<C> c (new C ());
     ex.read (*c.get ());
     return c.release ();
   }
diff --git a/src/db/db/gsiDeclDbPoint.cc b/src/db/db/gsiDeclDbPoint.cc
index cf9db1a14..48aff21a4 100644
--- a/src/db/db/gsiDeclDbPoint.cc
+++ b/src/db/db/gsiDeclDbPoint.cc
@@ -40,7 +40,7 @@ struct point_defs
   static C *from_string (const char *s)
   {
     tl::Extractor ex (s);
-    std::auto_ptr<C> c (new C ());
+    std::unique_ptr<C> c (new C ());
     ex.read (*c.get ());
     return c.release ();
   }
diff --git a/src/db/db/gsiDeclDbPolygon.cc b/src/db/db/gsiDeclDbPolygon.cc
index 1f6fa40d3..d0f07fcda 100644
--- a/src/db/db/gsiDeclDbPolygon.cc
+++ b/src/db/db/gsiDeclDbPolygon.cc
@@ -88,7 +88,7 @@ struct simple_polygon_defs
   static C *from_string (const char *s)
   {
     tl::Extractor ex (s);
-    std::auto_ptr<C> c (new C ());
+    std::unique_ptr<C> c (new C ());
     ex.read (*c.get ());
     return c.release ();
   }
@@ -932,7 +932,7 @@ struct polygon_defs
   static C *from_string (const char *s)
   {
     tl::Extractor ex (s);
-    std::auto_ptr<C> c (new C ());
+    std::unique_ptr<C> c (new C ());
     ex.read (*c.get ());
     return c.release ();
   }
diff --git a/src/db/db/gsiDeclDbRegion.cc b/src/db/db/gsiDeclDbRegion.cc
index 55b539d4f..a52ca5717 100644
--- a/src/db/db/gsiDeclDbRegion.cc
+++ b/src/db/db/gsiDeclDbRegion.cc
@@ -612,7 +612,7 @@ static std::vector<db::Region> andnot (const db::Region *r, const db::Region &ot
 template <class Container>
 static Container *decompose_convex (const db::Region *r, int mode)
 {
-  std::auto_ptr<Container> shapes (new Container ());
+  std::unique_ptr<Container> shapes (new Container ());
   db::SimplePolygonContainer sp;
   for (db::Region::const_iterator p = r->begin_merged (); ! p.at_end(); ++p) {
     sp.polygons ().clear ();
@@ -627,7 +627,7 @@ static Container *decompose_convex (const db::Region *r, int mode)
 template <class Container>
 static Container *decompose_trapezoids (const db::Region *r, int mode)
 {
-  std::auto_ptr<Container> shapes (new Container ());
+  std::unique_ptr<Container> shapes (new Container ());
   db::SimplePolygonContainer sp;
   for (db::Region::const_iterator p = r->begin_merged (); ! p.at_end(); ++p) {
     sp.polygons ().clear ();
diff --git a/src/db/db/gsiDeclDbText.cc b/src/db/db/gsiDeclDbText.cc
index 7d0d4f67f..3f241b2fa 100644
--- a/src/db/db/gsiDeclDbText.cc
+++ b/src/db/db/gsiDeclDbText.cc
@@ -44,7 +44,7 @@ struct text_defs
   static C *from_string (const char *s)
   {
     tl::Extractor ex (s);
-    std::auto_ptr<C> c (new C ());
+    std::unique_ptr<C> c (new C ());
     ex.read (*c.get ());
     return c.release ();
   }
diff --git a/src/db/db/gsiDeclDbTrans.cc b/src/db/db/gsiDeclDbTrans.cc
index 12c85e240..e0744b099 100644
--- a/src/db/db/gsiDeclDbTrans.cc
+++ b/src/db/db/gsiDeclDbTrans.cc
@@ -56,7 +56,7 @@ struct trans_defs
   static C *from_string (const char *s)
   {
     tl::Extractor ex (s);
-    std::auto_ptr<C> c (new C ());
+    std::unique_ptr<C> c (new C ());
     ex.read (*c.get ());
     return c.release ();
   }
@@ -549,7 +549,7 @@ struct cplx_trans_defs
   static C *from_string (const char *s)
   {
     tl::Extractor ex (s);
-    std::auto_ptr<C> c (new C ());
+    std::unique_ptr<C> c (new C ());
     ex.read (*c.get ());
     return c.release ();
   }
diff --git a/src/db/db/gsiDeclDbVector.cc b/src/db/db/gsiDeclDbVector.cc
index 03dbf8c21..9ad16cd02 100644
--- a/src/db/db/gsiDeclDbVector.cc
+++ b/src/db/db/gsiDeclDbVector.cc
@@ -40,7 +40,7 @@ struct vector_defs
   static C *from_string (const char *s)
   {
     tl::Extractor ex (s);
-    std::auto_ptr<C> c (new C ());
+    std::unique_ptr<C> c (new C ());
     ex.read (*c.get ());
     return c.release ();
   }
diff --git a/src/db/unit_tests/dbCellMappingTests.cc b/src/db/unit_tests/dbCellMappingTests.cc
index 6db101c97..c7d7c216d 100644
--- a/src/db/unit_tests/dbCellMappingTests.cc
+++ b/src/db/unit_tests/dbCellMappingTests.cc
@@ -430,7 +430,7 @@ TEST(5)
 //  Resolution of array references
 TEST(6)
 {
-  std::auto_ptr<db::Layout> g (new db::Layout ());
+  std::unique_ptr<db::Layout> g (new db::Layout ());
   db::Cell &a0 (g->cell (g->add_cell ("a0")));
   db::Cell *a4p, *a5p;
   a4p = &(g->cell (g->add_cell ("a4")));
@@ -456,7 +456,7 @@ TEST(6)
 //  Multi-mapping
 TEST(7)
 {
-  std::auto_ptr<db::Layout> g (new db::Layout ());
+  std::unique_ptr<db::Layout> g (new db::Layout ());
   db::Cell &a0 (g->cell (g->add_cell ("a0")));
   db::Cell &a1 (g->cell (g->add_cell ("a1")));
   db::Cell &a2 (g->cell (g->add_cell ("a2")));
diff --git a/src/db/unit_tests/dbHierarchyBuilderTests.cc b/src/db/unit_tests/dbHierarchyBuilderTests.cc
index d286d425a..d000c0cb3 100644
--- a/src/db/unit_tests/dbHierarchyBuilderTests.cc
+++ b/src/db/unit_tests/dbHierarchyBuilderTests.cc
@@ -588,7 +588,7 @@ TEST(7_DetachFromOriginalLayout)
   //  using OASIS means we create a lot of references to array
   //  and shape repo - we check here whether these references get
   //  translated or resolved in the hierarchy builder.
-  std::auto_ptr<db::Layout> ly (new db::Layout (false));
+  std::unique_ptr<db::Layout> ly (new db::Layout (false));
   {
     std::string fn (tl::testsrc ());
     fn += "/testdata/algo/hierarchy_builder_l5.oas.gz";
diff --git a/src/db/unit_tests/dbLayoutToNetlistTests.cc b/src/db/unit_tests/dbLayoutToNetlistTests.cc
index efa17da7e..4718c6a2b 100644
--- a/src/db/unit_tests/dbLayoutToNetlistTests.cc
+++ b/src/db/unit_tests/dbLayoutToNetlistTests.cc
@@ -55,7 +55,7 @@ static void dump_nets_to_layout (const db::LayoutToNetlist &l2n, db::Layout &ly,
 
       for (std::map<const db::Region *, unsigned int>::const_iterator m = lmap.begin (); m != lmap.end (); ++m) {
 
-        std::auto_ptr<db::Region> shapes (l2n.shapes_of_net (*n, *m->first, false));
+        std::unique_ptr<db::Region> shapes (l2n.shapes_of_net (*n, *m->first, false));
         if (shapes->empty ()) {
           continue;
         }
@@ -126,7 +126,7 @@ TEST(0_Basic)
 {
   db::LayoutToNetlist l2n;
 
-  std::auto_ptr<db::Region> reg (l2n.make_layer ("l1"));
+  std::unique_ptr<db::Region> reg (l2n.make_layer ("l1"));
   EXPECT_EQ (l2n.is_persisted (*reg), true);
   EXPECT_EQ (l2n.name (*reg), "l1");
   EXPECT_EQ (l2n.layer_of (*reg), 0u);
@@ -138,7 +138,7 @@ TEST(0_Basic)
   EXPECT_EQ (l2n.layer_by_index (1) == 0, true);
   EXPECT_EQ (l2n.layer_by_name ("l2") == 0, true);
 
-  std::auto_ptr<db::Region> reg_copy (l2n.layer_by_name ("l1"));
+  std::unique_ptr<db::Region> reg_copy (l2n.layer_by_name ("l1"));
   EXPECT_EQ (reg_copy.get () != 0, true);
   EXPECT_EQ (l2n.name (*reg_copy), "l1");
   EXPECT_EQ (l2n.layer_of (*reg_copy), 0u);
@@ -148,7 +148,7 @@ TEST(0_Basic)
   EXPECT_EQ (l2n.layer_of (*reg_copy), 0u);
   reg_copy.reset (0);
 
-  std::auto_ptr<db::Region> reg2 (l2n.make_layer ());
+  std::unique_ptr<db::Region> reg2 (l2n.make_layer ());
   EXPECT_EQ (l2n.name (1u), "");
   EXPECT_EQ (l2n.name (*reg2), "");
   EXPECT_EQ (l2n.layer_of (*reg2), 1u);
@@ -156,7 +156,7 @@ TEST(0_Basic)
   reg2.reset (0);
   EXPECT_EQ (l2n.internal_layout ()->is_valid_layer (1), false);
 
-  std::auto_ptr<db::Region> reg3 (l2n.make_layer ("l3"));
+  std::unique_ptr<db::Region> reg3 (l2n.make_layer ("l3"));
   EXPECT_EQ (l2n.name (*reg3), "l3");
   EXPECT_EQ (l2n.layer_of (*reg3), 1u);
 
@@ -202,17 +202,17 @@ TEST(1_BasicExtraction)
   db::Cell &tc = ly.cell (*ly.begin_top_down ());
   db::LayoutToNetlist l2n (db::RecursiveShapeIterator (ly, tc, std::set<unsigned int> ()));
 
-  std::auto_ptr<db::Region> rnwell (l2n.make_layer (nwell, "nwell"));
-  std::auto_ptr<db::Region> ractive (l2n.make_layer (active, "active"));
-  std::auto_ptr<db::Region> rpoly (l2n.make_polygon_layer (poly, "poly"));
-  std::auto_ptr<db::Texts> rpoly_lbl (l2n.make_text_layer (poly_lbl, "poly_lbl"));
-  std::auto_ptr<db::Region> rdiff_cont (l2n.make_polygon_layer (diff_cont, "diff_cont"));
-  std::auto_ptr<db::Region> rpoly_cont (l2n.make_polygon_layer (poly_cont, "poly_cont"));
-  std::auto_ptr<db::Region> rmetal1 (l2n.make_polygon_layer (metal1, "metal1"));
-  std::auto_ptr<db::Texts> rmetal1_lbl (l2n.make_text_layer (metal1_lbl, "metal1_lbl"));
-  std::auto_ptr<db::Region> rvia1 (l2n.make_polygon_layer (via1, "via1"));
-  std::auto_ptr<db::Region> rmetal2 (l2n.make_polygon_layer (metal2, "metal2"));
-  std::auto_ptr<db::Texts> rmetal2_lbl (l2n.make_text_layer (metal2_lbl, "metal2_lbl"));
+  std::unique_ptr<db::Region> rnwell (l2n.make_layer (nwell, "nwell"));
+  std::unique_ptr<db::Region> ractive (l2n.make_layer (active, "active"));
+  std::unique_ptr<db::Region> rpoly (l2n.make_polygon_layer (poly, "poly"));
+  std::unique_ptr<db::Texts> rpoly_lbl (l2n.make_text_layer (poly_lbl, "poly_lbl"));
+  std::unique_ptr<db::Region> rdiff_cont (l2n.make_polygon_layer (diff_cont, "diff_cont"));
+  std::unique_ptr<db::Region> rpoly_cont (l2n.make_polygon_layer (poly_cont, "poly_cont"));
+  std::unique_ptr<db::Region> rmetal1 (l2n.make_polygon_layer (metal1, "metal1"));
+  std::unique_ptr<db::Texts> rmetal1_lbl (l2n.make_text_layer (metal1_lbl, "metal1_lbl"));
+  std::unique_ptr<db::Region> rvia1 (l2n.make_polygon_layer (via1, "via1"));
+  std::unique_ptr<db::Region> rmetal2 (l2n.make_polygon_layer (metal2, "metal2"));
+  std::unique_ptr<db::Texts> rmetal2_lbl (l2n.make_text_layer (metal2_lbl, "metal2_lbl"));
 
   //  derived regions
 
@@ -690,17 +690,17 @@ TEST(2_Probing)
   db::Cell &tc = ly.cell (*ly.begin_top_down ());
   db::LayoutToNetlist l2n (db::RecursiveShapeIterator (ly, tc, std::set<unsigned int> ()));
 
-  std::auto_ptr<db::Region> rnwell (l2n.make_layer (nwell, "nwell"));
-  std::auto_ptr<db::Region> ractive (l2n.make_layer (active, "active"));
-  std::auto_ptr<db::Region> rpoly (l2n.make_polygon_layer (poly, "poly"));
-  std::auto_ptr<db::Texts> rpoly_lbl (l2n.make_text_layer (poly_lbl, "poly_lbl"));
-  std::auto_ptr<db::Region> rdiff_cont (l2n.make_polygon_layer (diff_cont, "diff_cont"));
-  std::auto_ptr<db::Region> rpoly_cont (l2n.make_polygon_layer (poly_cont, "poly_cont"));
-  std::auto_ptr<db::Region> rmetal1 (l2n.make_polygon_layer (metal1, "metal1"));
-  std::auto_ptr<db::Texts> rmetal1_lbl (l2n.make_text_layer (metal1_lbl, "metal1_lbl"));
-  std::auto_ptr<db::Region> rvia1 (l2n.make_polygon_layer (via1, "via1"));
-  std::auto_ptr<db::Region> rmetal2 (l2n.make_polygon_layer (metal2, "metal2"));
-  std::auto_ptr<db::Texts> rmetal2_lbl (l2n.make_text_layer (metal2_lbl, "metal2_lbl"));
+  std::unique_ptr<db::Region> rnwell (l2n.make_layer (nwell, "nwell"));
+  std::unique_ptr<db::Region> ractive (l2n.make_layer (active, "active"));
+  std::unique_ptr<db::Region> rpoly (l2n.make_polygon_layer (poly, "poly"));
+  std::unique_ptr<db::Texts> rpoly_lbl (l2n.make_text_layer (poly_lbl, "poly_lbl"));
+  std::unique_ptr<db::Region> rdiff_cont (l2n.make_polygon_layer (diff_cont, "diff_cont"));
+  std::unique_ptr<db::Region> rpoly_cont (l2n.make_polygon_layer (poly_cont, "poly_cont"));
+  std::unique_ptr<db::Region> rmetal1 (l2n.make_polygon_layer (metal1, "metal1"));
+  std::unique_ptr<db::Texts> rmetal1_lbl (l2n.make_text_layer (metal1_lbl, "metal1_lbl"));
+  std::unique_ptr<db::Region> rvia1 (l2n.make_polygon_layer (via1, "via1"));
+  std::unique_ptr<db::Region> rmetal2 (l2n.make_polygon_layer (metal2, "metal2"));
+  std::unique_ptr<db::Texts> rmetal2_lbl (l2n.make_text_layer (metal2_lbl, "metal2_lbl"));
 
   //  derived regions
 
@@ -942,19 +942,19 @@ TEST(3_GlobalNetConnections)
   db::Cell &tc = ly.cell (*ly.begin_top_down ());
   db::LayoutToNetlist l2n (db::RecursiveShapeIterator (ly, tc, std::set<unsigned int> ()));
 
-  std::auto_ptr<db::Region> rnwell (l2n.make_layer (nwell, "nwell"));
-  std::auto_ptr<db::Region> ractive (l2n.make_layer (active, "active"));
-  std::auto_ptr<db::Region> rpplus (l2n.make_layer (pplus, "pplus"));
-  std::auto_ptr<db::Region> rnplus (l2n.make_layer (nplus, "nplus"));
-  std::auto_ptr<db::Region> rpoly (l2n.make_polygon_layer (poly, "poly"));
-  std::auto_ptr<db::Texts> rpoly_lbl (l2n.make_text_layer (poly_lbl, "poly_lbl"));
-  std::auto_ptr<db::Region> rdiff_cont (l2n.make_polygon_layer (diff_cont, "diff_cont"));
-  std::auto_ptr<db::Region> rpoly_cont (l2n.make_polygon_layer (poly_cont, "poly_cont"));
-  std::auto_ptr<db::Region> rmetal1 (l2n.make_polygon_layer (metal1, "metal1"));
-  std::auto_ptr<db::Texts> rmetal1_lbl (l2n.make_text_layer (metal1_lbl, "metal1_lbl"));
-  std::auto_ptr<db::Region> rvia1 (l2n.make_polygon_layer (via1, "via1"));
-  std::auto_ptr<db::Region> rmetal2 (l2n.make_polygon_layer (metal2, "metal2"));
-  std::auto_ptr<db::Texts> rmetal2_lbl (l2n.make_text_layer (metal2_lbl, "metal2_lbl"));
+  std::unique_ptr<db::Region> rnwell (l2n.make_layer (nwell, "nwell"));
+  std::unique_ptr<db::Region> ractive (l2n.make_layer (active, "active"));
+  std::unique_ptr<db::Region> rpplus (l2n.make_layer (pplus, "pplus"));
+  std::unique_ptr<db::Region> rnplus (l2n.make_layer (nplus, "nplus"));
+  std::unique_ptr<db::Region> rpoly (l2n.make_polygon_layer (poly, "poly"));
+  std::unique_ptr<db::Texts> rpoly_lbl (l2n.make_text_layer (poly_lbl, "poly_lbl"));
+  std::unique_ptr<db::Region> rdiff_cont (l2n.make_polygon_layer (diff_cont, "diff_cont"));
+  std::unique_ptr<db::Region> rpoly_cont (l2n.make_polygon_layer (poly_cont, "poly_cont"));
+  std::unique_ptr<db::Region> rmetal1 (l2n.make_polygon_layer (metal1, "metal1"));
+  std::unique_ptr<db::Texts> rmetal1_lbl (l2n.make_text_layer (metal1_lbl, "metal1_lbl"));
+  std::unique_ptr<db::Region> rvia1 (l2n.make_polygon_layer (via1, "via1"));
+  std::unique_ptr<db::Region> rmetal2 (l2n.make_polygon_layer (metal2, "metal2"));
+  std::unique_ptr<db::Texts> rmetal2_lbl (l2n.make_text_layer (metal2_lbl, "metal2_lbl"));
 
   //  derived regions
 
@@ -1222,20 +1222,20 @@ TEST(4_GlobalNetDeviceExtraction)
   db::Cell &tc = ly.cell (*ly.begin_top_down ());
   db::LayoutToNetlist l2n (db::RecursiveShapeIterator (ly, tc, std::set<unsigned int> ()));
 
-  std::auto_ptr<db::Region> rbulk (l2n.make_layer (ly.insert_layer (), "bulk"));
-  std::auto_ptr<db::Region> rnwell (l2n.make_layer (nwell, "nwell"));
-  std::auto_ptr<db::Region> ractive (l2n.make_layer (active, "active"));
-  std::auto_ptr<db::Region> rpplus (l2n.make_layer (pplus, "pplus"));
-  std::auto_ptr<db::Region> rnplus (l2n.make_layer (nplus, "nplus"));
-  std::auto_ptr<db::Region> rpoly (l2n.make_polygon_layer (poly, "poly"));
-  std::auto_ptr<db::Texts> rpoly_lbl (l2n.make_text_layer (poly_lbl, "poly_lbl"));
-  std::auto_ptr<db::Region> rdiff_cont (l2n.make_polygon_layer (diff_cont, "diff_cont"));
-  std::auto_ptr<db::Region> rpoly_cont (l2n.make_polygon_layer (poly_cont, "poly_cont"));
-  std::auto_ptr<db::Region> rmetal1 (l2n.make_polygon_layer (metal1, "metal1"));
-  std::auto_ptr<db::Texts> rmetal1_lbl (l2n.make_text_layer (metal1_lbl, "metal1_lbl"));
-  std::auto_ptr<db::Region> rvia1 (l2n.make_polygon_layer (via1, "via1"));
-  std::auto_ptr<db::Region> rmetal2 (l2n.make_polygon_layer (metal2, "metal2"));
-  std::auto_ptr<db::Texts> rmetal2_lbl (l2n.make_text_layer (metal2_lbl, "metal2_lbl"));
+  std::unique_ptr<db::Region> rbulk (l2n.make_layer (ly.insert_layer (), "bulk"));
+  std::unique_ptr<db::Region> rnwell (l2n.make_layer (nwell, "nwell"));
+  std::unique_ptr<db::Region> ractive (l2n.make_layer (active, "active"));
+  std::unique_ptr<db::Region> rpplus (l2n.make_layer (pplus, "pplus"));
+  std::unique_ptr<db::Region> rnplus (l2n.make_layer (nplus, "nplus"));
+  std::unique_ptr<db::Region> rpoly (l2n.make_polygon_layer (poly, "poly"));
+  std::unique_ptr<db::Texts> rpoly_lbl (l2n.make_text_layer (poly_lbl, "poly_lbl"));
+  std::unique_ptr<db::Region> rdiff_cont (l2n.make_polygon_layer (diff_cont, "diff_cont"));
+  std::unique_ptr<db::Region> rpoly_cont (l2n.make_polygon_layer (poly_cont, "poly_cont"));
+  std::unique_ptr<db::Region> rmetal1 (l2n.make_polygon_layer (metal1, "metal1"));
+  std::unique_ptr<db::Texts> rmetal1_lbl (l2n.make_text_layer (metal1_lbl, "metal1_lbl"));
+  std::unique_ptr<db::Region> rvia1 (l2n.make_polygon_layer (via1, "via1"));
+  std::unique_ptr<db::Region> rmetal2 (l2n.make_polygon_layer (metal2, "metal2"));
+  std::unique_ptr<db::Texts> rmetal2_lbl (l2n.make_text_layer (metal2_lbl, "metal2_lbl"));
 
   //  derived regions
 
@@ -1508,20 +1508,20 @@ TEST(5_DeviceExtractionWithDeviceCombination)
   db::Cell &tc = ly.cell (*ly.begin_top_down ());
   db::LayoutToNetlist l2n (db::RecursiveShapeIterator (ly, tc, std::set<unsigned int> ()));
 
-  std::auto_ptr<db::Region> rbulk (l2n.make_layer ("bulk"));
-  std::auto_ptr<db::Region> rnwell (l2n.make_layer (nwell, "nwell"));
-  std::auto_ptr<db::Region> ractive (l2n.make_layer (active, "active"));
-  std::auto_ptr<db::Region> rpplus (l2n.make_layer (pplus, "pplus"));
-  std::auto_ptr<db::Region> rnplus (l2n.make_layer (nplus, "nplus"));
-  std::auto_ptr<db::Region> rpoly (l2n.make_polygon_layer (poly, "poly"));
-  std::auto_ptr<db::Texts> rpoly_lbl (l2n.make_text_layer (poly_lbl, "poly_lbl"));
-  std::auto_ptr<db::Region> rdiff_cont (l2n.make_polygon_layer (diff_cont, "diff_cont"));
-  std::auto_ptr<db::Region> rpoly_cont (l2n.make_polygon_layer (poly_cont, "poly_cont"));
-  std::auto_ptr<db::Region> rmetal1 (l2n.make_polygon_layer (metal1, "metal1"));
-  std::auto_ptr<db::Texts> rmetal1_lbl (l2n.make_text_layer (metal1_lbl, "metal1_lbl"));
-  std::auto_ptr<db::Region> rvia1 (l2n.make_polygon_layer (via1, "via1"));
-  std::auto_ptr<db::Region> rmetal2 (l2n.make_polygon_layer (metal2, "metal2"));
-  std::auto_ptr<db::Texts> rmetal2_lbl (l2n.make_text_layer (metal2_lbl, "metal2_lbl"));
+  std::unique_ptr<db::Region> rbulk (l2n.make_layer ("bulk"));
+  std::unique_ptr<db::Region> rnwell (l2n.make_layer (nwell, "nwell"));
+  std::unique_ptr<db::Region> ractive (l2n.make_layer (active, "active"));
+  std::unique_ptr<db::Region> rpplus (l2n.make_layer (pplus, "pplus"));
+  std::unique_ptr<db::Region> rnplus (l2n.make_layer (nplus, "nplus"));
+  std::unique_ptr<db::Region> rpoly (l2n.make_polygon_layer (poly, "poly"));
+  std::unique_ptr<db::Texts> rpoly_lbl (l2n.make_text_layer (poly_lbl, "poly_lbl"));
+  std::unique_ptr<db::Region> rdiff_cont (l2n.make_polygon_layer (diff_cont, "diff_cont"));
+  std::unique_ptr<db::Region> rpoly_cont (l2n.make_polygon_layer (poly_cont, "poly_cont"));
+  std::unique_ptr<db::Region> rmetal1 (l2n.make_polygon_layer (metal1, "metal1"));
+  std::unique_ptr<db::Texts> rmetal1_lbl (l2n.make_text_layer (metal1_lbl, "metal1_lbl"));
+  std::unique_ptr<db::Region> rvia1 (l2n.make_polygon_layer (via1, "via1"));
+  std::unique_ptr<db::Region> rmetal2 (l2n.make_polygon_layer (metal2, "metal2"));
+  std::unique_ptr<db::Texts> rmetal2_lbl (l2n.make_text_layer (metal2_lbl, "metal2_lbl"));
 
   //  derived regions
 
@@ -1786,20 +1786,20 @@ TEST(6_MoreDeviceTypes)
   db::Cell &tc = ly.cell (*ly.begin_top_down ());
   db::LayoutToNetlist l2n (db::RecursiveShapeIterator (ly, tc, std::set<unsigned int> ()));
 
-  std::auto_ptr<db::Region> rbulk (l2n.make_layer ("bulk"));
-  std::auto_ptr<db::Region> rnwell (l2n.make_layer (nwell, "nwell"));
-  std::auto_ptr<db::Region> rthickgox (l2n.make_layer (thickgox, "thickgox"));
-  std::auto_ptr<db::Region> ractive (l2n.make_layer (active, "active"));
-  std::auto_ptr<db::Region> rpplus (l2n.make_layer (pplus, "pplus"));
-  std::auto_ptr<db::Region> rnplus (l2n.make_layer (nplus, "nplus"));
-  std::auto_ptr<db::Region> rpoly (l2n.make_polygon_layer (poly, "poly"));
-  std::auto_ptr<db::Texts> rpoly_lbl (l2n.make_text_layer (poly_lbl, "poly_lbl"));
-  std::auto_ptr<db::Region> rcont (l2n.make_polygon_layer (cont, "cont"));
-  std::auto_ptr<db::Region> rmetal1 (l2n.make_polygon_layer (metal1, "metal1"));
-  std::auto_ptr<db::Texts> rmetal1_lbl (l2n.make_text_layer (metal1_lbl, "metal1_lbl"));
-  std::auto_ptr<db::Region> rvia1 (l2n.make_polygon_layer (via1, "via1"));
-  std::auto_ptr<db::Region> rmetal2 (l2n.make_polygon_layer (metal2, "metal2"));
-  std::auto_ptr<db::Texts> rmetal2_lbl (l2n.make_text_layer (metal2_lbl, "metal2_lbl"));
+  std::unique_ptr<db::Region> rbulk (l2n.make_layer ("bulk"));
+  std::unique_ptr<db::Region> rnwell (l2n.make_layer (nwell, "nwell"));
+  std::unique_ptr<db::Region> rthickgox (l2n.make_layer (thickgox, "thickgox"));
+  std::unique_ptr<db::Region> ractive (l2n.make_layer (active, "active"));
+  std::unique_ptr<db::Region> rpplus (l2n.make_layer (pplus, "pplus"));
+  std::unique_ptr<db::Region> rnplus (l2n.make_layer (nplus, "nplus"));
+  std::unique_ptr<db::Region> rpoly (l2n.make_polygon_layer (poly, "poly"));
+  std::unique_ptr<db::Texts> rpoly_lbl (l2n.make_text_layer (poly_lbl, "poly_lbl"));
+  std::unique_ptr<db::Region> rcont (l2n.make_polygon_layer (cont, "cont"));
+  std::unique_ptr<db::Region> rmetal1 (l2n.make_polygon_layer (metal1, "metal1"));
+  std::unique_ptr<db::Texts> rmetal1_lbl (l2n.make_text_layer (metal1_lbl, "metal1_lbl"));
+  std::unique_ptr<db::Region> rvia1 (l2n.make_polygon_layer (via1, "via1"));
+  std::unique_ptr<db::Region> rmetal2 (l2n.make_polygon_layer (metal2, "metal2"));
+  std::unique_ptr<db::Texts> rmetal2_lbl (l2n.make_text_layer (metal2_lbl, "metal2_lbl"));
 
   //  derived regions
 
@@ -1943,20 +1943,20 @@ TEST(7_MoreByEmptyDeviceTypes)
   db::Cell &tc = ly.cell (*ly.begin_top_down ());
   db::LayoutToNetlist l2n (db::RecursiveShapeIterator (ly, tc, std::set<unsigned int> ()));
 
-  std::auto_ptr<db::Region> rbulk (l2n.make_layer ("bulk"));
-  std::auto_ptr<db::Region> rnwell (l2n.make_layer (nwell, "nwell"));
-  std::auto_ptr<db::Region> rthickgox (l2n.make_layer (thickgox, "thickgox"));
-  std::auto_ptr<db::Region> ractive (l2n.make_layer (active, "active"));
-  std::auto_ptr<db::Region> rpplus (l2n.make_layer (pplus, "pplus"));
-  std::auto_ptr<db::Region> rnplus (l2n.make_layer (nplus, "nplus"));
-  std::auto_ptr<db::Region> rpoly (l2n.make_polygon_layer (poly, "poly"));
-  std::auto_ptr<db::Texts> rpoly_lbl (l2n.make_text_layer (poly_lbl, "poly_lbl"));
-  std::auto_ptr<db::Region> rcont (l2n.make_polygon_layer (cont, "cont"));
-  std::auto_ptr<db::Region> rmetal1 (l2n.make_polygon_layer (metal1, "metal1"));
-  std::auto_ptr<db::Texts> rmetal1_lbl (l2n.make_text_layer (metal1_lbl, "metal1_lbl"));
-  std::auto_ptr<db::Region> rvia1 (l2n.make_polygon_layer (via1, "via1"));
-  std::auto_ptr<db::Region> rmetal2 (l2n.make_polygon_layer (metal2, "metal2"));
-  std::auto_ptr<db::Texts> rmetal2_lbl (l2n.make_text_layer (metal2_lbl, "metal2_lbl"));
+  std::unique_ptr<db::Region> rbulk (l2n.make_layer ("bulk"));
+  std::unique_ptr<db::Region> rnwell (l2n.make_layer (nwell, "nwell"));
+  std::unique_ptr<db::Region> rthickgox (l2n.make_layer (thickgox, "thickgox"));
+  std::unique_ptr<db::Region> ractive (l2n.make_layer (active, "active"));
+  std::unique_ptr<db::Region> rpplus (l2n.make_layer (pplus, "pplus"));
+  std::unique_ptr<db::Region> rnplus (l2n.make_layer (nplus, "nplus"));
+  std::unique_ptr<db::Region> rpoly (l2n.make_polygon_layer (poly, "poly"));
+  std::unique_ptr<db::Texts> rpoly_lbl (l2n.make_text_layer (poly_lbl, "poly_lbl"));
+  std::unique_ptr<db::Region> rcont (l2n.make_polygon_layer (cont, "cont"));
+  std::unique_ptr<db::Region> rmetal1 (l2n.make_polygon_layer (metal1, "metal1"));
+  std::unique_ptr<db::Texts> rmetal1_lbl (l2n.make_text_layer (metal1_lbl, "metal1_lbl"));
+  std::unique_ptr<db::Region> rvia1 (l2n.make_polygon_layer (via1, "via1"));
+  std::unique_ptr<db::Region> rmetal2 (l2n.make_polygon_layer (metal2, "metal2"));
+  std::unique_ptr<db::Texts> rmetal2_lbl (l2n.make_text_layer (metal2_lbl, "metal2_lbl"));
 
   //  derived regions
 
@@ -2101,20 +2101,20 @@ TEST(8_FlatExtraction)
 
   db::LayoutToNetlist l2n (ly.cell_name (tc.cell_index ()), ly.dbu ());
 
-  std::auto_ptr<db::Region> rbulk (new db::Region ());
-  std::auto_ptr<db::Region> rnwell (new db::Region (db::RecursiveShapeIterator (ly, tc, nwell)));
-  std::auto_ptr<db::Region> rthickgox (new db::Region (db::RecursiveShapeIterator (ly, tc, thickgox)));
-  std::auto_ptr<db::Region> ractive (new db::Region (db::RecursiveShapeIterator (ly, tc, active)));
-  std::auto_ptr<db::Region> rpplus (new db::Region (db::RecursiveShapeIterator (ly, tc, pplus)));
-  std::auto_ptr<db::Region> rnplus (new db::Region (db::RecursiveShapeIterator (ly, tc, nplus)));
-  std::auto_ptr<db::Region> rpoly (new db::Region (db::RecursiveShapeIterator (ly, tc, poly)));
-  std::auto_ptr<db::Region> rpoly_lbl (new db::Region (db::RecursiveShapeIterator (ly, tc, poly_lbl)));
-  std::auto_ptr<db::Region> rcont (new db::Region (db::RecursiveShapeIterator (ly, tc, cont)));
-  std::auto_ptr<db::Region> rmetal1 (new db::Region (db::RecursiveShapeIterator (ly, tc, metal1)));
-  std::auto_ptr<db::Region> rmetal1_lbl (new db::Region (db::RecursiveShapeIterator (ly, tc, metal1_lbl)));
-  std::auto_ptr<db::Region> rvia1 (new db::Region (db::RecursiveShapeIterator (ly, tc, via1)));
-  std::auto_ptr<db::Region> rmetal2 (new db::Region (db::RecursiveShapeIterator (ly, tc, metal2)));
-  std::auto_ptr<db::Region> rmetal2_lbl (new db::Region (db::RecursiveShapeIterator (ly, tc, metal2_lbl)));
+  std::unique_ptr<db::Region> rbulk (new db::Region ());
+  std::unique_ptr<db::Region> rnwell (new db::Region (db::RecursiveShapeIterator (ly, tc, nwell)));
+  std::unique_ptr<db::Region> rthickgox (new db::Region (db::RecursiveShapeIterator (ly, tc, thickgox)));
+  std::unique_ptr<db::Region> ractive (new db::Region (db::RecursiveShapeIterator (ly, tc, active)));
+  std::unique_ptr<db::Region> rpplus (new db::Region (db::RecursiveShapeIterator (ly, tc, pplus)));
+  std::unique_ptr<db::Region> rnplus (new db::Region (db::RecursiveShapeIterator (ly, tc, nplus)));
+  std::unique_ptr<db::Region> rpoly (new db::Region (db::RecursiveShapeIterator (ly, tc, poly)));
+  std::unique_ptr<db::Region> rpoly_lbl (new db::Region (db::RecursiveShapeIterator (ly, tc, poly_lbl)));
+  std::unique_ptr<db::Region> rcont (new db::Region (db::RecursiveShapeIterator (ly, tc, cont)));
+  std::unique_ptr<db::Region> rmetal1 (new db::Region (db::RecursiveShapeIterator (ly, tc, metal1)));
+  std::unique_ptr<db::Region> rmetal1_lbl (new db::Region (db::RecursiveShapeIterator (ly, tc, metal1_lbl)));
+  std::unique_ptr<db::Region> rvia1 (new db::Region (db::RecursiveShapeIterator (ly, tc, via1)));
+  std::unique_ptr<db::Region> rmetal2 (new db::Region (db::RecursiveShapeIterator (ly, tc, metal2)));
+  std::unique_ptr<db::Region> rmetal2_lbl (new db::Region (db::RecursiveShapeIterator (ly, tc, metal2_lbl)));
 
   l2n.register_layer (*rbulk, "bulk");
   l2n.register_layer (*rnwell, "nwell");
@@ -2285,20 +2285,20 @@ TEST(9_FlatExtractionWithExternalDSS)
 
   db::LayoutToNetlist l2n (&dss);
 
-  std::auto_ptr<db::Region> rbulk (new db::Region ());
-  std::auto_ptr<db::Region> rnwell (new db::Region (db::RecursiveShapeIterator (ly, tc, nwell), dss));
-  std::auto_ptr<db::Region> rthickgox (new db::Region (db::RecursiveShapeIterator (ly, tc, thickgox), dss));
-  std::auto_ptr<db::Region> ractive (new db::Region (db::RecursiveShapeIterator (ly, tc, active), dss));
-  std::auto_ptr<db::Region> rpplus (new db::Region (db::RecursiveShapeIterator (ly, tc, pplus), dss));
-  std::auto_ptr<db::Region> rnplus (new db::Region (db::RecursiveShapeIterator (ly, tc, nplus), dss));
-  std::auto_ptr<db::Region> rpoly (new db::Region (db::RecursiveShapeIterator (ly, tc, poly), dss));
-  std::auto_ptr<db::Region> rpoly_lbl (new db::Region (db::RecursiveShapeIterator (ly, tc, poly_lbl), dss));
-  std::auto_ptr<db::Region> rcont (new db::Region (db::RecursiveShapeIterator (ly, tc, cont), dss));
-  std::auto_ptr<db::Region> rmetal1 (new db::Region (db::RecursiveShapeIterator (ly, tc, metal1), dss));
-  std::auto_ptr<db::Region> rmetal1_lbl (new db::Region (db::RecursiveShapeIterator (ly, tc, metal1_lbl), dss));
-  std::auto_ptr<db::Region> rvia1 (new db::Region (db::RecursiveShapeIterator (ly, tc, via1), dss));
-  std::auto_ptr<db::Region> rmetal2 (new db::Region (db::RecursiveShapeIterator (ly, tc, metal2), dss));
-  std::auto_ptr<db::Region> rmetal2_lbl (new db::Region (db::RecursiveShapeIterator (ly, tc, metal2_lbl), dss));
+  std::unique_ptr<db::Region> rbulk (new db::Region ());
+  std::unique_ptr<db::Region> rnwell (new db::Region (db::RecursiveShapeIterator (ly, tc, nwell), dss));
+  std::unique_ptr<db::Region> rthickgox (new db::Region (db::RecursiveShapeIterator (ly, tc, thickgox), dss));
+  std::unique_ptr<db::Region> ractive (new db::Region (db::RecursiveShapeIterator (ly, tc, active), dss));
+  std::unique_ptr<db::Region> rpplus (new db::Region (db::RecursiveShapeIterator (ly, tc, pplus), dss));
+  std::unique_ptr<db::Region> rnplus (new db::Region (db::RecursiveShapeIterator (ly, tc, nplus), dss));
+  std::unique_ptr<db::Region> rpoly (new db::Region (db::RecursiveShapeIterator (ly, tc, poly), dss));
+  std::unique_ptr<db::Region> rpoly_lbl (new db::Region (db::RecursiveShapeIterator (ly, tc, poly_lbl), dss));
+  std::unique_ptr<db::Region> rcont (new db::Region (db::RecursiveShapeIterator (ly, tc, cont), dss));
+  std::unique_ptr<db::Region> rmetal1 (new db::Region (db::RecursiveShapeIterator (ly, tc, metal1), dss));
+  std::unique_ptr<db::Region> rmetal1_lbl (new db::Region (db::RecursiveShapeIterator (ly, tc, metal1_lbl), dss));
+  std::unique_ptr<db::Region> rvia1 (new db::Region (db::RecursiveShapeIterator (ly, tc, via1), dss));
+  std::unique_ptr<db::Region> rmetal2 (new db::Region (db::RecursiveShapeIterator (ly, tc, metal2), dss));
+  std::unique_ptr<db::Region> rmetal2_lbl (new db::Region (db::RecursiveShapeIterator (ly, tc, metal2_lbl), dss));
 
   l2n.register_layer (*rbulk, "bulk");
   l2n.register_layer (*rnwell, "nwell");
@@ -2457,12 +2457,12 @@ TEST(10_Antenna)
 
   db::DeepShapeStore dss;
 
-  std::auto_ptr<db::Region> rdiode (new db::Region (db::RecursiveShapeIterator (ly, tc, diode), dss));
-  std::auto_ptr<db::Region> rpoly (new db::Region (db::RecursiveShapeIterator (ly, tc, poly), dss));
-  std::auto_ptr<db::Region> rcont (new db::Region (db::RecursiveShapeIterator (ly, tc, cont), dss));
-  std::auto_ptr<db::Region> rmetal1 (new db::Region (db::RecursiveShapeIterator (ly, tc, metal1), dss));
-  std::auto_ptr<db::Region> rvia1 (new db::Region (db::RecursiveShapeIterator (ly, tc, via1), dss));
-  std::auto_ptr<db::Region> rmetal2 (new db::Region (db::RecursiveShapeIterator (ly, tc, metal2), dss));
+  std::unique_ptr<db::Region> rdiode (new db::Region (db::RecursiveShapeIterator (ly, tc, diode), dss));
+  std::unique_ptr<db::Region> rpoly (new db::Region (db::RecursiveShapeIterator (ly, tc, poly), dss));
+  std::unique_ptr<db::Region> rcont (new db::Region (db::RecursiveShapeIterator (ly, tc, cont), dss));
+  std::unique_ptr<db::Region> rmetal1 (new db::Region (db::RecursiveShapeIterator (ly, tc, metal1), dss));
+  std::unique_ptr<db::Region> rvia1 (new db::Region (db::RecursiveShapeIterator (ly, tc, via1), dss));
+  std::unique_ptr<db::Region> rmetal2 (new db::Region (db::RecursiveShapeIterator (ly, tc, metal2), dss));
 
   db::Layout ly2;
   ly2.dbu (ly.dbu ());
@@ -2734,17 +2734,17 @@ TEST(11_DuplicateInstances)
   db::Cell &tc = ly.cell (*ly.begin_top_down ());
   db::LayoutToNetlist l2n (db::RecursiveShapeIterator (ly, tc, std::set<unsigned int> ()));
 
-  std::auto_ptr<db::Region> rnwell (l2n.make_layer (nwell, "nwell"));
-  std::auto_ptr<db::Region> ractive (l2n.make_layer (active, "active"));
-  std::auto_ptr<db::Region> rpoly (l2n.make_polygon_layer (poly, "poly"));
-  std::auto_ptr<db::Texts> rpoly_lbl (l2n.make_text_layer (poly_lbl, "poly_lbl"));
-  std::auto_ptr<db::Region> rdiff_cont (l2n.make_polygon_layer (diff_cont, "diff_cont"));
-  std::auto_ptr<db::Region> rpoly_cont (l2n.make_polygon_layer (poly_cont, "poly_cont"));
-  std::auto_ptr<db::Region> rmetal1 (l2n.make_polygon_layer (metal1, "metal1"));
-  std::auto_ptr<db::Texts> rmetal1_lbl (l2n.make_text_layer (metal1_lbl, "metal1_lbl"));
-  std::auto_ptr<db::Region> rvia1 (l2n.make_polygon_layer (via1, "via1"));
-  std::auto_ptr<db::Region> rmetal2 (l2n.make_polygon_layer (metal2, "metal2"));
-  std::auto_ptr<db::Texts> rmetal2_lbl (l2n.make_text_layer (metal2_lbl, "metal2_lbl"));
+  std::unique_ptr<db::Region> rnwell (l2n.make_layer (nwell, "nwell"));
+  std::unique_ptr<db::Region> ractive (l2n.make_layer (active, "active"));
+  std::unique_ptr<db::Region> rpoly (l2n.make_polygon_layer (poly, "poly"));
+  std::unique_ptr<db::Texts> rpoly_lbl (l2n.make_text_layer (poly_lbl, "poly_lbl"));
+  std::unique_ptr<db::Region> rdiff_cont (l2n.make_polygon_layer (diff_cont, "diff_cont"));
+  std::unique_ptr<db::Region> rpoly_cont (l2n.make_polygon_layer (poly_cont, "poly_cont"));
+  std::unique_ptr<db::Region> rmetal1 (l2n.make_polygon_layer (metal1, "metal1"));
+  std::unique_ptr<db::Texts> rmetal1_lbl (l2n.make_text_layer (metal1_lbl, "metal1_lbl"));
+  std::unique_ptr<db::Region> rvia1 (l2n.make_polygon_layer (via1, "via1"));
+  std::unique_ptr<db::Region> rmetal2 (l2n.make_polygon_layer (metal2, "metal2"));
+  std::unique_ptr<db::Texts> rmetal2_lbl (l2n.make_text_layer (metal2_lbl, "metal2_lbl"));
 
   //  derived regions
 
@@ -2939,20 +2939,20 @@ TEST(12_FlattenCircuitDoesFlattenLayout)
   db::Cell &tc = ly.cell (*ly.begin_top_down ());
   db::LayoutToNetlist l2n (db::RecursiveShapeIterator (ly, tc, std::set<unsigned int> ()));
 
-  std::auto_ptr<db::Region> rbulk (l2n.make_layer ("bulk"));
-  std::auto_ptr<db::Region> rnwell (l2n.make_layer (nwell, "nwell"));
-  std::auto_ptr<db::Region> ractive (l2n.make_layer (active, "active"));
-  std::auto_ptr<db::Region> rpplus (l2n.make_layer (pplus, "pplus"));
-  std::auto_ptr<db::Region> rnplus (l2n.make_layer (nplus, "nplus"));
-  std::auto_ptr<db::Region> rpoly (l2n.make_polygon_layer (poly, "poly"));
-  std::auto_ptr<db::Texts> rpoly_lbl (l2n.make_text_layer (poly_lbl, "poly_lbl"));
-  std::auto_ptr<db::Region> rdiff_cont (l2n.make_polygon_layer (diff_cont, "diff_cont"));
-  std::auto_ptr<db::Region> rpoly_cont (l2n.make_polygon_layer (poly_cont, "poly_cont"));
-  std::auto_ptr<db::Region> rmetal1 (l2n.make_polygon_layer (metal1, "metal1"));
-  std::auto_ptr<db::Texts> rmetal1_lbl (l2n.make_text_layer (metal1_lbl, "metal1_lbl"));
-  std::auto_ptr<db::Region> rvia1 (l2n.make_polygon_layer (via1, "via1"));
-  std::auto_ptr<db::Region> rmetal2 (l2n.make_polygon_layer (metal2, "metal2"));
-  std::auto_ptr<db::Texts> rmetal2_lbl (l2n.make_text_layer (metal2_lbl, "metal2_lbl"));
+  std::unique_ptr<db::Region> rbulk (l2n.make_layer ("bulk"));
+  std::unique_ptr<db::Region> rnwell (l2n.make_layer (nwell, "nwell"));
+  std::unique_ptr<db::Region> ractive (l2n.make_layer (active, "active"));
+  std::unique_ptr<db::Region> rpplus (l2n.make_layer (pplus, "pplus"));
+  std::unique_ptr<db::Region> rnplus (l2n.make_layer (nplus, "nplus"));
+  std::unique_ptr<db::Region> rpoly (l2n.make_polygon_layer (poly, "poly"));
+  std::unique_ptr<db::Texts> rpoly_lbl (l2n.make_text_layer (poly_lbl, "poly_lbl"));
+  std::unique_ptr<db::Region> rdiff_cont (l2n.make_polygon_layer (diff_cont, "diff_cont"));
+  std::unique_ptr<db::Region> rpoly_cont (l2n.make_polygon_layer (poly_cont, "poly_cont"));
+  std::unique_ptr<db::Region> rmetal1 (l2n.make_polygon_layer (metal1, "metal1"));
+  std::unique_ptr<db::Texts> rmetal1_lbl (l2n.make_text_layer (metal1_lbl, "metal1_lbl"));
+  std::unique_ptr<db::Region> rvia1 (l2n.make_polygon_layer (via1, "via1"));
+  std::unique_ptr<db::Region> rmetal2 (l2n.make_polygon_layer (metal2, "metal2"));
+  std::unique_ptr<db::Texts> rmetal2_lbl (l2n.make_text_layer (metal2_lbl, "metal2_lbl"));
 
   //  derived regions
 
@@ -3193,20 +3193,20 @@ TEST(13_JoinNets)
   db::Cell &tc = ly.cell (*ly.begin_top_down ());
   db::LayoutToNetlist l2n (db::RecursiveShapeIterator (ly, tc, std::set<unsigned int> ()));
 
-  std::auto_ptr<db::Region> rbulk (l2n.make_layer ("bulk"));
-  std::auto_ptr<db::Region> rnwell (l2n.make_layer (nwell, "nwell"));
-  std::auto_ptr<db::Region> ractive (l2n.make_layer (active, "active"));
-  std::auto_ptr<db::Region> rpplus (l2n.make_layer (pplus, "pplus"));
-  std::auto_ptr<db::Region> rnplus (l2n.make_layer (nplus, "nplus"));
-  std::auto_ptr<db::Region> rpoly (l2n.make_polygon_layer (poly, "poly"));
-  std::auto_ptr<db::Texts> rpoly_lbl (l2n.make_text_layer (poly_lbl, "poly_lbl"));
-  std::auto_ptr<db::Region> rdiff_cont (l2n.make_polygon_layer (diff_cont, "diff_cont"));
-  std::auto_ptr<db::Region> rpoly_cont (l2n.make_polygon_layer (poly_cont, "poly_cont"));
-  std::auto_ptr<db::Region> rmetal1 (l2n.make_polygon_layer (metal1, "metal1"));
-  std::auto_ptr<db::Texts> rmetal1_lbl (l2n.make_text_layer (metal1_lbl, "metal1_lbl"));
-  std::auto_ptr<db::Region> rvia1 (l2n.make_polygon_layer (via1, "via1"));
-  std::auto_ptr<db::Region> rmetal2 (l2n.make_polygon_layer (metal2, "metal2"));
-  std::auto_ptr<db::Texts> rmetal2_lbl (l2n.make_text_layer (metal2_lbl, "metal2_lbl"));
+  std::unique_ptr<db::Region> rbulk (l2n.make_layer ("bulk"));
+  std::unique_ptr<db::Region> rnwell (l2n.make_layer (nwell, "nwell"));
+  std::unique_ptr<db::Region> ractive (l2n.make_layer (active, "active"));
+  std::unique_ptr<db::Region> rpplus (l2n.make_layer (pplus, "pplus"));
+  std::unique_ptr<db::Region> rnplus (l2n.make_layer (nplus, "nplus"));
+  std::unique_ptr<db::Region> rpoly (l2n.make_polygon_layer (poly, "poly"));
+  std::unique_ptr<db::Texts> rpoly_lbl (l2n.make_text_layer (poly_lbl, "poly_lbl"));
+  std::unique_ptr<db::Region> rdiff_cont (l2n.make_polygon_layer (diff_cont, "diff_cont"));
+  std::unique_ptr<db::Region> rpoly_cont (l2n.make_polygon_layer (poly_cont, "poly_cont"));
+  std::unique_ptr<db::Region> rmetal1 (l2n.make_polygon_layer (metal1, "metal1"));
+  std::unique_ptr<db::Texts> rmetal1_lbl (l2n.make_text_layer (metal1_lbl, "metal1_lbl"));
+  std::unique_ptr<db::Region> rvia1 (l2n.make_polygon_layer (via1, "via1"));
+  std::unique_ptr<db::Region> rmetal2 (l2n.make_polygon_layer (metal2, "metal2"));
+  std::unique_ptr<db::Texts> rmetal2_lbl (l2n.make_text_layer (metal2_lbl, "metal2_lbl"));
 
   //  derived regions
 
diff --git a/src/db/unit_tests/dbLayoutToNetlistWriterTests.cc b/src/db/unit_tests/dbLayoutToNetlistWriterTests.cc
index 4f84c85cc..a5f6f9189 100644
--- a/src/db/unit_tests/dbLayoutToNetlistWriterTests.cc
+++ b/src/db/unit_tests/dbLayoutToNetlistWriterTests.cc
@@ -73,17 +73,17 @@ TEST(1_WriterBasic)
   db::Cell &tc = ly.cell (*ly.begin_top_down ());
   db::LayoutToNetlist l2n (db::RecursiveShapeIterator (ly, tc, std::set<unsigned int> ()));
 
-  std::auto_ptr<db::Region> rnwell (l2n.make_layer (nwell, "nwell"));
-  std::auto_ptr<db::Region> ractive (l2n.make_layer (active, "active"));
-  std::auto_ptr<db::Region> rpoly (l2n.make_polygon_layer (poly, "poly"));
-  std::auto_ptr<db::Texts> rpoly_lbl (l2n.make_text_layer (poly_lbl, "poly_lbl"));
-  std::auto_ptr<db::Region> rdiff_cont (l2n.make_polygon_layer (diff_cont, "diff_cont"));
-  std::auto_ptr<db::Region> rpoly_cont (l2n.make_polygon_layer (poly_cont, "poly_cont"));
-  std::auto_ptr<db::Region> rmetal1 (l2n.make_polygon_layer (metal1, "metal1"));
-  std::auto_ptr<db::Texts> rmetal1_lbl (l2n.make_text_layer (metal1_lbl, "metal1_lbl"));
-  std::auto_ptr<db::Region> rvia1 (l2n.make_polygon_layer (via1, "via1"));
-  std::auto_ptr<db::Region> rmetal2 (l2n.make_polygon_layer (metal2, "metal2"));
-  std::auto_ptr<db::Texts> rmetal2_lbl (l2n.make_text_layer (metal2_lbl, "metal2_lbl"));
+  std::unique_ptr<db::Region> rnwell (l2n.make_layer (nwell, "nwell"));
+  std::unique_ptr<db::Region> ractive (l2n.make_layer (active, "active"));
+  std::unique_ptr<db::Region> rpoly (l2n.make_polygon_layer (poly, "poly"));
+  std::unique_ptr<db::Texts> rpoly_lbl (l2n.make_text_layer (poly_lbl, "poly_lbl"));
+  std::unique_ptr<db::Region> rdiff_cont (l2n.make_polygon_layer (diff_cont, "diff_cont"));
+  std::unique_ptr<db::Region> rpoly_cont (l2n.make_polygon_layer (poly_cont, "poly_cont"));
+  std::unique_ptr<db::Region> rmetal1 (l2n.make_polygon_layer (metal1, "metal1"));
+  std::unique_ptr<db::Texts> rmetal1_lbl (l2n.make_text_layer (metal1_lbl, "metal1_lbl"));
+  std::unique_ptr<db::Region> rvia1 (l2n.make_polygon_layer (via1, "via1"));
+  std::unique_ptr<db::Region> rmetal2 (l2n.make_polygon_layer (metal2, "metal2"));
+  std::unique_ptr<db::Texts> rmetal2_lbl (l2n.make_text_layer (metal2_lbl, "metal2_lbl"));
 
   //  derived regions
 
@@ -283,20 +283,20 @@ TEST(2_WriterWithGlobalNets)
   db::Cell &tc = ly.cell (*ly.begin_top_down ());
   db::LayoutToNetlist l2n (db::RecursiveShapeIterator (ly, tc, std::set<unsigned int> ()));
 
-  std::auto_ptr<db::Region> rbulk (l2n.make_layer (ly.insert_layer (), "rbulk"));
-  std::auto_ptr<db::Region> rnwell (l2n.make_layer (nwell, "nwell"));
-  std::auto_ptr<db::Region> ractive (l2n.make_layer (active, "active"));
-  std::auto_ptr<db::Region> rpplus (l2n.make_layer (pplus, "pplus"));
-  std::auto_ptr<db::Region> rnplus (l2n.make_layer (nplus, "nplus"));
-  std::auto_ptr<db::Region> rpoly (l2n.make_polygon_layer (poly, "poly"));
-  std::auto_ptr<db::Region> rpoly_lbl (l2n.make_layer (poly_lbl, "poly_lbl"));
-  std::auto_ptr<db::Region> rdiff_cont (l2n.make_polygon_layer (diff_cont, "diff_cont"));
-  std::auto_ptr<db::Region> rpoly_cont (l2n.make_polygon_layer (poly_cont, "poly_cont"));
-  std::auto_ptr<db::Region> rmetal1 (l2n.make_polygon_layer (metal1, "metal1"));
-  std::auto_ptr<db::Region> rmetal1_lbl (l2n.make_layer (metal1_lbl, "metal1_lbl"));
-  std::auto_ptr<db::Region> rvia1 (l2n.make_polygon_layer (via1, "via1"));
-  std::auto_ptr<db::Region> rmetal2 (l2n.make_polygon_layer (metal2, "metal2"));
-  std::auto_ptr<db::Region> rmetal2_lbl (l2n.make_layer (metal2_lbl, "metal2_lbl"));
+  std::unique_ptr<db::Region> rbulk (l2n.make_layer (ly.insert_layer (), "rbulk"));
+  std::unique_ptr<db::Region> rnwell (l2n.make_layer (nwell, "nwell"));
+  std::unique_ptr<db::Region> ractive (l2n.make_layer (active, "active"));
+  std::unique_ptr<db::Region> rpplus (l2n.make_layer (pplus, "pplus"));
+  std::unique_ptr<db::Region> rnplus (l2n.make_layer (nplus, "nplus"));
+  std::unique_ptr<db::Region> rpoly (l2n.make_polygon_layer (poly, "poly"));
+  std::unique_ptr<db::Region> rpoly_lbl (l2n.make_layer (poly_lbl, "poly_lbl"));
+  std::unique_ptr<db::Region> rdiff_cont (l2n.make_polygon_layer (diff_cont, "diff_cont"));
+  std::unique_ptr<db::Region> rpoly_cont (l2n.make_polygon_layer (poly_cont, "poly_cont"));
+  std::unique_ptr<db::Region> rmetal1 (l2n.make_polygon_layer (metal1, "metal1"));
+  std::unique_ptr<db::Region> rmetal1_lbl (l2n.make_layer (metal1_lbl, "metal1_lbl"));
+  std::unique_ptr<db::Region> rvia1 (l2n.make_polygon_layer (via1, "via1"));
+  std::unique_ptr<db::Region> rmetal2 (l2n.make_polygon_layer (metal2, "metal2"));
+  std::unique_ptr<db::Region> rmetal2_lbl (l2n.make_layer (metal2_lbl, "metal2_lbl"));
 
   //  derived regions
 
diff --git a/src/db/unit_tests/dbLayoutVsSchematicTests.cc b/src/db/unit_tests/dbLayoutVsSchematicTests.cc
index 7f0b47bbc..10461475c 100644
--- a/src/db/unit_tests/dbLayoutVsSchematicTests.cc
+++ b/src/db/unit_tests/dbLayoutVsSchematicTests.cc
@@ -89,20 +89,20 @@ TEST(1_BasicFlow)
   db::Cell &tc = ly.cell (*ly.begin_top_down ());
   db::LayoutVsSchematic lvs (db::RecursiveShapeIterator (ly, tc, std::set<unsigned int> ()));
 
-  std::auto_ptr<db::Region> rbulk (lvs.make_layer ("bulk"));
-  std::auto_ptr<db::Region> rnwell (lvs.make_layer (nwell, "nwell"));
-  std::auto_ptr<db::Region> ractive (lvs.make_layer (active, "active"));
-  std::auto_ptr<db::Region> rpplus (lvs.make_layer (pplus, "pplus"));
-  std::auto_ptr<db::Region> rnplus (lvs.make_layer (nplus, "nplus"));
-  std::auto_ptr<db::Region> rpoly (lvs.make_polygon_layer (poly, "poly"));
-  std::auto_ptr<db::Region> rpoly_lbl (lvs.make_layer (poly_lbl, "poly_lbl"));
-  std::auto_ptr<db::Region> rdiff_cont (lvs.make_polygon_layer (diff_cont, "diff_cont"));
-  std::auto_ptr<db::Region> rpoly_cont (lvs.make_polygon_layer (poly_cont, "poly_cont"));
-  std::auto_ptr<db::Region> rmetal1 (lvs.make_polygon_layer (metal1, "metal1"));
-  std::auto_ptr<db::Region> rmetal1_lbl (lvs.make_layer (metal1_lbl, "metal1_lbl"));
-  std::auto_ptr<db::Region> rvia1 (lvs.make_polygon_layer (via1, "via1"));
-  std::auto_ptr<db::Region> rmetal2 (lvs.make_polygon_layer (metal2, "metal2"));
-  std::auto_ptr<db::Region> rmetal2_lbl (lvs.make_layer (metal2_lbl, "metal2_lbl"));
+  std::unique_ptr<db::Region> rbulk (lvs.make_layer ("bulk"));
+  std::unique_ptr<db::Region> rnwell (lvs.make_layer (nwell, "nwell"));
+  std::unique_ptr<db::Region> ractive (lvs.make_layer (active, "active"));
+  std::unique_ptr<db::Region> rpplus (lvs.make_layer (pplus, "pplus"));
+  std::unique_ptr<db::Region> rnplus (lvs.make_layer (nplus, "nplus"));
+  std::unique_ptr<db::Region> rpoly (lvs.make_polygon_layer (poly, "poly"));
+  std::unique_ptr<db::Region> rpoly_lbl (lvs.make_layer (poly_lbl, "poly_lbl"));
+  std::unique_ptr<db::Region> rdiff_cont (lvs.make_polygon_layer (diff_cont, "diff_cont"));
+  std::unique_ptr<db::Region> rpoly_cont (lvs.make_polygon_layer (poly_cont, "poly_cont"));
+  std::unique_ptr<db::Region> rmetal1 (lvs.make_polygon_layer (metal1, "metal1"));
+  std::unique_ptr<db::Region> rmetal1_lbl (lvs.make_layer (metal1_lbl, "metal1_lbl"));
+  std::unique_ptr<db::Region> rvia1 (lvs.make_polygon_layer (via1, "via1"));
+  std::unique_ptr<db::Region> rmetal2 (lvs.make_polygon_layer (metal2, "metal2"));
+  std::unique_ptr<db::Region> rmetal2_lbl (lvs.make_layer (metal2_lbl, "metal2_lbl"));
 
   //  derived regions
 
@@ -215,7 +215,7 @@ TEST(1_BasicFlow)
     fn = tl::combine_path (fn, "algo");
     fn = tl::combine_path (fn, "lvs_test_1.spi");
 
-    std::auto_ptr<db::Netlist> netlist (new db::Netlist ());
+    std::unique_ptr<db::Netlist> netlist (new db::Netlist ());
     tl::InputStream stream (fn);
     reader.read (stream, *netlist);
     lvs.set_reference_netlist (netlist.release ());
@@ -287,20 +287,20 @@ TEST(2_FlowWithErrors)
   db::Cell &tc = ly.cell (*ly.begin_top_down ());
   db::LayoutVsSchematic lvs (db::RecursiveShapeIterator (ly, tc, std::set<unsigned int> ()));
 
-  std::auto_ptr<db::Region> rbulk (lvs.make_layer ("bulk"));
-  std::auto_ptr<db::Region> rnwell (lvs.make_layer (nwell, "nwell"));
-  std::auto_ptr<db::Region> ractive (lvs.make_layer (active, "active"));
-  std::auto_ptr<db::Region> rpplus (lvs.make_layer (pplus, "pplus"));
-  std::auto_ptr<db::Region> rnplus (lvs.make_layer (nplus, "nplus"));
-  std::auto_ptr<db::Region> rpoly (lvs.make_polygon_layer (poly, "poly"));
-  std::auto_ptr<db::Region> rpoly_lbl (lvs.make_layer (poly_lbl, "poly_lbl"));
-  std::auto_ptr<db::Region> rdiff_cont (lvs.make_polygon_layer (diff_cont, "diff_cont"));
-  std::auto_ptr<db::Region> rpoly_cont (lvs.make_polygon_layer (poly_cont, "poly_cont"));
-  std::auto_ptr<db::Region> rmetal1 (lvs.make_polygon_layer (metal1, "metal1"));
-  std::auto_ptr<db::Region> rmetal1_lbl (lvs.make_layer (metal1_lbl, "metal1_lbl"));
-  std::auto_ptr<db::Region> rvia1 (lvs.make_polygon_layer (via1, "via1"));
-  std::auto_ptr<db::Region> rmetal2 (lvs.make_polygon_layer (metal2, "metal2"));
-  std::auto_ptr<db::Region> rmetal2_lbl (lvs.make_layer (metal2_lbl, "metal2_lbl"));
+  std::unique_ptr<db::Region> rbulk (lvs.make_layer ("bulk"));
+  std::unique_ptr<db::Region> rnwell (lvs.make_layer (nwell, "nwell"));
+  std::unique_ptr<db::Region> ractive (lvs.make_layer (active, "active"));
+  std::unique_ptr<db::Region> rpplus (lvs.make_layer (pplus, "pplus"));
+  std::unique_ptr<db::Region> rnplus (lvs.make_layer (nplus, "nplus"));
+  std::unique_ptr<db::Region> rpoly (lvs.make_polygon_layer (poly, "poly"));
+  std::unique_ptr<db::Region> rpoly_lbl (lvs.make_layer (poly_lbl, "poly_lbl"));
+  std::unique_ptr<db::Region> rdiff_cont (lvs.make_polygon_layer (diff_cont, "diff_cont"));
+  std::unique_ptr<db::Region> rpoly_cont (lvs.make_polygon_layer (poly_cont, "poly_cont"));
+  std::unique_ptr<db::Region> rmetal1 (lvs.make_polygon_layer (metal1, "metal1"));
+  std::unique_ptr<db::Region> rmetal1_lbl (lvs.make_layer (metal1_lbl, "metal1_lbl"));
+  std::unique_ptr<db::Region> rvia1 (lvs.make_polygon_layer (via1, "via1"));
+  std::unique_ptr<db::Region> rmetal2 (lvs.make_polygon_layer (metal2, "metal2"));
+  std::unique_ptr<db::Region> rmetal2_lbl (lvs.make_layer (metal2_lbl, "metal2_lbl"));
 
   //  derived regions
 
@@ -413,7 +413,7 @@ TEST(2_FlowWithErrors)
     fn = tl::combine_path (fn, "algo");
     fn = tl::combine_path (fn, "lvs_test_2.spi");
 
-    std::auto_ptr<db::Netlist> netlist (new db::Netlist ());
+    std::unique_ptr<db::Netlist> netlist (new db::Netlist ());
     tl::InputStream stream (fn);
     reader.read (stream, *netlist);
     lvs.set_reference_netlist (netlist.release ());
diff --git a/src/db/unit_tests/dbNetlistTests.cc b/src/db/unit_tests/dbNetlistTests.cc
index ba4479da5..58ae7eec2 100644
--- a/src/db/unit_tests/dbNetlistTests.cc
+++ b/src/db/unit_tests/dbNetlistTests.cc
@@ -390,7 +390,7 @@ TEST(4_CircuitDevices)
   dc2.add_parameter_definition (db::DeviceParameterDefinition ("U", "", 2.0));
   dc2.add_parameter_definition (db::DeviceParameterDefinition ("V", "", 1.0));
 
-  std::auto_ptr<db::Circuit> c (new db::Circuit ());
+  std::unique_ptr<db::Circuit> c (new db::Circuit ());
   c->set_name ("c");
 
   EXPECT_EQ (netlist2 (*c),
@@ -535,7 +535,7 @@ TEST(4_CircuitDevices)
 
 TEST(4_NetlistSubcircuits)
 {
-  std::auto_ptr<db::Netlist> nl (new db::Netlist ());
+  std::unique_ptr<db::Netlist> nl (new db::Netlist ());
 
   db::DeviceClass *dc = new db::DeviceClass ();
   dc->set_name ("dc2");
@@ -543,7 +543,7 @@ TEST(4_NetlistSubcircuits)
   dc->add_terminal_definition (db::DeviceTerminalDefinition ("B", ""));
   nl->add_device_class (dc);
 
-  std::auto_ptr<db::Netlist> nldup (new db::Netlist ());
+  std::unique_ptr<db::Netlist> nldup (new db::Netlist ());
   nldup->add_device_class (dc->clone ());
 
   db::DeviceAbstract *dm = new db::DeviceAbstract ();
@@ -1001,7 +1001,7 @@ TEST(10_NetPinRefBasics)
 
 TEST(11_NetlistCircuitRefs)
 {
-  std::auto_ptr<db::Netlist> nl (new db::Netlist ());
+  std::unique_ptr<db::Netlist> nl (new db::Netlist ());
 
   db::Circuit *c1 = new db::Circuit ();
   c1->set_name ("c1");
@@ -1036,7 +1036,7 @@ TEST(11_NetlistCircuitRefs)
 
 TEST(12_NetlistTopology)
 {
-  std::auto_ptr<db::Netlist> nl (new db::Netlist ());
+  std::unique_ptr<db::Netlist> nl (new db::Netlist ());
   EXPECT_EQ (nl->top_circuit_count (), size_t (0));
 
   db::Circuit *c1 = new db::Circuit ();
@@ -1053,7 +1053,7 @@ TEST(12_NetlistTopology)
   EXPECT_EQ (td2string (nl.get ()), "c2,c1");
   EXPECT_EQ (bu2string (nl.get ()), "c1,c2");
 
-  std::auto_ptr<db::NetlistLocker> locker (new db::NetlistLocker (nl.get ()));
+  std::unique_ptr<db::NetlistLocker> locker (new db::NetlistLocker (nl.get ()));
 
   db::Circuit *c3 = new db::Circuit ();
   c3->set_name ("c3");
diff --git a/src/edt/edt/edtInstPropertiesPage.cc b/src/edt/edt/edtInstPropertiesPage.cc
index fcefa98c1..23d6a509e 100644
--- a/src/edt/edt/edtInstPropertiesPage.cc
+++ b/src/edt/edt/edtInstPropertiesPage.cc
@@ -379,7 +379,7 @@ InstPropertiesPage::create_applicator (db::Cell & /*cell*/, const db::Instance &
   bool has_error = false;
   bool has_pcell_error = false;
 
-  std::auto_ptr<CombinedChangeApplicator> appl (new CombinedChangeApplicator ());
+  std::unique_ptr<CombinedChangeApplicator> appl (new CombinedChangeApplicator ());
 
   edt::Service::obj_iterator pos = m_selection_ptrs [m_index];
   const lay::CellView &cv = mp_service->view ()->cellview (pos->cv_index ());
@@ -608,7 +608,7 @@ InstPropertiesPage::do_apply (bool current_only, bool relative)
   lay::LayerState layer_state = mp_service->view ()->layer_snapshot ();
   unsigned int cv_index = m_selection_ptrs [m_index]->cv_index ();
 
-  std::auto_ptr<ChangeApplicator> applicator;
+  std::unique_ptr<ChangeApplicator> applicator;
 
   {
     edt::Service::obj_iterator pos = m_selection_ptrs [m_index];
diff --git a/src/edt/edt/edtMainService.cc b/src/edt/edt/edtMainService.cc
index e004e3ce0..50a5ba131 100644
--- a/src/edt/edt/edtMainService.cc
+++ b/src/edt/edt/edtMainService.cc
@@ -2107,7 +2107,7 @@ MainService::cm_tap ()
 
   //  List the layers under the cursor as pop up a menu
 
-  std::auto_ptr<QMenu> menu (new QMenu (view ()));
+  std::unique_ptr<QMenu> menu (new QMenu (view ()));
   menu->show ();
 
   int icon_size = menu->style ()->pixelMetric (QStyle::PM_ButtonIconSize);
diff --git a/src/edt/edt/edtPropertiesPages.cc b/src/edt/edt/edtPropertiesPages.cc
index 5e1f8e340..09912ce74 100644
--- a/src/edt/edt/edtPropertiesPages.cc
+++ b/src/edt/edt/edtPropertiesPages.cc
@@ -178,7 +178,7 @@ ShapePropertiesPage::recompute_selection_ptrs (const std::vector<lay::ObjectInst
 void 
 ShapePropertiesPage::do_apply (bool current_only, bool relative)
 {
-  std::auto_ptr<ChangeApplicator> applicator;
+  std::unique_ptr<ChangeApplicator> applicator;
 
   unsigned int cv_index = m_selection_ptrs [m_index]->cv_index ();
 
@@ -856,7 +856,7 @@ TextPropertiesPage::create_applicator (db::Shapes & /*shapes*/, const db::Shape
   db::Text org_text;
   shape.text (org_text);
 
-  std::auto_ptr<CombinedChangeApplicator> appl (new CombinedChangeApplicator ());
+  std::unique_ptr<CombinedChangeApplicator> appl (new CombinedChangeApplicator ());
 
   if (db::FTrans (tt) != db::FTrans (org_text.trans ())) {
     appl->add (new TextOrientationChangeApplicator (db::FTrans (tt)));
@@ -1126,7 +1126,7 @@ EditablePathPropertiesPage::create_applicator (db::Shapes & /*shapes*/, const db
     break;
   } 
 
-  std::auto_ptr<CombinedChangeApplicator> appl (new CombinedChangeApplicator ());
+  std::unique_ptr<CombinedChangeApplicator> appl (new CombinedChangeApplicator ());
 
   db::Path org_path;
   shape.path (org_path);
diff --git a/src/gsi/gsi/gsiClass.h b/src/gsi/gsi/gsiClass.h
index 788274f3c..ad52d9faa 100644
--- a/src/gsi/gsi/gsiClass.h
+++ b/src/gsi/gsi/gsiClass.h
@@ -899,7 +899,7 @@ private:
   gsi::VariantUserClass<X> m_var_cls;
   gsi::VariantUserClass<X> m_var_cls_c;
   gsi::VariantUserClass<X> m_var_cls_cls;
-  std::auto_ptr<SubClassTesterBase> m_subclass_tester;
+  std::unique_ptr<SubClassTesterBase> m_subclass_tester;
 };
 
 /**
diff --git a/src/gsi/gsi/gsiClassBase.h b/src/gsi/gsi/gsiClassBase.h
index 1f436e044..dcea483fe 100644
--- a/src/gsi/gsi/gsiClassBase.h
+++ b/src/gsi/gsi/gsiClassBase.h
@@ -631,7 +631,7 @@ private:
   std::string m_name;
   std::string m_module;
   tl::weak_collection<ClassBase> m_child_classes, m_subclasses;
-  mutable std::auto_ptr<PerClassClientSpecificData> mp_data[ClientIndex::MaxClientIndex];
+  mutable std::unique_ptr<PerClassClientSpecificData> mp_data[ClientIndex::MaxClientIndex];
 
   static class_collection *mp_class_collection;
   static class_collection *mp_new_class_collection;
diff --git a/src/gsi/gsi/gsiDeclTl.cc b/src/gsi/gsi/gsiDeclTl.cc
index 44cbb5eff..ef05a59e3 100644
--- a/src/gsi/gsi/gsiDeclTl.cc
+++ b/src/gsi/gsi/gsiDeclTl.cc
@@ -444,7 +444,7 @@ public:
   {
     mp_expr.reset (0);
 
-    std::auto_ptr<tl::Expression> ex (new tl::Expression ());
+    std::unique_ptr<tl::Expression> ex (new tl::Expression ());
     tl::Eval::parse (*ex, e);
     mp_expr.reset (ex.release ());
   }
@@ -459,7 +459,7 @@ public:
   }
 
 private:
-  std::auto_ptr<tl::Expression> mp_expr;
+  std::unique_ptr<tl::Expression> mp_expr;
 };
 
 static tl::Variant eval_expr (const std::string &e)
@@ -471,14 +471,14 @@ static tl::Variant eval_expr (const std::string &e)
 
 static ExpressionWrapper *new_expr1 (const std::string &e)
 {
-  std::auto_ptr<ExpressionWrapper> expr (new ExpressionWrapper ());
+  std::unique_ptr<ExpressionWrapper> expr (new ExpressionWrapper ());
   expr->parse (e);
   return expr.release ();
 }
 
 static ExpressionWrapper *new_expr2 (const std::string &e, const std::map<std::string, tl::Variant> &variables)
 {
-  std::auto_ptr<ExpressionWrapper> expr (new ExpressionWrapper ());
+  std::unique_ptr<ExpressionWrapper> expr (new ExpressionWrapper ());
   for (std::map<std::string, tl::Variant>::const_iterator v = variables.begin (); v != variables.end (); ++v) {
     expr->set_var (v->first, v->second);
   }
diff --git a/src/gsi/gsi/gsiExpression.cc b/src/gsi/gsi/gsiExpression.cc
index 5f2a9a2a8..f27433a35 100644
--- a/src/gsi/gsi/gsiExpression.cc
+++ b/src/gsi/gsi/gsiExpression.cc
@@ -765,7 +765,7 @@ struct reader<gsi::StringType>
   void
   operator() (tl::Variant *out, gsi::SerialArgs *rr, const gsi::ArgType &, tl::Heap *heap)
   {
-    std::auto_ptr<StringAdaptor> a ((StringAdaptor *) rr->read<void *>(*heap));
+    std::unique_ptr<StringAdaptor> a ((StringAdaptor *) rr->read<void *>(*heap));
     if (!a.get ()) {
       *out = tl::Variant ();
     } else {
@@ -783,7 +783,7 @@ struct reader<gsi::VariantType>
   void
   operator() (tl::Variant *out, gsi::SerialArgs *rr, const gsi::ArgType &, tl::Heap *heap)
   {
-    std::auto_ptr<VariantAdaptor> a ((VariantAdaptor *) rr->read<void *>(*heap));
+    std::unique_ptr<VariantAdaptor> a ((VariantAdaptor *) rr->read<void *>(*heap));
     if (!a.get ()) {
       *out = tl::Variant ();
     } else {
@@ -801,7 +801,7 @@ struct reader<MapType>
   void
   operator() (tl::Variant *out, gsi::SerialArgs *rr, const gsi::ArgType &atype, tl::Heap *heap)
   {
-    std::auto_ptr<MapAdaptor> a ((MapAdaptor *) rr->read<void *>(*heap));
+    std::unique_ptr<MapAdaptor> a ((MapAdaptor *) rr->read<void *>(*heap));
     if (!a.get ()) {
       *out = tl::Variant ();
     } else {
@@ -822,7 +822,7 @@ struct reader<VectorType>
   void
   operator() (tl::Variant *out, gsi::SerialArgs *rr, const gsi::ArgType &atype, tl::Heap *heap)
   {
-    std::auto_ptr<VectorAdaptor> a ((VectorAdaptor *) rr->read<void *>(*heap));
+    std::unique_ptr<VectorAdaptor> a ((VectorAdaptor *) rr->read<void *>(*heap));
     if (!a.get ()) {
       *out = tl::Variant ();
     } else {
diff --git a/src/gsi/gsi/gsiSerialisation.cc b/src/gsi/gsi/gsiSerialisation.cc
index dc48e0f22..e6864e76d 100644
--- a/src/gsi/gsi/gsiSerialisation.cc
+++ b/src/gsi/gsi/gsiSerialisation.cc
@@ -61,7 +61,7 @@ AdaptorBase::~AdaptorBase ()
 
 void AdaptorBase::tie_copies (AdaptorBase *target, tl::Heap &heap) 
 {
-  std::auto_ptr<AdaptorBase> t (target);
+  std::unique_ptr<AdaptorBase> t (target);
   copy_to (target, heap);
 
   //  This object (which will be destroyed before this is responsible for copying back 
diff --git a/src/gsi/gsi/gsiSerialisation.h b/src/gsi/gsi/gsiSerialisation.h
index 7956ce745..86d6a6719 100644
--- a/src/gsi/gsi/gsiSerialisation.h
+++ b/src/gsi/gsi/gsiSerialisation.h
@@ -498,7 +498,7 @@ private:
   {
     check_data ();
 
-    std::auto_ptr<AdaptorBase> p (*(AdaptorBase **)mp_read);
+    std::unique_ptr<AdaptorBase> p (*(AdaptorBase **)mp_read);
     mp_read += item_size<AdaptorBase *> ();
     tl_assert (p.get () != 0);
 
@@ -514,7 +514,7 @@ private:
 
     check_data ();
 
-    std::auto_ptr<AdaptorBase> p (*(AdaptorBase **)mp_read);
+    std::unique_ptr<AdaptorBase> p (*(AdaptorBase **)mp_read);
     mp_read += item_size<AdaptorBase *> ();
     tl_assert (p.get () != 0);
 
@@ -550,7 +550,7 @@ private:
 
     check_data ();
 
-    std::auto_ptr<AdaptorBase> p (*(AdaptorBase **)mp_read);
+    std::unique_ptr<AdaptorBase> p (*(AdaptorBase **)mp_read);
     mp_read += item_size<AdaptorBase *> ();
 
     x_type *x = 0;
@@ -1399,7 +1399,7 @@ public:
     gsi::SerialArgs rr (serial_size ());
     tl_assert (v->serial_size () == serial_size ());
 
-    std::auto_ptr<VectorAdaptorIterator> i (create_iterator ());
+    std::unique_ptr<VectorAdaptorIterator> i (create_iterator ());
     while (! i->at_end ()) {
       rr.reset ();
       i->get (rr, heap);
@@ -1672,7 +1672,7 @@ public:
     gsi::SerialArgs rr (serial_size ());
     tl_assert (v->serial_size () == serial_size ());
 
-    std::auto_ptr<MapAdaptorIterator> i (create_iterator ());
+    std::unique_ptr<MapAdaptorIterator> i (create_iterator ());
     while (! i->at_end ()) {
       rr.reset ();
       i->get (rr, heap);
@@ -1963,7 +1963,7 @@ inline AdaptorBase *adaptor_factory<Tag, X>::get (const X &v)
 template <class X>
 inline void copy_to (AdaptorBase &a, X &x, tl::Heap &heap)
 {
-  std::auto_ptr<AdaptorBase> t (adaptor_factory<typename gsi::type_traits<X &>::tag, X &>::get (x));
+  std::unique_ptr<AdaptorBase> t (adaptor_factory<typename gsi::type_traits<X &>::tag, X &>::get (x));
   a.copy_to (t.get (), heap);
 }
 
diff --git a/src/gsi/gsi_test/gsiTest.cc b/src/gsi/gsi_test/gsiTest.cc
index c2bc55a53..3693f1931 100644
--- a/src/gsi/gsi_test/gsiTest.cc
+++ b/src/gsi/gsi_test/gsiTest.cc
@@ -43,7 +43,7 @@ int _force_link_f ()
 // ----------------------------------------------------------------
 //  Implementation of A
 
-static std::auto_ptr<A> a_inst;
+static std::unique_ptr<A> a_inst;
 static int a_count = 0;
 
 void A::br () 
@@ -310,7 +310,7 @@ std::vector<int> C::m_v;
 // ----------------------------------------------------------------
 //  Implementation of E
 
-std::auto_ptr<E> E::e_inst;
+std::unique_ptr<E> E::e_inst;
 int E::e_count = 0;
 
 E::E() : x(0)
@@ -373,7 +373,7 @@ int inst_count();
 // ----------------------------------------------------------------
 //  Implementation of F
 
-std::auto_ptr<F> F::f_inst;
+std::unique_ptr<F> F::f_inst;
 
 const F &F::icref() 
 { 
@@ -414,8 +414,8 @@ F *F::inc()
 // ----------------------------------------------------------------
 //  Implementation of X
 
-std::auto_ptr<X> X::sp_a (new X ("X::a"));
-std::auto_ptr<X> X::sp_b (new X ("X::b"));
+std::unique_ptr<X> X::sp_a (new X ("X::a"));
+std::unique_ptr<X> X::sp_b (new X ("X::b"));
 
 static X *make_x (const char *x) 
 { 
@@ -524,8 +524,8 @@ void X::set_si (int v)
 // ----------------------------------------------------------------
 //  Implementation of Y
 
-std::auto_ptr<Y> Y::sp_a (new Y ("Y::a"));
-std::auto_ptr<Y> Y::sp_b (new Y ("Y::b"));
+std::unique_ptr<Y> Y::sp_a (new Y ("Y::a"));
+std::unique_ptr<Y> Y::sp_b (new Y ("Y::b"));
 int Y::s_dyn_count = 0;
 
 static Y *make_y (const char *x)
diff --git a/src/gsi/gsi_test/gsiTest.h b/src/gsi/gsi_test/gsiTest.h
index 4a6dafb92..b2d68776e 100644
--- a/src/gsi/gsi_test/gsiTest.h
+++ b/src/gsi/gsi_test/gsiTest.h
@@ -980,7 +980,7 @@ struct E
 
 private:
   int x;
-  static std::auto_ptr<E> e_inst;
+  static std::unique_ptr<E> e_inst;
   static int e_count;
 };
 
@@ -996,7 +996,7 @@ struct F
   int get_x() const { return x; }
 
   int x;
-  static std::auto_ptr<F> f_inst;
+  static std::unique_ptr<F> f_inst;
 };
 
 struct G
@@ -1043,7 +1043,7 @@ protected:
   std::string m_s;
 
 private:
-  static std::auto_ptr<X> sp_a, sp_b;
+  static std::unique_ptr<X> sp_a, sp_b;
 };
 
 class Y
@@ -1072,7 +1072,7 @@ public:
   int i () const;
 
 private:
-  static std::auto_ptr<Y> sp_a, sp_b;
+  static std::unique_ptr<Y> sp_a, sp_b;
   static int s_dyn_count;
   Y *mp_c;
 };
diff --git a/src/img/img/gsiDeclImg.cc b/src/img/img/gsiDeclImg.cc
index 6a7ff0dd4..3bc83c39a 100644
--- a/src/img/img/gsiDeclImg.cc
+++ b/src/img/img/gsiDeclImg.cc
@@ -409,7 +409,7 @@ private:
 
 static ImageRef *img_from_s (const std::string &s)
 {
-  std::auto_ptr<ImageRef> img (new ImageRef ());
+  std::unique_ptr<ImageRef> img (new ImageRef ());
   img->from_string (s.c_str ());
   return img.release ();
 }
@@ -419,7 +419,7 @@ static ImageRef *load_image (const std::string &path)
   tl::InputFile file (path);
   tl::InputStream stream (file);
 
-  std::auto_ptr<img::Object> read;
+  std::unique_ptr<img::Object> read;
   read.reset (img::ImageStreamer::read (stream));
   //  need to create a copy for now ...
   return new ImageRef (*read);
diff --git a/src/img/img/imgObject.cc b/src/img/img/imgObject.cc
index 40cd44ab0..09f8e9c8e 100644
--- a/src/img/img/imgObject.cc
+++ b/src/img/img/imgObject.cc
@@ -1492,7 +1492,7 @@ Object::read_file ()
 
     tl::InputFile file (m_filename);
     tl::InputStream stream (file);
-    std::auto_ptr<img::Object> read;
+    std::unique_ptr<img::Object> read;
     read.reset (img::ImageStreamer::read (stream));
     read->m_filename = m_filename;
 
diff --git a/src/img/img/imgStream.cc b/src/img/img/imgStream.cc
index ca4d75612..c3ee7cd31 100644
--- a/src/img/img/imgStream.cc
+++ b/src/img/img/imgStream.cc
@@ -224,7 +224,7 @@ string_to_pixels (img::Object *img, const std::string &s, size_t row, size_t w,
 img::Object *
 ImageProxy::get_image () const
 {
-  std::auto_ptr<img::Object> img (new Object (std::max (size_t (1), m_width), std::max (size_t (1), m_height), m_matrix, m_color, ! m_byte_data.empty ()));
+  std::unique_ptr<img::Object> img (new Object (std::max (size_t (1), m_width), std::max (size_t (1), m_height), m_matrix, m_color, ! m_byte_data.empty ()));
   img->set_min_value (m_min_value);
   img->set_max_value (m_max_value);
   img->set_data_mapping (m_data_mapping);
diff --git a/src/img/unit_tests/imgFile.cc b/src/img/unit_tests/imgFile.cc
index 91507093a..8616fc456 100644
--- a/src/img/unit_tests/imgFile.cc
+++ b/src/img/unit_tests/imgFile.cc
@@ -61,7 +61,7 @@ TEST(1_FloatMono)
     img::ImageStreamer::write (stream, image);
   }
 
-  std::auto_ptr<img::Object> read;
+  std::unique_ptr<img::Object> read;
 
   {
     tl::InputFile file (path);
@@ -94,7 +94,7 @@ TEST(2_FloatMonoWithMask)
     img::ImageStreamer::write (stream, image);
   }
 
-  std::auto_ptr<img::Object> read;
+  std::unique_ptr<img::Object> read;
 
   {
     tl::InputFile file (path);
@@ -123,7 +123,7 @@ TEST(3_ByteMono)
     img::ImageStreamer::write (stream, image);
   }
 
-  std::auto_ptr<img::Object> read;
+  std::unique_ptr<img::Object> read;
 
   {
     tl::InputFile file (path);
@@ -156,7 +156,7 @@ TEST(4_ByteMonoWithMask)
     img::ImageStreamer::write (stream, image);
   }
 
-  std::auto_ptr<img::Object> read;
+  std::unique_ptr<img::Object> read;
 
   {
     tl::InputFile file (path);
@@ -185,7 +185,7 @@ TEST(5_FloatColor)
     img::ImageStreamer::write (stream, image);
   }
 
-  std::auto_ptr<img::Object> read;
+  std::unique_ptr<img::Object> read;
 
   {
     tl::InputFile file (path);
@@ -218,7 +218,7 @@ TEST(6_FloatColorWithMask)
     img::ImageStreamer::write (stream, image);
   }
 
-  std::auto_ptr<img::Object> read;
+  std::unique_ptr<img::Object> read;
 
   {
     tl::InputFile file (path);
@@ -247,7 +247,7 @@ TEST(7_ByteColor)
     img::ImageStreamer::write (stream, image);
   }
 
-  std::auto_ptr<img::Object> read;
+  std::unique_ptr<img::Object> read;
 
   {
     tl::InputFile file (path);
@@ -280,7 +280,7 @@ TEST(8_ByteColorWithMask)
     img::ImageStreamer::write (stream, image);
   }
 
-  std::auto_ptr<img::Object> read;
+  std::unique_ptr<img::Object> read;
 
   {
     tl::InputFile file (path);
diff --git a/src/klayout_main/klayout_main/klayout.cc b/src/klayout_main/klayout_main/klayout.cc
index 67ff20063..fd1561980 100644
--- a/src/klayout_main/klayout_main/klayout.cc
+++ b/src/klayout_main/klayout_main/klayout.cc
@@ -252,7 +252,7 @@ klayout_main_cont (int &argc, char **argv)
       }
     }
 
-    std::auto_ptr<lay::ApplicationBase> app;
+    std::unique_ptr<lay::ApplicationBase> app;
     if (non_ui_mode) {
       app.reset (new lay::NonGuiApplication (argc, argv));
     } else {
diff --git a/src/lay/lay/gsiDeclLayApplication.cc b/src/lay/lay/gsiDeclLayApplication.cc
index 946bca3d1..f499f921e 100644
--- a/src/lay/lay/gsiDeclLayApplication.cc
+++ b/src/lay/lay/gsiDeclLayApplication.cc
@@ -248,8 +248,8 @@ static std::string application_doc ()
 void
 LAY_PUBLIC make_application_decl (bool non_gui_mode)
 {
-  static std::auto_ptr<Class<lay::GuiApplication> > gui_app_decl;
-  static std::auto_ptr<Class<lay::NonGuiApplication> > non_gui_app_decl;
+  static std::unique_ptr<Class<lay::GuiApplication> > gui_app_decl;
+  static std::unique_ptr<Class<lay::NonGuiApplication> > non_gui_app_decl;
 
   if (non_gui_mode) {
 
diff --git a/src/lay/lay/layApplication.cc b/src/lay/lay/layApplication.cc
index a56316d81..5fa542a75 100644
--- a/src/lay/lay/layApplication.cc
+++ b/src/lay/lay/layApplication.cc
@@ -1033,7 +1033,7 @@ ApplicationBase::run ()
 
     BEGIN_PROTECTED 
 
-      std::auto_ptr<lym::Macro> macro (new lym::Macro ());
+      std::unique_ptr<lym::Macro> macro (new lym::Macro ());
       macro->load_from (*m);
       macro->set_file_path (*m);
       if (macro->show_in_menu ()) {
@@ -1084,7 +1084,7 @@ ApplicationBase::run ()
         }
 
         if (mw->current_view () != 0) {
-          std::auto_ptr <rdb::Database> db (new rdb::Database ());
+          std::unique_ptr <rdb::Database> db (new rdb::Database ());
           db->load (f->second.first);
           int rdb_index = mw->current_view ()->add_rdb (db.release ());
           mw->current_view ()->open_rdb_browser (rdb_index, mw->current_view ()->active_cellview_index ());
diff --git a/src/lay/lay/layLibraryController.cc b/src/lay/lay/layLibraryController.cc
index b91438a0d..57e1a99c3 100644
--- a/src/lay/lay/layLibraryController.cc
+++ b/src/lay/lay/layLibraryController.cc
@@ -187,7 +187,7 @@ LibraryController::sync_files ()
 
           if (needs_load) {
 
-            std::auto_ptr<db::Library> lib (new db::Library ());
+            std::unique_ptr<db::Library> lib (new db::Library ());
             lib->set_description (filename);
             if (! p->second.empty ()) {
               lib->set_technology (p->second);
diff --git a/src/lay/lay/layMacroController.cc b/src/lay/lay/layMacroController.cc
index 6ee77ce5a..e337e7e49 100644
--- a/src/lay/lay/layMacroController.cc
+++ b/src/lay/lay/layMacroController.cc
@@ -293,7 +293,7 @@ MacroController::drop_url (const std::string &path_or_url)
   }
 
   //  load and run macro
-  std::auto_ptr<lym::Macro> macro (new lym::Macro ());
+  std::unique_ptr<lym::Macro> macro (new lym::Macro ());
   macro->load_from (path);
   macro->set_file_path (path);
 
diff --git a/src/lay/lay/layMacroEditorDialog.cc b/src/lay/lay/layMacroEditorDialog.cc
index e6a9f5695..c2b3377e4 100644
--- a/src/lay/lay/layMacroEditorDialog.cc
+++ b/src/lay/lay/layMacroEditorDialog.cc
@@ -1271,7 +1271,7 @@ MacroEditorDialog::update_inspected ()
     variableList->set_inspector (0);
   } else {
 
-    std::auto_ptr<gsi::Inspector> ci (mp_current_interpreter->inspector (m_eval_context));
+    std::unique_ptr<gsi::Inspector> ci (mp_current_interpreter->inspector (m_eval_context));
     variableListFrame->setVisible (ci.get () != 0);
     variableList->set_inspector (ci.release ());
 
@@ -3263,7 +3263,7 @@ MacroEditorDialog::stack_element_double_clicked (QListWidgetItem *item)
 MacroEditorPage *
 MacroEditorDialog::create_page (lym::Macro *macro)
 {
-  std::auto_ptr<MacroEditorPage> editor (new MacroEditorPage (this, &m_highlighters));
+  std::unique_ptr<MacroEditorPage> editor (new MacroEditorPage (this, &m_highlighters));
   editor->set_ntab (m_ntab);
   editor->set_nindent (m_nindent);
   editor->set_font (m_font_family, m_font_size);
diff --git a/src/lay/lay/layMacroVariableView.cc b/src/lay/lay/layMacroVariableView.cc
index ef8990066..8c4e3873b 100644
--- a/src/lay/lay/layMacroVariableView.cc
+++ b/src/lay/lay/layMacroVariableView.cc
@@ -51,7 +51,7 @@ public:
   }
 
 private:
-  std::auto_ptr<gsi::Inspector> mp_inspector;
+  std::unique_ptr<gsi::Inspector> mp_inspector;
 };
 
 }
@@ -180,7 +180,7 @@ void MacroVariableView::expanded (QTreeWidgetItem *item)
   if (item->childCount () > 0) {
     PlaceholderItem *ph = dynamic_cast<PlaceholderItem *> (item->child (0));
     if (ph) {
-      std::auto_ptr<QTreeWidgetItem> ph_taken (item->takeChild (0));
+      std::unique_ptr<QTreeWidgetItem> ph_taken (item->takeChild (0));
       sync (item, ph->inspector (), true);
     }
   }
@@ -238,7 +238,7 @@ void MacroVariableView::sync_item (QTreeWidgetItem *parent, gsi::Inspector *insp
 
     if (inspector->has_children (index)) {
 
-      std::auto_ptr<gsi::Inspector> ci (inspector->child_inspector (index));
+      std::unique_ptr<gsi::Inspector> ci (inspector->child_inspector (index));
       update_value (item, inspector_description (ci.get ()), false);
       if (item->isExpanded ()) {
         sync (item, ci.get (), fresh);
diff --git a/src/lay/lay/layMacroVariableView.h b/src/lay/lay/layMacroVariableView.h
index 237e2d1e7..6cc79c22d 100644
--- a/src/lay/lay/layMacroVariableView.h
+++ b/src/lay/lay/layMacroVariableView.h
@@ -81,7 +81,7 @@ private:
   void sync_item (QTreeWidgetItem *parent, gsi::Inspector *inspector, const QString &key, size_t index, int pos, bool fresh);
   void sync (bool fresh);
 
-  std::auto_ptr<gsi::Inspector> mp_inspector;
+  std::unique_ptr<gsi::Inspector> mp_inspector;
   bool m_show_all;
 };
 
diff --git a/src/lay/lay/layMainWindow.h b/src/lay/lay/layMainWindow.h
index d89678fdd..43398ebda 100644
--- a/src/lay/lay/layMainWindow.h
+++ b/src/lay/lay/layMainWindow.h
@@ -720,7 +720,7 @@ private:
   lay::HelpDialog *mp_assistant;
   std::string m_current_session;
   std::string m_message;
-  std::auto_ptr<QPrinter> mp_printer;
+  std::unique_ptr<QPrinter> mp_printer;
   std::vector<QString> m_changed_files;
 
   //  the object manager (undo/redo mechanism and others)
diff --git a/src/lay/lay/laySaltDownloadManager.cc b/src/lay/lay/laySaltDownloadManager.cc
index 5b2edd917..e2f5d07a9 100644
--- a/src/lay/lay/laySaltDownloadManager.cc
+++ b/src/lay/lay/laySaltDownloadManager.cc
@@ -447,7 +447,7 @@ SaltDownloadManager::execute (lay::SaltManagerDialog *parent, lay::Salt &salt)
       return true;
     }
 
-    std::auto_ptr<lay::ConfirmationDialog> dialog (make_confirmation_dialog (parent, salt));
+    std::unique_ptr<lay::ConfirmationDialog> dialog (make_confirmation_dialog (parent, salt));
 
     dialog->setModal (true);
     dialog->show ();
diff --git a/src/lay/lay/laySaltGrain.cc b/src/lay/lay/laySaltGrain.cc
index e8c4f18de..b62e39707 100644
--- a/src/lay/lay/laySaltGrain.cc
+++ b/src/lay/lay/laySaltGrain.cc
@@ -541,7 +541,7 @@ SaltGrain
 SaltGrain::from_url (const std::string &url_in)
 {
   std::string url = url_in;
-  std::auto_ptr<tl::InputStream> stream (stream_from_url (url));
+  std::unique_ptr<tl::InputStream> stream (stream_from_url (url));
 
   SaltGrain g;
   g.load (*stream);
diff --git a/src/lay/lay/laySaltGrainDetailsTextWidget.h b/src/lay/lay/laySaltGrainDetailsTextWidget.h
index 28dabcab1..f84a2b553 100644
--- a/src/lay/lay/laySaltGrainDetailsTextWidget.h
+++ b/src/lay/lay/laySaltGrainDetailsTextWidget.h
@@ -23,6 +23,8 @@
 #ifndef HDR_laySaltGrainDetailsTextWidget
 #define HDR_laySaltGrainDetailsTextWidget
 
+#include "laySaltGrain.h"
+
 #include <QTextBrowser>
 #include <memory>
 
@@ -57,7 +59,7 @@ private slots:
   void open_link (const QUrl &url);
 
 private:
-  std::auto_ptr<lay::SaltGrain> mp_grain;
+  std::unique_ptr<lay::SaltGrain> mp_grain;
 
   QString details_text ();
 };
diff --git a/src/lay/lay/laySaltManagerDialog.h b/src/lay/lay/laySaltManagerDialog.h
index d60e29337..e86cc3256 100644
--- a/src/lay/lay/laySaltManagerDialog.h
+++ b/src/lay/lay/laySaltManagerDialog.h
@@ -184,10 +184,10 @@ private:
   SaltGrainPropertiesDialog *mp_properties_dialog;
   tl::DeferredMethod<SaltManagerDialog> dm_update_models;
   int m_current_tab;
-  std::auto_ptr<tl::InputStream> m_downloaded_grain_reader;
-  std::auto_ptr<lay::SaltGrain> m_downloaded_grain, m_salt_mine_grain;
+  std::unique_ptr<tl::InputStream> m_downloaded_grain_reader;
+  std::unique_ptr<lay::SaltGrain> m_downloaded_grain, m_salt_mine_grain;
   SaltGrainDetailsTextWidget *mp_downloaded_target;
-  std::auto_ptr<tl::InputStream> m_salt_mine_reader;
+  std::unique_ptr<tl::InputStream> m_salt_mine_reader;
 
   SaltGrain *current_grain ();
   std::vector<lay::SaltGrain *> current_grains ();
diff --git a/src/lay/lay/laySearchReplaceDialog.cc b/src/lay/lay/laySearchReplaceDialog.cc
index 50ee3d7fd..0c5f5b321 100644
--- a/src/lay/lay/laySearchReplaceDialog.cc
+++ b/src/lay/lay/laySearchReplaceDialog.cc
@@ -981,7 +981,7 @@ BEGIN_PROTECTED
     return;
   }
 
-  std::auto_ptr<rdb::Database> rdb (new rdb::Database ());
+  std::unique_ptr<rdb::Database> rdb (new rdb::Database ());
 
   rdb->set_description (tl::to_string (QObject::tr ("Query results: ")) + m_last_query);
   rdb->set_name ("query_results");
@@ -1040,7 +1040,7 @@ BEGIN_PROTECTED
   query_to_model (model, lq, iq, std::numeric_limits<size_t>::max (), true);
   model.end_changes ();
 
-  std::auto_ptr <lay::LayoutHandle> handle (new lay::LayoutHandle (new db::Layout (), std::string ()));
+  std::unique_ptr <lay::LayoutHandle> handle (new lay::LayoutHandle (new db::Layout (), std::string ()));
   handle->rename ("query_results");
   model.export_layout (handle->layout ());
   mp_view->add_layout (handle.release (), true);
diff --git a/src/lay/lay/laySession.cc b/src/lay/lay/laySession.cc
index 599b54f29..6aebf4b11 100644
--- a/src/lay/lay/laySession.cc
+++ b/src/lay/lay/laySession.cc
@@ -237,7 +237,7 @@ Session::restore (lay::MainWindow &mw)
 
     for (unsigned int j = 0; j < vd.rdb_filenames.size (); ++j) {
 
-      std::auto_ptr<rdb::Database> rdb (new rdb::Database ());
+      std::unique_ptr<rdb::Database> rdb (new rdb::Database ());
 
       try {
         rdb->load (make_absolute (vd.rdb_filenames[j]));
diff --git a/src/lay/lay/laySignalHandler.cc b/src/lay/lay/laySignalHandler.cc
index 8affe3f97..62f64ab03 100644
--- a/src/lay/lay/laySignalHandler.cc
+++ b/src/lay/lay/laySignalHandler.cc
@@ -297,7 +297,7 @@ void signal_handler (int signo, siginfo_t *si, void *)
             lay::Version::name () + " " +
             lay::Version::version () + " (" + lay::Version::subversion () + ")\n";
 
-  std::auto_ptr<CrashMessage> msg;
+  std::unique_ptr<CrashMessage> msg;
 
   bool has_gui = s_sh_has_gui && lay::ApplicationBase::instance () && lay::ApplicationBase::instance ()->has_gui ();
 
diff --git a/src/lay/lay/layTechSetupDialog.cc b/src/lay/lay/layTechSetupDialog.cc
index 0806c064f..67c4b942b 100644
--- a/src/lay/lay/layTechSetupDialog.cc
+++ b/src/lay/lay/layTechSetupDialog.cc
@@ -358,7 +358,7 @@ TechSaveOptionsEditorPage::setup ()
   for (std::vector< std::pair<StreamWriterOptionsPage *, std::string> >::iterator page = m_pages.begin (); page != m_pages.end (); ++page) {
     if (page->first) {
       const db::FormatSpecificWriterOptions *specific_options = tech ()->save_layout_options ().get_options (page->second);
-      std::auto_ptr<db::FormatSpecificWriterOptions> default_options;
+      std::unique_ptr<db::FormatSpecificWriterOptions> default_options;
       if (! specific_options) {
         //  In case there is no option object yet, create a first one for initialization
         default_options.reset (StreamWriterPluginDeclaration::plugin_for_format (page->second)->create_specific_options ());
diff --git a/src/lay/lay/layTechSetupDialog.h b/src/lay/lay/layTechSetupDialog.h
index fc0b38b25..03b608e4b 100644
--- a/src/lay/lay/layTechSetupDialog.h
+++ b/src/lay/lay/layTechSetupDialog.h
@@ -98,7 +98,7 @@ private:
   Ui::TechMacrosPage *mp_ui;
   std::string m_cat, m_cat_desc;
   std::vector<std::pair<QLabel *, QString> > m_original_labels;
-  std::auto_ptr<lym::MacroCollection> mp_collection;
+  std::unique_ptr<lym::MacroCollection> mp_collection;
   std::string m_current_path;
 
 private slots:
diff --git a/src/lay/unit_tests/laySessionTests.cc b/src/lay/unit_tests/laySessionTests.cc
index 8cdb1d54c..6d7e8b438 100644
--- a/src/lay/unit_tests/laySessionTests.cc
+++ b/src/lay/unit_tests/laySessionTests.cc
@@ -61,14 +61,14 @@ TEST (1)
     img_service->insert_image (img);
   }
 
-  std::auto_ptr<rdb::Database> rdb (new rdb::Database ());
+  std::unique_ptr<rdb::Database> rdb (new rdb::Database ());
   rdb->load (tl::testsrc () + "/testdata/sessions/test.lyrdb");
   view->add_rdb (rdb.release ());
 
-  std::auto_ptr<db::LayoutToNetlist> l2ndb (db::LayoutToNetlist::create_from_file (tl::testsrc () + "/testdata/sessions/test.l2n"));
+  std::unique_ptr<db::LayoutToNetlist> l2ndb (db::LayoutToNetlist::create_from_file (tl::testsrc () + "/testdata/sessions/test.l2n"));
   view->add_l2ndb (l2ndb.release ());
 
-  std::auto_ptr<db::LayoutToNetlist> lvsdb (db::LayoutToNetlist::create_from_file (tl::testsrc () + "/testdata/sessions/test.lvsdb"));
+  std::unique_ptr<db::LayoutToNetlist> lvsdb (db::LayoutToNetlist::create_from_file (tl::testsrc () + "/testdata/sessions/test.lvsdb"));
   view->add_l2ndb (lvsdb.release ());
 
   std::string lys_file = tmp_file ("test1.lys");
diff --git a/src/laybasic/laybasic/layCellView.cc b/src/laybasic/laybasic/layCellView.cc
index c90ce7b94..c082b1c39 100644
--- a/src/laybasic/laybasic/layCellView.cc
+++ b/src/laybasic/laybasic/layCellView.cc
@@ -281,7 +281,7 @@ LayoutHandle::update_save_options (db::SaveLayoutOptions &options)
       continue;
     }
 
-    std::auto_ptr<db::FormatSpecificWriterOptions> specific_options;
+    std::unique_ptr<db::FormatSpecificWriterOptions> specific_options;
     if (options.get_options (decl->format_name ())) {
       specific_options.reset (options.get_options (decl->format_name ())->clone ());
     } else {
diff --git a/src/laybasic/laybasic/layD25TechnologyComponent.h b/src/laybasic/laybasic/layD25TechnologyComponent.h
index 8c9dab636..842006ccc 100644
--- a/src/laybasic/laybasic/layD25TechnologyComponent.h
+++ b/src/laybasic/laybasic/layD25TechnologyComponent.h
@@ -48,7 +48,7 @@ private slots:
   void cursor_position_changed ();
 
 private:
-  std::auto_ptr<lay::GenericSyntaxHighlighterAttributes> mp_hl_attributes, mp_hl_basic_attributes;
+  std::unique_ptr<lay::GenericSyntaxHighlighterAttributes> mp_hl_attributes, mp_hl_basic_attributes;
 };
 
 }
diff --git a/src/laybasic/laybasic/layDialogs.h b/src/laybasic/laybasic/layDialogs.h
index b724fc702..8a12966ea 100644
--- a/src/laybasic/laybasic/layDialogs.h
+++ b/src/laybasic/laybasic/layDialogs.h
@@ -445,7 +445,7 @@ private:
   bool m_editable;
   db::PropertiesRepository *mp_prep;
   Ui::UserPropertiesForm *mp_ui;
-  std::auto_ptr<lay::GenericSyntaxHighlighterAttributes> mp_hl_attributes, mp_hl_basic_attributes;
+  std::unique_ptr<lay::GenericSyntaxHighlighterAttributes> mp_hl_attributes, mp_hl_basic_attributes;
 };
 
 /**
diff --git a/src/laybasic/laybasic/layDispatcher.cc b/src/laybasic/laybasic/layDispatcher.cc
index ee977bbc5..14d3e224f 100644
--- a/src/laybasic/laybasic/layDispatcher.cc
+++ b/src/laybasic/laybasic/layDispatcher.cc
@@ -200,7 +200,7 @@ Dispatcher::write_config (const std::string &config_file)
 bool
 Dispatcher::read_config (const std::string &config_file)
 {
-  std::auto_ptr<tl::XMLFileSource> file;
+  std::unique_ptr<tl::XMLFileSource> file;
 
   try {
     file.reset (new tl::XMLFileSource (config_file));
diff --git a/src/laybasic/laybasic/layEditable.cc b/src/laybasic/laybasic/layEditable.cc
index 43a375ced..b3684fbb2 100644
--- a/src/laybasic/laybasic/layEditable.cc
+++ b/src/laybasic/laybasic/layEditable.cc
@@ -90,7 +90,7 @@ Editables::~Editables ()
 void 
 Editables::del (db::Transaction *transaction)
 {
-  std::auto_ptr<db::Transaction> trans_holder (transaction ? transaction : new db::Transaction (manager (), tl::to_string (QObject::tr ("Delete"))));
+  std::unique_ptr<db::Transaction> trans_holder (transaction ? transaction : new db::Transaction (manager (), tl::to_string (QObject::tr ("Delete"))));
 
   if (has_selection ()) {
 
@@ -168,7 +168,7 @@ Editables::selection_catch_bbox ()
 void
 Editables::transform (const db::DCplxTrans &tr, db::Transaction *transaction)
 {
-  std::auto_ptr<db::Transaction> trans_holder (transaction ? transaction : new db::Transaction (manager (), tl::to_string (QObject::tr ("Transform"))));
+  std::unique_ptr<db::Transaction> trans_holder (transaction ? transaction : new db::Transaction (manager (), tl::to_string (QObject::tr ("Transform"))));
 
   if (has_selection ()) {
 
@@ -594,7 +594,7 @@ Editables::move_transform (const db::DPoint &p, db::DFTrans t, lay::angle_constr
 void 
 Editables::end_move (const db::DPoint &p, lay::angle_constraint_type ac, db::Transaction *transaction)
 {
-  std::auto_ptr<db::Transaction> trans_holder (transaction ? transaction : new db::Transaction (manager (), tl::to_string (QObject::tr ("Move"))));
+  std::unique_ptr<db::Transaction> trans_holder (transaction ? transaction : new db::Transaction (manager (), tl::to_string (QObject::tr ("Move"))));
 
   if (m_any_move_operation) {
 
diff --git a/src/laybasic/laybasic/layGenericSyntaxHighlighter.cc b/src/laybasic/laybasic/layGenericSyntaxHighlighter.cc
index eafc62d6f..dbfd011a5 100644
--- a/src/laybasic/laybasic/layGenericSyntaxHighlighter.cc
+++ b/src/laybasic/laybasic/layGenericSyntaxHighlighter.cc
@@ -1633,7 +1633,7 @@ GenericSyntaxHighlighter::highlightBlock(const QString &text)
   int end_index = 0, last_index= -1;
   int attribute_id = 0, def_attribute_id = 0;
 
-  std::auto_ptr<SyntaxHighlighterUserData> user_data (new SyntaxHighlighterUserData ());
+  std::unique_ptr<SyntaxHighlighterUserData> user_data (new SyntaxHighlighterUserData ());
 
   while (std::max (0, index) < text.length ()) {
 
diff --git a/src/laybasic/laybasic/layHierarchyControlPanel.h b/src/laybasic/laybasic/layHierarchyControlPanel.h
index 3e4dc888c..826900bd5 100644
--- a/src/laybasic/laybasic/layHierarchyControlPanel.h
+++ b/src/laybasic/laybasic/layHierarchyControlPanel.h
@@ -306,7 +306,7 @@ private:
   QColor m_text_color;
   tl::DeferredMethod<HierarchyControlPanel> m_do_update_content_dm;
   tl::DeferredMethod<HierarchyControlPanel> m_do_full_update_content_dm;
-  std::auto_ptr<QStyle> mp_tree_style;
+  std::unique_ptr<QStyle> mp_tree_style;
 
   //  locate the CellTreeItem in the tree corresponding to a partial path starting from p.
   CellTreeItem *find_child_item (cell_path_type::const_iterator start, cell_path_type::const_iterator end, CellTreeItem *p);
diff --git a/src/laybasic/laybasic/layLayerControlPanel.h b/src/laybasic/laybasic/layLayerControlPanel.h
index 41e00b744..95f0acf34 100644
--- a/src/laybasic/laybasic/layLayerControlPanel.h
+++ b/src/laybasic/laybasic/layLayerControlPanel.h
@@ -336,7 +336,7 @@ public slots:
 private:
   QTabBar *mp_tab_bar;
   LCPTreeWidget *mp_layer_list;
-  std::auto_ptr<QStyle> mp_ll_style;
+  std::unique_ptr<QStyle> mp_ll_style;
   LayerTreeModel *mp_model;
   lay::LayoutView *mp_view;
   bool m_needs_update;
diff --git a/src/laybasic/laybasic/layLayoutView.cc b/src/laybasic/laybasic/layLayoutView.cc
index 0a6a3d9a5..5f3cbc636 100644
--- a/src/laybasic/laybasic/layLayoutView.cc
+++ b/src/laybasic/laybasic/layLayoutView.cc
@@ -5288,7 +5288,7 @@ LayoutView::paste_interactive ()
 {
   clear_selection ();
 
-  std::auto_ptr<db::Transaction> trans (new db::Transaction (manager (), tl::to_string (QObject::tr ("Paste and move"))));
+  std::unique_ptr<db::Transaction> trans (new db::Transaction (manager (), tl::to_string (QObject::tr ("Paste and move"))));
 
   {
     //  let the receivers sort out who is pasting what ..
diff --git a/src/laybasic/laybasic/layLibrariesView.h b/src/laybasic/laybasic/layLibrariesView.h
index 3f32f1c61..712cecd1b 100644
--- a/src/laybasic/laybasic/layLibrariesView.h
+++ b/src/laybasic/laybasic/layLibrariesView.h
@@ -250,7 +250,7 @@ private:
   QColor m_text_color;
   tl::DeferredMethod<LibrariesView> m_do_update_content_dm;
   tl::DeferredMethod<LibrariesView> m_do_full_update_content_dm;
-  std::auto_ptr<QStyle> mp_tree_style;
+  std::unique_ptr<QStyle> mp_tree_style;
   std::vector<tl::weak_ptr<db::Library> > m_libraries;
 
   //  event listener for changes in the cellview and layout
diff --git a/src/laybasic/laybasic/layMove.cc b/src/laybasic/laybasic/layMove.cc
index 611252300..bbcc94f66 100644
--- a/src/laybasic/laybasic/layMove.cc
+++ b/src/laybasic/laybasic/layMove.cc
@@ -247,7 +247,7 @@ MoveService::begin_move (db::Transaction *transaction, bool selected_after_move)
     return false;
   }
 
-  std::auto_ptr<db::Transaction> trans_holder (transaction);
+  std::unique_ptr<db::Transaction> trans_holder (transaction);
 
   bool drag_transient = ! selected_after_move;
   if (! mp_editables->has_selection ()) {
@@ -286,7 +286,7 @@ MoveService::begin_move (db::Transaction *transaction, bool selected_after_move)
 bool 
 MoveService::handle_click (const db::DPoint &p, unsigned int buttons, bool drag_transient, db::Transaction *transaction)
 {
-  std::auto_ptr<db::Transaction> trans_holder (transaction);
+  std::unique_ptr<db::Transaction> trans_holder (transaction);
 
   if (! m_dragging) {
 
diff --git a/src/laybasic/laybasic/layMove.h b/src/laybasic/laybasic/layMove.h
index 69d965945..fc45b0c6f 100644
--- a/src/laybasic/laybasic/layMove.h
+++ b/src/laybasic/laybasic/layMove.h
@@ -71,7 +71,7 @@ private:
   double m_global_grid;
   db::DPoint m_shift;
   db::DPoint m_mouse_pos;
-  std::auto_ptr<db::Transaction> mp_transaction;
+  std::unique_ptr<db::Transaction> mp_transaction;
 };
 
 }
diff --git a/src/laybasic/laybasic/layNetlistBrowserModel.h b/src/laybasic/laybasic/layNetlistBrowserModel.h
index bb8d731ee..487e2c811 100644
--- a/src/laybasic/laybasic/layNetlistBrowserModel.h
+++ b/src/laybasic/laybasic/layNetlistBrowserModel.h
@@ -377,14 +377,14 @@ private:
   db::LayoutToNetlist *mp_l2ndb;
   db::LayoutVsSchematic *mp_lvsdb;
   NetColorizer *mp_colorizer;
-  std::auto_ptr<IndexedNetlistModel> mp_indexer;
+  std::unique_ptr<IndexedNetlistModel> mp_indexer;
   mutable std::map<lay::color_t, QIcon> m_net_icon_per_color;
   mutable std::map<lay::color_t, QIcon> m_connection_icon_per_color;
   int m_object_column;
   int m_status_column;
   int m_first_column;
   int m_second_column;
-  std::auto_ptr<NetlistModelItemData> mp_root;
+  std::unique_ptr<NetlistModelItemData> mp_root;
 
   RootItemData *root () const;
 };
diff --git a/src/laybasic/laybasic/layNetlistBrowserPage.cc b/src/laybasic/laybasic/layNetlistBrowserPage.cc
index 5375ac670..429066d79 100644
--- a/src/laybasic/laybasic/layNetlistBrowserPage.cc
+++ b/src/laybasic/laybasic/layNetlistBrowserPage.cc
@@ -1381,7 +1381,7 @@ NetlistBrowserPage::export_nets (const std::vector<const db::Net *> *nets)
 
   const db::Cell &source_top = source_layout.cell (*source_layout.begin_top_down ());
 
-  std::auto_ptr<lay::NetExportDialog> dialog (new lay::NetExportDialog (this));
+  std::unique_ptr<lay::NetExportDialog> dialog (new lay::NetExportDialog (this));
   if (dialog->exec_dialog (mp_plugin_root)) {
 
     //  NOTE: mp_view and database might get reset to 0 in create_layout
diff --git a/src/laybasic/laybasic/layNetlistBrowserTreeModel.h b/src/laybasic/laybasic/layNetlistBrowserTreeModel.h
index 4becd9a5f..dfbc08d53 100644
--- a/src/laybasic/laybasic/layNetlistBrowserTreeModel.h
+++ b/src/laybasic/laybasic/layNetlistBrowserTreeModel.h
@@ -93,7 +93,7 @@ private:
 
   db::LayoutToNetlist *mp_l2ndb;
   db::LayoutVsSchematic *mp_lvsdb;
-  std::auto_ptr<IndexedNetlistModel> mp_indexer;
+  std::unique_ptr<IndexedNetlistModel> mp_indexer;
   mutable std::map<std::pair<const db::Circuit *, const db::Circuit *>, QModelIndex> m_circuits_to_index;
   int m_object_column;
   int m_status_column;
diff --git a/src/laybasic/laybasic/layRedrawThread.h b/src/laybasic/laybasic/layRedrawThread.h
index da61b68a0..1bfa9c181 100644
--- a/src/laybasic/laybasic/layRedrawThread.h
+++ b/src/laybasic/laybasic/layRedrawThread.h
@@ -123,7 +123,7 @@ private:
   QMutex m_initial_wait_lock;
   QWaitCondition m_initial_wait_cond;
 
-  std::auto_ptr<tl::SelfTimer> m_main_timer;
+  std::unique_ptr<tl::SelfTimer> m_main_timer;
 };
 
 }
diff --git a/src/laybasic/laybasic/layRedrawThreadWorker.cc b/src/laybasic/laybasic/layRedrawThreadWorker.cc
index b23405a97..5b38654b5 100644
--- a/src/laybasic/laybasic/layRedrawThreadWorker.cc
+++ b/src/laybasic/laybasic/layRedrawThreadWorker.cc
@@ -1265,7 +1265,7 @@ RedrawThreadWorker::draw_text_layer (bool drawing_context, db::cell_index_type c
     return;
   }
 
-  std::auto_ptr<lay::Bitmap> opt_bitmap;
+  std::unique_ptr<lay::Bitmap> opt_bitmap;
   lay::Bitmap *vertex_bitmap = dynamic_cast<lay::Bitmap *> (vertex);
   if (m_text_lazy_rendering && vertex_bitmap) {
     opt_bitmap.reset (new lay::Bitmap (vertex_bitmap->width (), vertex_bitmap->height (), vertex_bitmap->resolution ()));
diff --git a/src/laybasic/laybasic/layRedrawThreadWorker.h b/src/laybasic/laybasic/layRedrawThreadWorker.h
index 5e879c96b..27cd674b0 100644
--- a/src/laybasic/laybasic/layRedrawThreadWorker.h
+++ b/src/laybasic/laybasic/layRedrawThreadWorker.h
@@ -244,7 +244,7 @@ private:
   std::vector<std::pair<unsigned int, lay::CanvasPlane *> > m_buffers;
   unsigned int m_test_count;
   tl::Clock m_clock;
-  std::auto_ptr<lay::Renderer> mp_renderer;
+  std::unique_ptr<lay::Renderer> mp_renderer;
 };
 
 }
diff --git a/src/laybasic/laybasic/laySaveLayoutOptionsDialog.cc b/src/laybasic/laybasic/laySaveLayoutOptionsDialog.cc
index adbd86863..174832042 100644
--- a/src/laybasic/laybasic/laySaveLayoutOptionsDialog.cc
+++ b/src/laybasic/laybasic/laySaveLayoutOptionsDialog.cc
@@ -220,7 +220,7 @@ SaveLayoutOptionsDialog::update ()
       db::FormatSpecificWriterOptions *specific_options = m_opt_array [m_technology_index].get_options (page->second);
       if (! specific_options) {
         //  Create a container for the options unless there is one already
-        std::auto_ptr<db::FormatSpecificWriterOptions> new_options (StreamWriterPluginDeclaration::plugin_for_format (page->second)->create_specific_options ());
+        std::unique_ptr<db::FormatSpecificWriterOptions> new_options (StreamWriterPluginDeclaration::plugin_for_format (page->second)->create_specific_options ());
         page->first->setup (new_options.get (), m_tech_array [m_technology_index]);
       } else {
         page->first->setup (specific_options, m_tech_array [m_technology_index]);
@@ -385,7 +385,7 @@ SaveLayoutAsOptionsDialog::ok_button_pressed ()
     for (std::vector< std::pair<StreamWriterOptionsPage *, std::string> >::iterator page = m_pages.begin (); page != m_pages.end (); ++page) {
       if (page->second == fmt_name) {
         if (page->first) {
-          std::auto_ptr<db::FormatSpecificWriterOptions> options (decl->create_specific_options ());
+          std::unique_ptr<db::FormatSpecificWriterOptions> options (decl->create_specific_options ());
           if (options.get ()) {
             page->first->commit (options.get (), mp_tech, tl::OutputStream::output_mode_from_filename (m_filename, index_to_om (compression->currentIndex ())) != tl::OutputStream::OM_Plain);
           }
@@ -442,7 +442,7 @@ SaveLayoutAsOptionsDialog::get_options (lay::LayoutView *view, unsigned int cv_i
     const StreamWriterPluginDeclaration *decl = plugin_for_format (page->second);
     if (decl) {
 
-      std::auto_ptr<db::FormatSpecificWriterOptions> specific_options;
+      std::unique_ptr<db::FormatSpecificWriterOptions> specific_options;
       if (options.get_options (page->second)) {
         specific_options.reset (options.get_options (page->second)->clone ());
       } else {
@@ -522,7 +522,7 @@ SaveLayoutAsOptionsDialog::get_options (lay::LayoutView *view, unsigned int cv_i
       for (std::vector< std::pair<StreamWriterOptionsPage *, std::string> >::iterator page = m_pages.begin (); page != m_pages.end (); ++page) {
         if (page->second == options.format ()) {
 
-          std::auto_ptr<db::FormatSpecificWriterOptions> specific_options;
+          std::unique_ptr<db::FormatSpecificWriterOptions> specific_options;
           specific_options.reset (decl->create_specific_options ());
 
           if (specific_options.get ()) {
diff --git a/src/laybasic/laybasic/layViewObject.cc b/src/laybasic/laybasic/layViewObject.cc
index 3e04ab6a0..fdceb51bd 100644
--- a/src/laybasic/laybasic/layViewObject.cc
+++ b/src/laybasic/laybasic/layViewObject.cc
@@ -443,7 +443,7 @@ DragDropDataBase *get_drag_drop_data (const QMimeData *data)
   QByteArray ba = data->data (QString::fromUtf8 (drag_drop_mime_type ()));
 
   //  TODO: provide some global mechanism to register drag & drop classes
-  std::auto_ptr<DragDropDataBase> cd (new CellDragDropData ());
+  std::unique_ptr<DragDropDataBase> cd (new CellDragDropData ());
   if (cd->deserialize (ba)) {
     return cd.release ();
   } 
diff --git a/src/laybasic/laybasic/rdbMarkerBrowserDialog.cc b/src/laybasic/laybasic/rdbMarkerBrowserDialog.cc
index 9cc6bc9b6..777582d85 100644
--- a/src/laybasic/laybasic/rdbMarkerBrowserDialog.cc
+++ b/src/laybasic/laybasic/rdbMarkerBrowserDialog.cc
@@ -421,7 +421,7 @@ BEGIN_PROTECTED
   lay::FileDialog open_dialog (this, tl::to_string (QObject::tr ("Load Marker Database File")), fmts);
   if (open_dialog.get_open (m_open_filename)) {
 
-    std::auto_ptr <rdb::Database> db (new rdb::Database ());
+    std::unique_ptr <rdb::Database> db (new rdb::Database ());
     db->load (m_open_filename);
 
     int rdb_index = view ()->add_rdb (db.release ());
@@ -743,7 +743,7 @@ MarkerBrowserDialog::scan_layer ()
   const lay::CellView &cv = view ()->cellview (cv_index);
   const db::Layout &layout = cv->layout ();
 
-  std::auto_ptr<rdb::Database> rdb (new rdb::Database ());
+  std::unique_ptr<rdb::Database> rdb (new rdb::Database ());
   rdb->set_name ("Shapes");
   rdb->set_top_cell_name (layout.cell_name (cv.cell_index ()));
   rdb::Cell *rdb_top_cell = rdb->create_cell (rdb->top_cell_name ());
@@ -787,7 +787,7 @@ MarkerBrowserDialog::scan_layer ()
           
           for (db::ShapeIterator shape = cell.shapes ((*l)->layer_index ()).begin (db::ShapeIterator::All); ! shape.at_end (); ++shape) {
 
-            std::auto_ptr<rdb::ValueBase> value (rdb::ValueBase::create_from_shape (*shape, db::CplxTrans (layout.dbu ())));
+            std::unique_ptr<rdb::ValueBase> value (rdb::ValueBase::create_from_shape (*shape, db::CplxTrans (layout.dbu ())));
             if (value.get ()) {
               rdb::Item *item = rdb->create_item (rdb_cell->id (), cat->id ());
               item->values ().add (value.release ());
@@ -841,7 +841,7 @@ MarkerBrowserDialog::scan_layer_flat ()
   const lay::CellView &cv = view ()->cellview (cv_index);
   const db::Layout &layout = cv->layout ();
 
-  std::auto_ptr<rdb::Database> rdb (new rdb::Database ());
+  std::unique_ptr<rdb::Database> rdb (new rdb::Database ());
   rdb->set_name ("Shapes");
   rdb->set_top_cell_name (layout.cell_name (cv.cell_index ()));
   rdb::Cell *rdb_top_cell = rdb->create_cell (rdb->top_cell_name ());
@@ -866,7 +866,7 @@ MarkerBrowserDialog::scan_layer_flat ()
       db::RecursiveShapeIterator shape (layout, *cv.cell (), (*l)->layer_index ());
       while (! shape.at_end ()) {
 
-        std::auto_ptr<rdb::ValueBase> value (rdb::ValueBase::create_from_shape (*shape, db::CplxTrans (layout.dbu ()) * shape.trans ()));
+        std::unique_ptr<rdb::ValueBase> value (rdb::ValueBase::create_from_shape (*shape, db::CplxTrans (layout.dbu ()) * shape.trans ()));
         if (value.get ()) {
           rdb::Item *item = rdb->create_item (rdb_top_cell->id (), cat->id ());
           item->values ().add (value.release ());
diff --git a/src/laybasic/unit_tests/layNetlistBrowserModelTests.cc b/src/laybasic/unit_tests/layNetlistBrowserModelTests.cc
index cb4327276..83a7d059c 100644
--- a/src/laybasic/unit_tests/layNetlistBrowserModelTests.cc
+++ b/src/laybasic/unit_tests/layNetlistBrowserModelTests.cc
@@ -29,7 +29,7 @@ TEST (1)
   l2n.load (tl::testsrc () + "/testdata/lay/l2n_browser.l2n");
 
   lay::NetColorizer colorizer;
-  std::auto_ptr<lay::NetlistBrowserModel> model (new lay::NetlistBrowserModel (0, &l2n, &colorizer));
+  std::unique_ptr<lay::NetlistBrowserModel> model (new lay::NetlistBrowserModel (0, &l2n, &colorizer));
 
   EXPECT_EQ (model->hasChildren (QModelIndex ()), true);
   //  two circuits
@@ -246,7 +246,7 @@ TEST (2)
   lvs.load (tl::testsrc () + "/testdata/lay/lvsdb_browser.lvsdb");
 
   lay::NetColorizer colorizer;
-  std::auto_ptr<lay::NetlistBrowserModel> model (new lay::NetlistBrowserModel (0, &lvs, &colorizer));
+  std::unique_ptr<lay::NetlistBrowserModel> model (new lay::NetlistBrowserModel (0, &lvs, &colorizer));
 
   EXPECT_EQ (model->hasChildren (QModelIndex ()), true);
   //  two circuits
@@ -412,7 +412,7 @@ TEST (3)
   l2n.load (tl::testsrc () + "/testdata/lay/l2n_browser.l2n");
 
   lay::NetColorizer colorizer;
-  std::auto_ptr<lay::NetlistBrowserModel> model (new lay::NetlistBrowserModel (0, &l2n, &colorizer));
+  std::unique_ptr<lay::NetlistBrowserModel> model (new lay::NetlistBrowserModel (0, &l2n, &colorizer));
 
   db::Circuit *root = l2n.netlist ()->circuit_by_name ("RINGO");
   EXPECT_EQ (root != 0, true);
@@ -439,7 +439,7 @@ TEST (4)
   l2n.load (tl::testsrc () + "/testdata/lay/l2n_browser.l2n");
 
   lay::NetColorizer colorizer;
-  std::auto_ptr<lay::NetlistBrowserModel> model (new lay::NetlistBrowserModel (0, &l2n, &colorizer));
+  std::unique_ptr<lay::NetlistBrowserModel> model (new lay::NetlistBrowserModel (0, &l2n, &colorizer));
 
   db::Circuit *root = l2n.netlist ()->circuit_by_name ("RINGO");
   EXPECT_EQ (root != 0, true);
@@ -469,7 +469,7 @@ TEST (5)
   lvs.load (tl::testsrc () + "/testdata/lay/lvsdb_browser.lvsdb");
 
   lay::NetColorizer colorizer;
-  std::auto_ptr<lay::NetlistBrowserModel> model (new lay::NetlistBrowserModel (0, &lvs, &colorizer));
+  std::unique_ptr<lay::NetlistBrowserModel> model (new lay::NetlistBrowserModel (0, &lvs, &colorizer));
   QModelIndex idx;
 
   db::Circuit *root = lvs.netlist ()->circuit_by_name ("INV2PAIR");
@@ -527,7 +527,7 @@ TEST (6)
   lvs.load (tl::testsrc () + "/testdata/lay/lvsdb_browser.lvsdb");
 
   lay::NetColorizer colorizer;
-  std::auto_ptr<lay::NetlistBrowserModel> model (new lay::NetlistBrowserModel (0, &lvs, &colorizer));
+  std::unique_ptr<lay::NetlistBrowserModel> model (new lay::NetlistBrowserModel (0, &lvs, &colorizer));
   QModelIndex idx;
 
   db::Circuit *root = lvs.reference_netlist ()->circuit_by_name ("INV2PAIR");
diff --git a/src/laybasic/unit_tests/layNetlistBrowserTreeModelTests.cc b/src/laybasic/unit_tests/layNetlistBrowserTreeModelTests.cc
index 87e281c16..5b25ef55d 100644
--- a/src/laybasic/unit_tests/layNetlistBrowserTreeModelTests.cc
+++ b/src/laybasic/unit_tests/layNetlistBrowserTreeModelTests.cc
@@ -28,7 +28,7 @@ TEST (1)
   db::LayoutToNetlist l2n;
   l2n.load (tl::testsrc () + "/testdata/lay/l2n_browser.l2n");
 
-  std::auto_ptr<lay::NetlistBrowserTreeModel> model (new lay::NetlistBrowserTreeModel (0, &l2n));
+  std::unique_ptr<lay::NetlistBrowserTreeModel> model (new lay::NetlistBrowserTreeModel (0, &l2n));
 
   EXPECT_EQ (model->hasChildren (QModelIndex ()), true);
   //  two circuits
@@ -60,7 +60,7 @@ TEST (2)
   db::LayoutVsSchematic lvs;
   lvs.load (tl::testsrc () + "/testdata/lay/lvsdb_browser.lvsdb");
 
-  std::auto_ptr<lay::NetlistBrowserTreeModel> model (new lay::NetlistBrowserTreeModel (0, &lvs));
+  std::unique_ptr<lay::NetlistBrowserTreeModel> model (new lay::NetlistBrowserTreeModel (0, &lvs));
 
   EXPECT_EQ (model->hasChildren (QModelIndex ()), true);
   //  two top circuits
diff --git a/src/lym/lym/lymMacro.cc b/src/lym/lym/lymMacro.cc
index 610de3f24..17026ae56 100644
--- a/src/lym/lym/lymMacro.cc
+++ b/src/lym/lym/lymMacro.cc
@@ -1429,7 +1429,7 @@ void MacroCollection::scan (const std::string &path)
     QStringList files = dir.entryList (filters, QDir::Files);
     for (QStringList::ConstIterator f = files.begin (); f != files.end (); ++f) {
 
-      std::auto_ptr<lym::Macro> new_macro;
+      std::unique_ptr<lym::Macro> new_macro;
 
       try {
 
diff --git a/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc b/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc
index b7a6425f0..68ec18f34 100644
--- a/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc
+++ b/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc
@@ -902,10 +902,10 @@ DEFImporter::read_vias (db::Layout & /*layout*/, db::Cell & /*design*/, double s
     ViaDesc &vd = m_via_desc.insert (std::make_pair (n, ViaDesc ())).first->second;
 
     //  produce a cell for vias
-    std::auto_ptr<RuleBasedViaGenerator> rule_based_vg;
-    std::auto_ptr<GeometryBasedLayoutGenerator> geo_based_vg;
+    std::unique_ptr<RuleBasedViaGenerator> rule_based_vg;
+    std::unique_ptr<GeometryBasedLayoutGenerator> geo_based_vg;
 
-    std::auto_ptr<LEFDEFLayoutGenerator> via_generator;
+    std::unique_ptr<LEFDEFLayoutGenerator> via_generator;
     std::set<std::string> seen_layers;
     std::vector<std::string> routing_layers;
 
diff --git a/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.cc b/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.cc
index b00e6c065..4e859aaca 100644
--- a/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.cc
+++ b/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.cc
@@ -643,11 +643,11 @@ LEFImporter::read_viadef (Layout &layout)
   test (";");
 
   if (test ("VIARULE")) {
-    std::auto_ptr<RuleBasedViaGenerator> vg (new RuleBasedViaGenerator ());
+    std::unique_ptr<RuleBasedViaGenerator> vg (new RuleBasedViaGenerator ());
     read_viadef_by_rule (vg.get (), via_desc, n, layout.dbu ());
     reader_state ()->register_via_cell (n, vg.release ());
   } else {
-    std::auto_ptr<GeometryBasedLayoutGenerator> vg (new GeometryBasedLayoutGenerator ());
+    std::unique_ptr<GeometryBasedLayoutGenerator> vg (new GeometryBasedLayoutGenerator ());
     read_viadef_by_geometry (vg.get (), via_desc, n, layout.dbu ());
     reader_state ()->register_via_cell (n, vg.release ());
   }
diff --git a/src/plugins/streamers/lefdef/lay_plugin/layLEFDEFImport.cc b/src/plugins/streamers/lefdef/lay_plugin/layLEFDEFImport.cc
index e0cebfd07..9f5051c68 100644
--- a/src/plugins/streamers/lefdef/lay_plugin/layLEFDEFImport.cc
+++ b/src/plugins/streamers/lefdef/lay_plugin/layLEFDEFImport.cc
@@ -123,7 +123,7 @@ public:
         }
         config_root->config_end ();
 
-        std::auto_ptr<db::Layout> layout (new db::Layout ());
+        std::unique_ptr<db::Layout> layout (new db::Layout ());
 
         tl::InputStream stream (data.file);
 
diff --git a/src/plugins/tools/net_tracer/db_plugin/dbNetTracer.cc b/src/plugins/tools/net_tracer/db_plugin/dbNetTracer.cc
index 2bc6661f6..6baf4ea98 100644
--- a/src/plugins/tools/net_tracer/db_plugin/dbNetTracer.cc
+++ b/src/plugins/tools/net_tracer/db_plugin/dbNetTracer.cc
@@ -817,7 +817,7 @@ NetTracerLayerExpression::make_l2n_region (db::LayoutToNetlist &l2n, std::map <u
     rhb = make_l2n_region_for_org (l2n, region_cache, m_b, std::string ());
   }
 
-  std::auto_ptr<db::Region> res (new db::Region (*rha->get ()));
+  std::unique_ptr<db::Region> res (new db::Region (*rha->get ()));
 
   if (m_op == OPAnd) {
     *res &= *rhb->get ();
diff --git a/src/plugins/tools/net_tracer/db_plugin/dbNetTracerIO.cc b/src/plugins/tools/net_tracer/db_plugin/dbNetTracerIO.cc
index ac551836d..59b373f3b 100644
--- a/src/plugins/tools/net_tracer/db_plugin/dbNetTracerIO.cc
+++ b/src/plugins/tools/net_tracer/db_plugin/dbNetTracerIO.cc
@@ -254,7 +254,7 @@ NetTracerConnectionInfo::NetTracerConnectionInfo (const NetTracerLayerExpression
 
 static int get_layer_id (const NetTracerLayerExpressionInfo &e, const db::Layout &layout, const NetTracerTechnologyComponent &tech, NetTracerData *data)
 {
-  std::auto_ptr<NetTracerLayerExpression> expr_in (NetTracerLayerExpressionInfo::compile (e.to_string ()).get (layout, tech));
+  std::unique_ptr<NetTracerLayerExpression> expr_in (NetTracerLayerExpressionInfo::compile (e.to_string ()).get (layout, tech));
   int l = expr_in->alias_for ();
   if (l < 0 && data) {
     l = data->find_symbol (e.to_string ());
@@ -531,7 +531,7 @@ NetTracerTechnologyComponent::get_tracer_data (const db::Layout &layout) const
       throw tl::Exception (tl::to_string (tr ("Missing expression on symbol specification #%d")), n);
     }
     try {
-      std::auto_ptr<NetTracerLayerExpression> expr_in (NetTracerLayerExpressionInfo::compile (s->expression ()).get (layout, *this));
+      std::unique_ptr<NetTracerLayerExpression> expr_in (NetTracerLayerExpressionInfo::compile (s->expression ()).get (layout, *this));
     } catch (tl::Exception &ex) {
       throw tl::Exception (tl::to_string (tr ("Error compiling expression '%s' (symbol #%d): %s")), s->expression (), n, ex.msg ());
     }
diff --git a/src/plugins/tools/net_tracer/lay_plugin/layNetTracerDialog.cc b/src/plugins/tools/net_tracer/lay_plugin/layNetTracerDialog.cc
index fbf4da20d..8c1421bf7 100644
--- a/src/plugins/tools/net_tracer/lay_plugin/layNetTracerDialog.cc
+++ b/src/plugins/tools/net_tracer/lay_plugin/layNetTracerDialog.cc
@@ -573,7 +573,7 @@ NetTracerDialog::menu_activated (const std::string &symbol)
     const lay::CellView &cv = view ()->cellview (view ()->active_cellview_index ());
     if (cv.is_valid ()) {
       db::RecursiveShapeIterator si (cv->layout (), *cv.cell (), std::vector<unsigned int> ());
-      std::auto_ptr <db::LayoutToNetlist> l2ndb (new db::LayoutToNetlist (si));
+      std::unique_ptr <db::LayoutToNetlist> l2ndb (new db::LayoutToNetlist (si));
       trace_all_nets (l2ndb.get (), cv, flat);
       unsigned int l2ndb_index = view ()->add_l2ndb (l2ndb.release ());
       view ()->open_l2ndb_browser (l2ndb_index, view ()->index_of_cellview (&cv));
diff --git a/src/plugins/tools/view_25d/lay_plugin/layD25ViewWidget.h b/src/plugins/tools/view_25d/lay_plugin/layD25ViewWidget.h
index 8054cd8d7..6c5e21995 100644
--- a/src/plugins/tools/view_25d/lay_plugin/layD25ViewWidget.h
+++ b/src/plugins/tools/view_25d/lay_plugin/layD25ViewWidget.h
@@ -123,7 +123,7 @@ public slots:
 private:
   typedef lay::mem_chunks<GLfloat, 1024 * 18> chunks_type;
 
-  std::auto_ptr<D25InteractionMode> mp_mode;
+  std::unique_ptr<D25InteractionMode> mp_mode;
   QOpenGLShaderProgram *m_shapes_program, *m_gridplane_program;
   std::string m_error;
   double m_scale_factor;
diff --git a/src/pya/pya/pya.h b/src/pya/pya/pya.h
index 00ddd67cc..ae8423c6d 100644
--- a/src/pya/pya/pya.h
+++ b/src/pya/pya/pya.h
@@ -286,7 +286,7 @@ private:
   std::map<PyObject *, size_t> m_file_id_map;
   wchar_t *mp_py3_app_name;
   bool m_embedded;
-  std::auto_ptr<pya::PythonModule> m_pya_module;
+  std::unique_ptr<pya::PythonModule> m_pya_module;
 };
 
 }
diff --git a/src/pya/pya/pyaMarshal.cc b/src/pya/pya/pyaMarshal.cc
index c52714766..827240aa0 100644
--- a/src/pya/pya/pyaMarshal.cc
+++ b/src/pya/pya/pyaMarshal.cc
@@ -524,7 +524,7 @@ struct reader<gsi::StringType>
 {
   void operator() (gsi::SerialArgs *rr, PythonRef *ret, PYAObjectBase * /*self*/, const gsi::ArgType &, tl::Heap *heap)
   {
-    std::auto_ptr<gsi::StringAdaptor> a ((gsi::StringAdaptor *) rr->read<void *>(*heap));
+    std::unique_ptr<gsi::StringAdaptor> a ((gsi::StringAdaptor *) rr->read<void *>(*heap));
     if (!a.get ()) {
       *ret = PythonRef (Py_None, false /*borrowed*/);
     } else {
@@ -599,7 +599,7 @@ struct reader<gsi::VariantType>
 {
   void operator() (gsi::SerialArgs *rr, PythonRef *ret, PYAObjectBase *self, const gsi::ArgType &atype, tl::Heap *heap)
   {
-    std::auto_ptr<gsi::VariantAdaptor> a ((gsi::VariantAdaptor *) rr->read<void *>(*heap));
+    std::unique_ptr<gsi::VariantAdaptor> a ((gsi::VariantAdaptor *) rr->read<void *>(*heap));
     if (!a.get ()) {
       *ret = PythonRef (Py_None, false /*borrowed*/);
     } else {
@@ -623,7 +623,7 @@ struct reader<gsi::VectorType>
 {
   void operator() (gsi::SerialArgs *rr, PythonRef *ret, PYAObjectBase * /*self*/, const gsi::ArgType &atype, tl::Heap *heap)
   {
-    std::auto_ptr<gsi::VectorAdaptor> a ((gsi::VectorAdaptor *) rr->read<void *>(*heap));
+    std::unique_ptr<gsi::VectorAdaptor> a ((gsi::VectorAdaptor *) rr->read<void *>(*heap));
     if (!a.get ()) {
       *ret = PythonRef (Py_None, false /*borrowed*/);
     } else {
@@ -643,7 +643,7 @@ struct reader<gsi::MapType>
 {
   void operator() (gsi::SerialArgs *rr, PythonRef *ret, PYAObjectBase * /*self*/, const gsi::ArgType &atype, tl::Heap *heap)
   {
-    std::auto_ptr<gsi::MapAdaptor> a ((gsi::MapAdaptor *) rr->read<void *>(*heap));
+    std::unique_ptr<gsi::MapAdaptor> a ((gsi::MapAdaptor *) rr->read<void *>(*heap));
     if (!a.get ()) {
       *ret = PythonRef (Py_None, false /*borrowed*/);
     } else {
diff --git a/src/rba/rba/rba.cc b/src/rba/rba/rba.cc
index ba80f8b8c..17e970ddd 100644
--- a/src/rba/rba/rba.cc
+++ b/src/rba/rba/rba.cc
@@ -1093,7 +1093,7 @@ method_adaptor (int mid, int argc, VALUE *argv, VALUE self, bool ctor)
 
         ret = Qnil;
 
-        std::auto_ptr<gsi::IterAdaptorAbstractBase> iter ((gsi::IterAdaptorAbstractBase *) retlist.read<void *> (heap));
+        std::unique_ptr<gsi::IterAdaptorAbstractBase> iter ((gsi::IterAdaptorAbstractBase *) retlist.read<void *> (heap));
         if (iter.get ()) {
 
           try {
diff --git a/src/rba/rba/rbaMarshal.cc b/src/rba/rba/rbaMarshal.cc
index 6f7db041f..30ea8fa6c 100644
--- a/src/rba/rba/rbaMarshal.cc
+++ b/src/rba/rba/rbaMarshal.cc
@@ -547,7 +547,7 @@ struct reader<gsi::StringType>
 {
   void operator() (gsi::SerialArgs *rr, VALUE *ret, Proxy * /*self*/, const gsi::ArgType &, tl::Heap *heap)
   {
-    std::auto_ptr<gsi::StringAdaptor> a ((gsi::StringAdaptor *) rr->read<void *>(*heap));
+    std::unique_ptr<gsi::StringAdaptor> a ((gsi::StringAdaptor *) rr->read<void *>(*heap));
     if (!a.get ()) {
       *ret = Qnil;
     } else {
@@ -621,7 +621,7 @@ struct reader<gsi::VariantType>
 {
   void operator() (gsi::SerialArgs *rr, VALUE *ret, Proxy *self, const gsi::ArgType &atype, tl::Heap *heap)
   {
-    std::auto_ptr<gsi::VariantAdaptor> a ((gsi::VariantAdaptor *) rr->read<void *>(*heap));
+    std::unique_ptr<gsi::VariantAdaptor> a ((gsi::VariantAdaptor *) rr->read<void *>(*heap));
     if (!a.get ()) {
       *ret = Qnil;
     } else {
@@ -645,7 +645,7 @@ struct reader<gsi::VectorType>
 {
   void operator() (gsi::SerialArgs *rr, VALUE *ret, Proxy * /*self*/, const gsi::ArgType &atype, tl::Heap *heap)
   {
-    std::auto_ptr<gsi::VectorAdaptor> a ((gsi::VectorAdaptor *) rr->read<void *>(*heap));
+    std::unique_ptr<gsi::VectorAdaptor> a ((gsi::VectorAdaptor *) rr->read<void *>(*heap));
     if (!a.get ()) {
       *ret = Qnil;
     } else {
@@ -665,7 +665,7 @@ struct reader<gsi::MapType>
 {
   void operator() (gsi::SerialArgs *rr, VALUE *ret, Proxy * /*self*/, const gsi::ArgType &atype, tl::Heap *heap)
   {
-    std::auto_ptr<gsi::MapAdaptor> a ((gsi::MapAdaptor *) rr->read<void *>(*heap));
+    std::unique_ptr<gsi::MapAdaptor> a ((gsi::MapAdaptor *) rr->read<void *>(*heap));
     if (!a.get ()) {
       *ret = Qnil;
     } else {
diff --git a/src/rdb/rdb/rdb.h b/src/rdb/rdb/rdb.h
index 5213a7b0e..6c08e6d3d 100644
--- a/src/rdb/rdb/rdb.h
+++ b/src/rdb/rdb/rdb.h
@@ -999,7 +999,7 @@ private:
   std::vector <bool> m_tag_ids;
   Database *mp_database;
 #if defined(HAVE_QT)
-  std::auto_ptr<QImage> mp_image;
+  std::unique_ptr<QImage> mp_image;
 #endif
 
   Item ();
diff --git a/src/rdb/rdb/rdbUtils.cc b/src/rdb/rdb/rdbUtils.cc
index d56c07435..931da36c0 100644
--- a/src/rdb/rdb/rdbUtils.cc
+++ b/src/rdb/rdb/rdbUtils.cc
@@ -241,7 +241,7 @@ scan_layer (rdb::Category *cat, rdb::Cell *cell, const db::CplxTrans &trans, con
     return;
   }
 
-  std::auto_ptr<db::RecursiveShapeReceiver> rec;
+  std::unique_ptr<db::RecursiveShapeReceiver> rec;
   if (flat) {
     rec.reset (new CreateItemsFlatReceiver (cat, trans, cell));
   } else {
@@ -259,7 +259,7 @@ void create_items_from_iterator (rdb::Database *db, rdb::id_type cell_id, rdb::i
   double dbu = iter.layout ()->dbu ();
 
   for (db::RecursiveShapeIterator i = iter; !i.at_end (); ++i) {
-    std::auto_ptr<rdb::ValueBase> value (rdb::ValueBase::create_from_shape (*i, db::CplxTrans (dbu) * i.trans ()));
+    std::unique_ptr<rdb::ValueBase> value (rdb::ValueBase::create_from_shape (*i, db::CplxTrans (dbu) * i.trans ()));
     if (value.get ()) {
       rdb::Item *item = db->create_item (cell_id, cat_id);
       item->values ().add (value.release ());
@@ -270,7 +270,7 @@ void create_items_from_iterator (rdb::Database *db, rdb::id_type cell_id, rdb::i
 void create_items_from_shapes (rdb::Database *db, rdb::id_type cell_id, rdb::id_type cat_id, const db::CplxTrans &trans, const db::Shapes &shapes)
 {
   for (db::Shapes::shape_iterator s = shapes.begin (db::ShapeIterator::All); !s.at_end (); ++s) {
-    std::auto_ptr<rdb::ValueBase> value (rdb::ValueBase::create_from_shape (*s, trans));
+    std::unique_ptr<rdb::ValueBase> value (rdb::ValueBase::create_from_shape (*s, trans));
     if (value.get ()) {
       rdb::Item *item = db->create_item (cell_id, cat_id);
       item->values ().add (value.release ());
@@ -280,7 +280,7 @@ void create_items_from_shapes (rdb::Database *db, rdb::id_type cell_id, rdb::id_
 
 void create_item_from_shape (rdb::Database *db, rdb::id_type cell_id, rdb::id_type cat_id, const db::CplxTrans &trans, const db::Shape &shape)
 {
-  std::auto_ptr<rdb::ValueBase> value (rdb::ValueBase::create_from_shape (shape, trans));
+  std::unique_ptr<rdb::ValueBase> value (rdb::ValueBase::create_from_shape (shape, trans));
   if (value.get ()) {
     rdb::Item *item = db->create_item (cell_id, cat_id);
     item->values ().add (value.release ());
diff --git a/src/tl/tl/tlExpression.cc b/src/tl/tl/tlExpression.cc
index 43552a4cf..ee7d5a031 100644
--- a/src/tl/tl/tlExpression.cc
+++ b/src/tl/tl/tlExpression.cc
@@ -3158,7 +3158,7 @@ Eval::define_function (const std::string &name, EvalFunction *function)
 }
 
 void
-Eval::eval_top (ExpressionParserContext &ex, std::auto_ptr<ExpressionNode> &n)
+Eval::eval_top (ExpressionParserContext &ex, std::unique_ptr<ExpressionNode> &n)
 {
   do {
 
@@ -3171,7 +3171,7 @@ Eval::eval_top (ExpressionParserContext &ex, std::auto_ptr<ExpressionNode> &n)
 
     } else {
 
-      std::auto_ptr<ExpressionNode> nn;
+      std::unique_ptr<ExpressionNode> nn;
 
       ExpressionParserContext ex1 = ex;
 
@@ -3182,7 +3182,7 @@ Eval::eval_top (ExpressionParserContext &ex, std::auto_ptr<ExpressionNode> &n)
         ExpressionParserContext exb = ex;
         if (! exb.test ("=>") && ! exb.test ("==") && ex.test ("=")) {
 
-          std::auto_ptr<ExpressionNode> b;
+          std::unique_ptr<ExpressionNode> b;
           eval_assign (ex, b);
           nn.reset (new AssignExpressionNode (ex1, nn.release (), b.release ()));
 
@@ -3213,7 +3213,7 @@ Eval::eval_top (ExpressionParserContext &ex, std::auto_ptr<ExpressionNode> &n)
 }
 
 void
-Eval::eval_assign (ExpressionParserContext &ex, std::auto_ptr<ExpressionNode> &n)
+Eval::eval_assign (ExpressionParserContext &ex, std::unique_ptr<ExpressionNode> &n)
 {
   eval_if (ex, n);
 
@@ -3222,7 +3222,7 @@ Eval::eval_assign (ExpressionParserContext &ex, std::auto_ptr<ExpressionNode> &n
   if (! exb.test ("=>") && ! exb.test ("==") && ex.test ("=")) {
 
     exb = ex;
-    std::auto_ptr<ExpressionNode> b;
+    std::unique_ptr<ExpressionNode> b;
     eval_assign (ex, b);
     n.reset (new AssignExpressionNode (ex1, n.release (), b.release ()));
 
@@ -3230,14 +3230,14 @@ Eval::eval_assign (ExpressionParserContext &ex, std::auto_ptr<ExpressionNode> &n
 }
 
 void
-Eval::eval_if (ExpressionParserContext &ex, std::auto_ptr<ExpressionNode> &n)
+Eval::eval_if (ExpressionParserContext &ex, std::unique_ptr<ExpressionNode> &n)
 {
   eval_boolean (ex, n);
 
   ExpressionParserContext ex1 = ex;
   if (ex.test ("?")) {
 
-    std::auto_ptr<ExpressionNode> b, c;
+    std::unique_ptr<ExpressionNode> b, c;
     eval_if (ex, b);
     if (! ex.test (":")) {
       throw EvalError (tl::to_string (tr ("Expected ':'")), ex);
@@ -3249,7 +3249,7 @@ Eval::eval_if (ExpressionParserContext &ex, std::auto_ptr<ExpressionNode> &n)
 }
 
 void
-Eval::eval_boolean (ExpressionParserContext &ex, std::auto_ptr<ExpressionNode> &n)
+Eval::eval_boolean (ExpressionParserContext &ex, std::unique_ptr<ExpressionNode> &n)
 {
   eval_conditional (ex, n);
 
@@ -3258,13 +3258,13 @@ Eval::eval_boolean (ExpressionParserContext &ex, std::auto_ptr<ExpressionNode> &
     ExpressionParserContext ex1 = ex;
     if (ex.test("||")) {
 
-      std::auto_ptr<ExpressionNode> b;
+      std::unique_ptr<ExpressionNode> b;
       eval_conditional (ex, b);
       n.reset (new LogOrExpressionNode (ex1, n.release (), b.release ()));
 
     } else if (ex.test ("&&")) {
 
-      std::auto_ptr<ExpressionNode> b;
+      std::unique_ptr<ExpressionNode> b;
       eval_conditional (ex, b);
       n.reset (new LogAndExpressionNode (ex1, n.release (), b.release ()));
 
@@ -3276,7 +3276,7 @@ Eval::eval_boolean (ExpressionParserContext &ex, std::auto_ptr<ExpressionNode> &
 }
 
 void
-Eval::eval_conditional (ExpressionParserContext &ex, std::auto_ptr<ExpressionNode> &n)
+Eval::eval_conditional (ExpressionParserContext &ex, std::unique_ptr<ExpressionNode> &n)
 {
   eval_shift (ex, n);
 
@@ -3285,49 +3285,49 @@ Eval::eval_conditional (ExpressionParserContext &ex, std::auto_ptr<ExpressionNod
     ExpressionParserContext ex1 = ex;
     if (ex.test("<=")) {
 
-      std::auto_ptr<ExpressionNode> b;
+      std::unique_ptr<ExpressionNode> b;
       eval_shift (ex, b);
       n.reset (new LessOrEqualExpressionNode (ex1, n.release (), b.release ()));
 
     } else if (ex.test("<")) {
 
-      std::auto_ptr<ExpressionNode> b;
+      std::unique_ptr<ExpressionNode> b;
       eval_shift (ex, b);
       n.reset (new LessExpressionNode (ex1, n.release (), b.release ()));
 
     } else if (ex.test(">=")) {
 
-      std::auto_ptr<ExpressionNode> b;
+      std::unique_ptr<ExpressionNode> b;
       eval_shift (ex, b);
       n.reset (new GreaterOrEqualExpressionNode (ex1, n.release (), b.release ()));
 
     } else if (ex.test(">")) {
 
-      std::auto_ptr<ExpressionNode> b;
+      std::unique_ptr<ExpressionNode> b;
       eval_shift (ex, b);
       n.reset (new GreaterExpressionNode (ex1, n.release (), b.release ()));
 
     } else if (ex.test("==")) {
 
-      std::auto_ptr<ExpressionNode> b;
+      std::unique_ptr<ExpressionNode> b;
       eval_shift (ex, b);
       n.reset (new EqualExpressionNode (ex1, n.release (), b.release ()));
 
     } else if (ex.test("!=")) {
 
-      std::auto_ptr<ExpressionNode> b;
+      std::unique_ptr<ExpressionNode> b;
       eval_shift (ex, b);
       n.reset (new NotEqualExpressionNode (ex1, n.release (), b.release ()));
 
     } else if (ex.test("~")) {
 
-      std::auto_ptr<ExpressionNode> b;
+      std::unique_ptr<ExpressionNode> b;
       eval_shift (ex, b);
       n.reset (new MatchExpressionNode (ex1, n.release (), b.release (), this));
 
     } else if (ex.test("!~")) {
 
-      std::auto_ptr<ExpressionNode> b;
+      std::unique_ptr<ExpressionNode> b;
       eval_shift (ex, b);
       n.reset (new NoMatchExpressionNode (ex1, n.release (), b.release ()));
 
@@ -3339,7 +3339,7 @@ Eval::eval_conditional (ExpressionParserContext &ex, std::auto_ptr<ExpressionNod
 }
 
 void
-Eval::eval_shift (ExpressionParserContext &ex, std::auto_ptr<ExpressionNode> &n)
+Eval::eval_shift (ExpressionParserContext &ex, std::unique_ptr<ExpressionNode> &n)
 {
   eval_addsub (ex, n);
 
@@ -3348,13 +3348,13 @@ Eval::eval_shift (ExpressionParserContext &ex, std::auto_ptr<ExpressionNode> &n)
     ExpressionParserContext ex1 = ex;
     if (ex.test("<<")) {
 
-      std::auto_ptr<ExpressionNode> b;
+      std::unique_ptr<ExpressionNode> b;
       eval_addsub (ex, b);
       n.reset (new ShiftLeftExpressionNode (ex1, n.release (), b.release ()));
 
     } else if (ex.test(">>")) {
 
-      std::auto_ptr<ExpressionNode> b;
+      std::unique_ptr<ExpressionNode> b;
       eval_addsub (ex, b);
       n.reset (new ShiftRightExpressionNode (ex1, n.release (), b.release ()));
 
@@ -3366,7 +3366,7 @@ Eval::eval_shift (ExpressionParserContext &ex, std::auto_ptr<ExpressionNode> &n)
 }
 
 void
-Eval::eval_addsub (ExpressionParserContext &ex, std::auto_ptr<ExpressionNode> &n)
+Eval::eval_addsub (ExpressionParserContext &ex, std::unique_ptr<ExpressionNode> &n)
 {
   eval_product (ex, n);
 
@@ -3375,13 +3375,13 @@ Eval::eval_addsub (ExpressionParserContext &ex, std::auto_ptr<ExpressionNode> &n
     ExpressionParserContext ex1 = ex;
     if (ex.test("+")) {
 
-      std::auto_ptr<ExpressionNode> b;
+      std::unique_ptr<ExpressionNode> b;
       eval_product (ex, b);
       n.reset (new PlusExpressionNode (ex1, n.release (), b.release ()));
 
     } else if (ex.test("-")) {
 
-      std::auto_ptr<ExpressionNode> b;
+      std::unique_ptr<ExpressionNode> b;
       eval_product (ex, b);
       n.reset (new MinusExpressionNode (ex1, n.release (), b.release ()));
 
@@ -3393,7 +3393,7 @@ Eval::eval_addsub (ExpressionParserContext &ex, std::auto_ptr<ExpressionNode> &n
 }
 
 void
-Eval::eval_product (ExpressionParserContext &ex, std::auto_ptr<ExpressionNode> &n)
+Eval::eval_product (ExpressionParserContext &ex, std::unique_ptr<ExpressionNode> &n)
 {
   eval_bitwise (ex, n);
 
@@ -3402,19 +3402,19 @@ Eval::eval_product (ExpressionParserContext &ex, std::auto_ptr<ExpressionNode> &
     ExpressionParserContext ex1 = ex;
     if (ex.test("*")) {
 
-      std::auto_ptr<ExpressionNode> b;
+      std::unique_ptr<ExpressionNode> b;
       eval_bitwise (ex, b);
       n.reset (new StarExpressionNode (ex1, n.release (), b.release ()));
 
     } else if (ex.test("/")) {
 
-      std::auto_ptr<ExpressionNode> b;
+      std::unique_ptr<ExpressionNode> b;
       eval_bitwise (ex, b);
       n.reset (new SlashExpressionNode (ex1, n.release (), b.release ()));
 
     } else if (ex.test("%")) {
 
-      std::auto_ptr<ExpressionNode> b;
+      std::unique_ptr<ExpressionNode> b;
       eval_bitwise (ex, b);
       n.reset (new PercentExpressionNode (ex1, n.release (), b.release ()));
 
@@ -3426,7 +3426,7 @@ Eval::eval_product (ExpressionParserContext &ex, std::auto_ptr<ExpressionNode> &
 }
 
 void
-Eval::eval_bitwise (ExpressionParserContext &ex, std::auto_ptr<ExpressionNode> &n)
+Eval::eval_bitwise (ExpressionParserContext &ex, std::unique_ptr<ExpressionNode> &n)
 {
   eval_unary (ex, n);
 
@@ -3440,19 +3440,19 @@ Eval::eval_bitwise (ExpressionParserContext &ex, std::auto_ptr<ExpressionNode> &
       break; // not handled here
     } else if (ex.test("&")) {
 
-      std::auto_ptr<ExpressionNode> b;
+      std::unique_ptr<ExpressionNode> b;
       eval_unary (ex, b);
       n.reset (new AmpersandExpressionNode (ex1, n.release (), b.release ()));
 
     } else if (ex.test("|")) {
 
-      std::auto_ptr<ExpressionNode> b;
+      std::unique_ptr<ExpressionNode> b;
       eval_unary (ex, b);
       n.reset (new PipeExpressionNode (ex1, n.release (), b.release ()));
 
     } else if (ex.test("^")) {
 
-      std::auto_ptr<ExpressionNode> b;
+      std::unique_ptr<ExpressionNode> b;
       eval_unary (ex, b);
       n.reset (new AcuteExpressionNode (ex1, n.release (), b.release ()));
 
@@ -3464,7 +3464,7 @@ Eval::eval_bitwise (ExpressionParserContext &ex, std::auto_ptr<ExpressionNode> &
 }
 
 void
-Eval::eval_unary (ExpressionParserContext &ex, std::auto_ptr<ExpressionNode> &n)
+Eval::eval_unary (ExpressionParserContext &ex, std::unique_ptr<ExpressionNode> &n)
 {
   ExpressionParserContext ex1 = ex;
   if (ex.test ("!")) {
@@ -3496,7 +3496,7 @@ static const char *operator_methods[] =
 };
 
 void
-Eval::eval_suffix (ExpressionParserContext &ex, std::auto_ptr<ExpressionNode> &n)
+Eval::eval_suffix (ExpressionParserContext &ex, std::unique_ptr<ExpressionNode> &n)
 {
   eval_atomic (ex, n, 1);
 
@@ -3530,7 +3530,7 @@ Eval::eval_suffix (ExpressionParserContext &ex, std::auto_ptr<ExpressionNode> &n
 
         t += "=";
 
-        std::auto_ptr<ExpressionNode> a;
+        std::unique_ptr<ExpressionNode> a;
         eval_assign (ex, a);
 
         MethodExpressionNode *m = new MethodExpressionNode (ex1, t);
@@ -3549,7 +3549,7 @@ Eval::eval_suffix (ExpressionParserContext &ex, std::auto_ptr<ExpressionNode> &n
 
           do {
 
-            std::auto_ptr<ExpressionNode> a;
+            std::unique_ptr<ExpressionNode> a;
             eval_assign (ex, a);
             m->add_child (a.release ());
 
@@ -3573,7 +3573,7 @@ Eval::eval_suffix (ExpressionParserContext &ex, std::auto_ptr<ExpressionNode> &n
 
     } else if (ex.test ("[")) {
 
-      std::auto_ptr<ExpressionNode> a;
+      std::unique_ptr<ExpressionNode> a;
       eval_top (ex, a);
       n.reset (new IndexExpressionNode (ex1, n.release (), a.release ()));
 
@@ -3615,7 +3615,7 @@ scan_angle_bracket (tl::Extractor &ex, const char *term, std::string &s)
 }
 
 void
-Eval::eval_atomic (ExpressionParserContext &ex, std::auto_ptr<ExpressionNode> &n, int am)
+Eval::eval_atomic (ExpressionParserContext &ex, std::unique_ptr<ExpressionNode> &n, int am)
 {
   double g = 0.0;
   std::string t;
@@ -3636,7 +3636,7 @@ Eval::eval_atomic (ExpressionParserContext &ex, std::auto_ptr<ExpressionNode> &n
 
       do {
 
-        std::auto_ptr<ExpressionNode> a;
+        std::unique_ptr<ExpressionNode> a;
         eval_top (ex, a);
         n->add_child (a.release ());
 
@@ -3730,12 +3730,12 @@ Eval::eval_atomic (ExpressionParserContext &ex, std::auto_ptr<ExpressionNode> &n
       do {
 
         ExpressionParserContext ex2 = ex;
-        std::auto_ptr<ExpressionNode> k;
+        std::unique_ptr<ExpressionNode> k;
         eval_top (ex, k);
         n->add_child (k.release ());
 
         if (ex.test ("=>")) {
-          std::auto_ptr<ExpressionNode> v;
+          std::unique_ptr<ExpressionNode> v;
           eval_top (ex, v);
           n->add_child (v.release ());
         } else {
@@ -3891,7 +3891,7 @@ Eval::eval_atomic (ExpressionParserContext &ex, std::auto_ptr<ExpressionNode> &n
 
           do {
 
-            std::auto_ptr<ExpressionNode> v;
+            std::unique_ptr<ExpressionNode> v;
             eval_top (ex, v);
             n->add_child (v.release ());
 
@@ -4021,7 +4021,7 @@ Eval::parse_expr (tl::Extractor &ex, bool top)
   tl::Extractor ex0 = ex;
   ExpressionParserContext context (&expr, ex);
 
-  std::auto_ptr<ExpressionNode> n;
+  std::unique_ptr<ExpressionNode> n;
   if (top) {
     eval.eval_top (context, n);
   } else {
diff --git a/src/tl/tl/tlExpression.h b/src/tl/tl/tlExpression.h
index 983392349..325f11914 100644
--- a/src/tl/tl/tlExpression.h
+++ b/src/tl/tl/tlExpression.h
@@ -331,7 +331,7 @@ public:
 private:
   const char *mp_text;
   std::string m_local_text;
-  std::auto_ptr<ExpressionNode> m_root;
+  std::unique_ptr<ExpressionNode> m_root;
   Eval *mp_eval;
 
   friend class Eval;
@@ -349,7 +349,7 @@ private:
   /**
    *  @brief Accessor to the root node
    */
-  std::auto_ptr<ExpressionNode> &root () 
+  std::unique_ptr<ExpressionNode> &root () 
   {
     return m_root;
   }
@@ -520,18 +520,18 @@ private:
   const ContextHandler *mp_ctx_handler;
   std::vector<std::string> m_match_substrings;
 
-  void eval_top (ExpressionParserContext &context, std::auto_ptr<ExpressionNode> &v);
-  void eval_assign (ExpressionParserContext &context, std::auto_ptr<ExpressionNode> &v);
-  void eval_if (ExpressionParserContext &context, std::auto_ptr<ExpressionNode> &v);
-  void eval_boolean (ExpressionParserContext &context, std::auto_ptr<ExpressionNode> &v);
-  void eval_conditional (ExpressionParserContext &context, std::auto_ptr<ExpressionNode> &v);
-  void eval_shift (ExpressionParserContext &context, std::auto_ptr<ExpressionNode> &v);
-  void eval_addsub (ExpressionParserContext &context, std::auto_ptr<ExpressionNode> &v);
-  void eval_product (ExpressionParserContext &context, std::auto_ptr<ExpressionNode> &v);
-  void eval_bitwise (ExpressionParserContext &context, std::auto_ptr<ExpressionNode> &v);
-  void eval_unary (ExpressionParserContext &context, std::auto_ptr<ExpressionNode> &v);
-  void eval_atomic (ExpressionParserContext &context, std::auto_ptr<ExpressionNode> &v, int am);
-  void eval_suffix (ExpressionParserContext &context, std::auto_ptr<ExpressionNode> &v);
+  void eval_top (ExpressionParserContext &context, std::unique_ptr<ExpressionNode> &v);
+  void eval_assign (ExpressionParserContext &context, std::unique_ptr<ExpressionNode> &v);
+  void eval_if (ExpressionParserContext &context, std::unique_ptr<ExpressionNode> &v);
+  void eval_boolean (ExpressionParserContext &context, std::unique_ptr<ExpressionNode> &v);
+  void eval_conditional (ExpressionParserContext &context, std::unique_ptr<ExpressionNode> &v);
+  void eval_shift (ExpressionParserContext &context, std::unique_ptr<ExpressionNode> &v);
+  void eval_addsub (ExpressionParserContext &context, std::unique_ptr<ExpressionNode> &v);
+  void eval_product (ExpressionParserContext &context, std::unique_ptr<ExpressionNode> &v);
+  void eval_bitwise (ExpressionParserContext &context, std::unique_ptr<ExpressionNode> &v);
+  void eval_unary (ExpressionParserContext &context, std::unique_ptr<ExpressionNode> &v);
+  void eval_atomic (ExpressionParserContext &context, std::unique_ptr<ExpressionNode> &v, int am);
+  void eval_suffix (ExpressionParserContext &context, std::unique_ptr<ExpressionNode> &v);
   void resolve_name (const std::string &name, const EvalFunction *&function, const tl::Variant *&value, tl::Variant *&var);
   void resolve_var_name (const std::string &name, tl::Variant *&value);
 
diff --git a/src/tl/tl/tlHttpStreamCurl.cc b/src/tl/tl/tlHttpStreamCurl.cc
index fc88f8dc8..254c70e1a 100644
--- a/src/tl/tl/tlHttpStreamCurl.cc
+++ b/src/tl/tl/tlHttpStreamCurl.cc
@@ -336,7 +336,7 @@ public:
  *
  *  @code
  *    CurlNetworkManager mgr;
- *    std::auto_ptr<CurlConnection> conn (mgr.create_connection ());
+ *    std::unique_ptr<CurlConnection> conn (mgr.create_connection ());
  *    conn->set_url ("http://www.example.com");
  *    conn->send ();
  *    while (mgr.tick () > 0) {
diff --git a/src/tl/tl/tlHttpStreamQt.h b/src/tl/tl/tlHttpStreamQt.h
index 9fa000a22..1cc9b3ac7 100644
--- a/src/tl/tl/tlHttpStreamQt.h
+++ b/src/tl/tl/tlHttpStreamQt.h
@@ -109,7 +109,7 @@ private slots:
 private:
   std::string m_url;
   QNetworkReply *mp_reply;
-  std::auto_ptr<QNetworkReply> mp_active_reply;
+  std::unique_ptr<QNetworkReply> mp_active_reply;
   QByteArray m_request;
   QByteArray m_data;
   QBuffer *mp_buffer;
diff --git a/src/tl/tl/tlString.cc b/src/tl/tl/tlString.cc
index e36909c5f..2842e1161 100644
--- a/src/tl/tl/tlString.cc
+++ b/src/tl/tl/tlString.cc
@@ -242,7 +242,7 @@ std::string to_lower_case (const std::string &s)
 
 std::string to_local (const std::string &s)
 {
-  std::auto_ptr<char> buffer (new char [MB_CUR_MAX]); //  MB_CUR_MAX isn't a constant
+  std::unique_ptr<char> buffer (new char [MB_CUR_MAX]); //  MB_CUR_MAX isn't a constant
   std::string ls;
 
   std::wstring ws = to_wstring (s);
diff --git a/src/tl/tl/tlThreadedWorkers.cc b/src/tl/tl/tlThreadedWorkers.cc
index b712acda5..7cd63cf76 100644
--- a/src/tl/tl/tlThreadedWorkers.cc
+++ b/src/tl/tl/tlThreadedWorkers.cc
@@ -275,11 +275,11 @@ JobBase::start ()
 
     //  synchronous case: create a temporary worker and 
     //  perform the tasks in the order they were delivered
-    std::auto_ptr <Worker> sync_worker (create_worker ());
+    std::unique_ptr <Worker> sync_worker (create_worker ());
     setup_worker (sync_worker.get ());
 
     while (! m_task_list.is_empty ()) {
-      std::auto_ptr<Task> task (m_task_list.fetch ());
+      std::unique_ptr<Task> task (m_task_list.fetch ());
       try {
         sync_worker->perform_task (task.get ());
       } catch (TaskTerminatedException) {
@@ -586,7 +586,7 @@ Worker::run ()
   while (true)
   {
     try {
-      std::auto_ptr<Task> task (mp_job->get_task (m_worker_index));
+      std::unique_ptr<Task> task (mp_job->get_task (m_worker_index));
       perform_task (task.get ());
     } catch (TaskTerminatedException) {
       //  .. try again
diff --git a/src/tl/tl/tlWebDAV.cc b/src/tl/tl/tlWebDAV.cc
index ab4befc3a..31c222a98 100644
--- a/src/tl/tl/tlWebDAV.cc
+++ b/src/tl/tl/tlWebDAV.cc
@@ -288,7 +288,7 @@ WebDAVObject::download (const std::string &url, const std::string &target)
       try {
 
         tl::OutputStream os (i->path);
-        std::auto_ptr<tl::InputStream> is (download_item (i->url));
+        std::unique_ptr<tl::InputStream> is (download_item (i->url));
         is->copy_to (os);
 
       } catch (tl::Exception &ex) {
diff --git a/src/tl/tl/tlXMLParser.cc b/src/tl/tl/tlXMLParser.cc
index e37cc8df3..43c29dcd6 100644
--- a/src/tl/tl/tlXMLParser.cc
+++ b/src/tl/tl/tlXMLParser.cc
@@ -117,9 +117,9 @@ public:
   }
 
 private:
-  std::auto_ptr<tl::InputStream> mp_stream_holder;
+  std::unique_ptr<tl::InputStream> mp_stream_holder;
   tl::InputStream *mp_stream;
-  std::auto_ptr<tl::AbsoluteProgress> mp_progress;
+  std::unique_ptr<tl::AbsoluteProgress> mp_progress;
   bool m_has_error;
   std::string m_error;
 };
@@ -667,7 +667,7 @@ public:
 
 private:
   tl::InputStream *mp_stream;
-  std::auto_ptr<tl::InputStream> mp_stream_holder;
+  std::unique_ptr<tl::InputStream> mp_stream_holder;
   tl::AbsoluteProgress *mp_progress;
   bool m_has_error;
 };
@@ -696,7 +696,7 @@ public:
   }
 
 private:
-  std::auto_ptr<StreamIODevice> mp_io;
+  std::unique_ptr<StreamIODevice> mp_io;
 };
 
 // --------------------------------------------------------------------
diff --git a/src/tl/unit_tests/tlEventsTests.cc b/src/tl/unit_tests/tlEventsTests.cc
index e76de6fa9..1aa48ff21 100644
--- a/src/tl/unit_tests/tlEventsTests.cc
+++ b/src/tl/unit_tests/tlEventsTests.cc
@@ -71,7 +71,7 @@ public:
 TEST(1)
 {
   Observed x;
-  std::auto_ptr<Observer> yp;
+  std::unique_ptr<Observer> yp;
   yp.reset (new Observer ());
 
   EXPECT_EQ (yp->obj == 0, true);
@@ -129,7 +129,7 @@ TEST(1)
 TEST(2)
 {
   Observed x1, x2;
-  std::auto_ptr<Observer> yp;
+  std::unique_ptr<Observer> yp;
   yp.reset (new Observer ());
 
   EXPECT_EQ (yp->obj == 0, true);
@@ -205,7 +205,7 @@ TEST(3)
 TEST(4)
 {
   Observed x;
-  std::auto_ptr<Observer> yp;
+  std::unique_ptr<Observer> yp;
   yp.reset (new Observer ());
 
   EXPECT_EQ (yp->obj == 0, true);
@@ -263,7 +263,7 @@ TEST(4)
 TEST(5)
 {
   Observed x1, x2;
-  std::auto_ptr<Observer> yp;
+  std::unique_ptr<Observer> yp;
   yp.reset (new Observer ());
 
   EXPECT_EQ (yp->obj == 0, true);
diff --git a/src/tl/unit_tests/tlUniqueIdTests.cc b/src/tl/unit_tests/tlUniqueIdTests.cc
index 8cc6547e9..1744bf483 100644
--- a/src/tl/unit_tests/tlUniqueIdTests.cc
+++ b/src/tl/unit_tests/tlUniqueIdTests.cc
@@ -40,7 +40,7 @@ TEST(1)
   id = tl::id_of (0);
   EXPECT_EQ (id, tl::id_type (0));
 
-  std::auto_ptr<MyClass> ptr;
+  std::unique_ptr<MyClass> ptr;
   ptr.reset (new MyClass ());
   id0 = id = tl::id_of (ptr.get ());
   EXPECT_NE (id, tl::id_type (0));
diff --git a/src/tl/unit_tests/tlVariantTests.cc b/src/tl/unit_tests/tlVariantTests.cc
index a08d0f9de..93af6d383 100644
--- a/src/tl/unit_tests/tlVariantTests.cc
+++ b/src/tl/unit_tests/tlVariantTests.cc
@@ -826,7 +826,7 @@ TEST(2)
   EXPECT_EQ (AA::ac, 0);
 
   //  shallow copy for tl::Object based objects
-  std::auto_ptr<AA> aptr (new AA ());
+  std::unique_ptr<AA> aptr (new AA ());
 
   v = tl::Variant (aptr.get (), &aa_class_instance, false);
   EXPECT_EQ (AA::ac, 1);
diff --git a/src/unit_tests/unit_test_main.cc b/src/unit_tests/unit_test_main.cc
index 14d5e70df..b506ff893 100644
--- a/src/unit_tests/unit_test_main.cc
+++ b/src/unit_tests/unit_test_main.cc
@@ -423,8 +423,8 @@ run_tests (const std::vector<tl::TestBase *> &selected_tests, bool editable, boo
 static int
 main_cont (int &argc, char **argv)
 {
-  std::auto_ptr<rba::RubyInterpreter> ruby_interpreter;
-  std::auto_ptr<pya::PythonInterpreter> python_interpreter;
+  std::unique_ptr<rba::RubyInterpreter> ruby_interpreter;
+  std::unique_ptr<pya::PythonInterpreter> python_interpreter;
 
 #if defined(HAVE_QT)