diff --git a/legacy/eina/win32/MANIFEST.txt b/legacy/eina/win32/MANIFEST.txt
deleted file mode 100644
index 618718f997..0000000000
--- a/legacy/eina/win32/MANIFEST.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-
- This folder content:
-
-   common                       - common sources necessary to build efl with MSVC
-
-     eina_config.h                - header to configure Eina
-
-   vs8                          - Visual Studio 8 project files
-     evil.sln                     - Eina MSVC solution
-     libeina.vcproj               - libeina project
-
-   vs9                          - Visual Studio 9 project files
-     evil.sln                     - Eina MSVC solution
-     libeina.vcproj               - libeina project
-
-   start.bat                    - batch script to start work with the solution
-   MANIFEST.txt                 - this file
-   README.txt                   - about this folder
diff --git a/legacy/eina/win32/README.txt b/legacy/eina/win32/README.txt
deleted file mode 100644
index 398795ed7d..0000000000
--- a/legacy/eina/win32/README.txt
+++ /dev/null
@@ -1,10 +0,0 @@
- This folder contains Microsoft Visual Studio projects and some sources for
- building Eina.
-
-Important:
-
- Do not launch manually any solutions or projects in the folder, to start
- a solution run the start.bat script, it will setup environment for
- projects and will check system requirements. start.bat will detect
- automatically the version of Visual Studio which is installed. It
- currently supports Visual Studio 2005 and 2008.
diff --git a/legacy/eina/win32/common/eina_config.h b/legacy/eina/win32/common/eina_config.h
deleted file mode 100644
index be1a50c866..0000000000
--- a/legacy/eina/win32/common/eina_config.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/* EINA - EFL data type library
- * Copyright (C) 2008 Cedric Bail
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library;
- * if not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef EINA_CONFIG_H_
-#define EINA_CONFIG_H_
-
-#undef EINA_MAGIC_DEBUG
-#undef EINA_DEFAULT_MEMPOOL
-#undef EINA_SAFETY_CHECKS
-
-#ifndef NDEBUG
-# define EINA_MAGIC_DEBUG
-# define EINA_SAFETY_CHECKS
-#endif
-
-#define NVALGRIND
-
-#ifndef VMAJ
-# define VMAJ 1
-#endif
-#ifndef VMIN
-# define VMIN 0
-#endif
-#ifndef VMIC
-# define VMIC 0
-#endif
-#ifndef VREV
-# define VREV 0
-#endif
-
-#define MODULE_ARCH "win32-msc-x86"
-#define SHARED_LIB_SUFFIX ".dll"
-
-#endif /* EINA_CONFIG_H_ */
diff --git a/legacy/eina/win32/patch/eina.diff b/legacy/eina/win32/patch/eina.diff
deleted file mode 100644
index b68fbf4fdf..0000000000
--- a/legacy/eina/win32/patch/eina.diff
+++ /dev/null
@@ -1,952 +0,0 @@
---- ../../src/lib/eina_array.c	2010-04-15 06:29:24 +0000
-+++ ../../src/lib/eina_array_new.c	2010-04-15 06:32:11 +0000
-@@ -144,21 +144,39 @@
-        EINA_MAGIC_FAIL(d, EINA_MAGIC_ARRAY);		\
-   } while (0)
- 
--#define EINA_MAGIC_CHECK_ARRAY_ITERATOR(d, ...)			\
-+#define EINA_MAGIC_CHECK_ARRAY_ITERATOR(d)			\
-   do {								\
-      if (!EINA_MAGIC_CHECK(d, EINA_MAGIC_ARRAY_ITERATOR))	\
-        {							\
-           EINA_MAGIC_FAIL(d, EINA_MAGIC_ARRAY_ITERATOR);	\
--          return __VA_ARGS__;					\
-+          return;						\
-        }							\
-   } while (0)
- 
--#define EINA_MAGIC_CHECK_ARRAY_ACCESSOR(d, ...)			\
-+#define EINA_MAGIC_CHECK_ARRAY_ITERATOR_RETURN(d,ret)		\
-+  do {								\
-+     if (!EINA_MAGIC_CHECK(d, EINA_MAGIC_ARRAY_ITERATOR))	\
-+       {							\
-+          EINA_MAGIC_FAIL(d, EINA_MAGIC_ARRAY_ITERATOR);	\
-+          return ret;					\
-+       }							\
-+  } while (0)
-+
-+#define EINA_MAGIC_CHECK_ARRAY_ACCESSOR(d)			\
-+  do {								\
-+     if (!EINA_MAGIC_CHECK(d, EINA_MAGIC_ARRAY_ACCESSOR))	\
-+       {							\
-+          EINA_MAGIC_FAIL(d, EINA_MAGIC_ACCESSOR);		\
-+          return;						\
-+       }							\
-+  } while (0)
-+
-+#define EINA_MAGIC_CHECK_ARRAY_ACCESSOR_RETURN(d,ret)			\
-   do {								\
-      if (!EINA_MAGIC_CHECK(d, EINA_MAGIC_ARRAY_ACCESSOR))	\
-        {							\
-           EINA_MAGIC_FAIL(d, EINA_MAGIC_ACCESSOR);		\
--          return __VA_ARGS__;					\
-+          return ret;						\
-        }							\
-   } while (0)
- 
-@@ -205,7 +223,7 @@
- static Eina_Bool
- eina_array_iterator_next(Eina_Iterator_Array *it, void **data)
- {
--   EINA_MAGIC_CHECK_ARRAY_ITERATOR(it, EINA_FALSE);
-+   EINA_MAGIC_CHECK_ARRAY_ITERATOR_RETURN(it, EINA_FALSE);
- 
-    if (!(it->index < eina_array_count_get(it->array)))
-      return EINA_FALSE;
-@@ -218,7 +236,7 @@
- static Eina_Array *
- eina_array_iterator_get_container(Eina_Iterator_Array *it)
- {
--   EINA_MAGIC_CHECK_ARRAY_ITERATOR(it, NULL);
-+   EINA_MAGIC_CHECK_ARRAY_ITERATOR_RETURN(it, NULL);
-    return (Eina_Array *) it->array;
- }
- 
-@@ -232,7 +250,7 @@
- static Eina_Bool
- eina_array_accessor_get_at(Eina_Accessor_Array *it, unsigned int idx, void **data)
- {
--   EINA_MAGIC_CHECK_ARRAY_ACCESSOR(it, EINA_FALSE);
-+   EINA_MAGIC_CHECK_ARRAY_ACCESSOR_RETURN(it, EINA_FALSE);
- 
-    if (!(idx < eina_array_count_get(it->array)))
-      return EINA_FALSE;
-@@ -244,7 +262,7 @@
- static Eina_Array *
- eina_array_accessor_get_container(Eina_Accessor_Array *it)
- {
--   EINA_MAGIC_CHECK_ARRAY_ACCESSOR(it, NULL);
-+   EINA_MAGIC_CHECK_ARRAY_ACCESSOR_RETURN(it, NULL);
-    return (Eina_Array *) it->array;
- }
- 
---- ../../src/lib/eina_hash.c	2010-04-15 06:11:15 +0000
-+++ ../../src/lib/eina_hash_new.c	2010-04-14 16:59:57 +0000
-@@ -53,12 +53,21 @@
-        EINA_MAGIC_FAIL(d, EINA_MAGIC_HASH);				\
-   } while(0)
- 
--#define EINA_MAGIC_CHECK_HASH_ITERATOR(d, ...)				\
-+#define EINA_MAGIC_CHECK_HASH_ITERATOR(d)				\
-   do {									\
-      if (!EINA_MAGIC_CHECK(d, EINA_MAGIC_HASH_ITERATOR))		\
-      {									\
-           EINA_MAGIC_FAIL(d, EINA_MAGIC_HASH_ITERATOR);			\
--          return __VA_ARGS__;							\
-+          return;							\
-+     }									\
-+  } while(0)
-+
-+#define EINA_MAGIC_CHECK_HASH_ITERATOR_RET(d, ret)			\
-+  do {									\
-+     if (!EINA_MAGIC_CHECK(d, EINA_MAGIC_HASH_ITERATOR))		\
-+     {									\
-+          EINA_MAGIC_FAIL(d, EINA_MAGIC_HASH_ITERATOR);			\
-+          return ret;							\
-      }									\
-   } while(0)
- 
-@@ -484,7 +493,7 @@
- {
-    Eina_Hash_El *stuff;
- 
--   EINA_MAGIC_CHECK_HASH_ITERATOR(it, NULL);
-+   EINA_MAGIC_CHECK_HASH_ITERATOR_RET(it, NULL);
- 
-    stuff = it->el;
- 
-@@ -497,7 +506,7 @@
- {
-    Eina_Hash_El *stuff;
- 
--   EINA_MAGIC_CHECK_HASH_ITERATOR(it, NULL);
-+   EINA_MAGIC_CHECK_HASH_ITERATOR_RET(it, NULL);
- 
-    stuff = it->el;
- 
-@@ -510,7 +519,7 @@
- {
-    Eina_Hash_El *stuff;
- 
--   EINA_MAGIC_CHECK_HASH_ITERATOR(it, NULL);
-+   EINA_MAGIC_CHECK_HASH_ITERATOR_RET(it, NULL);
- 
-    stuff = it->el;
- 
-@@ -588,7 +597,7 @@
- static void *
- _eina_hash_iterator_get_container(Eina_Iterator_Hash *it)
- {
--   EINA_MAGIC_CHECK_HASH_ITERATOR(it, NULL);
-+   EINA_MAGIC_CHECK_HASH_ITERATOR_RET(it, NULL);
-    return (void *) it->hash;
- }
- 
---- ../../src/lib/eina_list.c	2010-04-15 06:29:24 +0000
-+++ ../../src/lib/eina_list_new.c	2010-04-15 06:33:11 +0000
-@@ -98,30 +98,57 @@
- static const char EINA_MAGIC_LIST_ACCOUNTING_STR[] = "Eina List Accounting";
- 
- 
--#define EINA_MAGIC_CHECK_LIST(d, ...)				\
-+#define EINA_MAGIC_CHECK_LIST(d)				\
-   do {								\
-     if (!EINA_MAGIC_CHECK(d, EINA_MAGIC_LIST))			\
-     {								\
-         EINA_MAGIC_FAIL(d, EINA_MAGIC_LIST);			\
--        return __VA_ARGS__;					\
-+        return;							\
-+    }								\
-+  } while(0)
-+
-+#define EINA_MAGIC_CHECK_LIST_RETURN(d,ret)			\
-+  do {								\
-+    if (!EINA_MAGIC_CHECK(d, EINA_MAGIC_LIST))			\
-+    {								\
-+        EINA_MAGIC_FAIL(d, EINA_MAGIC_LIST);			\
-+        return ret;						\
-+    }								\
-+  } while(0)
-+
-+#define EINA_MAGIC_CHECK_LIST_ITERATOR(d)			\
-+  do {								\
-+    if (!EINA_MAGIC_CHECK(d, EINA_MAGIC_LIST_ITERATOR))		\
-+    {								\
-+        EINA_MAGIC_FAIL(d, EINA_MAGIC_LIST_ITERATOR);		\
-+        return;							\
-     }								\
-   } while(0)
- 
--#define EINA_MAGIC_CHECK_LIST_ITERATOR(d, ...)			\
-+#define EINA_MAGIC_CHECK_LIST_ITERATOR_RETURN(d,ret)		\
-   do {								\
-     if (!EINA_MAGIC_CHECK(d, EINA_MAGIC_LIST_ITERATOR))		\
-     {								\
-         EINA_MAGIC_FAIL(d, EINA_MAGIC_LIST_ITERATOR);		\
--        return __VA_ARGS__;					\
-+        return ret;						\
-+    }								\
-+  } while(0)
-+
-+#define EINA_MAGIC_CHECK_LIST_ACCESSOR(d)			\
-+  do {								\
-+    if (!EINA_MAGIC_CHECK(d, EINA_MAGIC_LIST_ACCESSOR))		\
-+    {								\
-+        EINA_MAGIC_FAIL(d, EINA_MAGIC_LIST_ACCESSOR);		\
-+        return;							\
-     }								\
-   } while(0)
- 
--#define EINA_MAGIC_CHECK_LIST_ACCESSOR(d, ...)			\
-+#define EINA_MAGIC_CHECK_LIST_ACCESSOR_RETURN(d,ret)		\
-   do {								\
-     if (!EINA_MAGIC_CHECK(d, EINA_MAGIC_LIST_ACCESSOR))		\
-     {								\
-         EINA_MAGIC_FAIL(d, EINA_MAGIC_LIST_ACCESSOR);		\
--        return __VA_ARGS__;					\
-+        return ret;						\
-     }								\
-   } while(0)
- 
-@@ -224,7 +251,7 @@
- static Eina_List *
- _eina_list_setup_accounting(Eina_List *list)
- {
--   EINA_MAGIC_CHECK_LIST(list, NULL);
-+   EINA_MAGIC_CHECK_LIST_RETURN(list, NULL);
- 
-    list->accounting = _eina_list_mempool_accounting_new(list);
-    if (!list->accounting) goto on_error;
-@@ -267,7 +294,7 @@
- static Eina_Bool
- eina_list_iterator_next(Eina_Iterator_List *it, void **data)
- {
--   EINA_MAGIC_CHECK_LIST_ITERATOR(it, EINA_FALSE);
-+   EINA_MAGIC_CHECK_LIST_ITERATOR_RETURN(it, EINA_FALSE);
- 
-    if (it->current == NULL) return EINA_FALSE;
-    *data = eina_list_data_get(it->current);
-@@ -280,7 +307,7 @@
- static Eina_Bool
- eina_list_iterator_prev(Eina_Iterator_List *it, void **data)
- {
--   EINA_MAGIC_CHECK_LIST_ITERATOR(it, EINA_FALSE);
-+   EINA_MAGIC_CHECK_LIST_ITERATOR_RETURN(it, EINA_FALSE);
- 
-    if (it->current == NULL) return EINA_FALSE;
-    *data = eina_list_data_get(it->current);
-@@ -293,7 +320,7 @@
- static Eina_List *
- eina_list_iterator_get_container(Eina_Iterator_List *it)
- {
--   EINA_MAGIC_CHECK_LIST_ITERATOR(it, NULL);
-+   EINA_MAGIC_CHECK_LIST_ITERATOR_RETURN(it, NULL);
- 
-    return (Eina_List *) it->head;
- }
-@@ -313,7 +340,7 @@
-    unsigned int middle;
-    unsigned int i;
- 
--   EINA_MAGIC_CHECK_LIST_ACCESSOR(it, EINA_FALSE);
-+   EINA_MAGIC_CHECK_LIST_ACCESSOR_RETURN(it, EINA_FALSE);
- 
-    if (idx >= eina_list_count(it->head)) return EINA_FALSE;
- 
-@@ -378,7 +405,7 @@
- static Eina_List *
- eina_list_accessor_get_container(Eina_Accessor_List *it)
- {
--   EINA_MAGIC_CHECK_LIST_ACCESSOR(it, NULL);
-+   EINA_MAGIC_CHECK_LIST_ACCESSOR_RETURN(it, NULL);
- 
-    return (Eina_List *) it->head;
- }
-@@ -396,7 +423,7 @@
- {
-    Eina_List *prev = NULL;
- 
--   EINA_MAGIC_CHECK_LIST(list, NULL);
-+   EINA_MAGIC_CHECK_LIST_RETURN(list, NULL);
- 
-    for (; list; list = list->next)
-      {
-@@ -582,7 +609,7 @@
- 	return _eina_list_setup_accounting(new_l);
-      }
- 
--   EINA_MAGIC_CHECK_LIST(list, NULL);
-+   EINA_MAGIC_CHECK_LIST_RETURN(list, NULL);
- 
-    l = list->accounting->last;
-    list->accounting->last = new_l;
-@@ -637,7 +664,7 @@
- 
-    if (!list) return _eina_list_setup_accounting(new_l);
- 
--   EINA_MAGIC_CHECK_LIST(list, NULL);
-+   EINA_MAGIC_CHECK_LIST_RETURN(list, NULL);
- 
-    list->prev = new_l;
- 
-@@ -690,7 +717,7 @@
-    Eina_List *l;
-    void *list_data;
- 
--   if (list) EINA_MAGIC_CHECK_LIST(list, NULL);
-+   if (list) EINA_MAGIC_CHECK_LIST_RETURN(list, NULL);
- 
-    EINA_LIST_FOREACH(list, l, list_data)
-      {
-@@ -728,7 +755,7 @@
-    new_l = _eina_list_mempool_list_new(list);
-    if (!new_l) return list;
- 
--   EINA_MAGIC_CHECK_LIST(relative, NULL);
-+   EINA_MAGIC_CHECK_LIST_RETURN(relative, NULL);
-    new_l->next = relative->next;
-    new_l->data = (void *)data;
- 
-@@ -790,7 +817,7 @@
-    Eina_List *l;
-    void *list_data;
- 
--   if (list) EINA_MAGIC_CHECK_LIST(list, NULL);
-+   if (list) EINA_MAGIC_CHECK_LIST_RETURN(list, NULL);
- 
-    EINA_LIST_FOREACH(list, l, list_data)
-      {
-@@ -827,7 +854,7 @@
-    new_l = _eina_list_mempool_list_new(list);
-    if (!new_l) return list;
- 
--   EINA_MAGIC_CHECK_LIST(relative, NULL);
-+   EINA_MAGIC_CHECK_LIST_RETURN(relative, NULL);
- 
-    new_l->prev = relative->prev;
-    new_l->next = relative;
-@@ -899,7 +926,7 @@
- {
-    Eina_List *l;
- 
--   if (list) EINA_MAGIC_CHECK_LIST(list, NULL);
-+   if (list) EINA_MAGIC_CHECK_LIST_RETURN(list, NULL);
- 
-    l = eina_list_data_find_list(list, data);
-    return eina_list_remove_list(list, l);
-@@ -946,7 +973,7 @@
-    if (!list) return NULL;
-    if (!remove_list) return list;
- 
--   EINA_MAGIC_CHECK_LIST(remove_list, NULL);
-+   EINA_MAGIC_CHECK_LIST_RETURN(remove_list, NULL);
- 
-    if (remove_list->next) remove_list->next->prev = remove_list->prev;
-    if (remove_list->prev)
-@@ -958,7 +985,7 @@
-      return_l = remove_list->next;
-    if (remove_list == remove_list->accounting->last)
-      {
--       EINA_MAGIC_CHECK_LIST(list, NULL);
-+       EINA_MAGIC_CHECK_LIST_RETURN(list, NULL);
-        list->accounting->last = remove_list->prev;
-      }
-    _eina_list_mempool_list_free(remove_list);
-@@ -981,7 +1008,7 @@
- 
-    if (!list) return NULL;
- 
--   EINA_MAGIC_CHECK_LIST(list, NULL);
-+   EINA_MAGIC_CHECK_LIST_RETURN(list, NULL);
- 
-    for (l = list; l;)
-      {
-@@ -1032,8 +1059,8 @@
-    if (move_list == list) return list;
-    if (move_list->next == list) return move_list;
- 
--   EINA_MAGIC_CHECK_LIST(list, NULL);
--   EINA_MAGIC_CHECK_LIST(move_list, NULL);
-+   EINA_MAGIC_CHECK_LIST_RETURN(list, NULL);
-+   EINA_MAGIC_CHECK_LIST_RETURN(move_list, NULL);
- 
-    /* Remove the promoted item from the list. */
-    if (!move_list->prev)
-@@ -1094,8 +1121,8 @@
-    /* Demoting tail to be tail. */
-    if (move_list == list->accounting->last) return list;
- 
--   EINA_MAGIC_CHECK_LIST(list, NULL);
--   EINA_MAGIC_CHECK_LIST(move_list, NULL);
-+   EINA_MAGIC_CHECK_LIST_RETURN(list, NULL);
-+   EINA_MAGIC_CHECK_LIST_RETURN(move_list, NULL);
- 
-    /* Update pointer list if necessary. */
-    if (list == move_list)
-@@ -1160,7 +1187,7 @@
-    const Eina_List *l;
-    void *list_data;
- 
--   if (list) EINA_MAGIC_CHECK_LIST(list, NULL);
-+   if (list) EINA_MAGIC_CHECK_LIST_RETURN(list, NULL);
- 
-    EINA_LIST_FOREACH(list, l, list_data)
-      {
-@@ -1211,7 +1238,7 @@
-    const Eina_List *l;
-    unsigned int i;
- 
--   if (list) EINA_MAGIC_CHECK_LIST(list, NULL);
-+   if (list) EINA_MAGIC_CHECK_LIST_RETURN(list, NULL);
- 
-    /* check for non-existing nodes */
-    if ((!list) || (n > (list->accounting->count - 1)))
-@@ -1328,7 +1355,7 @@
- 
-    if (!list) return NULL;
- 
--   EINA_MAGIC_CHECK_LIST(list, NULL);
-+   EINA_MAGIC_CHECK_LIST_RETURN(list, NULL);
- 
-    l1 = list;
-    l2 = list->accounting->last;
-@@ -1372,7 +1399,7 @@
- 
-    if (!list) return NULL;
- 
--   EINA_MAGIC_CHECK_LIST(list, NULL);
-+   EINA_MAGIC_CHECK_LIST_RETURN(list, NULL);
- 
-    lclone = NULL;
-    EINA_LIST_FOREACH(list, l, data)
-@@ -1405,7 +1432,7 @@
- 
-    if (!list) return NULL;
- 
--   EINA_MAGIC_CHECK_LIST(list, NULL);
-+   EINA_MAGIC_CHECK_LIST_RETURN(list, NULL);
- 
-    lclone = NULL;
-    EINA_LIST_FOREACH(list, l, data)
-@@ -1466,7 +1493,7 @@
- 
-    EINA_SAFETY_ON_NULL_RETURN_VAL(func, list);
-    if (!list) return NULL;
--   EINA_MAGIC_CHECK_LIST(list, NULL);
-+   EINA_MAGIC_CHECK_LIST_RETURN(list, NULL);
- 
-    /* if the caller specified an invalid size, sort the whole list */
-    if ((size == 0) ||
---- ../../src/lib/eina_matrixsparse.c	2010-04-15 06:29:24 +0000
-+++ ../../src/lib/eina_matrixsparse_new.c	2010-04-15 06:33:48 +0000
-@@ -66,12 +66,21 @@
- static const char EINA_MAGIC_MATRIXSPARSE_CELL_ITERATOR_STR[] = "Eina Matrixsparse Cell Iterator";
- 
- 
--#define EINA_MAGIC_CHECK_MATRIXSPARSE(d, ...)		\
-+#define EINA_MAGIC_CHECK_MATRIXSPARSE(d)		\
-   do {							\
-      if (!EINA_MAGIC_CHECK(d, EINA_MAGIC_MATRIXSPARSE))	\
-        {						\
- 	  EINA_MAGIC_FAIL(d, EINA_MAGIC_MATRIXSPARSE);	\
--	  return __VA_ARGS__;				\
-+	  return;					\
-+       }						\
-+  } while(0)
-+
-+#define EINA_MAGIC_CHECK_MATRIXSPARSE_RET(d, ret)	\
-+  do {							\
-+     if (!EINA_MAGIC_CHECK(d, EINA_MAGIC_MATRIXSPARSE))	\
-+       {						\
-+	  EINA_MAGIC_FAIL(d, EINA_MAGIC_MATRIXSPARSE);	\
-+	  return ret;					\
-        }						\
-   } while(0)
- 
-@@ -93,12 +102,21 @@
-        }							\
-   } while(0)
- 
--#define EINA_MAGIC_CHECK_MATRIXSPARSE_ITERATOR(d, ...)			\
-+#define EINA_MAGIC_CHECK_MATRIXSPARSE_ITERATOR(d)			\
-+  do {									\
-+     if (!EINA_MAGIC_CHECK(d, EINA_MAGIC_MATRIXSPARSE_ITERATOR))	\
-+       {								\
-+	  EINA_MAGIC_FAIL(d, EINA_MAGIC_MATRIXSPARSE_ITERATOR);		\
-+	  return;							\
-+       }								\
-+  } while(0)
-+
-+#define EINA_MAGIC_CHECK_MATRIXSPARSE_ITERATOR_RET(d, ret)		\
-   do {									\
-      if (!EINA_MAGIC_CHECK(d, EINA_MAGIC_MATRIXSPARSE_ITERATOR))	\
-        {								\
- 	  EINA_MAGIC_FAIL(d, EINA_MAGIC_MATRIXSPARSE_ITERATOR);		\
--	  return __VA_ARGS__;						\
-+	  return ret;							\
-        }								\
-   } while(0)
- 
-@@ -663,7 +681,7 @@
- static Eina_Bool
- _eina_matrixsparse_iterator_next(Eina_Matrixsparse_Iterator *it, void **data)
- {
--   EINA_MAGIC_CHECK_MATRIXSPARSE_ITERATOR(it, EINA_FALSE);
-+   EINA_MAGIC_CHECK_MATRIXSPARSE_ITERATOR_RET(it, EINA_FALSE);
- 
-    /* do not touch it->idx */
- 
-@@ -683,7 +701,7 @@
- static Eina_Matrixsparse *
- _eina_matrixsparse_iterator_get_container(Eina_Matrixsparse_Iterator *it)
- {
--   EINA_MAGIC_CHECK_MATRIXSPARSE_ITERATOR(it, NULL);
-+   EINA_MAGIC_CHECK_MATRIXSPARSE_ITERATOR_RET(it, NULL);
-    return (Eina_Matrixsparse *)it->m;
- }
- 
-@@ -699,7 +717,7 @@
- static Eina_Bool
- _eina_matrixsparse_iterator_complete_next(Eina_Matrixsparse_Iterator_Complete *it, void **data)
- {
--   EINA_MAGIC_CHECK_MATRIXSPARSE_ITERATOR(it, EINA_FALSE);
-+   EINA_MAGIC_CHECK_MATRIXSPARSE_ITERATOR_RET(it, EINA_FALSE);
- 
-    if (it->idx.row >= it->m->size.rows)
-      return 0;
-@@ -740,7 +758,7 @@
- static Eina_Matrixsparse *
- _eina_matrixsparse_iterator_complete_get_container(Eina_Matrixsparse_Iterator_Complete *it)
- {
--   EINA_MAGIC_CHECK_MATRIXSPARSE_ITERATOR(it, NULL);
-+   EINA_MAGIC_CHECK_MATRIXSPARSE_ITERATOR_RET(it, NULL);
-    return (Eina_Matrixsparse *)it->m;
- }
- 
-@@ -993,7 +1011,7 @@
-    void (*free_func)(void *, void *);
-    void *user_data;
- 
--   EINA_MAGIC_CHECK_MATRIXSPARSE(m, 0);
-+   EINA_MAGIC_CHECK_MATRIXSPARSE_RET(m, 0);
-    EINA_SAFETY_ON_FALSE_RETURN_VAL(rows > 0, 0);
-    EINA_SAFETY_ON_FALSE_RETURN_VAL(cols > 0, 0);
- 
-@@ -1100,7 +1118,7 @@
- EAPI Eina_Bool
- eina_matrixsparse_cell_idx_get(const Eina_Matrixsparse *m, unsigned long row, unsigned long col, Eina_Matrixsparse_Cell **cell)
- {
--   EINA_MAGIC_CHECK_MATRIXSPARSE(m, 0);
-+   EINA_MAGIC_CHECK_MATRIXSPARSE_RET(m, 0);
-    EINA_SAFETY_ON_NULL_RETURN_VAL(cell, 0);
-    *cell = NULL;
-    EINA_SAFETY_ON_FALSE_RETURN_VAL(row < m->size.rows, 0);
-@@ -1142,7 +1160,7 @@
- eina_matrixsparse_data_idx_get(const Eina_Matrixsparse *m, unsigned long row, unsigned long col)
- {
-    Eina_Matrixsparse_Cell *c;
--   EINA_MAGIC_CHECK_MATRIXSPARSE(m, NULL);
-+   EINA_MAGIC_CHECK_MATRIXSPARSE_RET(m, NULL);
-    c = _eina_matrixsparse_cell_idx_get(m, row, col);
-    if (c) return c->data;
-    else   return NULL;
-@@ -1213,7 +1231,7 @@
- 
-    EINA_MAGIC_CHECK_MATRIXSPARSE_CELL(cell, 0);
-    EINA_MAGIC_CHECK_MATRIXSPARSE_ROW(cell->parent, 0);
--   EINA_MAGIC_CHECK_MATRIXSPARSE(cell->parent->parent, 0);
-+   EINA_MAGIC_CHECK_MATRIXSPARSE_RET(cell->parent->parent, 0);
- 
-    m = cell->parent->parent;
- 
-@@ -1245,7 +1263,7 @@
-    Eina_Matrixsparse_Cell *cell;
- 
-    if (p_old) *p_old = NULL;
--   EINA_MAGIC_CHECK_MATRIXSPARSE(m, 0);
-+   EINA_MAGIC_CHECK_MATRIXSPARSE_RET(m, 0);
-    EINA_SAFETY_ON_FALSE_RETURN_VAL(row < m->size.rows, 0);
-    EINA_SAFETY_ON_FALSE_RETURN_VAL(col < m->size.cols, 0);
- 
-@@ -1281,7 +1299,7 @@
- {
-    Eina_Matrixsparse_Cell *cell;
- 
--   EINA_MAGIC_CHECK_MATRIXSPARSE(m, 0);
-+   EINA_MAGIC_CHECK_MATRIXSPARSE_RET(m, 0);
-    EINA_SAFETY_ON_FALSE_RETURN_VAL(row < m->size.rows, 0);
-    EINA_SAFETY_ON_FALSE_RETURN_VAL(col < m->size.cols, 0);
- 
-@@ -1319,7 +1337,7 @@
- {
-    Eina_Matrixsparse_Row *r;
- 
--   EINA_MAGIC_CHECK_MATRIXSPARSE(m, 0);
-+   EINA_MAGIC_CHECK_MATRIXSPARSE_RET(m, 0);
-    EINA_SAFETY_ON_FALSE_RETURN_VAL(row < m->size.rows, 0);
- 
-    r = _eina_matrixsparse_row_idx_get(m, row);
-@@ -1355,7 +1373,7 @@
-    void (*free_func)(void *, void *);
-    void *user_data;
- 
--   EINA_MAGIC_CHECK_MATRIXSPARSE(m, 0);
-+   EINA_MAGIC_CHECK_MATRIXSPARSE_RET(m, 0);
-    EINA_SAFETY_ON_FALSE_RETURN_VAL(col < m->size.cols, 0);
- 
-    free_func = m->free.func;
-@@ -1410,7 +1428,7 @@
- {
-    Eina_Matrixsparse_Cell *c;
- 
--   EINA_MAGIC_CHECK_MATRIXSPARSE(m, 0);
-+   EINA_MAGIC_CHECK_MATRIXSPARSE_RET(m, 0);
-    EINA_SAFETY_ON_FALSE_RETURN_VAL(row < m->size.rows, 0);
-    EINA_SAFETY_ON_FALSE_RETURN_VAL(col < m->size.cols, 0);
- 
-@@ -1442,7 +1460,7 @@
- 
-    EINA_MAGIC_CHECK_MATRIXSPARSE_CELL(cell, 0);
-    EINA_MAGIC_CHECK_MATRIXSPARSE_ROW(cell->parent, 0);
--   EINA_MAGIC_CHECK_MATRIXSPARSE(cell->parent->parent, 0);
-+   EINA_MAGIC_CHECK_MATRIXSPARSE_RET(cell->parent->parent, 0);
- 
-    m = cell->parent->parent;
- 
---- ../../src/lib/eina_strbuf.c	2010-04-15 06:17:34 +0000
-+++ ../../src/lib/eina_strbuf_new.c	2010-04-15 06:47:16 +0000
-@@ -33,12 +33,21 @@
- 
- static const char EINA_MAGIC_STRBUF_STR[] = "Eina Strbuf";
- 
--#define EINA_MAGIC_CHECK_STRBUF(d, ...)				\
-+#define EINA_MAGIC_CHECK_STRBUF(d)				\
-    do {								\
- 	if (!EINA_MAGIC_CHECK((d), EINA_MAGIC_STRBUF))		\
- 	  {							\
- 	     EINA_MAGIC_FAIL((d), EINA_MAGIC_STRBUF);		\
--	     return __VA_ARGS__;				\
-+	     return;						\
-+	  }							\
-+   } while (0)
-+
-+#define EINA_MAGIC_CHECK_STRBUF_RET(d, ret)			\
-+   do {								\
-+	if (!EINA_MAGIC_CHECK((d), EINA_MAGIC_STRBUF))		\
-+	  {							\
-+	     EINA_MAGIC_FAIL((d), EINA_MAGIC_STRBUF);		\
-+	     return ret;					\
- 	  }							\
-    } while (0)
- 
-@@ -344,7 +353,7 @@
-    size_t len;
- 
-    EINA_SAFETY_ON_NULL_RETURN_VAL(str, EINA_FALSE);
--   EINA_MAGIC_CHECK_STRBUF(buf, EINA_FALSE);
-+   EINA_MAGIC_CHECK_STRBUF_RET(buf, EINA_FALSE);
- 
-    len = strlen(str);
-    if (EINA_UNLIKELY(!_eina_strbuf_grow(buf, buf->len + len)))
-@@ -372,7 +381,7 @@
-    char *esc;
- 
-    EINA_SAFETY_ON_NULL_RETURN_VAL(str, EINA_FALSE);
--   EINA_MAGIC_CHECK_STRBUF(buf, EINA_FALSE);
-+   EINA_MAGIC_CHECK_STRBUF_RET(buf, EINA_FALSE);
- 
-    esc = eina_str_escape(str);
-    if (EINA_UNLIKELY(!esc))
-@@ -416,7 +425,7 @@
-    size_t len;
- 
-    EINA_SAFETY_ON_NULL_RETURN_VAL(str, EINA_FALSE);
--   EINA_MAGIC_CHECK_STRBUF(buf, EINA_FALSE);
-+   EINA_MAGIC_CHECK_STRBUF_RET(buf, EINA_FALSE);
- 
-    len = strlen(str);
-    if (len > maxlen) len = maxlen;
-@@ -452,7 +461,7 @@
- eina_strbuf_append_length(Eina_Strbuf *buf, const char *str, size_t length)
- {
-    EINA_SAFETY_ON_NULL_RETURN_VAL(str, EINA_FALSE);
--   EINA_MAGIC_CHECK_STRBUF(buf, EINA_FALSE);
-+   EINA_MAGIC_CHECK_STRBUF_RET(buf, EINA_FALSE);
- 
-    if (EINA_UNLIKELY(!_eina_strbuf_grow(buf, buf->len + length)))
-      return EINA_FALSE;
-@@ -481,7 +490,7 @@
-    Eina_Bool ret;
- 
-    EINA_SAFETY_ON_NULL_RETURN_VAL(fmt, EINA_FALSE);
--   EINA_MAGIC_CHECK_STRBUF(buf, EINA_FALSE);
-+   EINA_MAGIC_CHECK_STRBUF_RET(buf, EINA_FALSE);
- 
-    va_start(args, fmt);
-    len = vasprintf(&str, fmt, args);
-@@ -512,7 +521,7 @@
-    Eina_Bool ret;
- 
-    EINA_SAFETY_ON_NULL_RETURN_VAL(fmt, EINA_FALSE);
--   EINA_MAGIC_CHECK_STRBUF(buf, EINA_FALSE);
-+   EINA_MAGIC_CHECK_STRBUF_RET(buf, EINA_FALSE);
- 
-    len = vasprintf(&str, fmt, args);
- 
-@@ -544,7 +553,7 @@
-    size_t len;
- 
-    EINA_SAFETY_ON_NULL_RETURN_VAL(str, EINA_FALSE);
--   EINA_MAGIC_CHECK_STRBUF(buf, EINA_FALSE);
-+   EINA_MAGIC_CHECK_STRBUF_RET(buf, EINA_FALSE);
- 
-    if (pos >= buf->len)
-      return eina_strbuf_append(buf, str);
-@@ -574,7 +583,7 @@
-    char *esc;
- 
-    EINA_SAFETY_ON_NULL_RETURN_VAL(str, EINA_FALSE);
--   EINA_MAGIC_CHECK_STRBUF(buf, EINA_FALSE);
-+   EINA_MAGIC_CHECK_STRBUF_RET(buf, EINA_FALSE);
- 
-    esc = eina_str_escape(str);
-    if (EINA_UNLIKELY(!esc))
-@@ -609,7 +618,7 @@
-    size_t len;
- 
-    EINA_SAFETY_ON_NULL_RETURN_VAL(str, EINA_FALSE);
--   EINA_MAGIC_CHECK_STRBUF(buf, EINA_FALSE);
-+   EINA_MAGIC_CHECK_STRBUF_RET(buf, EINA_FALSE);
- 
-    if (pos >= buf->len)
-      return eina_strbuf_append_n(buf, str, maxlen);
-@@ -643,7 +652,7 @@
- eina_strbuf_insert_length(Eina_Strbuf *buf, const char *str, size_t length, size_t pos)
- {
-    EINA_SAFETY_ON_NULL_RETURN_VAL(str, EINA_FALSE);
--   EINA_MAGIC_CHECK_STRBUF(buf, EINA_FALSE);
-+   EINA_MAGIC_CHECK_STRBUF_RET(buf, EINA_FALSE);
- 
-    if (pos >= buf->len)
-      return eina_strbuf_append_length(buf, str, length);
-@@ -665,7 +674,7 @@
- EAPI Eina_Bool
- eina_strbuf_append_char(Eina_Strbuf *buf, char c)
- {
--   EINA_MAGIC_CHECK_STRBUF(buf, EINA_FALSE);
-+   EINA_MAGIC_CHECK_STRBUF_RET(buf, EINA_FALSE);
- 
-    if (EINA_UNLIKELY(!_eina_strbuf_grow(buf, buf->len + 1)))
-      return EINA_FALSE;
-@@ -690,7 +699,7 @@
- EAPI Eina_Bool
- eina_strbuf_insert_char(Eina_Strbuf *buf, char c, size_t pos)
- {
--   EINA_MAGIC_CHECK_STRBUF(buf, EINA_FALSE);
-+   EINA_MAGIC_CHECK_STRBUF_RET(buf, EINA_FALSE);
- 
-    if (pos >= buf->len)
-      return eina_strbuf_append_char(buf, c);
-@@ -715,7 +724,7 @@
-    Eina_Bool ret;
- 
-    EINA_SAFETY_ON_NULL_RETURN_VAL(fmt, EINA_FALSE);
--   EINA_MAGIC_CHECK_STRBUF(buf, EINA_FALSE);
-+   EINA_MAGIC_CHECK_STRBUF_RET(buf, EINA_FALSE);
- 
-    va_start(args, pos);
-    len = vasprintf(&str, fmt, args);
-@@ -745,7 +754,7 @@
-    Eina_Bool ret;
- 
-    EINA_SAFETY_ON_NULL_RETURN_VAL(fmt, EINA_FALSE);
--   EINA_MAGIC_CHECK_STRBUF(buf, EINA_FALSE);
-+   EINA_MAGIC_CHECK_STRBUF_RET(buf, EINA_FALSE);
- 
-    len = vasprintf(&str, fmt, args);
- 
-@@ -776,7 +785,7 @@
- {
-    size_t remove_len, tail_len;
- 
--   EINA_MAGIC_CHECK_STRBUF(buf, EINA_FALSE);
-+   EINA_MAGIC_CHECK_STRBUF_RET(buf, EINA_FALSE);
- 
-    if (end >= buf->len)
-      end = buf->len;
-@@ -813,7 +822,7 @@
- EAPI const char *
- eina_strbuf_string_get(const Eina_Strbuf *buf)
- {
--   EINA_MAGIC_CHECK_STRBUF(buf, NULL);
-+   EINA_MAGIC_CHECK_STRBUF_RET(buf, NULL);
- 
-    return buf->buf;
- }
-@@ -836,7 +845,7 @@
- {
-    char *ret;
- 
--   EINA_MAGIC_CHECK_STRBUF(buf, NULL);
-+   EINA_MAGIC_CHECK_STRBUF_RET(buf, NULL);
- 
-    ret = buf->buf;
-    // TODO: Check return value and do something clever
-@@ -855,7 +864,7 @@
- EAPI size_t
- eina_strbuf_length_get(const Eina_Strbuf *buf)
- {
--   EINA_MAGIC_CHECK_STRBUF(buf, 0);
-+   EINA_MAGIC_CHECK_STRBUF_RET(buf, 0);
- 
-    return buf->len;
- }
-@@ -881,7 +890,7 @@
- 
-    EINA_SAFETY_ON_NULL_RETURN_VAL(str, EINA_FALSE);
-    EINA_SAFETY_ON_NULL_RETURN_VAL(with, EINA_FALSE);
--   EINA_MAGIC_CHECK_STRBUF(buf, 0);
-+   EINA_MAGIC_CHECK_STRBUF_RET(buf, 0);
- 
-    if (n == 0)
-      return EINA_FALSE;
-@@ -939,7 +948,7 @@
- 
-    EINA_SAFETY_ON_NULL_RETURN_VAL(str, 0);
-    EINA_SAFETY_ON_NULL_RETURN_VAL(with, 0);
--   EINA_MAGIC_CHECK_STRBUF(buf, 0);
-+   EINA_MAGIC_CHECK_STRBUF_RET(buf, 0);
- 
-    spos = strstr(buf->buf, str);
-    if (!spos || *spos == '\0')
---- ../../src/lib/eina_stringshare.c	2010-04-15 06:53:51 +0000
-+++ ../../src/lib/eina_stringshare_new.c	2010-04-15 06:35:44 +0000
-@@ -104,13 +104,23 @@
- static const char EINA_MAGIC_STRINGSHARE_NODE_STR[] = "Eina Stringshare Node";
- 
- 
--#define EINA_MAGIC_CHECK_STRINGSHARE_HEAD(d, unlock, ...)	\
-+#define EINA_MAGIC_CHECK_STRINGSHARE_HEAD(d, unlock)	\
-   do {								\
-     if (!EINA_MAGIC_CHECK((d), EINA_MAGIC_STRINGSHARE_HEAD))	\
-     {								\
-         EINA_MAGIC_FAIL((d), EINA_MAGIC_STRINGSHARE_HEAD);	\
-         unlock;							\
--        return __VA_ARGS__;					\
-+        return;							\
-+    }								\
-+  } while (0)
-+
-+#define EINA_MAGIC_CHECK_STRINGSHARE_HEAD_RET(d, unlock, ret)	\
-+  do {								\
-+    if (!EINA_MAGIC_CHECK((d), EINA_MAGIC_STRINGSHARE_HEAD))	\
-+    {								\
-+        EINA_MAGIC_FAIL((d), EINA_MAGIC_STRINGSHARE_HEAD);	\
-+        unlock;							\
-+        return ret;						\
-     }								\
-   } while (0)
- 
-@@ -371,7 +381,7 @@
- static int
- _eina_stringshare_cmp(const Eina_Stringshare_Head *ed, const int *hash, __UNUSED__ int length, __UNUSED__ void *data)
- {
--   EINA_MAGIC_CHECK_STRINGSHARE_HEAD(ed, , 0);
-+   EINA_MAGIC_CHECK_STRINGSHARE_HEAD_RET(ed, , 0);
- 
-    return ed->hash - *hash;
- }
-@@ -379,8 +389,8 @@
- static Eina_Rbtree_Direction
- _eina_stringshare_node(const Eina_Stringshare_Head *left, const Eina_Stringshare_Head *right, __UNUSED__ void *data)
- {
--   EINA_MAGIC_CHECK_STRINGSHARE_HEAD(left, , 0);
--   EINA_MAGIC_CHECK_STRINGSHARE_HEAD(right, , 0);
-+   EINA_MAGIC_CHECK_STRINGSHARE_HEAD_RET(left, , 0);
-+   EINA_MAGIC_CHECK_STRINGSHARE_HEAD_RET(right, , 0);
- 
-    if (left->hash - right->hash < 0)
-      return EINA_RBTREE_LEFT;
-@@ -1138,7 +1148,7 @@
- 	return s;
-      }
- 
--   EINA_MAGIC_CHECK_STRINGSHARE_HEAD(ed, STRINGSHARE_UNLOCK_BIG(), NULL);
-+   EINA_MAGIC_CHECK_STRINGSHARE_HEAD_RET(ed, STRINGSHARE_UNLOCK_BIG(), NULL);
- 
-    el = _eina_stringshare_head_find(ed, str, slen);
-    if (el)
---- ../../src/lib/eina_tiler.c	2010-04-15 06:11:15 +0000
-+++ ../../src/lib/eina_tiler_new.c	2010-04-14 16:50:29 +0000
-@@ -110,22 +110,40 @@
- 	splitter_t splitter;
- };
- 
--#define EINA_MAGIC_CHECK_TILER(d, ...)					\
-+#define EINA_MAGIC_CHECK_TILER(d)					\
- 	do {								\
- 		if (!EINA_MAGIC_CHECK(d, EINA_MAGIC_TILER))		\
- 		{							\
- 			EINA_MAGIC_FAIL(d, EINA_MAGIC_TILER);		\
--			return __VA_ARGS__;				\
-+			return;						\
- 		}							\
- 	} while(0)
- 
-+#define EINA_MAGIC_CHECK_TILER_RETURN(d,ret)				\
-+	do {								\
-+		if (!EINA_MAGIC_CHECK(d, EINA_MAGIC_TILER))		\
-+		{							\
-+			EINA_MAGIC_FAIL(d, EINA_MAGIC_TILER);		\
-+			return ret;					\
-+		}							\
-+	} while(0)
-+
-+
-+#define EINA_MAGIC_CHECK_TILER_ITERATOR(d)				\
-+	do {								\
-+		if (!EINA_MAGIC_CHECK(d, EINA_MAGIC_TILER_ITERATOR))	\
-+		{							\
-+			EINA_MAGIC_FAIL(d, EINA_MAGIC_TILER_ITERATOR);	\
-+			return;						\
-+		}							\
-+	} while(0)
- 
--#define EINA_MAGIC_CHECK_TILER_ITERATOR(d, ...)				\
-+#define EINA_MAGIC_CHECK_TILER_ITERATOR_RETURN(d,ret)			\
- 	do {								\
- 		if (!EINA_MAGIC_CHECK(d, EINA_MAGIC_TILER_ITERATOR))	\
- 		{							\
- 			EINA_MAGIC_FAIL(d, EINA_MAGIC_TILER_ITERATOR);	\
--			return __VA_ARGS__;				\
-+			return ret;					\
- 		}							\
- 	} while(0)
- 
-@@ -1081,7 +1099,7 @@
- 
- static void * _iterator_get_container(Eina_Iterator_Tiler *it)
- {
--	EINA_MAGIC_CHECK_TILER_ITERATOR(it, NULL);
-+	EINA_MAGIC_CHECK_TILER_ITERATOR_RETURN(it, NULL);
- 	return (void *)it->tiler;
- }
- 
-@@ -1134,7 +1152,7 @@
- {
- 	Eina_Rectangle tmp;
- 
--	EINA_MAGIC_CHECK_TILER(t, EINA_FALSE);
-+	EINA_MAGIC_CHECK_TILER_RETURN(t, EINA_FALSE);
- 	if ((r->w <= 0) || (r->h <= 0))
- 		return EINA_FALSE;
- 	tmp = *r;
-@@ -1171,7 +1189,7 @@
- {
- 	Eina_Iterator_Tiler *it;
- 
--	EINA_MAGIC_CHECK_TILER(t, NULL);
-+	EINA_MAGIC_CHECK_TILER_RETURN(t, NULL);
- 	it = calloc(1, sizeof (Eina_Iterator_Tiler));
- 	if (!it) return NULL;
- 
diff --git a/legacy/eina/win32/start.bat b/legacy/eina/win32/start.bat
deleted file mode 100644
index a7171243d4..0000000000
--- a/legacy/eina/win32/start.bat
+++ /dev/null
@@ -1,74 +0,0 @@
-@echo off
-
-rem Set external libraries directory.
-set EXT_DIR=%cd%\..\..\..\extern
-
-if not exist %EXT_DIR% (
-	set EXT_DIR=
-	echo ERROR: External libs dir is not set.
-	pause
-	goto END
-)
-
-rem Check for basic requirements for Visual Studio 2008
-if "%VS90COMNTOOLS%" == "" (
-	echo ERROR: Microsoft Visual Studio 2008 is not installed.
-	echo ERROR: Try to launch Microsoft Visual Studio 2005.
-	pause
-	goto NOVS9
-)
-
-set PROJECT_TYPE=vs9
-set VSCOMMONTOOLS=%VS90COMNTOOLS%vsvars32.bat
-
-goto STARTVS
-
-:NOVS9
-
-rem Check for basic requirements for Visual Studio 2005
-if "%VS80COMNTOOLS%" == "" (
-	echo ERROR: Microsoft Visual Studio 2005 is not installed.
-	pause
-	goto END
-)
-
-set PROJECT_TYPE=vs8
-set VSCOMMONTOOLS=%VS80COMNTOOLS%vsvars32.bat
-
-rem Patching Eina
-patch.exe --binary -p1 < %cd%\patch\eina.diff
-echo INFO: Eina patched.
-
-pause
-
-:STARTVS
-
-rem Setup common Win32 environment variables
-
-rem Add Evil lib path
-set EvilInclude=%cd%\..\..\evil\src\lib
-set EvilCommon=%cd%\..\..\evil\win32\common
-set EvilOut=%cd%\..\..\evil\win32\%PROJECT_TYPE%\out
-
-set INCLUDE=%EvilCommon%;%EvilInclude%;%EvilInclude%\dlfcn;%INCLUDE%
-set LIB=%EvilOut%;%LIB%
-
-rem Add installation directory pathes.
-set INCLUDE=%EXT_DIR%\include;%INCLUDE%
-set LIB=%EXT_DIR%\lib;%LIB%
-
-set INCLUDE=%cd%\common;%cd%\..\src\include;%cd%\..\src\lib;%INCLUDE%
-
-set SolutionDirectory=%cd%\%PROJECT_TYPE%
-set DebugOutputDirectory=%SolutionDirectory%\out
-set ReleaseOutputDirectory=%SolutionDirectory%\out
-set DebugLibraryDirectory=%SolutionDirectory%\out
-set ReleaseLibraryDirectory=%SolutionDirectory%\out
-set TemporaryDirectory=%SolutionDirectory%\temp
-
-rem Setting environment for using Microsoft Visual Studio x86 tools.
-call "%VSCOMMONTOOLS%"
-
-%PROJECT_TYPE%\eina.sln
-
-:END
diff --git a/legacy/eina/win32/vs8/eina.sln b/legacy/eina/win32/vs8/eina.sln
deleted file mode 100644
index 1051362f2b..0000000000
--- a/legacy/eina/win32/vs8/eina.sln
+++ /dev/null
@@ -1,20 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "eina", "libeina.vcproj", "{689B4F2B-666D-439F-9BF3-1203D813DE3F}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Release|Win32 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{689B4F2B-666D-439F-9BF3-1203D813DE3F}.Debug|Win32.ActiveCfg = Debug|Win32
-		{689B4F2B-666D-439F-9BF3-1203D813DE3F}.Debug|Win32.Build.0 = Debug|Win32
-		{689B4F2B-666D-439F-9BF3-1203D813DE3F}.Release|Win32.ActiveCfg = Release|Win32
-		{689B4F2B-666D-439F-9BF3-1203D813DE3F}.Release|Win32.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/legacy/eina/win32/vs8/libeina.vcproj b/legacy/eina/win32/vs8/libeina.vcproj
deleted file mode 100644
index 560ba47759..0000000000
--- a/legacy/eina/win32/vs8/libeina.vcproj
+++ /dev/null
@@ -1,519 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8,00"
-	Name="libeina"
-	ProjectGUID="{689B4F2B-666D-439F-9BF3-1203D813DE3F}"
-	RootNamespace="eina"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(DebugOutputDirectory)"
-			IntermediateDirectory="$(TemporaryDirectory)\$(TargetName)\$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="$(INCLUDE)"
-				PreprocessorDefinitions="HAVE_ERRNO_H;_WIN32_WINNT=0x0501;SECURITY_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;HAVE_EVIL;HAVE_ICONV;DLL_EXPORT;snprintf=_snprintf_c;__CRT_INLINE=__inline;inline=__inline;strcasecmp=_stricmp;__UNUSED__=;EFL_EINA_BUILD;PACKAGE_LIB_DIR=;_CRT_SECURE_NO_WARNINGS;EINA_STATIC_BUILD_BUDDY;EINA_STATIC_BUILD_CHAINED_POOL;EINA_STATIC_BUILD_PASS_THROUGH;EINA_STATIC_BUILD_FIXED_BITMAP;_POSIX_;_CRT_SECURE_NO_DEPRECATE"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-				CompileAs="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				IgnoreImportLibrary="false"
-				LinkLibraryDependencies="true"
-				AdditionalDependencies="libevil.lib libdl.lib iconv.lib"
-				OutputFile="$(OutDir)\libeina.dll"
-				LinkIncremental="2"
-				AdditionalLibraryDirectories="$(LIB); $(DebugLibraryDirectory)"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(ReleaseOutputDirectory)"
-			IntermediateDirectory="$(TemporaryDirectory)\$(TargetName)\$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="$(INCLUDE)"
-				PreprocessorDefinitions="HAVE_ERRNO_H;_WIN32_WINNT=0x0501;SECURITY_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;HAVE_EVIL;HAVE_ICONV;DLL_EXPORT;snprintf=_snprintf_c;__CRT_INLINE=__inline;inline=__inline;strcasecmp=_stricmp;__UNUSED__=;EFL_EINA_BUILD;PACKAGE_LIB_DIR=;_CRT_SECURE_NO_WARNINGS;EINA_STATIC_BUILD_BUDDY;EINA_STATIC_BUILD_CHAINED_POOL;EINA_STATIC_BUILD_PASS_THROUGH;EINA_STATIC_BUILD_FIXED_BITMAP;_POSIX_;_CRT_SECURE_NO_DEPRECATE"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				IgnoreImportLibrary="false"
-				LinkLibraryDependencies="true"
-				AdditionalDependencies="libevil.lib libdl.lib iconv.lib"
-				OutputFile="$(OutDir)\libeina.dll"
-				LinkIncremental="1"
-				AdditionalLibraryDirectories="$(LIB); $(ReleaseLibraryDirectory)"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\src\lib\eina_accessor.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\lib\eina_array.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\lib\eina_benchmark.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\lib\eina_binshare.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\lib\eina_convert.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\lib\eina_counter.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\lib\eina_cpu.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\lib\eina_error.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\lib\eina_file_win32.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\lib\eina_fp.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\lib\eina_hamster.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\lib\eina_hash.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\lib\eina_inlist.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\lib\eina_iterator.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\lib\eina_lalloc.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\lib\eina_list.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\lib\eina_log.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\lib\eina_magic.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\lib\eina_main.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\lib\eina_matrixsparse.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\lib\eina_mempool.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\lib\eina_module.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\lib\eina_quadtree.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\lib\eina_rbtree.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\lib\eina_rectangle.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\lib\eina_safety_checks.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\lib\eina_share_common.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\lib\eina_strbuf.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\lib\eina_strbuf_common.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\lib\eina_str.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\lib\eina_stringshare.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\lib\eina_tiler.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\lib\eina_unicode.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\lib\eina_ustrbuf.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\lib\eina_ustringshare.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\lib\eina_value.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\modules\mp\buddy\eina_buddy.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\modules\mp\chained_pool\eina_chained_mempool.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\modules\mp\fixed_bitmap\eina_fixed_bitmap.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\modules\mp\pass_through\eina_pass_through.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath="..\..\src\include\Eina.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\include\eina_accessor.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\include\eina_array.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\include\eina_benchmark.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\include\eina_binshare.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\include\eina_convert.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\include\eina_counter.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\include\eina_cpu.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\include\eina_error.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\include\eina_file.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\include\eina_fp.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\include\eina_hamster.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\include\eina_hash.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\include\eina_inlist.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\include\eina_iterator.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\include\eina_lalloc.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\include\eina_list.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\include\eina_log.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\include\eina_magic.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\include\eina_main.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\include\eina_matrixsparse.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\include\eina_mempool.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\include\eina_module.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\lib\eina_private.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\include\eina_quadtree.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\include\eina_rbtree.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\include\eina_rectangle.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\include\eina_safety_checks.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\include\eina_strbuf.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\include\eina_strbuf_common.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\include\eina_str.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\include\eina_stringshare.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\include\eina_tiler.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\include\eina_trash.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\include\eina_types.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\include\eina_unicode.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\include\eina_ustrbuf.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\include\eina_ustringshare.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/legacy/eina/win32/vs9/eina.sln b/legacy/eina/win32/vs9/eina.sln
deleted file mode 100644
index 4ab4a5397d..0000000000
--- a/legacy/eina/win32/vs9/eina.sln
+++ /dev/null
@@ -1,20 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual C++ Express 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libeina", "libeina.vcproj", "{689B4F2B-666D-439F-9BF3-1203D813DE3F}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Release|Win32 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{689B4F2B-666D-439F-9BF3-1203D813DE3F}.Debug|Win32.ActiveCfg = Debug|Win32
-		{689B4F2B-666D-439F-9BF3-1203D813DE3F}.Debug|Win32.Build.0 = Debug|Win32
-		{689B4F2B-666D-439F-9BF3-1203D813DE3F}.Release|Win32.ActiveCfg = Release|Win32
-		{689B4F2B-666D-439F-9BF3-1203D813DE3F}.Release|Win32.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/legacy/eina/win32/vs9/libeina.vcproj b/legacy/eina/win32/vs9/libeina.vcproj
deleted file mode 100644
index 24f3d8b181..0000000000
--- a/legacy/eina/win32/vs9/libeina.vcproj
+++ /dev/null
@@ -1,529 +0,0 @@
-<?xml version="1.0" encoding="windows-1251"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="libeina"
-	ProjectGUID="{689B4F2B-666D-439F-9BF3-1203D813DE3F}"
-	RootNamespace="eina"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(DebugOutputDirectory)"
-			IntermediateDirectory="$(TemporaryDirectory)\$(TargetName)\$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="$(INCLUDE)"
-				PreprocessorDefinitions="HAVE_ERRNO_H;_WIN32_WINNT=0x0501;SECURITY_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;HAVE_EVIL;HAVE_ICONV;DLL_EXPORT;snprintf=_snprintf_c;__CRT_INLINE=__inline;inline=__inline;strcasecmp=_stricmp;__UNUSED__=;EFL_EINA_BUILD;PACKAGE_LIB_DIR=;_CRT_SECURE_NO_WARNINGS;EINA_STATIC_BUILD_BUDDY;EINA_STATIC_BUILD_CHAINED_POOL;EINA_STATIC_BUILD_PASS_THROUGH;EINA_STATIC_BUILD_FIXED_BITMAP;_POSIX_;_CRT_SECURE_NO_DEPRECATE"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-				CompileAs="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				IgnoreImportLibrary="false"
-				LinkLibraryDependencies="true"
-				AdditionalDependencies="libevil.lib libdl.lib iconv.lib"
-				OutputFile="$(OutDir)\libeina.dll"
-				LinkIncremental="2"
-				AdditionalLibraryDirectories="$(LIB); $(DebugLibraryDirectory)"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(ReleaseOutputDirectory)"
-			IntermediateDirectory="$(TemporaryDirectory)\$(TargetName)\$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="$(INCLUDE)"
-				PreprocessorDefinitions="HAVE_ERRNO_H;_WIN32_WINNT=0x0501;SECURITY_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;HAVE_EVIL;HAVE_ICONV;DLL_EXPORT;snprintf=_snprintf_c;__CRT_INLINE=__inline;inline=__inline;strcasecmp=_stricmp;__UNUSED__=;EFL_EINA_BUILD;PACKAGE_LIB_DIR=;_CRT_SECURE_NO_WARNINGS;EINA_STATIC_BUILD_BUDDY;EINA_STATIC_BUILD_CHAINED_POOL;EINA_STATIC_BUILD_PASS_THROUGH;EINA_STATIC_BUILD_FIXED_BITMAP;_POSIX_;_CRT_SECURE_NO_DEPRECATE"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				IgnoreImportLibrary="false"
-				LinkLibraryDependencies="true"
-				AdditionalDependencies="libevil.lib libdl.lib iconv.lib"
-				OutputFile="$(OutDir)\libeina.dll"
-				LinkIncremental="1"
-				AdditionalLibraryDirectories="$(LIB); $(ReleaseLibraryDirectory)"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\src\lib\eina_accessor.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\lib\eina_array.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\lib\eina_benchmark.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\lib\eina_binshare.c"
-				>
-			</File>
-			<File
-
-				RelativePath="..\..\src\lib\eina_convert.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\lib\eina_counter.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\lib\eina_cpu.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\lib\eina_error.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\lib\eina_file_win32.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\lib\eina_fp.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\lib\eina_hamster.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\lib\eina_hash.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\lib\eina_inlist.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\lib\eina_iterator.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\lib\eina_lalloc.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\lib\eina_list.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\lib\eina_log.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\lib\eina_magic.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\lib\eina_main.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\lib\eina_matrixsparse.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\lib\eina_mempool.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\lib\eina_module.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\lib\eina_quadtree.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\lib\eina_rbtree.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\lib\eina_rectangle.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\lib\eina_safety_checks.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\lib\eina_sched.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\lib\eina_share_common.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\lib\eina_strbuf.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\lib\eina_strbuf_common.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\lib\eina_str.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\lib\eina_stringshare.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\lib\eina_tiler.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\lib\eina_unicode.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\lib\eina_ustrbuf.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\lib\eina_ustringshare.c"
-				>
-			</File>
-			<File
-
-				RelativePath="..\..\src\lib\eina_value.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\modules\mp\buddy\eina_buddy.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\modules\mp\chained_pool\eina_chained_mempool.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\modules\mp\fixed_bitmap\eina_fixed_bitmap.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\modules\mp\pass_through\eina_pass_through.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath="..\..\src\include\Eina.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\include\eina_accessor.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\include\eina_array.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\include\eina_benchmark.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\include\eina_binshare.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\include\eina_convert.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\include\eina_counter.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\include\eina_cpu.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\include\eina_error.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\include\eina_file.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\include\eina_fp.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\include\eina_hamster.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\include\eina_hash.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\include\eina_inlist.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\include\eina_iterator.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\include\eina_lalloc.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\include\eina_list.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\include\eina_log.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\include\eina_magic.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\include\eina_main.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\include\eina_matrixsparse.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\include\eina_mempool.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\include\eina_module.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\lib\eina_private.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\include\eina_quadtree.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\include\eina_rbtree.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\include\eina_rectangle.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\include\eina_safety_checks.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\include\eina_strbuf.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\include\eina_strbuf_common.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\include\eina_str.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\include\eina_stringshare.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\include\eina_stringshare.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\include\eina_tiler.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\include\eina_trash.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\include\eina_types.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\include\eina_unicode.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\include\eina_ustrbuf.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\include\eina_ustringshare.h"
-				>
-			</File>
-
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>