diff --git a/dynare++/parser/cc/tree.hh b/dynare++/parser/cc/tree.hh
index d8def988915fe1a64157f923f24fc63ffd993193..9517d4a9765370f5816fcfdc18bc7753cb28a2c3 100644
--- a/dynare++/parser/cc/tree.hh
+++ b/dynare++/parser/cc/tree.hh
@@ -6,15 +6,15 @@
 #include <vector>
 #include <set>
 #include <map>
-#include <boost/unordered_map.hpp>
-#include <boost/unordered_set.hpp>
+#include <unordered_map>
+#include <unordered_set>
 #include <cstdio>
 
 namespace ogp
 {
 
-  using boost::unordered_set;
-  using boost::unordered_map;
+  using std::unordered_set;
+  using std::unordered_map;
   using std::vector;
   using std::set;
   using std::map;
diff --git a/dynare++/src/dynare_model.cc b/dynare++/src/dynare_model.cc
index 1b40fae1d96f926edf3267120a6fb998c9b4b14e..7038f118c985c68e883f8415185037d60f94dc4f 100644
--- a/dynare++/src/dynare_model.cc
+++ b/dynare++/src/dynare_model.cc
@@ -13,6 +13,7 @@
 #include <string>
 #include <cmath>
 #include <climits>
+#include <ostream>
 
 using namespace ogdyn;
 
diff --git a/dynare++/src/dynare_model.hh b/dynare++/src/dynare_model.hh
index 5321bd6230c39748735e265e8c598a8a73e9e988..6f8c51fe3300daf90aa888bc567f54ba733bf593 100644
--- a/dynare++/src/dynare_model.hh
+++ b/dynare++/src/dynare_model.hh
@@ -13,11 +13,11 @@
 #include "GeneralMatrix.hh"
 
 #include <map>
-#include <boost/unordered_set.hpp>
+#include <unordered_set>
 
 namespace ogdyn
 {
-  using boost::unordered_set;
+  using std::unordered_set;
   using std::map;
 
   /** This represents an interval in a string by the pair of
diff --git a/dynare++/src/planner_builder.hh b/dynare++/src/planner_builder.hh
index b62b76a1eb55313893e1adae50ad979408d0450d..59e07d6d4c6a24493a9e2c2b1b4fea50bb247a16 100644
--- a/dynare++/src/planner_builder.hh
+++ b/dynare++/src/planner_builder.hh
@@ -8,7 +8,7 @@
 namespace ogdyn
 {
 
-  using boost::unordered_set;
+  using std::unordered_set;
   using std::map;
   using std::vector;