152 files changed, 223 insertions, 8 deletions
diff --git a/plugins/AddContactPlus/src/stdafx.h b/plugins/AddContactPlus/src/stdafx.h
index 0580c68b05..b1e2da7dfd 100644
--- a/plugins/AddContactPlus/src/stdafx.h
+++ b/plugins/AddContactPlus/src/stdafx.h
@@ -24,6 +24,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include <windows.h>
 #include <commctrl.h>
 
+#define __NO_CMPLUGIN_NEEDED
+
 #include <win2k.h>
 #include <newpluginapi.h>
 #include <m_utils.h>
diff --git a/plugins/Alarms/src/stdafx.h b/plugins/Alarms/src/stdafx.h
index c9596683f6..7ab9fd2a8b 100755
--- a/plugins/Alarms/src/stdafx.h
+++ b/plugins/Alarms/src/stdafx.h
@@ -7,6 +7,8 @@
 #include <windows.h>
 #include <shellapi.h>
 
+#define __NO_CMPLUGIN_NEEDED
+
 #include <newpluginapi.h>
 #include <m_utils.h>
 #include <m_options.h>
diff --git a/plugins/AsSingleWindow/src/stdafx.h b/plugins/AsSingleWindow/src/stdafx.h
index 8b24b19292..92ec30a804 100644
--- a/plugins/AsSingleWindow/src/stdafx.h
+++ b/plugins/AsSingleWindow/src/stdafx.h
@@ -10,6 +10,8 @@
 #include <list>
 #include <algorithm>
 
+#define __NO_CMPLUGIN_NEEDED
+
 #include "newpluginapi.h"
 #include "m_system.h"
 #include "m_langpack.h"
diff --git a/plugins/AssocMgr/src/stdafx.h b/plugins/AssocMgr/src/stdafx.h
index 1150cf95ed..08009fb652 100644
--- a/plugins/AssocMgr/src/stdafx.h
+++ b/plugins/AssocMgr/src/stdafx.h
@@ -29,6 +29,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #define DELAYIMP_INSECURE_WRITABLE_HOOKS
 #include <delayimp.h>
 
+#define __NO_CMPLUGIN_NEEDED
+
 #include <newpluginapi.h>
 #include <m_database.h>
 #include <m_langpack.h>
diff --git a/plugins/AuthState/src/stdafx.h b/plugins/AuthState/src/stdafx.h
index 19bb1c6d8e..19e5dd4399 100644
--- a/plugins/AuthState/src/stdafx.h
+++ b/plugins/AuthState/src/stdafx.h
@@ -23,6 +23,8 @@
 #include <windows.h>
 
 // Miranda API headers
+#define __NO_CMPLUGIN_NEEDED
+
 #include <newpluginapi.h>
 #include <m_database.h>
 #include <m_protocols.h>
diff --git a/plugins/AutoRun/src/stdafx.h b/plugins/AutoRun/src/stdafx.h
index 70c37bad5d..73bca890b8 100644
--- a/plugins/AutoRun/src/stdafx.h
+++ b/plugins/AutoRun/src/stdafx.h
@@ -2,6 +2,8 @@
 
 #include <windows.h>
 
+#define __NO_CMPLUGIN_NEEDED
+
 #include <newpluginapi.h>
 #include <m_langpack.h>
 #include <m_options.h>
diff --git a/plugins/AutoShutdown/src/stdafx.h b/plugins/AutoShutdown/src/stdafx.h
index 2dc839644f..7a22b307d6 100644
--- a/plugins/AutoShutdown/src/stdafx.h
+++ b/plugins/AutoShutdown/src/stdafx.h
@@ -42,6 +42,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <ras.h>       /* for RasEnumConnections(), RasHangUp() */
 #include <raserror.h>  /* error codes for RAS */
 
+#define __NO_CMPLUGIN_NEEDED
+
 #include <newpluginapi.h>
 #include <m_database.h>
 #include <m_langpack.h>
diff --git a/plugins/AvatarHistory/src/stdafx.h b/plugins/AvatarHistory/src/stdafx.h
index 2c359a32c7..28b882b8d9 100644
--- a/plugins/AvatarHistory/src/stdafx.h
+++ b/plugins/AvatarHistory/src/stdafx.h
@@ -6,6 +6,8 @@
 #include <ShObjIdl.h>
 #include <ShlGuid.h>
 
+#define __NO_CMPLUGIN_NEEDED
+
 #include <newpluginapi.h>
 #include <m_clist.h>
 #include <m_skin.h>
diff --git a/plugins/BASS_interface/src/stdafx.h b/plugins/BASS_interface/src/stdafx.h
index bb2a25e9d5..d804face02 100644
--- a/plugins/BASS_interface/src/stdafx.h
+++ b/plugins/BASS_interface/src/stdafx.h
@@ -8,6 +8,8 @@ Copyright (C) 2010, 2011 tico-tico
 #include <commctrl.h>
 #include <Uxtheme.h>
 
+#define __NO_CMPLUGIN_NEEDED
+
 #include <newpluginapi.h>
 #include <m_langpack.h>
 #include <m_skin.h>
diff --git a/plugins/BasicHistory/src/stdafx.h b/plugins/BasicHistory/src/stdafx.h
index 796d81c55d..7205088adf 100644
--- a/plugins/BasicHistory/src/stdafx.h
+++ b/plugins/BasicHistory/src/stdafx.h
@@ -31,6 +31,8 @@
 #include <fstream>
 #include <functional>
 
+#define __NO_CMPLUGIN_NEEDED
+
 #include <newpluginapi.h>
 #include <m_langpack.h>
 #include <m_system.h>
diff --git a/plugins/Boltun/src/stdafx.h b/plugins/Boltun/src/stdafx.h
index d82488d9e4..5fb0955d9d 100644
--- a/plugins/Boltun/src/stdafx.h
+++ b/plugins/Boltun/src/stdafx.h
@@ -30,6 +30,8 @@
 #include <string>
 #include <list>
 
+#define __NO_CMPLUGIN_NEEDED
+
 #include <newpluginapi.h>
 #include <m_clist.h>
 #include <m_system.h>
diff --git a/plugins/BossKeyPlus/src/stdafx.h b/plugins/BossKeyPlus/src/stdafx.h
index 416bddaf6f..77ec28d37c 100644
--- a/plugins/BossKeyPlus/src/stdafx.h
+++ b/plugins/BossKeyPlus/src/stdafx.h
@@ -28,6 +28,8 @@
 #include <shellapi.h>
 #include <Wtsapi32.h>
 
+#define __NO_CMPLUGIN_NEEDED
+
 #include <newpluginapi.h>
 #include <m_utils.h>
 #include <m_langpack.h>
diff --git a/plugins/BuddyExpectator/src/stdafx.h b/plugins/BuddyExpectator/src/stdafx.h
index 45df0fc175..d5e606febe 100644
--- a/plugins/BuddyExpectator/src/stdafx.h
+++ b/plugins/BuddyExpectator/src/stdafx.h
@@ -27,6 +27,8 @@
 #include <time.h>
 #include <locale.h>
 
+#define __NO_CMPLUGIN_NEEDED
+
 #include <newpluginapi.h>
 #include <m_skin.h>
 #include <m_clistint.h>
diff --git a/plugins/BuddyPounce/src/stdafx.h b/plugins/BuddyPounce/src/stdafx.h
index 833571d8e8..f69b5981ba 100644
--- a/plugins/BuddyPounce/src/stdafx.h
+++ b/plugins/BuddyPounce/src/stdafx.h
@@ -8,6 +8,8 @@
 #include <time.h>
 #include <malloc.h>
 
+#define __NO_CMPLUGIN_NEEDED
+
 #include <newpluginapi.h>
 #include <m_clist.h>
 #include <m_langpack.h>
diff --git a/plugins/CSList/src/stdafx.h b/plugins/CSList/src/stdafx.h
index c91c4b8129..6dbe1bfcbd 100644
--- a/plugins/CSList/src/stdafx.h
+++ b/plugins/CSList/src/stdafx.h
@@ -35,6 +35,8 @@ Offers List of your Custom Statuses.
 
 #include <windows.h>
 
+#define __NO_CMPLUGIN_NEEDED
+
 #include <newpluginapi.h>
 #include <m_database.h>
 #include <m_system.h>
diff --git a/plugins/ChangeKeyboardLayout/src/stdafx.h b/plugins/ChangeKeyboardLayout/src/stdafx.h
index 85223339b5..7be6d07a35 100644
--- a/plugins/ChangeKeyboardLayout/src/stdafx.h
+++ b/plugins/ChangeKeyboardLayout/src/stdafx.h
@@ -5,6 +5,8 @@
 #include <commctrl.h>
 #include <richedit.h>
 
+#define __NO_CMPLUGIN_NEEDED
+
 #include <newpluginapi.h>
 #include <m_options.h>
 #include <m_langpack.h>
diff --git a/plugins/ClientChangeNotify/src/stdafx.h b/plugins/ClientChangeNotify/src/stdafx.h
index 3fae08172e..53493b51e1 100644
--- a/plugins/ClientChangeNotify/src/stdafx.h
+++ b/plugins/ClientChangeNotify/src/stdafx.h
@@ -31,6 +31,8 @@
 #include <WinSock.h>
 #include <commdlg.h>
 
+#define __NO_CMPLUGIN_NEEDED
+
 #include "newpluginapi.h"
 #include "statusmodes.h"
 #include "m_popup.h"
diff --git a/plugins/Clist_blind/src/stdafx.h b/plugins/Clist_blind/src/stdafx.h
index 25f334a2e5..c60d913fc9 100644
--- a/plugins/Clist_blind/src/stdafx.h
+++ b/plugins/Clist_blind/src/stdafx.h
@@ -28,6 +28,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <vssym32.h>
 #include <Uxtheme.h>
 
+#define __NO_CMPLUGIN_NEEDED
+
 #include <newpluginapi.h>
 #include <m_clistint.h>
 #include <m_database.h>
