diff --git a/src/lib/eina/eina_types.h b/src/lib/eina/eina_types.h
index 25ad33a8..71a0d6ca 100644
--- a/src/lib/eina/eina_types.h
+++ b/src/lib/eina/eina_types.h
@@ -241,7 +241,7 @@
 #  define EINA_LIKELY(exp)      __builtin_expect((exp), 1)
 #  define EINA_SENTINEL __attribute__((__sentinel__))
 #  ifndef __clang__
-#   if __GNUC__ >= 7
+#   if __GNUC__ >= 7 && !defined(__e2k__)
 #    define EINA_FALLTHROUGH __attribute__ ((fallthrough));
 #   else
 #    define EINA_FALLTHROUGH
diff --git a/src/lib/eolian_cxx/grammar/converting_argument.hpp b/src/lib/eolian_cxx/grammar/converting_argument.hpp
index 778c6b39..bea60cea 100644
--- a/src/lib/eolian_cxx/grammar/converting_argument.hpp
+++ b/src/lib/eolian_cxx/grammar/converting_argument.hpp
@@ -34,7 +34,7 @@ namespace efl { namespace eolian { namespace grammar {
 
 struct converting_argument_generator
 {
-   struct
+   struct FIXME
    {
      typedef bool result_type;
      template <typename T>
@@ -80,6 +80,7 @@ struct attributes_needed<converting_argument_generator> : std::integral_constant
 }
       
 converting_argument_generator const converting_argument = {};
+converting_argument_generator::FIXME const converting_argument_generator::is_function_ptr = {};
       
 } } }