diff --git a/legacy/eina/win32/set_env.bat b/legacy/eina/win32/set_env.bat
deleted file mode 100644
index bdab5dca84..0000000000
--- a/legacy/eina/win32/set_env.bat
+++ /dev/null
@@ -1,27 +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 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;%EvilInclude%\mman;%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;%INCLUDE%
-
-:END
diff --git a/legacy/eina/win32/start.bat b/legacy/eina/win32/start.bat
new file mode 100644
index 0000000000..1f6ccc0c69
--- /dev/null
+++ b/legacy/eina/win32/start.bat
@@ -0,0 +1,68 @@
+@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 Setup common Win32 environment variables
+
+
+rem Check for basic requirements for Visual Studio 2008
+if "%VS90COMNTOOLS%" == "" (
+	echo ERROR: Microsoft Visual Studio 2008 is not installed.
+	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
+
+:STARTVS
+
+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;%EvilInclude%\mman;%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;%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/start.bat b/legacy/eina/win32/vs8/start.bat
deleted file mode 100644
index 1586a49e8e..0000000000
--- a/legacy/eina/win32/vs8/start.bat
+++ /dev/null
@@ -1,32 +0,0 @@
-@echo off
-rem Warning: environment is set for Win32 platform.
-
-rem Setup common Win32 environment variables
-
-set PROJECT_TYPE=vs8
-
-pushd ..
-call set_env.bat
-popd
-
-set SolutionDirectory=%cd%
-set DebugOutputDirectory=%SolutionDirectory%\out
-set ReleaseOutputDirectory=%SolutionDirectory%\out
-set DebugLibraryDirectory=%SolutionDirectory%\out
-set ReleaseLibraryDirectory=%SolutionDirectory%\out
-set TemporaryDirectory=%SolutionDirectory%\temp
-
-
-rem Check for basic requirements
-if "%VS80COMNTOOLS%" == "" (
-	echo ERROR: Microsoft Visual Studio 2005 is not installed.
-	pause
-	goto END
-)
-
-rem Setting environment for using Microsoft Visual Studio 2005 x86 tools.
-call "%VS80COMNTOOLS%vsvars32.bat"
-
-eina.sln
-
-:END
\ No newline at end of file
diff --git a/legacy/eina/win32/vs9/eina.sln b/legacy/eina/win32/vs9/eina.sln
new file mode 100644
index 0000000000..4ab4a5397d
--- /dev/null
+++ b/legacy/eina/win32/vs9/eina.sln
@@ -0,0 +1,20 @@
+
+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
new file mode 100644
index 0000000000..98d7efef93
--- /dev/null
+++ b/legacy/eina/win32/vs9/libeina.vcproj
@@ -0,0 +1,438 @@
+<?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;SECURITY_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;HAVE_EVIL;DLL_EXPORT;snprintf=_snprintf_c;__CRT_INLINE=__inline;inline=__inline;__UNUSED__=;EFL_EINA_BUILD;PACKAGE_LIB_DIR=;_CRT_SECURE_NO_WARNINGS"
+				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="libdl.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;SECURITY_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;HAVE_EVIL;DLL_EXPORT;snprintf=_snprintf_c;__CRT_INLINE=__inline;inline=__inline;__UNUSED__=;EFL_EINA_BUILD;PACKAGE_LIB_DIR="
+				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="libdl.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_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.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_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_stringshare.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\lib\eina_tiler.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\lib\eina_value.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_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_f8p24.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\include\eina_f16p16.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\include\eina_f32p32.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\include\eina_file.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\include\eina_private.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_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>
+		</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>