diff --git a/plugins/Clist_modern/src/stdafx.h b/plugins/Clist_modern/src/stdafx.h
index 7a94c83aa3..fffc321996 100644
--- a/plugins/Clist_modern/src/stdafx.h
+++ b/plugins/Clist_modern/src/stdafx.h
@@ -72,6 +72,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <math.h>
 #include <stdio.h>
 
+#define __NO_CMPLUGIN_NEEDED
+
 #include <newpluginapi.h>
 #include <m_system.h>
 #include <win2k.h>
diff --git a/plugins/Clist_nicer/src/stdafx.h b/plugins/Clist_nicer/src/stdafx.h
index 3dc937b5b2..356053cfbd 100644
--- a/plugins/Clist_nicer/src/stdafx.h
+++ b/plugins/Clist_nicer/src/stdafx.h
@@ -38,6 +38,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <vssym32.h>
 #include <time.h>
 
+#define __NO_CMPLUGIN_NEEDED
+
 #include <newpluginapi.h>
 #include <win2k.h>
 #include <m_clistint.h>
diff --git a/plugins/Cln_skinedit/src/stdafx.h b/plugins/Cln_skinedit/src/stdafx.h
index 65115d7578..19170158d3 100644
--- a/plugins/Cln_skinedit/src/stdafx.h
+++ b/plugins/Cln_skinedit/src/stdafx.h
@@ -28,6 +28,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <commctrl.h>
 #include <time.h>
 
+#define __NO_CMPLUGIN_NEEDED
+
 #include <newpluginapi.h>
 #include <m_database.h>
 #include <m_langpack.h>
diff --git a/plugins/CloudFile/src/main.cpp b/plugins/CloudFile/src/main.cpp
index 6f62068f34..a382ed5ddb 100644
--- a/plugins/CloudFile/src/main.cpp
+++ b/plugins/CloudFile/src/main.cpp
@@ -25,8 +25,6 @@ extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD)
 
 CMPlugin g_plugin;
 
-extern "C" _pfnCrtInit _pRawDllMain = &CMPlugin::RawDllMain;
-
 /////////////////////////////////////////////////////////////////////////////////////////
 // Interface information
 
diff --git a/plugins/CmdLine/src/stdafx.h b/plugins/CmdLine/src/stdafx.h
index 3049769b4c..23ae2a12fb 100644
--- a/plugins/CmdLine/src/stdafx.h
+++ b/plugins/CmdLine/src/stdafx.h
@@ -26,6 +26,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <time.h>
 #include <stdlib.h>
 
+#define __NO_CMPLUGIN_NEEDED
+
 #include "newpluginapi.h"
 #include "m_database.h"
 #include "m_clist.h"
diff --git a/plugins/ConnectionNotify/src/stdafx.h b/plugins/ConnectionNotify/src/stdafx.h
index 659fac668b..b048999086 100644
--- a/plugins/ConnectionNotify/src/stdafx.h
+++ b/plugins/ConnectionNotify/src/stdafx.h
@@ -6,6 +6,8 @@
 #include <iphlpapi.h>
 #include <Tlhelp32.h>
 
+#define __NO_CMPLUGIN_NEEDED
+
 #include <newpluginapi.h>
 #include <m_core.h>
 #include <m_clistint.h>
diff --git a/plugins/Console/src/stdafx.h b/plugins/Console/src/stdafx.h
index f228a0b72e..b50f7c2d07 100644
--- a/plugins/Console/src/stdafx.h
+++ b/plugins/Console/src/stdafx.h
@@ -28,6 +28,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <commctrl.h>
 #include <malloc.h>
 
+#define __NO_CMPLUGIN_NEEDED
+
 #include <newpluginapi.h>
 #include <win2k.h>
 #include <m_netlib.h>
diff --git a/plugins/ContactsPlus/src/stdafx.h b/plugins/ContactsPlus/src/stdafx.h
index 32c0d719f7..1a8207f470 100644
--- a/plugins/ContactsPlus/src/stdafx.h
+++ b/plugins/ContactsPlus/src/stdafx.h
@@ -29,6 +29,8 @@
 #include <malloc.h>
 #include <time.h>
 
+#define __NO_CMPLUGIN_NEEDED
+
 #include "newpluginapi.h"
 #include "m_protosvc.h"
 #include "m_database.h"
diff --git a/plugins/ContextHelp/src/stdafx.h b/plugins/ContextHelp/src/stdafx.h
index ca918fd4f0..2662bda552 100644
--- a/plugins/ContextHelp/src/stdafx.h
+++ b/plugins/ContextHelp/src/stdafx.h
@@ -25,8 +25,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <Vsstyle.h>
 #include <richedit.h>
 
+#define __NO_CMPLUGIN_NEEDED
+
 #include <newpluginapi.h>
-//#include <win2k.h>
 #include <m_system_cpp.h>
 #include <m_options.h>
 #include <m_database.h>
diff --git a/plugins/CountryFlags/src/stdafx.h b/plugins/CountryFlags/src/stdafx.h
index 9f69f4c8d4..5ca2c565f3 100644
--- a/plugins/CountryFlags/src/stdafx.h
+++ b/plugins/CountryFlags/src/stdafx.h
@@ -25,6 +25,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <commctrl.h>  /* for ImageList functions */
 
 #include <win2k.h>
+
+#define __NO_CMPLUGIN_NEEDED
 #include <newpluginapi.h>
 #include <m_langpack.h>
 #include <m_icolib.h>
diff --git a/plugins/CrashDumper/src/stdafx.h b/plugins/CrashDumper/src/stdafx.h
index 4480df5e84..ff651e6839 100644
--- a/plugins/CrashDumper/src/stdafx.h
+++ b/plugins/CrashDumper/src/stdafx.h
@@ -25,6 +25,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <delayimp.h>
 #include <malloc.h>
 
+#define __NO_CMPLUGIN_NEEDED
+
 #include <newpluginapi.h>
 #include <m_utils.h>
 #include <m_langpack.h>
diff --git a/plugins/CryptoPP/src/commonheaders.h b/plugins/CryptoPP/src/commonheaders.h
index ff27ce934c..e959912d38 100644
--- a/plugins/CryptoPP/src/commonheaders.h
+++ b/plugins/CryptoPP/src/commonheaders.h
@@ -32,6 +32,7 @@
 #define M_API_H__
 
 // Miranda API
+#define __NO_CMPLUGIN_NEEDED
 #include <newpluginapi.h>
 #include <m_system.h>
 #include <m_utils.h>
diff --git a/plugins/CyrTranslit/src/stdafx.h b/plugins/CyrTranslit/src/stdafx.h
index 9788f57f98..9b8a6c9a2a 100644
--- a/plugins/CyrTranslit/src/stdafx.h
+++ b/plugins/CyrTranslit/src/stdafx.h
@@ -22,6 +22,8 @@
 #include <windows.h>
 #include <map>
 
+#define __NO_CMPLUGIN_NEEDED
+
 #include <newpluginapi.h>
 #include <m_database.h>
 #include <m_protosvc.h>
diff --git a/plugins/Db3x_mmap/src/stdafx.h b/plugins/Db3x_mmap/src/stdafx.h
index 83f98baddd..d009117695 100644
--- a/plugins/Db3x_mmap/src/stdafx.h
+++ b/plugins/Db3x_mmap/src/stdafx.h
@@ -33,6 +33,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <process.h>
 #include <memory>
 
+#define __NO_CMPLUGIN_NEEDED
+
 #include <newpluginapi.h>
 #include <win2k.h>
 #include <m_system.h>
diff --git a/plugins/DbEditorPP/src/stdafx.h b/plugins/DbEditorPP/src/stdafx.h
index 2f649a7d2d..f661911b8c 100644
--- a/plugins/DbEditorPP/src/stdafx.h
+++ b/plugins/DbEditorPP/src/stdafx.h
@@ -16,6 +16,8 @@
 #include <win2k.h>
 #include <malloc.h>
 
+#define __NO_CMPLUGIN_NEEDED
+
 #include <newpluginapi.h>
 #include <m_utils.h>
 #include <m_clist.h>
diff --git a/plugins/Db_autobackups/src/stdafx.h b/plugins/Db_autobackups/src/stdafx.h
index be544e7cd3..6ad8c6628b 100644
--- a/plugins/Db_autobackups/src/stdafx.h
+++ b/plugins/Db_autobackups/src/stdafx.h
@@ -12,6 +12,8 @@
 
 namespace fs = std::experimental::filesystem;
 
+#define __NO_CMPLUGIN_NEEDED
+
 #include <newpluginapi.h>
 #include <m_clist.h>
 #include <m_database.h>
diff --git a/plugins/Dbx_mdbx/src/stdafx.h b/plugins/Dbx_mdbx/src/stdafx.h
index 5e00445dba..f394e09f3a 100644
--- a/plugins/Dbx_mdbx/src/stdafx.h
+++ b/plugins/Dbx_mdbx/src/stdafx.h
@@ -34,6 +34,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <map>
 #include <cassert>
 
+#define __NO_CMPLUGIN_NEEDED
+
 #include <newpluginapi.h>
 #include <win2k.h>
 #include <m_system_cpp.h>
diff --git a/plugins/Exchange/src/stdafx.h b/plugins/Exchange/src/stdafx.h
index 075d19ddd9..5c04e1c8f7 100644
--- a/plugins/Exchange/src/stdafx.h
+++ b/plugins/Exchange/src/stdafx.h
@@ -31,6 +31,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <stdlib.h>
 #include <string.h>
 
+#define __NO_CMPLUGIN_NEEDED
+
 #include <newpluginapi.h>
 #include <m_core.h>
 #include <m_popup.h>
diff --git a/plugins/FTPFileYM/src/stdafx.h b/plugins/FTPFileYM/src/stdafx.h
index 1ac6722a7f..f31b540dd8 100644
--- a/plugins/FTPFileYM/src/stdafx.h
+++ b/plugins/FTPFileYM/src/stdafx.h
@@ -27,6 +27,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 #include <vector>
 using namespace std;
 
+#define __NO_CMPLUGIN_NEEDED
+
 #include <newpluginapi.h>
 #include <m_button.h>
 #include <m_clist.h>
