diff --git a/src/eltlparse/eltlparse.yy b/src/eltlparse/eltlparse.yy
index 3525a1b70..5f8d2fdd1 100644
--- a/src/eltlparse/eltlparse.yy
+++ b/src/eltlparse/eltlparse.yy
@@ -32,7 +32,6 @@
 #include <limits>
 #include <cerrno>
 #include <algorithm>
-#include <boost/shared_ptr.hpp>
 #include "public.hh"
 #include "ltlast/allnodes.hh"
 #include "ltlast/formula_tree.hh"
@@ -376,9 +375,9 @@ nfa_arg: ARG
 	    CHECK_ARITY(@1, $1, $3->children.size(), arity);
 
 	    // Hack to return the right type without screwing with the
-	    // boost::shared_ptr memory handling by using get for
-	    // example. FIXME: Wait for the next version of boost and
-	    // modify the %union to handle formula_tree::node_ptr.
+	    // std::shared_ptr memory handling by using get for
+	    // example. FIXME: modify the %union to handle
+	    // formula_tree::node_ptr.
 	    formula_tree::node_unop* tmp1 = new formula_tree::node_unop;
 	    tmp1->op = unop::Not;
 	    tmp1->child = realias(i->second, $3->children);
diff --git a/src/ltlast/formula_tree.hh b/src/ltlast/formula_tree.hh
index 92b0c0833..120260917 100644
--- a/src/ltlast/formula_tree.hh
+++ b/src/ltlast/formula_tree.hh
@@ -24,7 +24,7 @@
 
 # include "formula.hh"
 # include <vector>
-# include <boost/shared_ptr.hpp>
+# include <memory>
 # include "multop.hh"
 # include "binop.hh"
 # include "unop.hh"
@@ -44,8 +44,7 @@ namespace spot
       {
 	virtual ~node() {};
       };
-      /// We use boost::shared_ptr to easily handle deletion.
-      typedef boost::shared_ptr<node> node_ptr;
+      typedef std::shared_ptr<node> node_ptr;
 
       struct SPOT_API node_unop : node
       {
diff --git a/src/ltlast/nfa.hh b/src/ltlast/nfa.hh
index 397d68807..c8097304f 100644
--- a/src/ltlast/nfa.hh
+++ b/src/ltlast/nfa.hh
@@ -24,7 +24,7 @@
 
 # include "misc/common.hh"
 # include "misc/hash.hh"
-# include <boost/shared_ptr.hpp>
+# include <memory>
 # include <list>
 # include <set>
 # include <map>
@@ -52,10 +52,10 @@ namespace spot
     public:
       struct transition;
       typedef std::list<transition*> state;
-      typedef boost::shared_ptr<formula_tree::node> label;
+      typedef std::shared_ptr<formula_tree::node> label;
       /// Iterator over the successors of a state.
       typedef succ_iterator iterator;
-      typedef boost::shared_ptr<nfa> ptr;
+      typedef std::shared_ptr<nfa> ptr;
 
       /// Explicit transitions.
       struct transition
diff --git a/src/saba/sabastate.hh b/src/saba/sabastate.hh
index efa05263d..83012bc6d 100644
--- a/src/saba/sabastate.hh
+++ b/src/saba/sabastate.hh
@@ -23,7 +23,8 @@
 #include "misc/common.hh"
 #include <bdd.h>
 #include <functional>
-#include <boost/shared_ptr.hpp>
+#include <memory>
+#include <cassert>
 
 namespace spot
 {
@@ -156,7 +157,7 @@ namespace spot
   // Functions related to shared_ptr.
   //////////////////////////////////////////////////
 
-  typedef boost::shared_ptr<const saba_state> shared_saba_state;
+  typedef std::shared_ptr<const saba_state> shared_saba_state;
 
   /// \ingroup saba_essentials
   /// \brief Strict Weak Ordering for \c shared_saba_state
diff --git a/src/tgba/state.hh b/src/tgba/state.hh
index 52e9d6a36..deaeb19da 100644
--- a/src/tgba/state.hh
+++ b/src/tgba/state.hh
@@ -28,7 +28,7 @@
 #include <bdd.h>
 #include <cassert>
 #include <functional>
-#include <boost/shared_ptr.hpp>
+#include <memory>
 #include "misc/casts.hh"
 #include "misc/hash.hh"
 
@@ -179,7 +179,7 @@ namespace spot
   // Functions related to shared_ptr.
   //////////////////////////////////////////////////
 
-  typedef boost::shared_ptr<const state> shared_state;
+  typedef std::shared_ptr<const state> shared_state;
 
   inline void shared_state_deleter(state* s) { s->destroy(); }