fix for include duplicates & recursions

17 files changed, 4 insertions, 19 deletions

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>