101 files changed, 175 insertions, 185 deletions
diff --git a/plugins/Variables/Variables_10.vcxproj b/plugins/Variables/Variables_10.vcxproj
index ec80e2139f..f9ac10a27e 100644
--- a/plugins/Variables/Variables_10.vcxproj
+++ b/plugins/Variables/Variables_10.vcxproj
@@ -72,13 +72,12 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;pcre\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;VARIABLES_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;src\pcre\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-      <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>variables.h</PrecompiledHeaderFile>
     </ClCompile>
@@ -92,7 +91,7 @@
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
       <SubSystem>Windows</SubSystem>
-      <AdditionalLibraryDirectories>pcre\lib;$(SolutionDir)\lib</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>src\pcre\lib;$(SolutionDir)\lib</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -100,12 +99,11 @@
       <Optimization>Full</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
-      <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;pcre\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;VARIABLES_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;src\pcre\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <WarningLevel>Level3</WarningLevel>
-      <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>variables.h</PrecompiledHeaderFile>
     </ClCompile>
@@ -121,18 +119,17 @@
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
       <SubSystem>Windows</SubSystem>
-      <AdditionalLibraryDirectories>pcre\lib;$(SolutionDir)\lib</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>src\pcre\lib;$(SolutionDir)\lib</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;pcre\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;VARIABLES_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;src\pcre\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Optimization>Full</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
       <WarningLevel>Level3</WarningLevel>
-      <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
       <StringPooling>true</StringPooling>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PrecompiledHeader>Use</PrecompiledHeader>
@@ -146,7 +143,7 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <SubSystem>Windows</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <AdditionalLibraryDirectories>pcre\lib64;$(SolutionDir)\lib</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>src\pcre\lib64;$(SolutionDir)\lib</AdditionalLibraryDirectories>
     </Link>
     <ResourceCompile>
       <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>
@@ -155,10 +152,9 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;pcre\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;VARIABLES_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;src\pcre\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <WarningLevel>Level3</WarningLevel>
-      <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
       <Optimization>Disabled</Optimization>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -171,7 +167,7 @@
       <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
       <SubSystem>Windows</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <AdditionalLibraryDirectories>pcre\lib64;$(SolutionDir)\lib</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>src\pcre\lib64;$(SolutionDir)\lib</AdditionalLibraryDirectories>
     </Link>
     <ResourceCompile>
       <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>
@@ -179,63 +175,60 @@
     </ResourceCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="contact.cpp" />
-    <ClCompile Include="help.cpp" />
-    <ClCompile Include="lookup3.cpp">
+    <ClCompile Include="src\contact.cpp" />
+    <ClCompile Include="src\help.cpp" />
+    <ClCompile Include="src\lookup3.cpp">
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
     </ClCompile>
-    <ClCompile Include="main.cpp">
+    <ClCompile Include="src\main.cpp">
       <PrecompiledHeader>Create</PrecompiledHeader>
     </ClCompile>
-    <ClCompile Include="options.cpp" />
-    <ClCompile Include="tokenregister.cpp" />
-    <ClCompile Include="variables.cpp" />
-    <ClCompile Include="enumprocs.cpp">
+    <ClCompile Include="src\options.cpp" />
+    <ClCompile Include="src\tokenregister.cpp" />
+    <ClCompile Include="src\variables.cpp" />
+    <ClCompile Include="src\enumprocs.cpp">
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
     </ClCompile>
-    <ClCompile Include="parse_alias.cpp" />
-    <ClCompile Include="parse_external.cpp" />
-    <ClCompile Include="parse_inet.cpp" />
-    <ClCompile Include="parse_logic.cpp" />
-    <ClCompile Include="parse_math.cpp" />
-    <ClCompile Include="parse_metacontacts.cpp" />
-    <ClCompile Include="parse_miranda.cpp" />
-    <ClCompile Include="parse_regexp.cpp" />
-    <ClCompile Include="parse_str.cpp" />
-    <ClCompile Include="parse_system.cpp" />
-    <ClCompile Include="parse_variables.cpp" />
-    <ClCompile Include="parse_xml.cpp" />
-    <ClCompile Include="action_variables.cpp" />
-    <ClCompile Include="condition_variables.cpp" />
-    <ClCompile Include="trigger_variables.cpp" />
+    <ClCompile Include="src\parse_alias.cpp" />
+    <ClCompile Include="src\parse_external.cpp" />
+    <ClCompile Include="src\parse_inet.cpp" />
+    <ClCompile Include="src\parse_logic.cpp" />
+    <ClCompile Include="src\parse_math.cpp" />
+    <ClCompile Include="src\parse_metacontacts.cpp" />
+    <ClCompile Include="src\parse_miranda.cpp" />
+    <ClCompile Include="src\parse_regexp.cpp" />
+    <ClCompile Include="src\parse_str.cpp" />
+    <ClCompile Include="src\parse_system.cpp" />
+    <ClCompile Include="src\parse_variables.cpp" />
+    <ClCompile Include="src\parse_xml.cpp" />
+    <ClCompile Include="src\action_variables.cpp" />
+    <ClCompile Include="src\condition_variables.cpp" />
+    <ClCompile Include="src\trigger_variables.cpp" />
     <ClCompile Include="..\helpers\gen_helpers.cpp">
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="contact.h" />
-    <ClInclude Include="variables.h" />
-    <ClInclude Include="enumprocs.h" />
-    <ClInclude Include="parse_alias.h" />
-    <ClInclude Include="parse_external.h" />
-    <ClInclude Include="parse_inet.h" />
-    <ClInclude Include="parse_logic.h" />
-    <ClInclude Include="parse_math.h" />
-    <ClInclude Include="parse_metacontacts.h" />
-    <ClInclude Include="parse_miranda.h" />
-    <ClInclude Include="parse_regexp.h" />
-    <ClInclude Include="parse_str.h" />
-    <ClInclude Include="parse_system.h" />
-    <ClInclude Include="parse_variables.h" />
-    <ClInclude Include="parse_xml.h" />
-    <ClInclude Include="trigger_variables.h" />
+    <ClInclude Include="src\contact.h" />
+    <ClInclude Include="src\variables.h" />
+    <ClInclude Include="src\enumprocs.h" />
+    <ClInclude Include="src\parse_alias.h" />
+    <ClInclude Include="src\parse_external.h" />
+    <ClInclude Include="src\parse_inet.h" />
+    <ClInclude Include="src\parse_logic.h" />
+    <ClInclude Include="src\parse_math.h" />
+    <ClInclude Include="src\parse_metacontacts.h" />
+    <ClInclude Include="src\parse_miranda.h" />
+    <ClInclude Include="src\parse_regexp.h" />
+    <ClInclude Include="src\parse_str.h" />
+    <ClInclude Include="src\parse_system.h" />
+    <ClInclude Include="src\parse_variables.h" />
+    <ClInclude Include="src\parse_xml.h" />
+    <ClInclude Include="src\trigger_variables.h" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="V.ico" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="Variables.rc" />
-    <ResourceCompile Include="version.rc" />
+    <ResourceCompile Include="res\Variables.rc" />
+    <ResourceCompile Include="res\version.rc" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/plugins/Variables/Variables_10.vcxproj.filters b/plugins/Variables/Variables_10.vcxproj.filters
index 03ffbf41a4..5a19c2154c 100644
--- a/plugins/Variables/Variables_10.vcxproj.filters
+++ b/plugins/Variables/Variables_10.vcxproj.filters
@@ -25,73 +25,73 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="contact.cpp">
+    <ClCompile Include="src\contact.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="help.cpp">
+    <ClCompile Include="src\help.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="lookup3.cpp">
+    <ClCompile Include="src\lookup3.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="main.cpp">
+    <ClCompile Include="src\main.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="options.cpp">
+    <ClCompile Include="src\options.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="tokenregister.cpp">
+    <ClCompile Include="src\tokenregister.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="variables.cpp">
+    <ClCompile Include="src\variables.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="enumprocs.cpp">
+    <ClCompile Include="src\enumprocs.cpp">
       <Filter>Parse</Filter>
     </ClCompile>
