35 files changed, 33 insertions, 212 deletions
diff --git a/include/m_keybindings.h b/include/m_keybindings.h
deleted file mode 100644
index faac722791..0000000000
--- a/include/m_keybindings.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
-
-Miranda IM: the free IM client for Microsoft* Windows*
-
-Copyright 2000-2008 Miranda ICQ/IM project,
-all portions of this codebase are copyrighted to the people
-listed in contributors.txt.
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-*/
-
-#define KB_CTRL_FLAG  0x10000
-#define KB_SHIFT_FLAG 0x20000
-#define KB_ALT_FLAG   0x40000
-#define KBDF_UNICODE 1
-
-typedef struct {
-  int cbSize;				//size of the structure
-  union {
-    char *pszSection;		// section name used to display key bindings in the tree view
-    TCHAR *ptszSection;		// [TRANSLATED-BY-CORE]
-    WCHAR *pwszSection;
-  };
-  union {
-    char *pszActionName;	// action name used to display key bindings in the tree view
-    TCHAR *ptszActionName;	// [TRANSLATED-BY-CORE]
-    WCHAR *pwszActionName;
-  };
-  char *pszActionGroup;		// action group name used to group unique shortcuts, shortcuts cannot be duplicated within a group
-  DWORD key[5];				// virtual key + KB_* flags, up to 5 different shortcuts may be defined for each action
-  DWORD flags;				// flags (KBDF_*)
-  int	action;				// id of the action
-} KEYBINDINGDESC;
-
-//Registers action with default key bindings assigned to it.
-//wParam = (WPARAM) 0; not used
-//lParam = (LPARAM) (KEYBINDINGDESC*)
-//return: 0 on success, error code otherwise
-#define MS_KEYBINDINGS_REGISTER  "KeyBindings/Register"
-//Gets action assigned to the given key
-//key[0] and pszActionGroup in KEYBINDINGDESC should be set before calling this service
-//wParam = (WPARAM) 0; not used
-//lParam = (LPARAM) (KEYBINDINGDESC*)
-//return: 0 if action assigned to the given key was found, 1 otherwise
-#define MS_KEYBINDINGS_GET  "KeyBindings/Get"
diff --git a/include/m_stdhdr.h b/include/m_stdhdr.h
deleted file mode 100644
index 85bebfd5d8..0000000000
--- a/include/m_stdhdr.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
-
-Miranda IM: the free IM client for Microsoft* Windows*
-
-Copyright 2000-2008 Miranda ICQ/IM project,
-all portions of this codebase are copyrighted to the people
-listed in contributors.txt.
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-*/
-
-#ifndef M_STDHDR_H__
-#define M_STDHDR_H__ 1
-
-#if defined( UNICODE ) && !defined( _UNICODE )
-#  define _UNICODE
-#endif
-
-#ifndef _WIN64
-#define _USE_32BIT_TIME_T
-#endif
-
-#include <tchar.h>
-
-#ifndef __GNUC__
-#	ifdef _DEBUG
-#		define _CRTDBG_MAP_ALLOC
-#		include <stdlib.h>
-#		include <crtdbg.h>
-#       define DEBUG_NEW new(_NORMAL_BLOCK, __FILE__, __LINE__)
-#  else
-#		include <stdlib.h>
-#	endif
-#else
-#	include <stdlib.h>
-/* GCC has not __try/except */
-#	define __try
-#	define __except(x) if (0) /* don't execute handler */
-#	define __finally
-/* neither _ASSERT */
-#	ifdef _DEBUG
-#		include <assert.h>
-#		define _ASSERT assert
-#	else
-#		define _ASSERT(x)
-#	endif
-/* neither some CRT debugging things */
-#	define _CRTDBG_REPORT_FLAG -1
-#	define _CRTDBG_LEAK_CHECK_DF 0x20
-#	define _CrtSetDbgFlag(x) 0
-#endif
-
-#if _MSC_VER >= 1400
-#	include <malloc.h>   // to avoid a warning in VS2005 & 2008
-#endif
-
-
-#endif // M_STDHDR_H__
diff --git a/plugins/AdvaImg/src/main.cpp b/plugins/AdvaImg/src/main.cpp
index a0342505e8..cb4500501d 100644
--- a/plugins/AdvaImg/src/main.cpp
+++ b/plugins/AdvaImg/src/main.cpp
@@ -24,10 +24,9 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
-#include <m_stdhdr.h>
-
 #include <windows.h>
 #include <commdlg.h>