diff --git a/plugins/FavContacts/src/stdafx.h b/plugins/FavContacts/src/stdafx.h
index b95b6f23bc..17b0d3ca6b 100644
--- a/plugins/FavContacts/src/stdafx.h
+++ b/plugins/FavContacts/src/stdafx.h
@@ -29,6 +29,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <time.h>
 #include <math.h>
 
+#define __NO_CMPLUGIN_NEEDED
+
 #include <win2k.h>
 #include <newpluginapi.h>
 #include <m_system.h>
diff --git a/plugins/FileAsMessage/src/stdafx.h b/plugins/FileAsMessage/src/stdafx.h
index 7b6f2133d7..3ac7b52e8d 100644
--- a/plugins/FileAsMessage/src/stdafx.h
+++ b/plugins/FileAsMessage/src/stdafx.h
@@ -7,6 +7,8 @@
 #include <fcntl.h>
 #include <commctrl.h>
 
+#define __NO_CMPLUGIN_NEEDED
+
 #include <newpluginapi.h>
 #include <m_database.h>
 #include <m_protosvc.h>
diff --git a/plugins/FingerprintNG/src/stdafx.h b/plugins/FingerprintNG/src/stdafx.h
index 0e70c1f812..822017b095 100644
--- a/plugins/FingerprintNG/src/stdafx.h
+++ b/plugins/FingerprintNG/src/stdafx.h
@@ -28,6 +28,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #include <malloc.h>
 
 // Miranda IM SDK includes
+#define __NO_CMPLUGIN_NEEDED
 #include <newpluginapi.h>
 #include <win2k.h>
 #include <m_database.h>
diff --git a/plugins/FloatingContacts/src/stdafx.h b/plugins/FloatingContacts/src/stdafx.h
index bf636150ef..6eb9a4eaf1 100644
--- a/plugins/FloatingContacts/src/stdafx.h
+++ b/plugins/FloatingContacts/src/stdafx.h
@@ -8,6 +8,8 @@
 #include <Shlwapi.h>
 #include <CommCtrl.h>
 
+#define __NO_CMPLUGIN_NEEDED
+
 #include <newpluginapi.h>
 #include <m_system.h>
 #include <m_skin.h>
diff --git a/plugins/Folders/src/stdafx.h b/plugins/Folders/src/stdafx.h
index 3d9f67e760..17b917a9f7 100644
--- a/plugins/Folders/src/stdafx.h
+++ b/plugins/Folders/src/stdafx.h
@@ -30,6 +30,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <string.h>
 #include <malloc.h>
 
+#define __NO_CMPLUGIN_NEEDED
+
 #include <newpluginapi.h>
 #include <m_database.h>
 #include <m_system.h>
diff --git a/plugins/HTTPServer/src/Glob.h b/plugins/HTTPServer/src/Glob.h
index fac6c3f3eb..24a1ab9268 100644
--- a/plugins/HTTPServer/src/Glob.h
+++ b/plugins/HTTPServer/src/Glob.h
@@ -27,6 +27,7 @@
 #include <string>
 using namespace std;
 
+#define __NO_CMPLUGIN_NEEDED
 #include <win2k.h>
 #include <newpluginapi.h>
 #include <m_database.h>
diff --git a/plugins/HistoryLinkListPlus/src/stdafx.h b/plugins/HistoryLinkListPlus/src/stdafx.h
index e0ff6adecd..b334a6326d 100644
--- a/plugins/HistoryLinkListPlus/src/stdafx.h
+++ b/plugins/HistoryLinkListPlus/src/stdafx.h
@@ -25,6 +25,8 @@
 #include <commctrl.h>
 #include <crtdbg.h>
 
+#define __NO_CMPLUGIN_NEEDED
+
 #include <newpluginapi.h>
 #include <m_clist.h>
 #include <m_database.h>
diff --git a/plugins/HistoryStats/src/stdafx.h b/plugins/HistoryStats/src/stdafx.h
index 06800ecb98..6641d87c67 100644
--- a/plugins/HistoryStats/src/stdafx.h
+++ b/plugins/HistoryStats/src/stdafx.h
@@ -31,6 +31,8 @@
 
 #define MIRANDA_VER 0x0A00
 
+#define __NO_CMPLUGIN_NEEDED
+
 #include <newpluginapi.h>
 
 #include <m_awaymsg.h>     // not used
diff --git a/plugins/HistorySweeperLight/src/stdafx.h b/plugins/HistorySweeperLight/src/stdafx.h
index 5e8140c1e8..1293f4ad9f 100644
--- a/plugins/HistorySweeperLight/src/stdafx.h
+++ b/plugins/HistorySweeperLight/src/stdafx.h
@@ -28,6 +28,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <windows.h>
 #include <time.h>
 
+#define __NO_CMPLUGIN_NEEDED
+
 #include <win2k.h>
 #include <newpluginapi.h>
 #include <m_database.h>
diff --git a/plugins/HwHotKeys/src/stdafx.h b/plugins/HwHotKeys/src/stdafx.h
index 83aa799421..7c2ecb0b64 100644
--- a/plugins/HwHotKeys/src/stdafx.h
+++ b/plugins/HwHotKeys/src/stdafx.h
@@ -22,6 +22,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111 - 1307, USA.
 #include <SDKDDKVer.h>
 #include <windows.h>
 
+#define __NO_CMPLUGIN_NEEDED
+
 #include <newpluginapi.h>
 #include <m_langpack.h>
 #include <m_database.h>
diff --git a/plugins/IEHistory/src/stdafx.h b/plugins/IEHistory/src/stdafx.h
index 4db5643aee..4ef48c89ed 100644
--- a/plugins/IEHistory/src/stdafx.h
+++ b/plugins/IEHistory/src/stdafx.h
@@ -34,6 +34,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <stdlib.h>
 #include <uxtheme.h>
 
+#define __NO_CMPLUGIN_NEEDED
+
 #include <newpluginapi.h>
 #include <m_database.h>
 #include <m_utils.h>
diff --git a/plugins/IEView/src/stdafx.h b/plugins/IEView/src/stdafx.h
index 853e897950..6faffa62fd 100644
--- a/plugins/IEView/src/stdafx.h
+++ b/plugins/IEView/src/stdafx.h
@@ -36,6 +36,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <io.h>
 #include <fcntl.h>
 
+#define __NO_CMPLUGIN_NEEDED
+
 #include <newpluginapi.h>
 #include <m_clistint.h>
 #include <m_langpack.h>
diff --git a/plugins/IgnoreState/src/stdafx.h b/plugins/IgnoreState/src/stdafx.h
index 4ba2b7e83a..765038ff49 100644
--- a/plugins/IgnoreState/src/stdafx.h
+++ b/plugins/IgnoreState/src/stdafx.h
@@ -25,6 +25,8 @@
 #include <windows.h>
 #include <commctrl.h>
 
+#define __NO_CMPLUGIN_NEEDED
+
 #include <win2k.h>
 #include <newpluginapi.h>
 #include <m_database.h>
diff --git a/plugins/Import/src/stdafx.h b/plugins/Import/src/stdafx.h
index 36e5156142..73d12fe83d 100644
--- a/plugins/Import/src/stdafx.h
+++ b/plugins/Import/src/stdafx.h
@@ -30,6 +30,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <malloc.h>
 #include <time.h>
 
+#define __NO_CMPLUGIN_NEEDED
+
 #include <win2k.h>
 #include <newpluginapi.h>
 #include <m_langpack.h>
diff --git a/plugins/KeyboardNotify/src/stdafx.h b/plugins/KeyboardNotify/src/stdafx.h
index 7efd635870..2b36b23ed0 100644
--- a/plugins/KeyboardNotify/src/stdafx.h
+++ b/plugins/KeyboardNotify/src/stdafx.h
@@ -28,6 +28,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <winioctl.h>
 #include <Uxtheme.h>
 
+#define __NO_CMPLUGIN_NEEDED
+
 #include <newpluginapi.h>
 #include <m_database.h>
 #include <m_options.h>
diff --git a/plugins/ListeningTo/src/stdafx.h b/plugins/ListeningTo/src/stdafx.h
index 9aa52d28ea..bbb70355dd 100644
--- a/plugins/ListeningTo/src/stdafx.h
+++ b/plugins/ListeningTo/src/stdafx.h
@@ -28,6 +28,8 @@ Boston, MA 02111-1307, USA.
 #include <vector>
 #include <algorithm>
 
+#define __NO_CMPLUGIN_NEEDED
+
 #include <newpluginapi.h>
 #include <win2k.h>
 #include <m_protosvc.h>
diff --git a/plugins/LotusNotify/src/stdafx.h b/plugins/LotusNotify/src/stdafx.h
index aba429fb15..bb7b1c3186 100644
--- a/plugins/LotusNotify/src/stdafx.h
+++ b/plugins/LotusNotify/src/stdafx.h
@@ -6,10 +6,11 @@
 #include <commctrl.h>
 #include <assert.h>
 
-
-
 // Miranda headers
 //LotusNotify.h
+
+#define __NO_CMPLUGIN_NEEDED
+
 #include <m_core.h>
 #include <win2k.h>
 #include <newpluginapi.h>
diff --git a/plugins/MagneticWindows/src/stdafx.h b/plugins/MagneticWindows/src/stdafx.h
index b93aa30baf..2ca9697411 100644
--- a/plugins/MagneticWindows/src/stdafx.h
+++ b/plugins/MagneticWindows/src/stdafx.h
@@ -2,6 +2,8 @@
 #include <commctrl.h>
 #include <stdio.h>
 
+#define __NO_CMPLUGIN_NEEDED
+
 #include <newpluginapi.h>
 #include <m_clistint.h>
 #include <m_message.h>
diff --git a/plugins/MenuItemEx/src/stdafx.h b/plugins/MenuItemEx/src/stdafx.h
index 07bb4cd71a..80a4dca30e 100644
--- a/plugins/MenuItemEx/src/stdafx.h
+++ b/plugins/MenuItemEx/src/stdafx.h
@@ -5,6 +5,8 @@
 
 #include <windows.h>
 
+#define __NO_CMPLUGIN_NEEDED
+
 #include <newpluginapi.h>
 #include <win2k.h>
 #include <m_system.h>
