64 files changed, 158 insertions, 156 deletions

diff --git a/plugins/FTPFileYM/ftpfile_10.vcxproj b/plugins/FTPFileYM/ftpfile_10.vcxproj
index 9d0f1983ba..dc02fe6b3f 100644
--- a/plugins/FTPFileYM/ftpfile_10.vcxproj
+++ b/plugins/FTPFileYM/ftpfile_10.vcxproj
@@ -73,7 +73,7 @@
     <ClCompile>

       <Optimization>Full</Optimization>

       <IntrinsicFunctions>true</IntrinsicFunctions>

-      <AdditionalIncludeDirectories>curl;..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>src\curl;..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <FunctionLevelLinking>true</FunctionLevelLinking>

       <PrecompiledHeader>Use</PrecompiledHeader>

@@ -101,7 +101,7 @@
     <ClCompile>

       <Optimization>Full</Optimization>

       <IntrinsicFunctions>true</IntrinsicFunctions>

-      <AdditionalIncludeDirectories>curl;..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>src\curl;..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <FunctionLevelLinking>true</FunctionLevelLinking>

       <PrecompiledHeader>Use</PrecompiledHeader>

@@ -128,7 +128,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

     <ClCompile>

       <Optimization>Disabled</Optimization>

-      <AdditionalIncludeDirectories>curl;..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>src\curl;..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <MinimalRebuild>true</MinimalRebuild>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

@@ -154,7 +154,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

     <ClCompile>

       <Optimization>Disabled</Optimization>

-      <AdditionalIncludeDirectories>curl;..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>src\curl;..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <MinimalRebuild>true</MinimalRebuild>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

@@ -177,65 +177,52 @@
     </ResourceCompile>

   </ItemDefinitionGroup>

   <ItemGroup>

-    <ClCompile Include="dbentry.cpp" />

-    <ClCompile Include="deletetimer.cpp" />

-    <ClCompile Include="dialog.cpp" />

-    <ClCompile Include="ftpfile.cpp">

+    <ClCompile Include="src\dbentry.cpp" />

+    <ClCompile Include="src\deletetimer.cpp" />

+    <ClCompile Include="src\dialog.cpp" />

+    <ClCompile Include="src\ftpfile.cpp">

       <PrecompiledHeader>Create</PrecompiledHeader>

     </ClCompile>

-    <ClCompile Include="job_delete.cpp" />

-    <ClCompile Include="job_generic.cpp" />

-    <ClCompile Include="job_packer.cpp" />

-    <ClCompile Include="job_upload.cpp" />

-    <ClCompile Include="libcurl.cpp" />

-    <ClCompile Include="manager.cpp" />

-    <ClCompile Include="mir_db.cpp" />

-    <ClCompile Include="options.cpp" />

-    <ClCompile Include="serverlist.cpp" />

-    <ClCompile Include="utils.cpp" />

-    <ClCompile Include="zip\ioapi.c">

+    <ClCompile Include="src\job_delete.cpp" />

+    <ClCompile Include="src\job_generic.cpp" />

+    <ClCompile Include="src\job_packer.cpp" />

+    <ClCompile Include="src\job_upload.cpp" />

+    <ClCompile Include="src\libcurl.cpp" />

+    <ClCompile Include="src\manager.cpp" />

+    <ClCompile Include="src\mir_db.cpp" />

+    <ClCompile Include="src\options.cpp" />

+    <ClCompile Include="src\serverlist.cpp" />

+    <ClCompile Include="src\utils.cpp" />

+    <ClCompile Include="src\zip\ioapi.c">

       <PrecompiledHeader>NotUsing</PrecompiledHeader>

     </ClCompile>

-    <ClCompile Include="zip\zip.c">

+    <ClCompile Include="src\zip\zip.c">

       <PrecompiledHeader>NotUsing</PrecompiledHeader>

     </ClCompile>

   </ItemGroup>

   <ItemGroup>

-    <ClInclude Include="common.h" />

-    <ClInclude Include="dbentry.h" />

-    <ClInclude Include="deletetimer.h" />

-    <ClInclude Include="dialog.h" />

-    <ClInclude Include="job_delete.h" />

-    <ClInclude Include="job_generic.h" />

-    <ClInclude Include="job_packer.h" />

-    <ClInclude Include="job_upload.h" />

-    <ClInclude Include="libcurl.h" />

-    <ClInclude Include="manager.h" />

-    <ClInclude Include="mir_db.h" />

-    <ClInclude Include="options.h" />

-    <ClInclude Include="resource.h" />

