diff --git a/dune/gfe/mixedriemanniantrsolver.cc b/dune/gfe/mixedriemanniantrsolver.cc
index dff40c95860ada21929500f252d4af44dd57de5d..5d32978cdaaa680b262a77d5aeee1601b7387001 100644
--- a/dune/gfe/mixedriemanniantrsolver.cc
+++ b/dune/gfe/mixedriemanniantrsolver.cc
@@ -208,7 +208,7 @@ setup(const GridType& grid,
                                          FufemBasis0>(pkToP1TransferMatrix,p1Basis,*basis0_);
 
         mmgStep0->mgTransfer_.back() = std::make_shared<TruncatedCompressedMGTransfer<CorrectionType0>>();
-        Dune::shared_ptr<TransferOperatorType> topTransferOperator = Dune::make_shared<TransferOperatorType>(pkToP1TransferMatrix);
+        std::shared_ptr<TransferOperatorType> topTransferOperator = std::make_shared<TransferOperatorType>(pkToP1TransferMatrix);
         std::dynamic_pointer_cast<TruncatedCompressedMGTransfer<CorrectionType0>>(mmgStep0->mgTransfer_.back())->setMatrix(topTransferOperator);
 
         for (size_t i=0; i<mmgStep0->mgTransfer_.size()-1; i++){
diff --git a/dune/gfe/riemanniantrsolver.hh b/dune/gfe/riemanniantrsolver.hh
index a3f5ec3d28a80c2cfdef844ccfb3d5f19e5a7670..7fc9ea26fd2f1ffaca0e7f122194d5a245e2fb28 100644
--- a/dune/gfe/riemanniantrsolver.hh
+++ b/dune/gfe/riemanniantrsolver.hh
@@ -137,7 +137,7 @@ public:
     void setIgnoreNodes(const Dune::BitSetVector<blocksize>& ignoreNodes)
     {
         ignoreNodes_ = &ignoreNodes;
-        Dune::shared_ptr<LoopSolver<CorrectionType> > loopSolver = std::dynamic_pointer_cast<LoopSolver<CorrectionType> >(innerSolver_);
+        std::shared_ptr<LoopSolver<CorrectionType> > loopSolver = std::dynamic_pointer_cast<LoopSolver<CorrectionType> >(innerSolver_);
         assert(loopSolver);
         loopSolver->iterationStep_->ignoreNodes_ = ignoreNodes_;
     }
diff --git a/src/compute-disc-error.cc b/src/compute-disc-error.cc
index 97cabf4093320723277103a98e7a3bd3fc21e26c..6fa0ca0059ced22006ffd29436fdead6fab2a93f 100644
--- a/src/compute-disc-error.cc
+++ b/src/compute-disc-error.cc
@@ -671,7 +671,7 @@ int main (int argc, char *argv[]) try
 
   const int numLevels = parameterSet.get<int>("numLevels");
 
-  shared_ptr<GridType> grid, referenceGrid;
+  std::shared_ptr<GridType> grid, referenceGrid;
 
   FieldVector<double,dimworld> lower(0), upper(1);
 
@@ -706,8 +706,8 @@ int main (int argc, char *argv[]) try
   {
     std::string path                = parameterSet.get<std::string>("path");
     std::string gridFile            = parameterSet.get<std::string>("gridFile");
-    grid          = shared_ptr<GridType>(GmshReader<GridType>::read(path + "/" + gridFile));
-    referenceGrid = shared_ptr<GridType>(GmshReader<GridType>::read(path + "/" + gridFile));
+    grid          = std::shared_ptr<GridType>(GmshReader<GridType>::read(path + "/" + gridFile));
+    referenceGrid = std::shared_ptr<GridType>(GmshReader<GridType>::read(path + "/" + gridFile));
   }
 
   grid->globalRefine(numLevels-1);
diff --git a/src/cosserat-continuum.cc b/src/cosserat-continuum.cc
index e34df722a89618c99398b706ec56d4a6ed30295a..45c0c5289a83428ad41cc7dd7d8c5005bd31122f 100644
--- a/src/cosserat-continuum.cc
+++ b/src/cosserat-continuum.cc
@@ -177,7 +177,7 @@ int main (int argc, char *argv[]) try
     typedef UGGrid<dim> GridType;
 #endif
 
-    shared_ptr<GridType> grid;
+    std::shared_ptr<GridType> grid;
 
     FieldVector<double,dimworld> lower(0), upper(1);
 
@@ -201,7 +201,7 @@ int main (int argc, char *argv[]) try
         std::string suffix = gridFile.substr(dotPos, gridFile.length()-dotPos);
 
         if (suffix == ".msh")
-            grid = shared_ptr<GridType>(GmshReader<GridType>::read(path + "/" + gridFile));
+            grid = std::shared_ptr<GridType>(GmshReader<GridType>::read(path + "/" + gridFile));
         else if (suffix == ".vtu" or suffix == ".vtp")
             grid = VTKReader<GridType>::read(path + "/" + gridFile);
     }
@@ -429,14 +429,14 @@ int main (int argc, char *argv[]) try
     // ////////////////////////////////////////////////////////////
 
     const ParameterTree& materialParameters = parameterSet.sub("materialParameters");
-    shared_ptr<NeumannFunction> neumannFunction;
+    std::shared_ptr<NeumannFunction> neumannFunction;
     if (parameterSet.hasKey("neumannValues"))
-        neumannFunction = make_shared<NeumannFunction>(parameterSet.get<FieldVector<double,3> >("neumannValues"),
+        neumannFunction = std::make_shared<NeumannFunction>(parameterSet.get<FieldVector<double,3> >("neumannValues"),
                                                        homotopyParameter);
 
-    shared_ptr<VolumeLoad> volumeLoad;
+    std::shared_ptr<VolumeLoad> volumeLoad;
     if (parameterSet.hasKey("volumeLoad"))
-        volumeLoad = make_shared<VolumeLoad>(parameterSet.get<FieldVector<double,3> >("volumeLoad"),
+        volumeLoad = std::make_shared<VolumeLoad>(parameterSet.get<FieldVector<double,3> >("volumeLoad"),
                                                                                           homotopyParameter);
 
     if (mpiHelper.rank() == 0) {
diff --git a/src/film-on-substrate.cc b/src/film-on-substrate.cc
index dbd81056278ea589e34e932c598e18bc23183136..4c2cfa1ae0a52eafade6e51c67ceaf78d8896e74 100644
--- a/src/film-on-substrate.cc
+++ b/src/film-on-substrate.cc
@@ -348,7 +348,7 @@ int main (int argc, char *argv[]) try
     std::shared_ptr<NeumannFunction> neumannFunction;
     if (parameterSet.hasKey("neumannValues"))
     {
-      neumannFunction = make_shared<NeumannFunction>(parameterSet.get<FieldVector<double,dim> >("neumannValues"),
+      neumannFunction = std::make_shared<NeumannFunction>(parameterSet.get<FieldVector<double,dim> >("neumannValues"),
                                                      homotopyParameter);
 
       std::cout << "Neumann values: " << parameterSet.get<FieldVector<double,dim> >("neumannValues") << std::endl;
diff --git a/src/harmonicmaps.cc b/src/harmonicmaps.cc
index 78cbc34011206c5a1443bdb5aecbf52bdf257457..84a08d3fe277d95ef060979336a4a5f436df7de2 100644
--- a/src/harmonicmaps.cc
+++ b/src/harmonicmaps.cc
@@ -172,7 +172,7 @@ int main (int argc, char *argv[])
     typedef std::conditional<dim==1,OneDGrid,UGGrid<dim> >::type GridType;
 #endif
 
-    shared_ptr<GridType> grid;
+    std::shared_ptr<GridType> grid;
     FieldVector<double,dimworld> lower(0), upper(1);
     std::array<unsigned int,dim> elements;
 
@@ -195,7 +195,7 @@ int main (int argc, char *argv[])
         std::string path                = parameterSet.get<std::string>("path");
         std::string gridFile            = parameterSet.get<std::string>("gridFile");
 
-        grid = shared_ptr<GridType>(GmshReader<GridType>::read(path + "/" + gridFile));
+        grid = std::shared_ptr<GridType>(GmshReader<GridType>::read(path + "/" + gridFile));
     }
 
     grid->globalRefine(numLevels-1);