diff --git a/legacy/edbus/Makefile.am b/legacy/edbus/Makefile.am
index cac29a928d..71558e4366 100644
--- a/legacy/edbus/Makefile.am
+++ b/legacy/edbus/Makefile.am
@@ -65,7 +65,7 @@ include_HEADERS = \
 	src/lib/edbus_service.h \
 	src/lib/edbus_signal_handler.h \
 	src/lib/edbus_message_helper.h \
-	src/lib/edbus_message_to_eina_value.h
+	src/lib/edbus_message_eina_value.h
 
 libedbus2_la_LIBADD = @ECORE_LIBS@ @DBUS_LIBS@
 libedbus2_la_SOURCES = \
diff --git a/legacy/edbus/src/lib/EDBus.h b/legacy/edbus/src/lib/EDBus.h
index 1be2e34809..784139c75d 100644
--- a/legacy/edbus/src/lib/EDBus.h
+++ b/legacy/edbus/src/lib/EDBus.h
@@ -133,9 +133,6 @@ typedef void (*EDBus_Signal_Cb)(void *data, const EDBus_Message *msg);
 #include "edbus_proxy.h"
 #include "edbus_freedesktop.h"
 #include "edbus_service.h"
-#include "edbus_message_helper.h"
-#include "edbus_message_to_eina_value.h"
-#include "edbus_message_from_eina_value.h"
 
 #ifdef __cplusplus
 }
diff --git a/legacy/edbus/src/lib/edbus_message.h b/legacy/edbus/src/lib/edbus_message.h
index bc14482b49..369bbe80fb 100644
--- a/legacy/edbus/src/lib/edbus_message.h
+++ b/legacy/edbus/src/lib/edbus_message.h
@@ -271,6 +271,10 @@ EAPI void                  edbus_message_iter_del(EDBus_Message_Iter *iter) EINA
 /**
  * @}
  */
+
+#include "edbus_message_helper.h"
+#include "edbus_message_eina_value.h"
+
 /**
  * @}
  */
diff --git a/legacy/edbus/src/lib/edbus_message_eina_value.h b/legacy/edbus/src/lib/edbus_message_eina_value.h
new file mode 100644
index 0000000000..4c47f1a2ae
--- /dev/null
+++ b/legacy/edbus/src/lib/edbus_message_eina_value.h
@@ -0,0 +1,26 @@
+/**
+ * @defgroup Eina_Value
+ * @{
+ */
+
+/**
+ * Convert EDBus_Message to Eina_Value
+ *
+ * @param msg Message
+ * @return Eina_Value of type Eina_Value_Type_Struct
+ */
+EAPI Eina_Value *edbus_message_to_eina_value(const EDBus_Message *msg);
+
+/**
+ * Convert Eina_Value to EDBus_Message
+ *
+ * @param signature dbus signature
+ * @param msg where data will be put
+ * @param value source of data, must be of type Eina_Value_Type_Struct
+ * @return success or not
+ */
+EAPI Eina_Bool edbus_message_from_eina_value(const char *signature, EDBus_Message *msg, const Eina_Value *value);
+
+/**
+ * @}
+ */
diff --git a/legacy/edbus/src/lib/edbus_message_from_eina_value.h b/legacy/edbus/src/lib/edbus_message_from_eina_value.h
deleted file mode 100644
index 11707fd76b..0000000000
--- a/legacy/edbus/src/lib/edbus_message_from_eina_value.h
+++ /dev/null
@@ -1 +0,0 @@
-EAPI Eina_Bool edbus_message_from_eina_value(const char *signature, EDBus_Message *msg, const Eina_Value *value);
diff --git a/legacy/edbus/src/lib/edbus_message_helper.h b/legacy/edbus/src/lib/edbus_message_helper.h
index 1dedfd4a46..4bad095d01 100644
--- a/legacy/edbus/src/lib/edbus_message_helper.h
+++ b/legacy/edbus/src/lib/edbus_message_helper.h
@@ -1,3 +1,9 @@
+/**
+ * @defgroup EDBus_Message_Helpers Helpers
+ *
+ * @{
+ */
+
 typedef void (*EDBus_Dict_Cb_Get)(void *data, const void *key, EDBus_Message_Iter *var);
 
 /**
@@ -9,3 +15,7 @@ typedef void (*EDBus_Dict_Cb_Get)(void *data, const void *key, EDBus_Message_Ite
  * @param data context data
  */
 EAPI void edbus_message_iter_dict_iterate(EDBus_Message_Iter *dict, const char *signature, EDBus_Dict_Cb_Get cb, const void *data);
+
+/**
+ * @}
+ */
diff --git a/legacy/edbus/src/lib/edbus_message_to_eina_value.h b/legacy/edbus/src/lib/edbus_message_to_eina_value.h
deleted file mode 100644
index 96044adc7d..0000000000
--- a/legacy/edbus/src/lib/edbus_message_to_eina_value.h
+++ /dev/null
@@ -1 +0,0 @@
-EAPI Eina_Value *edbus_message_to_eina_value(const EDBus_Message *msg);