diff --git a/plugins/MessageState/src/stdafx.h b/plugins/MessageState/src/stdafx.h
index a0f1841bc4..4efd7ab1f4 100644
--- a/plugins/MessageState/src/stdafx.h
+++ b/plugins/MessageState/src/stdafx.h
@@ -4,6 +4,8 @@
 #include <time.h>
 #include <locale.h>
 
+#define __NO_CMPLUGIN_NEEDED
+
 #include <m_messagestate.h>
 #include <newpluginapi.h>
 #include <m_database.h>
diff --git a/plugins/MimCmd/src/stdafx.h b/plugins/MimCmd/src/stdafx.h
index d6aa7d304c..2a1000d9e2 100644
--- a/plugins/MimCmd/src/stdafx.h
+++ b/plugins/MimCmd/src/stdafx.h
@@ -28,6 +28,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <fcntl.h>
 
 #define NO_MIMCMD_COMMANDS
+#define __NO_CMPLUGIN_NEEDED
 
 #include <newpluginapi.h>
 #include <m_langpack.h>
diff --git a/plugins/MirFox/src/common.h b/plugins/MirFox/src/common.h
index 5515a59762..aa36678281 100644
--- a/plugins/MirFox/src/common.h
+++ b/plugins/MirFox/src/common.h
@@ -6,7 +6,8 @@
 #pragma comment(lib, "comctl32.lib")
 #include <commctrl.h>
 
-//Miranda headers
+// Miranda headers
+#define __NO_CMPLUGIN_NEEDED
 #include <win2k.h>
 #include <newpluginapi.h>
 #include <m_system.h>
diff --git a/plugins/MirLua/src/stdafx.h b/plugins/MirLua/src/stdafx.h
index 98b45c6a4a..b61f7dfedc 100644
--- a/plugins/MirLua/src/stdafx.h
+++ b/plugins/MirLua/src/stdafx.h
@@ -6,6 +6,8 @@
 
 #include <map>
 
+#define __NO_CMPLUGIN_NEEDED
+
 #include <newpluginapi.h>
 #include <m_core.h>
 #include <m_utils.h>
diff --git a/plugins/MirOTR/src/stdafx.h b/plugins/MirOTR/src/stdafx.h
index 33bb070972..73bed096c4 100644
--- a/plugins/MirOTR/src/stdafx.h
+++ b/plugins/MirOTR/src/stdafx.h
@@ -23,6 +23,8 @@ extern "C" {
 }
 using namespace std;
 
+#define __NO_CMPLUGIN_NEEDED
+
 #include <newpluginapi.h>
 #include <m_langpack.h>
 #include <m_database.h>
diff --git a/plugins/MirandaG15/src/StdAfx.h b/plugins/MirandaG15/src/StdAfx.h
index f6aabb0c8f..deec9ef894 100644
--- a/plugins/MirandaG15/src/StdAfx.h
+++ b/plugins/MirandaG15/src/StdAfx.h
@@ -16,6 +16,8 @@
 
 using namespace std;
 
+#define __NO_CMPLUGIN_NEEDED
+
 #include <newpluginapi.h>
 
 #include <m_message.h>
diff --git a/plugins/MobileState/src/stdafx.h b/plugins/MobileState/src/stdafx.h
index b355d7785b..d0090adf55 100644
--- a/plugins/MobileState/src/stdafx.h
+++ b/plugins/MobileState/src/stdafx.h
@@ -23,6 +23,7 @@
 #include <malloc.h>
 
 // Miranda API headers
+#define __NO_CMPLUGIN_NEEDED
 #include <newpluginapi.h>
 #include <m_database.h>
 #include <m_protocols.h>
diff --git a/plugins/MsgPopup/src/stdafx.h b/plugins/MsgPopup/src/stdafx.h
index be80f56c4a..0344673222 100644
--- a/plugins/MsgPopup/src/stdafx.h
+++ b/plugins/MsgPopup/src/stdafx.h
@@ -26,6 +26,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <tlhelp32.h>
 #include <dbghelp.h>
 
+#define __NO_CMPLUGIN_NEEDED
+
 #include <newpluginapi.h>
 #include <m_utils.h>
 #include <m_langpack.h>
diff --git a/plugins/Msg_Export/src/stdafx.h b/plugins/Msg_Export/src/stdafx.h
index b655a1b511..6a4de3ead7 100755
--- a/plugins/Msg_Export/src/stdafx.h
+++ b/plugins/Msg_Export/src/stdafx.h
@@ -28,6 +28,8 @@ using namespace std;
 #include <string>
 #include <map>
 
+#define __NO_CMPLUGIN_NEEDED
+
 #include <newpluginapi.h>
 #include <m_database.h>
 #include <m_clist.h>
diff --git a/plugins/MyDetails/src/stdafx.h b/plugins/MyDetails/src/stdafx.h
index 1b0a10892e..f5ae61ac93 100644
--- a/plugins/MyDetails/src/stdafx.h
+++ b/plugins/MyDetails/src/stdafx.h
@@ -25,6 +25,8 @@ Boston, MA 02111-1307, USA.
 #include <windowsx.h>
 #include <commctrl.h>
 
+#define __NO_CMPLUGIN_NEEDED
+
 #include <newpluginapi.h>
 #include <m_skin.h>
 #include <m_protosvc.h>
diff --git a/plugins/NewAwaySysMod/src/stdafx.h b/plugins/NewAwaySysMod/src/stdafx.h
index 8596cf2377..c31cad6418 100644
--- a/plugins/NewAwaySysMod/src/stdafx.h
+++ b/plugins/NewAwaySysMod/src/stdafx.h
@@ -36,6 +36,8 @@
 #include <crtdbg.h>
 #include <stdarg.h>
 
+#define __NO_CMPLUGIN_NEEDED
+
 #include "newpluginapi.h"
 #include "m_clist.h"
 #include "m_system.h"
diff --git a/plugins/NewEventNotify/src/stdafx.h b/plugins/NewEventNotify/src/stdafx.h
index 4e18a9402a..3a9fe248b7 100644
--- a/plugins/NewEventNotify/src/stdafx.h
+++ b/plugins/NewEventNotify/src/stdafx.h
@@ -32,6 +32,8 @@
 #include <windows.h>
 #include <time.h>
 
+#define __NO_CMPLUGIN_NEEDED
+
 #include <win2k.h>
 #include <newpluginapi.h>
 #include <m_database.h>
diff --git a/plugins/NewXstatusNotify/src/stdafx.h b/plugins/NewXstatusNotify/src/stdafx.h
index 0e6e7906aa..98b7f13614 100644
--- a/plugins/NewXstatusNotify/src/stdafx.h
+++ b/plugins/NewXstatusNotify/src/stdafx.h
@@ -34,6 +34,8 @@
 #include <time.h>
 #include <malloc.h>
 
+#define __NO_CMPLUGIN_NEEDED
+
 #include <newpluginapi.h>
 #include <win2k.h>
 #include <m_button.h>
diff --git a/plugins/New_GPG/src/stdafx.h b/plugins/New_GPG/src/stdafx.h
index 1cd04dbabe..f66a3ef85f 100755
--- a/plugins/New_GPG/src/stdafx.h
+++ b/plugins/New_GPG/src/stdafx.h
@@ -55,6 +55,7 @@ using std::fstream;
 #include <utf8.h>
 
 //miranda
+#define __NO_CMPLUGIN_NEEDED
 #include <newpluginapi.h>
 #include <m_database.h>
 #include <m_options.h>
diff --git a/plugins/NewsAggregator/Src/stdafx.h b/plugins/NewsAggregator/Src/stdafx.h
index 834e47b174..0e9e76570b 100644
--- a/plugins/NewsAggregator/Src/stdafx.h
+++ b/plugins/NewsAggregator/Src/stdafx.h
@@ -30,6 +30,7 @@ Boston, MA 02111-1307, USA.
 #include <mshtml.h>
 
 // Miranda header files
+#define __NO_CMPLUGIN_NEEDED
 #include <newpluginapi.h>
 #include <m_clist.h>
 #include <m_langpack.h>
diff --git a/plugins/NoHistory/src/stdafx.h b/plugins/NoHistory/src/stdafx.h
index f53245336b..7ce31be872 100644
--- a/plugins/NoHistory/src/stdafx.h
+++ b/plugins/NoHistory/src/stdafx.h
@@ -4,6 +4,7 @@
 #include <windows.h>
 #include <commctrl.h>
 
+#define __NO_CMPLUGIN_NEEDED
 #include <win2k.h>
 #include <newpluginapi.h>
 #include <m_database.h>
diff --git a/plugins/Non-IM Contact/src/stdafx.h b/plugins/Non-IM Contact/src/stdafx.h
index 1497c970df..a1ca8f42ba 100644
--- a/plugins/Non-IM Contact/src/stdafx.h
+++ b/plugins/Non-IM Contact/src/stdafx.h
@@ -30,6 +30,7 @@ struct DLGTEMPLATEEX
     short cy;
 };
 
+#define __NO_CMPLUGIN_NEEDED
 #include <newpluginapi.h>
 #include <m_clistint.h>
 #include <m_skin.h>
diff --git a/plugins/NotesAndReminders/src/globals.h b/plugins/NotesAndReminders/src/globals.h
index 977a2c9c5e..c67ece2043 100644
--- a/plugins/NotesAndReminders/src/globals.h
+++ b/plugins/NotesAndReminders/src/globals.h
@@ -7,6 +7,7 @@
 #include <time.h>
 #include <richedit.h>
 
+#define __NO_CMPLUGIN_NEEDED
 #include <win2k.h>
 #include <newpluginapi.h>
 #include <m_database.h>
diff --git a/plugins/NotifyAnything/src/stdafx.h b/plugins/NotifyAnything/src/stdafx.h
index a2d50efc29..730eaecb78 100644
--- a/plugins/NotifyAnything/src/stdafx.h
+++ b/plugins/NotifyAnything/src/stdafx.h
@@ -11,6 +11,7 @@
 #include <set>
 #include <vector>
 
