182 files changed, 55 insertions, 1785 deletions
diff --git a/bin10/mir_dev.sln b/bin10/mir_dev.sln
index 2b505bf3bf..2193ed4357 100644
--- a/bin10/mir_dev.sln
+++ b/bin10/mir_dev.sln
@@ -1,6 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mir_core", "..\src\mir_core\mir_core_10.vcxproj", "{D9EFEA4B-B817-4DE1-BD62-68A5DB8F5F60}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mir_core", "..\src\mir_core\mir_core.vcxproj", "{D9EFEA4B-B817-4DE1-BD62-68A5DB8F5F60}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mir_app", "..\src\mir_app\mir_app.vcxproj", "{538E451F-E667-4D07-BCE6-976ECC7BB8D1}"
 EndProject
@@ -403,7 +403,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glib", "..\protocols\Sameti
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GmailNotifier", "..\plugins\GmailNotifier\GmailNotifier_10.vcxproj", "{EDAAD28B-505B-4969-A8BB-97EAE818DEEA}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Pcre16", "..\plugins\Pcre16\pcre16_10.vcxproj", "{6124E997-426E-4A0B-9617-D6D577D5E7D7}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Pcre16", "..\libs\Pcre16\pcre16.vcxproj", "{6124E997-426E-4A0B-9617-D6D577D5E7D7}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IEHistory", "..\plugins\IEHistory\IEHistory_10.vcxproj", "{7F5EA8BC-8F2B-478E-8F05-0ED4B691B776}"
 EndProject
diff --git a/bin10/mir_full.sln b/bin10/mir_full.sln
index 2a07729404..98ced02bea 100644
--- a/bin10/mir_full.sln
+++ b/bin10/mir_full.sln
@@ -1,6 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mir_core", "..\src\mir_core\mir_core_10.vcxproj", "{D9EFEA4B-B817-4DE1-BD62-68A5DB8F5F60}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mir_core", "..\src\mir_core\mir_core.vcxproj", "{D9EFEA4B-B817-4DE1-BD62-68A5DB8F5F60}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mir_app", "..\src\mir_app\mir_app.vcxproj", "{538E451F-E667-4D07-BCE6-976ECC7BB8D1}"
 EndProject
@@ -408,7 +408,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glib", "..\protocols\Sameti
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GmailNotifier", "..\plugins\GmailNotifier\GmailNotifier_10.vcxproj", "{EDAAD28B-505B-4969-A8BB-97EAE818DEEA}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Pcre16", "..\plugins\Pcre16\pcre16_10.vcxproj", "{6124E997-426E-4A0B-9617-D6D577D5E7D7}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Pcre16", "..\libs\Pcre16\pcre16.vcxproj", "{6124E997-426E-4A0B-9617-D6D577D5E7D7}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IEHistory", "..\plugins\IEHistory\IEHistory_10.vcxproj", "{7F5EA8BC-8F2B-478E-8F05-0ED4B691B776}"
 EndProject
diff --git a/bin10/mir_full_pro.sln b/bin10/mir_full_pro.sln
index 0dd44616f9..d45d33aebb 100644
--- a/bin10/mir_full_pro.sln
+++ b/bin10/mir_full_pro.sln
@@ -1,6 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mir_core", "..\src\mir_core\mir_core_10.vcxproj", "{D9EFEA4B-B817-4DE1-BD62-68A5DB8F5F60}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mir_core", "..\src\mir_core\mir_core.vcxproj", "{D9EFEA4B-B817-4DE1-BD62-68A5DB8F5F60}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mir_app", "..\src\mir_app\mir_app.vcxproj", "{538E451F-E667-4D07-BCE6-976ECC7BB8D1}"
 EndProject
@@ -440,7 +440,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Sametime", "..\protocols\Sa
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GmailNotifier", "..\plugins\GmailNotifier\GmailNotifier_10.vcxproj", "{EDAAD28B-505B-4969-A8BB-97EAE818DEEA}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Pcre16", "..\plugins\Pcre16\pcre16_10.vcxproj", "{6124E997-426E-4A0B-9617-D6D577D5E7D7}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Pcre16", "..\libs\Pcre16\pcre16.vcxproj", "{6124E997-426E-4A0B-9617-D6D577D5E7D7}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IEHistory", "..\plugins\IEHistory\IEHistory_10.vcxproj", "{7F5EA8BC-8F2B-478E-8F05-0ED4B691B776}"
 EndProject
diff --git a/bin10/miranda32.sln b/bin10/miranda32.sln
index fd6aa144d5..997f102fb5 100644
--- a/bin10/miranda32.sln
+++ b/bin10/miranda32.sln
@@ -1,6 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mir_core", "..\src\mir_core\mir_core_10.vcxproj", "{D9EFEA4B-B817-4DE1-BD62-68A5DB8F5F60}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mir_core", "..\src\mir_core\mir_core.vcxproj", "{D9EFEA4B-B817-4DE1-BD62-68A5DB8F5F60}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mir_app", "..\src\mir_app\mir_app.vcxproj", "{538E451F-E667-4D07-BCE6-976ECC7BB8D1}"
 EndProject
diff --git a/bin12/mir_dev.sln b/bin12/mir_dev.sln
index fbf0b18057..ad48333148 100644
--- a/bin12/mir_dev.sln
+++ b/bin12/mir_dev.sln
@@ -2,7 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Express 2013 for Windows Desktop
 VisualStudioVersion = 12.0.31101.0
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mir_core", "..\src\mir_core\mir_core_12.vcxproj", "{D9EFEA4B-B817-4DE1-BD62-68A5DB8F5F60}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mir_core", "..\src\mir_core\mir_core.vcxproj", "{D9EFEA4B-B817-4DE1-BD62-68A5DB8F5F60}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mir_app", "..\src\mir_app\mir_app.vcxproj", "{538E451F-E667-4D07-BCE6-976ECC7BB8D1}"
 EndProject
@@ -410,7 +410,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glib", "..\protocols\Sameti
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GmailNotifier", "..\plugins\GmailNotifier\GmailNotifier_12.vcxproj", "{EDAAD28B-505B-4969-A8BB-97EAE818DEEA}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Pcre16", "..\plugins\Pcre16\pcre16_12.vcxproj", "{6124E997-426E-4A0B-9617-D6D577D5E7D7}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Pcre16", "..\libs\Pcre16\pcre16.vcxproj", "{6124E997-426E-4A0B-9617-D6D577D5E7D7}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IEHistory", "..\plugins\IEHistory\IEHistory_12.vcxproj", "{7F5EA8BC-8F2B-478E-8F05-0ED4B691B776}"
 EndProject
diff --git a/bin12/mir_full.sln b/bin12/mir_full.sln
index d3535e46d1..363dd5e6f6 100644
--- a/bin12/mir_full.sln
+++ b/bin12/mir_full.sln
@@ -2,7 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Express 2013 for Windows Desktop
 VisualStudioVersion = 12.0.31101.0
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mir_core", "..\src\mir_core\mir_core_12.vcxproj", "{D9EFEA4B-B817-4DE1-BD62-68A5DB8F5F60}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mir_core", "..\src\mir_core\mir_core.vcxproj", "{D9EFEA4B-B817-4DE1-BD62-68A5DB8F5F60}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mir_app", "..\src\mir_app\mir_app.vcxproj", "{538E451F-E667-4D07-BCE6-976ECC7BB8D1}"
 EndProject
@@ -410,7 +410,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glib", "..\protocols\Sameti
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GmailNotifier", "..\plugins\GmailNotifier\GmailNotifier_12.vcxproj", "{EDAAD28B-505B-4969-A8BB-97EAE818DEEA}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Pcre16", "..\plugins\Pcre16\pcre16_12.vcxproj", "{6124E997-426E-4A0B-9617-D6D577D5E7D7}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Pcre16", "..\libs\Pcre16\pcre16.vcxproj", "{6124E997-426E-4A0B-9617-D6D577D5E7D7}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IEHistory", "..\plugins\IEHistory\IEHistory_12.vcxproj", "{7F5EA8BC-8F2B-478E-8F05-0ED4B691B776}"
 EndProject
diff --git a/bin12/miranda32.sln b/bin12/miranda32.sln
index 699e87da2e..ced079309f 100644
--- a/bin12/miranda32.sln
+++ b/bin12/miranda32.sln
@@ -2,7 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Express 2013 for Windows Desktop
 VisualStudioVersion = 12.0.31101.0
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mir_core", "..\src\mir_core\mir_core_12.vcxproj", "{D9EFEA4B-B817-4DE1-BD62-68A5DB8F5F60}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mir_core", "..\src\mir_core\mir_core.vcxproj", "{D9EFEA4B-B817-4DE1-BD62-68A5DB8F5F60}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mir_app", "..\src\mir_app\mir_app.vcxproj", "{538E451F-E667-4D07-BCE6-976ECC7BB8D1}"
 EndProject
diff --git a/include/m_string.h b/include/m_string.h
index ae769e52bc..53109e2130 100644
--- a/include/m_string.h
+++ b/include/m_string.h
@@ -440,7 +440,7 @@ public:
 			return;
 		}
 		DWORD dwSize = static_cast<DWORD>(size);
-		BOOL fSuccess = ::CharToOemBuffA(pstrString, pstrString, dwSize);
+		::CharToOemBuffA(pstrString, pstrString, dwSize);
 	}
 
 	static void ConvertToAnsi(_CharType* pstrString, size_t size)
@@ -449,7 +449,7 @@ public:
 			return;
 
 		DWORD dwSize = static_cast<DWORD>(size);
-		BOOL fSuccess = ::OemToCharBuffA(pstrString, pstrString, dwSize);
+		::OemToCharBuffA(pstrString, pstrString, dwSize);
 	}
 
 	static void __stdcall FloodCharacters(char ch, int nLength, char* pch)
