diff --git a/src/bin/edje/edje_cc_out.c b/src/bin/edje/edje_cc_out.c
index 1c09c3eb3a..d821902473 100644
--- a/src/bin/edje/edje_cc_out.c
+++ b/src/bin/edje/edje_cc_out.c
@@ -254,7 +254,7 @@ _part_lookup_key_pc_hash(const void *key, int key_length EINA_UNUSED)
 
    if (a->stable)
      {
-#ifdef __LP64__
+#ifdef EFL64
         return eina_hash_int64((uintptr_t *) &a->pc, sizeof (void*)) ^
           eina_hash_int64((uintptr_t *) &a->mem.dest, sizeof (void*));
 #else
@@ -264,7 +264,7 @@ _part_lookup_key_pc_hash(const void *key, int key_length EINA_UNUSED)
      }
    else
      {
-#ifdef __LP64__
+#ifdef EFL64
         return eina_hash_int64((uintptr_t *) &a->pc, sizeof (void*)) ^
           eina_hash_int64((uintptr_t *) &a->mem.reallocated.base, sizeof (void*)) ^
           eina_hash_int32((unsigned int *) &a->mem.reallocated.offset, sizeof (int));
@@ -298,7 +298,7 @@ _part_lookup_key_hash(const void *key, int key_length EINA_UNUSED)
 
    if (a->stable)
      {
-#ifdef __LP64__
+#ifdef EFL64
         return eina_hash_int64((uintptr_t *) &a->mem.dest, sizeof (void*));
 #else
         return eina_hash_int32((uintptr_t *) &a->mem.dest, sizeof (void*));
@@ -306,7 +306,7 @@ _part_lookup_key_hash(const void *key, int key_length EINA_UNUSED)
      }
    else
      {
-#ifdef __LP64__
+#ifdef EFL64
         return eina_hash_int64((uintptr_t *) &a->mem.reallocated.base, sizeof (void*)) ^
           eina_hash_int32((unsigned int *) &a->mem.reallocated.offset, sizeof (int));
 #else
diff --git a/src/lib/edje/edje_signal.c b/src/lib/edje/edje_signal.c
index 1ec9b151d1..b9aa3e9f55 100644
--- a/src/lib/edje/edje_signal.c
+++ b/src/lib/edje/edje_signal.c
@@ -36,7 +36,7 @@ _edje_signal_match_key_hash(const void *key, int key_length EINA_UNUSED)
    hash = eina_hash_int32(&a->matches_count, sizeof (int));
    for (i = 0; i < a->matches_count; ++i)
      {
-#ifdef __LP64__
+#ifdef EFL64
         hash ^= eina_hash_int64((const unsigned long int*) &a->matches[i].signal, sizeof (char *));
         hash ^= eina_hash_int64((const unsigned long int*) &a->matches[i].source, sizeof (char *));
         hash ^= eina_hash_int64((const unsigned long int*) &a->matches[i].func, sizeof (Edje_Signal_Cb));
diff --git a/src/lib/eina/eina_config.h.in b/src/lib/eina/eina_config.h.in
index 72e3ed3eeb..5eddfdd61d 100644
--- a/src/lib/eina/eina_config.h.in
+++ b/src/lib/eina/eina_config.h.in
@@ -97,4 +97,8 @@
 #endif
 @EINA_CONFIGURE_HAVE_POSIX_SPINLOCK@
 
+#if (defined(__x86_64__) || defined(__x86_64) || defined(__amd64__) || defined(__amd64) || defined(__ppc64__) || defined(_WIN64) || defined(__LP64__) || defined(_LP64))
+# define EFL64
+#endif
+
 #endif /* EINA_CONFIG_H_ */
diff --git a/src/lib/eina/eina_cow.c b/src/lib/eina/eina_cow.c
index a2c4e3fbfe..2488648178 100644
--- a/src/lib/eina/eina_cow.c
+++ b/src/lib/eina/eina_cow.c
@@ -163,7 +163,7 @@ _eina_cow_hash_gen(const void *key, int key_length,
    return r;
 }
 
-#ifdef __LP64__
+#ifdef EFL64
 static int
 _eina_cow_hash64(const void *key, int key_length)
 {
@@ -355,7 +355,7 @@ eina_cow_add(const char *name, unsigned int struct_size, unsigned int step, cons
         goto on_error;
      }
 
-#ifdef __LP64__
+#ifdef EFL64
    cow->match = eina_hash_new(_eina_cow_length,
                               _eina_cow_cmp,
                               _eina_cow_hash64,
diff --git a/src/lib/eina/eina_hash.c b/src/lib/eina/eina_hash.c
index 87dd68679e..0989f68342 100644
--- a/src/lib/eina/eina_hash.c
+++ b/src/lib/eina/eina_hash.c
@@ -804,7 +804,7 @@ eina_hash_int64_new(Eina_Free_Cb data_free_cb)
 EAPI Eina_Hash *
 eina_hash_pointer_new(Eina_Free_Cb data_free_cb)
 {
-#ifdef __LP64__
+#ifdef EFL64
    return eina_hash_new(EINA_KEY_LENGTH(_eina_int64_key_length),
                         EINA_KEY_CMP(_eina_int64_key_cmp),
                         EINA_KEY_HASH(eina_hash_int64),
diff --git a/src/lib/ethumb/ethumb.c b/src/lib/ethumb/ethumb.c
index eab57a2d8f..3c4a96868f 100644
--- a/src/lib/ethumb/ethumb.c
+++ b/src/lib/ethumb/ethumb.c
@@ -1892,7 +1892,7 @@ ethumb_key_cmp(const void *key1, EINA_UNUSED int key1_length,
 #undef CMP_PARAM
 
 #define HASH_PARAM_I(Param) r ^= eina_hash_int32((unsigned int*) &e->Param, 0);
-#ifdef __LP64__
+#ifdef EFL64
 # define HASH_PARAM_P(Param) r ^= eina_hash_int64((unsigned long int*) &e->Param, 0);
 #else
 # define HASH_PARAM_P(Param) r ^= eina_hash_int32((unsigned int*) &e->Param, 0);