diff --git a/legacy/eina/src/include/eina_hash.h b/legacy/eina/src/include/eina_hash.h
index 2c83d09c41..4e43157047 100644
--- a/legacy/eina/src/include/eina_hash.h
+++ b/legacy/eina/src/include/eina_hash.h
@@ -53,180 +53,61 @@ struct _Eina_Hash_Tuple
 
 typedef unsigned int (*Eina_Key_Length)(const void *key);
 #define EINA_KEY_LENGTH(Function) ((Eina_Key_Length)Function)
-typedef int (*Eina_Key_Cmp)(const void *key1, int key1_length,
-                            const void *key2, int key2_length);
+typedef int (*Eina_Key_Cmp)(const void *key1, int key1_length, const void *key2, int key2_length);
 #define EINA_KEY_CMP(Function) ((Eina_Key_Cmp)Function)
 typedef int (*Eina_Key_Hash)(const void *key, int key_length);
 #define EINA_KEY_HASH(Function) ((Eina_Key_Hash)Function)
 
-EAPI Eina_Hash *
-eina_hash_new(Eina_Key_Length key_length_cb,
-              Eina_Key_Cmp
-              key_cmp_cb,
-              Eina_Key_Hash
-              key_hash_cb,
-              Eina_Free_Cb
-              data_free_cb,
-              int
-              buckets_power_size) EINA_MALLOC EINA_WARN_UNUSED_RESULT
-EINA_ARG_NONNULL(2, 3);
-EAPI Eina_Hash *
-eina_hash_string_djb2_new(
-   Eina_Free_Cb data_free_cb);
-EAPI Eina_Hash *
-eina_hash_string_superfast_new(
-   Eina_Free_Cb data_free_cb);
-EAPI Eina_Hash *
-eina_hash_string_small_new(
-   Eina_Free_Cb data_free_cb);
-EAPI Eina_Hash *
-eina_hash_int32_new(
-   Eina_Free_Cb data_free_cb);
-EAPI Eina_Hash *
-eina_hash_int64_new(
-   Eina_Free_Cb data_free_cb);
-EAPI Eina_Hash *
-eina_hash_pointer_new(
-   Eina_Free_Cb data_free_cb);
-EAPI Eina_Hash *
-eina_hash_stringshared_new(
-   Eina_Free_Cb data_free_cb);
+EAPI Eina_Hash *eina_hash_new(Eina_Key_Length key_length_cb, Eina_Key_Cmp key_cmp_cb, Eina_Key_Hash key_hash_cb, Eina_Free_Cb data_free_cb, int buckets_power_size) EINA_MALLOC EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(2, 3);
+EAPI Eina_Hash *eina_hash_string_djb2_new(Eina_Free_Cb data_free_cb);
+EAPI Eina_Hash *eina_hash_string_superfast_new(Eina_Free_Cb data_free_cb);
+EAPI Eina_Hash *eina_hash_string_small_new(Eina_Free_Cb data_free_cb);
+EAPI Eina_Hash *eina_hash_int32_new(Eina_Free_Cb data_free_cb);
+EAPI Eina_Hash *eina_hash_int64_new(Eina_Free_Cb data_free_cb);
+EAPI Eina_Hash *eina_hash_pointer_new(Eina_Free_Cb data_free_cb);
+EAPI Eina_Hash *eina_hash_stringshared_new(Eina_Free_Cb data_free_cb);
 
