diff --git a/src/iforward_list.h b/src/iforward_list.h
index 7fa310c9..27ce3da2 100644
--- a/src/iforward_list.h
+++ b/src/iforward_list.h
@@ -1015,7 +1015,7 @@ bool operator <(const etl::iforward_list<T>& lhs, const etl::iforward_list<T>& r
 template <typename T>
 bool operator >(const etl::iforward_list<T>& lhs, const etl::iforward_list<T>& rhs)
 {
-  return operator <(rhs, lhs);
+  return (rhs < lhs);
 }
 
 //*************************************************************************
@@ -1028,7 +1028,7 @@ bool operator >(const etl::iforward_list<T>& lhs, const etl::iforward_list<T>& r
 template <typename T>
 bool operator <=(const etl::iforward_list<T>& lhs, const etl::iforward_list<T>& rhs)
 {
-  return !operator >(lhs, rhs);
+  return !(lhs > rhs);
 }
 
 //*************************************************************************
@@ -1041,7 +1041,7 @@ bool operator <=(const etl::iforward_list<T>& lhs, const etl::iforward_list<T>&
 template <typename T>
 bool operator >=(const etl::iforward_list<T>& lhs, const etl::iforward_list<T>& rhs)
 {
-  return !operator <(lhs, rhs);
+  return !(lhs < rhs);
 }
 
 #if WIN32
diff --git a/src/ilist.h b/src/ilist.h
index 7a21e381..9da115bd 100644
--- a/src/ilist.h
+++ b/src/ilist.h
@@ -1168,7 +1168,7 @@ bool operator <(const etl::ilist<T>& lhs, const etl::ilist<T>& rhs)
 template <typename T>
 bool operator >(const etl::ilist<T>& lhs, const etl::ilist<T>& rhs)
 {
-  return operator <(rhs, lhs);
+  return (rhs < lhs);
 }
 
 //*************************************************************************
@@ -1181,7 +1181,7 @@ bool operator >(const etl::ilist<T>& lhs, const etl::ilist<T>& rhs)
 template <typename T>
 bool operator <=(const etl::ilist<T>& lhs, const etl::ilist<T>& rhs)
 {
-  return !operator >(lhs, rhs);
+  return !(lhs > rhs);
 }
 
 //*************************************************************************
@@ -1194,7 +1194,7 @@ bool operator <=(const etl::ilist<T>& lhs, const etl::ilist<T>& rhs)
 template <typename T>
 bool operator >=(const etl::ilist<T>& lhs, const etl::ilist<T>& rhs)
 {
-  return !operator <(lhs, rhs);
+  return !(lhs < rhs);
 }
 
 #if WIN32
diff --git a/src/imap.h b/src/imap.h
index 0d0fad68..4b499460 100644
--- a/src/imap.h
+++ b/src/imap.h
@@ -1652,7 +1652,7 @@ bool operator <(const etl::imap<TKey, TMapped, TKeyCompare>& lhs, const etl::ima
 template <typename TKey, typename TMapped, typename TKeyCompare>
 bool operator >(const etl::imap<TKey, TMapped, TKeyCompare>& lhs, const etl::imap<TKey, TMapped, TKeyCompare>& rhs)
 {
-  return operator <(rhs, lhs);
+  return (rhs < lhs);
 }
 
 //*************************************************************************
@@ -1665,7 +1665,7 @@ bool operator >(const etl::imap<TKey, TMapped, TKeyCompare>& lhs, const etl::ima
 template <typename TKey, typename TMapped, typename TKeyCompare>
 bool operator <=(const etl::imap<TKey, TMapped, TKeyCompare>& lhs, const etl::imap<TKey, TMapped, TKeyCompare>& rhs)
 {
-  return !operator >(lhs, rhs);
+  return !(lhs > rhs);
 }
 
 //*************************************************************************
@@ -1678,7 +1678,7 @@ bool operator <=(const etl::imap<TKey, TMapped, TKeyCompare>& lhs, const etl::im
 template <typename TKey, typename TMapped, typename TKeyCompare>
 bool operator >=(const etl::imap<TKey, TMapped, TKeyCompare>& lhs, const etl::imap<TKey, TMapped, TKeyCompare>& rhs)
 {
-  return !operator <(lhs, rhs);
+  return !(lhs < rhs);
 }
 
 #if WIN32
diff --git a/src/imultimap.h b/src/imultimap.h
index a1505827..d02920a6 100644
--- a/src/imultimap.h
+++ b/src/imultimap.h
@@ -1385,7 +1385,7 @@ bool operator <(const etl::imultimap<TKey, TMapped, TKeyCompare>& lhs, const etl
 template <typename TKey, typename TMapped, typename TKeyCompare>
 bool operator >(const etl::imultimap<TKey, TMapped, TKeyCompare>& lhs, const etl::imultimap<TKey, TMapped, TKeyCompare>& rhs)
 {
-  return operator <(rhs, lhs);
+  return (rhs < lhs);
 }
 
 //*************************************************************************
@@ -1398,7 +1398,7 @@ bool operator >(const etl::imultimap<TKey, TMapped, TKeyCompare>& lhs, const etl
 template <typename TKey, typename TMapped, typename TKeyCompare>
 bool operator <=(const etl::imultimap<TKey, TMapped, TKeyCompare>& lhs, const etl::imultimap<TKey, TMapped, TKeyCompare>& rhs)
 {
-  return !operator >(lhs, rhs);
+  return !(lhs > rhs);
 }
 
 //*************************************************************************
@@ -1411,7 +1411,7 @@ bool operator <=(const etl::imultimap<TKey, TMapped, TKeyCompare>& lhs, const et
 template <typename TKey, typename TMapped, typename TKeyCompare>
 bool operator >=(const etl::imultimap<TKey, TMapped, TKeyCompare>& lhs, const etl::imultimap<TKey, TMapped, TKeyCompare>& rhs)
 {
-  return !operator <(lhs, rhs);
+  return !(lhs < rhs);
 }
 
 #if WIN32
diff --git a/src/imultiset.h b/src/imultiset.h
index 5a05a897..dc91ae04 100644
--- a/src/imultiset.h
+++ b/src/imultiset.h
@@ -1366,7 +1366,7 @@ bool operator <(const etl::imultiset<T, TCompare>& lhs, const etl::imultiset<T,
 template <typename T, typename TCompare>
 bool operator >(const etl::imultiset<T, TCompare>& lhs, const etl::imultiset<T, TCompare>& rhs)
 {
-  return operator <(rhs, lhs);
+  return (rhs < lhs);
 }
 
 //*************************************************************************
@@ -1379,7 +1379,7 @@ bool operator >(const etl::imultiset<T, TCompare>& lhs, const etl::imultiset<T,
 template <typename T, typename TCompare>
 bool operator <=(const etl::imultiset<T, TCompare>& lhs, const etl::imultiset<T, TCompare>& rhs)
 {
-  return !operator >(lhs, rhs);
+  return !(lhs > rhs);
 }
 
 //*************************************************************************
@@ -1392,7 +1392,7 @@ bool operator <=(const etl::imultiset<T, TCompare>& lhs, const etl::imultiset<T,
 template <typename T, typename TCompare>
 bool operator >=(const etl::imultiset<T, TCompare>& lhs, const etl::imultiset<T, TCompare>& rhs)
 {
-  return !operator <(lhs, rhs);
+  return !(lhs < rhs);
 }
 
 #if WIN32
diff --git a/src/iset.h b/src/iset.h
index 21f65924..27cdaed8 100644
--- a/src/iset.h
+++ b/src/iset.h
@@ -1583,7 +1583,7 @@ bool operator <(const etl::iset<T, TCompare>& lhs, const etl::iset<T, TCompare>&
 template <typename T, typename TCompare>
 bool operator >(const etl::iset<T, TCompare>& lhs, const etl::iset<T, TCompare>& rhs)
 {
-  return operator <(rhs, lhs);
+  return (rhs < lhs);
 }
 
 //*************************************************************************
@@ -1596,7 +1596,7 @@ bool operator >(const etl::iset<T, TCompare>& lhs, const etl::iset<T, TCompare>&
 template <typename T, typename TCompare>
 bool operator <=(const etl::iset<T, TCompare>& lhs, const etl::iset<T, TCompare>& rhs)
 {
-  return !operator >(lhs, rhs);
+  return !(lhs > rhs);
 }
 
 //*************************************************************************
@@ -1609,7 +1609,7 @@ bool operator <=(const etl::iset<T, TCompare>& lhs, const etl::iset<T, TCompare>
 template <typename T, typename TCompare>
 bool operator >=(const etl::iset<T, TCompare>& lhs, const etl::iset<T, TCompare>& rhs)
 {
-  return !operator <(lhs, rhs);
+  return !(lhs < rhs);
 }
 
 #if WIN32