+#define __NO_CMPLUGIN_NEEDED
 #include "newpluginapi.h"
 #include "m_options.h"
 #include "m_skin.h"
diff --git a/plugins/Nudge/src/stdafx.h b/plugins/Nudge/src/stdafx.h
index 6133271f4f..a1acd929d2 100644
--- a/plugins/Nudge/src/stdafx.h
+++ b/plugins/Nudge/src/stdafx.h
@@ -9,6 +9,7 @@
 #include <commctrl.h>
 #include <time.h>
 
+#define __NO_CMPLUGIN_NEEDED
 #include <newpluginapi.h>
 #include <m_clistint.h>
 #include <m_langpack.h>	
diff --git a/plugins/OpenFolder/src/stdafx.h b/plugins/OpenFolder/src/stdafx.h
index 2020c78b28..ea39d7d6da 100644
--- a/plugins/OpenFolder/src/stdafx.h
+++ b/plugins/OpenFolder/src/stdafx.h
@@ -3,6 +3,7 @@
 #include <windows.h>
 #include <commctrl.h>
 
+#define __NO_CMPLUGIN_NEEDED
 #include <newpluginapi.h>
 #include <m_clist.h>
 #include <m_icolib.h>
diff --git a/plugins/OpenSSL/src/stdafx.h b/plugins/OpenSSL/src/stdafx.h
index ab21d17d87..bc90991127 100644
--- a/plugins/OpenSSL/src/stdafx.h
+++ b/plugins/OpenSSL/src/stdafx.h
@@ -35,6 +35,7 @@ typedef struct SslHandle *HSSL;
 #define DELAYIMP_INSECURE_WRITABLE_HOOKS
 #include <delayimp.h>
 
+#define __NO_CMPLUGIN_NEEDED
 #include <newpluginapi.h>
 #include <m_netlib.h>
 #include <m_langpack.h>
diff --git a/plugins/PackUpdater/Src/stdafx.h b/plugins/PackUpdater/Src/stdafx.h
index 5fa61acd12..3b86f1ee69 100644
--- a/plugins/PackUpdater/Src/stdafx.h
+++ b/plugins/PackUpdater/Src/stdafx.h
@@ -27,6 +27,7 @@ Boston, MA 02111-1307, USA.
 #include <Shlobj.h>
 
 // Miranda header files
+#define __NO_CMPLUGIN_NEEDED
 #include <win2k.h>
 #include <newpluginapi.h>
 #include <m_clist.h>
diff --git a/plugins/PasteIt/src/stdafx.h b/plugins/PasteIt/src/stdafx.h
index 466448a431..6b2d795b3a 100644
--- a/plugins/PasteIt/src/stdafx.h
+++ b/plugins/PasteIt/src/stdafx.h
@@ -18,6 +18,7 @@
 #include <map>
 #include <list>
 
+#define __NO_CMPLUGIN_NEEDED
 #include <newpluginapi.h>
 #include <m_clist.h>
 #include <m_langpack.h>
diff --git a/plugins/Ping/src/stdafx.h b/plugins/Ping/src/stdafx.h
index a358624c5d..14049e295f 100644
--- a/plugins/Ping/src/stdafx.h
+++ b/plugins/Ping/src/stdafx.h
@@ -12,6 +12,7 @@
 #include <Icmpapi.h>
 #include <list>
 
+#define __NO_CMPLUGIN_NEEDED
 #include <newpluginapi.h>
 #include <m_options.h>
 #include <m_langpack.h>
diff --git a/plugins/PluginUpdater/src/stdafx.h b/plugins/PluginUpdater/src/stdafx.h
index 6a3c73c00a..9de650f87a 100644
--- a/plugins/PluginUpdater/src/stdafx.h
+++ b/plugins/PluginUpdater/src/stdafx.h
@@ -28,6 +28,7 @@ Boston, MA 02111-1307, USA.
 #include <string.h>
 
 // Miranda header files
+#define __NO_CMPLUGIN_NEEDED
 #include <newpluginapi.h>
 #include <m_clist.h>
 #include <m_skin.h>
diff --git a/plugins/Popup/src/stdafx.h b/plugins/Popup/src/stdafx.h
index 225f39558c..0902fa6e77 100644
--- a/plugins/Popup/src/stdafx.h
+++ b/plugins/Popup/src/stdafx.h
@@ -60,6 +60,7 @@ https://miranda-ng.org/distr/
 #include <malloc.h>
 #include <Uxtheme.h>
 
+#define __NO_CMPLUGIN_NEEDED
 #include <newpluginapi.h>
 #include <win2k.h>
 #include <m_clistint.h>
diff --git a/plugins/ProfileManager/src/stdafx.h b/plugins/ProfileManager/src/stdafx.h
index 26b605671a..013c87b75b 100644
--- a/plugins/ProfileManager/src/stdafx.h
+++ b/plugins/ProfileManager/src/stdafx.h
@@ -2,6 +2,7 @@
 
 #include <windows.h>
 
+#define __NO_CMPLUGIN_NEEDED
 #include <newpluginapi.h>
 #include <m_langpack.h>
 #include <m_genmenu.h>
diff --git a/plugins/QuickContacts/src/stdafx.h b/plugins/QuickContacts/src/stdafx.h
index 71f2ce9a59..b349233266 100644
--- a/plugins/QuickContacts/src/stdafx.h
+++ b/plugins/QuickContacts/src/stdafx.h
@@ -25,6 +25,7 @@ Boston, MA 02111-1307, USA.
 #include <windows.h>
 #include <commctrl.h>
 
+#define __NO_CMPLUGIN_NEEDED
 #include <newpluginapi.h>
 #include <m_protosvc.h>
 #include <m_clist.h>
diff --git a/plugins/QuickMessages/src/stdafx.h b/plugins/QuickMessages/src/stdafx.h
index 20ea57ee12..4672bdb74c 100644
--- a/plugins/QuickMessages/src/stdafx.h
+++ b/plugins/QuickMessages/src/stdafx.h
@@ -25,6 +25,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <commctrl.h>
 #include <Richedit.h>
 
+#define __NO_CMPLUGIN_NEEDED
 #include <newpluginapi.h>
 #include <m_clist.h>
 #include <m_options.h>
diff --git a/plugins/QuickReplies/src/stdafx.h b/plugins/QuickReplies/src/stdafx.h
index 827974eb82..d4aadc189d 100644
--- a/plugins/QuickReplies/src/stdafx.h
+++ b/plugins/QuickReplies/src/stdafx.h
@@ -23,6 +23,7 @@ Boston, MA 02111-1307, USA.
 
 #include <windows.h>
 
+#define __NO_CMPLUGIN_NEEDED
 #include <newpluginapi.h>
 #include <m_utils.h>
 #include <m_string.h>
diff --git a/plugins/Quotes/src/stdafx.h b/plugins/Quotes/src/stdafx.h
index ea4fed341e..aa2794e886 100644
--- a/plugins/Quotes/src/stdafx.h
+++ b/plugins/Quotes/src/stdafx.h
@@ -15,6 +15,7 @@
 #include <fstream>
 #include <msapi/comptr.h>
 
+#define __NO_CMPLUGIN_NEEDED
 #include <newpluginapi.h>
 #include <m_database.h>
 #include <win2k.h>
diff --git a/plugins/Rate/src/stdafx.h b/plugins/Rate/src/stdafx.h
index e04a7de369..f8b23375a5 100644
--- a/plugins/Rate/src/stdafx.h
+++ b/plugins/Rate/src/stdafx.h
@@ -23,6 +23,7 @@
 
 #include <windows.h>
 
+#define __NO_CMPLUGIN_NEEDED
 #include <win2k.h>
 #include <newpluginapi.h>
 #include <m_database.h>
diff --git a/plugins/RecentContacts/src/stdafx.h b/plugins/RecentContacts/src/stdafx.h
index 6ec475cd3b..9e809a6b23 100644
--- a/plugins/RecentContacts/src/stdafx.h
+++ b/plugins/RecentContacts/src/stdafx.h
@@ -8,6 +8,7 @@
 #include <map>
 #include <time.h>
 
+#define __NO_CMPLUGIN_NEEDED
 #include <newpluginapi.h>
 #include <m_clistint.h>
 #include <m_chat_int.h>
diff --git a/plugins/RemovePersonalSettings/src/stdafx.h b/plugins/RemovePersonalSettings/src/stdafx.h
index f1e9407f35..c8a1eef175 100644
--- a/plugins/RemovePersonalSettings/src/stdafx.h
+++ b/plugins/RemovePersonalSettings/src/stdafx.h
@@ -22,6 +22,8 @@
 #include <windows.h>
 #include <io.h>
 #include <stdio.h>
+
+#define __NO_CMPLUGIN_NEEDED
 #include <newpluginapi.h>
 #include <m_clist.h>
 #include <m_skin.h>
diff --git a/plugins/Restart/src/stdafx.h b/plugins/Restart/src/stdafx.h
index 13536d7f07..90e05480bb 100644
--- a/plugins/Restart/src/stdafx.h
+++ b/plugins/Restart/src/stdafx.h
@@ -3,6 +3,7 @@
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 
+#define __NO_CMPLUGIN_NEEDED
 #include <newpluginapi.h>
 #include <m_langpack.h>
 #include <m_genmenu.h>
diff --git a/plugins/SMS/src/stdafx.h b/plugins/SMS/src/stdafx.h
index e0df80811f..e3747bae9b 100644
--- a/plugins/SMS/src/stdafx.h
+++ b/plugins/SMS/src/stdafx.h
@@ -9,6 +9,7 @@
 #include <malloc.h>
 #include <time.h>
 
+#define __NO_CMPLUGIN_NEEDED
 #include <newpluginapi.h>
 #include <m_database.h>
 #include <m_clistint.h>
diff --git a/plugins/Scriver/src/stdafx.h b/plugins/Scriver/src/stdafx.h
index 01372f3ecf..6a4765256a 100644
--- a/plugins/Scriver/src/stdafx.h
+++ b/plugins/Scriver/src/stdafx.h
@@ -40,6 +40,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <math.h>
 #include <time.h>
 