+#include <malloc.h>
 
 #include <m_png.h>
 #include <m_clui.h>
diff --git a/plugins/BossKeyPlus/src/BossKey.h b/plugins/BossKeyPlus/src/BossKey.h
index 6c7577afc2..37a805a50c 100644
--- a/plugins/BossKeyPlus/src/BossKey.h
+++ b/plugins/BossKeyPlus/src/BossKey.h
@@ -28,7 +28,6 @@
 
 #define BOSSKEY_LISTEN_INFO _T("MY6BossKey_Param")
 
-#include <m_stdhdr.h>
 #include <windows.h>
 #include <shellapi.h>
 
diff --git a/plugins/Clist_modern/src/hdr/modern_commonheaders.h b/plugins/Clist_modern/src/hdr/modern_commonheaders.h
index cc0b819c9e..cdf1b7426b 100644
--- a/plugins/Clist_modern/src/hdr/modern_commonheaders.h
+++ b/plugins/Clist_modern/src/hdr/modern_commonheaders.h
@@ -68,12 +68,13 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <windows.h>
 #include <Shlwapi.h>
 #include <vssym32.h>
+
+#include <malloc.h>
 #include <time.h>
 #include <stddef.h>
 #include <io.h>
 #include <math.h>
 
-#include <m_stdhdr.h>
 #include <newpluginapi.h>
 #include <m_system_cpp.h>
 #include <win2k.h>
