diff --git a/src/Mod/Mesh/App/Core/Tools.h b/src/Mod/Mesh/App/Core/Tools.h
index 589ff66fe7..76269b4e9c 100644
--- a/src/Mod/Mesh/App/Core/Tools.h
+++ b/src/Mod/Mesh/App/Core/Tools.h
@@ -141,7 +141,7 @@ inline bool MeshSearchNeighbours::TriangleCutsSphere (const MeshFacet &rclF) con
   return fSqrDist < fRSqr;
 }
 
-class MeshFaceIterator : public std::unary_function<unsigned long, Base::Vector3f>
+class MeshFaceIterator
 {
 public:
     MeshFaceIterator(const MeshKernel& mesh)
@@ -156,7 +156,7 @@ private:
     MeshFacetIterator it;
 };
 
-class MeshVertexIterator : public std::unary_function<unsigned long, Base::Vector3f>
+class MeshVertexIterator
 {
 public:
     MeshVertexIterator(const MeshKernel& mesh)
@@ -172,7 +172,7 @@ private:
 };
 
 template <class T>
-class MeshNearestIndexToPlane : public std::unary_function<unsigned long, void>
+class MeshNearestIndexToPlane
 {
 public:
     MeshNearestIndexToPlane(const MeshKernel& mesh, const Base::Vector3f& b, const Base::Vector3f& n)
diff --git a/src/Mod/Sketcher/App/Analyse.h b/src/Mod/Sketcher/App/Analyse.h
index 87d89de6a0..875fbb8e96 100644
--- a/src/Mod/Sketcher/App/Analyse.h
+++ b/src/Mod/Sketcher/App/Analyse.h
@@ -39,8 +39,10 @@ struct ConstraintIds {
         Sketcher::ConstraintType Type;
 };
 
-struct Constraint_Equal  : public std::unary_function<const struct Sketcher::ConstraintIds&, bool>
+struct Constraint_Equal
 {
+    typedef ConstraintIds argument_type;
+    typedef bool result_type;
     struct Sketcher::ConstraintIds c;
     Constraint_Equal(const ConstraintIds& c) : c(c)
     {