-    <ClCompile Include="parse_alias.cpp">
+    <ClCompile Include="src\parse_alias.cpp">
       <Filter>Parse</Filter>
     </ClCompile>
-    <ClCompile Include="parse_external.cpp">
+    <ClCompile Include="src\parse_external.cpp">
       <Filter>Parse</Filter>
     </ClCompile>
-    <ClCompile Include="parse_inet.cpp">
+    <ClCompile Include="src\parse_inet.cpp">
       <Filter>Parse</Filter>
     </ClCompile>
-    <ClCompile Include="parse_logic.cpp">
+    <ClCompile Include="src\parse_logic.cpp">
       <Filter>Parse</Filter>
     </ClCompile>
-    <ClCompile Include="parse_math.cpp">
+    <ClCompile Include="src\parse_math.cpp">
       <Filter>Parse</Filter>
     </ClCompile>
-    <ClCompile Include="parse_metacontacts.cpp">
+    <ClCompile Include="src\parse_metacontacts.cpp">
       <Filter>Parse</Filter>
     </ClCompile>
-    <ClCompile Include="parse_miranda.cpp">
+    <ClCompile Include="src\parse_miranda.cpp">
       <Filter>Parse</Filter>
     </ClCompile>
-    <ClCompile Include="parse_regexp.cpp">
+    <ClCompile Include="src\parse_regexp.cpp">
       <Filter>Parse</Filter>
     </ClCompile>
-    <ClCompile Include="parse_str.cpp">
+    <ClCompile Include="src\parse_str.cpp">
       <Filter>Parse</Filter>
     </ClCompile>
-    <ClCompile Include="parse_system.cpp">
+    <ClCompile Include="src\parse_system.cpp">
       <Filter>Parse</Filter>
     </ClCompile>
-    <ClCompile Include="parse_variables.cpp">
+    <ClCompile Include="src\parse_variables.cpp">
       <Filter>Parse</Filter>
     </ClCompile>
-    <ClCompile Include="parse_xml.cpp">
+    <ClCompile Include="src\parse_xml.cpp">
       <Filter>Parse</Filter>
     </ClCompile>
-    <ClCompile Include="action_variables.cpp">
+    <ClCompile Include="src\action_variables.cpp">
       <Filter>TriggerPlugin</Filter>
     </ClCompile>
-    <ClCompile Include="condition_variables.cpp">
+    <ClCompile Include="src\condition_variables.cpp">
       <Filter>TriggerPlugin</Filter>
     </ClCompile>
-    <ClCompile Include="trigger_variables.cpp">
+    <ClCompile Include="src\trigger_variables.cpp">
       <Filter>TriggerPlugin</Filter>
     </ClCompile>
     <ClCompile Include="..\helpers\gen_helpers.cpp">
@@ -99,65 +99,60 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="contact.h">
+    <ClInclude Include="src\contact.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="variables.h">
+    <ClInclude Include="src\variables.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="enumprocs.h">
+    <ClInclude Include="src\enumprocs.h">
       <Filter>Parse</Filter>
     </ClInclude>
-    <ClInclude Include="parse_alias.h">
+    <ClInclude Include="src\parse_alias.h">
       <Filter>Parse</Filter>
     </ClInclude>
-    <ClInclude Include="parse_external.h">
+    <ClInclude Include="src\parse_external.h">
       <Filter>Parse</Filter>
     </ClInclude>
-    <ClInclude Include="parse_inet.h">
+    <ClInclude Include="src\parse_inet.h">
       <Filter>Parse</Filter>
     </ClInclude>
-    <ClInclude Include="parse_logic.h">
+    <ClInclude Include="src\parse_logic.h">
       <Filter>Parse</Filter>
     </ClInclude>
-    <ClInclude Include="parse_math.h">
+    <ClInclude Include="src\parse_math.h">
       <Filter>Parse</Filter>
     </ClInclude>
-    <ClInclude Include="parse_metacontacts.h">
+    <ClInclude Include="src\parse_metacontacts.h">
       <Filter>Parse</Filter>
     </ClInclude>
-    <ClInclude Include="parse_miranda.h">
+    <ClInclude Include="src\parse_miranda.h">
       <Filter>Parse</Filter>
     </ClInclude>
-    <ClInclude Include="parse_regexp.h">
+    <ClInclude Include="src\parse_regexp.h">
       <Filter>Parse</Filter>
     </ClInclude>
-    <ClInclude Include="parse_str.h">
+    <ClInclude Include="src\parse_str.h">
       <Filter>Parse</Filter>
     </ClInclude>
-    <ClInclude Include="parse_system.h">
+    <ClInclude Include="src\parse_system.h">
       <Filter>Parse</Filter>
     </ClInclude>
-    <ClInclude Include="parse_variables.h">
+    <ClInclude Include="src\parse_variables.h">
       <Filter>Parse</Filter>
     </ClInclude>
-    <ClInclude Include="parse_xml.h">
+    <ClInclude Include="src\parse_xml.h">
       <Filter>Parse</Filter>
     </ClInclude>
-    <ClInclude Include="trigger_variables.h">
+    <ClInclude Include="src\trigger_variables.h">
       <Filter>TriggerPlugin</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <None Include="V.ico">
-      <Filter>Resource Files</Filter>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="Variables.rc">
+    <ResourceCompile Include="res\Variables.rc">
       <Filter>Resource Files</Filter>
     </ResourceCompile>