+#define __NO_CMPLUGIN_NEEDED
 #include <newpluginapi.h>
 #include <m_database.h>
 #include <m_langpack.h>
diff --git a/plugins/SecureIM/src/commonheaders.h b/plugins/SecureIM/src/commonheaders.h
index 4afa278eee..e345a3fa51 100644
--- a/plugins/SecureIM/src/commonheaders.h
+++ b/plugins/SecureIM/src/commonheaders.h
@@ -19,6 +19,7 @@
 #include <process.h>
 #include <time.h>
 
+#define __NO_CMPLUGIN_NEEDED
 #include <win2k.h>
 #include <newpluginapi.h>
 #include <m_database.h>
diff --git a/plugins/SeenPlugin/src/stdafx.h b/plugins/SeenPlugin/src/stdafx.h
index 258e4b17b4..f3affdc167 100644
--- a/plugins/SeenPlugin/src/stdafx.h
+++ b/plugins/SeenPlugin/src/stdafx.h
@@ -31,6 +31,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <malloc.h>
 #include <time.h>
 
+#define __NO_CMPLUGIN_NEEDED
 #include <win2k.h>
 #include <newpluginapi.h>
 #include <m_database.h>
diff --git a/plugins/SendScreenshotPlus/src/stdafx.h b/plugins/SendScreenshotPlus/src/stdafx.h
index 7a899f61b8..2187b01fa7 100644
--- a/plugins/SendScreenshotPlus/src/stdafx.h
+++ b/plugins/SendScreenshotPlus/src/stdafx.h
@@ -51,6 +51,8 @@ using namespace std;
 #include <win2k.h>
 #include <msapi/vsstyle.h>
 #include <msapi/vssym32.h>
+
+#define __NO_CMPLUGIN_NEEDED
 #include <newpluginapi.h>
 #include <m_button.h>
 #include <m_chat_int.h>
diff --git a/plugins/Sessions/Src/stdafx.h b/plugins/Sessions/Src/stdafx.h
index d691eea7af..1cd5cfcf87 100644
--- a/plugins/Sessions/Src/stdafx.h
+++ b/plugins/Sessions/Src/stdafx.h
@@ -26,6 +26,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <malloc.h>
 
+#define __NO_CMPLUGIN_NEEDED
 #include <newpluginapi.h>
 #include <m_options.h>
 #include <m_clc.h>
diff --git a/plugins/ShellExt/src/stdafx.h b/plugins/ShellExt/src/stdafx.h
index 6dcac8d40f..b01486b518 100644
--- a/plugins/ShellExt/src/stdafx.h
+++ b/plugins/ShellExt/src/stdafx.h
@@ -8,6 +8,7 @@
 #include <string.h>
 #include <stddef.h>
 
+#define __NO_CMPLUGIN_NEEDED
 #include <newpluginapi.h>
 
 #include <m_system.h>
diff --git a/plugins/SimpleAR/src/stdafx.h b/plugins/SimpleAR/src/stdafx.h
index ca81f59099..26d54bb57a 100644
--- a/plugins/SimpleAR/src/stdafx.h
+++ b/plugins/SimpleAR/src/stdafx.h
@@ -3,6 +3,7 @@
 #include <windows.h>
 #include <time.h>
 
+#define __NO_CMPLUGIN_NEEDED
 #include <newpluginapi.h>
 #include <m_clistint.h>
 #include <m_langpack.h>
diff --git a/plugins/SimpleStatusMsg/src/stdafx.h b/plugins/SimpleStatusMsg/src/stdafx.h
index 95870c622a..64928dfee7 100644
--- a/plugins/SimpleStatusMsg/src/stdafx.h
+++ b/plugins/SimpleStatusMsg/src/stdafx.h
@@ -24,6 +24,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include <windowsx.h>
 #include <time.h>
 
+#define __NO_CMPLUGIN_NEEDED
 #include <newpluginapi.h>
 #include <m_database.h>
 #include <m_clistint.h>
diff --git a/plugins/SkypeStatusChange/src/stdafx.h b/plugins/SkypeStatusChange/src/stdafx.h
index 07b99f2708..efe7b97572 100644
--- a/plugins/SkypeStatusChange/src/stdafx.h
+++ b/plugins/SkypeStatusChange/src/stdafx.h
@@ -5,6 +5,7 @@
 #include <assert.h>
 #include <commctrl.h>
 
+#define __NO_CMPLUGIN_NEEDED
 #include <newpluginapi.h>
 #include <m_database.h>
 #include <m_protocols.h>
diff --git a/plugins/SmileyAdd/src/stdafx.h b/plugins/SmileyAdd/src/stdafx.h
index db2cc70b63..22ac7afc7d 100644
--- a/plugins/SmileyAdd/src/stdafx.h
+++ b/plugins/SmileyAdd/src/stdafx.h
@@ -50,6 +50,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define NETLIB_NOLOGGING
 
+#define __NO_CMPLUGIN_NEEDED
 #include <win2k.h>
 #include <newpluginapi.h>
 #include <m_clist.h>
diff --git a/plugins/Spamotron/src/stdafx.h b/plugins/Spamotron/src/stdafx.h
index 04b7e98577..64f97f4c96 100644
--- a/plugins/Spamotron/src/stdafx.h
+++ b/plugins/Spamotron/src/stdafx.h
@@ -5,6 +5,7 @@
 #include <stdlib.h>
 #include <time.h>
 
+#define __NO_CMPLUGIN_NEEDED
 #include <newpluginapi.h>
 #include <m_database.h>
 #include <m_system.h>
diff --git a/plugins/SpellChecker/src/stdafx.h b/plugins/SpellChecker/src/stdafx.h
index 033c84e806..83ab91a8b5 100644
--- a/plugins/SpellChecker/src/stdafx.h
+++ b/plugins/SpellChecker/src/stdafx.h
@@ -34,6 +34,7 @@ Boston, MA 02111-1307, USA.
 #include <string>
 using namespace std;
 
+#define __NO_CMPLUGIN_NEEDED
 #include <newpluginapi.h>
 #include <m_protosvc.h>
 #include <m_langpack.h>
diff --git a/plugins/SplashScreen/src/stdafx.h b/plugins/SplashScreen/src/stdafx.h
index dd1217124b..5f8b8c8660 100644
--- a/plugins/SplashScreen/src/stdafx.h
+++ b/plugins/SplashScreen/src/stdafx.h
@@ -27,6 +27,7 @@
 #include <time.h>
 #include <dshow.h>
 
+#define __NO_CMPLUGIN_NEEDED
 #include <win2k.h>
 #include <newpluginapi.h>
 #include <m_database.h>
diff --git a/plugins/StartPosition/src/stdafx.h b/plugins/StartPosition/src/stdafx.h
index c6a7682aef..0ad957d508 100644
--- a/plugins/StartPosition/src/stdafx.h
+++ b/plugins/StartPosition/src/stdafx.h
@@ -24,6 +24,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 #include <windows.h>
 
+#define __NO_CMPLUGIN_NEEDED
 #include <newpluginapi.h>
 #include <m_gui.h>
 #include <m_langpack.h>
diff --git a/plugins/StartupSilence/src/stdafx.h b/plugins/StartupSilence/src/stdafx.h
index 0a6e0c0be4..50f6bf36f4 100644
--- a/plugins/StartupSilence/src/stdafx.h
+++ b/plugins/StartupSilence/src/stdafx.h
@@ -4,6 +4,7 @@
 #include <CommCtrl.h>
 #include <WinSock.h>
 
+#define __NO_CMPLUGIN_NEEDED
 #include <newpluginapi.h>
 #include <m_core.h>
 #include <m_clist.h>
diff --git a/plugins/StatusChange/src/stdafx.h b/plugins/StatusChange/src/stdafx.h
index b04c4b9d71..3ec8723cd2 100644
--- a/plugins/StatusChange/src/stdafx.h
+++ b/plugins/StatusChange/src/stdafx.h
@@ -5,6 +5,7 @@
 #include <windows.h>
 #include <commctrl.h>
 
+#define __NO_CMPLUGIN_NEEDED
 #include <newpluginapi.h>
 #include <m_database.h>
 #include <m_clist.h>
diff --git a/plugins/StatusManager/src/stdafx.h b/plugins/StatusManager/src/stdafx.h
index 3753016404..9463297a5d 100644
--- a/plugins/StatusManager/src/stdafx.h
+++ b/plugins/StatusManager/src/stdafx.h
@@ -9,6 +9,7 @@
 #include <icmpapi.h>
 #include <commctrl.h>
 
+#define __NO_CMPLUGIN_NEEDED
 #include <newpluginapi.h>
 
 #include <m_core.h>
diff --git a/plugins/StopSpamMod/src/stdafx.h b/plugins/StopSpamMod/src/stdafx.h
index 8a827674d3..c10b806397 100755
--- a/plugins/StopSpamMod/src/stdafx.h
+++ b/plugins/StopSpamMod/src/stdafx.h
@@ -6,7 +6,7 @@ using namespace std;
 #include <fstream>
 #include <string>
 
-
+#define __NO_CMPLUGIN_NEEDED
 #include <newpluginapi.h>
 #include <m_database.h>
 #include <m_protosvc.h>
diff --git a/plugins/StopSpamPlus/src/stdafx.h b/plugins/StopSpamPlus/src/stdafx.h
index c57bd19005..e391c7780f 100644
--- a/plugins/StopSpamPlus/src/stdafx.h
+++ b/plugins/StopSpamPlus/src/stdafx.h
@@ -9,6 +9,7 @@
 #include <sstream>
 #include <list>
 
+#define __NO_CMPLUGIN_NEEDED
 #include <newpluginapi.h>
 #include <m_database.h>
 #include <m_protosvc.h>
diff --git a/plugins/TabSRMM/src/stdafx.h b/plugins/TabSRMM/src/stdafx.h
index 2e28832839..f0a4e8ae34 100644
--- a/plugins/TabSRMM/src/stdafx.h
+++ b/plugins/TabSRMM/src/stdafx.h
@@ -49,6 +49,7 @@
 #include <msapi/vsstyle.h>
 #include <msapi/comptr.h>
 
