349 files changed, 383 insertions, 1434 deletions
diff --git a/plugins/FreeImage/freeimage-translation.txt b/plugins/FreeImage/Docs/freeimage-translation.txt
index 52329c17db..52329c17db 100644
--- a/plugins/FreeImage/freeimage-translation.txt
+++ b/plugins/FreeImage/Docs/freeimage-translation.txt
diff --git a/plugins/FreeImage/FreeImage_10.vcxproj b/plugins/FreeImage/FreeImage_10.vcxproj
index f36dcdfc4d..27b52e0d07 100644
--- a/plugins/FreeImage/FreeImage_10.vcxproj
+++ b/plugins/FreeImage/FreeImage_10.vcxproj
@@ -74,7 +74,7 @@
       <Optimization>Full</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
-      <AdditionalIncludeDirectories>Source;Source\ZLib;..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>src;src\ZLib;..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;FREEIMAGE_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -102,7 +102,7 @@
       <Optimization>Full</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
-      <AdditionalIncludeDirectories>Source;Source\ZLib;..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>src;src\ZLib;..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;FREEIMAGE_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -128,7 +128,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>Source;Source\ZLib;..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>src;src\ZLib;..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;FREEIMAGE_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>false</StringPooling>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -154,7 +154,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>Source;Source\ZLib;..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>src;src\ZLib;..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;FREEIMAGE_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>false</StringPooling>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -185,170 +185,171 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="Source\FreeImage\BitmapAccess.cpp" />
-    <ClCompile Include="Source\FreeImage\ColorLookup.cpp" />
-    <ClCompile Include="Source\FreeImage\ConversionFloat.cpp" />
-    <ClCompile Include="Source\FreeImage\ConversionRGB16.cpp" />
-    <ClCompile Include="Source\FreeImage\ConversionUINT16.cpp" />
-    <ClCompile Include="Source\FreeImage\FreeImage.cpp" />
-    <ClCompile Include="Source\FreeImage\FreeImageC.c" />
-    <ClCompile Include="Source\FreeImage\FreeImageIO.cpp" />
-    <ClCompile Include="Source\FreeImage\GetType.cpp" />
-    <ClCompile Include="Source\FreeImage\MemoryIO.cpp" />
-    <ClCompile Include="Source\FreeImage\PixelAccess.cpp" />
-    <ClCompile Include="Source\FreeImage\Plugin.cpp" />
-    <ClCompile Include="Source\FreeImage\PluginBMP.cpp" />
-    <ClCompile Include="Source\FreeImage\PluginCUT.cpp" />
-    <ClCompile Include="Source\FreeImage\PluginGIF.cpp" />
-    <ClCompile Include="Source\FreeImage\PluginICO.cpp" />
-    <ClCompile Include="Source\FreeImage\PluginJPEG.cpp" />
-    <ClCompile Include="Source\FreeImage\PluginPNG.cpp" />
-    <ClCompile Include="Source\FreeImage\Conversion.cpp" />
-    <ClCompile Include="Source\FreeImage\Conversion16_555.cpp" />
-    <ClCompile Include="Source\FreeImage\Conversion16_565.cpp" />
-    <ClCompile Include="Source\FreeImage\Conversion24.cpp" />
-    <ClCompile Include="Source\FreeImage\Conversion32.cpp" />
-    <ClCompile Include="Source\FreeImage\Conversion4.cpp" />
-    <ClCompile Include="Source\FreeImage\Conversion8.cpp" />
-    <ClCompile Include="Source\FreeImage\ConversionRGBF.cpp" />
-    <ClCompile Include="Source\FreeImage\ConversionType.cpp" />
-    <ClCompile Include="Source\FreeImage\Halftoning.cpp" />
-    <ClCompile Include="Source\FreeImageToolkit\MultigridPoissonSolver.cpp" />
-    <ClCompile Include="Source\FreeImage\tmoColorConvert.cpp" />
-    <ClCompile Include="Source\FreeImage\tmoDrago03.cpp" />
-    <ClCompile Include="Source\FreeImage\tmoFattal02.cpp" />
-    <ClCompile Include="Source\FreeImage\tmoReinhard05.cpp" />
-    <ClCompile Include="Source\FreeImage\ToneMapping.cpp" />
-    <ClCompile Include="Source\FreeImage\NNQuantizer.cpp" />
-    <ClCompile Include="Source\FreeImage\WuQuantizer.cpp" />
-    <ClCompile Include="Source\FreeImage\CacheFile.cpp" />
-    <ClCompile Include="Source\FreeImage\MultiPage.cpp" />
-    <ClCompile Include="Source\FreeImage\ZLibInterface.cpp" />
-    <ClCompile Include="Source\LibJPEG\jaricom.c" />
-    <ClCompile Include="Source\LibJPEG\jcarith.c" />
-    <ClCompile Include="Source\LibJPEG\jdarith.c" />
-    <ClCompile Include="Source\LibJPEG\jdhuff.c" />
-    <ClCompile Include="Source\Metadata\Exif.cpp" />
-    <ClCompile Include="Source\Metadata\FIRational.cpp" />
-    <ClCompile Include="Source\Metadata\FreeImageTag.cpp" />
-    <ClCompile Include="Source\Metadata\IPTC.cpp" />
-    <ClCompile Include="Source\Metadata\TagConversion.cpp" />
-    <ClCompile Include="Source\Metadata\TagLib.cpp" />
-    <ClCompile Include="Miranda\main.cpp" />
-    <ClCompile Include="Source\LibJPEG\jcapimin.c" />
-    <ClCompile Include="Source\LibJPEG\jcapistd.c" />
-    <ClCompile Include="Source\LibJPEG\jccoefct.c" />
-    <ClCompile Include="Source\LibJPEG\jccolor.c" />
-    <ClCompile Include="Source\LibJPEG\jcdctmgr.c" />
-    <ClCompile Include="Source\LibJPEG\jchuff.c" />
-    <ClCompile Include="Source\LibJPEG\jcinit.c" />
-    <ClCompile Include="Source\LibJPEG\jcmainct.c" />
-    <ClCompile Include="Source\LibJPEG\jcmarker.c" />
-    <ClCompile Include="Source\LibJPEG\jcmaster.c" />
-    <ClCompile Include="Source\LibJPEG\jcomapi.c" />
-    <ClCompile Include="Source\LibJPEG\jcparam.c" />
-    <ClCompile Include="Source\LibJPEG\jcprepct.c" />
-    <ClCompile Include="Source\LibJPEG\jcsample.c" />
-    <ClCompile Include="Source\LibJPEG\jctrans.c" />
-    <ClCompile Include="Source\LibJPEG\jdapimin.c" />
-    <ClCompile Include="Source\LibJPEG\jdapistd.c" />
-    <ClCompile Include="Source\LibJPEG\jdatadst.c" />
-    <ClCompile Include="Source\LibJPEG\jdatasrc.c" />
-    <ClCompile Include="Source\LibJPEG\jdcoefct.c" />
-    <ClCompile Include="Source\LibJPEG\jdcolor.c" />
-    <ClCompile Include="Source\LibJPEG\jddctmgr.c" />
-    <ClCompile Include="Source\LibJPEG\jdinput.c" />
-    <ClCompile Include="Source\LibJPEG\jdmainct.c" />
-    <ClCompile Include="Source\LibJPEG\jdmarker.c" />
-    <ClCompile Include="Source\LibJPEG\jdmaster.c" />
-    <ClCompile Include="Source\LibJPEG\jdmerge.c" />
-    <ClCompile Include="Source\LibJPEG\jdpostct.c" />
-    <ClCompile Include="Source\LibJPEG\jdsample.c" />
-    <ClCompile Include="Source\LibJPEG\jdtrans.c" />
-    <ClCompile Include="Source\LibJPEG\jerror.c" />
-    <ClCompile Include="Source\LibJPEG\jfdctflt.c" />
-    <ClCompile Include="Source\LibJPEG\jfdctfst.c" />
-    <ClCompile Include="Source\LibJPEG\jfdctint.c" />
-    <ClCompile Include="Source\LibJPEG\jidctflt.c" />
-    <ClCompile Include="Source\LibJPEG\jidctfst.c" />
-    <ClCompile Include="Source\LibJPEG\jidctint.c" />
-    <ClCompile Include="Source\LibJPEG\jmemmgr.c" />
-    <ClCompile Include="Source\LibJPEG\jmemnobs.c" />
-    <ClCompile Include="Source\LibJPEG\jquant1.c" />
-    <ClCompile Include="Source\LibJPEG\jquant2.c" />
-    <ClCompile Include="Source\LibJPEG\jutils.c" />
-    <ClCompile Include="Source\LibJPEG\rdbmp.c" />
-    <ClCompile Include="Source\LibJPEG\rdcolmap.c" />
-    <ClCompile Include="Source\LibJPEG\rdgif.c" />
-    <ClCompile Include="Source\LibJPEG\rdppm.c" />
-    <ClCompile Include="Source\LibJPEG\rdrle.c" />
-    <ClCompile Include="Source\LibJPEG\rdswitch.c" />
-    <ClCompile Include="Source\LibJPEG\rdtarga.c" />
-    <ClCompile Include="Source\LibJPEG\transupp.c" />
-    <ClCompile Include="Source\LibJPEG\wrbmp.c" />
-    <ClCompile Include="Source\LibJPEG\wrgif.c" />
-    <ClCompile Include="Source\LibJPEG\wrppm.c" />
-    <ClCompile Include="Source\LibJPEG\wrrle.c" />
-    <ClCompile Include="Source\LibJPEG\wrtarga.c" />
-    <ClCompile Include="Source\LibPNG\png.c" />
-    <ClCompile Include="Source\LibPNG\pngerror.c" />
-    <ClCompile Include="Source\LibPNG\pngget.c" />
-    <ClCompile Include="Source\LibPNG\pngmem.c" />
-    <ClCompile Include="Source\LibPNG\pngpread.c" />
-    <ClCompile Include="Source\LibPNG\pngread.c" />
-    <ClCompile Include="Source\LibPNG\pngrio.c" />
-    <ClCompile Include="Source\LibPNG\pngrtran.c" />
-    <ClCompile Include="Source\LibPNG\pngrutil.c" />
-    <ClCompile Include="Source\LibPNG\pngset.c" />
-    <ClCompile Include="Source\LibPNG\pngtrans.c" />
-    <ClCompile Include="Source\LibPNG\pngwio.c" />
-    <ClCompile Include="Source\LibPNG\pngwrite.c" />
-    <ClCompile Include="Source\LibPNG\pngwtran.c" />
-    <ClCompile Include="Source\LibPNG\pngwutil.c" />
-    <ClCompile Include="Source\FreeImageToolkit\BSplineRotate.cpp" />
-    <ClCompile Include="Source\FreeImageToolkit\Channels.cpp" />
-    <ClCompile Include="Source\FreeImageToolkit\ClassicRotate.cpp" />
-    <ClCompile Include="Source\FreeImageToolkit\Colors.cpp" />
-    <ClCompile Include="Source\FreeImageToolkit\CopyPaste.cpp" />
-    <ClCompile Include="Source\FreeImageToolkit\Display.cpp" />
-    <ClCompile Include="Source\FreeImageToolkit\Flip.cpp" />
-    <ClCompile Include="Source\FreeImageToolkit\JPEGTransform.cpp" />
-    <ClCompile Include="Source\FreeImageToolkit\Rescale.cpp" />
-    <ClCompile Include="Source\FreeImageToolkit\Resize.cpp" />
+    <ClCompile Include="src\FreeImage\BitmapAccess.cpp" />
+    <ClCompile Include="src\FreeImage\ColorLookup.cpp" />
+    <ClCompile Include="src\FreeImage\ConversionFloat.cpp" />
+    <ClCompile Include="src\FreeImage\ConversionRGB16.cpp" />
+    <ClCompile Include="src\FreeImage\ConversionUINT16.cpp" />
+    <ClCompile Include="src\FreeImage\FreeImage.cpp" />
+    <ClCompile Include="src\FreeImage\FreeImageC.c" />
+    <ClCompile Include="src\FreeImage\FreeImageIO.cpp" />
+    <ClCompile Include="src\FreeImage\GetType.cpp" />
+    <ClCompile Include="src\FreeImage\MemoryIO.cpp" />
+    <ClCompile Include="src\FreeImage\PixelAccess.cpp" />
+    <ClCompile Include="src\FreeImage\Plugin.cpp" />
+    <ClCompile Include="src\FreeImage\PluginBMP.cpp" />
+    <ClCompile Include="src\FreeImage\PluginCUT.cpp" />
+    <ClCompile Include="src\FreeImage\PluginGIF.cpp" />
+    <ClCompile Include="src\FreeImage\PluginICO.cpp" />
+    <ClCompile Include="src\FreeImage\PluginJPEG.cpp" />
+    <ClCompile Include="src\FreeImage\PluginPNG.cpp" />
+    <ClCompile Include="src\FreeImage\Conversion.cpp" />
+    <ClCompile Include="src\FreeImage\Conversion16_555.cpp" />
+    <ClCompile Include="src\FreeImage\Conversion16_565.cpp" />
+    <ClCompile Include="src\FreeImage\Conversion24.cpp" />
+    <ClCompile Include="src\FreeImage\Conversion32.cpp" />
+    <ClCompile Include="src\FreeImage\Conversion4.cpp" />
+    <ClCompile Include="src\FreeImage\Conversion8.cpp" />
+    <ClCompile Include="src\FreeImage\ConversionRGBF.cpp" />
+    <ClCompile Include="src\FreeImage\ConversionType.cpp" />
+    <ClCompile Include="src\FreeImage\Halftoning.cpp" />
+    <ClCompile Include="src\FreeImageToolkit\MultigridPoissonSolver.cpp" />
+    <ClCompile Include="src\FreeImage\tmoColorConvert.cpp" />
+    <ClCompile Include="src\FreeImage\tmoDrago03.cpp" />
+    <ClCompile Include="src\FreeImage\tmoFattal02.cpp" />
+    <ClCompile Include="src\FreeImage\tmoReinhard05.cpp" />
+    <ClCompile Include="src\FreeImage\ToneMapping.cpp" />
+    <ClCompile Include="src\FreeImage\NNQuantizer.cpp" />
+    <ClCompile Include="src\FreeImage\WuQuantizer.cpp" />
+    <ClCompile Include="src\FreeImage\CacheFile.cpp" />
+    <ClCompile Include="src\FreeImage\MultiPage.cpp" />
+    <ClCompile Include="src\FreeImage\ZLibInterface.cpp" />
+    <ClCompile Include="src\LibJPEG\jaricom.c" />
+    <ClCompile Include="src\LibJPEG\jcarith.c" />
+    <ClCompile Include="src\LibJPEG\jdarith.c" />
+    <ClCompile Include="src\LibJPEG\jdhuff.c" />
+    <ClCompile Include="src\Metadata\Exif.cpp" />
+    <ClCompile Include="src\Metadata\FIRational.cpp" />
+    <ClCompile Include="src\Metadata\FreeImageTag.cpp" />
+    <ClCompile Include="src\Metadata\IPTC.cpp" />
+    <ClCompile Include="src\Metadata\TagConversion.cpp" />
+    <ClCompile Include="src\Metadata\TagLib.cpp" />
+    <ClCompile Include="src\main.cpp" />
+    <ClCompile Include="src\LibJPEG\jcapimin.c" />
+    <ClCompile Include="src\LibJPEG\jcapistd.c" />
+    <ClCompile Include="src\LibJPEG\jccoefct.c" />
+    <ClCompile Include="src\LibJPEG\jccolor.c" />
+    <ClCompile Include="src\LibJPEG\jcdctmgr.c" />
+    <ClCompile Include="src\LibJPEG\jchuff.c" />
+    <ClCompile Include="src\LibJPEG\jcinit.c" />
+    <ClCompile Include="src\LibJPEG\jcmainct.c" />
+    <ClCompile Include="src\LibJPEG\jcmarker.c" />
+    <ClCompile Include="src\LibJPEG\jcmaster.c" />
+    <ClCompile Include="src\LibJPEG\jcomapi.c" />
+    <ClCompile Include="src\LibJPEG\jcparam.c" />
+    <ClCompile Include="src\LibJPEG\jcprepct.c" />
+    <ClCompile Include="src\LibJPEG\jcsample.c" />
+    <ClCompile Include="src\LibJPEG\jctrans.c" />
+    <ClCompile Include="src\LibJPEG\jdapimin.c" />
+    <ClCompile Include="src\LibJPEG\jdapistd.c" />
+    <ClCompile Include="src\LibJPEG\jdatadst.c" />
+    <ClCompile Include="src\LibJPEG\jdatasrc.c" />
+    <ClCompile Include="src\LibJPEG\jdcoefct.c" />
+    <ClCompile Include="src\LibJPEG\jdcolor.c" />
+    <ClCompile Include="src\LibJPEG\jddctmgr.c" />
+    <ClCompile Include="src\LibJPEG\jdinput.c" />
+    <ClCompile Include="src\LibJPEG\jdmainct.c" />
+    <ClCompile Include="src\LibJPEG\jdmarker.c" />
+    <ClCompile Include="src\LibJPEG\jdmaster.c" />
+    <ClCompile Include="src\LibJPEG\jdmerge.c" />
+    <ClCompile Include="src\LibJPEG\jdpostct.c" />
+    <ClCompile Include="src\LibJPEG\jdsample.c" />
+    <ClCompile Include="src\LibJPEG\jdtrans.c" />
+    <ClCompile Include="src\LibJPEG\jerror.c" />
+    <ClCompile Include="src\LibJPEG\jfdctflt.c" />
+    <ClCompile Include="src\LibJPEG\jfdctfst.c" />
+    <ClCompile Include="src\LibJPEG\jfdctint.c" />
+    <ClCompile Include="src\LibJPEG\jidctflt.c" />
+    <ClCompile Include="src\LibJPEG\jidctfst.c" />
+    <ClCompile Include="src\LibJPEG\jidctint.c" />
+    <ClCompile Include="src\LibJPEG\jmemmgr.c" />
+    <ClCompile Include="src\LibJPEG\jmemnobs.c" />
+    <ClCompile Include="src\LibJPEG\jquant1.c" />
+    <ClCompile Include="src\LibJPEG\jquant2.c" />
+    <ClCompile Include="src\LibJPEG\jutils.c" />
+    <ClCompile Include="src\LibJPEG\rdbmp.c" />
+    <ClCompile Include="src\LibJPEG\rdcolmap.c" />
+    <ClCompile Include="src\LibJPEG\rdgif.c" />
+    <ClCompile Include="src\LibJPEG\rdppm.c" />
+    <ClCompile Include="src\LibJPEG\rdrle.c" />
+    <ClCompile Include="src\LibJPEG\rdswitch.c" />
+    <ClCompile Include="src\LibJPEG\rdtarga.c" />
+    <ClCompile Include="src\LibJPEG\transupp.c" />
+    <ClCompile Include="src\LibJPEG\wrbmp.c" />
+    <ClCompile Include="src\LibJPEG\wrgif.c" />
+    <ClCompile Include="src\LibJPEG\wrppm.c" />
+    <ClCompile Include="src\LibJPEG\wrrle.c" />
+    <ClCompile Include="src\LibJPEG\wrtarga.c" />
+    <ClCompile Include="src\LibPNG\png.c" />
+    <ClCompile Include="src\LibPNG\pngerror.c" />
+    <ClCompile Include="src\LibPNG\pngget.c" />
+    <ClCompile Include="src\LibPNG\pngmem.c" />
+    <ClCompile Include="src\LibPNG\pngpread.c" />
+    <ClCompile Include="src\LibPNG\pngread.c" />
+    <ClCompile Include="src\LibPNG\pngrio.c" />
+    <ClCompile Include="src\LibPNG\pngrtran.c" />
+    <ClCompile Include="src\LibPNG\pngrutil.c" />
+    <ClCompile Include="src\LibPNG\pngset.c" />
+    <ClCompile Include="src\LibPNG\pngtrans.c" />
+    <ClCompile Include="src\LibPNG\pngwio.c" />
+    <ClCompile Include="src\LibPNG\pngwrite.c" />
+    <ClCompile Include="src\LibPNG\pngwtran.c" />
+    <ClCompile Include="src\LibPNG\pngwutil.c" />
+    <ClCompile Include="src\FreeImageToolkit\BSplineRotate.cpp" />
+    <ClCompile Include="src\FreeImageToolkit\Channels.cpp" />
+    <ClCompile Include="src\FreeImageToolkit\ClassicRotate.cpp" />
+    <ClCompile Include="src\FreeImageToolkit\Colors.cpp" />
+    <ClCompile Include="src\FreeImageToolkit\CopyPaste.cpp" />
+    <ClCompile Include="src\FreeImageToolkit\Display.cpp" />
+    <ClCompile Include="src\FreeImageToolkit\Flip.cpp" />
+    <ClCompile Include="src\FreeImageToolkit\JPEGTransform.cpp" />
+    <ClCompile Include="src\FreeImageToolkit\Rescale.cpp" />
+    <ClCompile Include="src\FreeImageToolkit\Resize.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="FreeImage.rc" />
+    <ResourceCompile Include="res\FreeImage.rc" />
+    <ResourceCompile Include="res\Version.rc" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="Source\LibJPEG\cderror.h" />
-    <ClInclude Include="Source\LibJPEG\cdjpeg.h" />
-    <ClInclude Include="Source\LibJPEG\jconfig.h" />
-    <ClInclude Include="Source\LibJPEG\jdct.h" />
-    <ClInclude Include="Source\LibJPEG\jerror.h" />
-    <ClInclude Include="Source\LibJPEG\jinclude.h" />
-    <ClInclude Include="Source\LibJPEG\jmemsys.h" />
-    <ClInclude Include="Source\LibJPEG\jmorecfg.h" />
-    <ClInclude Include="Source\LibJPEG\jpegint.h" />
-    <ClInclude Include="Source\LibJPEG\jpeglib.h" />
-    <ClInclude Include="Source\LibJPEG\jversion.h" />
-    <ClInclude Include="Source\LibJPEG\transupp.h" />
-    <ClInclude Include="Source\LibPNG\png.h" />
-    <ClInclude Include="Source\LibPNG\pngconf.h" />
-    <ClInclude Include="Source\CacheFile.h" />
-    <ClInclude Include="Source\LibPNG\pngdebug.h" />
-    <ClInclude Include="Source\LibPNG\pnginfo.h" />
-    <ClInclude Include="Source\LibPNG\pnglibconf.h" />
-    <ClInclude Include="Source\LibPNG\pngpriv.h" />
-    <ClInclude Include="Source\Metadata\FIRational.h" />
-    <ClInclude Include="SOURCE\FreeImage.h" />
-    <ClInclude Include="Source\FreeImageIO.h" />
-    <ClInclude Include="Source\Metadata\FreeImageTag.h" />
-    <ClInclude Include="Source\Plugin.h" />
-    <ClInclude Include="Source\Quantizers.h" />
-    <ClInclude Include="Source\ToneMapping.h" />
-    <ClInclude Include="Source\Utilities.h" />
-    <ClInclude Include="Source\FreeImageToolkit\Resize.h" />
-    <ClInclude Include="Miranda\version.h" />
+    <ClInclude Include="src\LibJPEG\cderror.h" />
+    <ClInclude Include="src\LibJPEG\cdjpeg.h" />
+    <ClInclude Include="src\LibJPEG\jconfig.h" />
+    <ClInclude Include="src\LibJPEG\jdct.h" />
+    <ClInclude Include="src\LibJPEG\jerror.h" />
+    <ClInclude Include="src\LibJPEG\jinclude.h" />
+    <ClInclude Include="src\LibJPEG\jmemsys.h" />
+    <ClInclude Include="src\LibJPEG\jmorecfg.h" />
+    <ClInclude Include="src\LibJPEG\jpegint.h" />
+    <ClInclude Include="src\LibJPEG\jpeglib.h" />
+    <ClInclude Include="src\LibJPEG\jversion.h" />
+    <ClInclude Include="src\LibJPEG\transupp.h" />
+    <ClInclude Include="src\LibPNG\png.h" />
+    <ClInclude Include="src\LibPNG\pngconf.h" />
+    <ClInclude Include="src\CacheFile.h" />
+    <ClInclude Include="src\LibPNG\pngdebug.h" />
+    <ClInclude Include="src\LibPNG\pnginfo.h" />
+    <ClInclude Include="src\LibPNG\pnglibconf.h" />
+    <ClInclude Include="src\LibPNG\pngpriv.h" />
+    <ClInclude Include="src\Metadata\FIRational.h" />
+    <ClInclude Include="src\FreeImage.h" />
+    <ClInclude Include="src\FreeImageIO.h" />
+    <ClInclude Include="src\Metadata\FreeImageTag.h" />
+    <ClInclude Include="src\Plugin.h" />
+    <ClInclude Include="src\Quantizers.h" />
+    <ClInclude Include="src\ToneMapping.h" />
+    <ClInclude Include="src\Utilities.h" />
+    <ClInclude Include="src\FreeImageToolkit\Resize.h" />
+    <ClInclude Include="src\version.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/plugins/FreeImage/FreeImage_10.vcxproj.filters b/plugins/FreeImage/FreeImage_10.vcxproj.filters
index 6176a320d8..af127af105 100644
--- a/plugins/FreeImage/FreeImage_10.vcxproj.filters
+++ b/plugins/FreeImage/FreeImage_10.vcxproj.filters
@@ -47,394 +47,394 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="Source\FreeImage\BitmapAccess.cpp">
+    <ClCompile Include="src\FreeImage\BitmapAccess.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Source\FreeImage\ColorLookup.cpp">
+    <ClCompile Include="src\FreeImage\ColorLookup.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Source\FreeImage\FreeImage.cpp">
+    <ClCompile Include="src\FreeImage\FreeImage.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Source\FreeImage\FreeImageC.c">
+    <ClCompile Include="src\FreeImage\FreeImageC.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Source\FreeImage\FreeImageIO.cpp">
+    <ClCompile Include="src\FreeImage\FreeImageIO.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Source\FreeImage\GetType.cpp">
+    <ClCompile Include="src\FreeImage\GetType.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Source\FreeImage\MemoryIO.cpp">
+    <ClCompile Include="src\FreeImage\MemoryIO.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Source\FreeImage\PixelAccess.cpp">
+    <ClCompile Include="src\FreeImage\PixelAccess.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Source\FreeImage\Plugin.cpp">
+    <ClCompile Include="src\FreeImage\Plugin.cpp">
       <Filter>Source Files\Plugins</Filter>
     </ClCompile>