-    <ResourceCompile Include="version.rc">
+    <ResourceCompile Include="res\version.rc">
       <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>
diff --git a/plugins/Variables/Variables.txt b/plugins/Variables/docs/Variables.txt
index 14b37e0a48..14b37e0a48 100644
--- a/plugins/Variables/Variables.txt
+++ b/plugins/Variables/docs/Variables.txt
diff --git a/plugins/Variables/copying.txt b/plugins/Variables/docs/copying.txt
index bd5cace35b..bd5cace35b 100644
--- a/plugins/Variables/copying.txt
+++ b/plugins/Variables/docs/copying.txt
diff --git a/plugins/Variables/variables-translation.txt b/plugins/Variables/docs/variables-translation.txt
index 2b8ef53a7e..2b8ef53a7e 100644
--- a/plugins/Variables/variables-translation.txt
+++ b/plugins/Variables/docs/variables-translation.txt
diff --git a/plugins/Variables/V.ico b/plugins/Variables/res/V.ico
index 7f016eee31..7f016eee31 100644
--- a/plugins/Variables/V.ico
+++ b/plugins/Variables/res/V.ico
diff --git a/plugins/Variables/Variables.rc b/plugins/Variables/res/Variables.rc
index 2907d921d9..604367cf88 100644
--- a/plugins/Variables/Variables.rc
+++ b/plugins/Variables/res/Variables.rc
@@ -1,6 +1,6 @@
 //Microsoft Developer Studio generated resource script.
 //
-#include "resource.h"
+#include "..\src\resource.h"
 
 #define APSTUDIO_READONLY_SYMBOLS
 /////////////////////////////////////////////////////////////////////////////
@@ -273,7 +273,7 @@ END
 
 1 TEXTINCLUDE MOVEABLE PURE 
 BEGIN
-    "resource.h\0"
+    "..\\src\\resource.h\0"
 END
 
 2 TEXTINCLUDE MOVEABLE PURE 
@@ -297,7 +297,7 @@ END
 
 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
-IDI_V                   ICON    DISCARDABLE     "V.ico"
+IDI_V                   ICON     "V.ico"
 #endif    // English (U.S.) resources
 /////////////////////////////////////////////////////////////////////////////
 
diff --git a/plugins/Variables/version.rc b/plugins/Variables/res/version.rc
index 6650a34d93..e6a93d27ca 100644
--- a/plugins/Variables/version.rc
+++ b/plugins/Variables/res/version.rc
@@ -3,7 +3,7 @@
 #endif //APSTUDIO_INVOKED
 
 #include <windows.h>
-#include "buildnumber.h"
+#include "..\src\buildnumber.h"
 
 /////////////////////////////////////////////////////////////////////////////
 //
diff --git a/plugins/Variables/ac/ac.h b/plugins/Variables/src/ac/ac.h
index 7d0790f32b..7d0790f32b 100644
--- a/plugins/Variables/ac/ac.h
+++ b/plugins/Variables/src/ac/ac.h
diff --git a/plugins/Variables/action_variables.cpp b/plugins/Variables/src/action_variables.cpp
index e4d1a17aa1..e4d1a17aa1 100644
--- a/plugins/Variables/action_variables.cpp
+++ b/plugins/Variables/src/action_variables.cpp
diff --git a/plugins/Variables/buildnumber.h b/plugins/Variables/src/buildnumber.h
index 2e38a77fad..2e38a77fad 100644
--- a/plugins/Variables/buildnumber.h
+++ b/plugins/Variables/src/buildnumber.h
diff --git a/plugins/Variables/condition_variables.cpp b/plugins/Variables/src/condition_variables.cpp
index c58703cc54..c58703cc54 100644
--- a/plugins/Variables/condition_variables.cpp
+++ b/plugins/Variables/src/condition_variables.cpp
diff --git a/plugins/Variables/contact.cpp b/plugins/Variables/src/contact.cpp
index 9e2f08c83e..9e2f08c83e 100644
--- a/plugins/Variables/contact.cpp
+++ b/plugins/Variables/src/contact.cpp
diff --git a/plugins/Variables/contact.h b/plugins/Variables/src/contact.h
index 7d980801f3..7d980801f3 100644
--- a/plugins/Variables/contact.h
+++ b/plugins/Variables/src/contact.h
diff --git a/plugins/Variables/dbhelpers.h b/plugins/Variables/src/dbhelpers.h
index 3eb3c7e330..3eb3c7e330 100644
--- a/plugins/Variables/dbhelpers.h
+++ b/plugins/Variables/src/dbhelpers.h
diff --git a/plugins/Variables/enumprocs.cpp b/plugins/Variables/src/enumprocs.cpp
index 56df0acfc8..56df0acfc8 100644
--- a/plugins/Variables/enumprocs.cpp
+++ b/plugins/Variables/src/enumprocs.cpp
diff --git a/plugins/Variables/enumprocs.h b/plugins/Variables/src/enumprocs.h
index 118c40b67c..118c40b67c 100644
--- a/plugins/Variables/enumprocs.h
+++ b/plugins/Variables/src/enumprocs.h
diff --git a/plugins/Variables/help.cpp b/plugins/Variables/src/help.cpp
index 8b852b7f6c..8b852b7f6c 100644
--- a/plugins/Variables/help.cpp
+++ b/plugins/Variables/src/help.cpp
diff --git a/plugins/Variables/libxml/DOCBparser.h b/plugins/Variables/src/libxml/DOCBparser.h
index 4b7230f17d..75fb0b2ac8 100644
--- a/plugins/Variables/libxml/DOCBparser.h
+++ b/plugins/Variables/src/libxml/DOCBparser.h
@@ -8,7 +8,7 @@
 
 #ifndef __DOCB_PARSER_H__
 #define __DOCB_PARSER_H__
-#include <libxml/parser.h>
+#include "libxml/parser.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/plugins/Variables/libxml/HTMLparser.h b/plugins/Variables/src/libxml/HTMLparser.h
index c6d8899c30..a98ecbe8e6 100644
--- a/plugins/Variables/libxml/HTMLparser.h
+++ b/plugins/Variables/src/libxml/HTMLparser.h
@@ -8,7 +8,7 @@
 
 #ifndef __HTML_PARSER_H__
 #define __HTML_PARSER_H__
-#include <libxml/parser.h>
+#include "libxml/parser.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/plugins/Variables/libxml/HTMLtree.h b/plugins/Variables/src/libxml/HTMLtree.h
index 3a441c4b5c..e9944b3b25 100644
--- a/plugins/Variables/libxml/HTMLtree.h
+++ b/plugins/Variables/src/libxml/HTMLtree.h
@@ -11,8 +11,8 @@
 #define __HTML_TREE_H__
 
 #include <stdio.h>
