diff --git a/movext.hh b/movext.hh
index 9e7fc37..b52bfcd 100644
--- a/movext.hh
+++ b/movext.hh
@@ -44,9 +44,7 @@ public:
 template <typename TYPE, int NUM>
 class MovMin
 {
-	struct Equal { bool operator () (TYPE a, TYPE b) { return a == b; } };
-	struct Less { bool operator () (TYPE a, TYPE b) { return a < b; } };
-	MovExt<TYPE, Equal, Less, NUM> movmin;
+	MovExt<TYPE, std::equal_to<TYPE>, std::less<TYPE>, NUM> movmin;
 public:
 	TYPE operator () (TYPE input)
 	{
@@ -57,9 +55,7 @@ public:
 template <typename TYPE, int NUM>
 class MovMax
 {
-	struct Equal { bool operator () (TYPE a, TYPE b) { return a == b; } };
-	struct Greater { bool operator () (TYPE a, TYPE b) { return a > b; } };
-	MovExt<TYPE, Equal, Greater, NUM> movmax;
+	MovExt<TYPE, std::equal_to<TYPE>, std::greater<TYPE>, NUM> movmax;
 public:
 	TYPE operator () (TYPE input)
 	{
diff --git a/sma.hh b/sma.hh
index 5000c76..dd2039a 100644
--- a/sma.hh
+++ b/sma.hh
@@ -82,8 +82,7 @@ public:
 template <typename TYPE, typename VALUE, int NUM, bool NORM = true>
 class SMA4
 {
-	struct Add { TYPE operator () (TYPE a, TYPE b) { return a + b; } };
-	SWA<TYPE, Add, NUM> swa;
+	SWA<TYPE, std::plus<TYPE>, NUM> swa;
 public:
 	SMA4() : swa(0)
 	{