diff --git a/include/view/view.h b/include/view/view.h
index f6069b6742..993d1e7ae3 100644
--- a/include/view/view.h
+++ b/include/view/view.h
@@ -27,7 +27,7 @@
 
 #include <vector>
 #include <set>
-#include <boost/unordered/unordered_map.hpp>
+#include <unordered_map>
 
 #include <math/box2.h>
 #include <gal/definitions.h>
@@ -575,7 +575,7 @@ private:
     };
 
     // Convenience typedefs
-    typedef boost::unordered_map<int, VIEW_LAYER>   LAYER_MAP;
+    typedef std::unordered_map<int, VIEW_LAYER>   LAYER_MAP;
     typedef LAYER_MAP::iterator                     LAYER_MAP_ITER;
     typedef std::vector<VIEW_LAYER*>                LAYER_ORDER;
     typedef std::vector<VIEW_LAYER*>::iterator      LAYER_ORDER_ITER;
diff --git a/pcbnew/dialogs/wizard_add_fplib.cpp b/pcbnew/dialogs/wizard_add_fplib.cpp
index 17fdb9b919..47afc5ab11 100644
--- a/pcbnew/dialogs/wizard_add_fplib.cpp
+++ b/pcbnew/dialogs/wizard_add_fplib.cpp
@@ -32,6 +32,7 @@
  * - select scope (global/project)
  */
 
+#include <memory>
 #include <wx/wx.h>
 #include <wx/uri.h>
 #include <wx/dir.h>