-    <ClCompile Include="Source\FreeImage\PluginBMP.cpp">
+    <ClCompile Include="src\FreeImage\PluginBMP.cpp">
       <Filter>Source Files\Plugins</Filter>
     </ClCompile>
-    <ClCompile Include="Source\FreeImage\PluginCUT.cpp">
+    <ClCompile Include="src\FreeImage\PluginCUT.cpp">
       <Filter>Source Files\Plugins</Filter>
     </ClCompile>
-    <ClCompile Include="Source\FreeImage\PluginGIF.cpp">
+    <ClCompile Include="src\FreeImage\PluginGIF.cpp">
       <Filter>Source Files\Plugins</Filter>
     </ClCompile>
-    <ClCompile Include="Source\FreeImage\PluginICO.cpp">
+    <ClCompile Include="src\FreeImage\PluginICO.cpp">
       <Filter>Source Files\Plugins</Filter>
     </ClCompile>
-    <ClCompile Include="Source\FreeImage\PluginJPEG.cpp">
+    <ClCompile Include="src\FreeImage\PluginJPEG.cpp">
       <Filter>Source Files\Plugins</Filter>
     </ClCompile>
-    <ClCompile Include="Source\FreeImage\PluginPNG.cpp">
+    <ClCompile Include="src\FreeImage\PluginPNG.cpp">
       <Filter>Source Files\Plugins</Filter>
     </ClCompile>
-    <ClCompile Include="Source\FreeImage\Conversion.cpp">
+    <ClCompile Include="src\FreeImage\Conversion.cpp">
       <Filter>Source Files\Conversion</Filter>
     </ClCompile>
-    <ClCompile Include="Source\FreeImage\Conversion16_555.cpp">
+    <ClCompile Include="src\FreeImage\Conversion16_555.cpp">
       <Filter>Source Files\Conversion</Filter>
     </ClCompile>
-    <ClCompile Include="Source\FreeImage\Conversion16_565.cpp">
+    <ClCompile Include="src\FreeImage\Conversion16_565.cpp">
       <Filter>Source Files\Conversion</Filter>
     </ClCompile>
-    <ClCompile Include="Source\FreeImage\Conversion24.cpp">
+    <ClCompile Include="src\FreeImage\Conversion24.cpp">
       <Filter>Source Files\Conversion</Filter>
     </ClCompile>
-    <ClCompile Include="Source\FreeImage\Conversion32.cpp">
+    <ClCompile Include="src\FreeImage\Conversion32.cpp">
       <Filter>Source Files\Conversion</Filter>
     </ClCompile>
-    <ClCompile Include="Source\FreeImage\Conversion4.cpp">
+    <ClCompile Include="src\FreeImage\Conversion4.cpp">
       <Filter>Source Files\Conversion</Filter>
     </ClCompile>
-    <ClCompile Include="Source\FreeImage\Conversion8.cpp">
+    <ClCompile Include="src\FreeImage\Conversion8.cpp">
       <Filter>Source Files\Conversion</Filter>
     </ClCompile>
-    <ClCompile Include="Source\FreeImage\ConversionRGBF.cpp">
+    <ClCompile Include="src\FreeImage\ConversionRGBF.cpp">
       <Filter>Source Files\Conversion</Filter>
     </ClCompile>
-    <ClCompile Include="Source\FreeImage\ConversionType.cpp">
+    <ClCompile Include="src\FreeImage\ConversionType.cpp">
       <Filter>Source Files\Conversion</Filter>
     </ClCompile>
-    <ClCompile Include="Source\FreeImage\Halftoning.cpp">
+    <ClCompile Include="src\FreeImage\Halftoning.cpp">
       <Filter>Source Files\Conversion</Filter>
     </ClCompile>
-    <ClCompile Include="Source\FreeImageToolkit\MultigridPoissonSolver.cpp">
+    <ClCompile Include="src\FreeImageToolkit\MultigridPoissonSolver.cpp">
       <Filter>Source Files\Conversion</Filter>
     </ClCompile>
-    <ClCompile Include="Source\FreeImage\tmoColorConvert.cpp">
+    <ClCompile Include="src\FreeImage\tmoColorConvert.cpp">
       <Filter>Source Files\Conversion</Filter>
     </ClCompile>
-    <ClCompile Include="Source\FreeImage\tmoDrago03.cpp">
+    <ClCompile Include="src\FreeImage\tmoDrago03.cpp">
       <Filter>Source Files\Conversion</Filter>
     </ClCompile>
-    <ClCompile Include="Source\FreeImage\tmoFattal02.cpp">
+    <ClCompile Include="src\FreeImage\tmoFattal02.cpp">
       <Filter>Source Files\Conversion</Filter>
     </ClCompile>
-    <ClCompile Include="Source\FreeImage\tmoReinhard05.cpp">
+    <ClCompile Include="src\FreeImage\tmoReinhard05.cpp">
       <Filter>Source Files\Conversion</Filter>
     </ClCompile>
-    <ClCompile Include="Source\FreeImage\ToneMapping.cpp">
+    <ClCompile Include="src\FreeImage\ToneMapping.cpp">
       <Filter>Source Files\Conversion</Filter>
     </ClCompile>
-    <ClCompile Include="Source\FreeImage\NNQuantizer.cpp">
+    <ClCompile Include="src\FreeImage\NNQuantizer.cpp">
       <Filter>Source Files\Quantizers</Filter>
     </ClCompile>
-    <ClCompile Include="Source\FreeImage\WuQuantizer.cpp">
+    <ClCompile Include="src\FreeImage\WuQuantizer.cpp">
       <Filter>Source Files\Quantizers</Filter>
     </ClCompile>
-    <ClCompile Include="Source\FreeImage\CacheFile.cpp">
+    <ClCompile Include="src\FreeImage\CacheFile.cpp">
       <Filter>Source Files\MultiPaging</Filter>
     </ClCompile>
-    <ClCompile Include="Source\FreeImage\MultiPage.cpp">
+    <ClCompile Include="src\FreeImage\MultiPage.cpp">
       <Filter>Source Files\MultiPaging</Filter>
     </ClCompile>
-    <ClCompile Include="Source\FreeImage\ZLibInterface.cpp">
+    <ClCompile Include="src\FreeImage\ZLibInterface.cpp">
       <Filter>Source Files\MultiPaging</Filter>
     </ClCompile>
-    <ClCompile Include="Source\Metadata\Exif.cpp">
+    <ClCompile Include="src\Metadata\Exif.cpp">
       <Filter>Source Files\Metadata</Filter>
     </ClCompile>
-    <ClCompile Include="Source\Metadata\FIRational.cpp">
+    <ClCompile Include="src\Metadata\FIRational.cpp">
       <Filter>Source Files\Metadata</Filter>
     </ClCompile>
-    <ClCompile Include="Source\Metadata\FreeImageTag.cpp">
+    <ClCompile Include="src\Metadata\FreeImageTag.cpp">
       <Filter>Source Files\Metadata</Filter>
     </ClCompile>
-    <ClCompile Include="Source\Metadata\IPTC.cpp">
+    <ClCompile Include="src\Metadata\IPTC.cpp">
       <Filter>Source Files\Metadata</Filter>
     </ClCompile>
-    <ClCompile Include="Source\Metadata\TagConversion.cpp">
+    <ClCompile Include="src\Metadata\TagConversion.cpp">
       <Filter>Source Files\Metadata</Filter>
     </ClCompile>
-    <ClCompile Include="Source\Metadata\TagLib.cpp">
+    <ClCompile Include="src\Metadata\TagLib.cpp">
       <Filter>Source Files\Metadata</Filter>
     </ClCompile>
-    <ClCompile Include="Miranda\main.cpp">
+    <ClCompile Include="src\main.cpp">
       <Filter>Source Files\Miranda</Filter>
     </ClCompile>
-    <ClCompile Include="Source\LibJPEG\jcapimin.c">
+    <ClCompile Include="src\LibJPEG\jcapimin.c">
       <Filter>Source Files\LibJPEG\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Source\LibJPEG\jcapistd.c">
+    <ClCompile Include="src\LibJPEG\jcapistd.c">
       <Filter>Source Files\LibJPEG\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Source\LibJPEG\jccoefct.c">
+    <ClCompile Include="src\LibJPEG\jccoefct.c">
       <Filter>Source Files\LibJPEG\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Source\LibJPEG\jccolor.c">
+    <ClCompile Include="src\LibJPEG\jccolor.c">
       <Filter>Source Files\LibJPEG\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Source\LibJPEG\jcdctmgr.c">
+    <ClCompile Include="src\LibJPEG\jcdctmgr.c">
       <Filter>Source Files\LibJPEG\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Source\LibJPEG\jchuff.c">
+    <ClCompile Include="src\LibJPEG\jchuff.c">
       <Filter>Source Files\LibJPEG\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Source\LibJPEG\jcinit.c">
+    <ClCompile Include="src\LibJPEG\jcinit.c">
       <Filter>Source Files\LibJPEG\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Source\LibJPEG\jcmainct.c">
+    <ClCompile Include="src\LibJPEG\jcmainct.c">
       <Filter>Source Files\LibJPEG\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Source\LibJPEG\jcmarker.c">
+    <ClCompile Include="src\LibJPEG\jcmarker.c">
       <Filter>Source Files\LibJPEG\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Source\LibJPEG\jcmaster.c">
+    <ClCompile Include="src\LibJPEG\jcmaster.c">
       <Filter>Source Files\LibJPEG\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Source\LibJPEG\jcomapi.c">
+    <ClCompile Include="src\LibJPEG\jcomapi.c">
       <Filter>Source Files\LibJPEG\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Source\LibJPEG\jcparam.c">
+    <ClCompile Include="src\LibJPEG\jcparam.c">
       <Filter>Source Files\LibJPEG\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Source\LibJPEG\jcprepct.c">
+    <ClCompile Include="src\LibJPEG\jcprepct.c">
       <Filter>Source Files\LibJPEG\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Source\LibJPEG\jcsample.c">
+    <ClCompile Include="src\LibJPEG\jcsample.c">
       <Filter>Source Files\LibJPEG\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Source\LibJPEG\jctrans.c">
+    <ClCompile Include="src\LibJPEG\jctrans.c">
       <Filter>Source Files\LibJPEG\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Source\LibJPEG\jdapimin.c">
+    <ClCompile Include="src\LibJPEG\jdapimin.c">
       <Filter>Source Files\LibJPEG\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Source\LibJPEG\jdapistd.c">
+    <ClCompile Include="src\LibJPEG\jdapistd.c">
       <Filter>Source Files\LibJPEG\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Source\LibJPEG\jdatadst.c">
+    <ClCompile Include="src\LibJPEG\jdatadst.c">
       <Filter>Source Files\LibJPEG\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Source\LibJPEG\jdatasrc.c">
+    <ClCompile Include="src\LibJPEG\jdatasrc.c">
       <Filter>Source Files\LibJPEG\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Source\LibJPEG\jdcoefct.c">
+    <ClCompile Include="src\LibJPEG\jdcoefct.c">
       <Filter>Source Files\LibJPEG\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Source\LibJPEG\jdcolor.c">
+    <ClCompile Include="src\LibJPEG\jdcolor.c">
       <Filter>Source Files\LibJPEG\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Source\LibJPEG\jddctmgr.c">
+    <ClCompile Include="src\LibJPEG\jddctmgr.c">
       <Filter>Source Files\LibJPEG\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Source\LibJPEG\jdinput.c">
+    <ClCompile Include="src\LibJPEG\jdinput.c">
       <Filter>Source Files\LibJPEG\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Source\LibJPEG\jdmainct.c">
+    <ClCompile Include="src\LibJPEG\jdmainct.c">
       <Filter>Source Files\LibJPEG\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Source\LibJPEG\jdmarker.c">
+    <ClCompile Include="src\LibJPEG\jdmarker.c">
       <Filter>Source Files\LibJPEG\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Source\LibJPEG\jdmaster.c">
+    <ClCompile Include="src\LibJPEG\jdmaster.c">
       <Filter>Source Files\LibJPEG\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Source\LibJPEG\jdmerge.c">
+    <ClCompile Include="src\LibJPEG\jdmerge.c">
       <Filter>Source Files\LibJPEG\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Source\LibJPEG\jdpostct.c">
+    <ClCompile Include="src\LibJPEG\jdpostct.c">
       <Filter>Source Files\LibJPEG\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Source\LibJPEG\jdsample.c">
+    <ClCompile Include="src\LibJPEG\jdsample.c">
       <Filter>Source Files\LibJPEG\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Source\LibJPEG\jdtrans.c">
+    <ClCompile Include="src\LibJPEG\jdtrans.c">
       <Filter>Source Files\LibJPEG\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Source\LibJPEG\jerror.c">
+    <ClCompile Include="src\LibJPEG\jerror.c">
       <Filter>Source Files\LibJPEG\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Source\LibJPEG\jfdctflt.c">
+    <ClCompile Include="src\LibJPEG\jfdctflt.c">
       <Filter>Source Files\LibJPEG\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Source\LibJPEG\jfdctfst.c">
+    <ClCompile Include="src\LibJPEG\jfdctfst.c">
       <Filter>Source Files\LibJPEG\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Source\LibJPEG\jfdctint.c">
+    <ClCompile Include="src\LibJPEG\jfdctint.c">
       <Filter>Source Files\LibJPEG\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Source\LibJPEG\jidctflt.c">
+    <ClCompile Include="src\LibJPEG\jidctflt.c">
       <Filter>Source Files\LibJPEG\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Source\LibJPEG\jidctfst.c">
+    <ClCompile Include="src\LibJPEG\jidctfst.c">
       <Filter>Source Files\LibJPEG\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Source\LibJPEG\jidctint.c">
+    <ClCompile Include="src\LibJPEG\jidctint.c">
       <Filter>Source Files\LibJPEG\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Source\LibJPEG\jmemmgr.c">
+    <ClCompile Include="src\LibJPEG\jmemmgr.c">
       <Filter>Source Files\LibJPEG\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Source\LibJPEG\jmemnobs.c">
+    <ClCompile Include="src\LibJPEG\jmemnobs.c">
       <Filter>Source Files\LibJPEG\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Source\LibJPEG\jquant1.c">
+    <ClCompile Include="src\LibJPEG\jquant1.c">
       <Filter>Source Files\LibJPEG\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Source\LibJPEG\jquant2.c">
+    <ClCompile Include="src\LibJPEG\jquant2.c">
       <Filter>Source Files\LibJPEG\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Source\LibJPEG\jutils.c">
+    <ClCompile Include="src\LibJPEG\jutils.c">
       <Filter>Source Files\LibJPEG\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Source\LibJPEG\rdbmp.c">
+    <ClCompile Include="src\LibJPEG\rdbmp.c">
       <Filter>Source Files\LibJPEG\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Source\LibJPEG\rdcolmap.c">
+    <ClCompile Include="src\LibJPEG\rdcolmap.c">
       <Filter>Source Files\LibJPEG\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Source\LibJPEG\rdgif.c">
+    <ClCompile Include="src\LibJPEG\rdgif.c">
       <Filter>Source Files\LibJPEG\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Source\LibJPEG\rdppm.c">
+    <ClCompile Include="src\LibJPEG\rdppm.c">
       <Filter>Source Files\LibJPEG\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Source\LibJPEG\rdrle.c">
+    <ClCompile Include="src\LibJPEG\rdrle.c">
       <Filter>Source Files\LibJPEG\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Source\LibJPEG\rdswitch.c">
+    <ClCompile Include="src\LibJPEG\rdswitch.c">
       <Filter>Source Files\LibJPEG\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Source\LibJPEG\rdtarga.c">
+    <ClCompile Include="src\LibJPEG\rdtarga.c">
       <Filter>Source Files\LibJPEG\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Source\LibJPEG\transupp.c">
+    <ClCompile Include="src\LibJPEG\transupp.c">
       <Filter>Source Files\LibJPEG\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Source\LibJPEG\wrbmp.c">
+    <ClCompile Include="src\LibJPEG\wrbmp.c">
       <Filter>Source Files\LibJPEG\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Source\LibJPEG\wrgif.c">
+    <ClCompile Include="src\LibJPEG\wrgif.c">
       <Filter>Source Files\LibJPEG\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Source\LibJPEG\wrppm.c">
+    <ClCompile Include="src\LibJPEG\wrppm.c">
       <Filter>Source Files\LibJPEG\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Source\LibJPEG\wrrle.c">
+    <ClCompile Include="src\LibJPEG\wrrle.c">
       <Filter>Source Files\LibJPEG\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Source\LibJPEG\wrtarga.c">
+    <ClCompile Include="src\LibJPEG\wrtarga.c">
       <Filter>Source Files\LibJPEG\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Source\LibPNG\png.c">
+    <ClCompile Include="src\LibPNG\png.c">
       <Filter>Source Files\LibPNG\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Source\LibPNG\pngerror.c">
+    <ClCompile Include="src\LibPNG\pngerror.c">
       <Filter>Source Files\LibPNG\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Source\LibPNG\pngget.c">
+    <ClCompile Include="src\LibPNG\pngget.c">
       <Filter>Source Files\LibPNG\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Source\LibPNG\pngmem.c">
+    <ClCompile Include="src\LibPNG\pngmem.c">
       <Filter>Source Files\LibPNG\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Source\LibPNG\pngpread.c">
+    <ClCompile Include="src\LibPNG\pngpread.c">
       <Filter>Source Files\LibPNG\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Source\LibPNG\pngread.c">
+    <ClCompile Include="src\LibPNG\pngread.c">
       <Filter>Source Files\LibPNG\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Source\LibPNG\pngrio.c">
+    <ClCompile Include="src\LibPNG\pngrio.c">
       <Filter>Source Files\LibPNG\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Source\LibPNG\pngrtran.c">
+    <ClCompile Include="src\LibPNG\pngrtran.c">
       <Filter>Source Files\LibPNG\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Source\LibPNG\pngrutil.c">
+    <ClCompile Include="src\LibPNG\pngrutil.c">
       <Filter>Source Files\LibPNG\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Source\LibPNG\pngset.c">
+    <ClCompile Include="src\LibPNG\pngset.c">
       <Filter>Source Files\LibPNG\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Source\LibPNG\pngtrans.c">
+    <ClCompile Include="src\LibPNG\pngtrans.c">
       <Filter>Source Files\LibPNG\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Source\LibPNG\pngwio.c">
+    <ClCompile Include="src\LibPNG\pngwio.c">
       <Filter>Source Files\LibPNG\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Source\LibPNG\pngwrite.c">
+    <ClCompile Include="src\LibPNG\pngwrite.c">
       <Filter>Source Files\LibPNG\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Source\LibPNG\pngwtran.c">
+    <ClCompile Include="src\LibPNG\pngwtran.c">
       <Filter>Source Files\LibPNG\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Source\LibPNG\pngwutil.c">
+    <ClCompile Include="src\LibPNG\pngwutil.c">
       <Filter>Source Files\LibPNG\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Source\FreeImageToolkit\BSplineRotate.cpp">
+    <ClCompile Include="src\FreeImageToolkit\BSplineRotate.cpp">
       <Filter>Toolkit Files</Filter>
     </ClCompile>
-    <ClCompile Include="Source\FreeImageToolkit\Channels.cpp">
+    <ClCompile Include="src\FreeImageToolkit\Channels.cpp">
       <Filter>Toolkit Files</Filter>
     </ClCompile>
-    <ClCompile Include="Source\FreeImageToolkit\ClassicRotate.cpp">
+    <ClCompile Include="src\FreeImageToolkit\ClassicRotate.cpp">
       <Filter>Toolkit Files</Filter>
     </ClCompile>
-    <ClCompile Include="Source\FreeImageToolkit\Colors.cpp">
+    <ClCompile Include="src\FreeImageToolkit\Colors.cpp">
       <Filter>Toolkit Files</Filter>
     </ClCompile>
-    <ClCompile Include="Source\FreeImageToolkit\CopyPaste.cpp">
+    <ClCompile Include="src\FreeImageToolkit\CopyPaste.cpp">
       <Filter>Toolkit Files</Filter>
     </ClCompile>
-    <ClCompile Include="Source\FreeImageToolkit\Display.cpp">
+    <ClCompile Include="src\FreeImageToolkit\Display.cpp">
       <Filter>Toolkit Files</Filter>
     </ClCompile>
-    <ClCompile Include="Source\FreeImageToolkit\Flip.cpp">
+    <ClCompile Include="src\FreeImageToolkit\Flip.cpp">
       <Filter>Toolkit Files</Filter>
     </ClCompile>
-    <ClCompile Include="Source\FreeImageToolkit\JPEGTransform.cpp">
+    <ClCompile Include="src\FreeImageToolkit\JPEGTransform.cpp">
       <Filter>Toolkit Files</Filter>
     </ClCompile>
-    <ClCompile Include="Source\FreeImageToolkit\Rescale.cpp">
+    <ClCompile Include="src\FreeImageToolkit\Rescale.cpp">
       <Filter>Toolkit Files</Filter>
     </ClCompile>
-    <ClCompile Include="Source\FreeImageToolkit\Resize.cpp">
+    <ClCompile Include="src\FreeImageToolkit\Resize.cpp">
       <Filter>Toolkit Files</Filter>
     </ClCompile>
-    <ClCompile Include="Source\LibJPEG\jaricom.c">
+    <ClCompile Include="src\LibJPEG\jaricom.c">
       <Filter>Source Files\LibJPEG\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Source\LibJPEG\jcarith.c">
+    <ClCompile Include="src\LibJPEG\jcarith.c">
       <Filter>Source Files\LibJPEG\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Source\LibJPEG\jdarith.c">
+    <ClCompile Include="src\LibJPEG\jdarith.c">
       <Filter>Source Files\LibJPEG\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Source\LibJPEG\jdhuff.c">
+    <ClCompile Include="src\LibJPEG\jdhuff.c">
       <Filter>Source Files\LibJPEG\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Source\FreeImage\ConversionFloat.cpp">
+    <ClCompile Include="src\FreeImage\ConversionFloat.cpp">
       <Filter>Source Files\Conversion</Filter>
     </ClCompile>
-    <ClCompile Include="Source\FreeImage\ConversionRGB16.cpp">
+    <ClCompile Include="src\FreeImage\ConversionRGB16.cpp">
       <Filter>Source Files\Conversion</Filter>
     </ClCompile>
-    <ClCompile Include="Source\FreeImage\ConversionUINT16.cpp">
+    <ClCompile Include="src\FreeImage\ConversionUINT16.cpp">
       <Filter>Source Files\Conversion</Filter>
     </ClCompile>
   </ItemGroup>
@@ -442,93 +442,96 @@
     <ResourceCompile Include="FreeImage.rc">
       <Filter>Source Files</Filter>
     </ResourceCompile>
+    <ResourceCompile Include="Version.rc">
+      <Filter>Source Files</Filter>
+    </ResourceCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="Source\LibJPEG\cderror.h">
+    <ClInclude Include="src\LibJPEG\cderror.h">
       <Filter>Source Files\LibJPEG\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\LibJPEG\cdjpeg.h">
+    <ClInclude Include="src\LibJPEG\cdjpeg.h">
       <Filter>Source Files\LibJPEG\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\LibJPEG\jconfig.h">