-    <ClInclude Include="serverlist.h" />

-    <ClInclude Include="utils.h" />

-    <ClInclude Include="version.h" />

-    <ClInclude Include="zip\ioapi.h" />

-    <ClInclude Include="zip\zip.h" />

+    <ClInclude Include="src\common.h" />

+    <ClInclude Include="src\dbentry.h" />

+    <ClInclude Include="src\deletetimer.h" />

+    <ClInclude Include="src\dialog.h" />

+    <ClInclude Include="src\job_delete.h" />

+    <ClInclude Include="src\job_generic.h" />

+    <ClInclude Include="src\job_packer.h" />

+    <ClInclude Include="src\job_upload.h" />

+    <ClInclude Include="src\libcurl.h" />

+    <ClInclude Include="src\manager.h" />

+    <ClInclude Include="src\mir_db.h" />

+    <ClInclude Include="src\options.h" />

+    <ClInclude Include="src\resource.h" />

+    <ClInclude Include="src\serverlist.h" />

+    <ClInclude Include="src\utils.h" />

+    <ClInclude Include="src\version.h" />

+    <ClInclude Include="src\zip\ioapi.h" />

+    <ClInclude Include="src\zip\zip.h" />

   </ItemGroup>

   <ItemGroup>

-    <None Include="icons\clear.ico" />

-    <None Include="icons\clipboard.ico" />

-    <None Include="icons\delete.ico" />

-    <None Include="icons\ftp0.ico" />

-    <None Include="icons\ftp1.ico" />

-    <None Include="icons\ftp2.ico" />

-    <None Include="icons\ftp3.ico" />

-    <None Include="icons\ftp4.ico" />

-    <None Include="icons\menu.ico" />

-    <None Include="icons\pause.ico" />

-    <None Include="icons\resume.ico" />

-  </ItemGroup>

-  <ItemGroup>

-    <ResourceCompile Include="ftpfile.rc" />

-    <ResourceCompile Include="version.rc" />

+    <ResourceCompile Include="res\ftpfile.rc" />

+    <ResourceCompile Include="res\version.rc" />

   </ItemGroup>

   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

   <ImportGroup Label="ExtensionTargets">

diff --git a/plugins/FTPFileYM/ftpfile_10.vcxproj.filters b/plugins/FTPFileYM/ftpfile_10.vcxproj.filters
index a97add9543..1dcfc39ba4 100644
--- a/plugins/FTPFileYM/ftpfile_10.vcxproj.filters
+++ b/plugins/FTPFileYM/ftpfile_10.vcxproj.filters
@@ -21,151 +21,116 @@
     </Filter>

   </ItemGroup>

   <ItemGroup>

-    <ClCompile Include="dbentry.cpp">

+    <ClCompile Include="src\dbentry.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="deletetimer.cpp">

+    <ClCompile Include="src\deletetimer.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="dialog.cpp">

+    <ClCompile Include="src\dialog.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="ftpfile.cpp">

+    <ClCompile Include="src\ftpfile.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="job_delete.cpp">

+    <ClCompile Include="src\job_delete.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="job_generic.cpp">

+    <ClCompile Include="src\job_generic.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="job_packer.cpp">

+    <ClCompile Include="src\job_packer.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="job_upload.cpp">

+    <ClCompile Include="src\job_upload.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="libcurl.cpp">

+    <ClCompile Include="src\libcurl.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="manager.cpp">

+    <ClCompile Include="src\manager.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="mir_db.cpp">

+    <ClCompile Include="src\mir_db.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="options.cpp">

+    <ClCompile Include="src\options.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="serverlist.cpp">

+    <ClCompile Include="src\serverlist.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="utils.cpp">

+    <ClCompile Include="src\utils.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="zip\ioapi.c">

+    <ClCompile Include="src\zip\ioapi.c">

       <Filter>Source Files\zip</Filter>

     </ClCompile>

-    <ClCompile Include="zip\zip.c">

+    <ClCompile Include="src\zip\zip.c">

       <Filter>Source Files\zip</Filter>

     </ClCompile>

   </ItemGroup>

   <ItemGroup>

-    <ClInclude Include="common.h">

+    <ClInclude Include="src\common.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="dbentry.h">

+    <ClInclude Include="src\dbentry.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="deletetimer.h">

+    <ClInclude Include="src\deletetimer.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="dialog.h">

+    <ClInclude Include="src\dialog.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="job_delete.h">

+    <ClInclude Include="src\job_delete.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="job_generic.h">