-EAPI Eina_Bool
-eina_hash_add(
-   Eina_Hash *hash,
-   const void *key,
-   const void *data) EINA_ARG_NONNULL(1, 2, 3);
-EAPI Eina_Bool
-eina_hash_direct_add(
-   Eina_Hash *hash,
-   const void *key,
-   const void *data) EINA_ARG_NONNULL(1, 2, 3);
-EAPI Eina_Bool
-eina_hash_del(
-   Eina_Hash *hash,
-   const void *key,
-   const void *data) EINA_ARG_NONNULL(1);
-EAPI void *
-eina_hash_find(
-   const Eina_Hash *hash,
-   const void *key) EINA_ARG_NONNULL(1, 2);
-EAPI void *
-eina_hash_modify(
-   Eina_Hash *hash,
-   const void *key,
-   const void *data) EINA_ARG_NONNULL(1, 2, 3);
-EAPI void *
-eina_hash_set(
-   Eina_Hash *hash,
-   const void *key,
-   const void *data) EINA_ARG_NONNULL(1, 2, 3);
-EAPI Eina_Bool
-eina_hash_move(
-   Eina_Hash *hash,
-   const void *old_key,
-   const void *new_key) EINA_ARG_NONNULL(1, 2, 3);
+EAPI Eina_Bool eina_hash_add(Eina_Hash *hash, const void *key, const void *data) EINA_ARG_NONNULL(1, 2, 3);
+EAPI Eina_Bool eina_hash_direct_add(Eina_Hash *hash, const void *key, const void *data) EINA_ARG_NONNULL(1, 2, 3);
+EAPI Eina_Bool eina_hash_del(Eina_Hash *hash, const void *key, const void *data) EINA_ARG_NONNULL(1);
+EAPI void *eina_hash_find(const Eina_Hash *hash, const void *key) EINA_ARG_NONNULL(1, 2);
+EAPI void *eina_hash_modify(Eina_Hash *hash, const void *key, const void *data) EINA_ARG_NONNULL(1, 2, 3);
+EAPI void *eina_hash_set(Eina_Hash *hash, const void *key, const void *data) EINA_ARG_NONNULL(1, 2, 3);
+EAPI Eina_Bool eina_hash_move(Eina_Hash *hash, const void *old_key, const void *new_key) EINA_ARG_NONNULL(1, 2, 3);
 
-EAPI void
-eina_hash_free(
-   Eina_Hash *hash) EINA_ARG_NONNULL(1);
-EAPI void
-eina_hash_free_buckets(
-   Eina_Hash *hash) EINA_ARG_NONNULL(1);
-EAPI int
-eina_hash_population(
-   const Eina_Hash *hash) EINA_ARG_NONNULL(1);
+EAPI void eina_hash_free(Eina_Hash *hash) EINA_ARG_NONNULL(1);
+EAPI void eina_hash_free_buckets(Eina_Hash *hash) EINA_ARG_NONNULL(1);
+EAPI int eina_hash_population(const Eina_Hash *hash) EINA_ARG_NONNULL(1);
 
-EAPI Eina_Bool
-eina_hash_add_by_hash(
-   Eina_Hash *hash,
-   const
-   void *key,
-   int key_length,
-   int key_hash,
-   const
-   void *data)  EINA_ARG_NONNULL(1, 2, 5);
-EAPI Eina_Bool
-eina_hash_direct_add_by_hash(Eina_Hash *hash,
-                             const
-                             void *key,
-                             int key_length,
-                             int key_hash,
-                             const
-                             void *data) EINA_ARG_NONNULL(1, 2, 5);
+EAPI Eina_Bool eina_hash_add_by_hash(Eina_Hash *hash, const void *key, int key_length, int key_hash, const void *data) EINA_ARG_NONNULL(1, 2, 5);
+EAPI Eina_Bool eina_hash_direct_add_by_hash(Eina_Hash *hash, const void *key, int key_length, int key_hash, const void *data) EINA_ARG_NONNULL(1, 2, 5);
 
-EAPI Eina_Bool
-eina_hash_del_by_key_hash(Eina_Hash *hash,
-                          const void *key,
-                          int key_length,
-                          int key_hash) EINA_ARG_NONNULL(1, 2);
+EAPI Eina_Bool eina_hash_del_by_key_hash(Eina_Hash *hash, const void *key, int key_length, int key_hash) EINA_ARG_NONNULL(1, 2);
 
-EAPI Eina_Bool
-eina_hash_del_by_key(Eina_Hash *hash, const void *key) EINA_ARG_NONNULL(1, 2);
-EAPI Eina_Bool
-eina_hash_del_by_data(Eina_Hash *hash, const void *data) EINA_ARG_NONNULL(1, 2);
+EAPI Eina_Bool eina_hash_del_by_key(Eina_Hash *hash, const void *key) EINA_ARG_NONNULL(1, 2);
+EAPI Eina_Bool eina_hash_del_by_data(Eina_Hash *hash, const void *data) EINA_ARG_NONNULL(1, 2);
 