+    <ClInclude Include="src\LibJPEG\jconfig.h">
       <Filter>Source Files\LibJPEG\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\LibJPEG\jdct.h">
+    <ClInclude Include="src\LibJPEG\jdct.h">
       <Filter>Source Files\LibJPEG\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\LibJPEG\jerror.h">
+    <ClInclude Include="src\LibJPEG\jerror.h">
       <Filter>Source Files\LibJPEG\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\LibJPEG\jinclude.h">
+    <ClInclude Include="src\LibJPEG\jinclude.h">
       <Filter>Source Files\LibJPEG\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\LibJPEG\jmemsys.h">
+    <ClInclude Include="src\LibJPEG\jmemsys.h">
       <Filter>Source Files\LibJPEG\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\LibJPEG\jmorecfg.h">
+    <ClInclude Include="src\LibJPEG\jmorecfg.h">
       <Filter>Source Files\LibJPEG\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\LibJPEG\jpegint.h">
+    <ClInclude Include="src\LibJPEG\jpegint.h">
       <Filter>Source Files\LibJPEG\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\LibJPEG\jpeglib.h">
+    <ClInclude Include="src\LibJPEG\jpeglib.h">
       <Filter>Source Files\LibJPEG\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\LibJPEG\jversion.h">
+    <ClInclude Include="src\LibJPEG\jversion.h">
       <Filter>Source Files\LibJPEG\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\LibJPEG\transupp.h">
+    <ClInclude Include="src\LibJPEG\transupp.h">
       <Filter>Source Files\LibJPEG\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\LibPNG\png.h">
+    <ClInclude Include="src\LibPNG\png.h">
       <Filter>Source Files\LibPNG\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\LibPNG\pngconf.h">
+    <ClInclude Include="src\LibPNG\pngconf.h">
       <Filter>Source Files\LibPNG\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\CacheFile.h">
+    <ClInclude Include="src\CacheFile.h">
       <Filter>Source Files\LibJPEG\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\Metadata\FIRational.h">
+    <ClInclude Include="src\Metadata\FIRational.h">
       <Filter>Source Files\LibJPEG\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="SOURCE\FreeImage.h">
+    <ClInclude Include="src\FreeImage.h">
       <Filter>Source Files\LibJPEG\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\FreeImageIO.h">
+    <ClInclude Include="src\FreeImageIO.h">
       <Filter>Source Files\LibJPEG\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\Metadata\FreeImageTag.h">
+    <ClInclude Include="src\Metadata\FreeImageTag.h">
       <Filter>Source Files\LibJPEG\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\Plugin.h">
+    <ClInclude Include="src\Plugin.h">
       <Filter>Source Files\LibJPEG\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\Quantizers.h">
+    <ClInclude Include="src\Quantizers.h">
       <Filter>Source Files\LibJPEG\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\ToneMapping.h">
+    <ClInclude Include="src\ToneMapping.h">
       <Filter>Source Files\LibJPEG\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\Utilities.h">
+    <ClInclude Include="src\Utilities.h">
       <Filter>Source Files\LibJPEG\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\FreeImageToolkit\Resize.h">
+    <ClInclude Include="src\FreeImageToolkit\Resize.h">
       <Filter>Toolkit Files</Filter>
     </ClInclude>
-    <ClInclude Include="Miranda\version.h">
+    <ClInclude Include="src\version.h">
       <Filter>Source Files\LibJPEG\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\LibPNG\pngpriv.h">
+    <ClInclude Include="src\LibPNG\pngpriv.h">
       <Filter>Source Files\LibPNG\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\LibPNG\pnglibconf.h">
+    <ClInclude Include="src\LibPNG\pnglibconf.h">
       <Filter>Source Files\LibPNG\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\LibPNG\pnginfo.h">
+    <ClInclude Include="src\LibPNG\pnginfo.h">
       <Filter>Source Files\LibPNG\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\LibPNG\pngdebug.h">
+    <ClInclude Include="src\LibPNG\pngdebug.h">
       <Filter>Source Files\LibPNG\Header Files</Filter>
     </ClInclude>
   </ItemGroup>
diff --git a/plugins/FreeImage/Source/FreeImageLib/FreeImageLib.dsp b/plugins/FreeImage/Source/FreeImageLib/FreeImageLib.dsp
deleted file mode 100644
index 4f65350c38..0000000000
--- a/plugins/FreeImage/Source/FreeImageLib/FreeImageLib.dsp
+++ /dev/null
@@ -1,448 +0,0 @@
-# Microsoft Developer Studio Project File - Name="FreeImageLib" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=FreeImageLib - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "FreeImageLib.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "FreeImageLib.mak" CFG="FreeImageLib - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "FreeImageLib - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "FreeImageLib - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "FreeImageLib - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\\" /I "..\ZLib" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "FREEIMAGE_LIB" /YX /FD /c
-# ADD BASE RSC /l 0x413 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"Release\FreeImage.lib"
-# Begin Special Build Tool
-SOURCE="$(InputPath)"
-PostBuild_Cmds=copy Release\FreeImage.lib ..\..\Dist	copy ..\FreeImage.h ..\..\Dist
-# End Special Build Tool
-
-!ELSEIF  "$(CFG)" == "FreeImageLib - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\\" /I "..\ZLib" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "FREEIMAGE_LIB" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x413 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"Debug\FreeImaged.lib"
-# Begin Special Build Tool
-SOURCE="$(InputPath)"
-PostBuild_Cmds=copy Debug\FreeImaged.lib ..\..\Dist	copy ..\FreeImage.h ..\..\Dist
-# End Special Build Tool
-
-!ENDIF 
-
-# Begin Target
-
-# Name "FreeImageLib - Win32 Release"
-# Name "FreeImageLib - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Group "Quantizers"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\FreeImage\NNQuantizer.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\FreeImage\WuQuantizer.cpp
-# End Source File
-# End Group
-# Begin Group "Conversion"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\FreeImage\Conversion.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\FreeImage\Conversion16_555.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\FreeImage\Conversion16_565.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\FreeImage\Conversion24.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\FreeImage\Conversion32.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\FreeImage\Conversion4.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\FreeImage\Conversion8.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\FreeImage\ConversionRGBF.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\FreeImage\ConversionType.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\FreeImage\Halftoning.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\FreeImage\tmoColorConvert.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\FreeImage\tmoDrago03.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\FreeImage\tmoReinhard05.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\FreeImage\ToneMapping.cpp
-# End Source File
-# End Group
-# Begin Group "Plugins"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\FreeImage\Plugin.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\FreeImage\PluginBMP.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\FreeImage\PluginCUT.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\FreeImage\PluginDDS.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\FreeImage\PluginG3.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\FreeImage\PluginGIF.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\FreeImage\PluginHDR.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\FreeImage\PluginICO.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\FreeImage\PluginIFF.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\FreeImage\PluginJPEG.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\FreeImage\PluginKOALA.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\FreeImage\PluginMNG.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\FreeImage\PluginPCD.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\FreeImage\PluginPCX.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\FreeImage\PluginPNG.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\FreeImage\PluginPNM.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\FreeImage\PluginPSD.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\FreeImage\PluginRAS.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\FreeImage\PluginSGI.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\FreeImage\PluginTARGA.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\FreeImage\PluginTIFF.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\FreeImage\PluginWBMP.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\FreeImage\PluginXBM.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\FreeImage\PluginXPM.cpp
-# End Source File
-# End Group
-# Begin Group "DeprecationMgr"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\DeprecationManager\DeprecationMgr.cpp
-# End Source File
-# End Group
-# Begin Group "MultiPaging"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\FreeImage\CacheFile.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\FreeImage\MultiPage.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\FreeImage\ZLibInterface.cpp
-# End Source File
-# End Group
-# Begin Group "Metadata"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\Metadata\Exif.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\Metadata\FIRational.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\Metadata\FreeImageTag.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\Metadata\IPTC.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\Metadata\TagConversion.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\Metadata\TagLib.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\Metadata\XTIFF.cpp
-# End Source File
-# End Group
-# Begin Source File
-
-SOURCE=..\FreeImage\BitmapAccess.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\FreeImage\ColorLookup.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\FreeImage\FreeImage.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\FreeImage\FreeImageIO.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\FreeImage\GetType.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\FreeImage\MemoryIO.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\FreeImage\PixelAccess.cpp
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=..\CacheFile.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\DeprecationManager\DeprecationMgr.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\Metadata\FIRational.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\FreeImage.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\FreeImageIO.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\Metadata\FreeImageTag.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\Plugin.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\Quantizers.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\ToneMapping.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\Utilities.h
-# End Source File
-# End Group
-# Begin Group "Toolkit Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\FreeImageToolkit\BSplineRotate.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\FreeImageToolkit\Channels.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\FreeImageToolkit\ClassicRotate.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\FreeImageToolkit\Colors.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\FreeImageToolkit\CopyPaste.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\FreeImageToolkit\Display.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\FreeImageToolkit\Flip.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\FreeImageToolkit\JPEGTransform.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\FreeImageToolkit\Rescale.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\FreeImageToolkit\Resize.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\FreeImageToolkit\Resize.h
-# End Source File
-# End Group
-# Begin Source File
-
-SOURCE=..\..\Whatsnew.txt
-# End Source File
-# End Target
-# End Project
diff --git a/plugins/FreeImage/Source/FreeImageLib/FreeImageLib.vcproj b/plugins/FreeImage/Source/FreeImageLib/FreeImageLib.vcproj
deleted file mode 100644
index bac460eb48..0000000000
--- a/plugins/FreeImage/Source/FreeImageLib/FreeImageLib.vcproj
+++ /dev/null
@@ -1,411 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7.10"
-	Name="FreeImageLib"
-	SccProjectName=""
-	SccLocalPath="">
-	<Platforms>
-		<Platform
-			Name="Win32"/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\Debug"
-			IntermediateDirectory=".\Debug"
-			ConfigurationType="4"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\;..\ZLib;..\DeprecationManager"
-				PreprocessorDefinitions="WIN32;_DEBUG;FREEIMAGE_LIB;_SECURE_NO_DEPRECATE"
-				StringPooling="TRUE"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderFile=".\Debug/FreeImageLib.pch"
-				AssemblerListingLocation=".\Debug/"
-				ObjectFile=".\Debug/"
-				ProgramDataBaseFileName=".\Debug/"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				DebugInformationFormat="4"
-				CompileAs="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="Debug\FreeImaged.lib"
-				SuppressStartupBanner="TRUE"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="copy Debug\FreeImaged.lib ..\..\Dist
-copy ..\FreeImage.h ..\..\Dist
-"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1043"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\Release"
-			IntermediateDirectory=".\Release"
-			ConfigurationType="4"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				GlobalOptimizations="TRUE"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="TRUE"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="TRUE"
-				OptimizeForProcessor="3"
-				AdditionalIncludeDirectories="..\;..\ZLib;..\DeprecationManager"
-				PreprocessorDefinitions="WIN32;NDEBUG;FREEIMAGE_LIB;_SECURE_NO_DEPRECATE"
-				StringPooling="TRUE"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="FALSE"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderFile=".\Release/FreeImageLib.pch"
-				AssemblerListingLocation=".\Release/"
-				ObjectFile=".\Release/"
-				ProgramDataBaseFileName=".\Release/"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				CompileAs="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="Release\FreeImage.lib"
-				SuppressStartupBanner="TRUE"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="copy Release\FreeImage.lib ..\..\Dist
-copy ..\FreeImage.h ..\..\Dist
-"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
-			<File
-				RelativePath="..\FreeImage\BitmapAccess.cpp">
-			</File>
-			<File
-				RelativePath="..\FreeImage\ColorLookup.cpp">
-			</File>
-			<File
-				RelativePath="..\FreeImage\FreeImage.cpp">
-			</File>
-			<File
-				RelativePath="..\FreeImage\FreeImageIO.cpp">
-			</File>
-			<File
-				RelativePath="..\FreeImage\GetType.cpp">
-			</File>
-			<File
-				RelativePath="..\FreeImage\MemoryIO.cpp">
-			</File>
-			<File
-				RelativePath="..\FreeImage\PixelAccess.cpp">
-			</File>
-			<Filter
-				Name="Quantizers"
-				Filter="">
-				<File
-					RelativePath="..\FreeImage\NNQuantizer.cpp">
-				</File>
-				<File
-					RelativePath="..\FreeImage\WuQuantizer.cpp">
-				</File>
-			</Filter>
-			<Filter
-				Name="Conversion"
-				Filter="">
-				<File
-					RelativePath="..\FreeImage\Conversion.cpp">
-				</File>
-				<File
-					RelativePath="..\FreeImage\Conversion16_555.cpp">
-				</File>
-				<File
-					RelativePath="..\FreeImage\Conversion16_565.cpp">
-				</File>
-				<File
-					RelativePath="..\FreeImage\Conversion24.cpp">
-				</File>
-				<File
-					RelativePath="..\FreeImage\Conversion32.cpp">
-				</File>
-				<File
-					RelativePath="..\FreeImage\Conversion4.cpp">
-				</File>
-				<File
-					RelativePath="..\FreeImage\Conversion8.cpp">
-				</File>
-				<File
-					RelativePath="..\FreeImage\ConversionRGBF.cpp">
-				</File>
-				<File
-					RelativePath="..\FreeImage\ConversionType.cpp">
-				</File>
-				<File
-					RelativePath="..\FreeImage\Halftoning.cpp">
-				</File>
-				<File
-					RelativePath="..\FreeImage\tmoColorConvert.cpp">
-				</File>
-				<File
-					RelativePath="..\FreeImage\tmoDrago03.cpp">
-				</File>
-				<File
-					RelativePath="..\FreeImage\tmoReinhard05.cpp">
-				</File>
-				<File
-					RelativePath="..\FreeImage\ToneMapping.cpp">
-				</File>
-			</Filter>
-			<Filter
-				Name="Plugins"
-				Filter="">
-				<File
-					RelativePath="..\FreeImage\Plugin.cpp">
-				</File>
-				<File
-					RelativePath="..\FreeImage\PluginBMP.cpp">
-				</File>
-				<File
-					RelativePath="..\FreeImage\PluginCUT.cpp">
-				</File>
-				<File
-					RelativePath="..\FreeImage\PluginDDS.cpp">
-				</File>
-				<File
-					RelativePath="..\FreeImage\PluginG3.cpp">
-				</File>
-				<File
-					RelativePath="..\FreeImage\PluginGIF.cpp">
-				</File>
-				<File
-					RelativePath="..\FreeImage\PluginHDR.cpp">
-				</File>
-				<File
-					RelativePath="..\FreeImage\PluginICO.cpp">
-				</File>
-				<File
-					RelativePath="..\FreeImage\PluginIFF.cpp">
-				</File>
-				<File
-					RelativePath="..\FreeImage\PluginJPEG.cpp">
-				</File>
-				<File
-					RelativePath="..\FreeImage\PluginKOALA.cpp">
-				</File>
-				<File
-					RelativePath="..\FreeImage\PluginMNG.cpp">
-				</File>
-				<File
-					RelativePath="..\FreeImage\PluginPCD.cpp">
-				</File>
-				<File
-					RelativePath="..\FreeImage\PluginPCX.cpp">
-				</File>
-				<File
-					RelativePath="..\FreeImage\PluginPNG.cpp">
-				</File>
-				<File
-					RelativePath="..\FreeImage\PluginPNM.cpp">
-				</File>
-				<File
-					RelativePath="..\FreeImage\PluginPSD.cpp">
-				</File>
-				<File
-					RelativePath="..\FreeImage\PluginRAS.cpp">
-				</File>
-				<File
-					RelativePath="..\FreeImage\PluginSGI.cpp">
-				</File>
-				<File
-					RelativePath="..\FreeImage\PluginTARGA.cpp">
-				</File>
-				<File
-					RelativePath="..\FreeImage\PluginTIFF.cpp">
-				</File>
-				<File
-					RelativePath="..\FreeImage\PluginWBMP.cpp">
-				</File>
-				<File
-					RelativePath="..\FreeImage\PluginXBM.cpp">
-				</File>
-				<File
-					RelativePath="..\FreeImage\PluginXPM.cpp">
-				</File>
-			</Filter>
-			<Filter
-				Name="DeprecationMgr"
-				Filter="">
-				<File
-					RelativePath="..\DeprecationManager\DeprecationMgr.cpp">
-				</File>
-			</Filter>
-			<Filter
-				Name="MultiPaging"
-				Filter="">
-				<File
-					RelativePath="..\FreeImage\CacheFile.cpp">
-				</File>
-				<File
-					RelativePath="..\FreeImage\MultiPage.cpp">
-				</File>
-				<File
-					RelativePath="..\FreeImage\ZLibInterface.cpp">
-				</File>
-			</Filter>
-			<Filter
-				Name="Metadata"
-				Filter="">
-				<File
-					RelativePath="..\Metadata\Exif.cpp">
-				</File>
-				<File
-					RelativePath="..\Metadata\FIRational.cpp">
-				</File>
-				<File
-					RelativePath="..\Metadata\FreeImageTag.cpp">
-				</File>
-				<File
-					RelativePath="..\Metadata\IPTC.cpp">
-				</File>
-				<File
-					RelativePath="..\Metadata\TagConversion.cpp">
-				</File>
-				<File
-					RelativePath="..\Metadata\TagLib.cpp">
-				</File>
-				<File
-					RelativePath="..\Metadata\XTIFF.cpp">
-				</File>
-			</Filter>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl">
-			<File
-				RelativePath="..\CacheFile.h">
-			</File>
-			<File
-				RelativePath="..\DeprecationManager\DeprecationMgr.h">
-			</File>
-			<File
-				RelativePath="..\Metadata\FIRational.h">
-			</File>
-			<File
-				RelativePath="..\FreeImage.h">
-			</File>
-			<File
-				RelativePath="..\FreeImageIO.h">
-			</File>
-			<File
-				RelativePath="..\Metadata\FreeImageTag.h">
-			</File>
-			<File
-				RelativePath="..\Plugin.h">
-			</File>
-			<File
-				RelativePath="..\Quantizers.h">
-			</File>
-			<File
-				RelativePath="..\ToneMapping.h">
-			</File>
-			<File
-				RelativePath="..\Utilities.h">
-			</File>
-		</Filter>
-		<Filter
-			Name="Toolkit Files"
-			Filter="">
-			<File
-				RelativePath="..\FreeImageToolkit\BSplineRotate.cpp">
-			</File>
-			<File
-				RelativePath="..\FreeImageToolkit\Channels.cpp">
-			</File>
-			<File
-				RelativePath="..\FreeImageToolkit\ClassicRotate.cpp">
-			</File>
-			<File
-				RelativePath="..\FreeImageToolkit\Colors.cpp">
-			</File>
-			<File
-				RelativePath="..\FreeImageToolkit\CopyPaste.cpp">
-			</File>
-			<File
-				RelativePath="..\FreeImageToolkit\Display.cpp">
-			</File>
-			<File
-				RelativePath="..\FreeImageToolkit\Flip.cpp">
-			</File>
-			<File
-				RelativePath="..\FreeImageToolkit\JPEGTransform.cpp">
-			</File>
-			<File
-				RelativePath="..\FreeImageToolkit\Rescale.cpp">
-			</File>
-			<File
-				RelativePath="..\FreeImageToolkit\Resize.cpp">
-			</File>
-			<File
-				RelativePath="..\FreeImageToolkit\Resize.h">
-			</File>
-		</Filter>
-		<File
-			RelativePath="..\..\Whatsnew.txt">
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/plugins/FreeImage/Source/FreeImageLib/FreeImageLib.vpj b/plugins/FreeImage/Source/FreeImageLib/FreeImageLib.vpj
deleted file mode 100644
index 378f3f2311..0000000000
--- a/plugins/FreeImage/Source/FreeImageLib/FreeImageLib.vpj
+++ /dev/null
@@ -1,116 +0,0 @@
-<!DOCTYPE Project SYSTEM "http://www.slickedit.com/dtd/vse/10.0/vpj.dtd">
-<Project
-	Version="10.0"
-	VendorName="SlickEdit"
-	WorkingDir="."
-	AssociatedFile="FreeImageLib.dsp"
-	AssociatedFileType="microsoft visual c++">
-	<Config
-		Name="CFG=FreeImageLib - Win32 Release"
-		OutputFile=""
-		CompilerConfigName="Visual Studio 2005">
-		<Includes>
-			<Include Dir="%(INCLUDE)"/>
-		</Includes>
-		<Menu>
-			<Target
-				Name="Compile"
-				MenuCaption="&amp;Compile"
-				CaptureOutputWith="ProcessBuffer"
-				SaveOption="SaveCurrent"
-				RunFromDir="%rw">
-				<Exec CmdLine='nmake /F "%rn.mak" "%b" "%bd%n.obj"'/>
-			</Target>
-			<Target
-				Name="Build"
-				MenuCaption="&amp;Build"
-				CaptureOutputWith="ProcessBuffer"
-				SaveOption="SaveWorkspaceFiles"
-				RunFromDir="%rw">
-				<Exec CmdLine='msdev "%rn.dsp" /make "%bn"'/>
-			</Target>
-			<Target
-				Name="Rebuild"
-				MenuCaption="&amp;Rebuild"
-				CaptureOutputWith="ProcessBuffer"
-				SaveOption="SaveWorkspaceFiles"
-				RunFromDir="%rw">
-				<Exec CmdLine='msdev "%rn.dsp" /make "%bn" /rebuild'/>
-			</Target>
-			<Target
-				Name="Debug"
-				MenuCaption="&amp;Debug"
-				RunFromDir="%rw">
-				<Exec CmdLine='msdev "%bdFreeImageLib.exe"'/>
-			</Target>
-			<Target
-				Name="Execute"
-				MenuCaption="E&amp;xecute"
-				RunFromDir="%rw">
-				<Exec CmdLine='"%bdFreeImageLib.exe"'/>
-			</Target>
-			<Target
-				Name="Resource Editor"
-				MenuCaption="Resource Editor"
-				ShowOnMenu="HideIfNoCmdLine"
-				SaveOption="SaveWorkspaceFiles"
-				RunFromDir="%rw">
-				<Exec CmdLine="msdev"/>
-			</Target>
-		</Menu>
-	</Config>
-	<Config
-		Name="CFG=FreeImageLib - Win32 Debug"
-		OutputFile=""
-		CompilerConfigName="Visual Studio 2005">
-		<Includes>
-			<Include Dir="%(INCLUDE)"/>
-		</Includes>
-		<Menu>
-			<Target
-				Name="Compile"
-				MenuCaption="&amp;Compile"
-				CaptureOutputWith="ProcessBuffer"
-				SaveOption="SaveCurrent"
-				RunFromDir="%rw">
-				<Exec CmdLine='nmake /F "%rn.mak" "%b" "%bd%n.obj"'/>
-			</Target>
-			<Target
-				Name="Build"
-				MenuCaption="&amp;Build"
-				CaptureOutputWith="ProcessBuffer"
-				SaveOption="SaveWorkspaceFiles"
-				RunFromDir="%rw">
-				<Exec CmdLine='msdev "%rn.dsp" /make "%bn"'/>
-			</Target>
-			<Target
-				Name="Rebuild"
-				MenuCaption="&amp;Rebuild"
-				CaptureOutputWith="ProcessBuffer"
-				SaveOption="SaveWorkspaceFiles"
-				RunFromDir="%rw">
-				<Exec CmdLine='msdev "%rn.dsp" /make "%bn" /rebuild'/>
-			</Target>
-			<Target
-				Name="Debug"
-				MenuCaption="&amp;Debug"
-				RunFromDir="%rw">
-				<Exec CmdLine='msdev "%bdFreeImageLib.exe"'/>
-			</Target>
-			<Target
-				Name="Execute"
-				MenuCaption="E&amp;xecute"
-				RunFromDir="%rw">
-				<Exec CmdLine='"%bdFreeImageLib.exe"'/>
-			</Target>
-			<Target
-				Name="Resource Editor"
-				MenuCaption="Resource Editor"
-				ShowOnMenu="HideIfNoCmdLine"
-				SaveOption="SaveWorkspaceFiles"
-				RunFromDir="%rw">
-				<Exec CmdLine="msdev"/>
-			</Target>
-		</Menu>
-	</Config>
-</Project>
diff --git a/plugins/FreeImage/FreeImage.rc b/plugins/FreeImage/res/FreeImage.rc
index 9a5010d54c..28b78c7627 100644
--- a/plugins/FreeImage/FreeImage.rc
+++ b/plugins/FreeImage/res/FreeImage.rc
@@ -22,16 +22,6 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 
 /////////////////////////////////////////////////////////////////////////////
 //
-// Dialog
-//
-
-#ifndef APSTUDIO_INVOKED
-  #include "version.rc"
-#endif
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
 // DESIGNINFO
 //
 
@@ -81,7 +71,7 @@ LANGUAGE LANG_GERMAN, SUBLANG_GERMAN
 
 1 TEXTINCLUDE 
 BEGIN
