55 files changed, 62 insertions, 76 deletions
diff --git a/include/m_system.h b/include/m_system.h
index e1ffabc7df..012f36a99a 100644
--- a/include/m_system.h
+++ b/include/m_system.h
@@ -163,4 +163,8 @@ typedef struct
 
 #define ME_SYSTEM_MISSINGSERVICE "System/MissingService"
 
+#if defined(__cplusplus)
+	#include <m_system_cpp.h>
+#endif
+
 #endif // M_SYSTEM_H
diff --git a/include/m_system_cpp.h b/include/m_system_cpp.h
index ed4709e6d2..e051fdcadd 100644
--- a/include/m_system_cpp.h
+++ b/include/m_system_cpp.h
@@ -26,7 +26,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include <stdlib.h>
 
-#include "m_system.h"
+#ifndef M_SYSTEM_H__
+	#include "m_system.h"
+#endif
 
 #if defined(__cplusplus)
 
@@ -40,10 +42,10 @@ protected:
 
 public:
 	__inline explicit mir_ptr() : data(NULL) {}
-	__inline explicit mir_ptr(T* _p) : data(_p) {}
+	__inline explicit mir_ptr(T *_p) : data(_p) {}
 	__inline ~mir_ptr() { mir_free(data); }
 	__inline T* get() const { return data; }
-	__inline T* operator = (T* _p) { if (data) mir_free(data); data = _p; return data; }
+	__inline T* operator = (T *_p) { if (data) mir_free(data); data = _p; return data; }
 	__inline T* operator->() const { return data; }
 	__inline operator T*() const { return data; }
 	__inline operator INT_PTR() const { return (INT_PTR)data; }
@@ -72,11 +74,11 @@ public:
 
 class mir_cslock
 {
-	CRITICAL_SECTION& cs;
+	CRITICAL_SECTION &cs;
 	__inline mir_cslock& operator = (const mir_cslock&) { return *this; }
 
 public:
-	__inline mir_cslock(CRITICAL_SECTION& _cs) : cs(_cs) { ::EnterCriticalSection(&cs); }
+	__inline mir_cslock(CRITICAL_SECTION &_cs) : cs(_cs) { ::EnterCriticalSection(&cs); }
 	__inline ~mir_cslock() { ::LeaveCriticalSection(&cs); }
 };
 
