diff --git a/dune/fufem/assemblers/localassembler.hh b/dune/fufem/assemblers/localassembler.hh
index 05713686cf86668bd6b876d9e5868e8a2a4bcf5a..3e0a1dde6a248b8dad92762de468c14699b29249 100644
--- a/dune/fufem/assemblers/localassembler.hh
+++ b/dune/fufem/assemblers/localassembler.hh
@@ -3,6 +3,8 @@
 #ifndef LOCAL_ASSEMBLER_HH
 #define LOCAL_ASSEMBLER_HH
 
+#include <type_traits>
+
 #include <dune/common/fmatrix.hh>
 #include <dune/istl/matrix.hh>
 
@@ -71,7 +73,7 @@ class LocalAssembler
          */
         static bool isSameFE(const TrialLocalFE& tFE, const AnsatzLocalFE& aFE)
         {
-            if (not Dune::Conversion<TrialLocalFE, AnsatzLocalFE>::sameType)
+            if (not std::is_same<TrialLocalFE, AnsatzLocalFE>::value)
                 return false;
             return &tFE == reinterpret_cast<const TrialLocalFE*>(&aFE);
         }
diff --git a/dune/fufem/assemblers/localoperatorassembler.hh b/dune/fufem/assemblers/localoperatorassembler.hh
index 993d63e627c6810dbcb56abb1315345fa6fd7c10..28c2383cd414f4f81dc2e3208cabed4571e70c0c 100644
--- a/dune/fufem/assemblers/localoperatorassembler.hh
+++ b/dune/fufem/assemblers/localoperatorassembler.hh
@@ -3,6 +3,8 @@
 #ifndef LOCAL_OPERATOR_ASSEMBLER_HH
 #define LOCAL_OPERATOR_ASSEMBLER_HH
 
+#include <type_traits>
+
 #include <dune/common/fmatrix.hh>
 #include <dune/istl/matrix.hh>
 
@@ -71,7 +73,7 @@ class LocalOperatorAssembler
          */
         static bool isSameFE(const TrialLocalFE& tFE, const AnsatzLocalFE& aFE)
         {
-            if (not Dune::Conversion<TrialLocalFE, AnsatzLocalFE>::sameType)
+            if (not std::is_same<TrialLocalFE, AnsatzLocalFE>::value)
                 return false;
             return &tFE == reinterpret_cast<const TrialLocalFE*>(&aFE);
         }
diff --git a/dune/fufem/python/common.hh b/dune/fufem/python/common.hh
index 9f2ac8949521d7139c6469e486d853a727b94e17..1c1ffe9a2d76b0b7773c14c409f5ee2d628fc3cb 100644
--- a/dune/fufem/python/common.hh
+++ b/dune/fufem/python/common.hh
@@ -11,6 +11,7 @@
 
 #include <string>
 #include <sstream>
+#include <type_traits>
 
 #include <dune/common/exceptions.hh>