-    "resource.h\0"
+    "\r\n"
 END
 
 2 TEXTINCLUDE 
diff --git a/plugins/FreeImage/res/Version.rc b/plugins/FreeImage/res/Version.rc
new file mode 100644
index 0000000000..d741488c4f
--- /dev/null
+++ b/plugins/FreeImage/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/FreeImage/Source/CacheFile.h b/plugins/FreeImage/src/CacheFile.h
index a1e5e782c9..a1e5e782c9 100644
--- a/plugins/FreeImage/Source/CacheFile.h
+++ b/plugins/FreeImage/src/CacheFile.h
diff --git a/plugins/FreeImage/Source/DeprecationManager/Deprecated.cpp b/plugins/FreeImage/src/DeprecationManager/Deprecated.cpp
index 8ca5e71c5c..8ca5e71c5c 100644
--- a/plugins/FreeImage/Source/DeprecationManager/Deprecated.cpp
+++ b/plugins/FreeImage/src/DeprecationManager/Deprecated.cpp
diff --git a/plugins/FreeImage/Source/DeprecationManager/DeprecationMgr.cpp b/plugins/FreeImage/src/DeprecationManager/DeprecationMgr.cpp
index bf82dfa33b..bf82dfa33b 100644
--- a/plugins/FreeImage/Source/DeprecationManager/DeprecationMgr.cpp
+++ b/plugins/FreeImage/src/DeprecationManager/DeprecationMgr.cpp
diff --git a/plugins/FreeImage/Source/DeprecationManager/DeprecationMgr.h b/plugins/FreeImage/src/DeprecationManager/DeprecationMgr.h
index 9141f23a05..9141f23a05 100644
--- a/plugins/FreeImage/Source/DeprecationManager/DeprecationMgr.h
+++ b/plugins/FreeImage/src/DeprecationManager/DeprecationMgr.h
diff --git a/plugins/FreeImage/Source/FreeImage.h b/plugins/FreeImage/src/FreeImage.h
index a7090adf59..a7090adf59 100644
--- a/plugins/FreeImage/Source/FreeImage.h
+++ b/plugins/FreeImage/src/FreeImage.h
diff --git a/plugins/FreeImage/Source/FreeImage/BitmapAccess.cpp b/plugins/FreeImage/src/FreeImage/BitmapAccess.cpp
index 584870f359..584870f359 100644
--- a/plugins/FreeImage/Source/FreeImage/BitmapAccess.cpp
+++ b/plugins/FreeImage/src/FreeImage/BitmapAccess.cpp
diff --git a/plugins/FreeImage/Source/FreeImage/CacheFile.cpp b/plugins/FreeImage/src/FreeImage/CacheFile.cpp
index 309faf8faf..309faf8faf 100644
--- a/plugins/FreeImage/Source/FreeImage/CacheFile.cpp
+++ b/plugins/FreeImage/src/FreeImage/CacheFile.cpp
diff --git a/plugins/FreeImage/Source/FreeImage/ColorLookup.cpp b/plugins/FreeImage/src/FreeImage/ColorLookup.cpp
index 3e81abdb95..3e81abdb95 100644
--- a/plugins/FreeImage/Source/FreeImage/ColorLookup.cpp
+++ b/plugins/FreeImage/src/FreeImage/ColorLookup.cpp
diff --git a/plugins/FreeImage/Source/FreeImage/Conversion.cpp b/plugins/FreeImage/src/FreeImage/Conversion.cpp
index 3c14bab9dd..3c14bab9dd 100644
--- a/plugins/FreeImage/Source/FreeImage/Conversion.cpp
+++ b/plugins/FreeImage/src/FreeImage/Conversion.cpp
diff --git a/plugins/FreeImage/Source/FreeImage/Conversion16_555.cpp b/plugins/FreeImage/src/FreeImage/Conversion16_555.cpp
index c0c4785704..c0c4785704 100644
--- a/plugins/FreeImage/Source/FreeImage/Conversion16_555.cpp
+++ b/plugins/FreeImage/src/FreeImage/Conversion16_555.cpp
diff --git a/plugins/FreeImage/Source/FreeImage/Conversion16_565.cpp b/plugins/FreeImage/src/FreeImage/Conversion16_565.cpp
index 28e8255b4e..28e8255b4e 100644
--- a/plugins/FreeImage/Source/FreeImage/Conversion16_565.cpp
+++ b/plugins/FreeImage/src/FreeImage/Conversion16_565.cpp
diff --git a/plugins/FreeImage/Source/FreeImage/Conversion24.cpp b/plugins/FreeImage/src/FreeImage/Conversion24.cpp
index f04b946ef0..f04b946ef0 100644
--- a/plugins/FreeImage/Source/FreeImage/Conversion24.cpp
+++ b/plugins/FreeImage/src/FreeImage/Conversion24.cpp
diff --git a/plugins/FreeImage/Source/FreeImage/Conversion32.cpp b/plugins/FreeImage/src/FreeImage/Conversion32.cpp
index fad74671cd..fad74671cd 100644
--- a/plugins/FreeImage/Source/FreeImage/Conversion32.cpp
+++ b/plugins/FreeImage/src/FreeImage/Conversion32.cpp
diff --git a/plugins/FreeImage/Source/FreeImage/Conversion4.cpp b/plugins/FreeImage/src/FreeImage/Conversion4.cpp
index 7c09ac824a..7c09ac824a 100644
--- a/plugins/FreeImage/Source/FreeImage/Conversion4.cpp
+++ b/plugins/FreeImage/src/FreeImage/Conversion4.cpp
diff --git a/plugins/FreeImage/Source/FreeImage/Conversion8.cpp b/plugins/FreeImage/src/FreeImage/Conversion8.cpp
index 867cf756ed..867cf756ed 100644
--- a/plugins/FreeImage/Source/FreeImage/Conversion8.cpp
+++ b/plugins/FreeImage/src/FreeImage/Conversion8.cpp
diff --git a/plugins/FreeImage/Source/FreeImage/ConversionFloat.cpp b/plugins/FreeImage/src/FreeImage/ConversionFloat.cpp
index 181ff396e1..181ff396e1 100644
--- a/plugins/FreeImage/Source/FreeImage/ConversionFloat.cpp
+++ b/plugins/FreeImage/src/FreeImage/ConversionFloat.cpp
diff --git a/plugins/FreeImage/Source/FreeImage/ConversionRGB16.cpp b/plugins/FreeImage/src/FreeImage/ConversionRGB16.cpp
index 6b9d17fbed..6b9d17fbed 100644
--- a/plugins/FreeImage/Source/FreeImage/ConversionRGB16.cpp
+++ b/plugins/FreeImage/src/FreeImage/ConversionRGB16.cpp
diff --git a/plugins/FreeImage/Source/FreeImage/ConversionRGBF.cpp b/plugins/FreeImage/src/FreeImage/ConversionRGBF.cpp
index 6b8739532f..6b8739532f 100644
--- a/plugins/FreeImage/Source/FreeImage/ConversionRGBF.cpp
+++ b/plugins/FreeImage/src/FreeImage/ConversionRGBF.cpp
diff --git a/plugins/FreeImage/Source/FreeImage/ConversionType.cpp b/plugins/FreeImage/src/FreeImage/ConversionType.cpp
index 23528b60fe..23528b60fe 100644
--- a/plugins/FreeImage/Source/FreeImage/ConversionType.cpp
+++ b/plugins/FreeImage/src/FreeImage/ConversionType.cpp
diff --git a/plugins/FreeImage/Source/FreeImage/ConversionUINT16.cpp b/plugins/FreeImage/src/FreeImage/ConversionUINT16.cpp
index 3744cfe3b4..3744cfe3b4 100644
--- a/plugins/FreeImage/Source/FreeImage/ConversionUINT16.cpp
+++ b/plugins/FreeImage/src/FreeImage/ConversionUINT16.cpp
diff --git a/plugins/FreeImage/Source/FreeImage/FreeImage.cpp b/plugins/FreeImage/src/FreeImage/FreeImage.cpp
index b36f10aca1..b36f10aca1 100644
--- a/plugins/FreeImage/Source/FreeImage/FreeImage.cpp
+++ b/plugins/FreeImage/src/FreeImage/FreeImage.cpp
diff --git a/plugins/FreeImage/Source/FreeImage/FreeImageC.c b/plugins/FreeImage/src/FreeImage/FreeImageC.c
index 9e8125955f..9e8125955f 100644
--- a/plugins/FreeImage/Source/FreeImage/FreeImageC.c
+++ b/plugins/FreeImage/src/FreeImage/FreeImageC.c
diff --git a/plugins/FreeImage/Source/FreeImage/FreeImageIO.cpp b/plugins/FreeImage/src/FreeImage/FreeImageIO.cpp
index b289530be7..b289530be7 100644
--- a/plugins/FreeImage/Source/FreeImage/FreeImageIO.cpp
+++ b/plugins/FreeImage/src/FreeImage/FreeImageIO.cpp
diff --git a/plugins/FreeImage/Source/FreeImage/GetType.cpp b/plugins/FreeImage/src/FreeImage/GetType.cpp
index 76edc7f3f9..76edc7f3f9 100644
--- a/plugins/FreeImage/Source/FreeImage/GetType.cpp
+++ b/plugins/FreeImage/src/FreeImage/GetType.cpp
diff --git a/plugins/FreeImage/Source/FreeImage/Halftoning.cpp b/plugins/FreeImage/src/FreeImage/Halftoning.cpp
index 1542fc9268..1542fc9268 100644
--- a/plugins/FreeImage/Source/FreeImage/Halftoning.cpp
+++ b/plugins/FreeImage/src/FreeImage/Halftoning.cpp
diff --git a/plugins/FreeImage/Source/FreeImage/J2KHelper.cpp b/plugins/FreeImage/src/FreeImage/J2KHelper.cpp
index 44b210aca0..44b210aca0 100644
--- a/plugins/FreeImage/Source/FreeImage/J2KHelper.cpp
+++ b/plugins/FreeImage/src/FreeImage/J2KHelper.cpp
diff --git a/plugins/FreeImage/Source/FreeImage/MemoryIO.cpp b/plugins/FreeImage/src/FreeImage/MemoryIO.cpp
index 6ae3fb2e11..6ae3fb2e11 100644
--- a/plugins/FreeImage/Source/FreeImage/MemoryIO.cpp
+++ b/plugins/FreeImage/src/FreeImage/MemoryIO.cpp
diff --git a/plugins/FreeImage/Source/FreeImage/MultiPage.cpp b/plugins/FreeImage/src/FreeImage/MultiPage.cpp
index e5bcee3ded..e5bcee3ded 100644
--- a/plugins/FreeImage/Source/FreeImage/MultiPage.cpp
+++ b/plugins/FreeImage/src/FreeImage/MultiPage.cpp
diff --git a/plugins/FreeImage/Source/FreeImage/NNQuantizer.cpp b/plugins/FreeImage/src/FreeImage/NNQuantizer.cpp
index 6eb9aeaf48..6eb9aeaf48 100644
--- a/plugins/FreeImage/Source/FreeImage/NNQuantizer.cpp
+++ b/plugins/FreeImage/src/FreeImage/NNQuantizer.cpp
diff --git a/plugins/FreeImage/Source/FreeImage/PSDParser.cpp b/plugins/FreeImage/src/FreeImage/PSDParser.cpp
index 93573d01c0..93573d01c0 100644
--- a/plugins/FreeImage/Source/FreeImage/PSDParser.cpp
+++ b/plugins/FreeImage/src/FreeImage/PSDParser.cpp
diff --git a/plugins/FreeImage/Source/FreeImage/PSDParser.h b/plugins/FreeImage/src/FreeImage/PSDParser.h
index 15ab5425ca..15ab5425ca 100644
--- a/plugins/FreeImage/Source/FreeImage/PSDParser.h
+++ b/plugins/FreeImage/src/FreeImage/PSDParser.h
diff --git a/plugins/FreeImage/Source/FreeImage/PixelAccess.cpp b/plugins/FreeImage/src/FreeImage/PixelAccess.cpp
index 158f9997b2..158f9997b2 100644
--- a/plugins/FreeImage/Source/FreeImage/PixelAccess.cpp
+++ b/plugins/FreeImage/src/FreeImage/PixelAccess.cpp
diff --git a/plugins/FreeImage/Source/FreeImage/Plugin.cpp b/plugins/FreeImage/src/FreeImage/Plugin.cpp
index ce2863a72e..ce2863a72e 100644
--- a/plugins/FreeImage/Source/FreeImage/Plugin.cpp
+++ b/plugins/FreeImage/src/FreeImage/Plugin.cpp
diff --git a/plugins/FreeImage/Source/FreeImage/PluginBMP.cpp b/plugins/FreeImage/src/FreeImage/PluginBMP.cpp
index d69336f3f5..d69336f3f5 100644
--- a/plugins/FreeImage/Source/FreeImage/PluginBMP.cpp
+++ b/plugins/FreeImage/src/FreeImage/PluginBMP.cpp
diff --git a/plugins/FreeImage/Source/FreeImage/PluginCUT.cpp b/plugins/FreeImage/src/FreeImage/PluginCUT.cpp
index 746fa034a6..746fa034a6 100644
--- a/plugins/FreeImage/Source/FreeImage/PluginCUT.cpp
+++ b/plugins/FreeImage/src/FreeImage/PluginCUT.cpp
diff --git a/plugins/FreeImage/Source/FreeImage/PluginDDS.cpp b/plugins/FreeImage/src/FreeImage/PluginDDS.cpp
index 0a1667d7f1..0a1667d7f1 100644
--- a/plugins/FreeImage/Source/FreeImage/PluginDDS.cpp
+++ b/plugins/FreeImage/src/FreeImage/PluginDDS.cpp
diff --git a/plugins/FreeImage/Source/FreeImage/PluginEXR.cpp b/plugins/FreeImage/src/FreeImage/PluginEXR.cpp
index b9963a11b2..b9963a11b2 100644
--- a/plugins/FreeImage/Source/FreeImage/PluginEXR.cpp
+++ b/plugins/FreeImage/src/FreeImage/PluginEXR.cpp
diff --git a/plugins/FreeImage/Source/FreeImage/PluginG3.cpp b/plugins/FreeImage/src/FreeImage/PluginG3.cpp
index c383a455b7..c383a455b7 100644
--- a/plugins/FreeImage/Source/FreeImage/PluginG3.cpp
+++ b/plugins/FreeImage/src/FreeImage/PluginG3.cpp
diff --git a/plugins/FreeImage/Source/FreeImage/PluginGIF.cpp b/plugins/FreeImage/src/FreeImage/PluginGIF.cpp
index 7af1d821d8..7af1d821d8 100644
--- a/plugins/FreeImage/Source/FreeImage/PluginGIF.cpp
+++ b/plugins/FreeImage/src/FreeImage/PluginGIF.cpp
diff --git a/plugins/FreeImage/Source/FreeImage/PluginHDR.cpp b/plugins/FreeImage/src/FreeImage/PluginHDR.cpp
index a0334e1143..a0334e1143 100644
--- a/plugins/FreeImage/Source/FreeImage/PluginHDR.cpp
+++ b/plugins/FreeImage/src/FreeImage/PluginHDR.cpp
diff --git a/plugins/FreeImage/Source/FreeImage/PluginICO.cpp b/plugins/FreeImage/src/FreeImage/PluginICO.cpp
index d0ece3514c..d0ece3514c 100644
--- a/plugins/FreeImage/Source/FreeImage/PluginICO.cpp
+++ b/plugins/FreeImage/src/FreeImage/PluginICO.cpp
diff --git a/plugins/FreeImage/Source/FreeImage/PluginIFF.cpp b/plugins/FreeImage/src/FreeImage/PluginIFF.cpp
index b6cd45d6db..b6cd45d6db 100644
--- a/plugins/FreeImage/Source/FreeImage/PluginIFF.cpp
+++ b/plugins/FreeImage/src/FreeImage/PluginIFF.cpp
diff --git a/plugins/FreeImage/Source/FreeImage/PluginJ2K.cpp b/plugins/FreeImage/src/FreeImage/PluginJ2K.cpp
index 6e772afdaa..6e772afdaa 100644
--- a/plugins/FreeImage/Source/FreeImage/PluginJ2K.cpp
+++ b/plugins/FreeImage/src/FreeImage/PluginJ2K.cpp
diff --git a/plugins/FreeImage/Source/FreeImage/PluginJP2.cpp b/plugins/FreeImage/src/FreeImage/PluginJP2.cpp
index ed1cb267bb..ed1cb267bb 100644
--- a/plugins/FreeImage/Source/FreeImage/PluginJP2.cpp
+++ b/plugins/FreeImage/src/FreeImage/PluginJP2.cpp
diff --git a/plugins/FreeImage/Source/FreeImage/PluginJPEG.cpp b/plugins/FreeImage/src/FreeImage/PluginJPEG.cpp
index b69ace95bc..b69ace95bc 100644
--- a/plugins/FreeImage/Source/FreeImage/PluginJPEG.cpp
+++ b/plugins/FreeImage/src/FreeImage/PluginJPEG.cpp
diff --git a/plugins/FreeImage/Source/FreeImage/PluginKOALA.cpp b/plugins/FreeImage/src/FreeImage/PluginKOALA.cpp
index 6c3ae52254..6c3ae52254 100644
--- a/plugins/FreeImage/Source/FreeImage/PluginKOALA.cpp
+++ b/plugins/FreeImage/src/FreeImage/PluginKOALA.cpp
diff --git a/plugins/FreeImage/Source/FreeImage/PluginMNG.cpp b/plugins/FreeImage/src/FreeImage/PluginMNG.cpp
index 6d2f50ecec..6d2f50ecec 100644
--- a/plugins/FreeImage/Source/FreeImage/PluginMNG.cpp
+++ b/plugins/FreeImage/src/FreeImage/PluginMNG.cpp
diff --git a/plugins/FreeImage/Source/FreeImage/PluginPCD.cpp b/plugins/FreeImage/src/FreeImage/PluginPCD.cpp
index 87cbe967b2..87cbe967b2 100644
--- a/plugins/FreeImage/Source/FreeImage/PluginPCD.cpp
+++ b/plugins/FreeImage/src/FreeImage/PluginPCD.cpp
diff --git a/plugins/FreeImage/Source/FreeImage/PluginPCX.cpp b/plugins/FreeImage/src/FreeImage/PluginPCX.cpp
index a6feb5fea7..a6feb5fea7 100644
--- a/plugins/FreeImage/Source/FreeImage/PluginPCX.cpp
+++ b/plugins/FreeImage/src/FreeImage/PluginPCX.cpp
diff --git a/plugins/FreeImage/Source/FreeImage/PluginPFM.cpp b/plugins/FreeImage/src/FreeImage/PluginPFM.cpp
index 8ccbd48ba5..8ccbd48ba5 100644
--- a/plugins/FreeImage/Source/FreeImage/PluginPFM.cpp
+++ b/plugins/FreeImage/src/FreeImage/PluginPFM.cpp
diff --git a/plugins/FreeImage/Source/FreeImage/PluginPICT.cpp b/plugins/FreeImage/src/FreeImage/PluginPICT.cpp
index 0c44cb2d1f..0c44cb2d1f 100644
--- a/plugins/FreeImage/Source/FreeImage/PluginPICT.cpp
+++ b/plugins/FreeImage/src/FreeImage/PluginPICT.cpp
diff --git a/plugins/FreeImage/Source/FreeImage/PluginPNG.cpp b/plugins/FreeImage/src/FreeImage/PluginPNG.cpp
index ad398a87e8..ad398a87e8 100644
--- a/plugins/FreeImage/Source/FreeImage/PluginPNG.cpp
+++ b/plugins/FreeImage/src/FreeImage/PluginPNG.cpp
diff --git a/plugins/FreeImage/Source/FreeImage/PluginPNM.cpp b/plugins/FreeImage/src/FreeImage/PluginPNM.cpp
index a30f858851..a30f858851 100644
--- a/plugins/FreeImage/Source/FreeImage/PluginPNM.cpp
+++ b/plugins/FreeImage/src/FreeImage/PluginPNM.cpp
diff --git a/plugins/FreeImage/Source/FreeImage/PluginPSD.cpp b/plugins/FreeImage/src/FreeImage/PluginPSD.cpp
index e453a31789..e453a31789 100644
--- a/plugins/FreeImage/Source/FreeImage/PluginPSD.cpp
+++ b/plugins/FreeImage/src/FreeImage/PluginPSD.cpp
diff --git a/plugins/FreeImage/Source/FreeImage/PluginRAS.cpp b/plugins/FreeImage/src/FreeImage/PluginRAS.cpp
index 08fc0c9e17..08fc0c9e17 100644
--- a/plugins/FreeImage/Source/FreeImage/PluginRAS.cpp
+++ b/plugins/FreeImage/src/FreeImage/PluginRAS.cpp
diff --git a/plugins/FreeImage/Source/FreeImage/PluginRAW.cpp b/plugins/FreeImage/src/FreeImage/PluginRAW.cpp
index 4611824f4d..4611824f4d 100644
--- a/plugins/FreeImage/Source/FreeImage/PluginRAW.cpp
+++ b/plugins/FreeImage/src/FreeImage/PluginRAW.cpp
diff --git a/plugins/FreeImage/Source/FreeImage/PluginSGI.cpp b/plugins/FreeImage/src/FreeImage/PluginSGI.cpp
index 3ac189e0ef..3ac189e0ef 100644
--- a/plugins/FreeImage/Source/FreeImage/PluginSGI.cpp
+++ b/plugins/FreeImage/src/FreeImage/PluginSGI.cpp
diff --git a/plugins/FreeImage/Source/FreeImage/PluginTARGA.cpp b/plugins/FreeImage/src/FreeImage/PluginTARGA.cpp
index 4e3f1a720a..4e3f1a720a 100644
--- a/plugins/FreeImage/Source/FreeImage/PluginTARGA.cpp
+++ b/plugins/FreeImage/src/FreeImage/PluginTARGA.cpp
diff --git a/plugins/FreeImage/Source/FreeImage/PluginTIFF.cpp b/plugins/FreeImage/src/FreeImage/PluginTIFF.cpp
index 54f81e0938..54f81e0938 100644
--- a/plugins/FreeImage/Source/FreeImage/PluginTIFF.cpp
+++ b/plugins/FreeImage/src/FreeImage/PluginTIFF.cpp
diff --git a/plugins/FreeImage/Source/FreeImage/PluginWBMP.cpp b/plugins/FreeImage/src/FreeImage/PluginWBMP.cpp
index 2ff8f023c3..2ff8f023c3 100644
--- a/plugins/FreeImage/Source/FreeImage/PluginWBMP.cpp
+++ b/plugins/FreeImage/src/FreeImage/PluginWBMP.cpp
diff --git a/plugins/FreeImage/Source/FreeImage/PluginXBM.cpp b/plugins/FreeImage/src/FreeImage/PluginXBM.cpp
index 140029e862..140029e862 100644
--- a/plugins/FreeImage/Source/FreeImage/PluginXBM.cpp
+++ b/plugins/FreeImage/src/FreeImage/PluginXBM.cpp
diff --git a/plugins/FreeImage/Source/FreeImage/PluginXPM.cpp b/plugins/FreeImage/src/FreeImage/PluginXPM.cpp
index 16db443c47..16db443c47 100644
--- a/plugins/FreeImage/Source/FreeImage/PluginXPM.cpp
+++ b/plugins/FreeImage/src/FreeImage/PluginXPM.cpp
diff --git a/plugins/FreeImage/Source/FreeImage/TIFFLogLuv.cpp b/plugins/FreeImage/src/FreeImage/TIFFLogLuv.cpp
index 124b25f64f..124b25f64f 100644
--- a/plugins/FreeImage/Source/FreeImage/TIFFLogLuv.cpp
+++ b/plugins/FreeImage/src/FreeImage/TIFFLogLuv.cpp
diff --git a/plugins/FreeImage/Source/FreeImage/ToneMapping.cpp b/plugins/FreeImage/src/FreeImage/ToneMapping.cpp
index 33ae08ea59..33ae08ea59 100644
--- a/plugins/FreeImage/Source/FreeImage/ToneMapping.cpp
+++ b/plugins/FreeImage/src/FreeImage/ToneMapping.cpp
diff --git a/plugins/FreeImage/Source/FreeImage/WuQuantizer.cpp b/plugins/FreeImage/src/FreeImage/WuQuantizer.cpp
index 532fbfc3e6..532fbfc3e6 100644
--- a/plugins/FreeImage/Source/FreeImage/WuQuantizer.cpp
+++ b/plugins/FreeImage/src/FreeImage/WuQuantizer.cpp
diff --git a/plugins/FreeImage/Source/FreeImage/ZLibInterface.cpp b/plugins/FreeImage/src/FreeImage/ZLibInterface.cpp
index 3ab6d321f2..3ab6d321f2 100644
--- a/plugins/FreeImage/Source/FreeImage/ZLibInterface.cpp
+++ b/plugins/FreeImage/src/FreeImage/ZLibInterface.cpp
diff --git a/plugins/FreeImage/Source/FreeImage/tmoColorConvert.cpp b/plugins/FreeImage/src/FreeImage/tmoColorConvert.cpp
index 367cb13c96..367cb13c96 100644
--- a/plugins/FreeImage/Source/FreeImage/tmoColorConvert.cpp
+++ b/plugins/FreeImage/src/FreeImage/tmoColorConvert.cpp
diff --git a/plugins/FreeImage/Source/FreeImage/tmoDrago03.cpp b/plugins/FreeImage/src/FreeImage/tmoDrago03.cpp
index b820bb3577..b820bb3577 100644
--- a/plugins/FreeImage/Source/FreeImage/tmoDrago03.cpp
+++ b/plugins/FreeImage/src/FreeImage/tmoDrago03.cpp
diff --git a/plugins/FreeImage/Source/FreeImage/tmoFattal02.cpp b/plugins/FreeImage/src/FreeImage/tmoFattal02.cpp
index bcd4524523..bcd4524523 100644
--- a/plugins/FreeImage/Source/FreeImage/tmoFattal02.cpp
+++ b/plugins/FreeImage/src/FreeImage/tmoFattal02.cpp
diff --git a/plugins/FreeImage/Source/FreeImage/tmoReinhard05.cpp b/plugins/FreeImage/src/FreeImage/tmoReinhard05.cpp
index 969aa4c950..969aa4c950 100644
--- a/plugins/FreeImage/Source/FreeImage/tmoReinhard05.cpp
+++ b/plugins/FreeImage/src/FreeImage/tmoReinhard05.cpp
diff --git a/plugins/FreeImage/Source/FreeImageIO.h b/plugins/FreeImage/src/FreeImageIO.h
index b251d474f6..b251d474f6 100644
--- a/plugins/FreeImage/Source/FreeImageIO.h
+++ b/plugins/FreeImage/src/FreeImageIO.h
diff --git a/plugins/FreeImage/Source/FreeImageToolkit/BSplineRotate.cpp b/plugins/FreeImage/src/FreeImageToolkit/BSplineRotate.cpp
index e4be1d0bd2..e4be1d0bd2 100644
--- a/plugins/FreeImage/Source/FreeImageToolkit/BSplineRotate.cpp
+++ b/plugins/FreeImage/src/FreeImageToolkit/BSplineRotate.cpp
diff --git a/plugins/FreeImage/Source/FreeImageToolkit/Channels.cpp b/plugins/FreeImage/src/FreeImageToolkit/Channels.cpp
index f6e6c5509c..f6e6c5509c 100644
--- a/plugins/FreeImage/Source/FreeImageToolkit/Channels.cpp
+++ b/plugins/FreeImage/src/FreeImageToolkit/Channels.cpp
diff --git a/plugins/FreeImage/Source/FreeImageToolkit/ClassicRotate.cpp b/plugins/FreeImage/src/FreeImageToolkit/ClassicRotate.cpp
index d38d8c1bcd..d38d8c1bcd 100644
--- a/plugins/FreeImage/Source/FreeImageToolkit/ClassicRotate.cpp
+++ b/plugins/FreeImage/src/FreeImageToolkit/ClassicRotate.cpp
diff --git a/plugins/FreeImage/Source/FreeImageToolkit/Colors.cpp b/plugins/FreeImage/src/FreeImageToolkit/Colors.cpp
index 8b9bbd6482..8b9bbd6482 100644
--- a/plugins/FreeImage/Source/FreeImageToolkit/Colors.cpp
+++ b/plugins/FreeImage/src/FreeImageToolkit/Colors.cpp
diff --git a/plugins/FreeImage/Source/FreeImageToolkit/CopyPaste.cpp b/plugins/FreeImage/src/FreeImageToolkit/CopyPaste.cpp
index 753fdc736e..753fdc736e 100644
--- a/plugins/FreeImage/Source/FreeImageToolkit/CopyPaste.cpp
+++ b/plugins/FreeImage/src/FreeImageToolkit/CopyPaste.cpp
diff --git a/plugins/FreeImage/Source/FreeImageToolkit/Display.cpp b/plugins/FreeImage/src/FreeImageToolkit/Display.cpp
index 3e4807042d..3e4807042d 100644
--- a/plugins/FreeImage/Source/FreeImageToolkit/Display.cpp
+++ b/plugins/FreeImage/src/FreeImageToolkit/Display.cpp
diff --git a/plugins/FreeImage/Source/FreeImageToolkit/Filters.h b/plugins/FreeImage/src/FreeImageToolkit/Filters.h
index 7a45c493f4..7a45c493f4 100644
--- a/plugins/FreeImage/Source/FreeImageToolkit/Filters.h
+++ b/plugins/FreeImage/src/FreeImageToolkit/Filters.h
diff --git a/plugins/FreeImage/Source/FreeImageToolkit/Flip.cpp b/plugins/FreeImage/src/FreeImageToolkit/Flip.cpp
index c7898a7813..c7898a7813 100644
--- a/plugins/FreeImage/Source/FreeImageToolkit/Flip.cpp
+++ b/plugins/FreeImage/src/FreeImageToolkit/Flip.cpp
diff --git a/plugins/FreeImage/Source/FreeImageToolkit/JPEGTransform.cpp b/plugins/FreeImage/src/FreeImageToolkit/JPEGTransform.cpp
index 2d7399dcb2..2d7399dcb2 100644
--- a/plugins/FreeImage/Source/FreeImageToolkit/JPEGTransform.cpp
+++ b/plugins/FreeImage/src/FreeImageToolkit/JPEGTransform.cpp
diff --git a/plugins/FreeImage/Source/FreeImageToolkit/MultigridPoissonSolver.cpp b/plugins/FreeImage/src/FreeImageToolkit/MultigridPoissonSolver.cpp
index a31961447a..a31961447a 100644
--- a/plugins/FreeImage/Source/FreeImageToolkit/MultigridPoissonSolver.cpp
+++ b/plugins/FreeImage/src/FreeImageToolkit/MultigridPoissonSolver.cpp
diff --git a/plugins/FreeImage/Source/FreeImageToolkit/Rescale.cpp b/plugins/FreeImage/src/FreeImageToolkit/Rescale.cpp
index e79e5f456c..e79e5f456c 100644
--- a/plugins/FreeImage/Source/FreeImageToolkit/Rescale.cpp
+++ b/plugins/FreeImage/src/FreeImageToolkit/Rescale.cpp
diff --git a/plugins/FreeImage/Source/FreeImageToolkit/Resize.cpp b/plugins/FreeImage/src/FreeImageToolkit/Resize.cpp
index 5421bd47ab..5421bd47ab 100644
--- a/plugins/FreeImage/Source/FreeImageToolkit/Resize.cpp
+++ b/plugins/FreeImage/src/FreeImageToolkit/Resize.cpp
diff --git a/plugins/FreeImage/Source/FreeImageToolkit/Resize.h b/plugins/FreeImage/src/FreeImageToolkit/Resize.h
index 0d5d0b451a..0d5d0b451a 100644
--- a/plugins/FreeImage/Source/FreeImageToolkit/Resize.h
+++ b/plugins/FreeImage/src/FreeImageToolkit/Resize.h
diff --git a/plugins/FreeImage/Source/LibJPEG/ansi2knr.c b/plugins/FreeImage/src/LibJPEG/ansi2knr.c
index dcfb5d9255..dcfb5d9255 100644
--- a/plugins/FreeImage/Source/LibJPEG/ansi2knr.c
+++ b/plugins/FreeImage/src/LibJPEG/ansi2knr.c
diff --git a/plugins/FreeImage/Source/LibJPEG/cderror.h b/plugins/FreeImage/src/LibJPEG/cderror.h
index e19c475c5c..e19c475c5c 100644
--- a/plugins/FreeImage/Source/LibJPEG/cderror.h
+++ b/plugins/FreeImage/src/LibJPEG/cderror.h
diff --git a/plugins/FreeImage/Source/LibJPEG/cdjpeg.c b/plugins/FreeImage/src/LibJPEG/cdjpeg.c
index 89fe633728..89fe633728 100644
--- a/plugins/FreeImage/Source/LibJPEG/cdjpeg.c
+++ b/plugins/FreeImage/src/LibJPEG/cdjpeg.c
diff --git a/plugins/FreeImage/Source/LibJPEG/cdjpeg.h b/plugins/FreeImage/src/LibJPEG/cdjpeg.h
index ed024ac3ae..ed024ac3ae 100644
--- a/plugins/FreeImage/Source/LibJPEG/cdjpeg.h
+++ b/plugins/FreeImage/src/LibJPEG/cdjpeg.h
diff --git a/plugins/FreeImage/Source/LibJPEG/change.log b/plugins/FreeImage/src/LibJPEG/change.log
index ce71abd2eb..ce71abd2eb 100644
--- a/plugins/FreeImage/Source/LibJPEG/change.log
+++ b/plugins/FreeImage/src/LibJPEG/change.log
diff --git a/plugins/FreeImage/Source/LibJPEG/cjpeg.c b/plugins/FreeImage/src/LibJPEG/cjpeg.c
index a999eeef1c..a999eeef1c 100644
--- a/plugins/FreeImage/Source/LibJPEG/cjpeg.c
+++ b/plugins/FreeImage/src/LibJPEG/cjpeg.c
diff --git a/plugins/FreeImage/Source/LibJPEG/ckconfig.c b/plugins/FreeImage/src/LibJPEG/ckconfig.c
index fb9429af08..fb9429af08 100644
--- a/plugins/FreeImage/Source/LibJPEG/ckconfig.c
+++ b/plugins/FreeImage/src/LibJPEG/ckconfig.c
diff --git a/plugins/FreeImage/Source/LibJPEG/djpeg.c b/plugins/FreeImage/src/LibJPEG/djpeg.c
index 363c628cbe..363c628cbe 100644
--- a/plugins/FreeImage/Source/LibJPEG/djpeg.c
+++ b/plugins/FreeImage/src/LibJPEG/djpeg.c
diff --git a/plugins/FreeImage/Source/LibJPEG/example.c b/plugins/FreeImage/src/LibJPEG/example.c
index e21cf12126..e21cf12126 100644
--- a/plugins/FreeImage/Source/LibJPEG/example.c
+++ b/plugins/FreeImage/src/LibJPEG/example.c
diff --git a/plugins/FreeImage/Source/LibJPEG/jaricom.c b/plugins/FreeImage/src/LibJPEG/jaricom.c
index 690068861f..690068861f 100644
--- a/plugins/FreeImage/Source/LibJPEG/jaricom.c
+++ b/plugins/FreeImage/src/LibJPEG/jaricom.c
diff --git a/plugins/FreeImage/Source/LibJPEG/jcapimin.c b/plugins/FreeImage/src/LibJPEG/jcapimin.c
index 639ce86f44..639ce86f44 100644
--- a/plugins/FreeImage/Source/LibJPEG/jcapimin.c
+++ b/plugins/FreeImage/src/LibJPEG/jcapimin.c
diff --git a/plugins/FreeImage/Source/LibJPEG/jcapistd.c b/plugins/FreeImage/src/LibJPEG/jcapistd.c
index c0320b1b19..c0320b1b19 100644
--- a/plugins/FreeImage/Source/LibJPEG/jcapistd.c
+++ b/plugins/FreeImage/src/LibJPEG/jcapistd.c
diff --git a/plugins/FreeImage/Source/LibJPEG/jcarith.c b/plugins/FreeImage/src/LibJPEG/jcarith.c
index 033f67069e..033f67069e 100644
--- a/plugins/FreeImage/Source/LibJPEG/jcarith.c
+++ b/plugins/FreeImage/src/LibJPEG/jcarith.c
diff --git a/plugins/FreeImage/Source/LibJPEG/jccoefct.c b/plugins/FreeImage/src/LibJPEG/jccoefct.c
index 924a703dda..924a703dda 100644
--- a/plugins/FreeImage/Source/LibJPEG/jccoefct.c
+++ b/plugins/FreeImage/src/LibJPEG/jccoefct.c
diff --git a/plugins/FreeImage/Source/LibJPEG/jccolor.c b/plugins/FreeImage/src/LibJPEG/jccolor.c
index 3e2d0e9277..3e2d0e9277 100644
--- a/plugins/FreeImage/Source/LibJPEG/jccolor.c
+++ b/plugins/FreeImage/src/LibJPEG/jccolor.c
diff --git a/plugins/FreeImage/Source/LibJPEG/jcdctmgr.c b/plugins/FreeImage/src/LibJPEG/jcdctmgr.c
index 0bbdbb685d..0bbdbb685d 100644
--- a/plugins/FreeImage/Source/LibJPEG/jcdctmgr.c
+++ b/plugins/FreeImage/src/LibJPEG/jcdctmgr.c
diff --git a/plugins/FreeImage/Source/LibJPEG/jchuff.c b/plugins/FreeImage/src/LibJPEG/jchuff.c
index 257d7aa1f5..257d7aa1f5 100644
--- a/plugins/FreeImage/Source/LibJPEG/jchuff.c
+++ b/plugins/FreeImage/src/LibJPEG/jchuff.c
diff --git a/plugins/FreeImage/Source/LibJPEG/jcinit.c b/plugins/FreeImage/src/LibJPEG/jcinit.c
index 0ba310f217..0ba310f217 100644
--- a/plugins/FreeImage/Source/LibJPEG/jcinit.c
+++ b/plugins/FreeImage/src/LibJPEG/jcinit.c
diff --git a/plugins/FreeImage/Source/LibJPEG/jcmainct.c b/plugins/FreeImage/src/LibJPEG/jcmainct.c
index 7de75d1675..7de75d1675 100644
--- a/plugins/FreeImage/Source/LibJPEG/jcmainct.c
+++ b/plugins/FreeImage/src/LibJPEG/jcmainct.c
diff --git a/plugins/FreeImage/Source/LibJPEG/jcmarker.c b/plugins/FreeImage/src/LibJPEG/jcmarker.c
index 606c19af39..606c19af39 100644
--- a/plugins/FreeImage/Source/LibJPEG/jcmarker.c
+++ b/plugins/FreeImage/src/LibJPEG/jcmarker.c
diff --git a/plugins/FreeImage/Source/LibJPEG/jcmaster.c b/plugins/FreeImage/src/LibJPEG/jcmaster.c
index caf80a53b3..caf80a53b3 100644
--- a/plugins/FreeImage/Source/LibJPEG/jcmaster.c
+++ b/plugins/FreeImage/src/LibJPEG/jcmaster.c
diff --git a/plugins/FreeImage/Source/LibJPEG/jcomapi.c b/plugins/FreeImage/src/LibJPEG/jcomapi.c
index 9b1fa7568a..9b1fa7568a 100644
--- a/plugins/FreeImage/Source/LibJPEG/jcomapi.c
+++ b/plugins/FreeImage/src/LibJPEG/jcomapi.c
diff --git a/plugins/FreeImage/Source/LibJPEG/jconfig.h b/plugins/FreeImage/src/LibJPEG/jconfig.h
index 44e5c52ee5..44e5c52ee5 100644
--- a/plugins/FreeImage/Source/LibJPEG/jconfig.h
+++ b/plugins/FreeImage/src/LibJPEG/jconfig.h
diff --git a/plugins/FreeImage/Source/LibJPEG/jconfig.txt b/plugins/FreeImage/src/LibJPEG/jconfig.txt
index 27086a3644..27086a3644 100644
--- a/plugins/FreeImage/Source/LibJPEG/jconfig.txt
+++ b/plugins/FreeImage/src/LibJPEG/jconfig.txt
diff --git a/plugins/FreeImage/Source/LibJPEG/jcparam.c b/plugins/FreeImage/src/LibJPEG/jcparam.c
index 1c81d2ec59..1c81d2ec59 100644
--- a/plugins/FreeImage/Source/LibJPEG/jcparam.c
+++ b/plugins/FreeImage/src/LibJPEG/jcparam.c
diff --git a/plugins/FreeImage/Source/LibJPEG/jcprepct.c b/plugins/FreeImage/src/LibJPEG/jcprepct.c
index be44cc4b45..be44cc4b45 100644
--- a/plugins/FreeImage/Source/LibJPEG/jcprepct.c
+++ b/plugins/FreeImage/src/LibJPEG/jcprepct.c
diff --git a/plugins/FreeImage/Source/LibJPEG/jcsample.c b/plugins/FreeImage/src/LibJPEG/jcsample.c
index 4d36f85f35..4d36f85f35 100644
--- a/plugins/FreeImage/Source/LibJPEG/jcsample.c
+++ b/plugins/FreeImage/src/LibJPEG/jcsample.c
diff --git a/plugins/FreeImage/Source/LibJPEG/jctrans.c b/plugins/FreeImage/src/LibJPEG/jctrans.c
index f7d7b81491..f7d7b81491 100644
--- a/plugins/FreeImage/Source/LibJPEG/jctrans.c
+++ b/plugins/FreeImage/src/LibJPEG/jctrans.c
diff --git a/plugins/FreeImage/Source/LibJPEG/jdapimin.c b/plugins/FreeImage/src/LibJPEG/jdapimin.c
index 7f1ce4c05b..7f1ce4c05b 100644
--- a/plugins/FreeImage/Source/LibJPEG/jdapimin.c
+++ b/plugins/FreeImage/src/LibJPEG/jdapimin.c
diff --git a/plugins/FreeImage/Source/LibJPEG/jdapistd.c b/plugins/FreeImage/src/LibJPEG/jdapistd.c
index 9d74537772..9d74537772 100644
--- a/plugins/FreeImage/Source/LibJPEG/jdapistd.c
+++ b/plugins/FreeImage/src/LibJPEG/jdapistd.c
diff --git a/plugins/FreeImage/Source/LibJPEG/jdarith.c b/plugins/FreeImage/src/LibJPEG/jdarith.c
index 092f8af5fe..092f8af5fe 100644
--- a/plugins/FreeImage/Source/LibJPEG/jdarith.c
+++ b/plugins/FreeImage/src/LibJPEG/jdarith.c
diff --git a/plugins/FreeImage/Source/LibJPEG/jdatadst.c b/plugins/FreeImage/src/LibJPEG/jdatadst.c
index 6981fb73de..6981fb73de 100644
--- a/plugins/FreeImage/Source/LibJPEG/jdatadst.c
+++ b/plugins/FreeImage/src/LibJPEG/jdatadst.c
diff --git a/plugins/FreeImage/Source/LibJPEG/jdatasrc.c b/plugins/FreeImage/src/LibJPEG/jdatasrc.c
index 7be59a88a1..7be59a88a1 100644
--- a/plugins/FreeImage/Source/LibJPEG/jdatasrc.c
+++ b/plugins/FreeImage/src/LibJPEG/jdatasrc.c
diff --git a/plugins/FreeImage/Source/LibJPEG/jdcoefct.c b/plugins/FreeImage/src/LibJPEG/jdcoefct.c
index ed02fc378f..ed02fc378f 100644
--- a/plugins/FreeImage/Source/LibJPEG/jdcoefct.c
+++ b/plugins/FreeImage/src/LibJPEG/jdcoefct.c
diff --git a/plugins/FreeImage/Source/LibJPEG/jdcolor.c b/plugins/FreeImage/src/LibJPEG/jdcolor.c
index 83e4d069ab..83e4d069ab 100644
--- a/plugins/FreeImage/Source/LibJPEG/jdcolor.c
+++ b/plugins/FreeImage/src/LibJPEG/jdcolor.c
diff --git a/plugins/FreeImage/Source/LibJPEG/jdct.h b/plugins/FreeImage/src/LibJPEG/jdct.h
index 360dec80c9..360dec80c9 100644
--- a/plugins/FreeImage/Source/LibJPEG/jdct.h
+++ b/plugins/FreeImage/src/LibJPEG/jdct.h
diff --git a/plugins/FreeImage/Source/LibJPEG/jddctmgr.c b/plugins/FreeImage/src/LibJPEG/jddctmgr.c
index 0ded9d5741..0ded9d5741 100644
--- a/plugins/FreeImage/Source/LibJPEG/jddctmgr.c
+++ b/plugins/FreeImage/src/LibJPEG/jddctmgr.c
diff --git a/plugins/FreeImage/Source/LibJPEG/jdhuff.c b/plugins/FreeImage/src/LibJPEG/jdhuff.c
index 06f92fe47f..06f92fe47f 100644
--- a/plugins/FreeImage/Source/LibJPEG/jdhuff.c
+++ b/plugins/FreeImage/src/LibJPEG/jdhuff.c
diff --git a/plugins/FreeImage/Source/LibJPEG/jdinput.c b/plugins/FreeImage/src/LibJPEG/jdinput.c
index 2c5c717b9c..2c5c717b9c 100644
--- a/plugins/FreeImage/Source/LibJPEG/jdinput.c
+++ b/plugins/FreeImage/src/LibJPEG/jdinput.c
diff --git a/plugins/FreeImage/Source/LibJPEG/jdmainct.c b/plugins/FreeImage/src/LibJPEG/jdmainct.c
index 02723ca732..02723ca732 100644
--- a/plugins/FreeImage/Source/LibJPEG/jdmainct.c
+++ b/plugins/FreeImage/src/LibJPEG/jdmainct.c
diff --git a/plugins/FreeImage/Source/LibJPEG/jdmarker.c b/plugins/FreeImage/src/LibJPEG/jdmarker.c
index f2a9cc4295..f2a9cc4295 100644
--- a/plugins/FreeImage/Source/LibJPEG/jdmarker.c
+++ b/plugins/FreeImage/src/LibJPEG/jdmarker.c
diff --git a/plugins/FreeImage/Source/LibJPEG/jdmaster.c b/plugins/FreeImage/src/LibJPEG/jdmaster.c
index fef72a21b4..fef72a21b4 100644
--- a/plugins/FreeImage/Source/LibJPEG/jdmaster.c
+++ b/plugins/FreeImage/src/LibJPEG/jdmaster.c
diff --git a/plugins/FreeImage/Source/LibJPEG/jdmerge.c b/plugins/FreeImage/src/LibJPEG/jdmerge.c
index 37444468c2..37444468c2 100644
--- a/plugins/FreeImage/Source/LibJPEG/jdmerge.c
+++ b/plugins/FreeImage/src/LibJPEG/jdmerge.c
diff --git a/plugins/FreeImage/Source/LibJPEG/jdpostct.c b/plugins/FreeImage/src/LibJPEG/jdpostct.c
index 571563d728..571563d728 100644
--- a/plugins/FreeImage/Source/LibJPEG/jdpostct.c
+++ b/plugins/FreeImage/src/LibJPEG/jdpostct.c
diff --git a/plugins/FreeImage/Source/LibJPEG/jdsample.c b/plugins/FreeImage/src/LibJPEG/jdsample.c
index 7bc8885b02..7bc8885b02 100644
--- a/plugins/FreeImage/Source/LibJPEG/jdsample.c
+++ b/plugins/FreeImage/src/LibJPEG/jdsample.c
diff --git a/plugins/FreeImage/Source/LibJPEG/jdtrans.c b/plugins/FreeImage/src/LibJPEG/jdtrans.c
index 22dd47fb5c..22dd47fb5c 100644
--- a/plugins/FreeImage/Source/LibJPEG/jdtrans.c
+++ b/plugins/FreeImage/src/LibJPEG/jdtrans.c
diff --git a/plugins/FreeImage/Source/LibJPEG/jerror.c b/plugins/FreeImage/src/LibJPEG/jerror.c
index 3da7be86a0..3da7be86a0 100644
--- a/plugins/FreeImage/Source/LibJPEG/jerror.c
+++ b/plugins/FreeImage/src/LibJPEG/jerror.c
diff --git a/plugins/FreeImage/Source/LibJPEG/jerror.h b/plugins/FreeImage/src/LibJPEG/jerror.h
index 1cfb2b19d8..1cfb2b19d8 100644
--- a/plugins/FreeImage/Source/LibJPEG/jerror.h
+++ b/plugins/FreeImage/src/LibJPEG/jerror.h
diff --git a/plugins/FreeImage/Source/LibJPEG/jfdctflt.c b/plugins/FreeImage/src/LibJPEG/jfdctflt.c
index 74d0d862dc..74d0d862dc 100644
--- a/plugins/FreeImage/Source/LibJPEG/jfdctflt.c
+++ b/plugins/FreeImage/src/LibJPEG/jfdctflt.c
diff --git a/plugins/FreeImage/Source/LibJPEG/jfdctfst.c b/plugins/FreeImage/src/LibJPEG/jfdctfst.c
index 8cad5f2293..8cad5f2293 100644
--- a/plugins/FreeImage/Source/LibJPEG/jfdctfst.c
+++ b/plugins/FreeImage/src/LibJPEG/jfdctfst.c
diff --git a/plugins/FreeImage/Source/LibJPEG/jfdctint.c b/plugins/FreeImage/src/LibJPEG/jfdctint.c
index 1dde58c499..1dde58c499 100644
--- a/plugins/FreeImage/Source/LibJPEG/jfdctint.c
+++ b/plugins/FreeImage/src/LibJPEG/jfdctint.c
diff --git a/plugins/FreeImage/Source/LibJPEG/jidctflt.c b/plugins/FreeImage/src/LibJPEG/jidctflt.c
index 23ae9d333b..23ae9d333b 100644
--- a/plugins/FreeImage/Source/LibJPEG/jidctflt.c
+++ b/plugins/FreeImage/src/LibJPEG/jidctflt.c
diff --git a/plugins/FreeImage/Source/LibJPEG/jidctfst.c b/plugins/FreeImage/src/LibJPEG/jidctfst.c
index dba4216fb9..dba4216fb9 100644
--- a/plugins/FreeImage/Source/LibJPEG/jidctfst.c
+++ b/plugins/FreeImage/src/LibJPEG/jidctfst.c
diff --git a/plugins/FreeImage/Source/LibJPEG/jidctint.c b/plugins/FreeImage/src/LibJPEG/jidctint.c
index dcdf7ce454..dcdf7ce454 100644
--- a/plugins/FreeImage/Source/LibJPEG/jidctint.c
+++ b/plugins/FreeImage/src/LibJPEG/jidctint.c
diff --git a/plugins/FreeImage/Source/LibJPEG/jinclude.h b/plugins/FreeImage/src/LibJPEG/jinclude.h
index 0a4f15146a..0a4f15146a 100644
--- a/plugins/FreeImage/Source/LibJPEG/jinclude.h
+++ b/plugins/FreeImage/src/LibJPEG/jinclude.h
diff --git a/plugins/FreeImage/Source/LibJPEG/jmemansi.c b/plugins/FreeImage/src/LibJPEG/jmemansi.c
index b5da4743fb..b5da4743fb 100644
--- a/plugins/FreeImage/Source/LibJPEG/jmemansi.c
+++ b/plugins/FreeImage/src/LibJPEG/jmemansi.c
diff --git a/plugins/FreeImage/Source/LibJPEG/jmemdos.c b/plugins/FreeImage/src/LibJPEG/jmemdos.c
index 0955047ecc..0955047ecc 100644
--- a/plugins/FreeImage/Source/LibJPEG/jmemdos.c
+++ b/plugins/FreeImage/src/LibJPEG/jmemdos.c
diff --git a/plugins/FreeImage/Source/LibJPEG/jmemdosa.asm b/plugins/FreeImage/src/LibJPEG/jmemdosa.asm
index c6ec48b346..c6ec48b346 100644
--- a/plugins/FreeImage/Source/LibJPEG/jmemdosa.asm
+++ b/plugins/FreeImage/src/LibJPEG/jmemdosa.asm
diff --git a/plugins/FreeImage/Source/LibJPEG/jmemmac.c b/plugins/FreeImage/src/LibJPEG/jmemmac.c
index a6f043ed46..a6f043ed46 100644
--- a/plugins/FreeImage/Source/LibJPEG/jmemmac.c
+++ b/plugins/FreeImage/src/LibJPEG/jmemmac.c
diff --git a/plugins/FreeImage/Source/LibJPEG/jmemmgr.c b/plugins/FreeImage/src/LibJPEG/jmemmgr.c
index f0e83fb950..f0e83fb950 100644
--- a/plugins/FreeImage/Source/LibJPEG/jmemmgr.c
+++ b/plugins/FreeImage/src/LibJPEG/jmemmgr.c
diff --git a/plugins/FreeImage/Source/LibJPEG/jmemname.c b/plugins/FreeImage/src/LibJPEG/jmemname.c
index e28b212f48..e28b212f48 100644
--- a/plugins/FreeImage/Source/LibJPEG/jmemname.c
+++ b/plugins/FreeImage/src/LibJPEG/jmemname.c
diff --git a/plugins/FreeImage/Source/LibJPEG/jmemnobs.c b/plugins/FreeImage/src/LibJPEG/jmemnobs.c
index eb8c337725..eb8c337725 100644
--- a/plugins/FreeImage/Source/LibJPEG/jmemnobs.c
+++ b/plugins/FreeImage/src/LibJPEG/jmemnobs.c
diff --git a/plugins/FreeImage/Source/LibJPEG/jmemsys.h b/plugins/FreeImage/src/LibJPEG/jmemsys.h
index 6c3c6d348f..6c3c6d348f 100644
--- a/plugins/FreeImage/Source/LibJPEG/jmemsys.h
+++ b/plugins/FreeImage/src/LibJPEG/jmemsys.h
diff --git a/plugins/FreeImage/Source/LibJPEG/jmorecfg.h b/plugins/FreeImage/src/LibJPEG/jmorecfg.h
index 6c085c36a6..6c085c36a6 100644
--- a/plugins/FreeImage/Source/LibJPEG/jmorecfg.h
+++ b/plugins/FreeImage/src/LibJPEG/jmorecfg.h
diff --git a/plugins/FreeImage/Source/LibJPEG/jpegint.h b/plugins/FreeImage/src/LibJPEG/jpegint.h
index c0d5c14202..c0d5c14202 100644
--- a/plugins/FreeImage/Source/LibJPEG/jpegint.h
+++ b/plugins/FreeImage/src/LibJPEG/jpegint.h
diff --git a/plugins/FreeImage/Source/LibJPEG/jpeglib.h b/plugins/FreeImage/src/LibJPEG/jpeglib.h
index 1327cffa96..1327cffa96 100644
--- a/plugins/FreeImage/Source/LibJPEG/jpeglib.h
+++ b/plugins/FreeImage/src/LibJPEG/jpeglib.h
diff --git a/plugins/FreeImage/Source/LibJPEG/jpegtran.c b/plugins/FreeImage/src/LibJPEG/jpegtran.c
index 2193ffe377..2193ffe377 100644
--- a/plugins/FreeImage/Source/LibJPEG/jpegtran.c
+++ b/plugins/FreeImage/src/LibJPEG/jpegtran.c
diff --git a/plugins/FreeImage/Source/LibJPEG/jquant1.c b/plugins/FreeImage/src/LibJPEG/jquant1.c
index 9d11f70669..9d11f70669 100644
--- a/plugins/FreeImage/Source/LibJPEG/jquant1.c
+++ b/plugins/FreeImage/src/LibJPEG/jquant1.c
diff --git a/plugins/FreeImage/Source/LibJPEG/jquant2.c b/plugins/FreeImage/src/LibJPEG/jquant2.c
index 38fc2af7a5..38fc2af7a5 100644
--- a/plugins/FreeImage/Source/LibJPEG/jquant2.c
+++ b/plugins/FreeImage/src/LibJPEG/jquant2.c
diff --git a/plugins/FreeImage/Source/LibJPEG/jutils.c b/plugins/FreeImage/src/LibJPEG/jutils.c
index 5b16b6d03c..5b16b6d03c 100644
--- a/plugins/FreeImage/Source/LibJPEG/jutils.c
+++ b/plugins/FreeImage/src/LibJPEG/jutils.c
diff --git a/plugins/FreeImage/Source/LibJPEG/jversion.h b/plugins/FreeImage/src/LibJPEG/jversion.h
index 5d4915103e..5d4915103e 100644
--- a/plugins/FreeImage/Source/LibJPEG/jversion.h
+++ b/plugins/FreeImage/src/LibJPEG/jversion.h
diff --git a/plugins/FreeImage/Source/LibJPEG/rdbmp.c b/plugins/FreeImage/src/LibJPEG/rdbmp.c
index dfdf96ff5c..dfdf96ff5c 100644
--- a/plugins/FreeImage/Source/LibJPEG/rdbmp.c
+++ b/plugins/FreeImage/src/LibJPEG/rdbmp.c
diff --git a/plugins/FreeImage/Source/LibJPEG/rdcolmap.c b/plugins/FreeImage/src/LibJPEG/rdcolmap.c
index eebf8346c5..eebf8346c5 100644
--- a/plugins/FreeImage/Source/LibJPEG/rdcolmap.c
+++ b/plugins/FreeImage/src/LibJPEG/rdcolmap.c
diff --git a/plugins/FreeImage/Source/LibJPEG/rdgif.c b/plugins/FreeImage/src/LibJPEG/rdgif.c
index b0757e718f..b0757e718f 100644
--- a/plugins/FreeImage/Source/LibJPEG/rdgif.c
+++ b/plugins/FreeImage/src/LibJPEG/rdgif.c
diff --git a/plugins/FreeImage/Source/LibJPEG/rdjpgcom.c b/plugins/FreeImage/src/LibJPEG/rdjpgcom.c
index ab09b443ff..ab09b443ff 100644
--- a/plugins/FreeImage/Source/LibJPEG/rdjpgcom.c
+++ b/plugins/FreeImage/src/LibJPEG/rdjpgcom.c
diff --git a/plugins/FreeImage/Source/LibJPEG/rdppm.c b/plugins/FreeImage/src/LibJPEG/rdppm.c
index 9dcd2dc216..9dcd2dc216 100644
--- a/plugins/FreeImage/Source/LibJPEG/rdppm.c
+++ b/plugins/FreeImage/src/LibJPEG/rdppm.c
diff --git a/plugins/FreeImage/Source/LibJPEG/rdrle.c b/plugins/FreeImage/src/LibJPEG/rdrle.c
index df871e00a4..df871e00a4 100644
--- a/plugins/FreeImage/Source/LibJPEG/rdrle.c
+++ b/plugins/FreeImage/src/LibJPEG/rdrle.c
diff --git a/plugins/FreeImage/Source/LibJPEG/rdswitch.c b/plugins/FreeImage/src/LibJPEG/rdswitch.c
index 5eebcc1e5c..5eebcc1e5c 100644
--- a/plugins/FreeImage/Source/LibJPEG/rdswitch.c
+++ b/plugins/FreeImage/src/LibJPEG/rdswitch.c
diff --git a/plugins/FreeImage/Source/LibJPEG/rdtarga.c b/plugins/FreeImage/src/LibJPEG/rdtarga.c
index d7ffc33ebd..d7ffc33ebd 100644
--- a/plugins/FreeImage/Source/LibJPEG/rdtarga.c
+++ b/plugins/FreeImage/src/LibJPEG/rdtarga.c
diff --git a/plugins/FreeImage/Source/LibJPEG/transupp.c b/plugins/FreeImage/src/LibJPEG/transupp.c
index 016f383d4f..016f383d4f 100644
--- a/plugins/FreeImage/Source/LibJPEG/transupp.c
+++ b/plugins/FreeImage/src/LibJPEG/transupp.c
diff --git a/plugins/FreeImage/Source/LibJPEG/transupp.h b/plugins/FreeImage/src/LibJPEG/transupp.h
index 9aa0af385a..9aa0af385a 100644
--- a/plugins/FreeImage/Source/LibJPEG/transupp.h
+++ b/plugins/FreeImage/src/LibJPEG/transupp.h
diff --git a/plugins/FreeImage/Source/LibJPEG/wrbmp.c b/plugins/FreeImage/src/LibJPEG/wrbmp.c
index 2b8146e2c0..2b8146e2c0 100644
--- a/plugins/FreeImage/Source/LibJPEG/wrbmp.c
+++ b/plugins/FreeImage/src/LibJPEG/wrbmp.c
diff --git a/plugins/FreeImage/Source/LibJPEG/wrgif.c b/plugins/FreeImage/src/LibJPEG/wrgif.c
index 13f953b567..13f953b567 100644
--- a/plugins/FreeImage/Source/LibJPEG/wrgif.c
+++ b/plugins/FreeImage/src/LibJPEG/wrgif.c
diff --git a/plugins/FreeImage/Source/LibJPEG/wrjpgcom.c b/plugins/FreeImage/src/LibJPEG/wrjpgcom.c
index 7d10ee66e8..7d10ee66e8 100644
--- a/plugins/FreeImage/Source/LibJPEG/wrjpgcom.c
+++ b/plugins/FreeImage/src/LibJPEG/wrjpgcom.c
diff --git a/plugins/FreeImage/Source/LibJPEG/wrppm.c b/plugins/FreeImage/src/LibJPEG/wrppm.c
index 1e56d9c50e..1e56d9c50e 100644
--- a/plugins/FreeImage/Source/LibJPEG/wrppm.c
+++ b/plugins/FreeImage/src/LibJPEG/wrppm.c
diff --git a/plugins/FreeImage/Source/LibJPEG/wrrle.c b/plugins/FreeImage/src/LibJPEG/wrrle.c
index 7a00c0dd11..7a00c0dd11 100644
--- a/plugins/FreeImage/Source/LibJPEG/wrrle.c
+++ b/plugins/FreeImage/src/LibJPEG/wrrle.c
diff --git a/plugins/FreeImage/Source/LibJPEG/wrtarga.c b/plugins/FreeImage/src/LibJPEG/wrtarga.c
index 65662738d9..65662738d9 100644
--- a/plugins/FreeImage/Source/LibJPEG/wrtarga.c
+++ b/plugins/FreeImage/src/LibJPEG/wrtarga.c
diff --git a/plugins/FreeImage/Source/LibMNG/Changes b/plugins/FreeImage/src/LibMNG/Changes
index fbf2ac572f..fbf2ac572f 100644
--- a/plugins/FreeImage/Source/LibMNG/Changes
+++ b/plugins/FreeImage/src/LibMNG/Changes
diff --git a/plugins/FreeImage/Source/LibMNG/LICENSE b/plugins/FreeImage/src/LibMNG/LICENSE
index 5878e32a2a..5878e32a2a 100644
--- a/plugins/FreeImage/Source/LibMNG/LICENSE
+++ b/plugins/FreeImage/src/LibMNG/LICENSE
diff --git a/plugins/FreeImage/Source/LibMNG/README b/plugins/FreeImage/src/LibMNG/README
index 35b12596f1..35b12596f1 100644
--- a/plugins/FreeImage/Source/LibMNG/README
+++ b/plugins/FreeImage/src/LibMNG/README
diff --git a/plugins/FreeImage/Source/LibMNG/README.autoconf b/plugins/FreeImage/src/LibMNG/README.autoconf
index 97167b7d74..97167b7d74 100644
--- a/plugins/FreeImage/Source/LibMNG/README.autoconf
+++ b/plugins/FreeImage/src/LibMNG/README.autoconf
diff --git a/plugins/FreeImage/Source/LibMNG/README.config b/plugins/FreeImage/src/LibMNG/README.config
index 97fcb31606..97fcb31606 100644
--- a/plugins/FreeImage/Source/LibMNG/README.config
+++ b/plugins/FreeImage/src/LibMNG/README.config
diff --git a/plugins/FreeImage/Source/LibMNG/README.contrib b/plugins/FreeImage/src/LibMNG/README.contrib
index 2d51ac50a1..2d51ac50a1 100644
--- a/plugins/FreeImage/Source/LibMNG/README.contrib
+++ b/plugins/FreeImage/src/LibMNG/README.contrib
diff --git a/plugins/FreeImage/Source/LibMNG/README.examples b/plugins/FreeImage/src/LibMNG/README.examples
index 9f23b5077b..9f23b5077b 100644
--- a/plugins/FreeImage/Source/LibMNG/README.examples
+++ b/plugins/FreeImage/src/LibMNG/README.examples
diff --git a/plugins/FreeImage/Source/LibMNG/README.footprint b/plugins/FreeImage/src/LibMNG/README.footprint
index ae47da2c1a..ae47da2c1a 100644
--- a/plugins/FreeImage/Source/LibMNG/README.footprint
+++ b/plugins/FreeImage/src/LibMNG/README.footprint
diff --git a/plugins/FreeImage/Source/LibMNG/README.packaging b/plugins/FreeImage/src/LibMNG/README.packaging
index 32fb2da8be..32fb2da8be 100644
--- a/plugins/FreeImage/Source/LibMNG/README.packaging
+++ b/plugins/FreeImage/src/LibMNG/README.packaging
diff --git a/plugins/FreeImage/Source/LibMNG/libmng.h b/plugins/FreeImage/src/LibMNG/libmng.h
index 8513bf1127..8513bf1127 100644
--- a/plugins/FreeImage/Source/LibMNG/libmng.h
+++ b/plugins/FreeImage/src/LibMNG/libmng.h
diff --git a/plugins/FreeImage/Source/LibMNG/libmng_callback_xs.c b/plugins/FreeImage/src/LibMNG/libmng_callback_xs.c
index e8f1efeb66..e8f1efeb66 100644
--- a/plugins/FreeImage/Source/LibMNG/libmng_callback_xs.c
+++ b/plugins/FreeImage/src/LibMNG/libmng_callback_xs.c
diff --git a/plugins/FreeImage/Source/LibMNG/libmng_chunk_descr.c b/plugins/FreeImage/src/LibMNG/libmng_chunk_descr.c
index 5a4bfa0381..5a4bfa0381 100644
--- a/plugins/FreeImage/Source/LibMNG/libmng_chunk_descr.c
+++ b/plugins/FreeImage/src/LibMNG/libmng_chunk_descr.c
diff --git a/plugins/FreeImage/Source/LibMNG/libmng_chunk_descr.h b/plugins/FreeImage/src/LibMNG/libmng_chunk_descr.h
index 5126cb2775..5126cb2775 100644
--- a/plugins/FreeImage/Source/LibMNG/libmng_chunk_descr.h
+++ b/plugins/FreeImage/src/LibMNG/libmng_chunk_descr.h
diff --git a/plugins/FreeImage/Source/LibMNG/libmng_chunk_io.c b/plugins/FreeImage/src/LibMNG/libmng_chunk_io.c
index a75945f063..a75945f063 100644
--- a/plugins/FreeImage/Source/LibMNG/libmng_chunk_io.c
+++ b/plugins/FreeImage/src/LibMNG/libmng_chunk_io.c
diff --git a/plugins/FreeImage/Source/LibMNG/libmng_chunk_io.h b/plugins/FreeImage/src/LibMNG/libmng_chunk_io.h
index b47f8639b9..b47f8639b9 100644
--- a/plugins/FreeImage/Source/LibMNG/libmng_chunk_io.h
+++ b/plugins/FreeImage/src/LibMNG/libmng_chunk_io.h
diff --git a/plugins/FreeImage/Source/LibMNG/libmng_chunk_prc.c b/plugins/FreeImage/src/LibMNG/libmng_chunk_prc.c
index 6c8e5897f5..6c8e5897f5 100644
--- a/plugins/FreeImage/Source/LibMNG/libmng_chunk_prc.c
+++ b/plugins/FreeImage/src/LibMNG/libmng_chunk_prc.c
diff --git a/plugins/FreeImage/Source/LibMNG/libmng_chunk_prc.h b/plugins/FreeImage/src/LibMNG/libmng_chunk_prc.h
index 96db17498e..96db17498e 100644
--- a/plugins/FreeImage/Source/LibMNG/libmng_chunk_prc.h
+++ b/plugins/FreeImage/src/LibMNG/libmng_chunk_prc.h
diff --git a/plugins/FreeImage/Source/LibMNG/libmng_chunk_xs.c b/plugins/FreeImage/src/LibMNG/libmng_chunk_xs.c
index 1c4ec2e50d..1c4ec2e50d 100644
--- a/plugins/FreeImage/Source/LibMNG/libmng_chunk_xs.c
+++ b/plugins/FreeImage/src/LibMNG/libmng_chunk_xs.c
diff --git a/plugins/FreeImage/Source/LibMNG/libmng_chunks.h b/plugins/FreeImage/src/LibMNG/libmng_chunks.h
index 6c50d8b867..6c50d8b867 100644
--- a/plugins/FreeImage/Source/LibMNG/libmng_chunks.h
+++ b/plugins/FreeImage/src/LibMNG/libmng_chunks.h
diff --git a/plugins/FreeImage/Source/LibMNG/libmng_cms.c b/plugins/FreeImage/src/LibMNG/libmng_cms.c
index f215271f2a..f215271f2a 100644
--- a/plugins/FreeImage/Source/LibMNG/libmng_cms.c
+++ b/plugins/FreeImage/src/LibMNG/libmng_cms.c
diff --git a/plugins/FreeImage/Source/LibMNG/libmng_cms.h b/plugins/FreeImage/src/LibMNG/libmng_cms.h
index d442a3fa6a..d442a3fa6a 100644
--- a/plugins/FreeImage/Source/LibMNG/libmng_cms.h
+++ b/plugins/FreeImage/src/LibMNG/libmng_cms.h
diff --git a/plugins/FreeImage/Source/LibMNG/libmng_conf.h b/plugins/FreeImage/src/LibMNG/libmng_conf.h
index 5f6fdb91a5..5f6fdb91a5 100644
--- a/plugins/FreeImage/Source/LibMNG/libmng_conf.h
+++ b/plugins/FreeImage/src/LibMNG/libmng_conf.h
diff --git a/plugins/FreeImage/Source/LibMNG/libmng_data.h b/plugins/FreeImage/src/LibMNG/libmng_data.h
index dd715b0989..dd715b0989 100644
--- a/plugins/FreeImage/Source/LibMNG/libmng_data.h
+++ b/plugins/FreeImage/src/LibMNG/libmng_data.h
diff --git a/plugins/FreeImage/Source/LibMNG/libmng_display.c b/plugins/FreeImage/src/LibMNG/libmng_display.c
index 65a5c31d95..65a5c31d95 100644
--- a/plugins/FreeImage/Source/LibMNG/libmng_display.c
+++ b/plugins/FreeImage/src/LibMNG/libmng_display.c
diff --git a/plugins/FreeImage/Source/LibMNG/libmng_display.h b/plugins/FreeImage/src/LibMNG/libmng_display.h
index 3dc6ca2d91..3dc6ca2d91 100644
--- a/plugins/FreeImage/Source/LibMNG/libmng_display.h
+++ b/plugins/FreeImage/src/LibMNG/libmng_display.h
diff --git a/plugins/FreeImage/Source/LibMNG/libmng_dither.c b/plugins/FreeImage/src/LibMNG/libmng_dither.c
index 3ba2a7069c..3ba2a7069c 100644
--- a/plugins/FreeImage/Source/LibMNG/libmng_dither.c
+++ b/plugins/FreeImage/src/LibMNG/libmng_dither.c
diff --git a/plugins/FreeImage/Source/LibMNG/libmng_dither.h b/plugins/FreeImage/src/LibMNG/libmng_dither.h
index 250c0b9d28..250c0b9d28 100644
--- a/plugins/FreeImage/Source/LibMNG/libmng_dither.h
+++ b/plugins/FreeImage/src/LibMNG/libmng_dither.h
diff --git a/plugins/FreeImage/Source/LibMNG/libmng_error.c b/plugins/FreeImage/src/LibMNG/libmng_error.c
index 89501a2eae..89501a2eae 100644
--- a/plugins/FreeImage/Source/LibMNG/libmng_error.c
+++ b/plugins/FreeImage/src/LibMNG/libmng_error.c
diff --git a/plugins/FreeImage/Source/LibMNG/libmng_error.h b/plugins/FreeImage/src/LibMNG/libmng_error.h
index 14eb450a28..14eb450a28 100644
--- a/plugins/FreeImage/Source/LibMNG/libmng_error.h
+++ b/plugins/FreeImage/src/LibMNG/libmng_error.h
diff --git a/plugins/FreeImage/Source/LibMNG/libmng_filter.c b/plugins/FreeImage/src/LibMNG/libmng_filter.c
index ad57a3be90..ad57a3be90 100644
--- a/plugins/FreeImage/Source/LibMNG/libmng_filter.c
+++ b/plugins/FreeImage/src/LibMNG/libmng_filter.c
diff --git a/plugins/FreeImage/Source/LibMNG/libmng_filter.h b/plugins/FreeImage/src/LibMNG/libmng_filter.h
index 5ff4cb609b..5ff4cb609b 100644
--- a/plugins/FreeImage/Source/LibMNG/libmng_filter.h
+++ b/plugins/FreeImage/src/LibMNG/libmng_filter.h
diff --git a/plugins/FreeImage/Source/LibMNG/libmng_hlapi.c b/plugins/FreeImage/src/LibMNG/libmng_hlapi.c
index ef0c2e1484..ef0c2e1484 100644
--- a/plugins/FreeImage/Source/LibMNG/libmng_hlapi.c
+++ b/plugins/FreeImage/src/LibMNG/libmng_hlapi.c
diff --git a/plugins/FreeImage/Source/LibMNG/libmng_jpeg.c b/plugins/FreeImage/src/LibMNG/libmng_jpeg.c
index 409f6df74d..409f6df74d 100644
--- a/plugins/FreeImage/Source/LibMNG/libmng_jpeg.c
+++ b/plugins/FreeImage/src/LibMNG/libmng_jpeg.c
diff --git a/plugins/FreeImage/Source/LibMNG/libmng_jpeg.h b/plugins/FreeImage/src/LibMNG/libmng_jpeg.h
index ef9dbf204d..ef9dbf204d 100644
--- a/plugins/FreeImage/Source/LibMNG/libmng_jpeg.h
+++ b/plugins/FreeImage/src/LibMNG/libmng_jpeg.h
diff --git a/plugins/FreeImage/Source/LibMNG/libmng_memory.h b/plugins/FreeImage/src/LibMNG/libmng_memory.h
index 9da16a460b..9da16a460b 100644
--- a/plugins/FreeImage/Source/LibMNG/libmng_memory.h
+++ b/plugins/FreeImage/src/LibMNG/libmng_memory.h
diff --git a/plugins/FreeImage/Source/LibMNG/libmng_object_prc.c b/plugins/FreeImage/src/LibMNG/libmng_object_prc.c
index 570d346aa6..570d346aa6 100644
--- a/plugins/FreeImage/Source/LibMNG/libmng_object_prc.c
+++ b/plugins/FreeImage/src/LibMNG/libmng_object_prc.c
diff --git a/plugins/FreeImage/Source/LibMNG/libmng_object_prc.h b/plugins/FreeImage/src/LibMNG/libmng_object_prc.h
index 46d201ca0e..46d201ca0e 100644
--- a/plugins/FreeImage/Source/LibMNG/libmng_object_prc.h
+++ b/plugins/FreeImage/src/LibMNG/libmng_object_prc.h
diff --git a/plugins/FreeImage/Source/LibMNG/libmng_objects.h b/plugins/FreeImage/src/LibMNG/libmng_objects.h
index ab7290fdf3..ab7290fdf3 100644
--- a/plugins/FreeImage/Source/LibMNG/libmng_objects.h
+++ b/plugins/FreeImage/src/LibMNG/libmng_objects.h
diff --git a/plugins/FreeImage/Source/LibMNG/libmng_pixels.c b/plugins/FreeImage/src/LibMNG/libmng_pixels.c
index 9990ee67bb..9990ee67bb 100644
--- a/plugins/FreeImage/Source/LibMNG/libmng_pixels.c
+++ b/plugins/FreeImage/src/LibMNG/libmng_pixels.c
diff --git a/plugins/FreeImage/Source/LibMNG/libmng_pixels.h b/plugins/FreeImage/src/LibMNG/libmng_pixels.h
index 203d1c1f99..203d1c1f99 100644
--- a/plugins/FreeImage/Source/LibMNG/libmng_pixels.h
+++ b/plugins/FreeImage/src/LibMNG/libmng_pixels.h
diff --git a/plugins/FreeImage/Source/LibMNG/libmng_prop_xs.c b/plugins/FreeImage/src/LibMNG/libmng_prop_xs.c
index d4afc87d09..d4afc87d09 100644
--- a/plugins/FreeImage/Source/LibMNG/libmng_prop_xs.c
+++ b/plugins/FreeImage/src/LibMNG/libmng_prop_xs.c
diff --git a/plugins/FreeImage/Source/LibMNG/libmng_read.c b/plugins/FreeImage/src/LibMNG/libmng_read.c
index 3a6e49fcac..3a6e49fcac 100644
--- a/plugins/FreeImage/Source/LibMNG/libmng_read.c
+++ b/plugins/FreeImage/src/LibMNG/libmng_read.c
diff --git a/plugins/FreeImage/Source/LibMNG/libmng_read.h b/plugins/FreeImage/src/LibMNG/libmng_read.h
index e6399532b7..e6399532b7 100644
--- a/plugins/FreeImage/Source/LibMNG/libmng_read.h
+++ b/plugins/FreeImage/src/LibMNG/libmng_read.h
diff --git a/plugins/FreeImage/Source/LibMNG/libmng_trace.c b/plugins/FreeImage/src/LibMNG/libmng_trace.c
index ffb7b57d2e..ffb7b57d2e 100644
--- a/plugins/FreeImage/Source/LibMNG/libmng_trace.c
+++ b/plugins/FreeImage/src/LibMNG/libmng_trace.c
diff --git a/plugins/FreeImage/Source/LibMNG/libmng_trace.h b/plugins/FreeImage/src/LibMNG/libmng_trace.h
index d8621c34c3..d8621c34c3 100644
--- a/plugins/FreeImage/Source/LibMNG/libmng_trace.h
+++ b/plugins/FreeImage/src/LibMNG/libmng_trace.h
diff --git a/plugins/FreeImage/Source/LibMNG/libmng_types.h b/plugins/FreeImage/src/LibMNG/libmng_types.h
index 08086b69f2..08086b69f2 100644
--- a/plugins/FreeImage/Source/LibMNG/libmng_types.h
+++ b/plugins/FreeImage/src/LibMNG/libmng_types.h
diff --git a/plugins/FreeImage/Source/LibMNG/libmng_write.c b/plugins/FreeImage/src/LibMNG/libmng_write.c
index 22ed3a01e4..22ed3a01e4 100644
--- a/plugins/FreeImage/Source/LibMNG/libmng_write.c
+++ b/plugins/FreeImage/src/LibMNG/libmng_write.c
diff --git a/plugins/FreeImage/Source/LibMNG/libmng_write.h b/plugins/FreeImage/src/LibMNG/libmng_write.h
index 31e5d1b622..31e5d1b622 100644
--- a/plugins/FreeImage/Source/LibMNG/libmng_write.h
+++ b/plugins/FreeImage/src/LibMNG/libmng_write.h
diff --git a/plugins/FreeImage/Source/LibMNG/libmng_zlib.c b/plugins/FreeImage/src/LibMNG/libmng_zlib.c
index 894bc74ac7..894bc74ac7 100644
--- a/plugins/FreeImage/Source/LibMNG/libmng_zlib.c
+++ b/plugins/FreeImage/src/LibMNG/libmng_zlib.c
diff --git a/plugins/FreeImage/Source/LibMNG/libmng_zlib.h b/plugins/FreeImage/src/LibMNG/libmng_zlib.h
index 4309344ded..4309344ded 100644
--- a/plugins/FreeImage/Source/LibMNG/libmng_zlib.h
+++ b/plugins/FreeImage/src/LibMNG/libmng_zlib.h
diff --git a/plugins/FreeImage/Source/LibPNG/ANNOUNCE b/plugins/FreeImage/src/LibPNG/ANNOUNCE
index e8498a379c..e8498a379c 100644
--- a/plugins/FreeImage/Source/LibPNG/ANNOUNCE
+++ b/plugins/FreeImage/src/LibPNG/ANNOUNCE
diff --git a/plugins/FreeImage/Source/LibPNG/CHANGES b/plugins/FreeImage/src/LibPNG/CHANGES
index fb3a90be8c..fb3a90be8c 100644
--- a/plugins/FreeImage/Source/LibPNG/CHANGES
+++ b/plugins/FreeImage/src/LibPNG/CHANGES
diff --git a/plugins/FreeImage/Source/LibPNG/INSTALL b/plugins/FreeImage/src/LibPNG/INSTALL
index c2d6c9e24a..c2d6c9e24a 100644
--- a/plugins/FreeImage/Source/LibPNG/INSTALL
+++ b/plugins/FreeImage/src/LibPNG/INSTALL
diff --git a/plugins/FreeImage/Source/LibPNG/KNOWNBUG b/plugins/FreeImage/src/LibPNG/KNOWNBUG
index f3ddc5245f..f3ddc5245f 100644
--- a/plugins/FreeImage/Source/LibPNG/KNOWNBUG
+++ b/plugins/FreeImage/src/LibPNG/KNOWNBUG
diff --git a/plugins/FreeImage/Source/LibPNG/LICENSE b/plugins/FreeImage/src/LibPNG/LICENSE
index 0c927409ac..0c927409ac 100644
--- a/plugins/FreeImage/Source/LibPNG/LICENSE
+++ b/plugins/FreeImage/src/LibPNG/LICENSE
diff --git a/plugins/FreeImage/Source/LibPNG/README b/plugins/FreeImage/src/LibPNG/README
index c648a5ad78..c648a5ad78 100644
--- a/plugins/FreeImage/Source/LibPNG/README
+++ b/plugins/FreeImage/src/LibPNG/README
diff --git a/plugins/FreeImage/Source/LibPNG/TODO b/plugins/FreeImage/src/LibPNG/TODO
index b1660a413a..b1660a413a 100644
--- a/plugins/FreeImage/Source/LibPNG/TODO
+++ b/plugins/FreeImage/src/LibPNG/TODO
diff --git a/plugins/FreeImage/Source/LibPNG/Y2KINFO b/plugins/FreeImage/src/LibPNG/Y2KINFO
index 7776d83732..7776d83732 100644
--- a/plugins/FreeImage/Source/LibPNG/Y2KINFO
+++ b/plugins/FreeImage/src/LibPNG/Y2KINFO
diff --git a/plugins/FreeImage/Source/LibPNG/configure b/plugins/FreeImage/src/LibPNG/configure
index 9da0f74eca..9da0f74eca 100644
--- a/plugins/FreeImage/Source/LibPNG/configure
+++ b/plugins/FreeImage/src/LibPNG/configure
diff --git a/plugins/FreeImage/Source/LibPNG/libpng.3 b/plugins/FreeImage/src/LibPNG/libpng.3
index 1d72ab4cae..1d72ab4cae 100644
--- a/plugins/FreeImage/Source/LibPNG/libpng.3
+++ b/plugins/FreeImage/src/LibPNG/libpng.3
diff --git a/plugins/FreeImage/Source/LibPNG/libpng.txt b/plugins/FreeImage/src/LibPNG/libpng.txt
index f1eefbbb37..f1eefbbb37 100644
--- a/plugins/FreeImage/Source/LibPNG/libpng.txt
+++ b/plugins/FreeImage/src/LibPNG/libpng.txt
diff --git a/plugins/FreeImage/Source/LibPNG/libpngpf.3 b/plugins/FreeImage/src/LibPNG/libpngpf.3
index ef54f7b5b0..ef54f7b5b0 100644
--- a/plugins/FreeImage/Source/LibPNG/libpngpf.3
+++ b/plugins/FreeImage/src/LibPNG/libpngpf.3
diff --git a/plugins/FreeImage/Source/LibPNG/png.5 b/plugins/FreeImage/src/LibPNG/png.5
index 6df917d4ae..6df917d4ae 100644
--- a/plugins/FreeImage/Source/LibPNG/png.5
+++ b/plugins/FreeImage/src/LibPNG/png.5
diff --git a/plugins/FreeImage/Source/LibPNG/png.c b/plugins/FreeImage/src/LibPNG/png.c
index 0df53a62af..0df53a62af 100644
--- a/plugins/FreeImage/Source/LibPNG/png.c
+++ b/plugins/FreeImage/src/LibPNG/png.c
diff --git a/plugins/FreeImage/Source/LibPNG/png.h b/plugins/FreeImage/src/LibPNG/png.h
index 81267675a5..81267675a5 100644
--- a/plugins/FreeImage/Source/LibPNG/png.h
+++ b/plugins/FreeImage/src/LibPNG/png.h
diff --git a/plugins/FreeImage/Source/LibPNG/pngconf.h b/plugins/FreeImage/src/LibPNG/pngconf.h
index 121d204ccd..121d204ccd 100644
--- a/plugins/FreeImage/Source/LibPNG/pngconf.h
+++ b/plugins/FreeImage/src/LibPNG/pngconf.h
diff --git a/plugins/FreeImage/Source/LibPNG/pngdebug.h b/plugins/FreeImage/src/LibPNG/pngdebug.h
index 96c1ea42b3..96c1ea42b3 100644
--- a/plugins/FreeImage/Source/LibPNG/pngdebug.h
+++ b/plugins/FreeImage/src/LibPNG/pngdebug.h
diff --git a/plugins/FreeImage/Source/LibPNG/pngerror.c b/plugins/FreeImage/src/LibPNG/pngerror.c
index 9df97f583c..9df97f583c 100644
--- a/plugins/FreeImage/Source/LibPNG/pngerror.c
+++ b/plugins/FreeImage/src/LibPNG/pngerror.c
diff --git a/plugins/FreeImage/Source/LibPNG/pngget.c b/plugins/FreeImage/src/LibPNG/pngget.c
index 1889e9903e..1889e9903e 100644
--- a/plugins/FreeImage/Source/LibPNG/pngget.c
+++ b/plugins/FreeImage/src/LibPNG/pngget.c
diff --git a/plugins/FreeImage/Source/LibPNG/pnginfo.h b/plugins/FreeImage/src/LibPNG/pnginfo.h
index bbfb105aaf..bbfb105aaf 100644
--- a/plugins/FreeImage/Source/LibPNG/pnginfo.h
+++ b/plugins/FreeImage/src/LibPNG/pnginfo.h
diff --git a/plugins/FreeImage/Source/LibPNG/pnglibconf.h b/plugins/FreeImage/src/LibPNG/pnglibconf.h
index 8022a5a881..8022a5a881 100644
--- a/plugins/FreeImage/Source/LibPNG/pnglibconf.h
+++ b/plugins/FreeImage/src/LibPNG/pnglibconf.h
diff --git a/plugins/FreeImage/Source/LibPNG/pngmem.c b/plugins/FreeImage/src/LibPNG/pngmem.c
index 25b5c73546..25b5c73546 100644
--- a/plugins/FreeImage/Source/LibPNG/pngmem.c
+++ b/plugins/FreeImage/src/LibPNG/pngmem.c
diff --git a/plugins/FreeImage/Source/LibPNG/pngpread.c b/plugins/FreeImage/src/LibPNG/pngpread.c
index eda5a6c80f..eda5a6c80f 100644
--- a/plugins/FreeImage/Source/LibPNG/pngpread.c
+++ b/plugins/FreeImage/src/LibPNG/pngpread.c
diff --git a/plugins/FreeImage/Source/LibPNG/pngpriv.h b/plugins/FreeImage/src/LibPNG/pngpriv.h
index 02cc5d8c53..02cc5d8c53 100644
--- a/plugins/FreeImage/Source/LibPNG/pngpriv.h
+++ b/plugins/FreeImage/src/LibPNG/pngpriv.h
diff --git a/plugins/FreeImage/Source/LibPNG/pngread.c b/plugins/FreeImage/src/LibPNG/pngread.c
index e2641d540f..e2641d540f 100644
--- a/plugins/FreeImage/Source/LibPNG/pngread.c
+++ b/plugins/FreeImage/src/LibPNG/pngread.c
diff --git a/plugins/FreeImage/Source/LibPNG/pngrio.c b/plugins/FreeImage/src/LibPNG/pngrio.c
index d0d9d8a737..d0d9d8a737 100644
--- a/plugins/FreeImage/Source/LibPNG/pngrio.c
+++ b/plugins/FreeImage/src/LibPNG/pngrio.c
diff --git a/plugins/FreeImage/Source/LibPNG/pngrtran.c b/plugins/FreeImage/src/LibPNG/pngrtran.c
index bbee10ce56..bbee10ce56 100644
--- a/plugins/FreeImage/Source/LibPNG/pngrtran.c
+++ b/plugins/FreeImage/src/LibPNG/pngrtran.c
diff --git a/plugins/FreeImage/Source/LibPNG/pngrutil.c b/plugins/FreeImage/src/LibPNG/pngrutil.c
index 995896dbc5..995896dbc5 100644
--- a/plugins/FreeImage/Source/LibPNG/pngrutil.c
+++ b/plugins/FreeImage/src/LibPNG/pngrutil.c
diff --git a/plugins/FreeImage/Source/LibPNG/pngset.c b/plugins/FreeImage/src/LibPNG/pngset.c
index e753ca8867..e753ca8867 100644
--- a/plugins/FreeImage/Source/LibPNG/pngset.c
+++ b/plugins/FreeImage/src/LibPNG/pngset.c
diff --git a/plugins/FreeImage/Source/LibPNG/pngstruct.h b/plugins/FreeImage/src/LibPNG/pngstruct.h
index 1824c49114..1824c49114 100644
--- a/plugins/FreeImage/Source/LibPNG/pngstruct.h
+++ b/plugins/FreeImage/src/LibPNG/pngstruct.h
diff --git a/plugins/FreeImage/Source/LibPNG/pngtest.c b/plugins/FreeImage/src/LibPNG/pngtest.c
index 840517400b..840517400b 100644
--- a/plugins/FreeImage/Source/LibPNG/pngtest.c
+++ b/plugins/FreeImage/src/LibPNG/pngtest.c
diff --git a/plugins/FreeImage/Source/LibPNG/pngtrans.c b/plugins/FreeImage/src/LibPNG/pngtrans.c
index 53d9a25b95..53d9a25b95 100644
--- a/plugins/FreeImage/Source/LibPNG/pngtrans.c
+++ b/plugins/FreeImage/src/LibPNG/pngtrans.c
diff --git a/plugins/FreeImage/Source/LibPNG/pngwio.c b/plugins/FreeImage/src/LibPNG/pngwio.c
index 8eacf9f6d4..8eacf9f6d4 100644
--- a/plugins/FreeImage/Source/LibPNG/pngwio.c
+++ b/plugins/FreeImage/src/LibPNG/pngwio.c
diff --git a/plugins/FreeImage/Source/LibPNG/pngwrite.c b/plugins/FreeImage/src/LibPNG/pngwrite.c
index dc12a20481..dc12a20481 100644
--- a/plugins/FreeImage/Source/LibPNG/pngwrite.c
+++ b/plugins/FreeImage/src/LibPNG/pngwrite.c
diff --git a/plugins/FreeImage/Source/LibPNG/pngwtran.c b/plugins/FreeImage/src/LibPNG/pngwtran.c
index b598149a96..b598149a96 100644
--- a/plugins/FreeImage/Source/LibPNG/pngwtran.c
+++ b/plugins/FreeImage/src/LibPNG/pngwtran.c
diff --git a/plugins/FreeImage/Source/LibPNG/pngwutil.c b/plugins/FreeImage/src/LibPNG/pngwutil.c
index 64888f7c6c..64888f7c6c 100644
--- a/plugins/FreeImage/Source/LibPNG/pngwutil.c
+++ b/plugins/FreeImage/src/LibPNG/pngwutil.c
diff --git a/plugins/FreeImage/Source/LibTIFF/ChangeLog b/plugins/FreeImage/src/LibTIFF/ChangeLog
index f3dfe26b0b..f3dfe26b0b 100644
--- a/plugins/FreeImage/Source/LibTIFF/ChangeLog
+++ b/plugins/FreeImage/src/LibTIFF/ChangeLog
diff --git a/plugins/FreeImage/Source/LibTIFF/LibTIFF.dsp b/plugins/FreeImage/src/LibTIFF/LibTIFF.dsp
index 9dd04050be..9dd04050be 100644
--- a/plugins/FreeImage/Source/LibTIFF/LibTIFF.dsp
+++ b/plugins/FreeImage/src/LibTIFF/LibTIFF.dsp
diff --git a/plugins/FreeImage/Source/LibTIFF/SConstruct b/plugins/FreeImage/src/LibTIFF/SConstruct
index d1a2620cf5..d1a2620cf5 100644
--- a/plugins/FreeImage/Source/LibTIFF/SConstruct
+++ b/plugins/FreeImage/src/LibTIFF/SConstruct
diff --git a/plugins/FreeImage/Source/LibTIFF/mkg3states.c b/plugins/FreeImage/src/LibTIFF/mkg3states.c
index 46fac37a9c..46fac37a9c 100644
--- a/plugins/FreeImage/Source/LibTIFF/mkg3states.c
+++ b/plugins/FreeImage/src/LibTIFF/mkg3states.c
diff --git a/plugins/FreeImage/Source/LibTIFF/t4.h b/plugins/FreeImage/src/LibTIFF/t4.h
index 1457ebfabe..1457ebfabe 100644
--- a/plugins/FreeImage/Source/LibTIFF/t4.h
+++ b/plugins/FreeImage/src/LibTIFF/t4.h
diff --git a/plugins/FreeImage/Source/LibTIFF/tif_acorn.c b/plugins/FreeImage/src/LibTIFF/tif_acorn.c
index d2de42de53..d2de42de53 100644
--- a/plugins/FreeImage/Source/LibTIFF/tif_acorn.c
+++ b/plugins/FreeImage/src/LibTIFF/tif_acorn.c
diff --git a/plugins/FreeImage/Source/LibTIFF/tif_apple.c b/plugins/FreeImage/src/LibTIFF/tif_apple.c
index 0cd2948cb7..0cd2948cb7 100644
--- a/plugins/FreeImage/Source/LibTIFF/tif_apple.c
+++ b/plugins/FreeImage/src/LibTIFF/tif_apple.c
diff --git a/plugins/FreeImage/Source/LibTIFF/tif_atari.c b/plugins/FreeImage/src/LibTIFF/tif_atari.c
index 62453a1d93..62453a1d93 100644
--- a/plugins/FreeImage/Source/LibTIFF/tif_atari.c
+++ b/plugins/FreeImage/src/LibTIFF/tif_atari.c
diff --git a/plugins/FreeImage/Source/LibTIFF/tif_aux.c b/plugins/FreeImage/src/LibTIFF/tif_aux.c
index 92df69bd1a..92df69bd1a 100644
--- a/plugins/FreeImage/Source/LibTIFF/tif_aux.c
+++ b/plugins/FreeImage/src/LibTIFF/tif_aux.c
diff --git a/plugins/FreeImage/Source/LibTIFF/tif_close.c b/plugins/FreeImage/src/LibTIFF/tif_close.c
index 03a8847e84..03a8847e84 100644
--- a/plugins/FreeImage/Source/LibTIFF/tif_close.c
+++ b/plugins/FreeImage/src/LibTIFF/tif_close.c
diff --git a/plugins/FreeImage/Source/LibTIFF/tif_codec.c b/plugins/FreeImage/src/LibTIFF/tif_codec.c
index 7876a5fc63..7876a5fc63 100644
--- a/plugins/FreeImage/Source/LibTIFF/tif_codec.c
+++ b/plugins/FreeImage/src/LibTIFF/tif_codec.c
diff --git a/plugins/FreeImage/Source/LibTIFF/tif_color.c b/plugins/FreeImage/src/LibTIFF/tif_color.c
index f0302e4bf2..f0302e4bf2 100644
--- a/plugins/FreeImage/Source/LibTIFF/tif_color.c
+++ b/plugins/FreeImage/src/LibTIFF/tif_color.c
diff --git a/plugins/FreeImage/Source/LibTIFF/tif_compress.c b/plugins/FreeImage/src/LibTIFF/tif_compress.c
index ac471b1e10..ac471b1e10 100644
--- a/plugins/FreeImage/Source/LibTIFF/tif_compress.c
+++ b/plugins/FreeImage/src/LibTIFF/tif_compress.c
diff --git a/plugins/FreeImage/Source/LibTIFF/tif_config.h b/plugins/FreeImage/src/LibTIFF/tif_config.h
index 3e08176627..3e08176627 100644
--- a/plugins/FreeImage/Source/LibTIFF/tif_config.h
+++ b/plugins/FreeImage/src/LibTIFF/tif_config.h
diff --git a/plugins/FreeImage/Source/LibTIFF/tif_config.h-vms b/plugins/FreeImage/src/LibTIFF/tif_config.h-vms
index c2cae5752e..c2cae5752e 100644
--- a/plugins/FreeImage/Source/LibTIFF/tif_config.h-vms
+++ b/plugins/FreeImage/src/LibTIFF/tif_config.h-vms
diff --git a/plugins/FreeImage/Source/LibTIFF/tif_config.h.in b/plugins/FreeImage/src/LibTIFF/tif_config.h.in
index 86c07e6a99..86c07e6a99 100644
--- a/plugins/FreeImage/Source/LibTIFF/tif_config.h.in
+++ b/plugins/FreeImage/src/LibTIFF/tif_config.h.in
diff --git a/plugins/FreeImage/Source/LibTIFF/tif_config.vc.h b/plugins/FreeImage/src/LibTIFF/tif_config.vc.h
index 2bb16d3322..2bb16d3322 100644
--- a/plugins/FreeImage/Source/LibTIFF/tif_config.vc.h
+++ b/plugins/FreeImage/src/LibTIFF/tif_config.vc.h
diff --git a/plugins/FreeImage/Source/LibTIFF/tif_dir.c b/plugins/FreeImage/src/LibTIFF/tif_dir.c
index 081bb43c06..081bb43c06 100644
--- a/plugins/FreeImage/Source/LibTIFF/tif_dir.c
+++ b/plugins/FreeImage/src/LibTIFF/tif_dir.c
diff --git a/plugins/FreeImage/Source/LibTIFF/tif_dir.h b/plugins/FreeImage/src/LibTIFF/tif_dir.h
index f642834c44..f642834c44 100644
--- a/plugins/FreeImage/Source/LibTIFF/tif_dir.h
+++ b/plugins/FreeImage/src/LibTIFF/tif_dir.h
diff --git a/plugins/FreeImage/Source/LibTIFF/tif_dirinfo.c b/plugins/FreeImage/src/LibTIFF/tif_dirinfo.c
index 7b7507a8cb..7b7507a8cb 100644
--- a/plugins/FreeImage/Source/LibTIFF/tif_dirinfo.c
+++ b/plugins/FreeImage/src/LibTIFF/tif_dirinfo.c
diff --git a/plugins/FreeImage/Source/LibTIFF/tif_dirread.c b/plugins/FreeImage/src/LibTIFF/tif_dirread.c
index 3567b2ae51..3567b2ae51 100644
--- a/plugins/FreeImage/Source/LibTIFF/tif_dirread.c
+++ b/plugins/FreeImage/src/LibTIFF/tif_dirread.c
diff --git a/plugins/FreeImage/Source/LibTIFF/tif_dirwrite.c b/plugins/FreeImage/src/LibTIFF/tif_dirwrite.c
index 962937298e..962937298e 100644
--- a/plugins/FreeImage/Source/LibTIFF/tif_dirwrite.c
+++ b/plugins/FreeImage/src/LibTIFF/tif_dirwrite.c
diff --git a/plugins/FreeImage/Source/LibTIFF/tif_dumpmode.c b/plugins/FreeImage/src/LibTIFF/tif_dumpmode.c
index 273614728d..273614728d 100644
--- a/plugins/FreeImage/Source/LibTIFF/tif_dumpmode.c
+++ b/plugins/FreeImage/src/LibTIFF/tif_dumpmode.c
diff --git a/plugins/FreeImage/Source/LibTIFF/tif_error.c b/plugins/FreeImage/src/LibTIFF/tif_error.c
index 23f90648de..23f90648de 100644
--- a/plugins/FreeImage/Source/LibTIFF/tif_error.c
+++ b/plugins/FreeImage/src/LibTIFF/tif_error.c
diff --git a/plugins/FreeImage/Source/LibTIFF/tif_extension.c b/plugins/FreeImage/src/LibTIFF/tif_extension.c
index e8fb4a2cac..e8fb4a2cac 100644
--- a/plugins/FreeImage/Source/LibTIFF/tif_extension.c
+++ b/plugins/FreeImage/src/LibTIFF/tif_extension.c
diff --git a/plugins/FreeImage/Source/LibTIFF/tif_fax3.c b/plugins/FreeImage/src/LibTIFF/tif_fax3.c
index 2e74a37c69..2e74a37c69 100644
--- a/plugins/FreeImage/Source/LibTIFF/tif_fax3.c
+++ b/plugins/FreeImage/src/LibTIFF/tif_fax3.c
diff --git a/plugins/FreeImage/Source/LibTIFF/tif_fax3.h b/plugins/FreeImage/src/LibTIFF/tif_fax3.h
index ec2811f660..ec2811f660 100644
--- a/plugins/FreeImage/Source/LibTIFF/tif_fax3.h
+++ b/plugins/FreeImage/src/LibTIFF/tif_fax3.h
diff --git a/plugins/FreeImage/Source/LibTIFF/tif_fax3sm.c b/plugins/FreeImage/src/LibTIFF/tif_fax3sm.c
index 1e2fe42316..1e2fe42316 100644
--- a/plugins/FreeImage/Source/LibTIFF/tif_fax3sm.c
+++ b/plugins/FreeImage/src/LibTIFF/tif_fax3sm.c
diff --git a/plugins/FreeImage/Source/LibTIFF/tif_flush.c b/plugins/FreeImage/src/LibTIFF/tif_flush.c
index af7fdd9b2a..af7fdd9b2a 100644
--- a/plugins/FreeImage/Source/LibTIFF/tif_flush.c
+++ b/plugins/FreeImage/src/LibTIFF/tif_flush.c
diff --git a/plugins/FreeImage/Source/LibTIFF/tif_getimage.c b/plugins/FreeImage/src/LibTIFF/tif_getimage.c
index 041e540cba..041e540cba 100644
--- a/plugins/FreeImage/Source/LibTIFF/tif_getimage.c
+++ b/plugins/FreeImage/src/LibTIFF/tif_getimage.c
diff --git a/plugins/FreeImage/Source/LibTIFF/tif_jbig.c b/plugins/FreeImage/src/LibTIFF/tif_jbig.c
index c779c9b0f6..c779c9b0f6 100644
--- a/plugins/FreeImage/Source/LibTIFF/tif_jbig.c
+++ b/plugins/FreeImage/src/LibTIFF/tif_jbig.c
diff --git a/plugins/FreeImage/Source/LibTIFF/tif_jpeg.c b/plugins/FreeImage/src/LibTIFF/tif_jpeg.c
index ee7d886fa8..ee7d886fa8 100644
--- a/plugins/FreeImage/Source/LibTIFF/tif_jpeg.c
+++ b/plugins/FreeImage/src/LibTIFF/tif_jpeg.c
diff --git a/plugins/FreeImage/Source/LibTIFF/tif_luv.c b/plugins/FreeImage/src/LibTIFF/tif_luv.c
index 5e72ca63ba..5e72ca63ba 100644
--- a/plugins/FreeImage/Source/LibTIFF/tif_luv.c
+++ b/plugins/FreeImage/src/LibTIFF/tif_luv.c
diff --git a/plugins/FreeImage/Source/LibTIFF/tif_lzw.c b/plugins/FreeImage/src/LibTIFF/tif_lzw.c
index 16fcd7f9a7..16fcd7f9a7 100644
--- a/plugins/FreeImage/Source/LibTIFF/tif_lzw.c
+++ b/plugins/FreeImage/src/LibTIFF/tif_lzw.c
diff --git a/plugins/FreeImage/Source/LibTIFF/tif_msdos.c b/plugins/FreeImage/src/LibTIFF/tif_msdos.c
index 884981fa49..884981fa49 100644
--- a/plugins/FreeImage/Source/LibTIFF/tif_msdos.c
+++ b/plugins/FreeImage/src/LibTIFF/tif_msdos.c
diff --git a/plugins/FreeImage/Source/LibTIFF/tif_next.c b/plugins/FreeImage/src/LibTIFF/tif_next.c
index 3fa6406e68..3fa6406e68 100644
--- a/plugins/FreeImage/Source/LibTIFF/tif_next.c
+++ b/plugins/FreeImage/src/LibTIFF/tif_next.c
diff --git a/plugins/FreeImage/Source/LibTIFF/tif_ojpeg.c b/plugins/FreeImage/src/LibTIFF/tif_ojpeg.c
index ad339afc1b..ad339afc1b 100644
--- a/plugins/FreeImage/Source/LibTIFF/tif_ojpeg.c
+++ b/plugins/FreeImage/src/LibTIFF/tif_ojpeg.c
diff --git a/plugins/FreeImage/Source/LibTIFF/tif_open.c b/plugins/FreeImage/src/LibTIFF/tif_open.c
index c2a0412e90..c2a0412e90 100644
--- a/plugins/FreeImage/Source/LibTIFF/tif_open.c
+++ b/plugins/FreeImage/src/LibTIFF/tif_open.c
diff --git a/plugins/FreeImage/Source/LibTIFF/tif_packbits.c b/plugins/FreeImage/src/LibTIFF/tif_packbits.c
index 1fc96d13a2..1fc96d13a2 100644
--- a/plugins/FreeImage/Source/LibTIFF/tif_packbits.c
+++ b/plugins/FreeImage/src/LibTIFF/tif_packbits.c
diff --git a/plugins/FreeImage/Source/LibTIFF/tif_pixarlog.c b/plugins/FreeImage/src/LibTIFF/tif_pixarlog.c
index ef4faa4e45..ef4faa4e45 100644
--- a/plugins/FreeImage/Source/LibTIFF/tif_pixarlog.c
+++ b/plugins/FreeImage/src/LibTIFF/tif_pixarlog.c
diff --git a/plugins/FreeImage/Source/LibTIFF/tif_predict.c b/plugins/FreeImage/src/LibTIFF/tif_predict.c
index 7f7dc636be..7f7dc636be 100644
--- a/plugins/FreeImage/Source/LibTIFF/tif_predict.c
+++ b/plugins/FreeImage/src/LibTIFF/tif_predict.c
diff --git a/plugins/FreeImage/Source/LibTIFF/tif_predict.h b/plugins/FreeImage/src/LibTIFF/tif_predict.h
index 6675d9b2a7..6675d9b2a7 100644
--- a/plugins/FreeImage/Source/LibTIFF/tif_predict.h
+++ b/plugins/FreeImage/src/LibTIFF/tif_predict.h
diff --git a/plugins/FreeImage/Source/LibTIFF/tif_print.c b/plugins/FreeImage/src/LibTIFF/tif_print.c
index 50663396df..50663396df 100644
--- a/plugins/FreeImage/Source/LibTIFF/tif_print.c
+++ b/plugins/FreeImage/src/LibTIFF/tif_print.c
diff --git a/plugins/FreeImage/Source/LibTIFF/tif_read.c b/plugins/FreeImage/src/LibTIFF/tif_read.c
index 351a1b058d..351a1b058d 100644
--- a/plugins/FreeImage/Source/LibTIFF/tif_read.c
+++ b/plugins/FreeImage/src/LibTIFF/tif_read.c
diff --git a/plugins/FreeImage/Source/LibTIFF/tif_stream.cxx b/plugins/FreeImage/src/LibTIFF/tif_stream.cxx
index a3aaea19d7..a3aaea19d7 100644
--- a/plugins/FreeImage/Source/LibTIFF/tif_stream.cxx
+++ b/plugins/FreeImage/src/LibTIFF/tif_stream.cxx
diff --git a/plugins/FreeImage/Source/LibTIFF/tif_strip.c b/plugins/FreeImage/src/LibTIFF/tif_strip.c
index 8abf726a00..8abf726a00 100644
--- a/plugins/FreeImage/Source/LibTIFF/tif_strip.c
+++ b/plugins/FreeImage/src/LibTIFF/tif_strip.c
diff --git a/plugins/FreeImage/Source/LibTIFF/tif_swab.c b/plugins/FreeImage/src/LibTIFF/tif_swab.c
index 5a42713d5c..5a42713d5c 100644
--- a/plugins/FreeImage/Source/LibTIFF/tif_swab.c
+++ b/plugins/FreeImage/src/LibTIFF/tif_swab.c
diff --git a/plugins/FreeImage/Source/LibTIFF/tif_thunder.c b/plugins/FreeImage/src/LibTIFF/tif_thunder.c
index b8c6cc93cc..b8c6cc93cc 100644
--- a/plugins/FreeImage/Source/LibTIFF/tif_thunder.c
+++ b/plugins/FreeImage/src/LibTIFF/tif_thunder.c
diff --git a/plugins/FreeImage/Source/LibTIFF/tif_tile.c b/plugins/FreeImage/src/LibTIFF/tif_tile.c
index 4659825aab..4659825aab 100644
--- a/plugins/FreeImage/Source/LibTIFF/tif_tile.c
+++ b/plugins/FreeImage/src/LibTIFF/tif_tile.c
diff --git a/plugins/FreeImage/Source/LibTIFF/tif_unix.c b/plugins/FreeImage/src/LibTIFF/tif_unix.c
index 7e294cb78b..7e294cb78b 100644
--- a/plugins/FreeImage/Source/LibTIFF/tif_unix.c
+++ b/plugins/FreeImage/src/LibTIFF/tif_unix.c
diff --git a/plugins/FreeImage/Source/LibTIFF/tif_version.c b/plugins/FreeImage/src/LibTIFF/tif_version.c
index 6badfcdb5f..6badfcdb5f 100644
--- a/plugins/FreeImage/Source/LibTIFF/tif_version.c
+++ b/plugins/FreeImage/src/LibTIFF/tif_version.c
diff --git a/plugins/FreeImage/Source/LibTIFF/tif_vms.c b/plugins/FreeImage/src/LibTIFF/tif_vms.c
index 553f5072e3..553f5072e3 100644
--- a/plugins/FreeImage/Source/LibTIFF/tif_vms.c
+++ b/plugins/FreeImage/src/LibTIFF/tif_vms.c
diff --git a/plugins/FreeImage/Source/LibTIFF/tif_warning.c b/plugins/FreeImage/src/LibTIFF/tif_warning.c
index a2dbbe7e2f..a2dbbe7e2f 100644
--- a/plugins/FreeImage/Source/LibTIFF/tif_warning.c
+++ b/plugins/FreeImage/src/LibTIFF/tif_warning.c
diff --git a/plugins/FreeImage/Source/LibTIFF/tif_win3.c b/plugins/FreeImage/src/LibTIFF/tif_win3.c
index aa21e3aef8..aa21e3aef8 100644
--- a/plugins/FreeImage/Source/LibTIFF/tif_win3.c
+++ b/plugins/FreeImage/src/LibTIFF/tif_win3.c
diff --git a/plugins/FreeImage/Source/LibTIFF/tif_win32.c b/plugins/FreeImage/src/LibTIFF/tif_win32.c
index 5b3875901d..5b3875901d 100644
--- a/plugins/FreeImage/Source/LibTIFF/tif_win32.c
+++ b/plugins/FreeImage/src/LibTIFF/tif_win32.c
diff --git a/plugins/FreeImage/Source/LibTIFF/tif_write.c b/plugins/FreeImage/src/LibTIFF/tif_write.c
index 043e645b87..043e645b87 100644
--- a/plugins/FreeImage/Source/LibTIFF/tif_write.c
+++ b/plugins/FreeImage/src/LibTIFF/tif_write.c
diff --git a/plugins/FreeImage/Source/LibTIFF/tif_zip.c b/plugins/FreeImage/src/LibTIFF/tif_zip.c
index 74ee9c4b5a..74ee9c4b5a 100644
--- a/plugins/FreeImage/Source/LibTIFF/tif_zip.c
+++ b/plugins/FreeImage/src/LibTIFF/tif_zip.c
diff --git a/plugins/FreeImage/Source/LibTIFF/tiff.h b/plugins/FreeImage/src/LibTIFF/tiff.h
index b8912efb9d..b8912efb9d 100644
--- a/plugins/FreeImage/Source/LibTIFF/tiff.h
+++ b/plugins/FreeImage/src/LibTIFF/tiff.h
diff --git a/plugins/FreeImage/Source/LibTIFF/tiffconf.h-vms b/plugins/FreeImage/src/LibTIFF/tiffconf.h-vms
index de717ecb97..de717ecb97 100644
--- a/plugins/FreeImage/Source/LibTIFF/tiffconf.h-vms
+++ b/plugins/FreeImage/src/LibTIFF/tiffconf.h-vms
diff --git a/plugins/FreeImage/Source/LibTIFF/tiffconf.vc.h b/plugins/FreeImage/src/LibTIFF/tiffconf.vc.h
index 5d73852c41..5d73852c41 100644
--- a/plugins/FreeImage/Source/LibTIFF/tiffconf.vc.h
+++ b/plugins/FreeImage/src/LibTIFF/tiffconf.vc.h
diff --git a/plugins/FreeImage/Source/LibTIFF/tiffio.h b/plugins/FreeImage/src/LibTIFF/tiffio.h
index 2b94407acd..2b94407acd 100644
--- a/plugins/FreeImage/Source/LibTIFF/tiffio.h
+++ b/plugins/FreeImage/src/LibTIFF/tiffio.h
diff --git a/plugins/FreeImage/Source/LibTIFF/tiffio.hxx b/plugins/FreeImage/src/LibTIFF/tiffio.hxx
index fc20d725d2..fc20d725d2 100644
--- a/plugins/FreeImage/Source/LibTIFF/tiffio.hxx
+++ b/plugins/FreeImage/src/LibTIFF/tiffio.hxx
diff --git a/plugins/FreeImage/Source/LibTIFF/tiffiop.h b/plugins/FreeImage/src/LibTIFF/tiffiop.h
index 1a64862810..1a64862810 100644
--- a/plugins/FreeImage/Source/LibTIFF/tiffiop.h
+++ b/plugins/FreeImage/src/LibTIFF/tiffiop.h
diff --git a/plugins/FreeImage/Source/LibTIFF/tiffvers.h b/plugins/FreeImage/src/LibTIFF/tiffvers.h
index 594702b566..594702b566 100644
--- a/plugins/FreeImage/Source/LibTIFF/tiffvers.h
+++ b/plugins/FreeImage/src/LibTIFF/tiffvers.h
diff --git a/plugins/FreeImage/Source/LibTIFF/uvcode.h b/plugins/FreeImage/src/LibTIFF/uvcode.h
index 8f22325703..8f22325703 100644
--- a/plugins/FreeImage/Source/LibTIFF/uvcode.h
+++ b/plugins/FreeImage/src/LibTIFF/uvcode.h
diff --git a/plugins/FreeImage/Source/Metadata/Exif.cpp b/plugins/FreeImage/src/Metadata/Exif.cpp
index 7d0955c5db..7d0955c5db 100644
--- a/plugins/FreeImage/Source/Metadata/Exif.cpp
+++ b/plugins/FreeImage/src/Metadata/Exif.cpp
diff --git a/plugins/FreeImage/Source/Metadata/FIRational.cpp b/plugins/FreeImage/src/Metadata/FIRational.cpp
index d383c8d38f..d383c8d38f 100644
--- a/plugins/FreeImage/Source/Metadata/FIRational.cpp
+++ b/plugins/FreeImage/src/Metadata/FIRational.cpp
diff --git a/plugins/FreeImage/Source/Metadata/FIRational.h b/plugins/FreeImage/src/Metadata/FIRational.h
index bd3ee13e07..bd3ee13e07 100644
--- a/plugins/FreeImage/Source/Metadata/FIRational.h
+++ b/plugins/FreeImage/src/Metadata/FIRational.h
diff --git a/plugins/FreeImage/Source/Metadata/FreeImageTag.cpp b/plugins/FreeImage/src/Metadata/FreeImageTag.cpp
index 84e15d0822..84e15d0822 100644
--- a/plugins/FreeImage/Source/Metadata/FreeImageTag.cpp
+++ b/plugins/FreeImage/src/Metadata/FreeImageTag.cpp
diff --git a/plugins/FreeImage/Source/Metadata/FreeImageTag.h b/plugins/FreeImage/src/Metadata/FreeImageTag.h
index f412603e8d..f412603e8d 100644
--- a/plugins/FreeImage/Source/Metadata/FreeImageTag.h
+++ b/plugins/FreeImage/src/Metadata/FreeImageTag.h
diff --git a/plugins/FreeImage/Source/Metadata/IPTC.cpp b/plugins/FreeImage/src/Metadata/IPTC.cpp
index 817beddf98..817beddf98 100644
--- a/plugins/FreeImage/Source/Metadata/IPTC.cpp
+++ b/plugins/FreeImage/src/Metadata/IPTC.cpp
diff --git a/plugins/FreeImage/Source/Metadata/TagConversion.cpp b/plugins/FreeImage/src/Metadata/TagConversion.cpp
index 7b91598014..7b91598014 100644
--- a/plugins/FreeImage/Source/Metadata/TagConversion.cpp
+++ b/plugins/FreeImage/src/Metadata/TagConversion.cpp
diff --git a/plugins/FreeImage/Source/Metadata/TagLib.cpp b/plugins/FreeImage/src/Metadata/TagLib.cpp
index eff291beab..eff291beab 100644
--- a/plugins/FreeImage/Source/Metadata/TagLib.cpp
+++ b/plugins/FreeImage/src/Metadata/TagLib.cpp
diff --git a/plugins/FreeImage/Source/Metadata/XTIFF.cpp b/plugins/FreeImage/src/Metadata/XTIFF.cpp
index bc63cf38b2..bc63cf38b2 100644
--- a/plugins/FreeImage/Source/Metadata/XTIFF.cpp
+++ b/plugins/FreeImage/src/Metadata/XTIFF.cpp
diff --git a/plugins/FreeImage/Source/Plugin.h b/plugins/FreeImage/src/Plugin.h
index dbb4540ef5..dbb4540ef5 100644
--- a/plugins/FreeImage/Source/Plugin.h
+++ b/plugins/FreeImage/src/Plugin.h
diff --git a/plugins/FreeImage/Source/Quantizers.h b/plugins/FreeImage/src/Quantizers.h
index 2a671fad1c..2a671fad1c 100644
--- a/plugins/FreeImage/Source/Quantizers.h
+++ b/plugins/FreeImage/src/Quantizers.h
diff --git a/plugins/FreeImage/Source/ToneMapping.h b/plugins/FreeImage/src/ToneMapping.h
index 0519933c68..0519933c68 100644
--- a/plugins/FreeImage/Source/ToneMapping.h
+++ b/plugins/FreeImage/src/ToneMapping.h
diff --git a/plugins/FreeImage/Source/Utilities.h b/plugins/FreeImage/src/Utilities.h
index b743325129..b743325129 100644
--- a/plugins/FreeImage/Source/Utilities.h
+++ b/plugins/FreeImage/src/Utilities.h
diff --git a/plugins/FreeImage/Source/Zlib/zconf.h b/plugins/FreeImage/src/Zlib/zconf.h
index 93c1bb27e3..93c1bb27e3 100644
--- a/plugins/FreeImage/Source/Zlib/zconf.h
+++ b/plugins/FreeImage/src/Zlib/zconf.h
diff --git a/plugins/FreeImage/Source/Zlib/zlib.h b/plugins/FreeImage/src/Zlib/zlib.h
index 79142d1172..79142d1172 100644
--- a/plugins/FreeImage/Source/Zlib/zlib.h
+++ b/plugins/FreeImage/src/Zlib/zlib.h
diff --git a/plugins/FreeImage/Source/Zlib/zutil.h b/plugins/FreeImage/src/Zlib/zutil.h
index 8f33fd3e7d..8f33fd3e7d 100644
--- a/plugins/FreeImage/Source/Zlib/zutil.h
+++ b/plugins/FreeImage/src/Zlib/zutil.h
diff --git a/plugins/FreeImage/Miranda/main.cpp b/plugins/FreeImage/src/main.cpp
index 370e743f94..a2ae903485 100644
--- a/plugins/FreeImage/Miranda/main.cpp
+++ b/plugins/FreeImage/src/main.cpp
@@ -43,12 +43,12 @@ Last change by : $Author: rainwater $
 #include "newpluginapi.h"
 #include "version.h"
 