diff --git a/plugins/Clist_modern/src/modern_row.cpp b/plugins/Clist_modern/src/modern_row.cpp
index 093bfb6d68..a83ef4ffae 100644
--- a/plugins/Clist_modern/src/modern_row.cpp
+++ b/plugins/Clist_modern/src/modern_row.cpp
@@ -27,8 +27,6 @@ Created by Anton Senko aka ZORG , tweaked by Artem Shpynov aka FYR
 #include "hdr/modern_commonheaders.h"
 
 /*
-#include "m_stdhdr.h"
-
 #include <windows.h>
 #include <commctrl.h>
 #include <stdio.h>
diff --git a/plugins/Clist_mw/src/commonheaders.h b/plugins/Clist_mw/src/commonheaders.h
index 8b4c9181de..f20960a1cf 100644
--- a/plugins/Clist_mw/src/commonheaders.h
+++ b/plugins/Clist_mw/src/commonheaders.h
@@ -29,10 +29,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include <windows.h>
 #include <vssym32.h>
-#include <time.h>
+
+#include <malloc.h>
 #include <stddef.h>
+#include <time.h>
 
-#include <m_stdhdr.h>
 #include <newpluginapi.h>
 #include <m_database.h>
 #include <m_langpack.h>
diff --git a/plugins/Clist_nicer/src/Include/commonheaders.h b/plugins/Clist_nicer/src/Include/commonheaders.h
index a094b29235..7dafdfee0a 100644
--- a/plugins/Clist_nicer/src/Include/commonheaders.h
+++ b/plugins/Clist_nicer/src/Include/commonheaders.h
@@ -47,7 +47,6 @@
 #include <shlwapi.h>
 #include <Richedit.h>
 
-#include <m_stdhdr.h>
 #include <newpluginapi.h>
 #include <win2k.h>
 #include <m_clistint.h>
diff --git a/plugins/CrashDumper/src/utils.h b/plugins/CrashDumper/src/utils.h
index d82b32b703..0399c28bb3 100644
--- a/plugins/CrashDumper/src/utils.h
+++ b/plugins/CrashDumper/src/utils.h
@@ -20,7 +20,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <windows.h>
 #include <richedit.h>
+
 #include <delayimp.h>
+#include <malloc.h>
 
 #include <newpluginapi.h>
 #include <m_database.h>
@@ -30,7 +32,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <m_hotkeys.h>
 #include <m_protocols.h>
 #include <m_icolib.h>
-#include <m_stdhdr.h>
 #include <m_options.h>
 #include <m_popup.h>
 #include <m_netlib.h>
diff --git a/plugins/CryptoPP/src/commonheaders.h b/plugins/CryptoPP/src/commonheaders.h
index 1e16f4e6d8..d6eae14c33 100644
--- a/plugins/CryptoPP/src/commonheaders.h
+++ b/plugins/CryptoPP/src/commonheaders.h
@@ -25,12 +25,12 @@
 #include <limits>
 
 #define MIRANDA_VER 0x0A00
-#include <m_stdhdr.h>
 
 #include <windows.h>
 #include <wincrypt.h>
 #include <winsock2.h>
 
+#include <malloc.h>
 #include <process.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -44,7 +44,6 @@
 
 // Miranda API
 #include <newpluginapi.h>
-#include <m_stdhdr.h>
 #include <m_system.h>
 #include <m_database.h>
 #include <m_langpack.h>
diff --git a/plugins/FlashAvatars/src/stdafx.h b/plugins/FlashAvatars/src/stdafx.h
index 731c64963b..fb175de920 100644
--- a/plugins/FlashAvatars/src/stdafx.h
+++ b/plugins/FlashAvatars/src/stdafx.h
@@ -31,8 +31,6 @@
 #include <fcntl.h>
 #include <Winsock2.h>
 
-#include <m_stdhdr.h>
-#include <win2k.h>
 #include <newpluginapi.h>
 #include <m_system_cpp.h>
 #include <m_database.h>
@@ -41,6 +39,7 @@
 #include <m_avatars.h>
 #include <m_netlib.h>
 #include <m_clistint.h>
+#include <win2k.h>
 
 #include <m_folders.h>
 #include <m_flash.h>
diff --git a/plugins/Import/src/import.h b/plugins/Import/src/import.h
index f3fd07bd2f..eb8bfe696f 100644
--- a/plugins/Import/src/import.h
+++ b/plugins/Import/src/import.h
@@ -29,9 +29,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include <windows.h>
 #include <commctrl.h> // datetimepicker
+
+#include <malloc.h>
 #include <time.h>
 
-#include <m_stdhdr.h>
 #include <win2k.h>
 #include <newpluginapi.h>
 #include <m_langpack.h>
diff --git a/plugins/Scriver/src/commonheaders.h b/plugins/Scriver/src/commonheaders.h
index 48c0af734b..ca81b3b2b4 100644
--- a/plugins/Scriver/src/commonheaders.h
+++ b/plugins/Scriver/src/commonheaders.h
@@ -37,13 +37,13 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <shlwapi.h>
 #include <uxtheme.h>
 #include <vssym32.h>
-#include <time.h>
-#include <math.h>
 #include <richedit.h>
 #include <richole.h>
 
-#include <win2k.h>
-#include <m_stdhdr.h>
+#include <malloc.h>
+#include <math.h>
+#include <time.h>
+
 #include <newpluginapi.h>
 #include <m_database.h>
 #include <m_langpack.h>
@@ -65,6 +65,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <m_hotkeys.h>
 #include <m_popup.h>
 #include <m_timezones.h>
+#include <win2k.h>
 
 #include <m_ieview.h>
 #include <m_smileyadd.h>
diff --git a/plugins/SecureIM/src/commonheaders.h b/plugins/SecureIM/src/commonheaders.h
index 5b0b0173d7..15e739cf32 100644
--- a/plugins/SecureIM/src/commonheaders.h
+++ b/plugins/SecureIM/src/commonheaders.h
@@ -25,11 +25,12 @@
 #include <commdlg.h>
 #include <commctrl.h>
 #include <shlwapi.h>
+
+#include <malloc.h>
 #include <process.h>
 #include <time.h>
 
 #include <win2k.h>
-#include <m_stdhdr.h>
 #include <newpluginapi.h>
 #include <m_database.h>
 #include <m_protomod.h>
diff --git a/protocols/FacebookRM/src/common.h b/protocols/FacebookRM/src/common.h
index 23084b8d35..ab8faf4db0 100644
--- a/protocols/FacebookRM/src/common.h
+++ b/protocols/FacebookRM/src/common.h
@@ -30,8 +30,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define _WIN32_WINNT   0x0500
 #define _WIN32_WINDOWS 0x0500
 
-#include <m_stdhdr.h>
-
 #include <string>
 #include <sstream>
 #include <fstream>
diff --git a/protocols/Gadu-Gadu/src/gg.h b/protocols/Gadu-Gadu/src/gg.h
index 2ae43a64d2..9e7f16e454 100644
--- a/protocols/Gadu-Gadu/src/gg.h
+++ b/protocols/Gadu-Gadu/src/gg.h
@@ -32,8 +32,6 @@
 #define _WIN32_WINNT 0x0501
 #endif
 
-#include <m_stdhdr.h>
-
 // Windows headers
 // Visual C++ .NET tries to include winsock.h
 // which is very ver bad
@@ -44,6 +42,8 @@
 #endif
 #include <commctrl.h>
 #include <commdlg.h>
+
+#include <malloc.h>
 #include <process.h>
 #include <stdio.h>
 #include <time.h>
diff --git a/protocols/IRCG/IRC_10.vcxproj b/protocols/IRCG/IRC_10.vcxproj
index 1e050d5274..a3b41d3fe3 100644
--- a/protocols/IRCG/IRC_10.vcxproj
+++ b/protocols/IRCG/IRC_10.vcxproj
@@ -215,7 +215,6 @@
     <ClCompile Include="src\windows.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="src\commandmonitor.h" />
     <ClInclude Include="src\irc.h" />
     <ClInclude Include="src\irc_dlg.h" />
     <ClInclude Include="src\irclib.h" />
diff --git a/protocols/IRCG/IRC_10.vcxproj.filters b/protocols/IRCG/IRC_10.vcxproj.filters
index 25e3c6de44..93048461ca 100644
--- a/protocols/IRCG/IRC_10.vcxproj.filters
+++ b/protocols/IRCG/IRC_10.vcxproj.filters
@@ -69,9 +69,6 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="src\commandmonitor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="src\irc.h">
       <Filter>Header Files</Filter>
     </ClInclude>
diff --git a/protocols/IRCG/IRC_11.vcxproj b/protocols/IRCG/IRC_11.vcxproj
index 64a0fd3353..8b703db493 100644
--- a/protocols/IRCG/IRC_11.vcxproj
+++ b/protocols/IRCG/IRC_11.vcxproj
@@ -218,7 +218,6 @@
     <ClCompile Include="src\windows.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="src\commandmonitor.h" />
     <ClInclude Include="src\irc.h" />
     <ClInclude Include="src\irc_dlg.h" />
     <ClInclude Include="src\irclib.h" />
diff --git a/protocols/IRCG/IRC_11.vcxproj.filters b/protocols/IRCG/IRC_11.vcxproj.filters
index 3fe7a31e89..7075dac8fe 100644
--- a/protocols/IRCG/IRC_11.vcxproj.filters
+++ b/protocols/IRCG/IRC_11.vcxproj.filters
@@ -69,9 +69,6 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="src\commandmonitor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="src\irc.h">
       <Filter>Header Files</Filter>
     </ClInclude>
diff --git a/protocols/IRCG/src/commandmonitor.h b/protocols/IRCG/src/commandmonitor.h
deleted file mode 100644
index 940cb9cc02..0000000000
--- a/protocols/IRCG/src/commandmonitor.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
-IRC plugin for Miranda IM
-
-Copyright (C) 2003-05 Jurgen Persson
-Copyright (C) 2007-09 George Hazan
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-*/
-
-using namespace irc;
diff --git a/protocols/IRCG/src/irc.h b/protocols/IRCG/src/irc.h
index 0fe14cb629..d82b394a70 100644
--- a/protocols/IRCG/src/irc.h
+++ b/protocols/IRCG/src/irc.h
@@ -26,8 +26,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #define _WIN32_WINNT 0x0501
 #define _WIN32_IE 0x0501
 
