diff --git a/src/bindings/cxx/eina_cxx/eina_eo_concrete_fwd.hh b/src/bindings/cxx/eina_cxx/eina_eo_concrete_fwd.hh
index 13efd4259d..60aa84f034 100644
--- a/src/bindings/cxx/eina_cxx/eina_eo_concrete_fwd.hh
+++ b/src/bindings/cxx/eina_cxx/eina_eo_concrete_fwd.hh
@@ -9,7 +9,11 @@ namespace efl { namespace eo {
 struct concrete;
 
 template <typename T>
-struct is_eolian_object;
+struct is_eolian_object : std::false_type {};
+template <typename T>
+struct is_eolian_object<T const> : is_eolian_object<T> {};
+template <>
+struct is_eolian_object<eo::concrete> : std::true_type {};
     
 } }
 
diff --git a/src/bindings/cxx/eo_cxx/eo_concrete.hh b/src/bindings/cxx/eo_cxx/eo_concrete.hh
index 2b29d09545..9cd23be1ea 100644
--- a/src/bindings/cxx/eo_cxx/eo_concrete.hh
+++ b/src/bindings/cxx/eo_cxx/eo_concrete.hh
@@ -10,6 +10,8 @@
 #include <cstddef>
 #include <eina_optional.hh>
 
+#include <eina_eo_concrete_fwd.hh>
+
 #include "eo_ops.hh"
 
 #ifndef EFL_CXX_THROW
@@ -254,13 +256,6 @@ T downcast(U object)
      }
 }
 
-template <typename T>
-struct is_eolian_object : std::false_type {};
-template <typename T>
-struct is_eolian_object<T const> : is_eolian_object<T> {};
-template <>
-struct is_eolian_object<eo::concrete> : std::true_type {};
-    
 /// @}
 
 } } // namespace efl { namespace eo {
diff --git a/src/lib/eolian_cxx/grammar/klass_def.hpp b/src/lib/eolian_cxx/grammar/klass_def.hpp
index d8b61458ce..48044d9be7 100644
--- a/src/lib/eolian_cxx/grammar/klass_def.hpp
+++ b/src/lib/eolian_cxx/grammar/klass_def.hpp
@@ -13,8 +13,6 @@
 
 #include <Eina.hh>
 
-#include "eo_concrete.hh"
-
 #include <vector>
 #include <memory>
 #include <set>