-EAPI Eina_Bool
-eina_hash_del_by_hash(Eina_Hash *hash,
-                      const
-                      void *key,
-                      int key_length,
-                      int key_hash,
-                      const
-                      void *data) EINA_ARG_NONNULL(1);
-EAPI void *
-eina_hash_find_by_hash(const Eina_Hash *hash,
-                       const
-                       void *key,
-                       int key_length,
-                       int key_hash) EINA_ARG_NONNULL(1, 2);
-EAPI void *
-eina_hash_modify_by_hash(Eina_Hash *hash,
-                         const
-                         void *key,
-                         int key_length,
-                         int key_hash,
-                         const
-                         void *data) EINA_ARG_NONNULL(1, 2, 5);
+EAPI Eina_Bool eina_hash_del_by_hash(Eina_Hash *hash, const void *key, int key_length, int key_hash, const void *data) EINA_ARG_NONNULL(1);
+EAPI void *eina_hash_find_by_hash(const Eina_Hash *hash, const void *key, int key_length, int key_hash) EINA_ARG_NONNULL(1, 2);
+EAPI void *eina_hash_modify_by_hash(Eina_Hash *hash, const void *key, int key_length, int key_hash, const void *data) EINA_ARG_NONNULL(1, 2, 5);
 
-EAPI Eina_Iterator *
-                                      eina_hash_iterator_key_new(
-   const Eina_Hash *hash) EINA_MALLOC EINA_ARG_NONNULL(1)
-EINA_WARN_UNUSED_RESULT;
-EAPI Eina_Iterator *
-                                      eina_hash_iterator_data_new(
-   const Eina_Hash *hash) EINA_MALLOC EINA_ARG_NONNULL(
-   1) EINA_WARN_UNUSED_RESULT;
-EAPI Eina_Iterator *
-                                      eina_hash_iterator_tuple_new(
-   const Eina_Hash *hash) EINA_MALLOC EINA_ARG_NONNULL(
-   1) EINA_WARN_UNUSED_RESULT;
+EAPI Eina_Iterator *eina_hash_iterator_key_new(const Eina_Hash *hash) EINA_MALLOC EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
+EAPI Eina_Iterator *eina_hash_iterator_data_new(const Eina_Hash *hash) EINA_MALLOC EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
+EAPI Eina_Iterator *eina_hash_iterator_tuple_new(const Eina_Hash *hash) EINA_MALLOC EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
 
-typedef Eina_Bool (*Eina_Hash_Foreach)(const Eina_Hash *hash, const void *key,
-                                       void *data, void *fdata);
-EAPI void
-eina_hash_foreach(const Eina_Hash *hash,
-                  Eina_Hash_Foreach
-                  cb,
-                  const
-                  void *fdata) EINA_ARG_NONNULL(1, 2);
+typedef Eina_Bool (*Eina_Hash_Foreach)(const Eina_Hash *hash, const void *key, void *data, void *fdata);
+EAPI void eina_hash_foreach(const Eina_Hash *hash, Eina_Hash_Foreach cb, const void *fdata) EINA_ARG_NONNULL(1, 2);
 
-/* Paul Hsieh (http://www.azillionmonkeys.com/qed/hash.html) hash function
-   used by WebCore (http://webkit.org/blog/8/hashtables-part-2/) */
-EAPI int
-eina_hash_superfast(const char *key, int len) EINA_ARG_NONNULL(1);
+/* Paul Hsieh (http://www.azillionmonkeys.com/qed/hash.html) hash function used by WebCore (http://webkit.org/blog/8/hashtables-part-2/) */
+EAPI int eina_hash_superfast(const char *key, int len) EINA_ARG_NONNULL(1);
 
 /* Hash function first reported by dan bernstein many years ago in comp.lang.c */
-static inline int
-eina_hash_djb2(const char *key, int len) EINA_ARG_NONNULL(1);
-static inline int
-eina_hash_djb2_len(const char *key, int *plen) EINA_ARG_NONNULL(1, 2);
+static inline int eina_hash_djb2(const char *key, int len) EINA_ARG_NONNULL(1);
+static inline int eina_hash_djb2_len(const char *key, int *plen) EINA_ARG_NONNULL(1, 2);
 
 /* Hash function from http://www.concentric.net/~Ttwang/tech/inthash.htm */
-static inline int
-eina_hash_int32(const unsigned int *pkey, int len) EINA_ARG_NONNULL(1);
-static inline int
-eina_hash_int64(const unsigned long int *pkey, int len) EINA_ARG_NONNULL(1);
+static inline int eina_hash_int32(const unsigned int *pkey, int len) EINA_ARG_NONNULL(1);
+static inline int eina_hash_int64(const unsigned long int *pkey, int len) EINA_ARG_NONNULL(1);
 
 #include "eina_inline_hash.x"