-#include "../Source/libpng/png.h"
+#include "libpng/png.h"
 
 static const PLUGININFOEX pluginInfoEx = {
 	sizeof(PLUGININFOEX),
 	__PLUGIN_NAME,
-	__VERSION_DWORD,
+	PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
 	__DESCRIPTION,
 	__AUTHOR,
 	__AUTHOREMAIL,
@@ -480,11 +480,6 @@ long __stdcall fiio_mem_TellProc(fi_handle handle) {
 
 */
 
-extern "C" DWORD __declspec(dllexport) getver( void )
-{
-	return __VERSION_DWORD;
-}
-
 // PNG image handler functions
 
 typedef struct {
diff --git a/plugins/FreeImage/Miranda/version.h b/plugins/FreeImage/src/version.h
index cb909c8a03..fb6dca1759 100644
--- a/plugins/FreeImage/Miranda/version.h
+++ b/plugins/FreeImage/src/version.h
@@ -1,6 +1,14 @@
-#define __FILEVERSION_STRING        0,11,0,1
-#define __VERSION_STRING            "0.11.0.1"
-#define __VERSION_DWORD             PLUGIN_MAKE_VERSION(0, 11, 0, 1)
+#define __MAJOR_VERSION				0
+#define __MINOR_VERSION				11
+#define __RELEASE_NUM				0
+#define __BUILD_NUM					1
+
+#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				"Miranda Image services"
 #define __INTERNAL_NAME				"AdvaImg"
diff --git a/plugins/FreeImage/version.rc b/plugins/FreeImage/version.rc
deleted file mode 100644
index 171ae6576c..0000000000
--- a/plugins/FreeImage/version.rc
+++ /dev/null
@@ -1,115 +0,0 @@
-// Microsoft Visual C++ generated resource script.
-//
-#ifdef APSTUDIO_INVOKED
-#error this file is not editable by Microsoft Visual C++
-#endif //APSTUDIO_INVOKED
-
-#include "Miranda\version.h"
-#include "afxres.h"
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#pragma code_page(1252)
-#endif //_WIN32
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE 
-BEGIN
-    "resource.h\0"
-END
-
-2 TEXTINCLUDE 
-BEGIN
-    "\r\n"
-END
-
-3 TEXTINCLUDE 
-BEGIN
-    "\r\n"
-END
-
-#endif    // APSTUDIO_INVOKED
-
-#endif    // English (U.S.) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-/////////////////////////////////////////////////////////////////////////////
-// German (Austria) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_DEA)
-#ifdef _WIN32
-LANGUAGE LANG_GERMAN, SUBLANG_GERMAN_AUSTRIAN
-#pragma code_page(1252)
-#endif //_WIN32
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-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
-
-#endif    // German (Austria) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-
-
-/////////////////////////////////////////////////////////////////////////////
-#endif    // not APSTUDIO_INVOKED
-
-