diff --git a/legacy/eina/src/include/Makefile.am b/legacy/eina/src/include/Makefile.am
index ee8ce46d6e..58782e6335 100644
--- a/legacy/eina/src/include/Makefile.am
+++ b/legacy/eina/src/include/Makefile.am
@@ -61,4 +61,7 @@ dist_installed_headers_DATA = $(EINAHEADERS)
 
 EXTRA_DIST = \
 eina_config.h.in \
-eina_private.h
+eina_private.h \
+eina_share_common.h \
+eina_strbuf_common.h \
+eina_strbuf_template_c.x
diff --git a/legacy/eina/src/lib/eina_share_common.h b/legacy/eina/src/include/eina_share_common.h
similarity index 100%
rename from legacy/eina/src/lib/eina_share_common.h
rename to legacy/eina/src/include/eina_share_common.h
diff --git a/legacy/eina/src/lib/eina_strbuf_common.h b/legacy/eina/src/include/eina_strbuf_common.h
similarity index 100%
rename from legacy/eina/src/lib/eina_strbuf_common.h
rename to legacy/eina/src/include/eina_strbuf_common.h
diff --git a/legacy/eina/src/lib/eina_strbuf_template_c.i b/legacy/eina/src/include/eina_strbuf_template_c.x
similarity index 100%
rename from legacy/eina/src/lib/eina_strbuf_template_c.i
rename to legacy/eina/src/include/eina_strbuf_template_c.x
diff --git a/legacy/eina/src/lib/Makefile.am b/legacy/eina/src/lib/Makefile.am
index 5f1c693eec..9fc3df6931 100644
--- a/legacy/eina/src/lib/Makefile.am
+++ b/legacy/eina/src/lib/Makefile.am
@@ -45,10 +45,7 @@ eina_strbuf.c \
 eina_strbuf_common.c \
 eina_ustrbuf.c \
 eina_unicode.c \
-eina_quadtree.c \
-eina_share_common.h \
-eina_strbuf_common.h \
-eina_strbuf_template_c.i
+eina_quadtree.c
 
 if EINA_STATIC_BUILD_CHAINED_POOL
 base_sources += $(top_srcdir)/src/modules/mp/chained_pool/eina_chained_mempool.c
diff --git a/legacy/eina/src/lib/eina_strbuf.c b/legacy/eina/src/lib/eina_strbuf.c
index 17716cf95a..a85709d296 100644
--- a/legacy/eina/src/lib/eina_strbuf.c
+++ b/legacy/eina/src/lib/eina_strbuf.c
@@ -43,7 +43,7 @@ static const char __STRBUF_MAGIC_STR[] = "Eina Strbuf";
 #include "eina_unicode.h"
 #include "eina_private.h"
 
-#include "eina_strbuf_template_c.i"
+#include "eina_strbuf_template_c.x"
 
 
 
@@ -122,4 +122,4 @@ eina_strbuf_insert_vprintf(Eina_Strbuf *buf,
    ret = eina_strbuf_insert(buf, str, pos);
    free(str);
    return ret;
-}
\ No newline at end of file
+}
diff --git a/legacy/eina/src/lib/eina_ustrbuf.c b/legacy/eina/src/lib/eina_ustrbuf.c
index 6febe8ec7c..272724b558 100644
--- a/legacy/eina/src/lib/eina_ustrbuf.c
+++ b/legacy/eina/src/lib/eina_ustrbuf.c
@@ -39,4 +39,4 @@ static const char __USTRBUF_MAGIC_STR[] = "Eina UStrbuf";
 
 #define _FUNC_EXPAND(y) eina_ustrbuf_ ## y
 
-#include "eina_strbuf_template_c.i"
\ No newline at end of file
+#include "eina_strbuf_template_c.x"