+    <ClInclude Include="src\job_generic.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="job_packer.h">

+    <ClInclude Include="src\job_packer.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="job_upload.h">

+    <ClInclude Include="src\job_upload.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="libcurl.h">

+    <ClInclude Include="src\libcurl.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="manager.h">

+    <ClInclude Include="src\manager.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="mir_db.h">

+    <ClInclude Include="src\mir_db.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="options.h">

+    <ClInclude Include="src\options.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="resource.h">

+    <ClInclude Include="src\resource.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="serverlist.h">

+    <ClInclude Include="src\serverlist.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="utils.h">

+    <ClInclude Include="src\utils.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="version.h">

+    <ClInclude Include="src\version.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="zip\ioapi.h">

+    <ClInclude Include="src\zip\ioapi.h">

       <Filter>Header Files\zip</Filter>

     </ClInclude>

-    <ClInclude Include="zip\zip.h">

+    <ClInclude Include="src\zip\zip.h">

       <Filter>Header Files\zip</Filter>

     </ClInclude>

   </ItemGroup>

   <ItemGroup>

-    <None Include="icons\clear.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="icons\clipboard.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="icons\delete.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="icons\ftp0.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="icons\ftp1.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="icons\ftp2.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="icons\ftp3.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="icons\ftp4.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="icons\menu.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="icons\pause.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="icons\resume.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-  </ItemGroup>

-  <ItemGroup>

-    <ResourceCompile Include="ftpfile.rc">

+    <ResourceCompile Include="res\ftpfile.rc">

       <Filter>Resource Files</Filter>

     </ResourceCompile>

-    <ResourceCompile Include="version.rc">

+    <ResourceCompile Include="res\version.rc">

       <Filter>Resource Files</Filter>

     </ResourceCompile>

   </ItemGroup>

diff --git a/plugins/FTPFileYM/res/Version.rc b/plugins/FTPFileYM/res/Version.rc
new file mode 100644
index 0000000000..d741488c4f
--- /dev/null
+++ b/plugins/FTPFileYM/res/Version.rc
@@ -0,0 +1,42 @@
+// Microsoft Visual C++ generated resource script.

+//

+#ifdef APSTUDIO_INVOKED

+#error this file is not editable by Microsoft Visual C++

+#endif //APSTUDIO_INVOKED

+

+#include "afxres.h"

+#include "..\src\version.h"

+

+#ifdef _WIN32

+LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL

+#endif //_WIN32

+

+VS_VERSION_INFO VERSIONINFO

+ FILEVERSION __FILEVERSION_STRING

+ PRODUCTVERSION __FILEVERSION_STRING

+ FILEFLAGSMASK 0x17L

+#ifdef _DEBUG

+ FILEFLAGS 0x1L

+#else

+ FILEFLAGS 0x0L

+#endif

+ FILEOS 0x4L

+ FILETYPE 0x0L

+ FILESUBTYPE 0x0L

+BEGIN

+    BLOCK "StringFileInfo"

+    BEGIN

+        BLOCK "000004b0"

+        BEGIN

+            VALUE "FileDescription", __DESCRIPTION

+            VALUE "InternalName", __PLUGIN_NAME

+            VALUE "LegalCopyright", __COPYRIGHT

+            VALUE "OriginalFilename", __FILENAME

+            VALUE "ProductName", __PLUGIN_NAME

+        END

+    END

+    BLOCK "VarFileInfo"

+    BEGIN

+        VALUE "Translation", 0x0, 1200

+    END

+END

