diff --git a/src/lib/eolian_cxx/grammar/class_implementation.hpp b/src/lib/eolian_cxx/grammar/class_implementation.hpp
index 60eb075073..615ee6022e 100644
--- a/src/lib/eolian_cxx/grammar/class_implementation.hpp
+++ b/src/lib/eolian_cxx/grammar/class_implementation.hpp
@@ -38,6 +38,10 @@ struct class_implementation_generator
         .generate(sink, std::make_tuple(), ctx))
        return false;
 
+     if(!as_generator("\n#include \"" << *(string << "_") << string << ".eo.hh\"\n\n")
+        .generate(sink, std::make_tuple(cls.namespaces, cls.cxx_name), add_lower_case_context(ctx)))
+       return false;
+
 #ifndef USE_EOCXX_INHERIT_ONLY
      if(!as_generator(
         (namespaces