diff --git a/include/tool/edit_constraints.h b/include/tool/edit_constraints.h
index 0227442be2..01aa622038 100644
--- a/include/tool/edit_constraints.h
+++ b/include/tool/edit_constraints.h
@@ -28,7 +28,7 @@
 #define EDIT_CONSTRAINTS_H_
 
 #include <math/vector2d.h>
-#include <boost/function.hpp>
+#include <functional>
 
 class EDIT_POINT;
 class EDIT_LINE;
@@ -232,7 +232,7 @@ class EC_SNAPLINE : public EDIT_CONSTRAINT<EDIT_LINE>
 {
 public:
     ///< Typedef for a function that determines snapping point.
-    typedef boost::function<VECTOR2D (const VECTOR2D&)> V2D_TRANSFORM_FUN;
+    typedef std::function<VECTOR2D( const VECTOR2D& )> V2D_TRANSFORM_FUN;
 
     EC_SNAPLINE( EDIT_LINE& aLine, V2D_TRANSFORM_FUN aSnapFun );
 
diff --git a/pcbnew/dialogs/dialog_find.h b/pcbnew/dialogs/dialog_find.h
index 06d9f49a30..95d8b4e662 100644
--- a/pcbnew/dialogs/dialog_find.h
+++ b/pcbnew/dialogs/dialog_find.h
@@ -26,7 +26,7 @@
 #ifndef DIALOG_FIND_BASE_H
 #define DIALOG_FIND_BASE_H
 
-#include <boost/function.hpp>
+#include <functional>
 #include <sys/types.h>
 #include <wx/event.h>
 #include <deque>
@@ -59,7 +59,7 @@ public:
      * case where no item is found
      * @param aCallback
      */
-    void SetCallback( boost::function<void( BOARD_ITEM* )> aCallback )
+    void SetCallback( std::function<void( BOARD_ITEM* )> aCallback )
     {
         m_highlightCallback = aCallback;
     }
@@ -71,7 +71,7 @@ private:
     std::deque<BOARD_ITEM*>::iterator   m_it;
     bool                                m_upToDate;
 
-    boost::function<void( BOARD_ITEM* )> m_highlightCallback;
+    std::function<void( BOARD_ITEM* )> m_highlightCallback;
 
     void onTextEnter( wxCommandEvent& event ) override;
     void onFindNextClick( wxCommandEvent& event ) override;