diff --git a/plugins/Pcre16/docs/AUTHORS b/libs/Pcre16/docs/AUTHORS
index 5eee1af4c6..5eee1af4c6 100644
--- a/plugins/Pcre16/docs/AUTHORS
+++ b/libs/Pcre16/docs/AUTHORS
diff --git a/plugins/Pcre16/docs/COPYING b/libs/Pcre16/docs/COPYING
index 58eed01b61..58eed01b61 100644
--- a/plugins/Pcre16/docs/COPYING
+++ b/libs/Pcre16/docs/COPYING
diff --git a/plugins/Pcre16/docs/ChangeLog b/libs/Pcre16/docs/ChangeLog
index 7801ef8411..7801ef8411 100644
--- a/plugins/Pcre16/docs/ChangeLog
+++ b/libs/Pcre16/docs/ChangeLog
diff --git a/plugins/Pcre16/docs/HACKING b/libs/Pcre16/docs/HACKING
index 691b7a14e5..691b7a14e5 100644
--- a/plugins/Pcre16/docs/HACKING
+++ b/libs/Pcre16/docs/HACKING
diff --git a/plugins/Pcre16/docs/LICENCE b/libs/Pcre16/docs/LICENCE
index 602e4ae680..602e4ae680 100644
--- a/plugins/Pcre16/docs/LICENCE
+++ b/libs/Pcre16/docs/LICENCE
diff --git a/plugins/Pcre16/docs/NEWS b/libs/Pcre16/docs/NEWS
index 6331e9908d..6331e9908d 100644
--- a/plugins/Pcre16/docs/NEWS
+++ b/libs/Pcre16/docs/NEWS
diff --git a/plugins/Pcre16/docs/NON-AUTOTOOLS-BUILD b/libs/Pcre16/docs/NON-AUTOTOOLS-BUILD
index cddf3e0699..cddf3e0699 100644
--- a/plugins/Pcre16/docs/NON-AUTOTOOLS-BUILD
+++ b/libs/Pcre16/docs/NON-AUTOTOOLS-BUILD
diff --git a/plugins/Pcre16/docs/NON-UNIX-USE b/libs/Pcre16/docs/NON-UNIX-USE
index a25546b6ff..a25546b6ff 100644
--- a/plugins/Pcre16/docs/NON-UNIX-USE
+++ b/libs/Pcre16/docs/NON-UNIX-USE
diff --git a/plugins/Pcre16/docs/README b/libs/Pcre16/docs/README
index 88f2dfd4ef..88f2dfd4ef 100644
--- a/plugins/Pcre16/docs/README
+++ b/libs/Pcre16/docs/README
diff --git a/plugins/Pcre16/docs/doc/html/NON-AUTOTOOLS-BUILD.txt b/libs/Pcre16/docs/doc/html/NON-AUTOTOOLS-BUILD.txt
index cddf3e0699..cddf3e0699 100644
--- a/plugins/Pcre16/docs/doc/html/NON-AUTOTOOLS-BUILD.txt
+++ b/libs/Pcre16/docs/doc/html/NON-AUTOTOOLS-BUILD.txt
diff --git a/plugins/Pcre16/docs/doc/html/README.txt b/libs/Pcre16/docs/doc/html/README.txt
index 88f2dfd4ef..88f2dfd4ef 100644
--- a/plugins/Pcre16/docs/doc/html/README.txt
+++ b/libs/Pcre16/docs/doc/html/README.txt
diff --git a/plugins/Pcre16/docs/doc/html/index.html b/libs/Pcre16/docs/doc/html/index.html
index 352c55df2f..352c55df2f 100644
--- a/plugins/Pcre16/docs/doc/html/index.html
+++ b/libs/Pcre16/docs/doc/html/index.html
diff --git a/plugins/Pcre16/docs/doc/html/pcre-config.html b/libs/Pcre16/docs/doc/html/pcre-config.html
index 56a8060492..56a8060492 100644
--- a/plugins/Pcre16/docs/doc/html/pcre-config.html
+++ b/libs/Pcre16/docs/doc/html/pcre-config.html
diff --git a/plugins/Pcre16/docs/doc/html/pcre.html b/libs/Pcre16/docs/doc/html/pcre.html
index c2b29aa812..c2b29aa812 100644
--- a/plugins/Pcre16/docs/doc/html/pcre.html
+++ b/libs/Pcre16/docs/doc/html/pcre.html
diff --git a/plugins/Pcre16/docs/doc/html/pcre16.html b/libs/Pcre16/docs/doc/html/pcre16.html
index f00859f052..f00859f052 100644
--- a/plugins/Pcre16/docs/doc/html/pcre16.html
+++ b/libs/Pcre16/docs/doc/html/pcre16.html
diff --git a/plugins/Pcre16/docs/doc/html/pcre32.html b/libs/Pcre16/docs/doc/html/pcre32.html
index f96876e750..f96876e750 100644
--- a/plugins/Pcre16/docs/doc/html/pcre32.html
+++ b/libs/Pcre16/docs/doc/html/pcre32.html
diff --git a/plugins/Pcre16/docs/doc/html/pcre_assign_jit_stack.html b/libs/Pcre16/docs/doc/html/pcre_assign_jit_stack.html
index b2eef704db..b2eef704db 100644
--- a/plugins/Pcre16/docs/doc/html/pcre_assign_jit_stack.html
+++ b/libs/Pcre16/docs/doc/html/pcre_assign_jit_stack.html
diff --git a/plugins/Pcre16/docs/doc/html/pcre_compile.html b/libs/Pcre16/docs/doc/html/pcre_compile.html
index 95b4bec63c..95b4bec63c 100644
--- a/plugins/Pcre16/docs/doc/html/pcre_compile.html
+++ b/libs/Pcre16/docs/doc/html/pcre_compile.html
diff --git a/plugins/Pcre16/docs/doc/html/pcre_compile2.html b/libs/Pcre16/docs/doc/html/pcre_compile2.html
index 9cd56a237b..9cd56a237b 100644
--- a/plugins/Pcre16/docs/doc/html/pcre_compile2.html
+++ b/libs/Pcre16/docs/doc/html/pcre_compile2.html
diff --git a/plugins/Pcre16/docs/doc/html/pcre_config.html b/libs/Pcre16/docs/doc/html/pcre_config.html
index bcdcdded70..bcdcdded70 100644
--- a/plugins/Pcre16/docs/doc/html/pcre_config.html
+++ b/libs/Pcre16/docs/doc/html/pcre_config.html
diff --git a/plugins/Pcre16/docs/doc/html/pcre_copy_named_substring.html b/libs/Pcre16/docs/doc/html/pcre_copy_named_substring.html
index 77b48043cd..77b48043cd 100644
--- a/plugins/Pcre16/docs/doc/html/pcre_copy_named_substring.html
+++ b/libs/Pcre16/docs/doc/html/pcre_copy_named_substring.html
diff --git a/plugins/Pcre16/docs/doc/html/pcre_copy_substring.html b/libs/Pcre16/docs/doc/html/pcre_copy_substring.html
index ecaebe8533..ecaebe8533 100644
--- a/plugins/Pcre16/docs/doc/html/pcre_copy_substring.html
+++ b/libs/Pcre16/docs/doc/html/pcre_copy_substring.html
diff --git a/plugins/Pcre16/docs/doc/html/pcre_dfa_exec.html b/libs/Pcre16/docs/doc/html/pcre_dfa_exec.html
index 5fff6a7e0a..5fff6a7e0a 100644
--- a/plugins/Pcre16/docs/doc/html/pcre_dfa_exec.html
+++ b/libs/Pcre16/docs/doc/html/pcre_dfa_exec.html
diff --git a/plugins/Pcre16/docs/doc/html/pcre_exec.html b/libs/Pcre16/docs/doc/html/pcre_exec.html
index 18e1a13ff8..18e1a13ff8 100644
--- a/plugins/Pcre16/docs/doc/html/pcre_exec.html
+++ b/libs/Pcre16/docs/doc/html/pcre_exec.html
diff --git a/plugins/Pcre16/docs/doc/html/pcre_free_study.html b/libs/Pcre16/docs/doc/html/pcre_free_study.html
index 7f9e10e863..7f9e10e863 100644
--- a/plugins/Pcre16/docs/doc/html/pcre_free_study.html
+++ b/libs/Pcre16/docs/doc/html/pcre_free_study.html
diff --git a/plugins/Pcre16/docs/doc/html/pcre_free_substring.html b/libs/Pcre16/docs/doc/html/pcre_free_substring.html
index 1fe6610746..1fe6610746 100644
--- a/plugins/Pcre16/docs/doc/html/pcre_free_substring.html
+++ b/libs/Pcre16/docs/doc/html/pcre_free_substring.html
diff --git a/plugins/Pcre16/docs/doc/html/pcre_free_substring_list.html b/libs/Pcre16/docs/doc/html/pcre_free_substring_list.html
index c0861780b4..c0861780b4 100644
--- a/plugins/Pcre16/docs/doc/html/pcre_free_substring_list.html
+++ b/libs/Pcre16/docs/doc/html/pcre_free_substring_list.html
diff --git a/plugins/Pcre16/docs/doc/html/pcre_fullinfo.html b/libs/Pcre16/docs/doc/html/pcre_fullinfo.html
index b88fc1155b..b88fc1155b 100644
--- a/plugins/Pcre16/docs/doc/html/pcre_fullinfo.html
+++ b/libs/Pcre16/docs/doc/html/pcre_fullinfo.html
diff --git a/plugins/Pcre16/docs/doc/html/pcre_get_named_substring.html b/libs/Pcre16/docs/doc/html/pcre_get_named_substring.html
index 72924d9b25..72924d9b25 100644
--- a/plugins/Pcre16/docs/doc/html/pcre_get_named_substring.html
+++ b/libs/Pcre16/docs/doc/html/pcre_get_named_substring.html
diff --git a/plugins/Pcre16/docs/doc/html/pcre_get_stringnumber.html b/libs/Pcre16/docs/doc/html/pcre_get_stringnumber.html
index 7324d782e7..7324d782e7 100644
--- a/plugins/Pcre16/docs/doc/html/pcre_get_stringnumber.html
+++ b/libs/Pcre16/docs/doc/html/pcre_get_stringnumber.html
diff --git a/plugins/Pcre16/docs/doc/html/pcre_get_stringtable_entries.html b/libs/Pcre16/docs/doc/html/pcre_get_stringtable_entries.html
index 79906798e6..79906798e6 100644
--- a/plugins/Pcre16/docs/doc/html/pcre_get_stringtable_entries.html
+++ b/libs/Pcre16/docs/doc/html/pcre_get_stringtable_entries.html
diff --git a/plugins/Pcre16/docs/doc/html/pcre_get_substring.html b/libs/Pcre16/docs/doc/html/pcre_get_substring.html
index 1a8e4f5a49..1a8e4f5a49 100644
--- a/plugins/Pcre16/docs/doc/html/pcre_get_substring.html
+++ b/libs/Pcre16/docs/doc/html/pcre_get_substring.html
diff --git a/plugins/Pcre16/docs/doc/html/pcre_get_substring_list.html b/libs/Pcre16/docs/doc/html/pcre_get_substring_list.html
index 7e8c6bc858..7e8c6bc858 100644
--- a/plugins/Pcre16/docs/doc/html/pcre_get_substring_list.html
+++ b/libs/Pcre16/docs/doc/html/pcre_get_substring_list.html
diff --git a/plugins/Pcre16/docs/doc/html/pcre_jit_exec.html b/libs/Pcre16/docs/doc/html/pcre_jit_exec.html
index 4ebb0cbcac..4ebb0cbcac 100644
--- a/plugins/Pcre16/docs/doc/html/pcre_jit_exec.html
+++ b/libs/Pcre16/docs/doc/html/pcre_jit_exec.html
diff --git a/plugins/Pcre16/docs/doc/html/pcre_jit_stack_alloc.html b/libs/Pcre16/docs/doc/html/pcre_jit_stack_alloc.html
index 23ba450750..23ba450750 100644
--- a/plugins/Pcre16/docs/doc/html/pcre_jit_stack_alloc.html
+++ b/libs/Pcre16/docs/doc/html/pcre_jit_stack_alloc.html
diff --git a/plugins/Pcre16/docs/doc/html/pcre_jit_stack_free.html b/libs/Pcre16/docs/doc/html/pcre_jit_stack_free.html
index 8bd06e4655..8bd06e4655 100644
--- a/plugins/Pcre16/docs/doc/html/pcre_jit_stack_free.html
+++ b/libs/Pcre16/docs/doc/html/pcre_jit_stack_free.html
diff --git a/plugins/Pcre16/docs/doc/html/pcre_maketables.html b/libs/Pcre16/docs/doc/html/pcre_maketables.html
index 3a7b5ebc4a..3a7b5ebc4a 100644
--- a/plugins/Pcre16/docs/doc/html/pcre_maketables.html
+++ b/libs/Pcre16/docs/doc/html/pcre_maketables.html
diff --git a/plugins/Pcre16/docs/doc/html/pcre_pattern_to_host_byte_order.html b/libs/Pcre16/docs/doc/html/pcre_pattern_to_host_byte_order.html
index 1b1c80372b..1b1c80372b 100644
--- a/plugins/Pcre16/docs/doc/html/pcre_pattern_to_host_byte_order.html
+++ b/libs/Pcre16/docs/doc/html/pcre_pattern_to_host_byte_order.html
diff --git a/plugins/Pcre16/docs/doc/html/pcre_refcount.html b/libs/Pcre16/docs/doc/html/pcre_refcount.html
index bfb92e6d8a..bfb92e6d8a 100644
--- a/plugins/Pcre16/docs/doc/html/pcre_refcount.html
+++ b/libs/Pcre16/docs/doc/html/pcre_refcount.html
diff --git a/plugins/Pcre16/docs/doc/html/pcre_study.html b/libs/Pcre16/docs/doc/html/pcre_study.html
index af82f11409..af82f11409 100644
--- a/plugins/Pcre16/docs/doc/html/pcre_study.html
+++ b/libs/Pcre16/docs/doc/html/pcre_study.html
diff --git a/plugins/Pcre16/docs/doc/html/pcre_utf16_to_host_byte_order.html b/libs/Pcre16/docs/doc/html/pcre_utf16_to_host_byte_order.html
index 18e7788f68..18e7788f68 100644
--- a/plugins/Pcre16/docs/doc/html/pcre_utf16_to_host_byte_order.html
+++ b/libs/Pcre16/docs/doc/html/pcre_utf16_to_host_byte_order.html
diff --git a/plugins/Pcre16/docs/doc/html/pcre_utf32_to_host_byte_order.html b/libs/Pcre16/docs/doc/html/pcre_utf32_to_host_byte_order.html
index 772ae40cd9..772ae40cd9 100644
--- a/plugins/Pcre16/docs/doc/html/pcre_utf32_to_host_byte_order.html
+++ b/libs/Pcre16/docs/doc/html/pcre_utf32_to_host_byte_order.html
diff --git a/plugins/Pcre16/docs/doc/html/pcre_version.html b/libs/Pcre16/docs/doc/html/pcre_version.html
index d33e718955..d33e718955 100644
--- a/plugins/Pcre16/docs/doc/html/pcre_version.html
+++ b/libs/Pcre16/docs/doc/html/pcre_version.html
diff --git a/plugins/Pcre16/docs/doc/html/pcreapi.html b/libs/Pcre16/docs/doc/html/pcreapi.html
index b401ecc76d..b401ecc76d 100644
--- a/plugins/Pcre16/docs/doc/html/pcreapi.html
+++ b/libs/Pcre16/docs/doc/html/pcreapi.html
diff --git a/plugins/Pcre16/docs/doc/html/pcrebuild.html b/libs/Pcre16/docs/doc/html/pcrebuild.html
index 03c8cbe0b2..03c8cbe0b2 100644
--- a/plugins/Pcre16/docs/doc/html/pcrebuild.html
+++ b/libs/Pcre16/docs/doc/html/pcrebuild.html
diff --git a/plugins/Pcre16/docs/doc/html/pcrecallout.html b/libs/Pcre16/docs/doc/html/pcrecallout.html
index 53a937f52d..53a937f52d 100644
--- a/plugins/Pcre16/docs/doc/html/pcrecallout.html
+++ b/libs/Pcre16/docs/doc/html/pcrecallout.html
diff --git a/plugins/Pcre16/docs/doc/html/pcrecompat.html b/libs/Pcre16/docs/doc/html/pcrecompat.html
index 3e6226692e..3e6226692e 100644
--- a/plugins/Pcre16/docs/doc/html/pcrecompat.html
+++ b/libs/Pcre16/docs/doc/html/pcrecompat.html
diff --git a/plugins/Pcre16/docs/doc/html/pcrecpp.html b/libs/Pcre16/docs/doc/html/pcrecpp.html
index b7eac3a3d7..b7eac3a3d7 100644
--- a/plugins/Pcre16/docs/doc/html/pcrecpp.html
+++ b/libs/Pcre16/docs/doc/html/pcrecpp.html
diff --git a/plugins/Pcre16/docs/doc/html/pcredemo.html b/libs/Pcre16/docs/doc/html/pcredemo.html
index 894a930826..894a930826 100644
--- a/plugins/Pcre16/docs/doc/html/pcredemo.html
+++ b/libs/Pcre16/docs/doc/html/pcredemo.html
diff --git a/plugins/Pcre16/docs/doc/html/pcregrep.html b/libs/Pcre16/docs/doc/html/pcregrep.html
index dacbb4998f..dacbb4998f 100644
--- a/plugins/Pcre16/docs/doc/html/pcregrep.html
+++ b/libs/Pcre16/docs/doc/html/pcregrep.html
diff --git a/plugins/Pcre16/docs/doc/html/pcrejit.html b/libs/Pcre16/docs/doc/html/pcrejit.html
index 210f1da026..210f1da026 100644
--- a/plugins/Pcre16/docs/doc/html/pcrejit.html
+++ b/libs/Pcre16/docs/doc/html/pcrejit.html
diff --git a/plugins/Pcre16/docs/doc/html/pcrelimits.html b/libs/Pcre16/docs/doc/html/pcrelimits.html
index ee5ebf033d..ee5ebf033d 100644
--- a/plugins/Pcre16/docs/doc/html/pcrelimits.html
+++ b/libs/Pcre16/docs/doc/html/pcrelimits.html
diff --git a/plugins/Pcre16/docs/doc/html/pcrematching.html b/libs/Pcre16/docs/doc/html/pcrematching.html
index a1af39b68d..a1af39b68d 100644
--- a/plugins/Pcre16/docs/doc/html/pcrematching.html
+++ b/libs/Pcre16/docs/doc/html/pcrematching.html
diff --git a/plugins/Pcre16/docs/doc/html/pcrepartial.html b/libs/Pcre16/docs/doc/html/pcrepartial.html
index 4faeafcb68..4faeafcb68 100644
--- a/plugins/Pcre16/docs/doc/html/pcrepartial.html
+++ b/libs/Pcre16/docs/doc/html/pcrepartial.html
diff --git a/plugins/Pcre16/docs/doc/html/pcrepattern.html b/libs/Pcre16/docs/doc/html/pcrepattern.html
index c06d1e03f1..c06d1e03f1 100644
--- a/plugins/Pcre16/docs/doc/html/pcrepattern.html
+++ b/libs/Pcre16/docs/doc/html/pcrepattern.html
diff --git a/plugins/Pcre16/docs/doc/html/pcreperform.html b/libs/Pcre16/docs/doc/html/pcreperform.html
index dda207f901..dda207f901 100644
--- a/plugins/Pcre16/docs/doc/html/pcreperform.html
+++ b/libs/Pcre16/docs/doc/html/pcreperform.html
diff --git a/plugins/Pcre16/docs/doc/html/pcreposix.html b/libs/Pcre16/docs/doc/html/pcreposix.html
index 18924cf7f9..18924cf7f9 100644
--- a/plugins/Pcre16/docs/doc/html/pcreposix.html
+++ b/libs/Pcre16/docs/doc/html/pcreposix.html
diff --git a/plugins/Pcre16/docs/doc/html/pcreprecompile.html b/libs/Pcre16/docs/doc/html/pcreprecompile.html
index decb1d6ce0..decb1d6ce0 100644
--- a/plugins/Pcre16/docs/doc/html/pcreprecompile.html
+++ b/libs/Pcre16/docs/doc/html/pcreprecompile.html
diff --git a/plugins/Pcre16/docs/doc/html/pcresample.html b/libs/Pcre16/docs/doc/html/pcresample.html
index aca9184e00..aca9184e00 100644
--- a/plugins/Pcre16/docs/doc/html/pcresample.html
+++ b/libs/Pcre16/docs/doc/html/pcresample.html
diff --git a/plugins/Pcre16/docs/doc/html/pcrestack.html b/libs/Pcre16/docs/doc/html/pcrestack.html
index af6406d070..af6406d070 100644
--- a/plugins/Pcre16/docs/doc/html/pcrestack.html
+++ b/libs/Pcre16/docs/doc/html/pcrestack.html
diff --git a/plugins/Pcre16/docs/doc/html/pcresyntax.html b/libs/Pcre16/docs/doc/html/pcresyntax.html
index 89f35737b4..89f35737b4 100644
--- a/plugins/Pcre16/docs/doc/html/pcresyntax.html
+++ b/libs/Pcre16/docs/doc/html/pcresyntax.html
diff --git a/plugins/Pcre16/docs/doc/html/pcretest.html b/libs/Pcre16/docs/doc/html/pcretest.html
index 839fabf189..839fabf189 100644
--- a/plugins/Pcre16/docs/doc/html/pcretest.html
+++ b/libs/Pcre16/docs/doc/html/pcretest.html
diff --git a/plugins/Pcre16/docs/doc/html/pcreunicode.html b/libs/Pcre16/docs/doc/html/pcreunicode.html
index ab36bc61e3..ab36bc61e3 100644
--- a/plugins/Pcre16/docs/doc/html/pcreunicode.html
+++ b/libs/Pcre16/docs/doc/html/pcreunicode.html
diff --git a/plugins/Pcre16/docs/doc/index.html.src b/libs/Pcre16/docs/doc/index.html.src
index 887f4d7507..887f4d7507 100644
--- a/plugins/Pcre16/docs/doc/index.html.src
+++ b/libs/Pcre16/docs/doc/index.html.src
diff --git a/plugins/Pcre16/docs/doc/pcre-config.1 b/libs/Pcre16/docs/doc/pcre-config.1
index 52eb4fb226..52eb4fb226 100644
--- a/plugins/Pcre16/docs/doc/pcre-config.1
+++ b/libs/Pcre16/docs/doc/pcre-config.1
diff --git a/plugins/Pcre16/docs/doc/pcre-config.txt b/libs/Pcre16/docs/doc/pcre-config.txt
index 8503ab0ef0..8503ab0ef0 100644
--- a/plugins/Pcre16/docs/doc/pcre-config.txt
+++ b/libs/Pcre16/docs/doc/pcre-config.txt
diff --git a/plugins/Pcre16/docs/doc/pcre.3 b/libs/Pcre16/docs/doc/pcre.3
index 4eda404ccf..4eda404ccf 100644
--- a/plugins/Pcre16/docs/doc/pcre.3
+++ b/libs/Pcre16/docs/doc/pcre.3
diff --git a/plugins/Pcre16/docs/doc/pcre.txt b/libs/Pcre16/docs/doc/pcre.txt
index 14cbb8bf2b..14cbb8bf2b 100644
--- a/plugins/Pcre16/docs/doc/pcre.txt
+++ b/libs/Pcre16/docs/doc/pcre.txt
diff --git a/plugins/Pcre16/docs/doc/pcre16.3 b/libs/Pcre16/docs/doc/pcre16.3
index 85126a6792..85126a6792 100644
--- a/plugins/Pcre16/docs/doc/pcre16.3
+++ b/libs/Pcre16/docs/doc/pcre16.3
diff --git a/plugins/Pcre16/docs/doc/pcre32.3 b/libs/Pcre16/docs/doc/pcre32.3
index 7cde8c0877..7cde8c0877 100644
--- a/plugins/Pcre16/docs/doc/pcre32.3
+++ b/libs/Pcre16/docs/doc/pcre32.3
diff --git a/plugins/Pcre16/docs/doc/pcre_assign_jit_stack.3 b/libs/Pcre16/docs/doc/pcre_assign_jit_stack.3
index 0ecf6f2c60..0ecf6f2c60 100644
--- a/plugins/Pcre16/docs/doc/pcre_assign_jit_stack.3
+++ b/libs/Pcre16/docs/doc/pcre_assign_jit_stack.3
diff --git a/plugins/Pcre16/docs/doc/pcre_compile.3 b/libs/Pcre16/docs/doc/pcre_compile.3
index 5c16ebe26d..5c16ebe26d 100644
--- a/plugins/Pcre16/docs/doc/pcre_compile.3
+++ b/libs/Pcre16/docs/doc/pcre_compile.3
diff --git a/plugins/Pcre16/docs/doc/pcre_compile2.3 b/libs/Pcre16/docs/doc/pcre_compile2.3
index 377420180e..377420180e 100644
--- a/plugins/Pcre16/docs/doc/pcre_compile2.3
+++ b/libs/Pcre16/docs/doc/pcre_compile2.3
diff --git a/plugins/Pcre16/docs/doc/pcre_config.3 b/libs/Pcre16/docs/doc/pcre_config.3
index d3de14bb73..d3de14bb73 100644
--- a/plugins/Pcre16/docs/doc/pcre_config.3
+++ b/libs/Pcre16/docs/doc/pcre_config.3
diff --git a/plugins/Pcre16/docs/doc/pcre_copy_named_substring.3 b/libs/Pcre16/docs/doc/pcre_copy_named_substring.3
index 52582aecb2..52582aecb2 100644
--- a/plugins/Pcre16/docs/doc/pcre_copy_named_substring.3
+++ b/libs/Pcre16/docs/doc/pcre_copy_named_substring.3
diff --git a/plugins/Pcre16/docs/doc/pcre_copy_substring.3 b/libs/Pcre16/docs/doc/pcre_copy_substring.3
index 83af6e800a..83af6e800a 100644
--- a/plugins/Pcre16/docs/doc/pcre_copy_substring.3
+++ b/libs/Pcre16/docs/doc/pcre_copy_substring.3
diff --git a/plugins/Pcre16/docs/doc/pcre_dfa_exec.3 b/libs/Pcre16/docs/doc/pcre_dfa_exec.3
index 39c2e836da..39c2e836da 100644
--- a/plugins/Pcre16/docs/doc/pcre_dfa_exec.3
+++ b/libs/Pcre16/docs/doc/pcre_dfa_exec.3
diff --git a/plugins/Pcre16/docs/doc/pcre_exec.3 b/libs/Pcre16/docs/doc/pcre_exec.3
index 4686bd6de0..4686bd6de0 100644
--- a/plugins/Pcre16/docs/doc/pcre_exec.3
+++ b/libs/Pcre16/docs/doc/pcre_exec.3
diff --git a/plugins/Pcre16/docs/doc/pcre_free_study.3 b/libs/Pcre16/docs/doc/pcre_free_study.3
index 8826b73597..8826b73597 100644
--- a/plugins/Pcre16/docs/doc/pcre_free_study.3
+++ b/libs/Pcre16/docs/doc/pcre_free_study.3
diff --git a/plugins/Pcre16/docs/doc/pcre_free_substring.3 b/libs/Pcre16/docs/doc/pcre_free_substring.3
index 88c04019f4..88c04019f4 100644
--- a/plugins/Pcre16/docs/doc/pcre_free_substring.3
+++ b/libs/Pcre16/docs/doc/pcre_free_substring.3
diff --git a/plugins/Pcre16/docs/doc/pcre_free_substring_list.3 b/libs/Pcre16/docs/doc/pcre_free_substring_list.3
index 248b4bd01b..248b4bd01b 100644
--- a/plugins/Pcre16/docs/doc/pcre_free_substring_list.3
+++ b/libs/Pcre16/docs/doc/pcre_free_substring_list.3
diff --git a/plugins/Pcre16/docs/doc/pcre_fullinfo.3 b/libs/Pcre16/docs/doc/pcre_fullinfo.3
index 01e2e92874..01e2e92874 100644
--- a/plugins/Pcre16/docs/doc/pcre_fullinfo.3
+++ b/libs/Pcre16/docs/doc/pcre_fullinfo.3
diff --git a/plugins/Pcre16/docs/doc/pcre_get_named_substring.3 b/libs/Pcre16/docs/doc/pcre_get_named_substring.3
index 84d4ee7dbb..84d4ee7dbb 100644
--- a/plugins/Pcre16/docs/doc/pcre_get_named_substring.3
+++ b/libs/Pcre16/docs/doc/pcre_get_named_substring.3
diff --git a/plugins/Pcre16/docs/doc/pcre_get_stringnumber.3 b/libs/Pcre16/docs/doc/pcre_get_stringnumber.3
index 9fc5291dc8..9fc5291dc8 100644
--- a/plugins/Pcre16/docs/doc/pcre_get_stringnumber.3
+++ b/libs/Pcre16/docs/doc/pcre_get_stringnumber.3
diff --git a/plugins/Pcre16/docs/doc/pcre_get_stringtable_entries.3 b/libs/Pcre16/docs/doc/pcre_get_stringtable_entries.3
index 5c58c90c0e..5c58c90c0e 100644
--- a/plugins/Pcre16/docs/doc/pcre_get_stringtable_entries.3
+++ b/libs/Pcre16/docs/doc/pcre_get_stringtable_entries.3
diff --git a/plugins/Pcre16/docs/doc/pcre_get_substring.3 b/libs/Pcre16/docs/doc/pcre_get_substring.3
index 1e62b2c0c6..1e62b2c0c6 100644
--- a/plugins/Pcre16/docs/doc/pcre_get_substring.3
+++ b/libs/Pcre16/docs/doc/pcre_get_substring.3
diff --git a/plugins/Pcre16/docs/doc/pcre_get_substring_list.3 b/libs/Pcre16/docs/doc/pcre_get_substring_list.3
index 511a4a39d6..511a4a39d6 100644
--- a/plugins/Pcre16/docs/doc/pcre_get_substring_list.3
+++ b/libs/Pcre16/docs/doc/pcre_get_substring_list.3
diff --git a/plugins/Pcre16/docs/doc/pcre_jit_exec.3 b/libs/Pcre16/docs/doc/pcre_jit_exec.3
index ba85168178..ba85168178 100644
--- a/plugins/Pcre16/docs/doc/pcre_jit_exec.3
+++ b/libs/Pcre16/docs/doc/pcre_jit_exec.3
diff --git a/plugins/Pcre16/docs/doc/pcre_jit_stack_alloc.3 b/libs/Pcre16/docs/doc/pcre_jit_stack_alloc.3
index 11c97a0fc8..11c97a0fc8 100644
--- a/plugins/Pcre16/docs/doc/pcre_jit_stack_alloc.3
+++ b/libs/Pcre16/docs/doc/pcre_jit_stack_alloc.3
diff --git a/plugins/Pcre16/docs/doc/pcre_jit_stack_free.3 b/libs/Pcre16/docs/doc/pcre_jit_stack_free.3
index 494724e844..494724e844 100644
--- a/plugins/Pcre16/docs/doc/pcre_jit_stack_free.3
+++ b/libs/Pcre16/docs/doc/pcre_jit_stack_free.3
diff --git a/plugins/Pcre16/docs/doc/pcre_maketables.3 b/libs/Pcre16/docs/doc/pcre_maketables.3
index b2c3d23aa6..b2c3d23aa6 100644
--- a/plugins/Pcre16/docs/doc/pcre_maketables.3
+++ b/libs/Pcre16/docs/doc/pcre_maketables.3
diff --git a/plugins/Pcre16/docs/doc/pcre_pattern_to_host_byte_order.3 b/libs/Pcre16/docs/doc/pcre_pattern_to_host_byte_order.3
index b0c41c38e8..b0c41c38e8 100644
--- a/plugins/Pcre16/docs/doc/pcre_pattern_to_host_byte_order.3
+++ b/libs/Pcre16/docs/doc/pcre_pattern_to_host_byte_order.3
diff --git a/plugins/Pcre16/docs/doc/pcre_refcount.3 b/libs/Pcre16/docs/doc/pcre_refcount.3
index 45a41fef6a..45a41fef6a 100644
--- a/plugins/Pcre16/docs/doc/pcre_refcount.3
+++ b/libs/Pcre16/docs/doc/pcre_refcount.3
diff --git a/plugins/Pcre16/docs/doc/pcre_study.3 b/libs/Pcre16/docs/doc/pcre_study.3
index 1200e0a668..1200e0a668 100644
--- a/plugins/Pcre16/docs/doc/pcre_study.3
+++ b/libs/Pcre16/docs/doc/pcre_study.3
diff --git a/plugins/Pcre16/docs/doc/pcre_utf16_to_host_byte_order.3 b/libs/Pcre16/docs/doc/pcre_utf16_to_host_byte_order.3
index 1851b619da..1851b619da 100644
--- a/plugins/Pcre16/docs/doc/pcre_utf16_to_host_byte_order.3
+++ b/libs/Pcre16/docs/doc/pcre_utf16_to_host_byte_order.3
diff --git a/plugins/Pcre16/docs/doc/pcre_utf32_to_host_byte_order.3 b/libs/Pcre16/docs/doc/pcre_utf32_to_host_byte_order.3
index a415dcf5fa..a415dcf5fa 100644
--- a/plugins/Pcre16/docs/doc/pcre_utf32_to_host_byte_order.3
+++ b/libs/Pcre16/docs/doc/pcre_utf32_to_host_byte_order.3
diff --git a/plugins/Pcre16/docs/doc/pcre_version.3 b/libs/Pcre16/docs/doc/pcre_version.3
index 0f4973f9c7..0f4973f9c7 100644
--- a/plugins/Pcre16/docs/doc/pcre_version.3
+++ b/libs/Pcre16/docs/doc/pcre_version.3
diff --git a/plugins/Pcre16/docs/doc/pcreapi.3 b/libs/Pcre16/docs/doc/pcreapi.3
index ab3eaa0b52..ab3eaa0b52 100644
--- a/plugins/Pcre16/docs/doc/pcreapi.3
+++ b/libs/Pcre16/docs/doc/pcreapi.3
diff --git a/plugins/Pcre16/docs/doc/pcrebuild.3 b/libs/Pcre16/docs/doc/pcrebuild.3
index 403f2ae32f..403f2ae32f 100644
--- a/plugins/Pcre16/docs/doc/pcrebuild.3
+++ b/libs/Pcre16/docs/doc/pcrebuild.3
diff --git a/plugins/Pcre16/docs/doc/pcrecallout.3 b/libs/Pcre16/docs/doc/pcrecallout.3
index 8ebc995952..8ebc995952 100644
--- a/plugins/Pcre16/docs/doc/pcrecallout.3
+++ b/libs/Pcre16/docs/doc/pcrecallout.3
diff --git a/plugins/Pcre16/docs/doc/pcrecompat.3 b/libs/Pcre16/docs/doc/pcrecompat.3
index 0cc4019823..0cc4019823 100644
--- a/plugins/Pcre16/docs/doc/pcrecompat.3
+++ b/libs/Pcre16/docs/doc/pcrecompat.3
diff --git a/plugins/Pcre16/docs/doc/pcrecpp.3 b/libs/Pcre16/docs/doc/pcrecpp.3
index fbddd86ab3..fbddd86ab3 100644
--- a/plugins/Pcre16/docs/doc/pcrecpp.3
+++ b/libs/Pcre16/docs/doc/pcrecpp.3
diff --git a/plugins/Pcre16/docs/doc/pcredemo.3 b/libs/Pcre16/docs/doc/pcredemo.3
index 194629b1fa..194629b1fa 100644
--- a/plugins/Pcre16/docs/doc/pcredemo.3
+++ b/libs/Pcre16/docs/doc/pcredemo.3
diff --git a/plugins/Pcre16/docs/doc/pcregrep.1 b/libs/Pcre16/docs/doc/pcregrep.1
index 988667542f..988667542f 100644
--- a/plugins/Pcre16/docs/doc/pcregrep.1
+++ b/libs/Pcre16/docs/doc/pcregrep.1
diff --git a/plugins/Pcre16/docs/doc/pcregrep.txt b/libs/Pcre16/docs/doc/pcregrep.txt
index 97d9a7bd37..97d9a7bd37 100644
--- a/plugins/Pcre16/docs/doc/pcregrep.txt
+++ b/libs/Pcre16/docs/doc/pcregrep.txt
diff --git a/plugins/Pcre16/docs/doc/pcrejit.3 b/libs/Pcre16/docs/doc/pcrejit.3
index 341403f7c8..341403f7c8 100644
--- a/plugins/Pcre16/docs/doc/pcrejit.3
+++ b/libs/Pcre16/docs/doc/pcrejit.3
diff --git a/plugins/Pcre16/docs/doc/pcrelimits.3 b/libs/Pcre16/docs/doc/pcrelimits.3
index 423d6a2768..423d6a2768 100644
--- a/plugins/Pcre16/docs/doc/pcrelimits.3
+++ b/libs/Pcre16/docs/doc/pcrelimits.3
diff --git a/plugins/Pcre16/docs/doc/pcrematching.3 b/libs/Pcre16/docs/doc/pcrematching.3
index 268baf9b8c..268baf9b8c 100644
--- a/plugins/Pcre16/docs/doc/pcrematching.3
+++ b/libs/Pcre16/docs/doc/pcrematching.3
diff --git a/plugins/Pcre16/docs/doc/pcrepartial.3 b/libs/Pcre16/docs/doc/pcrepartial.3
index 14d0124f1c..14d0124f1c 100644
--- a/plugins/Pcre16/docs/doc/pcrepartial.3
+++ b/libs/Pcre16/docs/doc/pcrepartial.3
diff --git a/plugins/Pcre16/docs/doc/pcrepattern.3 b/libs/Pcre16/docs/doc/pcrepattern.3
index f1c45cda5d..f1c45cda5d 100644
--- a/plugins/Pcre16/docs/doc/pcrepattern.3
+++ b/libs/Pcre16/docs/doc/pcrepattern.3
diff --git a/plugins/Pcre16/docs/doc/pcreperform.3 b/libs/Pcre16/docs/doc/pcreperform.3
index fb2aa95926..fb2aa95926 100644
--- a/plugins/Pcre16/docs/doc/pcreperform.3
+++ b/libs/Pcre16/docs/doc/pcreperform.3
diff --git a/plugins/Pcre16/docs/doc/pcreposix.3 b/libs/Pcre16/docs/doc/pcreposix.3
index 77890f36b4..77890f36b4 100644
--- a/plugins/Pcre16/docs/doc/pcreposix.3
+++ b/libs/Pcre16/docs/doc/pcreposix.3
diff --git a/plugins/Pcre16/docs/doc/pcreprecompile.3 b/libs/Pcre16/docs/doc/pcreprecompile.3
index 40f257a98c..40f257a98c 100644
--- a/plugins/Pcre16/docs/doc/pcreprecompile.3
+++ b/libs/Pcre16/docs/doc/pcreprecompile.3
diff --git a/plugins/Pcre16/docs/doc/pcresample.3 b/libs/Pcre16/docs/doc/pcresample.3
index d7fe7ec546..d7fe7ec546 100644
--- a/plugins/Pcre16/docs/doc/pcresample.3
+++ b/libs/Pcre16/docs/doc/pcresample.3
diff --git a/plugins/Pcre16/docs/doc/pcrestack.3 b/libs/Pcre16/docs/doc/pcrestack.3
index 798f0bca63..798f0bca63 100644
--- a/plugins/Pcre16/docs/doc/pcrestack.3
+++ b/libs/Pcre16/docs/doc/pcrestack.3
diff --git a/plugins/Pcre16/docs/doc/pcresyntax.3 b/libs/Pcre16/docs/doc/pcresyntax.3
index fd878da4f9..fd878da4f9 100644
--- a/plugins/Pcre16/docs/doc/pcresyntax.3
+++ b/libs/Pcre16/docs/doc/pcresyntax.3
diff --git a/plugins/Pcre16/docs/doc/pcretest.1 b/libs/Pcre16/docs/doc/pcretest.1
index 92640da8e1..92640da8e1 100644
--- a/plugins/Pcre16/docs/doc/pcretest.1
+++ b/libs/Pcre16/docs/doc/pcretest.1
diff --git a/plugins/Pcre16/docs/doc/pcretest.txt b/libs/Pcre16/docs/doc/pcretest.txt
index 55de502443..55de502443 100644
--- a/plugins/Pcre16/docs/doc/pcretest.txt
+++ b/libs/Pcre16/docs/doc/pcretest.txt
diff --git a/plugins/Pcre16/docs/doc/pcreunicode.3 b/libs/Pcre16/docs/doc/pcreunicode.3
index cb5e5269a4..cb5e5269a4 100644
--- a/plugins/Pcre16/docs/doc/pcreunicode.3
+++ b/libs/Pcre16/docs/doc/pcreunicode.3
diff --git a/plugins/Pcre16/docs/doc/perltest.txt b/libs/Pcre16/docs/doc/perltest.txt
index bb1a52a48e..bb1a52a48e 100644
--- a/plugins/Pcre16/docs/doc/perltest.txt
+++ b/libs/Pcre16/docs/doc/perltest.txt
diff --git a/libs/Pcre16/pcre16.vcxproj b/libs/Pcre16/pcre16.vcxproj
new file mode 100644
index 0000000000..ef71d0f838
--- /dev/null
+++ b/libs/Pcre16/pcre16.vcxproj
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="us-ascii"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGUID>{6124E997-426E-4A0B-9617-D6D577D5E7D7}</ProjectGUID>
+    <ProjectName>Pcre16</ProjectName>
+  </PropertyGroup>
+  <ImportGroup Label="PropertySheets">
+    <Import Project="$(ProjectDir)..\..\build\vc.common\lib.props" />
+  </ImportGroup>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <PreprocessorDefinitions>HAVE_CONFIG_H;COMPILE_PCRE16;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+</Project>
+\ No newline at end of file
diff --git a/libs/Pcre16/pcre16.vcxproj.filters b/libs/Pcre16/pcre16.vcxproj.filters
new file mode 100644
index 0000000000..70c343abd5
--- /dev/null
+++ b/libs/Pcre16/pcre16.vcxproj.filters
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(ProjectDir)..\..\build\vc.common\common.filters" />
+</Project>
+\ No newline at end of file
diff --git a/plugins/Pcre16/src/config.h b/libs/Pcre16/src/config.h
index d1e35175fe..d1e35175fe 100644
--- a/plugins/Pcre16/src/config.h
+++ b/libs/Pcre16/src/config.h
diff --git a/plugins/Pcre16/src/pcre.h b/libs/Pcre16/src/pcre.h
index 962f6f22db..962f6f22db 100644
--- a/plugins/Pcre16/src/pcre.h
+++ b/libs/Pcre16/src/pcre.h
diff --git a/plugins/Pcre16/src/pcre_byte_order.c b/libs/Pcre16/src/pcre_byte_order.c
index cf5f12b04e..cf5f12b04e 100644
--- a/plugins/Pcre16/src/pcre_byte_order.c
+++ b/libs/Pcre16/src/pcre_byte_order.c
diff --git a/plugins/Pcre16/src/pcre_chartables.c b/libs/Pcre16/src/pcre_chartables.c
index 1e20ec29d0..1e20ec29d0 100644
--- a/plugins/Pcre16/src/pcre_chartables.c
+++ b/libs/Pcre16/src/pcre_chartables.c
diff --git a/plugins/Pcre16/src/pcre_compile.c b/libs/Pcre16/src/pcre_compile.c
index 0efad2645d..0efad2645d 100644
--- a/plugins/Pcre16/src/pcre_compile.c
+++ b/libs/Pcre16/src/pcre_compile.c
diff --git a/plugins/Pcre16/src/pcre_config.c b/libs/Pcre16/src/pcre_config.c
index 1cbdd9c960..1cbdd9c960 100644
--- a/plugins/Pcre16/src/pcre_config.c
+++ b/libs/Pcre16/src/pcre_config.c
diff --git a/plugins/Pcre16/src/pcre_dfa_exec.c b/libs/Pcre16/src/pcre_dfa_exec.c
index 170ce6a001..170ce6a001 100644
--- a/plugins/Pcre16/src/pcre_dfa_exec.c
+++ b/libs/Pcre16/src/pcre_dfa_exec.c
diff --git a/plugins/Pcre16/src/pcre_exec.c b/libs/Pcre16/src/pcre_exec.c
index 5cff0d62a6..5cff0d62a6 100644
--- a/plugins/Pcre16/src/pcre_exec.c
+++ b/libs/Pcre16/src/pcre_exec.c
diff --git a/plugins/Pcre16/src/pcre_fullinfo.c b/libs/Pcre16/src/pcre_fullinfo.c
index a6c2ece6ca..a6c2ece6ca 100644
--- a/plugins/Pcre16/src/pcre_fullinfo.c
+++ b/libs/Pcre16/src/pcre_fullinfo.c
diff --git a/plugins/Pcre16/src/pcre_get.c b/libs/Pcre16/src/pcre_get.c
index 8094b34bbf..8094b34bbf 100644
--- a/plugins/Pcre16/src/pcre_get.c
+++ b/libs/Pcre16/src/pcre_get.c
diff --git a/plugins/Pcre16/src/pcre_globals.c b/libs/Pcre16/src/pcre_globals.c
index 0f106aa901..0f106aa901 100644
--- a/plugins/Pcre16/src/pcre_globals.c
+++ b/libs/Pcre16/src/pcre_globals.c
diff --git a/plugins/Pcre16/src/pcre_internal.h b/libs/Pcre16/src/pcre_internal.h
index 4508e2c772..4508e2c772 100644
--- a/plugins/Pcre16/src/pcre_internal.h
+++ b/libs/Pcre16/src/pcre_internal.h
diff --git a/plugins/Pcre16/src/pcre_jit_compile.c b/libs/Pcre16/src/pcre_jit_compile.c
index debdf6ef45..debdf6ef45 100644
--- a/plugins/Pcre16/src/pcre_jit_compile.c
+++ b/libs/Pcre16/src/pcre_jit_compile.c
diff --git a/plugins/Pcre16/src/pcre_maketables.c b/libs/Pcre16/src/pcre_maketables.c
index a44a6eaa90..a44a6eaa90 100644
--- a/plugins/Pcre16/src/pcre_maketables.c
+++ b/libs/Pcre16/src/pcre_maketables.c
diff --git a/plugins/Pcre16/src/pcre_newline.c b/libs/Pcre16/src/pcre_newline.c
index b8f5a4de19..b8f5a4de19 100644
--- a/plugins/Pcre16/src/pcre_newline.c
+++ b/libs/Pcre16/src/pcre_newline.c
diff --git a/plugins/Pcre16/src/pcre_refcount.c b/libs/Pcre16/src/pcre_refcount.c
index 79efa90f21..79efa90f21 100644
--- a/plugins/Pcre16/src/pcre_refcount.c
+++ b/libs/Pcre16/src/pcre_refcount.c
diff --git a/plugins/Pcre16/src/pcre_string_utils.c b/libs/Pcre16/src/pcre_string_utils.c
index 25eacc8507..25eacc8507 100644
--- a/plugins/Pcre16/src/pcre_string_utils.c
+++ b/libs/Pcre16/src/pcre_string_utils.c
diff --git a/plugins/Pcre16/src/pcre_study.c b/libs/Pcre16/src/pcre_study.c
index 998fe2325e..998fe2325e 100644
--- a/plugins/Pcre16/src/pcre_study.c
+++ b/libs/Pcre16/src/pcre_study.c
diff --git a/plugins/Pcre16/src/pcre_tables.c b/libs/Pcre16/src/pcre_tables.c
index 4960af57c4..4960af57c4 100644
--- a/plugins/Pcre16/src/pcre_tables.c
+++ b/libs/Pcre16/src/pcre_tables.c
diff --git a/plugins/Pcre16/src/pcre_ucd.c b/libs/Pcre16/src/pcre_ucd.c
index 69c4fd42c3..69c4fd42c3 100644
--- a/plugins/Pcre16/src/pcre_ucd.c
+++ b/libs/Pcre16/src/pcre_ucd.c
diff --git a/plugins/Pcre16/src/pcre_version.c b/libs/Pcre16/src/pcre_version.c
index ae86ff28bc..ae86ff28bc 100644
--- a/plugins/Pcre16/src/pcre_version.c
+++ b/libs/Pcre16/src/pcre_version.c
diff --git a/plugins/Pcre16/src/pcre_xclass.c b/libs/Pcre16/src/pcre_xclass.c
index c2b61f0f92..c2b61f0f92 100644
--- a/plugins/Pcre16/src/pcre_xclass.c
+++ b/libs/Pcre16/src/pcre_xclass.c
diff --git a/libs/Pcre16/src/stdafx.cxx b/libs/Pcre16/src/stdafx.cxx
new file mode 100644
index 0000000000..0fb604da7c
--- /dev/null
+++ b/libs/Pcre16/src/stdafx.cxx
@@ -0,0 +1,2 @@
+
+#include "stdafx.h"
+\ No newline at end of file
diff --git a/libs/Pcre16/src/stdafx.h b/libs/Pcre16/src/stdafx.h
new file mode 100644
index 0000000000..d78b7834c8
--- /dev/null
+++ b/libs/Pcre16/src/stdafx.h
@@ -0,0 +1,2 @@
+
+// just a stub
+\ No newline at end of file
diff --git a/plugins/Pcre16/src/ucp.h b/libs/Pcre16/src/ucp.h
index d8b34bfcc5..d8b34bfcc5 100644
--- a/plugins/Pcre16/src/ucp.h
+++ b/libs/Pcre16/src/ucp.h
diff --git a/plugins/Pcre16/pcre16_10.vcxproj b/plugins/Pcre16/pcre16_10.vcxproj
deleted file mode 100644
index 3b01177e7d..0000000000
--- a/plugins/Pcre16/pcre16_10.vcxproj
+++ /dev/null
@@ -1,168 +0,0 @@
-<?xml version="1.0" encoding="us-ascii"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGUID>{6124E997-426E-4A0B-9617-D6D577D5E7D7}</ProjectGUID>
-    <ProjectName>Pcre16</ProjectName>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.20506.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\Obj\$(ProjectName)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Configuration)64\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\Obj\$(ProjectName)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Configuration)64\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <Optimization>Disabled</Optimization>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <PreprocessorDefinitions>_WINDOWS;_DEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalLibraryDirectories>$(ProfileDir)..\..\bin10\lib</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
-      <SubSystem>Windows</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <Optimization>Disabled</Optimization>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <PreprocessorDefinitions>_WINDOWS;_DEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <AdditionalLibraryDirectories>$(ProfileDir)..\..\bin10\lib</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
-      <SubSystem>Windows</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <Optimization>Full</Optimization>
-      <WarningLevel>Level3</WarningLevel>
-      <PreprocessorDefinitions>_WINDOWS;NDEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
-    </ClCompile>
-    <Link>
-      <AdditionalLibraryDirectories>$(ProfileDir)..\..\bin10\lib</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <Optimization>Full</Optimization>
-      <WarningLevel>Level3</WarningLevel>
-      <PreprocessorDefinitions>_WINDOWS;NDEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
-    </ClCompile>
-    <Link>
-      <AdditionalLibraryDirectories>$(ProfileDir)..\..\bin10\lib</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="src\pcre.h" />
-    <ClInclude Include="src\config.h" />
-    <ClCompile Include="src\pcre16_byte_order.c" />
-    <ClCompile Include="src\pcre16_chartables.c" />
-    <ClCompile Include="src\pcre16_compile.c" />
-    <ClCompile Include="src\pcre16_config.c" />
-    <ClCompile Include="src\pcre16_dfa_exec.c" />
-    <ClCompile Include="src\pcre16_exec.c" />
-    <ClCompile Include="src\pcre16_fullinfo.c" />
-    <ClCompile Include="src\pcre16_get.c" />
-    <ClCompile Include="src\pcre16_globals.c" />
-    <ClCompile Include="src\pcre16_jit_compile.c" />
-    <ClCompile Include="src\pcre16_maketables.c" />
-    <ClCompile Include="src\pcre16_newline.c" />
-    <ClCompile Include="src\pcre16_ord2utf16.c" />
-    <ClCompile Include="src\pcre16_refcount.c" />
-    <ClCompile Include="src\pcre16_string_utils.c" />
-    <ClCompile Include="src\pcre16_study.c" />
-    <ClCompile Include="src\pcre16_tables.c" />
-    <ClCompile Include="src\pcre16_ucd.c" />
-    <ClCompile Include="src\pcre16_utf16_utils.c" />
-    <ClCompile Include="src\pcre16_valid_utf16.c" />
-    <ClCompile Include="src\pcre16_version.c" />
-    <ClCompile Include="src\pcre16_xclass.c" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
-\ No newline at end of file
diff --git a/plugins/Pcre16/pcre16_10.vcxproj.filters b/plugins/Pcre16/pcre16_10.vcxproj.filters
deleted file mode 100644
index fa13b307f2..0000000000
--- a/plugins/Pcre16/pcre16_10.vcxproj.filters
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClCompile Include="src\pcre16_byte_order.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\pcre16_chartables.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\pcre16_compile.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\pcre16_config.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\pcre16_dfa_exec.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\pcre16_exec.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\pcre16_fullinfo.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\pcre16_get.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\pcre16_globals.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\pcre16_jit_compile.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\pcre16_maketables.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\pcre16_newline.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\pcre16_ord2utf16.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\pcre16_refcount.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\pcre16_string_utils.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\pcre16_study.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\pcre16_tables.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\pcre16_ucd.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\pcre16_utf16_utils.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\pcre16_valid_utf16.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\pcre16_version.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\pcre16_xclass.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="src\pcre.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\config.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{E4DC98D5-B82E-4336-B232-8E640F6524EA}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{C6E6402B-1E53-4CFA-96A6-AC1DB4FB8E6D}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-</Project>
-\ No newline at end of file
diff --git a/plugins/Pcre16/pcre16_12.vcxproj b/plugins/Pcre16/pcre16_12.vcxproj
deleted file mode 100644
index ae9da49cbe..0000000000
--- a/plugins/Pcre16/pcre16_12.vcxproj
+++ /dev/null
@@ -1,172 +0,0 @@
-<?xml version="1.0" encoding="us-ascii"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGUID>{6124E997-426E-4A0B-9617-D6D577D5E7D7}</ProjectGUID>
-    <ProjectName>Pcre16</ProjectName>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v120_xp</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v120_xp</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v120_xp</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v120_xp</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.20506.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\Obj\$(ProjectName)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Configuration)64\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\Obj\$(ProjectName)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Configuration)64\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <Optimization>Disabled</Optimization>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <PreprocessorDefinitions>_WINDOWS;_DEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalLibraryDirectories>$(ProfileDir)..\..\bin12\lib</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
-      <SubSystem>Windows</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <Optimization>Disabled</Optimization>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <PreprocessorDefinitions>_WINDOWS;_DEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <AdditionalLibraryDirectories>$(ProfileDir)..\..\bin12\lib</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
-      <SubSystem>Windows</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <Optimization>Full</Optimization>
-      <WarningLevel>Level3</WarningLevel>
-      <PreprocessorDefinitions>_WINDOWS;NDEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
-    </ClCompile>
-    <Link>
-      <AdditionalLibraryDirectories>$(ProfileDir)..\..\bin12\lib</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <Optimization>Full</Optimization>
-      <WarningLevel>Level3</WarningLevel>
-      <PreprocessorDefinitions>_WINDOWS;NDEBUG;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
-    </ClCompile>
-    <Link>
-      <AdditionalLibraryDirectories>$(ProfileDir)..\..\bin12\lib</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="src\pcre.h" />
-    <ClInclude Include="src\config.h" />
-    <ClCompile Include="src\pcre16_byte_order.c" />
-    <ClCompile Include="src\pcre16_chartables.c" />
-    <ClCompile Include="src\pcre16_compile.c" />
-    <ClCompile Include="src\pcre16_config.c" />
-    <ClCompile Include="src\pcre16_dfa_exec.c" />
-    <ClCompile Include="src\pcre16_exec.c" />
-    <ClCompile Include="src\pcre16_fullinfo.c" />
-    <ClCompile Include="src\pcre16_get.c" />
-    <ClCompile Include="src\pcre16_globals.c" />
-    <ClCompile Include="src\pcre16_jit_compile.c" />
-    <ClCompile Include="src\pcre16_maketables.c" />
-    <ClCompile Include="src\pcre16_newline.c" />
-    <ClCompile Include="src\pcre16_ord2utf16.c" />
-    <ClCompile Include="src\pcre16_refcount.c" />
-    <ClCompile Include="src\pcre16_string_utils.c" />
-    <ClCompile Include="src\pcre16_study.c" />
-    <ClCompile Include="src\pcre16_tables.c" />
-    <ClCompile Include="src\pcre16_ucd.c" />
-    <ClCompile Include="src\pcre16_utf16_utils.c" />
-    <ClCompile Include="src\pcre16_valid_utf16.c" />
-    <ClCompile Include="src\pcre16_version.c" />
-    <ClCompile Include="src\pcre16_xclass.c" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
-\ No newline at end of file
diff --git a/plugins/Pcre16/pcre16_12.vcxproj.filters b/plugins/Pcre16/pcre16_12.vcxproj.filters
deleted file mode 100644
index cdcc9ea59b..0000000000
--- a/plugins/Pcre16/pcre16_12.vcxproj.filters
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClCompile Include="src\pcre16_byte_order.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\pcre16_chartables.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\pcre16_compile.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\pcre16_config.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\pcre16_dfa_exec.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\pcre16_exec.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\pcre16_fullinfo.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\pcre16_get.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\pcre16_globals.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\pcre16_jit_compile.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\pcre16_maketables.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\pcre16_newline.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\pcre16_ord2utf16.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\pcre16_refcount.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\pcre16_string_utils.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\pcre16_study.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\pcre16_tables.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\pcre16_ucd.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\pcre16_utf16_utils.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\pcre16_valid_utf16.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\pcre16_version.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\pcre16_xclass.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="src\pcre.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\config.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{E4DC98D5-B82E-4336-B232-8E640F6524EA}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{C6E6402B-1E53-4CFA-96A6-AC1DB4FB8E6D}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-</Project>
-\ No newline at end of file
diff --git a/plugins/Pcre16/src/pcre16_byte_order.c b/plugins/Pcre16/src/pcre16_byte_order.c
deleted file mode 100644
index 11d2973a3d..0000000000
--- a/plugins/Pcre16/src/pcre16_byte_order.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/*************************************************
-*      Perl-Compatible Regular Expressions       *
-*************************************************/
-
-/* PCRE is a library of functions to support regular expressions whose syntax
-and semantics are as close as possible to those of the Perl 5 language.
-
-                       Written by Philip Hazel
-           Copyright (c) 1997-2012 University of Cambridge
-
------------------------------------------------------------------------------
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
-
-    * Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-
-    * Neither the name of the University of Cambridge nor the names of its
-      contributors may be used to endorse or promote products derived from
-      this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
------------------------------------------------------------------------------
-*/
-
-/* Generate code with 16 bit character support. */
-#define COMPILE_PCRE16
-
-#include "pcre_byte_order.c"
-
-/* End of pcre16_byte_order.c */
diff --git a/plugins/Pcre16/src/pcre16_chartables.c b/plugins/Pcre16/src/pcre16_chartables.c
deleted file mode 100644
index 7c0ff35f5e..0000000000
--- a/plugins/Pcre16/src/pcre16_chartables.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/*************************************************
-*      Perl-Compatible Regular Expressions       *
-*************************************************/
-
-/* PCRE is a library of functions to support regular expressions whose syntax
-and semantics are as close as possible to those of the Perl 5 language.
-
-                       Written by Philip Hazel
-           Copyright (c) 1997-2012 University of Cambridge
-
------------------------------------------------------------------------------
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
-
-    * Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-
-    * Neither the name of the University of Cambridge nor the names of its
-      contributors may be used to endorse or promote products derived from
-      this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
------------------------------------------------------------------------------
-*/
-
-/* Generate code with 16 bit character support. */
-#define COMPILE_PCRE16
-
-#include "pcre_chartables.c"
-
-/* End of pcre16_chartables.c */
diff --git a/plugins/Pcre16/src/pcre16_compile.c b/plugins/Pcre16/src/pcre16_compile.c
deleted file mode 100644
index e499b67087..0000000000
--- a/plugins/Pcre16/src/pcre16_compile.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/*************************************************
-*      Perl-Compatible Regular Expressions       *
-*************************************************/
-
-/* PCRE is a library of functions to support regular expressions whose syntax
-and semantics are as close as possible to those of the Perl 5 language.
-
-                       Written by Philip Hazel
-           Copyright (c) 1997-2012 University of Cambridge
-
------------------------------------------------------------------------------
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
-
-    * Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-
-    * Neither the name of the University of Cambridge nor the names of its
-      contributors may be used to endorse or promote products derived from
-      this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
------------------------------------------------------------------------------
-*/
-
-/* Generate code with 16 bit character support. */
-#define COMPILE_PCRE16
-
-#include "pcre_compile.c"
-
-/* End of pcre16_compile.c */
diff --git a/plugins/Pcre16/src/pcre16_config.c b/plugins/Pcre16/src/pcre16_config.c
deleted file mode 100644
index b52138764f..0000000000
--- a/plugins/Pcre16/src/pcre16_config.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/*************************************************
-*      Perl-Compatible Regular Expressions       *
-*************************************************/
-
-/* PCRE is a library of functions to support regular expressions whose syntax
-and semantics are as close as possible to those of the Perl 5 language.
-
-                       Written by Philip Hazel
-           Copyright (c) 1997-2012 University of Cambridge
-
------------------------------------------------------------------------------
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
-
-    * Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-
-    * Neither the name of the University of Cambridge nor the names of its
-      contributors may be used to endorse or promote products derived from
-      this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
------------------------------------------------------------------------------
-*/
-
-/* Generate code with 16 bit character support. */
-#define COMPILE_PCRE16
-
-#include "pcre_config.c"
-
-/* End of pcre16_config.c */
diff --git a/plugins/Pcre16/src/pcre16_dfa_exec.c b/plugins/Pcre16/src/pcre16_dfa_exec.c
deleted file mode 100644
index 2ba740e972..0000000000
--- a/plugins/Pcre16/src/pcre16_dfa_exec.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/*************************************************
-*      Perl-Compatible Regular Expressions       *
-*************************************************/
-
-/* PCRE is a library of functions to support regular expressions whose syntax
-and semantics are as close as possible to those of the Perl 5 language.
-
-                       Written by Philip Hazel
-           Copyright (c) 1997-2012 University of Cambridge
-
------------------------------------------------------------------------------
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
-
-    * Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-
-    * Neither the name of the University of Cambridge nor the names of its
-      contributors may be used to endorse or promote products derived from
-      this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
------------------------------------------------------------------------------
-*/
-
-/* Generate code with 16 bit character support. */
-#define COMPILE_PCRE16
-
-#include "pcre_dfa_exec.c"
-
-/* End of pcre16_dfa_exec.c */
diff --git a/plugins/Pcre16/src/pcre16_exec.c b/plugins/Pcre16/src/pcre16_exec.c
deleted file mode 100644
index 7417b1770c..0000000000
--- a/plugins/Pcre16/src/pcre16_exec.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/*************************************************
-*      Perl-Compatible Regular Expressions       *
-*************************************************/
-
-/* PCRE is a library of functions to support regular expressions whose syntax
-and semantics are as close as possible to those of the Perl 5 language.
-
-                       Written by Philip Hazel
-           Copyright (c) 1997-2012 University of Cambridge
-
------------------------------------------------------------------------------
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
-
-    * Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-
-    * Neither the name of the University of Cambridge nor the names of its
-      contributors may be used to endorse or promote products derived from
-      this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
------------------------------------------------------------------------------
-*/
-
-/* Generate code with 16 bit character support. */
-#define COMPILE_PCRE16
-
-#include "pcre_exec.c"
-
-/* End of pcre16_exec.c */
diff --git a/plugins/Pcre16/src/pcre16_fullinfo.c b/plugins/Pcre16/src/pcre16_fullinfo.c
deleted file mode 100644
index 544dca6ed5..0000000000
--- a/plugins/Pcre16/src/pcre16_fullinfo.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/*************************************************
-*      Perl-Compatible Regular Expressions       *
-*************************************************/
-
-/* PCRE is a library of functions to support regular expressions whose syntax
-and semantics are as close as possible to those of the Perl 5 language.
-
-                       Written by Philip Hazel
-           Copyright (c) 1997-2012 University of Cambridge
-
------------------------------------------------------------------------------
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
-
-    * Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-
-    * Neither the name of the University of Cambridge nor the names of its
-      contributors may be used to endorse or promote products derived from
-      this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
------------------------------------------------------------------------------
-*/
-
-/* Generate code with 16 bit character support. */
-#define COMPILE_PCRE16
-
-#include "pcre_fullinfo.c"
-
-/* End of pcre16_fullinfo.c */
diff --git a/plugins/Pcre16/src/pcre16_get.c b/plugins/Pcre16/src/pcre16_get.c
deleted file mode 100644
index 3ded08c622..0000000000
--- a/plugins/Pcre16/src/pcre16_get.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/*************************************************
-*      Perl-Compatible Regular Expressions       *
-*************************************************/
-
-/* PCRE is a library of functions to support regular expressions whose syntax
-and semantics are as close as possible to those of the Perl 5 language.
-
-                       Written by Philip Hazel
-           Copyright (c) 1997-2012 University of Cambridge
-
------------------------------------------------------------------------------
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
-
-    * Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-
-    * Neither the name of the University of Cambridge nor the names of its
-      contributors may be used to endorse or promote products derived from
-      this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
------------------------------------------------------------------------------
-*/
-
-/* Generate code with 16 bit character support. */
-#define COMPILE_PCRE16
-
-#include "pcre_get.c"
-
-/* End of pcre16_get.c */
diff --git a/plugins/Pcre16/src/pcre16_globals.c b/plugins/Pcre16/src/pcre16_globals.c
deleted file mode 100644
index a136b3d8c2..0000000000
--- a/plugins/Pcre16/src/pcre16_globals.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/*************************************************
-*      Perl-Compatible Regular Expressions       *
-*************************************************/
-
-/* PCRE is a library of functions to support regular expressions whose syntax
-and semantics are as close as possible to those of the Perl 5 language.
-
-                       Written by Philip Hazel
-           Copyright (c) 1997-2012 University of Cambridge
-
------------------------------------------------------------------------------
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
-
-    * Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-
-    * Neither the name of the University of Cambridge nor the names of its
-      contributors may be used to endorse or promote products derived from
-      this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
------------------------------------------------------------------------------
-*/
-
-/* Generate code with 16 bit character support. */
-#define COMPILE_PCRE16
-
-#include "pcre_globals.c"
-
-/* End of pcre16_globals.c */
diff --git a/plugins/Pcre16/src/pcre16_jit_compile.c b/plugins/Pcre16/src/pcre16_jit_compile.c
deleted file mode 100644
index ab0cacd764..0000000000
--- a/plugins/Pcre16/src/pcre16_jit_compile.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/*************************************************
-*      Perl-Compatible Regular Expressions       *
-*************************************************/
-
-/* PCRE is a library of functions to support regular expressions whose syntax
-and semantics are as close as possible to those of the Perl 5 language.
-
-                       Written by Philip Hazel
-           Copyright (c) 1997-2012 University of Cambridge
-
------------------------------------------------------------------------------
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
-
-    * Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-
-    * Neither the name of the University of Cambridge nor the names of its
-      contributors may be used to endorse or promote products derived from
-      this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
------------------------------------------------------------------------------
-*/
-
-/* Generate code with 16 bit character support. */
-#define COMPILE_PCRE16
-
-#include "pcre_jit_compile.c"
-
-/* End of pcre16_jit_compile.c */
diff --git a/plugins/Pcre16/src/pcre16_maketables.c b/plugins/Pcre16/src/pcre16_maketables.c
deleted file mode 100644
index b1cd1c579d..0000000000
--- a/plugins/Pcre16/src/pcre16_maketables.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/*************************************************
-*      Perl-Compatible Regular Expressions       *
-*************************************************/
-
-/* PCRE is a library of functions to support regular expressions whose syntax
-and semantics are as close as possible to those of the Perl 5 language.
-
-                       Written by Philip Hazel
-           Copyright (c) 1997-2012 University of Cambridge
-
------------------------------------------------------------------------------
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
-
-    * Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-
-    * Neither the name of the University of Cambridge nor the names of its
-      contributors may be used to endorse or promote products derived from
-      this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
------------------------------------------------------------------------------
-*/
-
-/* Generate code with 16 bit character support. */
-#define COMPILE_PCRE16
-
-#include "pcre_maketables.c"
-
-/* End of pcre16_maketables.c */
diff --git a/plugins/Pcre16/src/pcre16_newline.c b/plugins/Pcre16/src/pcre16_newline.c
deleted file mode 100644
index 7fe201400f..0000000000
--- a/plugins/Pcre16/src/pcre16_newline.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/*************************************************
-*      Perl-Compatible Regular Expressions       *
-*************************************************/
-
-/* PCRE is a library of functions to support regular expressions whose syntax
-and semantics are as close as possible to those of the Perl 5 language.
-
-                       Written by Philip Hazel
-           Copyright (c) 1997-2012 University of Cambridge
-
------------------------------------------------------------------------------
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
-
-    * Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-
-    * Neither the name of the University of Cambridge nor the names of its
-      contributors may be used to endorse or promote products derived from
-      this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
------------------------------------------------------------------------------
-*/
-
-/* Generate code with 16 bit character support. */
-#define COMPILE_PCRE16
-
-#include "pcre_newline.c"
-
-/* End of pcre16_newline.c */
diff --git a/plugins/Pcre16/src/pcre16_ord2utf16.c b/plugins/Pcre16/src/pcre16_ord2utf16.c
deleted file mode 100644
index 8e2ce5ea6c..0000000000
--- a/plugins/Pcre16/src/pcre16_ord2utf16.c
+++ /dev/null
@@ -1,90 +0,0 @@
-/*************************************************
-*      Perl-Compatible Regular Expressions       *
-*************************************************/
-
-/* PCRE is a library of functions to support regular expressions whose syntax
-and semantics are as close as possible to those of the Perl 5 language.
-
-                       Written by Philip Hazel
-           Copyright (c) 1997-2012 University of Cambridge
-
------------------------------------------------------------------------------
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
-
-    * Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-
-    * Neither the name of the University of Cambridge nor the names of its
-      contributors may be used to endorse or promote products derived from
-      this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
------------------------------------------------------------------------------
-*/
-
-
-/* This file contains a private PCRE function that converts an ordinal
-character value into a UTF16 string. */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-/* Generate code with 16 bit character support. */
-#define COMPILE_PCRE16
-
-#include "pcre_internal.h"
-
-/*************************************************
-*       Convert character value to UTF-16         *
-*************************************************/
-
-/* This function takes an integer value in the range 0 - 0x10ffff
-and encodes it as a UTF-16 character in 1 to 2 pcre_uchars.
-
-Arguments:
-  cvalue     the character value
-  buffer     pointer to buffer for result - at least 2 pcre_uchars long
-
-Returns:     number of characters placed in the buffer
-*/
-
-unsigned int
-PRIV(ord2utf)(pcre_uint32 cvalue, pcre_uchar *buffer)
-{
-#ifdef SUPPORT_UTF
-
-if (cvalue <= 0xffff)
-  {
-  *buffer = (pcre_uchar)cvalue;
-  return 1;
-  }
-
-cvalue -= 0x10000;
-*buffer++ = 0xd800 | (cvalue >> 10);
-*buffer = 0xdc00 | (cvalue & 0x3ff);
-return 2;
-
-#else /* SUPPORT_UTF */
-(void)(cvalue);  /* Keep compiler happy; this function won't ever be */
-(void)(buffer);  /* called when SUPPORT_UTF is not defined. */
-return 0;
-#endif /* SUPPORT_UTF */
-}
-
-/* End of pcre16_ord2utf16.c */
diff --git a/plugins/Pcre16/src/pcre16_printint.c b/plugins/Pcre16/src/pcre16_printint.c
deleted file mode 100644
index 33d8c34020..0000000000
--- a/plugins/Pcre16/src/pcre16_printint.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/*************************************************
-*      Perl-Compatible Regular Expressions       *
-*************************************************/
-
-/* PCRE is a library of functions to support regular expressions whose syntax
-and semantics are as close as possible to those of the Perl 5 language.
-
-                       Written by Philip Hazel
-           Copyright (c) 1997-2012 University of Cambridge
-
------------------------------------------------------------------------------
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
-
-    * Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-
-    * Neither the name of the University of Cambridge nor the names of its
-      contributors may be used to endorse or promote products derived from
-      this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
------------------------------------------------------------------------------
-*/
-
-/* Generate code with 16 bit character support. */
-#define COMPILE_PCRE16
-
-#include "pcre_printint.c"
-
-/* End of pcre16_printint.c */
diff --git a/plugins/Pcre16/src/pcre16_refcount.c b/plugins/Pcre16/src/pcre16_refcount.c
deleted file mode 100644
index d3d1543973..0000000000
--- a/plugins/Pcre16/src/pcre16_refcount.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/*************************************************
-*      Perl-Compatible Regular Expressions       *
-*************************************************/
-
-/* PCRE is a library of functions to support regular expressions whose syntax
-and semantics are as close as possible to those of the Perl 5 language.
-
-                       Written by Philip Hazel
-           Copyright (c) 1997-2012 University of Cambridge
-
------------------------------------------------------------------------------
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
-
-    * Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-
-    * Neither the name of the University of Cambridge nor the names of its
-      contributors may be used to endorse or promote products derived from
-      this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
------------------------------------------------------------------------------
-*/
-
-/* Generate code with 16 bit character support. */
-#define COMPILE_PCRE16
-
-#include "pcre_refcount.c"
-
-/* End of pcre16_refcount.c */
diff --git a/plugins/Pcre16/src/pcre16_string_utils.c b/plugins/Pcre16/src/pcre16_string_utils.c
deleted file mode 100644
index 382c40799f..0000000000
--- a/plugins/Pcre16/src/pcre16_string_utils.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/*************************************************
-*      Perl-Compatible Regular Expressions       *
-*************************************************/
-
-/* PCRE is a library of functions to support regular expressions whose syntax
-and semantics are as close as possible to those of the Perl 5 language.
-
-                       Written by Philip Hazel
-           Copyright (c) 1997-2012 University of Cambridge
-
------------------------------------------------------------------------------
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
-
-    * Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-
-    * Neither the name of the University of Cambridge nor the names of its
-      contributors may be used to endorse or promote products derived from
-      this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
------------------------------------------------------------------------------
-*/
-
-/* Generate code with 16 bit character support. */
-#define COMPILE_PCRE16
-
-#include "pcre_string_utils.c"
-
-/* End of pcre16_string_utils.c */
diff --git a/plugins/Pcre16/src/pcre16_study.c b/plugins/Pcre16/src/pcre16_study.c
deleted file mode 100644
index f87de081fc..0000000000
--- a/plugins/Pcre16/src/pcre16_study.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/*************************************************
-*      Perl-Compatible Regular Expressions       *
-*************************************************/
-
-/* PCRE is a library of functions to support regular expressions whose syntax
-and semantics are as close as possible to those of the Perl 5 language.
-
-                       Written by Philip Hazel
-           Copyright (c) 1997-2012 University of Cambridge
-
------------------------------------------------------------------------------
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
-
-    * Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-
-    * Neither the name of the University of Cambridge nor the names of its
-      contributors may be used to endorse or promote products derived from
-      this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
------------------------------------------------------------------------------
-*/
-
-/* Generate code with 16 bit character support. */
-#define COMPILE_PCRE16
-
-#include "pcre_study.c"
-
-/* End of pcre16_study.c */
diff --git a/plugins/Pcre16/src/pcre16_tables.c b/plugins/Pcre16/src/pcre16_tables.c
deleted file mode 100644
index d84297093a..0000000000
--- a/plugins/Pcre16/src/pcre16_tables.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/*************************************************
-*      Perl-Compatible Regular Expressions       *
-*************************************************/
-
-/* PCRE is a library of functions to support regular expressions whose syntax
-and semantics are as close as possible to those of the Perl 5 language.
-
-                       Written by Philip Hazel
-           Copyright (c) 1997-2012 University of Cambridge
-
------------------------------------------------------------------------------
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
-
-    * Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-
-    * Neither the name of the University of Cambridge nor the names of its
-      contributors may be used to endorse or promote products derived from
-      this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
------------------------------------------------------------------------------
-*/
-
-/* Generate code with 16 bit character support. */
-#define COMPILE_PCRE16
-
-#include "pcre_tables.c"
-
-/* End of pcre16_tables.c */
diff --git a/plugins/Pcre16/src/pcre16_ucd.c b/plugins/Pcre16/src/pcre16_ucd.c
deleted file mode 100644
index ee23439a01..0000000000
--- a/plugins/Pcre16/src/pcre16_ucd.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/*************************************************
-*      Perl-Compatible Regular Expressions       *
-*************************************************/
-
-/* PCRE is a library of functions to support regular expressions whose syntax
-and semantics are as close as possible to those of the Perl 5 language.
-
-                       Written by Philip Hazel
-           Copyright (c) 1997-2012 University of Cambridge
-
------------------------------------------------------------------------------
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
-
-    * Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-
-    * Neither the name of the University of Cambridge nor the names of its
-      contributors may be used to endorse or promote products derived from
-      this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
------------------------------------------------------------------------------
-*/
-
-/* Generate code with 16 bit character support. */
-#define COMPILE_PCRE16
-
-#include "pcre_ucd.c"
-
-/* End of pcre16_ucd.c */
diff --git a/plugins/Pcre16/src/pcre16_utf16_utils.c b/plugins/Pcre16/src/pcre16_utf16_utils.c
deleted file mode 100644
index 49ced0c0b1..0000000000
--- a/plugins/Pcre16/src/pcre16_utf16_utils.c
+++ /dev/null
@@ -1,130 +0,0 @@
-/*************************************************
-*      Perl-Compatible Regular Expressions       *
-*************************************************/
-
-/* PCRE is a library of functions to support regular expressions whose syntax
-and semantics are as close as possible to those of the Perl 5 language.
-
-                       Written by Philip Hazel
-           Copyright (c) 1997-2012 University of Cambridge
-
------------------------------------------------------------------------------
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
-
-    * Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-
-    * Neither the name of the University of Cambridge nor the names of its
-      contributors may be used to endorse or promote products derived from
-      this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
------------------------------------------------------------------------------
-*/
-
-
-/* This module contains a function for converting any UTF-16 character
-strings to host byte order. */
-
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-/* Generate code with 16 bit character support. */
-#define COMPILE_PCRE16
-
-#include "pcre_internal.h"
-
-/*************************************************
-*  Convert any UTF-16 string to host byte order  *
-*************************************************/
-
-/* This function takes an UTF-16 string and converts
-it to host byte order. The length can be explicitly set,
-or automatically detected for zero terminated strings.
-BOMs can be kept or discarded during the conversion.
-Conversion can be done in place (output == input).
-
-Arguments:
-  output     the output buffer, its size must be greater
-             or equal than the input string
-  input      any UTF-16 string
-  length     the number of 16-bit units in the input string
-             can be less than zero for zero terminated strings
-  host_byte_order
-             A non-zero value means the input is in host byte
-             order, which can be dynamically changed by BOMs later.
-             Initially it contains the starting byte order and returns
-             with the last byte order so it can be used for stream
-             processing. It can be NULL, which set the host byte
-             order mode by default.
-  keep_boms  for a non-zero value, the BOM (0xfeff) characters
-             are copied as well
-
-Returns:     the number of 16-bit units placed into the output buffer,
-             including the zero-terminator
-*/
-
-int
-pcre16_utf16_to_host_byte_order(PCRE_UCHAR16 *output, PCRE_SPTR16 input,
-  int length, int *host_byte_order, int keep_boms)
-{
-#ifdef SUPPORT_UTF
-/* This function converts any UTF-16 string to host byte order and optionally
-removes any Byte Order Marks (BOMS). Returns with the remainig length. */
-int host_bo = host_byte_order != NULL ? *host_byte_order : 1;
-pcre_uchar *optr = (pcre_uchar *)output;
-const pcre_uchar *iptr = (const pcre_uchar *)input;
-const pcre_uchar *end;
-/* The c variable must be unsigned. */
-register pcre_uchar c;
-
-if (length < 0)
-  length = STRLEN_UC(iptr) + 1;
-end = iptr + length;
-
-while (iptr < end)
-  {
-  c = *iptr++;
-  if (c == 0xfeff || c == 0xfffe)
-    {
-    /* Detecting the byte order of the machine is unnecessary, it is
-    enough to know that the UTF-16 string has the same byte order or not. */
-    host_bo = c == 0xfeff;
-    if (keep_boms != 0)
-      *optr++ = 0xfeff;
-    else
-      length--;
-    }
-  else
-    *optr++ = host_bo ? c : ((c >> 8) | (c << 8)); /* Flip bytes if needed. */
-  }
-if (host_byte_order != NULL)
-  *host_byte_order = host_bo;
-
-#else /* Not SUPPORT_UTF */
-(void)(output);  /* Keep picky compilers happy */
-(void)(input);
-(void)(keep_boms);
-(void)(host_byte_order);
-#endif /* SUPPORT_UTF */
-return length;
-}
-
-/* End of pcre16_utf16_utils.c */
diff --git a/plugins/Pcre16/src/pcre16_valid_utf16.c b/plugins/Pcre16/src/pcre16_valid_utf16.c
deleted file mode 100644
index 09076539d0..0000000000
--- a/plugins/Pcre16/src/pcre16_valid_utf16.c
+++ /dev/null
@@ -1,137 +0,0 @@
-/*************************************************
-*      Perl-Compatible Regular Expressions       *
-*************************************************/
-
-/* PCRE is a library of functions to support regular expressions whose syntax
-and semantics are as close as possible to those of the Perl 5 language.
-
-                       Written by Philip Hazel
-           Copyright (c) 1997-2013 University of Cambridge
-
------------------------------------------------------------------------------
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
-
-    * Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-
-    * Neither the name of the University of Cambridge nor the names of its
-      contributors may be used to endorse or promote products derived from
-      this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
------------------------------------------------------------------------------
-*/
-
-
-/* This module contains an internal function for validating UTF-16 character
-strings. */
-
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-/* Generate code with 16 bit character support. */
-#define COMPILE_PCRE16
-
-#include "pcre_internal.h"
-
-
-/*************************************************
-*         Validate a UTF-16 string                *
-*************************************************/
-
-/* This function is called (optionally) at the start of compile or match, to
-check that a supposed UTF-16 string is actually valid. The early check means
-that subsequent code can assume it is dealing with a valid string. The check
-can be turned off for maximum performance, but the consequences of supplying an
-invalid string are then undefined.
-
-From release 8.21 more information about the details of the error are passed
-back in the returned value:
-
-PCRE_UTF16_ERR0  No error
-PCRE_UTF16_ERR1  Missing low surrogate at the end of the string
-PCRE_UTF16_ERR2  Invalid low surrogate
-PCRE_UTF16_ERR3  Isolated low surrogate
-PCRE_UTF16_ERR4  Unused (was non-character)
-
-Arguments:
-  string       points to the string
-  length       length of string, or -1 if the string is zero-terminated
-  errp         pointer to an error position offset variable
-
-Returns:       = 0    if the string is a valid UTF-16 string
-               > 0    otherwise, setting the offset of the bad character
-*/
-
-int
-PRIV(valid_utf)(PCRE_PUCHAR string, int length, int *erroroffset)
-{
-#ifdef SUPPORT_UTF
-register PCRE_PUCHAR p;
-register pcre_uint32 c;
-
-if (length < 0)
-  {
-  for (p = string; *p != 0; p++);
-  length = p - string;
-  }
-
-for (p = string; length-- > 0; p++)
-  {
-  c = *p;
-
-  if ((c & 0xf800) != 0xd800)
-    {
-    /* Normal UTF-16 code point. Neither high nor low surrogate. */
-    }
-  else if ((c & 0x0400) == 0)
-    {
-    /* High surrogate. Must be a followed by a low surrogate. */
-    if (length == 0)
-      {
-      *erroroffset = p - string;
-      return PCRE_UTF16_ERR1;
-      }
-    p++;
-    length--;
-    if ((*p & 0xfc00) != 0xdc00)
-      {
-      *erroroffset = p - string;
-      return PCRE_UTF16_ERR2;
-      }
-    }
-  else
-    {
-    /* Isolated low surrogate. Always an error. */
-    *erroroffset = p - string;
-    return PCRE_UTF16_ERR3;
-    }
-  }
-
-#else  /* SUPPORT_UTF */
-(void)(string);  /* Keep picky compilers happy */
-(void)(length);
-(void)(erroroffset);
-#endif /* SUPPORT_UTF */
-
-return PCRE_UTF16_ERR0;   /* This indicates success */
-}
-
-/* End of pcre16_valid_utf16.c */
diff --git a/plugins/Pcre16/src/pcre16_version.c b/plugins/Pcre16/src/pcre16_version.c
deleted file mode 100644
index e991b1a8cf..0000000000
--- a/plugins/Pcre16/src/pcre16_version.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/*************************************************
-*      Perl-Compatible Regular Expressions       *
-*************************************************/
-
-/* PCRE is a library of functions to support regular expressions whose syntax
-and semantics are as close as possible to those of the Perl 5 language.
-
-                       Written by Philip Hazel
-           Copyright (c) 1997-2012 University of Cambridge
-
------------------------------------------------------------------------------
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
-
-    * Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-
-    * Neither the name of the University of Cambridge nor the names of its
-      contributors may be used to endorse or promote products derived from
-      this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
------------------------------------------------------------------------------
-*/
-
-/* Generate code with 16 bit character support. */
-#define COMPILE_PCRE16
-
-#include "pcre_version.c"
-
-/* End of pcre16_version.c */
diff --git a/plugins/Pcre16/src/pcre16_xclass.c b/plugins/Pcre16/src/pcre16_xclass.c
deleted file mode 100644
index 5aac2a36c6..0000000000
--- a/plugins/Pcre16/src/pcre16_xclass.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/*************************************************
-*      Perl-Compatible Regular Expressions       *
-*************************************************/
-
-/* PCRE is a library of functions to support regular expressions whose syntax
-and semantics are as close as possible to those of the Perl 5 language.
-
-                       Written by Philip Hazel
-           Copyright (c) 1997-2012 University of Cambridge
-
------------------------------------------------------------------------------
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
-
-    * Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-
-    * Neither the name of the University of Cambridge nor the names of its
-      contributors may be used to endorse or promote products derived from
-      this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
------------------------------------------------------------------------------
-*/
-
-/* Generate code with 16 bit character support. */
-#define COMPILE_PCRE16
-
-#include "pcre_xclass.c"
-
-/* End of pcre16_xclass.c */