-#include "m_stdhdr.h"
-
 #define _CRT_SECURE_NO_WARNINGS
 
 #define WIN32_LEAN_AND_MEAN
@@ -39,6 +37,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <stdio.h>
 #include <stdlib.h>
 #include <process.h>
+#include <malloc.h>
 #include <math.h>
 #include <winsock.h>
 #include <commctrl.h>
diff --git a/protocols/IcqOscarJ/src/icqoscar.h b/protocols/IcqOscarJ/src/icqoscar.h
index d946da5ac5..05101b81eb 100644
--- a/protocols/IcqOscarJ/src/icqoscar.h
+++ b/protocols/IcqOscarJ/src/icqoscar.h
@@ -32,8 +32,6 @@
 #define _WIN32_WINNT 0x0501
 #define _WIN32_IE 0x0501
 
-#include <m_stdhdr.h>
-
 // Windows includes
 #include <windows.h>
 #include <commctrl.h>
diff --git a/protocols/JabberG/src/jabber.h b/protocols/JabberG/src/jabber.h
index b999103128..c0074cda96 100644
--- a/protocols/JabberG/src/jabber.h
+++ b/protocols/JabberG/src/jabber.h
@@ -31,8 +31,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #define MIRANDA_VER 0x0A00
 
-#include "m_stdhdr.h"
-
 #define LISTFOREACH(var__, obj__, list__)	\
 	for (int var__ = 0; (var__ = obj__->ListFindNext(list__, var__)) >= 0; ++var__)
 #define LISTFOREACH_NODEF(var__, obj__, list__)	\