+#define __NO_CMPLUGIN_NEEDED
 #include <m_avatars.h>
 #include <m_message.h>
 #include <win2k.h>
diff --git a/plugins/TipperYM/src/stdafx.h b/plugins/TipperYM/src/stdafx.h
index 9812583b3f..fe059869bb 100644
--- a/plugins/TipperYM/src/stdafx.h
+++ b/plugins/TipperYM/src/stdafx.h
@@ -28,6 +28,7 @@ Boston, MA 02111-1307, USA.
 #include <windowsx.h>
 #include <malloc.h>
 
+#define __NO_CMPLUGIN_NEEDED
 #include <win2k.h>
 #include <newpluginapi.h>
 #include <m_avatars.h>
diff --git a/plugins/Toaster/src/stdafx.h b/plugins/Toaster/src/stdafx.h
index 06f2ee3bef..925a04f86d 100644
--- a/plugins/Toaster/src/stdafx.h
+++ b/plugins/Toaster/src/stdafx.h
@@ -9,6 +9,8 @@
 #include <propvarutil.h>
 #include <memory>
 #include <map>
+
+#define __NO_CMPLUGIN_NEEDED
 #include <newpluginapi.h>
 #include <m_system_cpp.h>
 #include <m_langpack.h>
diff --git a/plugins/TooltipNotify/src/stdafx.h b/plugins/TooltipNotify/src/stdafx.h
index 20c79aa8f1..d8b6960fde 100644
--- a/plugins/TooltipNotify/src/stdafx.h
+++ b/plugins/TooltipNotify/src/stdafx.h
@@ -13,6 +13,7 @@
 #include <algorithm>
 #include <vector>
 
+#define __NO_CMPLUGIN_NEEDED
 #include <newpluginapi.h>
 #include <m_clistint.h>
 #include <m_skin.h>
diff --git a/plugins/TopToolBar/src/stdafx.h b/plugins/TopToolBar/src/stdafx.h
index 6c3d1a676b..06f934ee19 100644
--- a/plugins/TopToolBar/src/stdafx.h
+++ b/plugins/TopToolBar/src/stdafx.h
@@ -6,6 +6,7 @@
 #include <commctrl.h>
 #include <stddef.h>
 
+#define __NO_CMPLUGIN_NEEDED
 #include <win2k.h>
 #include <newpluginapi.h>
 #include <m_database.h>
diff --git a/plugins/TrafficCounter/src/stdafx.h b/plugins/TrafficCounter/src/stdafx.h
index edd4494e3a..728a2a7ecc 100644
--- a/plugins/TrafficCounter/src/stdafx.h
+++ b/plugins/TrafficCounter/src/stdafx.h
@@ -27,6 +27,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <win2k.h>
 #include <m_system.h>
 
+#define __NO_CMPLUGIN_NEEDED
 #include <newpluginapi.h>
 #include <m_netlib.h>
 #include <m_langpack.h>
diff --git a/plugins/TranslitSwitcher/src/stdafx.h b/plugins/TranslitSwitcher/src/stdafx.h
index fd6e7cd3c7..6939fee8c6 100644
--- a/plugins/TranslitSwitcher/src/stdafx.h
+++ b/plugins/TranslitSwitcher/src/stdafx.h
@@ -23,6 +23,7 @@ Boston, MA 02111-1307, USA.
 #include <windows.h>
 #include <commctrl.h>
 
+#define __NO_CMPLUGIN_NEEDED
 #include <newpluginapi.h>
 #include <m_langpack.h>
 #include <m_utils.h>
diff --git a/plugins/UserGuide/src/stdafx.h b/plugins/UserGuide/src/stdafx.h
index cef468c456..95ba80f95a 100644
--- a/plugins/UserGuide/src/stdafx.h
+++ b/plugins/UserGuide/src/stdafx.h
@@ -2,6 +2,7 @@
 
 #include <windows.h>
 
+#define __NO_CMPLUGIN_NEEDED
 #include <newpluginapi.h>
 #include <m_database.h>
 #include <m_langpack.h>
diff --git a/plugins/UserInfoEx/src/stdafx.h b/plugins/UserInfoEx/src/stdafx.h
index b9b3a02457..c34ad85bde 100644
--- a/plugins/UserInfoEx/src/stdafx.h
+++ b/plugins/UserInfoEx/src/stdafx.h
@@ -48,6 +48,7 @@ using namespace std;
  * Miranda NG SDK includes and macros
  ***********************************************************************************************************/
 
+#define __NO_CMPLUGIN_NEEDED
 #include <newpluginapi.h>
 #include <m_button.h>
 #include <m_clistint.h>
diff --git a/plugins/Variables/src/stdafx.h b/plugins/Variables/src/stdafx.h
index bcedfe8a8e..63f5205a01 100644
--- a/plugins/Variables/src/stdafx.h
+++ b/plugins/Variables/src/stdafx.h
@@ -32,6 +32,7 @@
 #include <pdh.h>
 #include <pdhmsg.h>
 
+#define __NO_CMPLUGIN_NEEDED
 #include <win2k.h>
 #include <newpluginapi.h>
 #include <m_langpack.h>
diff --git a/plugins/Watrack_MPD/src/stdafx.h b/plugins/Watrack_MPD/src/stdafx.h
index c9a6a3f014..2b17d1d703 100755
--- a/plugins/Watrack_MPD/src/stdafx.h
+++ b/plugins/Watrack_MPD/src/stdafx.h
@@ -18,6 +18,7 @@
 
 #include <windows.h>
 
+#define __NO_CMPLUGIN_NEEDED
 #include <newpluginapi.h>
 #include <m_database.h>
 #include <m_netlib.h>
diff --git a/plugins/WebView/src/stdafx.h b/plugins/WebView/src/stdafx.h
index 3ce8c77b06..b214d3d6ea 100644
--- a/plugins/WebView/src/stdafx.h
+++ b/plugins/WebView/src/stdafx.h
@@ -14,6 +14,7 @@
 #include <time.h>
 #include <wchar.h>
 
+#define __NO_CMPLUGIN_NEEDED
 #include <newpluginapi.h>
 #include <m_system.h>
 #include <m_clist.h>
diff --git a/plugins/WhenWasIt/src/stdafx.h b/plugins/WhenWasIt/src/stdafx.h
index 5f5ce88dda..a562fb8890 100644
--- a/plugins/WhenWasIt/src/stdafx.h
+++ b/plugins/WhenWasIt/src/stdafx.h
@@ -29,6 +29,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <math.h>
 #include <commctrl.h>
 
+#define __NO_CMPLUGIN_NEEDED
 #include <newpluginapi.h>
 #include <m_database.h>
 #include <m_skin.h>
diff --git a/plugins/WhoUsesMyFiles/src/stdafx.h b/plugins/WhoUsesMyFiles/src/stdafx.h
index a653df93c0..4b93df658f 100644
--- a/plugins/WhoUsesMyFiles/src/stdafx.h
+++ b/plugins/WhoUsesMyFiles/src/stdafx.h
@@ -6,6 +6,7 @@
 #include <locale.h>
 #include <shlobj.h>
 
+#define __NO_CMPLUGIN_NEEDED
 #include <newpluginapi.h>
 #include <m_options.h>
 #include <m_langpack.h>
diff --git a/plugins/WinterSpeak/src/stdafx.h b/plugins/WinterSpeak/src/stdafx.h
index 5d1a2374e6..79c4a9a1da 100644
--- a/plugins/WinterSpeak/src/stdafx.h
+++ b/plugins/WinterSpeak/src/stdafx.h
@@ -8,6 +8,7 @@
 
 #include <memory>
 
+#define __NO_CMPLUGIN_NEEDED
 #include <newpluginapi.h>
 #include <m_langpack.h>
 #include <m_database.h>
diff --git a/plugins/XSoundNotify/src/stdafx.h b/plugins/XSoundNotify/src/stdafx.h
index 04ae7ee456..ea8008c8c6 100644
--- a/plugins/XSoundNotify/src/stdafx.h
+++ b/plugins/XSoundNotify/src/stdafx.h
@@ -3,6 +3,7 @@
 #include <windows.h>
 #include <Shlwapi.h>
 
+#define __NO_CMPLUGIN_NEEDED
 #include <newpluginapi.h>
 #include <m_system.h>
 #include <m_database.h>
diff --git a/plugins/YAPP/src/stdafx.h b/plugins/YAPP/src/stdafx.h
index 037ca3fb02..7309ef7413 100644
--- a/plugins/YAPP/src/stdafx.h
+++ b/plugins/YAPP/src/stdafx.h
@@ -13,6 +13,7 @@
 #include <time.h>
 #include <malloc.h>
 
+#define __NO_CMPLUGIN_NEEDED
 #include <newpluginapi.h>
 #include <m_utils.h>
 #include <m_langpack.h>
diff --git a/plugins/YARelay/src/stdafx.h b/plugins/YARelay/src/stdafx.h
index 828b190b39..a185b39742 100644
--- a/plugins/YARelay/src/stdafx.h
+++ b/plugins/YARelay/src/stdafx.h
@@ -23,6 +23,7 @@ Features:
 #include <time.h>
 #include <malloc.h>
 
+#define __NO_CMPLUGIN_NEEDED
 #include <newpluginapi.h>
 #include <m_clist.h>
 #include <m_database.h>
diff --git a/plugins/ZeroNotification/src/stdafx.h b/plugins/ZeroNotification/src/stdafx.h
index 245923a2aa..fa2de8828f 100644
--- a/plugins/ZeroNotification/src/stdafx.h
+++ b/plugins/ZeroNotification/src/stdafx.h
@@ -3,6 +3,7 @@
 #include <windows.h>
 #include <commctrl.h>
 
+#define __NO_CMPLUGIN_NEEDED
 #include <newpluginapi.h>
 #include <m_options.h>
 #include <m_database.h>
diff --git a/plugins/ZeroSwitch/src/stdafx.h b/plugins/ZeroSwitch/src/stdafx.h
index ac729e6640..8b91cd0a06 100644
--- a/plugins/ZeroSwitch/src/stdafx.h
+++ b/plugins/ZeroSwitch/src/stdafx.h
@@ -9,6 +9,7 @@
 // Windows Header Files:
 #include <windows.h>
 