-#include <libxml/tree.h>
-#include <libxml/HTMLparser.h>
+#include "libxml/tree.h"
+#include "libxml/HTMLparser.h"
 
 
 #ifdef __cplusplus
diff --git a/plugins/Variables/libxml/SAX.h b/plugins/Variables/src/libxml/SAX.h
index d96d9e9596..a46e14c78e 100644
--- a/plugins/Variables/libxml/SAX.h
+++ b/plugins/Variables/src/libxml/SAX.h
@@ -12,8 +12,8 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <libxml/parser.h>
-#include <libxml/xlink.h>
+#include "libxml/parser.h"
+#include "libxml/xlink.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/plugins/Variables/libxml/c14n.h b/plugins/Variables/src/libxml/c14n.h
index 75ace8a4a4..75ace8a4a4 100644
--- a/plugins/Variables/libxml/c14n.h
+++ b/plugins/Variables/src/libxml/c14n.h
diff --git a/plugins/Variables/libxml/catalog.h b/plugins/Variables/src/libxml/catalog.h
index 037e7e80e0..f6ee04815e 100644
--- a/plugins/Variables/libxml/catalog.h
+++ b/plugins/Variables/src/libxml/catalog.h
@@ -17,7 +17,7 @@
 
 #include <stdio.h>
 
-#include <libxml/xmlversion.h>
+#include "libxml/xmlversion.h"
 
 #ifdef LIBXML_CATALOG_ENABLED
 
diff --git a/plugins/Variables/libxml/debugXML.h b/plugins/Variables/src/libxml/debugXML.h
index cf017a4a73..444acb408e 100644
--- a/plugins/Variables/libxml/debugXML.h
+++ b/plugins/Variables/src/libxml/debugXML.h
@@ -8,11 +8,11 @@
 #ifndef __DEBUG_XML__
 #define __DEBUG_XML__
 #include <stdio.h>
-#include <libxml/tree.h>
+#include "libxml/tree.h"
 
 #ifdef LIBXML_DEBUG_ENABLED
 
-#include <libxml/xpath.h>
+#include "libxml/xpath.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/plugins/Variables/libxml/encoding.h b/plugins/Variables/src/libxml/encoding.h
index 3c0fbb91ff..012f6d9cf6 100644
--- a/plugins/Variables/libxml/encoding.h
+++ b/plugins/Variables/src/libxml/encoding.h
@@ -21,7 +21,7 @@
 #ifndef __XML_CHAR_ENCODING_H__
 #define __XML_CHAR_ENCODING_H__
 
-#include <libxml/xmlversion.h>
+#include "libxml/xmlversion.h"
 
 #ifdef LIBXML_ICONV_ENABLED
 #include <iconv.h>
@@ -137,7 +137,7 @@ struct _xmlCharEncodingHandler {
 #ifdef __cplusplus
 }
 #endif
-#include <libxml/tree.h>
+#include "libxml/tree.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/plugins/Variables/libxml/entities.h b/plugins/Variables/src/libxml/entities.h
index ea7f2020c2..3dfc4deba1 100644
--- a/plugins/Variables/libxml/entities.h
+++ b/plugins/Variables/src/libxml/entities.h
@@ -9,7 +9,7 @@
 #ifndef __XML_ENTITIES_H__
 #define __XML_ENTITIES_H__
 
-#include <libxml/tree.h>
+#include "libxml/tree.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/plugins/Variables/libxml/globals.h b/plugins/Variables/src/libxml/globals.h
index 6f880c0877..8a5e8c88e0 100644
--- a/plugins/Variables/libxml/globals.h
+++ b/plugins/Variables/src/libxml/globals.h
@@ -13,10 +13,10 @@
 #ifndef __XML_GLOBALS_H
 #define __XML_GLOBALS_H
 
-#include <libxml/parser.h>
-#include <libxml/xmlerror.h>
-#include <libxml/SAX.h>
-#include <libxml/xmlmemory.h>
+#include "libxml/parser.h"
+#include "libxml/xmlerror.h"
+#include "libxml/SAX.h"
+#include "libxml/xmlmemory.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -102,7 +102,7 @@ struct _xmlGlobalState
 #ifdef __cplusplus
 }
 #endif
-#include <libxml/threads.h>
+#include "libxml/threads.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/plugins/Variables/libxml/hash.h b/plugins/Variables/src/libxml/hash.h
index ec590c91fe..24c5f214c3 100644
--- a/plugins/Variables/libxml/hash.h
+++ b/plugins/Variables/src/libxml/hash.h
@@ -18,7 +18,7 @@
 #ifndef __XML_HASH_H__
 #define __XML_HASH_H__
 
-#include <libxml/parser.h>
+#include "libxml/parser.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/plugins/Variables/libxml/list.h b/plugins/Variables/src/libxml/list.h
index 8c9515fe1d..8c9515fe1d 100644
--- a/plugins/Variables/libxml/list.h
+++ b/plugins/Variables/src/libxml/list.h
diff --git a/plugins/Variables/libxml/nanoftp.h b/plugins/Variables/src/libxml/nanoftp.h
index a0ba2ceeb3..a0ba2ceeb3 100644
--- a/plugins/Variables/libxml/nanoftp.h
+++ b/plugins/Variables/src/libxml/nanoftp.h
diff --git a/plugins/Variables/libxml/nanohttp.h b/plugins/Variables/src/libxml/nanohttp.h
index 4fb4e1d256..4fb4e1d256 100644
--- a/plugins/Variables/libxml/nanohttp.h
+++ b/plugins/Variables/src/libxml/nanohttp.h
diff --git a/plugins/Variables/libxml/parser.h b/plugins/Variables/src/libxml/parser.h
index e6725a364d..ac98f4b944 100644
--- a/plugins/Variables/libxml/parser.h
+++ b/plugins/Variables/src/libxml/parser.h
@@ -9,9 +9,9 @@
 #ifndef __XML_PARSER_H__
 #define __XML_PARSER_H__
 
-#include <libxml/tree.h>
-#include <libxml/valid.h>
-#include <libxml/entities.h>
+#include "libxml/tree.h"
+#include "libxml/valid.h"
+#include "libxml/entities.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -638,9 +638,9 @@ LIBXML_DLL_IMPORT extern int xmlGetWarningsDefaultValue;
 #ifdef __cplusplus
 }
 #endif