@@ -43,9 +41,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  *******************************************************************/
 #define _WIN32_WINNT 0x501
 #define _WIN32_IE 0x501
+
 #include <windows.h>
 #include <commctrl.h>
 #include <uxtheme.h>
+
+#include <malloc.h>
 #include <process.h>
 #include <stdio.h>
 #include <stdarg.h>
@@ -53,6 +54,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <limits.h>
 #include <ctype.h>
 #include <stdarg.h>
+
 #include <newpluginapi.h>
 #include <m_system.h>
 #include <m_system_cpp.h>
diff --git a/protocols/MSN/src/msn_global.h b/protocols/MSN/src/msn_global.h
index 5df5eff0da..a2588bb523 100644
--- a/protocols/MSN/src/msn_global.h
+++ b/protocols/MSN/src/msn_global.h
@@ -23,12 +23,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // this plugin is for Miranda 0.9 or later
 #define MIRANDA_VER 0x0A00
 
-#include <m_stdhdr.h>
-
 #include <windows.h>
 #include <commctrl.h>
 
 #include <ctype.h>
+#include <malloc.h>
 #include <process.h>
 #include <stdio.h>
 #include <time.h>
diff --git a/protocols/MSN/src/msn_proto.h b/protocols/MSN/src/msn_proto.h
index b9819eb099..22b3a924a1 100644
--- a/protocols/MSN/src/msn_proto.h
+++ b/protocols/MSN/src/msn_proto.h
@@ -21,7 +21,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #ifndef _MSN_PROTO_H_
 #define _MSN_PROTO_H_
 
-#include <m_stdhdr.h>
 #include <m_protoint.h>
 
 struct CMsnProto;
diff --git a/protocols/Omegle/src/common.h b/protocols/Omegle/src/common.h
index c2d5be0c2e..76ca316359 100644
--- a/protocols/Omegle/src/common.h
+++ b/protocols/Omegle/src/common.h
@@ -28,8 +28,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define _WIN32_WINNT   0x0500
 #define _WIN32_WINDOWS 0x0500
 
-#include <m_stdhdr.h>
-
 #include <string>
 #include <cstring>
 #include <sstream>
diff --git a/protocols/Tlen/src/jabber.h b/protocols/Tlen/src/jabber.h
index 28459d781a..cb06e7e34e 100644
--- a/protocols/Tlen/src/jabber.h
+++ b/protocols/Tlen/src/jabber.h
@@ -39,10 +39,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #define _except __except
 #define _finally __finally
 
-
-#include "m_stdhdr.h"
-
-
 #ifdef _DEBUG
 #define _CRTDBG_MAP_ALLOC
 #include <stdlib.h>