+#define __NO_CMPLUGIN_NEEDED
 #include <newpluginapi.h>
 #include <m_clistint.h>
 #include <m_skin.h>
diff --git a/plugins/helpers/commonheaders.h b/plugins/helpers/commonheaders.h
index b523e0bdd1..f3922da535 100644
--- a/plugins/helpers/commonheaders.h
+++ b/plugins/helpers/commonheaders.h
@@ -35,7 +35,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <windows.h>
 #include <commctrl.h>
 #include <stdio.h>
-//#include <win2k.h>
+
+#define __NO_CMPLUGIN_NEEDED
 #include <newpluginapi.h>
 #include <m_system.h>
 #include <m_database.h>
diff --git a/plugins/mTextControl/src/stdafx.h b/plugins/mTextControl/src/stdafx.h
index 3840d89738..1adfef31b6 100644
--- a/plugins/mTextControl/src/stdafx.h
+++ b/plugins/mTextControl/src/stdafx.h
@@ -30,6 +30,8 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #include <tom.h>
 #include <textserv.h>
 
+#define __NO_CMPLUGIN_NEEDED
+
 #include <newpluginapi.h>
 #include <m_database.h>
 #include <m_langpack.h>
diff --git a/plugins/wbOSD/src/stdafx.h b/plugins/wbOSD/src/stdafx.h
index a07c40a770..6d13b4fb9b 100644
--- a/plugins/wbOSD/src/stdafx.h
+++ b/plugins/wbOSD/src/stdafx.h
@@ -13,6 +13,7 @@ Distributed under GNU's GPL 2 or later
 #include <shlwapi.h>
 #include <commctrl.h>
 
+#define __NO_CMPLUGIN_NEEDED
 #include <newpluginapi.h>
 #include <m_langpack.h>
 #include <m_database.h>
diff --git a/protocols/ICQCorp/src/stdafx.h b/protocols/ICQCorp/src/stdafx.h
index 747f1805bf..55864cf479 100644
--- a/protocols/ICQCorp/src/stdafx.h
+++ b/protocols/ICQCorp/src/stdafx.h
@@ -27,6 +27,7 @@
 #include <vector>
 #include <time.h>
 
+#define __NO_CMPLUGIN_NEEDED
 #include <newpluginapi.h>
 #include <m_system.h>
 #include <m_protosvc.h>
diff --git a/src/core/stdautoaway/src/stdafx.h b/src/core/stdautoaway/src/stdafx.h
index da5fa9a4da..2f94563910 100644
--- a/src/core/stdautoaway/src/stdafx.h
+++ b/src/core/stdautoaway/src/stdafx.h
@@ -40,6 +40,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <direct.h>
 #include <malloc.h>
 
+#define __NO_CMPLUGIN_NEEDED
 #include <win2k.h>
 
 #include <m_system.h>
diff --git a/src/core/stdaway/src/stdafx.h b/src/core/stdaway/src/stdafx.h
index 54b57da457..44a47b363a 100644
--- a/src/core/stdaway/src/stdafx.h
+++ b/src/core/stdaway/src/stdafx.h
@@ -40,6 +40,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <direct.h>
 #include <malloc.h>
 
+#define __NO_CMPLUGIN_NEEDED
 #include <win2k.h>
 
 #include <m_system.h>
diff --git a/src/core/stdclist/src/stdafx.h b/src/core/stdclist/src/stdafx.h
index 142f20a451..60e58f22e8 100644
--- a/src/core/stdclist/src/stdafx.h
+++ b/src/core/stdclist/src/stdafx.h
@@ -37,6 +37,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <Uxtheme.h>
 #include <shlwapi.h>
 
+#define __NO_CMPLUGIN_NEEDED
 #include <win2k.h>
 #include <newpluginapi.h>
 #include <m_clistint.h>
diff --git a/src/core/stdcrypt/src/stdafx.h b/src/core/stdcrypt/src/stdafx.h
index 698d769a89..2bc0d66d3e 100644
--- a/src/core/stdcrypt/src/stdafx.h
+++ b/src/core/stdcrypt/src/stdafx.h
@@ -40,6 +40,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <direct.h>
 #include <malloc.h>
 
+#define __NO_CMPLUGIN_NEEDED
 #include <win2k.h>
 
 #include <m_system.h>
diff --git a/src/core/stdemail/src/stdafx.h b/src/core/stdemail/src/stdafx.h
index dc1c4cebfd..f9505f25a8 100644
--- a/src/core/stdemail/src/stdafx.h
+++ b/src/core/stdemail/src/stdafx.h
@@ -40,6 +40,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <direct.h>
 #include <malloc.h>
 
+#define __NO_CMPLUGIN_NEEDED
 #include <win2k.h>
 
 #include <m_system.h>
diff --git a/src/core/stdfile/src/stdafx.h b/src/core/stdfile/src/stdafx.h
index 037823ab45..eba834de22 100644
--- a/src/core/stdfile/src/stdafx.h
+++ b/src/core/stdfile/src/stdafx.h
@@ -43,6 +43,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <sys/types.h>
 #include <sys/stat.h>
 
+#define __NO_CMPLUGIN_NEEDED
 #include <win2k.h>
 
 #include <newpluginapi.h>
diff --git a/src/core/stdidle/src/stdafx.h b/src/core/stdidle/src/stdafx.h
index 8cf7e23374..594499c890 100644
--- a/src/core/stdidle/src/stdafx.h
+++ b/src/core/stdidle/src/stdafx.h
@@ -40,6 +40,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <direct.h>
 #include <malloc.h>
 
+#define __NO_CMPLUGIN_NEEDED
 #include <win2k.h>
 
 #include <m_system.h>
diff --git a/src/core/stdmsg/src/stdafx.h b/src/core/stdmsg/src/stdafx.h
index 7d19e3b7a9..e477a56005 100644
--- a/src/core/stdmsg/src/stdafx.h
+++ b/src/core/stdmsg/src/stdafx.h
@@ -40,6 +40,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "resource.h"
 
+#define __NO_CMPLUGIN_NEEDED
 #include <win2k.h>
 
 #include <newpluginapi.h>
diff --git a/src/core/stdssl/src/stdafx.h b/src/core/stdssl/src/stdafx.h
index 93cb948195..ae3bbd4f13 100644
--- a/src/core/stdssl/src/stdafx.h
+++ b/src/core/stdssl/src/stdafx.h
@@ -31,6 +31,8 @@ typedef struct SslHandle *HSSL;
 #include <schannel.h>
 
 #include <malloc.h>
+
+#define __NO_CMPLUGIN_NEEDED
 #include <newpluginapi.h>
 #include <m_langpack.h>
 #include <m_netlib.h>
diff --git a/src/core/stduihist/src/stdafx.h b/src/core/stduihist/src/stdafx.h
index 3649a843fc..7251d4ab74 100644
--- a/src/core/stduihist/src/stdafx.h
+++ b/src/core/stduihist/src/stdafx.h
@@ -40,6 +40,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <direct.h>
 #include <malloc.h>
 
+#define __NO_CMPLUGIN_NEEDED
 #include <win2k.h>
 
 #include <m_system.h>
diff --git a/src/core/stduserinfo/src/stdafx.h b/src/core/stduserinfo/src/stdafx.h
index 5e4f607a0b..f91ec2e15f 100644
--- a/src/core/stduserinfo/src/stdafx.h
+++ b/src/core/stduserinfo/src/stdafx.h
@@ -41,6 +41,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <direct.h>
 #include <malloc.h>
 
+#define __NO_CMPLUGIN_NEEDED
 #include <win2k.h>
 
 #include <m_system.h>
diff --git a/src/core/stduseronline/src/stdafx.h b/src/core/stduseronline/src/stdafx.h
index ce3622103e..c29da6dc6f 100644
--- a/src/core/stduseronline/src/stdafx.h
+++ b/src/core/stduseronline/src/stdafx.h
@@ -40,6 +40,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <direct.h>
 #include <malloc.h>
 
+#define __NO_CMPLUGIN_NEEDED
 #include <win2k.h>
 
 #include <m_system.h>
diff --git a/src/mir_app/src/stdafx.h b/src/mir_app/src/stdafx.h
index edc880de52..4919eefd98 100644
--- a/src/mir_app/src/stdafx.h
+++ b/src/mir_app/src/stdafx.h
@@ -57,6 +57,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <locale.h>
 #include <direct.h>
 
+#define __NO_CMPLUGIN_NEEDED
 #include <win2k.h>
 
 #include <m_system.h>
diff --git a/src/mir_core/src/stdafx.h b/src/mir_core/src/stdafx.h
index 40e75635d6..dcf55d1eaa 100644
--- a/src/mir_core/src/stdafx.h
+++ b/src/mir_core/src/stdafx.h
@@ -48,6 +48,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <locale.h>
 #include <direct.h>
 
+#define __NO_CMPLUGIN_NEEDED
 #include <win2k.h>
 
 #include <m_system.h>
diff --git a/utils/mir_options.cpp b/utils/mir_options.cpp
index c027b4e7e1..165edbc0b7 100644
--- a/utils/mir_options.cpp
+++ b/utils/mir_options.cpp
@@ -21,6 +21,7 @@ Boston, MA 02111-1307, USA.
 #include <commctrl.h>
 #include <stdio.h>
 
+#define __NO_CMPLUGIN_NEEDED
 #include <newpluginapi.h>
 #include <m_database.h>
 #include <m_utils.h>
diff --git a/utils/mir_smileys.cpp b/utils/mir_smileys.cpp
index 9758cd5065..aea8de3a74 100644
--- a/utils/mir_smileys.cpp
+++ b/utils/mir_smileys.cpp
@@ -17,10 +17,13 @@ not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.
 */
 
+#define __NO_CMPLUGIN_NEEDED
+
 #include "mir_smileys.h"
 #include "utf8_helpers.h"
 
 #include <richedit.h>
+
 #include <m_smileyadd.h>
 #include <newpluginapi.h>
 #include <m_langpack.h>