diff --git a/plugins/FTPFileYM/icons/clear.ico b/plugins/FTPFileYM/res/clear.ico
index 8fd6c2a936..8fd6c2a936 100644
--- a/plugins/FTPFileYM/icons/clear.ico
+++ b/plugins/FTPFileYM/res/clear.ico
diff --git a/plugins/FTPFileYM/icons/clipboard.ico b/plugins/FTPFileYM/res/clipboard.ico
index d0e80b0e7e..d0e80b0e7e 100644
--- a/plugins/FTPFileYM/icons/clipboard.ico
+++ b/plugins/FTPFileYM/res/clipboard.ico
diff --git a/plugins/FTPFileYM/icons/delete.ico b/plugins/FTPFileYM/res/delete.ico
index 26058006a0..26058006a0 100644
--- a/plugins/FTPFileYM/icons/delete.ico
+++ b/plugins/FTPFileYM/res/delete.ico
diff --git a/plugins/FTPFileYM/icons/ftp0.ico b/plugins/FTPFileYM/res/ftp0.ico
index 2a10ab1ad9..2a10ab1ad9 100644
--- a/plugins/FTPFileYM/icons/ftp0.ico
+++ b/plugins/FTPFileYM/res/ftp0.ico
diff --git a/plugins/FTPFileYM/icons/ftp1.ico b/plugins/FTPFileYM/res/ftp1.ico
index 6ab8b4a2f3..6ab8b4a2f3 100644
--- a/plugins/FTPFileYM/icons/ftp1.ico
+++ b/plugins/FTPFileYM/res/ftp1.ico
diff --git a/plugins/FTPFileYM/icons/ftp2.ico b/plugins/FTPFileYM/res/ftp2.ico
index cda6827a5e..cda6827a5e 100644
--- a/plugins/FTPFileYM/icons/ftp2.ico
+++ b/plugins/FTPFileYM/res/ftp2.ico
diff --git a/plugins/FTPFileYM/icons/ftp3.ico b/plugins/FTPFileYM/res/ftp3.ico
index ed2eea3582..ed2eea3582 100644
--- a/plugins/FTPFileYM/icons/ftp3.ico
+++ b/plugins/FTPFileYM/res/ftp3.ico
diff --git a/plugins/FTPFileYM/icons/ftp4.ico b/plugins/FTPFileYM/res/ftp4.ico
index 69965d998a..69965d998a 100644
--- a/plugins/FTPFileYM/icons/ftp4.ico
+++ b/plugins/FTPFileYM/res/ftp4.ico
diff --git a/plugins/FTPFileYM/ftpfile.rc b/plugins/FTPFileYM/res/ftpfile.rc
index c1cd9e3a96..408ec670cd 100644
--- a/plugins/FTPFileYM/ftpfile.rc
+++ b/plugins/FTPFileYM/res/ftpfile.rc
@@ -1,6 +1,6 @@
 // Microsoft Visual C++ generated resource script.

 //

-#include "resource.h"

+#include "..\src\resource.h"

 

 #define APSTUDIO_READONLY_SYMBOLS

 /////////////////////////////////////////////////////////////////////////////

@@ -243,15 +243,17 @@ END
 

 // Icon with lowest ID value placed first to ensure application icon

 // remains consistent on all systems.

-IDI_PAUSE               ICON                    "icons\\pause.ico"

-IDI_FTP0                ICON                    "icons\\ftp0.ico"

-IDI_FTP1                ICON                    "icons\\ftp1.ico"

-IDI_FTP2                ICON                    "icons\\ftp2.ico"

-IDI_FTP3                ICON                    "icons\\ftp3.ico"

-IDI_FTP4                ICON                    "icons\\ftp4.ico"

-IDI_MENU                ICON                    "icons\\menu.ico"

-IDI_CLIPBOARD           ICON                    "icons\\clipboard.ico"

-IDI_RESUME              ICON                    "icons\\resume.ico"

+IDI_PAUSE               ICON                    "pause.ico"

+IDI_FTP0                ICON                    "ftp0.ico"

+IDI_FTP1                ICON                    "ftp1.ico"

+IDI_FTP2                ICON                    "ftp2.ico"

+IDI_FTP3                ICON                    "ftp3.ico"

+IDI_FTP4                ICON                    "ftp4.ico"

+IDI_MENU                ICON                    "menu.ico"

+IDI_CLIPBOARD           ICON                    "clipboard.ico"

+IDI_RESUME              ICON                    "resume.ico"

+IDI_CLEAR               ICON                    "clear.ico"

+IDI_DELETE              ICON                    "delete.ico"

 #endif    // Neutral resources

 /////////////////////////////////////////////////////////////////////////////

 

@@ -265,16 +267,6 @@ LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
 #pragma code_page(1250)

 #endif //_WIN32

 

-/////////////////////////////////////////////////////////////////////////////

-//

-// Icon

-//

-

-// Icon with lowest ID value placed first to ensure application icon

-// remains consistent on all systems.

-IDI_CLEAR               ICON                    "icons\\clear.ico"

-IDI_DELETE              ICON                    "icons\\delete.ico"

-

 #ifdef APSTUDIO_INVOKED

 /////////////////////////////////////////////////////////////////////////////

 //

@@ -283,7 +275,7 @@ IDI_DELETE              ICON                    "icons\\delete.ico"
 

 1 TEXTINCLUDE 

 BEGIN

-    "resource.h\0"

+    "..\\src\\resource.h\0"

 END

 

 2 TEXTINCLUDE 