diff --git a/protocols/Yahoo/src/libyahoo2/config.h b/protocols/Yahoo/src/libyahoo2/config.h
index 53ef7ca7cf..5de1dbc82d 100644
--- a/protocols/Yahoo/src/libyahoo2/config.h
+++ b/protocols/Yahoo/src/libyahoo2/config.h
@@ -22,8 +22,6 @@
 #define PACKAGE "libyahoo2"
 #define VERSION "0.7.5"
 
-#include <m_stdhdr.h>
-
 #include <windows.h>
 #include <stdio.h>
 
diff --git a/protocols/Yahoo/src/yahoo.h b/protocols/Yahoo/src/yahoo.h
index c0875f3f02..cab4ba5aa4 100644
--- a/protocols/Yahoo/src/yahoo.h
+++ b/protocols/Yahoo/src/yahoo.h
@@ -19,15 +19,14 @@
 	#define snprintf  _snprintf
 #endif
 
-#include <m_stdhdr.h>
+#include <windows.h>
+#include <shlwapi.h>
 
+#include <malloc.h>
 #include <sys/stat.h>
 #include <io.h>
 #include <time.h>
 
-#include <windows.h>
-#include <shlwapi.h>
-
 /*
  * Yahoo Services
  */
diff --git a/src/core/commonheaders.h b/src/core/commonheaders.h
index 65ce0c653a..401e7beab7 100644
--- a/src/core/commonheaders.h
+++ b/src/core/commonheaders.h
@@ -30,8 +30,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #define INCL_WINSOCK_API_TYPEDEFS 1
 
-#include "m_stdhdr.h"
-
 #include <winsock2.h>
 #include <ws2tcpip.h>
 #include <windows.h>
diff --git a/src/core/stdchat/src/chat.h b/src/core/stdchat/src/chat.h
index 8881e1e112..739f835f85 100644
--- a/src/core/stdchat/src/chat.h
+++ b/src/core/stdchat/src/chat.h
@@ -25,8 +25,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #define _WIN32_WINNT 0x0501
 #define _WIN32_IE 0x0501
 
-#include <m_stdhdr.h>
-
 #include <shlobj.h>
 #include <windows.h>
 #include <commctrl.h>
@@ -38,6 +36,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <Initguid.h>
 #include <Oleacc.h>
 
+#include <malloc.h>
 #include <time.h>
 
 #include <win2k.h>
diff --git a/src/core/stdclist/src/commonheaders.h b/src/core/stdclist/src/commonheaders.h
index e68da0be82..5bc04d3066 100644
--- a/src/core/stdclist/src/commonheaders.h
+++ b/src/core/stdclist/src/commonheaders.h
@@ -26,8 +26,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #define _WIN32_WINNT 0x0600
 #define _WIN32_IE 0x0501
 
-#include "m_stdhdr.h"
-
 #include <windows.h>
 #include <vssym32.h>
 #include <commctrl.h>
diff --git a/src/core/stdmsg/src/commonheaders.h b/src/core/stdmsg/src/commonheaders.h
index 31e72d7ff1..83e20872e2 100644
--- a/src/core/stdmsg/src/commonheaders.h
+++ b/src/core/stdmsg/src/commonheaders.h
@@ -26,8 +26,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #define _CRT_SECURE_NO_WARNINGS
 
-#include <m_stdhdr.h>
-
 #include <windows.h>
 #include <windowsx.h>
 #include <ole2.h>
@@ -36,6 +34,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <commctrl.h>
 #include <vssym32.h>
 
+#include <malloc.h>
 #include <time.h>
 
 #include "resource.h"
diff --git a/src/mir_core/commonheaders.h b/src/mir_core/commonheaders.h
index 600d7bc9b0..4a76153e96 100644
--- a/src/mir_core/commonheaders.h
+++ b/src/mir_core/commonheaders.h
@@ -27,8 +27,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #define INCL_WINSOCK_API_TYPEDEFS 1
 
-#include "m_stdhdr.h"
-
 #include <winsock2.h>
 #include <ws2tcpip.h>
 #include <windows.h>
@@ -38,6 +36,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <commctrl.h>
 #include <vssym32.h>
 
+#include <malloc.h>
 #include <stdio.h>
 #include <time.h>
 #include <stddef.h>