9 files changed, 10 insertions, 49 deletions
diff --git a/plugins/ClientChangeNotify/ClientChangeNotify.vcxproj b/plugins/ClientChangeNotify/ClientChangeNotify.vcxproj
index 548dba941b..a3a7c06473 100644
--- a/plugins/ClientChangeNotify/ClientChangeNotify.vcxproj
+++ b/plugins/ClientChangeNotify/ClientChangeNotify.vcxproj
@@ -37,7 +37,6 @@
     <ClInclude Include="src\CString.h" />
     <ClInclude Include="src\Misc.h" />
     <ClInclude Include="src\Options.h" />
-    <ClInclude Include="src\pcre.h" />
     <ClInclude Include="src\resource.h" />
     <ClInclude Include="src\stdafx.h" />
     <ClInclude Include="src\TMyArray.h" />
diff --git a/plugins/ClientChangeNotify/ClientChangeNotify.vcxproj.filters b/plugins/ClientChangeNotify/ClientChangeNotify.vcxproj.filters
index 243c5594db..46c933d6dd 100644
--- a/plugins/ClientChangeNotify/ClientChangeNotify.vcxproj.filters
+++ b/plugins/ClientChangeNotify/ClientChangeNotify.vcxproj.filters
@@ -31,9 +31,6 @@
     <ClInclude Include="src\Options.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="src\pcre.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="src\resource.h">
       <Filter>Header Files</Filter>
     </ClInclude>
diff --git a/plugins/ClientChangeNotify/src/Misc.h b/plugins/ClientChangeNotify/src/Misc.h
index 977871b0ff..6240d93016 100644
--- a/plugins/ClientChangeNotify/src/Misc.h
+++ b/plugins/ClientChangeNotify/src/Misc.h
@@ -44,6 +44,10 @@ __inline void ShowLog(TCString &LogFilePath)
 	}
 }
 
+int PcreCheck(TCString Str, int StartingID = -1);
+void FreePcreCompileData();
+TCString CompileRegexp(TCString Regexp, int bAddAsUsualSubstring = 0, int ID = 0);
+
 __inline void RecompileRegexps(TCString IgnoreSubstrings)
 {
 	FreePcreCompileData();
diff --git a/plugins/ClientChangeNotify/src/pcre.cpp b/plugins/ClientChangeNotify/src/pcre.cpp
index 0ab9eb0fe3..66f9d14fd3 100644
--- a/plugins/ClientChangeNotify/src/pcre.cpp
+++ b/plugins/ClientChangeNotify/src/pcre.cpp
@@ -18,14 +18,6 @@
 */
 
 #include "stdafx.h"
-#include <windows.h>
-#include <stdio.h>
-#include <crtdbg.h>
-#include "newpluginapi.h"
-#include "m_utils.h"
-#include "TMyArray.h"
-#include "CString.h"
-#include "pcre.h"
 
 typedef struct
 {
diff --git a/plugins/ClientChangeNotify/src/pcre.h b/plugins/ClientChangeNotify/src/pcre.h
deleted file mode 100644
index f230896689..0000000000
--- a/plugins/ClientChangeNotify/src/pcre.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
-	Pcre.h
-	Copyright (c) 2007-2008 Chervov Dmitry
-
-	This program is free software; you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation; either version 2 of the License, or
-	(at your option) any later version.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with this program; if not, write to the Free Software
-	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
-
-#include "CString.h"
-#include "../../../libs/pcre16/src/pcre.h"
-
-#pragma once
-
-int PcreCheck(TCString Str, int StartingID = -1);
-void FreePcreCompileData();
-TCString CompileRegexp(TCString Regexp, int bAddAsUsualSubstring = 0, int ID = 0);
diff --git a/plugins/ClientChangeNotify/src/stdafx.h b/plugins/ClientChangeNotify/src/stdafx.h
index fe24e4bb86..4775140184 100644
--- a/plugins/ClientChangeNotify/src/stdafx.h
+++ b/plugins/ClientChangeNotify/src/stdafx.h
@@ -52,6 +52,8 @@
 
 #include "m_fingerprint.h"
 
+#include <pcre.h>
+
 struct CMPlugin : public PLUGIN<CMPlugin>
 {
 	CMPlugin();
@@ -62,7 +64,6 @@ struct CMPlugin : public PLUGIN<CMPlugin>
 #include "TMyArray.h"
 #include "Options.h"
 #include "CString.h"
-#include "pcre.h"
 
 #include "resource.h"
 #include "Misc.h"
diff --git a/plugins/Import/src/stdafx.h b/plugins/Import/src/stdafx.h
index a8629c7a13..dd75756bb0 100644
--- a/plugins/Import/src/stdafx.h
+++ b/plugins/Import/src/stdafx.h
@@ -45,8 +45,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <m_netlib.h>
 #include <m_protosvc.h>
 #include <m_timezones.h>
-
-#include "../../../libs/Pcre16/src/pcre.h"
+#include <pcre.h>
 
 #include "version.h"
 #include "resource.h"
diff --git a/plugins/Spamotron/src/stdafx.h b/plugins/Spamotron/src/stdafx.h
index c09ca7d427..a046076b0e 100644
--- a/plugins/Spamotron/src/stdafx.h
+++ b/plugins/Spamotron/src/stdafx.h
@@ -17,10 +17,8 @@
 #include <m_popup.h>
 #include <m_langpack.h>
 #include <m_protosvc.h>
-
-#include "m_folders.h"
-
-#include "../../libs/pcre16/src/pcre.h"
+#include <m_folders.h>
+#include <pcre.h>
 
 #include "resource.h"
 #include "version.h"
diff --git a/plugins/Variables/src/stdafx.h b/plugins/Variables/src/stdafx.h
index 7147e2e8b6..7aadeee69e 100644
--- a/plugins/Variables/src/stdafx.h
+++ b/plugins/Variables/src/stdafx.h
@@ -44,13 +44,11 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #include <m_netlib.h>
 #include <m_metacontacts.h>
 #include <m_timezones.h>
-
 #include <m_variables.h>
+#include <pcre.h>
 
 #include "../helpers/gen_helpers.h"
 
-#include "../../libs/pcre16/src/pcre.h"
-
 #include "resource.h"
 #include "version.h"
 #include "contact.h"