diff --git a/plugins/FTPFileYM/icons/menu.ico b/plugins/FTPFileYM/res/menu.ico
index ae0e211a7f..ae0e211a7f 100644
--- a/plugins/FTPFileYM/icons/menu.ico
+++ b/plugins/FTPFileYM/res/menu.ico
diff --git a/plugins/FTPFileYM/icons/pause.ico b/plugins/FTPFileYM/res/pause.ico
index c3ed4fa12b..c3ed4fa12b 100644
--- a/plugins/FTPFileYM/icons/pause.ico
+++ b/plugins/FTPFileYM/res/pause.ico
diff --git a/plugins/FTPFileYM/icons/resume.ico b/plugins/FTPFileYM/res/resume.ico
index 01451a7319..01451a7319 100644
--- a/plugins/FTPFileYM/icons/resume.ico
+++ b/plugins/FTPFileYM/res/resume.ico
diff --git a/plugins/FTPFileYM/version.rc b/plugins/FTPFileYM/res/version1.rc
index 6384d03f71..6384d03f71 100644
--- a/plugins/FTPFileYM/version.rc
+++ b/plugins/FTPFileYM/res/version1.rc
diff --git a/plugins/FTPFileYM/common.h b/plugins/FTPFileYM/src/common.h
index 5e1ff74618..5e1ff74618 100644
--- a/plugins/FTPFileYM/common.h
+++ b/plugins/FTPFileYM/src/common.h
diff --git a/plugins/FTPFileYM/curl/curl.h b/plugins/FTPFileYM/src/curl/curl.h
index 973fdcc49d..973fdcc49d 100644
--- a/plugins/FTPFileYM/curl/curl.h
+++ b/plugins/FTPFileYM/src/curl/curl.h
diff --git a/plugins/FTPFileYM/curl/curlbuild.h b/plugins/FTPFileYM/src/curl/curlbuild.h
index 9cb347323e..9cb347323e 100644
--- a/plugins/FTPFileYM/curl/curlbuild.h
+++ b/plugins/FTPFileYM/src/curl/curlbuild.h
diff --git a/plugins/FTPFileYM/curl/curlrules.h b/plugins/FTPFileYM/src/curl/curlrules.h
index 44018737d9..44018737d9 100644
--- a/plugins/FTPFileYM/curl/curlrules.h
+++ b/plugins/FTPFileYM/src/curl/curlrules.h
diff --git a/plugins/FTPFileYM/curl/curlver.h b/plugins/FTPFileYM/src/curl/curlver.h
index 177f6cbd8d..177f6cbd8d 100644
--- a/plugins/FTPFileYM/curl/curlver.h
+++ b/plugins/FTPFileYM/src/curl/curlver.h
diff --git a/plugins/FTPFileYM/curl/easy.h b/plugins/FTPFileYM/src/curl/easy.h
index 40449c3ec8..40449c3ec8 100644
--- a/plugins/FTPFileYM/curl/easy.h
+++ b/plugins/FTPFileYM/src/curl/easy.h
diff --git a/plugins/FTPFileYM/curl/mprintf.h b/plugins/FTPFileYM/src/curl/mprintf.h
index d7202de170..d7202de170 100644
--- a/plugins/FTPFileYM/curl/mprintf.h
+++ b/plugins/FTPFileYM/src/curl/mprintf.h
diff --git a/plugins/FTPFileYM/curl/multi.h b/plugins/FTPFileYM/src/curl/multi.h
index 153f7721c9..153f7721c9 100644
--- a/plugins/FTPFileYM/curl/multi.h
+++ b/plugins/FTPFileYM/src/curl/multi.h
diff --git a/plugins/FTPFileYM/curl/stdcheaders.h b/plugins/FTPFileYM/src/curl/stdcheaders.h
index f739d7f9aa..f739d7f9aa 100644
--- a/plugins/FTPFileYM/curl/stdcheaders.h
+++ b/plugins/FTPFileYM/src/curl/stdcheaders.h
diff --git a/plugins/FTPFileYM/curl/typecheck-gcc.h b/plugins/FTPFileYM/src/curl/typecheck-gcc.h
index 9788305819..9788305819 100644
--- a/plugins/FTPFileYM/curl/typecheck-gcc.h
+++ b/plugins/FTPFileYM/src/curl/typecheck-gcc.h
diff --git a/plugins/FTPFileYM/curl/types.h b/plugins/FTPFileYM/src/curl/types.h
index d37d6ae9e1..d37d6ae9e1 100644
--- a/plugins/FTPFileYM/curl/types.h
+++ b/plugins/FTPFileYM/src/curl/types.h
diff --git a/plugins/FTPFileYM/dbentry.cpp b/plugins/FTPFileYM/src/dbentry.cpp
index bb43e120a8..bb43e120a8 100644
--- a/plugins/FTPFileYM/dbentry.cpp
+++ b/plugins/FTPFileYM/src/dbentry.cpp
diff --git a/plugins/FTPFileYM/dbentry.h b/plugins/FTPFileYM/src/dbentry.h
index 27ad865559..27ad865559 100644
--- a/plugins/FTPFileYM/dbentry.h
+++ b/plugins/FTPFileYM/src/dbentry.h
diff --git a/plugins/FTPFileYM/deletetimer.cpp b/plugins/FTPFileYM/src/deletetimer.cpp
index 2534069a0d..2534069a0d 100644
--- a/plugins/FTPFileYM/deletetimer.cpp
+++ b/plugins/FTPFileYM/src/deletetimer.cpp
diff --git a/plugins/FTPFileYM/deletetimer.h b/plugins/FTPFileYM/src/deletetimer.h
index 9fbe478c9d..9fbe478c9d 100644
--- a/plugins/FTPFileYM/deletetimer.h
+++ b/plugins/FTPFileYM/src/deletetimer.h
diff --git a/plugins/FTPFileYM/dialog.cpp b/plugins/FTPFileYM/src/dialog.cpp
index 9553a42dae..9553a42dae 100644
--- a/plugins/FTPFileYM/dialog.cpp
+++ b/plugins/FTPFileYM/src/dialog.cpp
diff --git a/plugins/FTPFileYM/dialog.h b/plugins/FTPFileYM/src/dialog.h
index 1c1cd38ff8..1c1cd38ff8 100644
--- a/plugins/FTPFileYM/dialog.h
+++ b/plugins/FTPFileYM/src/dialog.h
diff --git a/plugins/FTPFileYM/ftpfile.cpp b/plugins/FTPFileYM/src/ftpfile.cpp
index 56b3ca56cb..dea3d4457f 100644
--- a/plugins/FTPFileYM/ftpfile.cpp
+++ b/plugins/FTPFileYM/src/ftpfile.cpp
@@ -42,13 +42,13 @@ int UploadFile(HANDLE hContact, int iFtpNum, UploadJob::EMode mode);
 static PLUGININFOEX pluginInfoEx = 

 {

 	sizeof(PLUGININFOEX), 

-	"FTP File YM",

-	__VERSION_DWORD,

-	"FTP a file to a server and send the URL to your friend. Supported automatic zipping before upload and encryption via SFTP and FTPS.",

-	"yaho",

-	"yaho@miranda-easy.net",

-	"Copyright © 2007-2010 Jan Holub",

-	"http://miranda-ng.org/",

+	__PLUGIN_NAME,

+	PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),

