From d087c0b8cc5361f230761e27b0d685d3acb6ae71 Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Tue, 14 Feb 2017 18:09:31 +0300
Subject: fix for include duplicates & recursions

---
 plugins/Boltun/src/stdafx.h                | 2 +-
 plugins/CSList/src/stdafx.h                | 2 +-
 plugins/Clist_modern/src/stdafx.h          | 2 +-
 plugins/Clist_nicer/src/stdafx.h           | 2 +-
 plugins/Db3x_mmap/src/stdafx.h             | 2 +-
 plugins/Exchange/src/stdafx.h              | 1 -
 plugins/FavContacts/src/stdafx.h           | 2 +-
 plugins/FloatingContacts/src/stdafx.h      | 2 +-
 plugins/Folders/src/stdafx.h               | 2 +-
 plugins/HistoryStats/src/stdafx.h          | 1 -
 plugins/Import/src/stdafx.h                | 2 +-
 plugins/MenuItemEx/src/stdafx.h            | 2 +-
 plugins/MimCmd/src/stdafx.h                | 1 -
 plugins/MirLua/Modules/m_json/src/stdafx.h | 4 +---
 plugins/NewAwaySysMod/src/stdafx.h         | 1 -
 plugins/PluginUpdater/src/stdafx.h         | 2 +-
 plugins/ShellExt/src/stdafx.h              | 2 +-
 plugins/SpellChecker/src/stdafx.h          | 2 +-
 plugins/StartupSilence/src/stdafx.h        | 1 -
 plugins/StatusManager/src/commonstatus.h   | 1 -
 plugins/StopSpamMod/src/stdafx.h           | 2 +-
 plugins/XSoundNotify/src/stdafx.h          | 2 +-
 22 files changed, 16 insertions(+), 24 deletions(-)

(limited to 'plugins')

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>
-- 
cgit v1.2.3