@@ -87,7 +89,7 @@ class pass_ptrA : public mir_ptr<char>
 {
 public:
 	__inline explicit pass_ptrA() : mir_ptr(){}
-	__inline explicit pass_ptrA(char* _p) : mir_ptr(_p) {}
+	__inline explicit pass_ptrA(char *_p) : mir_ptr(_p) {}
 	__inline ~pass_ptrA() { zero(); }
 	__inline char* operator = (char *_p){ zero(); return mir_ptr::operator=(_p); }
 	__inline void zero() 
@@ -100,7 +102,7 @@ class pass_ptrW : public mir_ptr<wchar_t>
 {
 public:
 	__inline explicit pass_ptrW() : mir_ptr(){}
-	__inline explicit pass_ptrW(wchar_t* _p) : mir_ptr(_p) {}
+	__inline explicit pass_ptrW(wchar_t *_p) : mir_ptr(_p) {}
 	__inline ~pass_ptrW() { zero(); }
 	__inline wchar_t* operator = (wchar_t *_p){ zero(); return mir_ptr::operator=(_p); }
 	__inline void zero() 
@@ -116,7 +118,7 @@ typedef pass_ptrW pass_ptrT;
 
 class mir_cslockfull
 {
-	CRITICAL_SECTION& cs;
+	CRITICAL_SECTION &cs;
 	bool bIsLocked;
 	__inline mir_cslockfull& operator = (const mir_cslockfull&) { return *this; }
 
@@ -124,7 +126,7 @@ public:
 	__inline void lock() { bIsLocked = true; EnterCriticalSection(&cs); }
 	__inline void unlock() { bIsLocked = false; LeaveCriticalSection(&cs); }
 
-	__inline mir_cslockfull(CRITICAL_SECTION& _cs) : cs(_cs) { lock(); }
+	__inline mir_cslockfull(CRITICAL_SECTION &_cs) : cs(_cs) { lock(); }
 	__inline ~mir_cslockfull() { if (bIsLocked) unlock(); }
 };
 
@@ -291,6 +293,32 @@ public:
 	#endif
 };
 
+///////////////////////////////////////////////////////////////////////////////
+// basic class for classes that should be cleared inside new()
+
+class MIR_CORE_EXPORT MBinBuffer
+{
+	char *m_buf;
+	size_t m_len;
+
+public:
+	MBinBuffer();
+	~MBinBuffer();
+
+	__forceinline char*  data() const { return m_buf; }
+	__forceinline bool   isEmpty() const { return m_len == 0; }
+	__forceinline size_t length() const { return m_len; }
+
+	// adds a buffer to the end
+	void append(void *pBuf, size_t bufLen);
+
+	// adds a buffer to the beginning
+	void appendBefore(void *pBuf, size_t bufLen);
+
+	// drops a part of buffer
+	void remove(size_t sz);
+};
+
 #endif
 
 #endif // M_SYSTEM_CPP_H
diff --git a/libs/libjson/src/stdafx.h b/libs/libjson/src/stdafx.h
index 76a10b9f42..2c015eb916 100644
--- a/libs/libjson/src/stdafx.h
+++ b/libs/libjson/src/stdafx.h
@@ -35,7 +35,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <direct.h>
 
 #include <m_system.h>
-#include <m_system_cpp.h>
 
 #include <m_string.h>
 #include <m_json.h>
diff --git a/plugins/Boltun/src/stdafx.h b/plugins/Boltun/src/stdafx.h
index a4a084bdf2..113bb4dc88 100644
--- a/plugins/Boltun/src/stdafx.h
+++ b/plugins/Boltun/src/stdafx.h
@@ -32,7 +32,7 @@
 
 #include <newpluginapi.h>
 #include <m_clist.h>
-#include <m_system_cpp.h>
+#include <m_system.h>
 #include <m_database.h>
 #include <m_genmenu.h>
 #include <m_options.h>
diff --git a/plugins/CSList/src/stdafx.h b/plugins/CSList/src/stdafx.h
index 7e80f4519f..e76d3aa296 100644
--- a/plugins/CSList/src/stdafx.h
+++ b/plugins/CSList/src/stdafx.h
@@ -37,7 +37,7 @@
 
 #include <newpluginapi.h>
 #include <m_database.h>
-#include <m_system_cpp.h>
+#include <m_system.h>
 #include <m_langpack.h>
 #include <m_clist.h>
 #include <m_icolib.h>
diff --git a/plugins/Clist_modern/src/stdafx.h b/plugins/Clist_modern/src/stdafx.h
index 764faa9e93..22c91a7c04 100644
--- a/plugins/Clist_modern/src/stdafx.h
+++ b/plugins/Clist_modern/src/stdafx.h
@@ -73,7 +73,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <stdio.h>
 
 #include <newpluginapi.h>
-#include <m_system_cpp.h>
+#include <m_system.h>
 #include <win2k.h>
 #include <m_database.h>
 #include <m_langpack.h>
diff --git a/plugins/Clist_nicer/src/stdafx.h b/plugins/Clist_nicer/src/stdafx.h
index 7a2612ea9f..38eda9fd98 100644
--- a/plugins/Clist_nicer/src/stdafx.h
+++ b/plugins/Clist_nicer/src/stdafx.h
@@ -40,7 +40,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <win2k.h>
 #include <m_clist.h>
 #include <m_database.h>
-#include <m_system_cpp.h>
+#include <m_system.h>
 #include <m_langpack.h>
 #include <m_avatars.h>
 #include <m_button.h>
diff --git a/plugins/Db3x_mmap/src/stdafx.h b/plugins/Db3x_mmap/src/stdafx.h
index 8985114f7d..4291b361b8 100644
--- a/plugins/Db3x_mmap/src/stdafx.h
+++ b/plugins/Db3x_mmap/src/stdafx.h
@@ -30,7 +30,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include <newpluginapi.h>
 #include <win2k.h>
-#include <m_system_cpp.h>
+#include <m_system.h>
 #include <m_database.h>
 #include <m_langpack.h>
 #include <m_clist.h>
diff --git a/plugins/Exchange/src/stdafx.h b/plugins/Exchange/src/stdafx.h
index 3fe791c0a1..bccf7e2c22 100644
--- a/plugins/Exchange/src/stdafx.h
+++ b/plugins/Exchange/src/stdafx.h
@@ -36,7 +36,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <m_popup.h>
 #include <m_utils.h>
 #include <m_system.h>
-#include <m_system_cpp.h>
 #include <m_options.h>
 #include <m_clist.h>
 #include <m_langpack.h>
diff --git a/plugins/FavContacts/src/stdafx.h b/plugins/FavContacts/src/stdafx.h
index 59ae32bd60..8c123f1131 100644
--- a/plugins/FavContacts/src/stdafx.h
+++ b/plugins/FavContacts/src/stdafx.h
@@ -29,7 +29,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include <win2k.h>
 #include <newpluginapi.h>
-#include <m_system_cpp.h>
+#include <m_system.h>
 #include <m_database.h>
 #include <m_db_int.h>
 #include <m_langpack.h>
diff --git a/plugins/FloatingContacts/src/stdafx.h b/plugins/FloatingContacts/src/stdafx.h
index fb438647d6..1d6069ec3e 100644
--- a/plugins/FloatingContacts/src/stdafx.h
+++ b/plugins/FloatingContacts/src/stdafx.h
@@ -9,7 +9,7 @@
 #include <CommCtrl.h>
 
 #include <newpluginapi.h>
-#include <m_system_cpp.h>
+#include <m_system.h>
 #include <m_skin.h>
 #include <m_file.h>
 #include <m_fontservice.h>
diff --git a/plugins/Folders/src/stdafx.h b/plugins/Folders/src/stdafx.h
index 148720d01d..a1cab2d14b 100644
--- a/plugins/Folders/src/stdafx.h
+++ b/plugins/Folders/src/stdafx.h
@@ -32,7 +32,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include <newpluginapi.h>
 #include <m_database.h>
-#include <m_system_cpp.h>
+#include <m_system.h>
 #include <m_options.h>
 #include <m_string.h>
 #include <m_langpack.h>
diff --git a/plugins/HistoryStats/src/stdafx.h b/plugins/HistoryStats/src/stdafx.h
index d4fcfc6f6b..d0b4aee7ce 100644
--- a/plugins/HistoryStats/src/stdafx.h
+++ b/plugins/HistoryStats/src/stdafx.h
@@ -58,7 +58,6 @@
 #include <m_protosvc.h>
 #include <m_skin.h>
 #include <m_system.h>
-#include <m_system_cpp.h>  // not used
 #include <m_url.h>         // not used
 #include <m_userinfo.h>    // not used
 #include <m_utils.h>
diff --git a/plugins/Import/src/stdafx.h b/plugins/Import/src/stdafx.h
index e29af64334..02ec53a34d 100644
--- a/plugins/Import/src/stdafx.h
+++ b/plugins/Import/src/stdafx.h
@@ -31,7 +31,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <win2k.h>
 #include <newpluginapi.h>
 #include <m_langpack.h>
-#include <m_system_cpp.h>
+#include <m_system.h>
 #include <m_database.h>
 #include <m_protosvc.h>
 #include <m_icolib.h>
diff --git a/plugins/MenuItemEx/src/stdafx.h b/plugins/MenuItemEx/src/stdafx.h
index 4d4135b587..daeb667f8a 100644
--- a/plugins/MenuItemEx/src/stdafx.h
+++ b/plugins/MenuItemEx/src/stdafx.h
@@ -7,7 +7,7 @@
 
 #include <newpluginapi.h>
 #include <win2k.h>
-#include <m_system_cpp.h>
+#include <m_system.h>
 #include <m_options.h>
 #include <m_database.h>
 #include <m_protosvc.h>
diff --git a/plugins/MimCmd/src/stdafx.h b/plugins/MimCmd/src/stdafx.h
index 73c8e327f0..e56c664f1d 100644
--- a/plugins/MimCmd/src/stdafx.h
+++ b/plugins/MimCmd/src/stdafx.h
@@ -30,7 +30,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <newpluginapi.h>
 #include <m_langpack.h>
 #include <m_system.h>
-#include <m_system_cpp.h>
 #include <m_string.h>
 
 #include "../CmdLine/src/mimcmd_ipc.h"
diff --git a/plugins/MirLua/Modules/m_json/src/stdafx.h b/plugins/MirLua/Modules/m_json/src/stdafx.h
index 298f91d5c2..dcbdfbd56d 100644
--- a/plugins/MirLua/Modules/m_json/src/stdafx.h
+++ b/plugins/MirLua/Modules/m_json/src/stdafx.h
@@ -2,10 +2,8 @@
 
 #include <Windows.h>
 #include <lua.hpp>
-#include <m_system_cpp.h>
-//#include "../../../src/mlua_metatable.h"
+#include <m_system.h>
 
-#include <m_core.h>
 #include <m_json.h>
 #include <m_string.h>
 
diff --git a/plugins/NewAwaySysMod/src/stdafx.h b/plugins/NewAwaySysMod/src/stdafx.h
index 466f31ffd9..b8136f95c8 100644
--- a/plugins/NewAwaySysMod/src/stdafx.h
+++ b/plugins/NewAwaySysMod/src/stdafx.h
@@ -49,7 +49,6 @@
 #include "m_skin.h"
 #include "m_awaymsg.h"
 #include "m_utils.h"
-#include "m_system_cpp.h"
 #include "m_history.h"
 #include "m_icolib.h"
 #include "m_message.h"
diff --git a/plugins/PluginUpdater/src/stdafx.h b/plugins/PluginUpdater/src/stdafx.h
index dae531b4ca..3159243a51 100644
--- a/plugins/PluginUpdater/src/stdafx.h
+++ b/plugins/PluginUpdater/src/stdafx.h
@@ -31,7 +31,7 @@ Boston, MA 02111-1307, USA.
 #include <m_skin.h>
 #include <m_langpack.h>
 #include <m_options.h>
-#include <m_system_cpp.h>
+#include <m_system.h>
 #include <m_popup.h>
 #include <m_hotkeys.h>
 #include <m_netlib.h>
diff --git a/plugins/ShellExt/src/stdafx.h b/plugins/ShellExt/src/stdafx.h
index a5b02f1ff5..d84472a037 100644
--- a/plugins/ShellExt/src/stdafx.h
+++ b/plugins/ShellExt/src/stdafx.h
@@ -9,7 +9,7 @@
 
 #include <newpluginapi.h>
 
-#include <m_system_cpp.h>
+#include <m_system.h>
 #include <m_protocols.h>
 #include <m_protosvc.h>
 #include <m_file.h>
diff --git a/plugins/SpellChecker/src/stdafx.h b/plugins/SpellChecker/src/stdafx.h
index ea4ea9b6bc..2b7fd394f8 100644
--- a/plugins/SpellChecker/src/stdafx.h
+++ b/plugins/SpellChecker/src/stdafx.h
@@ -44,7 +44,7 @@ using namespace std;
 #include <m_icolib.h>
 #include <m_hotkeys.h>
 #include <win2k.h>
-#include <m_system_cpp.h>
+#include <m_system.h>
 
 //own includes
 #include <m_folders.h>
diff --git a/plugins/StartupSilence/src/stdafx.h b/plugins/StartupSilence/src/stdafx.h
index e4fcc25b3b..b20aa52f5b 100644
--- a/plugins/StartupSilence/src/stdafx.h
+++ b/plugins/StartupSilence/src/stdafx.h
@@ -13,7 +13,6 @@
 #include <m_options.h>
 #include <m_protocols.h>
 #include <m_system.h>
-#include <m_system_cpp.h>
 #include "win2k.h"
 
 #include <m_toptoolbar.h>
diff --git a/plugins/StatusManager/src/commonstatus.h b/plugins/StatusManager/src/commonstatus.h
index 45e23ef2b6..59a39708b6 100644
--- a/plugins/StatusManager/src/commonstatus.h
+++ b/plugins/StatusManager/src/commonstatus.h
@@ -29,7 +29,6 @@
 
 #include <newpluginapi.h>
 #include <m_system.h>
-#include <m_system_cpp.h>
 #include <m_awaymsg.h>
 #include <m_database.h>
 #include <m_protosvc.h>
diff --git a/plugins/StopSpamMod/src/stdafx.h b/plugins/StopSpamMod/src/stdafx.h
index 028c8089c4..378384ff09 100755
--- a/plugins/StopSpamMod/src/stdafx.h
+++ b/plugins/StopSpamMod/src/stdafx.h
@@ -13,7 +13,7 @@ using namespace std;
 #include <m_clist.h>
 #include <m_skin.h>
 #include <m_contacts.h>
-#include <m_system_cpp.h>
+#include <m_system.h>
 
 #include <m_variables.h>
 #include <m_folders.h>
diff --git a/plugins/XSoundNotify/src/stdafx.h b/plugins/XSoundNotify/src/stdafx.h
index ae497266c6..a04427e9f8 100644
--- a/plugins/XSoundNotify/src/stdafx.h
+++ b/plugins/XSoundNotify/src/stdafx.h
@@ -2,7 +2,7 @@
 #include <Shlwapi.h>
 
 #include <newpluginapi.h>
-#include <m_system_cpp.h>
+#include <m_system.h>
 #include <m_database.h>
 #include <m_protocols.h>
 #include <m_protosvc.h>
diff --git a/protocols/Discord/src/stdafx.h b/protocols/Discord/src/stdafx.h
index 0794bc5df3..6a233e59b4 100644
--- a/protocols/Discord/src/stdafx.h
+++ b/protocols/Discord/src/stdafx.h
@@ -15,7 +15,7 @@
 
 #include "resource.h"
 
-#include <m_system_cpp.h>
+#include <m_system.h>
 #include <newpluginapi.h>
 #include <m_chat_int.h>
 #include <m_clist.h>
@@ -32,7 +32,6 @@
 #include <m_protoint.h>
 #include <m_skin.h>
 #include <m_gui.h>
-#include <m_system.h>
 #include <m_userinfo.h>
 #include <m_icolib.h>
 #include <m_utils.h>
diff --git a/protocols/Dummy/src/stdafx.h b/protocols/Dummy/src/stdafx.h
index a28d1fd992..84b1fbc2da 100644
--- a/protocols/Dummy/src/stdafx.h
+++ b/protocols/Dummy/src/stdafx.h
@@ -27,7 +27,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 #include <newpluginapi.h>
 #include <m_system.h>
-#include <m_system_cpp.h>
 
 #include <m_avatars.h>
 #include <m_chat.h>
diff --git a/protocols/GTalkExt/src/stdafx.h b/protocols/GTalkExt/src/stdafx.h
index f545ff3b25..abfc7fcb29 100644
--- a/protocols/GTalkExt/src/stdafx.h
+++ b/protocols/GTalkExt/src/stdafx.h
@@ -47,7 +47,6 @@
 #pragma warning(disable:4996)
 
 #include <m_system.h>
-#include <m_system_cpp.h>
 #include <m_popup.h>
 #include <m_jabber.h>
 #include <m_langpack.h>
diff --git a/protocols/Gadu-Gadu/src/gg.h b/protocols/Gadu-Gadu/src/gg.h
index 34e753122c..f1848d2e5e 100644
--- a/protocols/Gadu-Gadu/src/gg.h
+++ b/protocols/Gadu-Gadu/src/gg.h
@@ -46,7 +46,6 @@
 // Miranda IM headers
 #include <newpluginapi.h>
 #include <m_system.h>
-#include <m_system_cpp.h>
 #include <m_database.h>
 #include <m_netlib.h>
 #include <m_protocols.h>
diff --git a/protocols/IRCG/src/stdafx.h b/protocols/IRCG/src/stdafx.h
index d23614a3d5..d14de924bc 100644
--- a/protocols/IRCG/src/stdafx.h
+++ b/protocols/IRCG/src/stdafx.h
@@ -43,7 +43,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "newpluginapi.h"
 #include "m_system.h"
-#include "m_system_cpp.h"
 #include "m_protocols.h"
 #include "m_protosvc.h"
 #include "m_protoint.h"
diff --git a/protocols/IcqOscarJ/src/icq_proto.h b/protocols/IcqOscarJ/src/icq_proto.h
index 09e273793c..e0a61c1611 100644
--- a/protocols/IcqOscarJ/src/icq_proto.h
+++ b/protocols/IcqOscarJ/src/icq_proto.h
@@ -30,7 +30,7 @@
 #ifndef _ICQ_PROTO_H_
 #define _ICQ_PROTO_H_
 
-#include "m_system_cpp.h"
+#include "m_system.h"
 #include "m_protoint.h"
 
 #define LISTSIZE 100
diff --git a/protocols/IcqOscarJ/src/stdafx.h b/protocols/IcqOscarJ/src/stdafx.h
index 16a2b5b21a..293352a46a 100644
--- a/protocols/IcqOscarJ/src/stdafx.h
+++ b/protocols/IcqOscarJ/src/stdafx.h
@@ -65,7 +65,6 @@
 #include <m_protosvc.h>
 #include <m_options.h>
 #include <m_system.h>
-#include <m_system_cpp.h>
 #include <m_userinfo.h>
 #include <m_utils.h>
 #include <m_idle.h>
diff --git a/protocols/JabberG/src/stdafx.h b/protocols/JabberG/src/stdafx.h
index 03d2128e9b..794983a869 100644
--- a/protocols/JabberG/src/stdafx.h
+++ b/protocols/JabberG/src/stdafx.h
@@ -54,7 +54,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include <newpluginapi.h>
 #include <m_system.h>
-#include <m_system_cpp.h>
 
 #include <m_avatars.h>
 #include <m_awaymsg.h>
diff --git a/protocols/MRA/src/stdafx.h b/protocols/MRA/src/stdafx.h
index 6d61cdcc49..e7bd1a649a 100644
--- a/protocols/MRA/src/stdafx.h
+++ b/protocols/MRA/src/stdafx.h
@@ -22,7 +22,6 @@
 
 #include <newpluginapi.h>
 #include <m_system.h>
-#include <m_system_cpp.h>
 #include <m_protocols.h>
 #include <m_clist.h>
 #include <m_cluiframes.h>
diff --git a/protocols/MSN/src/stdafx.h b/protocols/MSN/src/stdafx.h
index 633b842f78..bc2b4cad1e 100644
--- a/protocols/MSN/src/stdafx.h
+++ b/protocols/MSN/src/stdafx.h
@@ -47,7 +47,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <m_protoint.h>
 #include <m_skin.h>
 #include <m_system.h>
-#include <m_system_cpp.h>
 #include <m_userinfo.h>
 #include <m_utils.h>
 #include <win2k.h>
diff --git a/protocols/MinecraftDynmap/src/stdafx.h b/protocols/MinecraftDynmap/src/stdafx.h
index 252b2e2ac9..07c6d363f7 100644
--- a/protocols/MinecraftDynmap/src/stdafx.h
+++ b/protocols/MinecraftDynmap/src/stdafx.h
@@ -40,7 +40,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <newpluginapi.h>
 #include <m_system.h>
-#include <m_system_cpp.h>
 #include <m_chat.h>
 #include <m_clist.h>
 #include <m_langpack.h>
diff --git a/protocols/Omegle/src/stdafx.h b/protocols/Omegle/src/stdafx.h
index b2eaaf23b6..3485235b2d 100644
--- a/protocols/Omegle/src/stdafx.h
+++ b/protocols/Omegle/src/stdafx.h
@@ -41,7 +41,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <newpluginapi.h>
 #include <m_system.h>
-#include <m_system_cpp.h>
 #include <m_chat.h>
 #include <m_clist.h>
 #include <m_langpack.h>
diff --git a/protocols/Steam/src/stdafx.h b/protocols/Steam/src/stdafx.h
index 44e3dfc893..3abce22f89 100644
--- a/protocols/Steam/src/stdafx.h
+++ b/protocols/Steam/src/stdafx.h
@@ -35,7 +35,7 @@
 #include <m_extraicons.h>
 #include <m_gui.h>
 #include <m_http.h>
-#include <m_system_cpp.h>
+#include <m_system.h>
 
 #include "resource.h"
 #include "version.h"
diff --git a/protocols/Tlen/src/stdafx.h b/protocols/Tlen/src/stdafx.h
index d5783e17ee..079d700eb8 100644
--- a/protocols/Tlen/src/stdafx.h
+++ b/protocols/Tlen/src/stdafx.h
@@ -57,7 +57,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include <newpluginapi.h>
 #include <m_system.h>
-#include <m_system_cpp.h>
 #include <m_netlib.h>
 #include <m_protosvc.h>
 #include <m_protoint.h>
diff --git a/protocols/Twitter/src/stdafx.h b/protocols/Twitter/src/stdafx.h
index bd46045ca8..ce46f463da 100644
--- a/protocols/Twitter/src/stdafx.h
+++ b/protocols/Twitter/src/stdafx.h
@@ -34,7 +34,7 @@ typedef std::basic_string<wchar_t> wstring;
 
 #pragma warning(push)
 #	pragma warning(disable:4312)
-#include <m_system_cpp.h>
+#include <m_system.h>
 #include <newpluginapi.h>
 #include <m_avatars.h>
 #include <m_button.h>
@@ -53,7 +53,6 @@ typedef std::basic_string<wchar_t> wstring;
 #include <m_protoint.h>
 #include <m_skin.h>
 #include <statusmodes.h>
-#include <m_system.h>
 #include <m_userinfo.h>
 #include <m_icolib.h>
 #include <m_utils.h>
diff --git a/protocols/VKontakte/src/stdafx.h b/protocols/VKontakte/src/stdafx.h
index 5684a0a1f8..9733a19dd6 100644
--- a/protocols/VKontakte/src/stdafx.h
+++ b/protocols/VKontakte/src/stdafx.h
@@ -26,7 +26,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 #include <newpluginapi.h>
 #include <m_system.h>
-#include <m_system_cpp.h>
 
 #include <m_avatars.h>
 #include <m_chat_int.h>
diff --git a/protocols/WhatsApp/src/stdafx.h b/protocols/WhatsApp/src/stdafx.h
index c0c7915712..35993bc8db 100755
--- a/protocols/WhatsApp/src/stdafx.h
+++ b/protocols/WhatsApp/src/stdafx.h
@@ -33,7 +33,6 @@ Copyright � 2013-14 Uli Hecht
 
 #include <newpluginapi.h>
 #include <m_system.h>
-#include <m_system_cpp.h>
 #include <m_avatars.h>
 #include <m_button.h>
 #include <m_chat.h>
diff --git a/src/core/stdauth/src/stdafx.h b/src/core/stdauth/src/stdafx.h
index dc6db3b3c6..8b0ba9a522 100644
--- a/src/core/stdauth/src/stdafx.h
+++ b/src/core/stdauth/src/stdafx.h
@@ -41,7 +41,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <win2k.h>
 
 #include <m_system.h>
-#include <m_system_cpp.h>
 #include <m_core.h>
 #include <newpluginapi.h>
 #include <m_database.h>
diff --git a/src/core/stdautoaway/src/stdafx.h b/src/core/stdautoaway/src/stdafx.h
index 3d4d0ec159..c991fa57b7 100644
--- a/src/core/stdautoaway/src/stdafx.h
+++ b/src/core/stdautoaway/src/stdafx.h
@@ -41,8 +41,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <win2k.h>
 
 #include <m_system.h>
-#include <m_system_cpp.h>
-#include <m_core.h>
 #include <newpluginapi.h>
 #include <m_utils.h>
 #include <m_netlib.h>
diff --git a/src/core/stdaway/src/stdafx.h b/src/core/stdaway/src/stdafx.h
index 0980f6b980..c4d8bf2d04 100644
--- a/src/core/stdaway/src/stdafx.h
+++ b/src/core/stdaway/src/stdafx.h
@@ -41,8 +41,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <win2k.h>
 
 #include <m_system.h>
-#include <m_system_cpp.h>
-#include <m_core.h>
 #include <newpluginapi.h>
 #include <m_utils.h>
 #include <m_netlib.h>
diff --git a/src/core/stdcrypt/src/stdafx.h b/src/core/stdcrypt/src/stdafx.h
index 9623d2136c..595dce2c1e 100644
--- a/src/core/stdcrypt/src/stdafx.h
+++ b/src/core/stdcrypt/src/stdafx.h
@@ -41,8 +41,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <win2k.h>
 
 #include <m_system.h>
-#include <m_system_cpp.h>
-#include <m_core.h>
 #include <newpluginapi.h>
 #include <m_utils.h>
 #include <m_netlib.h>
diff --git a/src/core/stdemail/src/stdafx.h b/src/core/stdemail/src/stdafx.h
index b53fd5932e..82eaec2193 100644
--- a/src/core/stdemail/src/stdafx.h
+++ b/src/core/stdemail/src/stdafx.h
@@ -41,8 +41,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <win2k.h>
 
 #include <m_system.h>
-#include <m_system_cpp.h>
-#include <m_core.h>
 #include <newpluginapi.h>
 #include <m_utils.h>
 #include <m_netlib.h>
diff --git a/src/core/stdfile/src/stdafx.h b/src/core/stdfile/src/stdafx.h
index 07fb354dbb..0b81ab8776 100644
--- a/src/core/stdfile/src/stdafx.h
+++ b/src/core/stdfile/src/stdafx.h
@@ -43,10 +43,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include <win2k.h>
 
-#include <m_system.h>
-#include <m_system_cpp.h>
-#include <m_core.h>
 #include <newpluginapi.h>
+#include <m_system.h>
 #include <m_database.h>
 #include <m_netlib.h>
 #include <m_crypto.h>
diff --git a/src/core/stdhelp/src/stdafx.h b/src/core/stdhelp/src/stdafx.h
index 556110d744..8740813b1b 100644
--- a/src/core/stdhelp/src/stdafx.h
+++ b/src/core/stdhelp/src/stdafx.h
@@ -41,8 +41,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <win2k.h>
 
 #include <m_system.h>
-#include <m_system_cpp.h>
-#include <m_core.h>
 #include <newpluginapi.h>
 #include <m_utils.h>
 #include <m_netlib.h>
diff --git a/src/core/stdidle/src/stdafx.h b/src/core/stdidle/src/stdafx.h
index ab98ee22cb..0924b8e7b5 100644
--- a/src/core/stdidle/src/stdafx.h
+++ b/src/core/stdidle/src/stdafx.h
@@ -42,8 +42,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <win2k.h>
 
 #include <m_system.h>
-#include <m_system_cpp.h>
-#include <m_core.h>
 #include <newpluginapi.h>
 #include <m_utils.h>
 #include <m_netlib.h>
diff --git a/src/core/stduihist/src/stdafx.h b/src/core/stduihist/src/stdafx.h
index 9a6c4b9ff1..d168fb3b1b 100644
--- a/src/core/stduihist/src/stdafx.h
+++ b/src/core/stduihist/src/stdafx.h
@@ -41,8 +41,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <win2k.h>
 
 #include <m_system.h>
-#include <m_system_cpp.h>
-#include <m_core.h>
 #include <newpluginapi.h>
 #include <m_database.h>
 #include <m_netlib.h>
diff --git a/src/core/stduserinfo/src/stdafx.h b/src/core/stduserinfo/src/stdafx.h
index c99690c6e0..3334702011 100644
--- a/src/core/stduserinfo/src/stdafx.h
+++ b/src/core/stduserinfo/src/stdafx.h
@@ -42,7 +42,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <win2k.h>
 
 #include <m_system.h>
-#include <m_system_cpp.h>
 #include <m_core.h>
 #include <newpluginapi.h>
 #include <m_database.h>
diff --git a/src/core/stduseronline/src/stdafx.h b/src/core/stduseronline/src/stdafx.h
index 2a527cb557..dd0dd7a905 100644
--- a/src/core/stduseronline/src/stdafx.h
+++ b/src/core/stduseronline/src/stdafx.h
@@ -41,8 +41,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <win2k.h>
 
 #include <m_system.h>
-#include <m_system_cpp.h>
-#include <m_core.h>
 #include <newpluginapi.h>
 #include <m_database.h>
 #include <m_netlib.h>
diff --git a/src/mir_app/src/stdafx.h b/src/mir_app/src/stdafx.h
index 7accf068d9..0771630b73 100644
--- a/src/mir_app/src/stdafx.h
+++ b/src/mir_app/src/stdafx.h
@@ -58,7 +58,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <win2k.h>
 
 #include <m_system.h>
-#include <m_system_cpp.h>
 #include <m_string.h>
 #include <newpluginapi.h>
 #include <m_database.h>
diff --git a/src/mir_core/src/stdafx.h b/src/mir_core/src/stdafx.h
index 2b42fa0d9e..d23da87ebd 100644
--- a/src/mir_core/src/stdafx.h
+++ b/src/mir_core/src/stdafx.h
@@ -47,7 +47,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <win2k.h>
 
 #include <m_system.h>
-#include <m_system_cpp.h>
 #include <m_database.h>
 #include <m_db_int.h>
 #include <newpluginapi.h>