-#include <libxml/encoding.h>
-#include <libxml/xmlIO.h>
-#include <libxml/globals.h>
+#include "libxml/encoding.h"
+#include "libxml/xmlIO.h"
+#include "libxml/globals.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/plugins/Variables/libxml/parserInternals.h b/plugins/Variables/src/libxml/parserInternals.h
index 8507442be8..8507442be8 100644
--- a/plugins/Variables/libxml/parserInternals.h
+++ b/plugins/Variables/src/libxml/parserInternals.h
diff --git a/plugins/Variables/libxml/schemasInternals.h b/plugins/Variables/src/libxml/schemasInternals.h
index fb1f7eeb39..fb1f7eeb39 100644
--- a/plugins/Variables/libxml/schemasInternals.h
+++ b/plugins/Variables/src/libxml/schemasInternals.h
diff --git a/plugins/Variables/libxml/threads.h b/plugins/Variables/src/libxml/threads.h
index afca78ffe5..4ef7a17386 100644
--- a/plugins/Variables/libxml/threads.h
+++ b/plugins/Variables/src/libxml/threads.h
@@ -28,7 +28,7 @@ typedef xmlRMutex *xmlRMutexPtr;
 #ifdef __cplusplus
 }
 #endif
-#include <libxml/globals.h>
+#include "libxml/globals.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/plugins/Variables/libxml/tree.h b/plugins/Variables/src/libxml/tree.h
index 8521a31997..1a9fb0036d 100644
--- a/plugins/Variables/libxml/tree.h
+++ b/plugins/Variables/src/libxml/tree.h
@@ -12,7 +12,7 @@
 #define __XML_TREE_H__
 
 #include <stdio.h>
-#include <libxml/xmlversion.h>
+#include "libxml/xmlversion.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -261,7 +261,7 @@ typedef enum {
 #ifdef __cplusplus
 }
 #endif
-#include <libxml/xmlregexp.h>
+#include "libxml/xmlregexp.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/plugins/Variables/libxml/uri.h b/plugins/Variables/src/libxml/uri.h
index 319c509d1b..319c509d1b 100644
--- a/plugins/Variables/libxml/uri.h
+++ b/plugins/Variables/src/libxml/uri.h
diff --git a/plugins/Variables/libxml/valid.h b/plugins/Variables/src/libxml/valid.h
index 36373e17f0..dbf2aba562 100644
--- a/plugins/Variables/libxml/valid.h
+++ b/plugins/Variables/src/libxml/valid.h
@@ -10,10 +10,10 @@
 #ifndef __XML_VALID_H__
 #define __XML_VALID_H__
 
-#include <libxml/tree.h>
-#include <libxml/list.h>
-#include <libxml/xmlautomata.h>
-#include <libxml/xmlregexp.h>
+#include "libxml/tree.h"
+#include "libxml/list.h"
+#include "libxml/xmlautomata.h"
+#include "libxml/xmlregexp.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/plugins/Variables/libxml/xinclude.h b/plugins/Variables/src/libxml/xinclude.h
index 9c83ba0e5c..f59020f7a2 100644
--- a/plugins/Variables/libxml/xinclude.h
+++ b/plugins/Variables/src/libxml/xinclude.h
@@ -12,7 +12,7 @@
 #ifndef __XML_XINCLUDE_H__
 #define __XML_XINCLUDE_H__
 
-#include <libxml/tree.h>
+#include "libxml/tree.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/plugins/Variables/libxml/xlink.h b/plugins/Variables/src/libxml/xlink.h
index c7f48c8539..b5a0f91067 100644
--- a/plugins/Variables/libxml/xlink.h
+++ b/plugins/Variables/src/libxml/xlink.h
@@ -13,7 +13,7 @@
 #ifndef __XML_XLINK_H__
 #define __XML_XLINK_H__
 
-#include <libxml/tree.h>
+#include "libxml/tree.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/plugins/Variables/libxml/xmlIO.h b/plugins/Variables/src/libxml/xmlIO.h
index 16cc8e507a..a6870fc51b 100644
--- a/plugins/Variables/libxml/xmlIO.h
+++ b/plugins/Variables/src/libxml/xmlIO.h
@@ -11,7 +11,7 @@
 #define __XML_IO_H__
 
 #include <stdio.h>
-#include <libxml/xmlversion.h>
+#include "libxml/xmlversion.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -112,10 +112,10 @@ typedef int (*xmlOutputCloseCallback) (void * context);
 }
 #endif
 
-#include <libxml/globals.h>
-#include <libxml/tree.h>
-#include <libxml/parser.h>
-#include <libxml/encoding.h>
+#include "libxml/globals.h"
+#include "libxml/tree.h"
+#include "libxml/parser.h"
+#include "libxml/encoding.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/plugins/Variables/libxml/xmlautomata.h b/plugins/Variables/src/libxml/xmlautomata.h
index 96ba2245b3..cc25e0b715 100644
--- a/plugins/Variables/libxml/xmlautomata.h
+++ b/plugins/Variables/src/libxml/xmlautomata.h
@@ -9,11 +9,11 @@
 #ifndef __XML_AUTOMATA_H__
 #define __XML_AUTOMATA_H__
 
-#include <libxml/xmlversion.h>
-#include <libxml/tree.h>
+#include "libxml/xmlversion.h"
+#include "libxml/tree.h"
 
 #ifdef LIBXML_AUTOMATA_ENABLED
-#include <libxml/xmlregexp.h>
+#include "libxml/xmlregexp.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/plugins/Variables/libxml/xmlerror.h b/plugins/Variables/src/libxml/xmlerror.h
index 33e2275910..a40a1ec7ab 100644
--- a/plugins/Variables/libxml/xmlerror.h
+++ b/plugins/Variables/src/libxml/xmlerror.h
@@ -1,4 +1,4 @@
-#include <libxml/parser.h>
+#include "libxml/parser.h"
 
 #ifndef __XML_ERROR_H__
 #define __XML_ERROR_H__
diff --git a/plugins/Variables/libxml/xmlmemory.h b/plugins/Variables/src/libxml/xmlmemory.h
index 8e8df944c1..314d8f8339 100644
--- a/plugins/Variables/libxml/xmlmemory.h
+++ b/plugins/Variables/src/libxml/xmlmemory.h
@@ -9,7 +9,7 @@
 #define _DEBUG_MEMORY_ALLOC_
 
 #include <stdio.h>
