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

---
 src/core/stdauth/src/stdafx.h       | 1 -
 src/core/stdautoaway/src/stdafx.h   | 2 --
 src/core/stdaway/src/stdafx.h       | 2 --
 src/core/stdcrypt/src/stdafx.h      | 2 --
 src/core/stdemail/src/stdafx.h      | 2 --
 src/core/stdfile/src/stdafx.h       | 4 +---
 src/core/stdhelp/src/stdafx.h       | 2 --
 src/core/stdidle/src/stdafx.h       | 2 --
 src/core/stduihist/src/stdafx.h     | 2 --
 src/core/stduserinfo/src/stdafx.h   | 1 -
 src/core/stduseronline/src/stdafx.h | 2 --
 11 files changed, 1 insertion(+), 21 deletions(-)

(limited to 'src/core')

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