+	__DESCRIPTION,

+	__AUTHOR,

+	__AUTHOREMAIL,

+	__COPYRIGHT,

+	__AUTHORWEB,

 	UNICODE_AWARE,		

 	MIID_FTPFILE

 };

diff --git a/plugins/FTPFileYM/job_delete.cpp b/plugins/FTPFileYM/src/job_delete.cpp
index f7d2c7c64b..f7d2c7c64b 100644
--- a/plugins/FTPFileYM/job_delete.cpp
+++ b/plugins/FTPFileYM/src/job_delete.cpp
diff --git a/plugins/FTPFileYM/job_delete.h b/plugins/FTPFileYM/src/job_delete.h
index a2da7c5d24..a2da7c5d24 100644
--- a/plugins/FTPFileYM/job_delete.h
+++ b/plugins/FTPFileYM/src/job_delete.h
diff --git a/plugins/FTPFileYM/job_generic.cpp b/plugins/FTPFileYM/src/job_generic.cpp
index ea199ea4db..ea199ea4db 100644
--- a/plugins/FTPFileYM/job_generic.cpp
+++ b/plugins/FTPFileYM/src/job_generic.cpp
diff --git a/plugins/FTPFileYM/job_generic.h b/plugins/FTPFileYM/src/job_generic.h
index 618d891a82..618d891a82 100644
--- a/plugins/FTPFileYM/job_generic.h
+++ b/plugins/FTPFileYM/src/job_generic.h
diff --git a/plugins/FTPFileYM/job_packer.cpp b/plugins/FTPFileYM/src/job_packer.cpp
index bcc8ab02dc..bcc8ab02dc 100644
--- a/plugins/FTPFileYM/job_packer.cpp
+++ b/plugins/FTPFileYM/src/job_packer.cpp
diff --git a/plugins/FTPFileYM/job_packer.h b/plugins/FTPFileYM/src/job_packer.h
index 5d6857f24b..5d6857f24b 100644
--- a/plugins/FTPFileYM/job_packer.h
+++ b/plugins/FTPFileYM/src/job_packer.h
diff --git a/plugins/FTPFileYM/job_upload.cpp b/plugins/FTPFileYM/src/job_upload.cpp
index bdc31fc61e..bdc31fc61e 100644
--- a/plugins/FTPFileYM/job_upload.cpp
+++ b/plugins/FTPFileYM/src/job_upload.cpp
diff --git a/plugins/FTPFileYM/job_upload.h b/plugins/FTPFileYM/src/job_upload.h
index fa29e3c640..fa29e3c640 100644
--- a/plugins/FTPFileYM/job_upload.h
+++ b/plugins/FTPFileYM/src/job_upload.h
diff --git a/plugins/FTPFileYM/libcurl.cpp b/plugins/FTPFileYM/src/libcurl.cpp
index 2017556c3e..2017556c3e 100644
--- a/plugins/FTPFileYM/libcurl.cpp
+++ b/plugins/FTPFileYM/src/libcurl.cpp
diff --git a/plugins/FTPFileYM/libcurl.h b/plugins/FTPFileYM/src/libcurl.h
index 4a8ba6b253..4a8ba6b253 100644
--- a/plugins/FTPFileYM/libcurl.h
+++ b/plugins/FTPFileYM/src/libcurl.h
diff --git a/plugins/FTPFileYM/manager.cpp b/plugins/FTPFileYM/src/manager.cpp
index abf1ec3f0a..abf1ec3f0a 100644
--- a/plugins/FTPFileYM/manager.cpp
+++ b/plugins/FTPFileYM/src/manager.cpp
diff --git a/plugins/FTPFileYM/manager.h b/plugins/FTPFileYM/src/manager.h
index ef5ba0ddb3..ef5ba0ddb3 100644
--- a/plugins/FTPFileYM/manager.h
+++ b/plugins/FTPFileYM/src/manager.h
diff --git a/plugins/FTPFileYM/mir_db.cpp b/plugins/FTPFileYM/src/mir_db.cpp
index f5745d9f24..f5745d9f24 100644
--- a/plugins/FTPFileYM/mir_db.cpp
+++ b/plugins/FTPFileYM/src/mir_db.cpp
diff --git a/plugins/FTPFileYM/mir_db.h b/plugins/FTPFileYM/src/mir_db.h
index df2004c86d..df2004c86d 100644
--- a/plugins/FTPFileYM/mir_db.h
+++ b/plugins/FTPFileYM/src/mir_db.h
diff --git a/plugins/FTPFileYM/options.cpp b/plugins/FTPFileYM/src/options.cpp
index b1dfdb0c62..b1dfdb0c62 100644
--- a/plugins/FTPFileYM/options.cpp
+++ b/plugins/FTPFileYM/src/options.cpp
diff --git a/plugins/FTPFileYM/options.h b/plugins/FTPFileYM/src/options.h
index 5def96e1e5..5def96e1e5 100644
--- a/plugins/FTPFileYM/options.h
+++ b/plugins/FTPFileYM/src/options.h
diff --git a/plugins/FTPFileYM/resource.h b/plugins/FTPFileYM/src/resource.h
index 17a227010b..17a227010b 100644
--- a/plugins/FTPFileYM/resource.h
+++ b/plugins/FTPFileYM/src/resource.h
diff --git a/plugins/FTPFileYM/serverlist.cpp b/plugins/FTPFileYM/src/serverlist.cpp
index 1d1c67b145..1d1c67b145 100644
--- a/plugins/FTPFileYM/serverlist.cpp
+++ b/plugins/FTPFileYM/src/serverlist.cpp
diff --git a/plugins/FTPFileYM/serverlist.h b/plugins/FTPFileYM/src/serverlist.h
index 8a1a540172..8a1a540172 100644
--- a/plugins/FTPFileYM/serverlist.h
+++ b/plugins/FTPFileYM/src/serverlist.h
diff --git a/plugins/FTPFileYM/utils.cpp b/plugins/FTPFileYM/src/utils.cpp
index 4757a4d183..4757a4d183 100644
--- a/plugins/FTPFileYM/utils.cpp
+++ b/plugins/FTPFileYM/src/utils.cpp
diff --git a/plugins/FTPFileYM/utils.h b/plugins/FTPFileYM/src/utils.h
index 3b22ccc7d6..3b22ccc7d6 100644
--- a/plugins/FTPFileYM/utils.h
+++ b/plugins/FTPFileYM/src/utils.h
diff --git a/plugins/FTPFileYM/src/version.h b/plugins/FTPFileYM/src/version.h
new file mode 100644
index 0000000000..8186e44083
--- /dev/null
+++ b/plugins/FTPFileYM/src/version.h
@@ -0,0 +1,20 @@
+#define __MAJOR_VERSION				0