-#include <libxml/xmlversion.h>
+#include "libxml/xmlversion.h"
 
 /**
  * DEBUG_MEMORY:
@@ -160,8 +160,8 @@ char *	xmlMemStrdupLoc(const char *str, const char *file, int line);
 
 #ifndef __XML_GLOBALS_H
 #ifndef __XML_THREADS_H__
-#include <libxml/threads.h>
-#include <libxml/globals.h>
+#include "libxml/threads.h"
+#include "libxml/globals.h"
 #endif
 #endif
 
diff --git a/plugins/Variables/libxml/xmlregexp.h b/plugins/Variables/src/libxml/xmlregexp.h
index 434b7a2bd9..f15ead03ae 100644
--- a/plugins/Variables/libxml/xmlregexp.h
+++ b/plugins/Variables/src/libxml/xmlregexp.h
@@ -9,7 +9,7 @@
 #ifndef __XML_REGEXP_H__
 #define __XML_REGEXP_H__
 
-#include <libxml/xmlversion.h>
+#include "libxml/xmlversion.h"
 
 #ifdef LIBXML_REGEXP_ENABLED
 
@@ -37,7 +37,7 @@ typedef xmlRegExecCtxt *xmlRegExecCtxtPtr;
 #ifdef __cplusplus
 }
 #endif 
-#include <libxml/tree.h>
+#include "libxml/tree.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/plugins/Variables/libxml/xmlschemas.h b/plugins/Variables/src/libxml/xmlschemas.h
index 14b9230832..14b9230832 100644
--- a/plugins/Variables/libxml/xmlschemas.h
+++ b/plugins/Variables/src/libxml/xmlschemas.h
diff --git a/plugins/Variables/libxml/xmlschemastypes.h b/plugins/Variables/src/libxml/xmlschemastypes.h
index a758c128e5..a758c128e5 100644
--- a/plugins/Variables/libxml/xmlschemastypes.h
+++ b/plugins/Variables/src/libxml/xmlschemastypes.h
diff --git a/plugins/Variables/libxml/xmlunicode.h b/plugins/Variables/src/libxml/xmlunicode.h
index f0f1fe9ce9..f0f1fe9ce9 100644
--- a/plugins/Variables/libxml/xmlunicode.h
+++ b/plugins/Variables/src/libxml/xmlunicode.h
diff --git a/plugins/Variables/libxml/xmlversion.h b/plugins/Variables/src/libxml/xmlversion.h
index 1342eba969..1342eba969 100644
--- a/plugins/Variables/libxml/xmlversion.h
+++ b/plugins/Variables/src/libxml/xmlversion.h
diff --git a/plugins/Variables/libxml/xpath.h b/plugins/Variables/src/libxml/xpath.h
index f36b16f938..9ec5453d88 100644
--- a/plugins/Variables/libxml/xpath.h
+++ b/plugins/Variables/src/libxml/xpath.h
@@ -12,8 +12,8 @@
 #ifndef __XML_XPATH_H__
 #define __XML_XPATH_H__
 
-#include <libxml/tree.h>
-#include <libxml/hash.h>
+#include "libxml/tree.h"
+#include "libxml/hash.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/plugins/Variables/libxml/xpathInternals.h b/plugins/Variables/src/libxml/xpathInternals.h
index 59a4e35d53..59a4e35d53 100644
--- a/plugins/Variables/libxml/xpathInternals.h
+++ b/plugins/Variables/src/libxml/xpathInternals.h
diff --git a/plugins/Variables/libxml/xpointer.h b/plugins/Variables/src/libxml/xpointer.h
index 80c465c70f..80c465c70f 100644
--- a/plugins/Variables/libxml/xpointer.h
+++ b/plugins/Variables/src/libxml/xpointer.h
diff --git a/plugins/Variables/libxslt/numbersInternals.h b/plugins/Variables/src/libxslt/numbersInternals.h
index e4938f335a..8707789521 100644
--- a/plugins/Variables/libxslt/numbersInternals.h
+++ b/plugins/Variables/src/libxslt/numbersInternals.h
@@ -10,7 +10,7 @@
 #ifndef __XML_XSLT_NUMBERSINTERNALS_H__
 #define __XML_XSLT_NUMBERSINTERNALS_H__
 
-#include <libxml/tree.h>
+#include "libxml/tree.h"
 #include "xsltexports.h"
 
 #ifdef __cplusplus
diff --git a/plugins/Variables/libxslt/transform.h b/plugins/Variables/src/libxslt/transform.h
index 9efb79c437..10d3d2d55a 100644
--- a/plugins/Variables/libxslt/transform.h
+++ b/plugins/Variables/src/libxslt/transform.h
@@ -10,10 +10,10 @@
 #ifndef __XML_XSLT_TRANSFORM_H__
 #define __XML_XSLT_TRANSFORM_H__
 
-#include <libxml/parser.h>
-#include <libxml/xmlIO.h>
+#include "libxml/parser.h"
+#include "libxml/xmlIO.h"
 #include "xsltexports.h"
-#include <libxslt/xsltInternals.h>
+#include "libxslt/xsltInternals.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/plugins/Variables/libxslt/win32config.h b/plugins/Variables/src/libxslt/win32config.h
index c035aeb90e..249408b54a 100644
--- a/plugins/Variables/libxslt/win32config.h
+++ b/plugins/Variables/src/libxslt/win32config.h
@@ -78,7 +78,7 @@ static int isnan (double d) {
 #define HAVE__STAT
 #define HAVE_STRING_H
 
-#include <libxml/xmlversion.h>
+#include "libxml/xmlversion.h"
 
 #if !defined LIBXSLT_PUBLIC
 #if defined _MSC_VER && !defined IN_LIBXSLT && !defined LIBXSLT_STATIC
diff --git a/plugins/Variables/libxslt/xslt.h b/plugins/Variables/src/libxslt/xslt.h
index d201fccda4..4d3462fd25 100644
--- a/plugins/Variables/libxslt/xslt.h
+++ b/plugins/Variables/src/libxslt/xslt.h
@@ -9,7 +9,7 @@
 #ifndef __XML_XSLT_H__
 #define __XML_XSLT_H__
 
-#include <libxml/tree.h>
+#include "libxml/tree.h"
 #include "xsltexports.h"
 
 #ifdef __cplusplus
diff --git a/plugins/Variables/libxslt/xsltInternals.h b/plugins/Variables/src/libxslt/xsltInternals.h
index d574e5997b..78b80661da 100644
--- a/plugins/Variables/libxslt/xsltInternals.h
+++ b/plugins/Variables/src/libxslt/xsltInternals.h
@@ -12,11 +12,11 @@
 #ifndef __XML_XSLT_INTERNALS_H__
 #define __XML_XSLT_INTERNALS_H__
 
-#include <libxml/tree.h>
-#include <libxml/hash.h>
-#include <libxml/xpath.h>
-#include <libxml/xmlerror.h>
-#include <libxslt/xslt.h>
+#include "libxml/tree.h"
+#include "libxml/hash.h"
+#include "libxml/xpath.h"
+#include "libxml/xmlerror.h"
+#include "libxslt/xslt.h"
 #include "xsltexports.h"
 #include "numbersInternals.h"
 
diff --git a/plugins/Variables/libxslt/xsltexports.h b/plugins/Variables/src/libxslt/xsltexports.h
index aab58025b8..aab58025b8 100644
--- a/plugins/Variables/libxslt/xsltexports.h
+++ b/plugins/Variables/src/libxslt/xsltexports.h
diff --git a/plugins/Variables/libxslt/xsltutils.h b/plugins/Variables/src/libxslt/xsltutils.h
index 180ae04561..699fd4ab1c 100644
--- a/plugins/Variables/libxslt/xsltutils.h
+++ b/plugins/Variables/src/libxslt/xsltutils.h
@@ -10,13 +10,13 @@
 #define __XML_XSLTUTILS_H__
 
 #if defined(WIN32) && defined(_MSC_VER)
-#include <libxslt/xsltwin32config.h>
+#include "libxslt/xsltwin32config.h"
 #else
-#include <libxslt/xsltconfig.h>
+#include "libxslt/xsltconfig.h"
 #endif
 
-#include <libxml/xpath.h>
-#include <libxml/xmlerror.h>
+#include "libxml/xpath.h"
+#include "libxml/xmlerror.h"
 #include "xsltexports.h"
 #include "xsltInternals.h"
 
diff --git a/plugins/Variables/libxslt/xsltwin32config.h b/plugins/Variables/src/libxslt/xsltwin32config.h
index 985bfc71dc..985bfc71dc 100644
--- a/plugins/Variables/libxslt/xsltwin32config.h
+++ b/plugins/Variables/src/libxslt/xsltwin32config.h
diff --git a/plugins/Variables/lookup3.cpp b/plugins/Variables/src/lookup3.cpp
index f2c930950c..f2c930950c 100644
--- a/plugins/Variables/lookup3.cpp
+++ b/plugins/Variables/src/lookup3.cpp
diff --git a/plugins/Variables/main.cpp b/plugins/Variables/src/main.cpp
index b6330ce585..b6330ce585 100644
--- a/plugins/Variables/main.cpp
+++ b/plugins/Variables/src/main.cpp
diff --git a/plugins/Variables/options.cpp b/plugins/Variables/src/options.cpp
index 0220386564..0220386564 100644
--- a/plugins/Variables/options.cpp
+++ b/plugins/Variables/src/options.cpp
diff --git a/plugins/Variables/parse_alias.cpp b/plugins/Variables/src/parse_alias.cpp
index 49c2999595..49c2999595 100644
--- a/plugins/Variables/parse_alias.cpp
+++ b/plugins/Variables/src/parse_alias.cpp
diff --git a/plugins/Variables/parse_alias.h b/plugins/Variables/src/parse_alias.h
index d868841fb8..d868841fb8 100644
--- a/plugins/Variables/parse_alias.h
+++ b/plugins/Variables/src/parse_alias.h
diff --git a/plugins/Variables/parse_external.cpp b/plugins/Variables/src/parse_external.cpp
index 42b7a12462..42b7a12462 100644
--- a/plugins/Variables/parse_external.cpp
+++ b/plugins/Variables/src/parse_external.cpp
diff --git a/plugins/Variables/parse_external.h b/plugins/Variables/src/parse_external.h
index 201b1e26a3..201b1e26a3 100644
--- a/plugins/Variables/parse_external.h
+++ b/plugins/Variables/src/parse_external.h
diff --git a/plugins/Variables/parse_inet.cpp b/plugins/Variables/src/parse_inet.cpp
index 4eabed3ccc..4eabed3ccc 100644
--- a/plugins/Variables/parse_inet.cpp
+++ b/plugins/Variables/src/parse_inet.cpp
diff --git a/plugins/Variables/parse_inet.h b/plugins/Variables/src/parse_inet.h
index 8e9bf66e1b..8e9bf66e1b 100644
--- a/plugins/Variables/parse_inet.h
+++ b/plugins/Variables/src/parse_inet.h
diff --git a/plugins/Variables/parse_logic.cpp b/plugins/Variables/src/parse_logic.cpp
index b375faab14..b375faab14 100644
--- a/plugins/Variables/parse_logic.cpp
+++ b/plugins/Variables/src/parse_logic.cpp
diff --git a/plugins/Variables/parse_logic.h b/plugins/Variables/src/parse_logic.h
index 774a94b670..774a94b670 100644
--- a/plugins/Variables/parse_logic.h
+++ b/plugins/Variables/src/parse_logic.h
diff --git a/plugins/Variables/parse_math.cpp b/plugins/Variables/src/parse_math.cpp
index c214898b5d..c214898b5d 100644
--- a/plugins/Variables/parse_math.cpp
+++ b/plugins/Variables/src/parse_math.cpp
diff --git a/plugins/Variables/parse_math.h b/plugins/Variables/src/parse_math.h
index f185749399..f185749399 100644
--- a/plugins/Variables/parse_math.h
+++ b/plugins/Variables/src/parse_math.h
diff --git a/plugins/Variables/parse_metacontacts.cpp b/plugins/Variables/src/parse_metacontacts.cpp
index 8831e7a192..8831e7a192 100644
--- a/plugins/Variables/parse_metacontacts.cpp
+++ b/plugins/Variables/src/parse_metacontacts.cpp
diff --git a/plugins/Variables/parse_metacontacts.h b/plugins/Variables/src/parse_metacontacts.h
index 8015d40413..8015d40413 100644
--- a/plugins/Variables/parse_metacontacts.h
+++ b/plugins/Variables/src/parse_metacontacts.h
diff --git a/plugins/Variables/parse_miranda.cpp b/plugins/Variables/src/parse_miranda.cpp
index 926f7fb67b..926f7fb67b 100644
--- a/plugins/Variables/parse_miranda.cpp
+++ b/plugins/Variables/src/parse_miranda.cpp
diff --git a/plugins/Variables/parse_miranda.h b/plugins/Variables/src/parse_miranda.h
index 0d429d67bb..0d429d67bb 100644
--- a/plugins/Variables/parse_miranda.h
+++ b/plugins/Variables/src/parse_miranda.h
diff --git a/plugins/Variables/parse_regexp.cpp b/plugins/Variables/src/parse_regexp.cpp
index 4460e41ca6..4460e41ca6 100644
--- a/plugins/Variables/parse_regexp.cpp
+++ b/plugins/Variables/src/parse_regexp.cpp
diff --git a/plugins/Variables/parse_regexp.h b/plugins/Variables/src/parse_regexp.h
index 00d38cab59..00d38cab59 100644
--- a/plugins/Variables/parse_regexp.h
+++ b/plugins/Variables/src/parse_regexp.h
diff --git a/plugins/Variables/parse_str.cpp b/plugins/Variables/src/parse_str.cpp
index 112b064d1f..112b064d1f 100644
--- a/plugins/Variables/parse_str.cpp
+++ b/plugins/Variables/src/parse_str.cpp
diff --git a/plugins/Variables/parse_str.h b/plugins/Variables/src/parse_str.h
index 7942da455f..7942da455f 100644
--- a/plugins/Variables/parse_str.h
+++ b/plugins/Variables/src/parse_str.h
diff --git a/plugins/Variables/parse_system.cpp b/plugins/Variables/src/parse_system.cpp
index e5db6af03e..e5db6af03e 100644
--- a/plugins/Variables/parse_system.cpp
+++ b/plugins/Variables/src/parse_system.cpp
diff --git a/plugins/Variables/parse_system.h b/plugins/Variables/src/parse_system.h
index d4349130f7..d4349130f7 100644
--- a/plugins/Variables/parse_system.h
+++ b/plugins/Variables/src/parse_system.h
diff --git a/plugins/Variables/parse_variables.cpp b/plugins/Variables/src/parse_variables.cpp
index 1be98fdf5e..1be98fdf5e 100644
--- a/plugins/Variables/parse_variables.cpp
+++ b/plugins/Variables/src/parse_variables.cpp
diff --git a/plugins/Variables/parse_variables.h b/plugins/Variables/src/parse_variables.h
index 5bde654f5f..5bde654f5f 100644
--- a/plugins/Variables/parse_variables.h
+++ b/plugins/Variables/src/parse_variables.h
diff --git a/plugins/Variables/parse_xml.cpp b/plugins/Variables/src/parse_xml.cpp
index 4e360035b4..76f701e116 100644
--- a/plugins/Variables/parse_xml.cpp
+++ b/plugins/Variables/src/parse_xml.cpp
@@ -20,17 +20,17 @@
 #include "parse_xml.h"
 
 #include <string.h>
-#include <libxml/xmlmemory.h>
-#include <libxml/debugXML.h>
-#include <libxml/HTMLtree.h>
-#include <libxml/xmlIO.h>
-#include <libxml/DOCBparser.h>
-#include <libxml/xinclude.h>
-#include <libxml/catalog.h>
-#include <libxslt/xslt.h>
-#include <libxslt/xsltInternals.h>
-#include <libxslt/transform.h>
-#include <libxslt/xsltutils.h>
+#include "libxml/xmlmemory.h"
+#include "libxml/debugXML.h"
+#include "libxml/HTMLtree.h"
+#include "libxml/xmlIO.h"
+#include "libxml/DOCBparser.h"
+#include "libxml/xinclude.h"
+#include "libxml/catalog.h"
+#include "libxslt/xslt.h"
+#include "libxslt/xsltInternals.h"
+#include "libxslt/transform.h"
+#include "libxslt/xsltutils.h"
 
 xsltStylesheetPtr (*pXsltParseStylesheetDoc)(xmlDocPtr doc);
 xmlDocPtr (*pXmlParseMemory)(const char * buffer, int size);
diff --git a/plugins/Variables/parse_xml.h b/plugins/Variables/src/parse_xml.h
index 51df56be79..51df56be79 100644
--- a/plugins/Variables/parse_xml.h
+++ b/plugins/Variables/src/parse_xml.h
diff --git a/plugins/Variables/pcre/include/pcre.h b/plugins/Variables/src/pcre/include/pcre.h
index 712bd3d714..712bd3d714 100644
--- a/plugins/Variables/pcre/include/pcre.h
+++ b/plugins/Variables/src/pcre/include/pcre.h
diff --git a/plugins/Variables/pcre/include/pcreposix.h b/plugins/Variables/src/pcre/include/pcreposix.h
index c77c0b0523..c77c0b0523 100644
--- a/plugins/Variables/pcre/include/pcreposix.h
+++ b/plugins/Variables/src/pcre/include/pcreposix.h
diff --git a/plugins/Variables/pcre/lib/pcre.lib b/plugins/Variables/src/pcre/lib/pcre.lib
index c0dce0ce08..c0dce0ce08 100644
--- a/plugins/Variables/pcre/lib/pcre.lib
+++ b/plugins/Variables/src/pcre/lib/pcre.lib
diff --git a/plugins/Variables/pcre/lib/pcred.lib b/plugins/Variables/src/pcre/lib/pcred.lib
index 103517b44b..103517b44b 100644
--- a/plugins/Variables/pcre/lib/pcred.lib
+++ b/plugins/Variables/src/pcre/lib/pcred.lib
diff --git a/plugins/Variables/pcre/lib64/pcre.lib b/plugins/Variables/src/pcre/lib64/pcre.lib
index 57bd4b65c3..57bd4b65c3 100644
--- a/plugins/Variables/pcre/lib64/pcre.lib
+++ b/plugins/Variables/src/pcre/lib64/pcre.lib
diff --git a/plugins/Variables/pcre/lib64/pcred.lib b/plugins/Variables/src/pcre/lib64/pcred.lib
index 8350667bf7..8350667bf7 100644
--- a/plugins/Variables/pcre/lib64/pcred.lib
+++ b/plugins/Variables/src/pcre/lib64/pcred.lib
diff --git a/plugins/Variables/pcre/pcre_license.txt b/plugins/Variables/src/pcre/pcre_license.txt
index 0fbd6f3e6b..0fbd6f3e6b 100644
--- a/plugins/Variables/pcre/pcre_license.txt
+++ b/plugins/Variables/src/pcre/pcre_license.txt
diff --git a/plugins/Variables/resource.h b/plugins/Variables/src/resource.h
index 3217663618..3217663618 100644
--- a/plugins/Variables/resource.h
+++ b/plugins/Variables/src/resource.h
diff --git a/plugins/Variables/tokenregister.cpp b/plugins/Variables/src/tokenregister.cpp
index 0418c3024f..0418c3024f 100644
--- a/plugins/Variables/tokenregister.cpp
+++ b/plugins/Variables/src/tokenregister.cpp
diff --git a/plugins/Variables/trigger_variables.cpp b/plugins/Variables/src/trigger_variables.cpp
index 6b90088c4f..6b90088c4f 100644
--- a/plugins/Variables/trigger_variables.cpp
+++ b/plugins/Variables/src/trigger_variables.cpp
diff --git a/plugins/Variables/trigger_variables.h b/plugins/Variables/src/trigger_variables.h
index 6b80087e2d..6b80087e2d 100644
--- a/plugins/Variables/trigger_variables.h
+++ b/plugins/Variables/src/trigger_variables.h
diff --git a/plugins/Variables/variables.cpp b/plugins/Variables/src/variables.cpp
index 258725055f..258725055f 100644
--- a/plugins/Variables/variables.cpp
+++ b/plugins/Variables/src/variables.cpp
diff --git a/plugins/Variables/variables.h b/plugins/Variables/src/variables.h
index 35b5e2f367..24b2d17737 100644
--- a/plugins/Variables/variables.h
+++ b/plugins/Variables/src/variables.h
@@ -20,6 +20,8 @@
 
 #define MIRANDA_VER 0x0A00
 
+#define _CRT_NON_CONFORMING_SWPRINTFS
+
 #include <tchar.h> 
 #include <malloc.h>