summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/m_stdhdr.h4
-rw-r--r--include/win2k.h2
-rw-r--r--plugins/BasicHistory/src/stdafx.h1
-rw-r--r--plugins/Clist_modern/src/hdr/modern_commonheaders.h1
-rw-r--r--plugins/Clist_modern/src/modern_skinengine.cpp1
-rw-r--r--plugins/Clist_nicer/src/Include/commonheaders.h3
-rw-r--r--plugins/Scriver/src/chat/log.cpp2
-rw-r--r--plugins/Scriver/src/chat/options.cpp2
-rw-r--r--plugins/Scriver/src/chat/tools.cpp2
-rw-r--r--plugins/Scriver/src/commonheaders.h1
-rw-r--r--plugins/TabSRMM/src/chat/log.cpp1
-rw-r--r--plugins/TabSRMM/src/chat/options.cpp2
-rw-r--r--protocols/Twitter/src/common.h1
-rw-r--r--protocols/Yahoo/src/options.cpp2
-rw-r--r--protocols/Yahoo/src/proto.cpp1
-rw-r--r--protocols/Yahoo/src/yahoo.h1
16 files changed, 9 insertions, 18 deletions
diff --git a/include/m_stdhdr.h b/include/m_stdhdr.h
index eedf55946c..85bebfd5d8 100644
--- a/include/m_stdhdr.h
+++ b/include/m_stdhdr.h
@@ -34,10 +34,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <tchar.h>
-#if _MSC_VER < 1400
-# include <malloc.h> // to avoid a crazy bug in VS2003 header files
-#endif
-
#ifndef __GNUC__
# ifdef _DEBUG
# define _CRTDBG_MAP_ALLOC
diff --git a/include/win2k.h b/include/win2k.h
index 8970828c0d..a7ce81fc0f 100644
--- a/include/win2k.h
+++ b/include/win2k.h
@@ -546,7 +546,7 @@ File created by Christian Kästner, and tweaked a bit by Richard Hughes*/
#endif /* __ITaskbarList3_INTERFACE_DEFINED__ */
#endif /* _SHLOBJ_H_ */
-#ifndef FTA_Exclude
+#ifndef FILETYPEATTRIBUTEFLAGS
#define FTA_Exclude 0x00000001
#define FTA_Show 0x00000002
#define FTA_HasExtension 0x00000004
diff --git a/plugins/BasicHistory/src/stdafx.h b/plugins/BasicHistory/src/stdafx.h
index 32ef7720e7..9bde9513b3 100644
--- a/plugins/BasicHistory/src/stdafx.h
+++ b/plugins/BasicHistory/src/stdafx.h
@@ -30,6 +30,7 @@
#include <locale>
#include <string>
#include <fstream>
+#include <functional>
#define MIRANDA_VER 0x0A00
diff --git a/plugins/Clist_modern/src/hdr/modern_commonheaders.h b/plugins/Clist_modern/src/hdr/modern_commonheaders.h
index 9735c0787f..c8aa087968 100644
--- a/plugins/Clist_modern/src/hdr/modern_commonheaders.h
+++ b/plugins/Clist_modern/src/hdr/modern_commonheaders.h
@@ -73,6 +73,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "m_stdhdr.h"
#include <windows.h>
+#include <Shlwapi.h>
#include <commctrl.h>
#include <uxtheme.h>
#include <vssym32.h>
diff --git a/plugins/Clist_modern/src/modern_skinengine.cpp b/plugins/Clist_modern/src/modern_skinengine.cpp
index 4d3bea9a3c..8e70268998 100644
--- a/plugins/Clist_modern/src/modern_skinengine.cpp
+++ b/plugins/Clist_modern/src/modern_skinengine.cpp
@@ -34,7 +34,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "hdr/modern_skinengine.h"
#include "hdr/modern_commonprototypes.h"
-#include <shlwapi.h>
#include "hdr/modern_sync.h"
//Implementation
diff --git a/plugins/Clist_nicer/src/Include/commonheaders.h b/plugins/Clist_nicer/src/Include/commonheaders.h
index 383ad487d8..87cf90fd3d 100644
--- a/plugins/Clist_nicer/src/Include/commonheaders.h
+++ b/plugins/Clist_nicer/src/Include/commonheaders.h
@@ -56,7 +56,10 @@
#include <direct.h>
#include <math.h>
#include <shlwapi.h>
+#include <Richedit.h>
+
#include "resource.h"
+
#include <newpluginapi.h>
#include <win2k.h>
#include <m_clist.h>
diff --git a/plugins/Scriver/src/chat/log.cpp b/plugins/Scriver/src/chat/log.cpp
index a7fc260fd1..7cffea1360 100644
--- a/plugins/Scriver/src/chat/log.cpp
+++ b/plugins/Scriver/src/chat/log.cpp
@@ -23,8 +23,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "chat.h"
#include <math.h>
#include <mbstring.h>
-#include <shlwapi.h>
-
#ifndef EM_GETSCROLLPOS
#define EM_GETSCROLLPOS (WM_USER+221)
diff --git a/plugins/Scriver/src/chat/options.cpp b/plugins/Scriver/src/chat/options.cpp
index 32d8f5124b..be785840ba 100644
--- a/plugins/Scriver/src/chat/options.cpp
+++ b/plugins/Scriver/src/chat/options.cpp
@@ -21,8 +21,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "../commonheaders.h"
#include "chat.h"
-#include <shlobj.h>
-#include <shlwapi.h>
#define UM_CHECKSTATECHANGE (WM_USER+100)
diff --git a/plugins/Scriver/src/chat/tools.cpp b/plugins/Scriver/src/chat/tools.cpp
index f5adc887a5..43e29a7293 100644
--- a/plugins/Scriver/src/chat/tools.cpp
+++ b/plugins/Scriver/src/chat/tools.cpp
@@ -21,8 +21,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "../commonheaders.h"
#include "chat.h"
-#include <string.h>
-#include <shlwapi.h>
extern FONTINFO aFonts[OPTIONS_FONTCOUNT];
extern HMENU g_hMenu;
diff --git a/plugins/Scriver/src/commonheaders.h b/plugins/Scriver/src/commonheaders.h
index 6271ef0aa9..1818bfd546 100644
--- a/plugins/Scriver/src/commonheaders.h
+++ b/plugins/Scriver/src/commonheaders.h
@@ -38,6 +38,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <windows.h>
#include <shellapi.h>
#include <shlobj.h>
+#include <shlwapi.h>
#include <commctrl.h>
#include <commdlg.h>
#include <ole2.h>
diff --git a/plugins/TabSRMM/src/chat/log.cpp b/plugins/TabSRMM/src/chat/log.cpp
index 48886bf0ba..a421c1aefb 100644
--- a/plugins/TabSRMM/src/chat/log.cpp
+++ b/plugins/TabSRMM/src/chat/log.cpp
@@ -40,7 +40,6 @@
#include "..\commonheaders.h"
#include <math.h>
#include <mbstring.h>
-#include <shlwapi.h>
/*
* The code for streaming the text is to a large extent copied from
diff --git a/plugins/TabSRMM/src/chat/options.cpp b/plugins/TabSRMM/src/chat/options.cpp
index b259319a45..559d3f3adc 100644
--- a/plugins/TabSRMM/src/chat/options.cpp
+++ b/plugins/TabSRMM/src/chat/options.cpp
@@ -40,8 +40,6 @@
#undef Translate
#define TranslateA(s) ((char*)CallService(MS_LANGPACK_TRANSLATESTRING,0,(LPARAM)(s)))
-#include <shlobj.h>
-#include <shlwapi.h>
extern HBRUSH hListBkgBrush;
extern HICON hIcons[30];
diff --git a/protocols/Twitter/src/common.h b/protocols/Twitter/src/common.h
index b9fade2a9f..a400bb84aa 100644
--- a/protocols/Twitter/src/common.h
+++ b/protocols/Twitter/src/common.h
@@ -32,6 +32,7 @@ using std::list;
using std::min;
#include <windows.h>
+#include <Shlwapi.h>
#include "resource.h"
diff --git a/protocols/Yahoo/src/options.cpp b/protocols/Yahoo/src/options.cpp
index 17ff35bb66..0ea1cb4049 100644
--- a/protocols/Yahoo/src/options.cpp
+++ b/protocols/Yahoo/src/options.cpp
@@ -14,8 +14,6 @@
#include "yahoo.h"
#include "resource.h"
-#include <shlwapi.h>
-
#include <m_langpack.h>
#include <m_utils.h>
#include <m_options.h>
diff --git a/protocols/Yahoo/src/proto.cpp b/protocols/Yahoo/src/proto.cpp
index 124048995f..6f4ad4306d 100644
--- a/protocols/Yahoo/src/proto.cpp
+++ b/protocols/Yahoo/src/proto.cpp
@@ -13,7 +13,6 @@
#include "yahoo.h"
-#include <shlwapi.h>
#include <win2k.h>
#include <m_idle.h>
diff --git a/protocols/Yahoo/src/yahoo.h b/protocols/Yahoo/src/yahoo.h
index 29772a0817..001e1a2b3b 100644
--- a/protocols/Yahoo/src/yahoo.h
+++ b/protocols/Yahoo/src/yahoo.h
@@ -26,6 +26,7 @@
#include <time.h>
#include <windows.h>
+#include <shlwapi.h>
/*
* Yahoo Services
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-15 04:48:54 +0000