+#define __MINOR_VERSION				5

+#define __RELEASE_NUM				0

+#define __BUILD_NUM					0

+

+#define __FILEVERSION_STRING		__MAJOR_VERSION,__MINOR_VERSION,__RELEASE_NUM,__BUILD_NUM

+#define __FILEVERSION_DOTS			__MAJOR_VERSION.__MINOR_VERSION.__RELEASE_NUM.__BUILD_NUM

+

+#define __STRINGIFY_IMPL(x)			#x

+#define __STRINGIFY(x)				__STRINGIFY_IMPL(x)

+#define __VERSION_STRING			__STRINGIFY(__FILEVERSION_DOTS)

+

+#define __PLUGIN_NAME				"FTP File YM"

+#define __INTERNAL_NAME				"FTPFile"

+#define __FILENAME					"FTPFile.dll"

+#define __DESCRIPTION 				"FTP a file to a server and send the URL to your friend. Supported automatic zipping before upload and encryption via SFTP and FTPS."

+#define __AUTHOR					"yaho"

+#define __AUTHOREMAIL				"yaho@miranda-easy.net"

+#define __AUTHORWEB					"http://miranda-ng.org/"

+#define __COPYRIGHT					"© 2007-2010 Jan Holub"

diff --git a/plugins/FTPFileYM/zip/crypt.h b/plugins/FTPFileYM/src/zip/crypt.h
index a01d08d932..a01d08d932 100644
--- a/plugins/FTPFileYM/zip/crypt.h
+++ b/plugins/FTPFileYM/src/zip/crypt.h
diff --git a/plugins/FTPFileYM/zip/ioapi.c b/plugins/FTPFileYM/src/zip/ioapi.c
index 49958f61ff..49958f61ff 100644
--- a/plugins/FTPFileYM/zip/ioapi.c
+++ b/plugins/FTPFileYM/src/zip/ioapi.c
diff --git a/plugins/FTPFileYM/zip/ioapi.h b/plugins/FTPFileYM/src/zip/ioapi.h
index 8309c4cf8f..8309c4cf8f 100644
--- a/plugins/FTPFileYM/zip/ioapi.h
+++ b/plugins/FTPFileYM/src/zip/ioapi.h
diff --git a/plugins/FTPFileYM/zip/zconf.h b/plugins/FTPFileYM/src/zip/zconf.h
index 58880245c1..58880245c1 100644
--- a/plugins/FTPFileYM/zip/zconf.h
+++ b/plugins/FTPFileYM/src/zip/zconf.h
diff --git a/plugins/FTPFileYM/zip/zip.c b/plugins/FTPFileYM/src/zip/zip.c
index 3c34fc8bd4..3c34fc8bd4 100644
--- a/plugins/FTPFileYM/zip/zip.c
+++ b/plugins/FTPFileYM/src/zip/zip.c
diff --git a/plugins/FTPFileYM/zip/zip.h b/plugins/FTPFileYM/src/zip/zip.h
index 8aaebb6234..8aaebb6234 100644
--- a/plugins/FTPFileYM/zip/zip.h
+++ b/plugins/FTPFileYM/src/zip/zip.h
diff --git a/plugins/FTPFileYM/zip/zlib.h b/plugins/FTPFileYM/src/zip/zlib.h
index f5785be7e0..f5785be7e0 100644
--- a/plugins/FTPFileYM/zip/zlib.h
+++ b/plugins/FTPFileYM/src/zip/zlib.h
diff --git a/plugins/FTPFileYM/version.h b/plugins/FTPFileYM/version.h
deleted file mode 100644
index ca7d1ef7cd..0000000000
--- a/plugins/FTPFileYM/version.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#define __FILEVERSION_STRING        0,5,0,0

-#define __VERSION_STRING            "0.5.0.0"

-#define __VERSION_DWORD             PLUGIN_MAKE_VERSION(0, 5, 0, 0)

-