21 years after Win2k release we don't need win2k.h - everything we need is included into minimum Windows SDK 7.1

97 files changed, 27 insertions, 102 deletions

diff --git a/plugins/AVS/src/stdafx.h b/plugins/AVS/src/stdafx.h
index 42419679a2..b698cbf861 100644
--- a/plugins/AVS/src/stdafx.h
+++ b/plugins/AVS/src/stdafx.h
@@ -29,7 +29,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <time.h>

 #include <malloc.h>

 

-#include <win2k.h>

 #include <newpluginapi.h>

 #include <m_clist.h>

 #include <m_contacts.h>

diff --git a/plugins/AddContactPlus/src/stdafx.h b/plugins/AddContactPlus/src/stdafx.h
index 1b31806a90..a95604ac51 100644
--- a/plugins/AddContactPlus/src/stdafx.h
+++ b/plugins/AddContactPlus/src/stdafx.h
@@ -25,7 +25,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include <commctrl.h>

 #include <limits.h>

 

-#include <win2k.h>

 #include <newpluginapi.h>

 #include <m_utils.h>

 #include <m_clistint.h>

diff --git a/plugins/Alarms/src/stdafx.h b/plugins/Alarms/src/stdafx.h
index edb0265094..ef193d0b23 100755
--- a/plugins/Alarms/src/stdafx.h
+++ b/plugins/Alarms/src/stdafx.h
@@ -20,7 +20,6 @@
 #include <m_cluiframes.h>

 #include <m_fontservice.h>

 #include <m_icolib.h>

-#include <win2k.h>

 

 #include <m_toptoolbar.h>

 #include <m_alarms.h>

diff --git a/plugins/AssocMgr/src/reg.cpp b/plugins/AssocMgr/src/reg.cpp
index 82f19f5040..fda90a497c 100644
--- a/plugins/AssocMgr/src/reg.cpp
+++ b/plugins/AssocMgr/src/reg.cpp
@@ -21,6 +21,30 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 #include "stdafx.h"

 

+#ifndef FILETYPEATTRIBUTEFLAGS

+	#define FTA_Exclude               0x00000001

+	#define FTA_Show                  0x00000002

+	#define FTA_HasExtension          0x00000004

+	#define FTA_NoEdit                0x00000008

+	#define FTA_NoRemove              0x00000010

+	#define FTA_NoNewVerb             0x00000020

+	#define FTA_NoEditVerb            0x00000040

+	#define FTA_NoRemoveVerb          0x00000080

+	#define FTA_NoEditDesc            0x00000100

+	#define FTA_NoEditIcon            0x00000200

+	#define FTA_NoEditDflt            0x00000400

+	#define FTA_NoEditVerbCmd         0x00000800

+	#define FTA_NoEditVerbExe         0x00001000

+	#define FTA_NoDDE                 0x00002000

+	#define FTA_NoEditMIME            0x00008000

+	#define FTA_OpenIsSafe            0x00010000

+	#define FTA_AlwaysUnsafe          0x00020000

+	#define FTA_AlwaysShowExt         0x00040000

+	#define FTA_NoRecentDocs          0x00100000

+	#define FTA_SafeForElevation      0x00200000

+	#define FTA_AlwaysUseDirectInvoke 0x00400000

+#endif  /* FTA_Exclude */

+

 #ifdef _DEBUG

 // Debug: Ensure all registry calls do succeed and have valid parameters.

 // Shows a details message box otherwise.

@@ -604,9 +628,9 @@ BOOL AddRegClass(const char *pszClassName, const wchar_t *pszTypeDescription, co
 		{

 			DWORD dwFlags = 0, dwSize = sizeof(dwFlags);

 			RegQueryValueEx(hClassKey, L"EditFlags", nullptr, nullptr, (BYTE*)&dwFlags, &dwSize);

-			if (fBrowserAutoOpen) dwFlags = (dwFlags&~FTA_AlwaysUnsafe) | FTA_OpenIsSafe;

+			if (fBrowserAutoOpen) dwFlags = (dwFlags & ~FTA_AlwaysUnsafe) | FTA_OpenIsSafe;

 			if (!fUrlProto) dwFlags |= FTA_HasExtension;

-			else dwFlags = (dwFlags&~FTA_HasExtension) | FTA_Show; // show classes without extension

+			else dwFlags = (dwFlags & ~FTA_HasExtension) | FTA_Show; // show classes without extension

 			RegSetValueEx(hClassKey, L"EditFlags", 0, REG_DWORD, (BYTE*)&dwFlags, sizeof(dwFlags));

 		}

 		if (fIsShortcut) {

diff --git a/plugins/AssocMgr/src/stdafx.h b/plugins/AssocMgr/src/stdafx.h
index 09096de40b..e4f910ac70 100644
--- a/plugins/AssocMgr/src/stdafx.h
+++ b/plugins/AssocMgr/src/stdafx.h
@@ -35,7 +35,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <m_options.h>

 #include <m_clist.h>

 #include <m_gui.h>

-#include "win2k.h"

 

 #include "m_assocmgr.h"

 

diff --git a/plugins/AutoRun/src/stdafx.h b/plugins/AutoRun/src/stdafx.h
index 8de5e959f3..dfafa2cbdd 100644
--- a/plugins/AutoRun/src/stdafx.h
+++ b/plugins/AutoRun/src/stdafx.h
@@ -6,7 +6,6 @@
 #include <m_langpack.h>

 #include <m_options.h>

 #include <m_database.h>

-#include <win2k.h>

 

 #include "resource.h"

 #include "version.h"

diff --git a/plugins/AutoShutdown/src/stdafx.h b/plugins/AutoShutdown/src/stdafx.h
index e541eacbb1..e45715116c 100644
--- a/plugins/AutoShutdown/src/stdafx.h
+++ b/plugins/AutoShutdown/src/stdafx.h
@@ -52,7 +52,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <m_message.h>

 #include <m_file.h>

 #include <m_idle.h>

-#include <win2k.h>

 #include <m_clistint.h>

 #include <m_cluiframes.h>

 #include <m_fontservice.h>

diff --git a/plugins/AvatarHistory/src/stdafx.h b/plugins/AvatarHistory/src/stdafx.h
index 1bf87a8b61..69cdfc1246 100644
--- a/plugins/AvatarHistory/src/stdafx.h
+++ b/plugins/AvatarHistory/src/stdafx.h
@@ -20,7 +20,6 @@
 #include <m_imgsrvc.h>

 #include <m_timezones.h>

 #include <m_icolib.h>

-#include <win2k.h>

 

 #include <m_folders.h>

 #include <m_metacontacts.h>

diff --git a/plugins/BASS_interface/src/stdafx.h b/plugins/BASS_interface/src/stdafx.h
index 48bfe04616..b3afaccd9c 100644
--- a/plugins/BASS_interface/src/stdafx.h
+++ b/plugins/BASS_interface/src/stdafx.h
@@ -13,7 +13,6 @@ Copyright (C) 2010, 2011 tico-tico
 #include <m_skin.h>

 #include <m_database.h>

 #include <m_options.h>

-#include <win2k.h>

 #include <m_clistint.h>

 #include <m_cluiframes.h>

 #include <m_fontservice.h>

diff --git a/plugins/BasicHistory/src/stdafx.h b/plugins/BasicHistory/src/stdafx.h
index 81269b85ff..d7714814f4 100644
--- a/plugins/BasicHistory/src/stdafx.h
+++ b/plugins/BasicHistory/src/stdafx.h
@@ -53,7 +53,6 @@
 #include <m_clc.h>

 #include <m_utils.h>

 #include <m_popup.h>

-#include <win2k.h>

 

 #include "m_toptoolbar.h"

 #include "m_smileyadd.h"

diff --git a/plugins/BossKeyPlus/src/stdafx.h b/plugins/BossKeyPlus/src/stdafx.h
index faf4c00535..2e8cd39402 100644
--- a/plugins/BossKeyPlus/src/stdafx.h
+++ b/plugins/BossKeyPlus/src/stdafx.h
@@ -40,7 +40,6 @@
 #include <m_message.h>

 #include <m_hotkeys.h>

 #include <m_gui.h>

-#include <win2k.h>

 

 #include <m_variables.h>

 #include <m_toptoolbar.h>

diff --git a/plugins/BuddyExpectator/src/stdafx.h b/plugins/BuddyExpectator/src/stdafx.h
index 32063d5756..68145e12fa 100644
--- a/plugins/BuddyExpectator/src/stdafx.h
+++ b/plugins/BuddyExpectator/src/stdafx.h
@@ -35,7 +35,6 @@
 #include <m_langpack.h>

 #include <m_options.h>

 #include <m_protosvc.h>

-#include <win2k.h>

 #include <m_message.h>

 #include <m_userinfo.h>

 #include <m_icolib.h>

diff --git a/plugins/BuddyPounce/src/stdafx.h b/plugins/BuddyPounce/src/stdafx.h
index dcebbbcd04..f3a346aef5 100644
--- a/plugins/BuddyPounce/src/stdafx.h
+++ b/plugins/BuddyPounce/src/stdafx.h
@@ -15,7 +15,6 @@
 #include <m_protocols.h>

 #include <m_options.h>

 #include <m_protosvc.h>

-#include <win2k.h>

 

 #include "resource.h"

 #include "version.h"

diff --git a/plugins/CSList/src/stdafx.h b/plugins/CSList/src/stdafx.h
index b2d0f0a639..b70f359d2e 100644
--- a/plugins/CSList/src/stdafx.h
+++ b/plugins/CSList/src/stdafx.h
@@ -47,7 +47,6 @@ Offers List of your Custom Statuses.
 #include <m_hotkeys.h>

 

 #include <m_variables.h>

-#include <win2k.h>

 

 #include "resource.h"

 #include "version.h"

diff --git a/plugins/ChangeKeyboardLayout/src/stdafx.h b/plugins/ChangeKeyboardLayout/src/stdafx.h
index ee2cb8bdec..d76e96c72f 100644
--- a/plugins/ChangeKeyboardLayout/src/stdafx.h
+++ b/plugins/ChangeKeyboardLayout/src/stdafx.h
@@ -14,7 +14,6 @@
 #include <m_popup.h>

 #include <m_utils.h>

 #include <m_icolib.h>

-#include <win2k.h>

 

 #include <m_ieview.h>

 #include <m_changekeyboardlayout.h>

diff --git a/plugins/ClientChangeNotify/src/stdafx.h b/plugins/ClientChangeNotify/src/stdafx.h
index b152ec70e5..fe24e4bb86 100644
--- a/plugins/ClientChangeNotify/src/stdafx.h
+++ b/plugins/ClientChangeNotify/src/stdafx.h
@@ -47,7 +47,6 @@
 #include "m_protosvc.h"

 #include "m_icolib.h"

 #include "m_genmenu.h"

-#include "win2k.h"

 #include "m_metacontacts.h"

 #include "m_netlib.h"

 

diff --git a/plugins/Clist_blind/src/stdafx.h b/plugins/Clist_blind/src/stdafx.h
index 84cf3bf1ec..4afbfc5001 100644
--- a/plugins/Clist_blind/src/stdafx.h
+++ b/plugins/Clist_blind/src/stdafx.h
@@ -35,7 +35,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <m_langpack.h>

 #include <m_options.h>

 #include <m_protosvc.h>

-#include <win2k.h>

 

 #include "resource.h"

 #include "version.h"

diff --git a/plugins/Clist_modern/src/modern_clisttray.cpp b/plugins/Clist_modern/src/modern_clisttray.cpp
index b284e83e37..bef48fc9ef 100644
--- a/plugins/Clist_modern/src/modern_clisttray.cpp
+++ b/plugins/Clist_modern/src/modern_clisttray.cpp
@@ -31,7 +31,6 @@ BOOL IS_WM_MOUSE_DOWN_IN_TRAY;
 BOOL g_trayTooltipActive = FALSE;

 POINT tray_hover_pos = { 0 };

 

-// don't move to win2k.h, need new and old versions to work on 9x/2000/XP

 #define NIF_STATE       0x00000008

 #define NIF_INFO        0x00000010

 

diff --git a/plugins/Clist_modern/src/stdafx.h b/plugins/Clist_modern/src/stdafx.h
index a6d87989a9..4fca6633eb 100644
--- a/plugins/Clist_modern/src/stdafx.h
+++ b/plugins/Clist_modern/src/stdafx.h
@@ -74,7 +74,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 #include <newpluginapi.h>

 #include <m_system.h>

-#include <win2k.h>

 #include <m_database.h>

 #include <m_langpack.h>

 #include <m_options.h>

diff --git a/plugins/Clist_nicer/src/coolscroll.h b/plugins/Clist_nicer/src/coolscroll.h
index 4ffc36fdf7..a77ad2f8b8 100644
--- a/plugins/Clist_nicer/src/coolscroll.h
+++ b/plugins/Clist_nicer/src/coolscroll.h
@@ -6,7 +6,6 @@ extern "C"{
 #endif

 

 #include <windows.h>

-#include <win2k.h>

 

 // To complement the exisiting SB_HORZ, SB_VERT, SB_BOTH

 // scrollbar identifiers

diff --git a/plugins/Clist_nicer/src/stdafx.h b/plugins/Clist_nicer/src/stdafx.h
index a540037329..80427aa16a 100644
--- a/plugins/Clist_nicer/src/stdafx.h
+++ b/plugins/Clist_nicer/src/stdafx.h
@@ -40,7 +40,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <time.h>

 

 #include <newpluginapi.h>

-#include <win2k.h>

 #include <m_clistint.h>

 #include <m_database.h>

 #include <m_system.h>

diff --git a/plugins/Console/src/stdafx.h b/plugins/Console/src/stdafx.h
index 3edfa2ab6e..31723041c8 100644
--- a/plugins/Console/src/stdafx.h
+++ b/plugins/Console/src/stdafx.h
@@ -29,7 +29,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <malloc.h>

 

 #include <newpluginapi.h>

-#include <win2k.h>

 #include <m_netlib.h>

 #include <m_database.h>

 #include <m_options.h>

diff --git a/plugins/ContactsPlus/src/stdafx.h b/plugins/ContactsPlus/src/stdafx.h
index c83bee9491..88a37c043f 100644
--- a/plugins/ContactsPlus/src/stdafx.h
+++ b/plugins/ContactsPlus/src/stdafx.h
@@ -42,7 +42,6 @@
 #include "m_userinfo.h"

 #include "m_button.h"

 #include "m_message.h"

-#include "win2k.h"

 

 #include "resource.h"

 #include "version.h"

diff --git a/plugins/CountryFlags/src/stdafx.h b/plugins/CountryFlags/src/stdafx.h
index 25142a7e1c..cebfc5762e 100644
--- a/plugins/CountryFlags/src/stdafx.h
+++ b/plugins/CountryFlags/src/stdafx.h
@@ -24,8 +24,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <windows.h>

 #include <commctrl.h>  /* for ImageList functions */

 

-#include <win2k.h>

-

 #include <newpluginapi.h>

 #include <m_langpack.h>

 #include <m_icolib.h>

diff --git a/plugins/Db3x_mmap/src/stdafx.h b/plugins/Db3x_mmap/src/stdafx.h
index b14c1e0786..3882bb5d89 100644
--- a/plugins/Db3x_mmap/src/stdafx.h
+++ b/plugins/Db3x_mmap/src/stdafx.h
@@ -35,7 +35,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <memory>

 

 #include <newpluginapi.h>

-#include <win2k.h>

 #include <m_system.h>

 #include <m_database.h>

 #include <m_langpack.h>

diff --git a/plugins/DbChecker/src/stdafx.h b/plugins/DbChecker/src/stdafx.h
index c08189312e..b6cbb59ae2 100644
--- a/plugins/DbChecker/src/stdafx.h
+++ b/plugins/DbChecker/src/stdafx.h
@@ -35,7 +35,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <m_gui.h>
 #include <m_icolib.h>
 #include <m_langpack.h>
-#include <win2k.h>
 
 #include "resource.h"
 #include "version.h"
diff --git a/plugins/DbEditorPP/src/stdafx.h b/plugins/DbEditorPP/src/stdafx.h
index 85d47b9edd..afe1a23d68 100644
--- a/plugins/DbEditorPP/src/stdafx.h
+++ b/plugins/DbEditorPP/src/stdafx.h
@@ -13,7 +13,6 @@
 #include <shlwapi.h>

 #include <process.h>

 #include <string.h>

-#include <win2k.h>

 #include <malloc.h>

 

 #include <newpluginapi.h>

diff --git a/plugins/Dbx_mdbx/src/stdafx.h b/plugins/Dbx_mdbx/src/stdafx.h
index 7c5f564922..a3b257bc8e 100644
--- a/plugins/Dbx_mdbx/src/stdafx.h
+++ b/plugins/Dbx_mdbx/src/stdafx.h
@@ -38,7 +38,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <string>

 

 #include <newpluginapi.h>

-#include <win2k.h>

 #include <m_system.h>

 #include <m_database.h>

 #include <m_langpack.h>

diff --git a/plugins/ExternalAPI/m_variables.h b/plugins/ExternalAPI/m_variables.h
index 3a7605c118..0dd9cfd828 100644
--- a/plugins/ExternalAPI/m_variables.h
+++ b/plugins/ExternalAPI/m_variables.h
@@ -28,10 +28,6 @@
 #include <m_button.h>

 #endif

 

-#ifndef _countof

-#include <win2k.h>

-#endif

-

 // --------------------------------------------------------------------------

 // String formatting

 // --------------------------------------------------------------------------

diff --git a/plugins/FTPFileYM/src/stdafx.h b/plugins/FTPFileYM/src/stdafx.h
index 0752376744..93959e8ccc 100644
--- a/plugins/FTPFileYM/src/stdafx.h
+++ b/plugins/FTPFileYM/src/stdafx.h
@@ -39,7 +39,6 @@ using namespace std;
 #include <m_options.h>

 #include <m_protosvc.h>

 #include <m_skin.h>

-#include <win2k.h>

 

 #include <m_ftpfile.h>

 

diff --git a/plugins/FavContacts/src/stdafx.h b/plugins/FavContacts/src/stdafx.h
index 84b456665c..f974139199 100644
--- a/plugins/FavContacts/src/stdafx.h
+++ b/plugins/FavContacts/src/stdafx.h
@@ -29,7 +29,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <time.h>

 #include <math.h>

 

-#include <win2k.h>

 #include <newpluginapi.h>

 #include <m_system.h>

 #include <m_database.h>

diff --git a/plugins/FileAsMessage/src/stdafx.h b/plugins/FileAsMessage/src/stdafx.h
index 047f16d9a2..17a663aeb2 100644
--- a/plugins/FileAsMessage/src/stdafx.h
+++ b/plugins/FileAsMessage/src/stdafx.h
@@ -20,7 +20,6 @@
 #include <m_button.h>
 #include <m_netlib.h>
 #include <m_file.h>
-#include <win2k.h>
 
 #include "dialog.h"
 #include "resource.h"
diff --git a/plugins/FingerprintNG/src/stdafx.h b/plugins/FingerprintNG/src/stdafx.h
index 27f6b04b20..e25cb6ae39 100644
--- a/plugins/FingerprintNG/src/stdafx.h
+++ b/plugins/FingerprintNG/src/stdafx.h
@@ -29,7 +29,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 

 // Miranda IM SDK includes

 #include <newpluginapi.h>

-#include <win2k.h>

 #include <m_database.h>

 #include <m_langpack.h>

 #include <m_icolib.h>

diff --git a/plugins/FloatingContacts/src/stdafx.h b/plugins/FloatingContacts/src/stdafx.h
index 5d556a5548..cdde4073c2 100644
--- a/plugins/FloatingContacts/src/stdafx.h
+++ b/plugins/FloatingContacts/src/stdafx.h
@@ -22,7 +22,6 @@
 #include <m_clistint.h>

 #include <m_hotkeys.h>

 #include <m_imgsrvc.h>

-#include <win2k.h>

 

 #include "bitmap_funcs.h"

 #include "fltcont.h"

diff --git a/plugins/HTTPServer/src/Glob.h b/plugins/HTTPServer/src/Glob.h
index fe853b5e00..3b913cc840 100644
--- a/plugins/HTTPServer/src/Glob.h
+++ b/plugins/HTTPServer/src/Glob.h
@@ -27,7 +27,6 @@
 #include <string>

 using namespace std;

 

-#include <win2k.h>

 #include <newpluginapi.h>

 #include <m_database.h>

 #include <m_clistint.h>

diff --git a/plugins/HistoryLinkListPlus/src/stdafx.h b/plugins/HistoryLinkListPlus/src/stdafx.h
index c14165320a..f1dc8bbf58 100644
--- a/plugins/HistoryLinkListPlus/src/stdafx.h
+++ b/plugins/HistoryLinkListPlus/src/stdafx.h
@@ -30,7 +30,6 @@
 #include <m_database.h>

 #include <m_langpack.h>

 #include <m_timezones.h>

-#include <win2k.h>

 #include <m_options.h>

 

 #include "language.h"

diff --git a/plugins/HistorySweeperLight/src/stdafx.h b/plugins/HistorySweeperLight/src/stdafx.h
index 73df99ec90..1c3bfd0e03 100644
--- a/plugins/HistorySweeperLight/src/stdafx.h
+++ b/plugins/HistorySweeperLight/src/stdafx.h
@@ -28,7 +28,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <windows.h>

 #include <time.h>

 

-#include <win2k.h>

 #include <newpluginapi.h>

 #include <m_database.h>

 #include <m_langpack.h>

diff --git a/plugins/IEView/src/stdafx.h b/plugins/IEView/src/stdafx.h
index 40881602f2..fa5ba81185 100644
--- a/plugins/IEView/src/stdafx.h
+++ b/plugins/IEView/src/stdafx.h
@@ -54,7 +54,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <m_smileyadd.h>

 #include <m_srmm_int.h>

 #include <m_timezones.h>

-#include <win2k.h>

 

 #include "IEView.h"

 #include "Utils.h"

diff --git a/plugins/IgnoreState/src/stdafx.h b/plugins/IgnoreState/src/stdafx.h
index b7fced8013..e0514eeb54 100644
--- a/plugins/IgnoreState/src/stdafx.h
+++ b/plugins/IgnoreState/src/stdafx.h
@@ -25,7 +25,6 @@
 #include <windows.h>

 #include <commctrl.h>

 

-#include <win2k.h>

 #include <newpluginapi.h>

 #include <m_database.h>

 #include <m_ignore.h>

diff --git a/plugins/Import/src/stdafx.h b/plugins/Import/src/stdafx.h
index 51f3e93af9..2382cf261f 100644
--- a/plugins/Import/src/stdafx.h
+++ b/plugins/Import/src/stdafx.h
@@ -33,7 +33,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 #include <memory>

 

-#include <win2k.h>

 #include <newpluginapi.h>

 #include <m_langpack.h>

 #include <m_clist.h>

diff --git a/plugins/KeyboardNotify/src/stdafx.h b/plugins/KeyboardNotify/src/stdafx.h
index fa9a0960fe..1f5a4346cf 100644
--- a/plugins/KeyboardNotify/src/stdafx.h
+++ b/plugins/KeyboardNotify/src/stdafx.h
@@ -44,7 +44,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <m_protosvc.h>

 #include <m_skin.h>

 #include <m_xstatus.h>

-#include <win2k.h>

 

 #include "flash.h"

 #include "ignore.h"

diff --git a/plugins/ListeningTo/src/stdafx.h b/plugins/ListeningTo/src/stdafx.h
index bcfab528fe..1f996ec4a1 100644
--- a/plugins/ListeningTo/src/stdafx.h
+++ b/plugins/ListeningTo/src/stdafx.h
@@ -30,7 +30,6 @@ Boston, MA 02111-1307, USA.
 #include <algorithm>

 

 #include <newpluginapi.h>

-#include <win2k.h>

 #include <m_protosvc.h>

 #include <m_langpack.h>

 #include <m_database.h>

diff --git a/plugins/MenuItemEx/src/stdafx.h b/plugins/MenuItemEx/src/stdafx.h
index 701134cafd..94bf0ea81b 100644
--- a/plugins/MenuItemEx/src/stdafx.h
+++ b/plugins/MenuItemEx/src/stdafx.h
@@ -6,7 +6,6 @@
 #include <windows.h>

 

 #include <newpluginapi.h>

-#include <win2k.h>

 #include <m_system.h>

 #include <m_options.h>

 #include <m_contacts.h>

diff --git a/plugins/MirFox/src/common.h b/plugins/MirFox/src/common.h
index b664accb69..208dcfbd2c 100644
--- a/plugins/MirFox/src/common.h
+++ b/plugins/MirFox/src/common.h
@@ -6,7 +6,6 @@
 #include <commctrl.h>

 

 // Miranda headers

-#include <win2k.h>

 #include <newpluginapi.h>

 #include <m_contacts.h>

 #include <m_database.h>

diff --git a/plugins/MirOTR/src/stdafx.h b/plugins/MirOTR/src/stdafx.h
index dfbe88fd4c..b6fbc5529a 100644
--- a/plugins/MirOTR/src/stdafx.h
+++ b/plugins/MirOTR/src/stdafx.h
@@ -35,7 +35,6 @@ using namespace std;
 #include <m_icolib.h>

 #include <m_skin.h>

 #include <m_gui.h>

-#include <win2k.h>

 #include <m_genmenu.h>

 #include <m_options.h>

 

diff --git a/plugins/MobileState/src/stdafx.h b/plugins/MobileState/src/stdafx.h
index fde9068c21..afff4f09f0 100644
--- a/plugins/MobileState/src/stdafx.h
+++ b/plugins/MobileState/src/stdafx.h
@@ -29,7 +29,6 @@
 #include <m_langpack.h>

 #include <m_icolib.h>

 #include <m_extraicons.h>

-#include <win2k.h>

 

 #include "resource.h"

 #include "version.h"

diff --git a/plugins/MsgPopup/src/stdafx.h b/plugins/MsgPopup/src/stdafx.h
index 759bc6436a..1172759da4 100644
--- a/plugins/MsgPopup/src/stdafx.h
+++ b/plugins/MsgPopup/src/stdafx.h
@@ -31,7 +31,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <m_langpack.h>

 #include <m_options.h>

 #include <m_popup.h>

-#include <win2k.h>

 

 #include "options.h"

 #include "resource.h"

diff --git a/plugins/Msg_Export/src/stdafx.h b/plugins/Msg_Export/src/stdafx.h
index 4648e635f6..827cd39447 100755
--- a/plugins/Msg_Export/src/stdafx.h
+++ b/plugins/Msg_Export/src/stdafx.h
@@ -45,7 +45,6 @@ using namespace std;
 #include <m_protosvc.h>

 #include <m_timezones.h>

 #include <m_skin.h>

-#include <win2k.h>

 #include <m_gui.h>

 #include <m_json.h>

 

diff --git a/plugins/MyDetails/src/stdafx.h b/plugins/MyDetails/src/stdafx.h
index c1a073d0eb..9949d13c2e 100644
--- a/plugins/MyDetails/src/stdafx.h
+++ b/plugins/MyDetails/src/stdafx.h
@@ -38,7 +38,6 @@ Boston, MA 02111-1307, USA.
 #include <m_xstatus.h>

 #include <m_icolib.h>

 #include <m_cluiframes.h>

-#include <win2k.h>

 #include <m_gui.h>

 

 #include <m_proto_listeningto.h>

diff --git a/plugins/NewAwaySysMod/src/stdafx.h b/plugins/NewAwaySysMod/src/stdafx.h
index 5ff302b3bb..f9cea15ab4 100644
--- a/plugins/NewAwaySysMod/src/stdafx.h
+++ b/plugins/NewAwaySysMod/src/stdafx.h
@@ -51,7 +51,6 @@
 #include "m_icolib.h"

 #include "m_message.h"

 #include "m_userinfo.h"

-#include "win2k.h"

 

 #include "resource.h"

 

diff --git a/plugins/NewEventNotify/src/stdafx.h b/plugins/NewEventNotify/src/stdafx.h
index 059636e836..f99ad18aa8 100644
--- a/plugins/NewEventNotify/src/stdafx.h
+++ b/plugins/NewEventNotify/src/stdafx.h
@@ -32,7 +32,6 @@
 #include <windows.h>

 #include <time.h>

 

-#include <win2k.h>

 #include <newpluginapi.h>

 #include <m_database.h>

 #include <m_langpack.h>

diff --git a/plugins/NewStory/src/stdafx.h b/plugins/NewStory/src/stdafx.h
index c4a5065c99..cf4437e53a 100644
--- a/plugins/NewStory/src/stdafx.h
+++ b/plugins/NewStory/src/stdafx.h
@@ -31,7 +31,6 @@ Boston, MA 02111-1307, USA.
 
 //Miranda headers
 #include "newpluginapi.h"
-#include "win2k.h"
 #include "m_chat_int.h"
 #include "m_clc.h"
 #include "m_clistint.h"
diff --git a/plugins/NewXstatusNotify/src/stdafx.h b/plugins/NewXstatusNotify/src/stdafx.h
index 48aec9fce8..270cb562d0 100644
--- a/plugins/NewXstatusNotify/src/stdafx.h
+++ b/plugins/NewXstatusNotify/src/stdafx.h
@@ -35,7 +35,6 @@
 #include <malloc.h>

 

 #include <newpluginapi.h>

-#include <win2k.h>

 #include <m_button.h>

 #include <m_clc.h>

 #include <m_contacts.h>

diff --git a/plugins/New_GPG/src/stdafx.h b/plugins/New_GPG/src/stdafx.h
index a61e35b2fd..bd63c508fc 100755
--- a/plugins/New_GPG/src/stdafx.h
+++ b/plugins/New_GPG/src/stdafx.h
@@ -67,7 +67,6 @@ using std::fstream;
 #include <m_icolib.h>
 #include <m_extraicons.h>
 #include <m_gui.h>
-#include <win2k.h>
 
 #include <m_metacontacts.h>
 
diff --git a/plugins/NoHistory/src/stdafx.h b/plugins/NoHistory/src/stdafx.h
index 612f2e2aea..3810ddfb6c 100644
--- a/plugins/NoHistory/src/stdafx.h
+++ b/plugins/NoHistory/src/stdafx.h
@@ -4,7 +4,6 @@
 #include <windows.h>

 #include <commctrl.h>

 

-#include <win2k.h>

 #include <newpluginapi.h>

 #include <m_database.h>

 #include <m_clist.h>

diff --git a/plugins/NotesAndReminders/src/stdafx.h b/plugins/NotesAndReminders/src/stdafx.h
index c7107e60a0..f0a8a2bf7f 100644
--- a/plugins/NotesAndReminders/src/stdafx.h
+++ b/plugins/NotesAndReminders/src/stdafx.h
@@ -7,7 +7,6 @@
 #include <time.h>
 #include <richedit.h>
 
-#include <win2k.h>
 #include <newpluginapi.h>
 #include <m_database.h>
 #include <m_utils.h>
diff --git a/plugins/Nudge/src/stdafx.h b/plugins/Nudge/src/stdafx.h
index 7216df9ab0..a93ce13dca 100644
--- a/plugins/Nudge/src/stdafx.h
+++ b/plugins/Nudge/src/stdafx.h
@@ -21,7 +21,6 @@
 #include <m_database.h>

 #include <m_protosvc.h>

 #include <m_icolib.h>	

-#include <win2k.h>

 

 #include <m_metacontacts.h>

 #include <m_nudge.h>

diff --git a/plugins/OpenFolder/src/stdafx.h b/plugins/OpenFolder/src/stdafx.h
index 2020c78b28..53672789f9 100644
--- a/plugins/OpenFolder/src/stdafx.h
+++ b/plugins/OpenFolder/src/stdafx.h
@@ -9,7 +9,6 @@
 #include <m_langpack.h>

 #include <m_utils.h>

 #include <m_hotkeys.h>

-#include <win2k.h>

 

 #include <m_toptoolbar.h>

 

diff --git a/plugins/PackUpdater/Src/stdafx.h b/plugins/PackUpdater/Src/stdafx.h
index 69b3f64373..1561d42f87 100644
--- a/plugins/PackUpdater/Src/stdafx.h
+++ b/plugins/PackUpdater/Src/stdafx.h
@@ -29,7 +29,6 @@ Boston, MA 02111-1307, USA.
 #include <vector>

 

 // Miranda header files

-#include <win2k.h>

 #include <newpluginapi.h>

 #include <m_clist.h>

 #include <m_skin.h>

diff --git a/plugins/Ping/src/stdafx.h b/plugins/Ping/src/stdafx.h
index 80b2da686d..7fbb838d85 100644
--- a/plugins/Ping/src/stdafx.h
+++ b/plugins/Ping/src/stdafx.h
@@ -24,7 +24,6 @@
 #include <m_cluiframes.h>

 #include <m_fontservice.h>

 #include <m_icolib.h>

-#include <win2k.h>

 

 #include "resource.h"

 #include "collection.h"

diff --git a/plugins/PluginUpdater/src/stdafx.h b/plugins/PluginUpdater/src/stdafx.h
index ccac6fd5d8..41c5d38590 100644
--- a/plugins/PluginUpdater/src/stdafx.h
+++ b/plugins/PluginUpdater/src/stdafx.h
@@ -40,7 +40,6 @@ Boston, MA 02111-1307, USA.
 #include <m_icolib.h>

 #include <m_assocmgr.h>

 #include <m_gui.h>

-#include <win2k.h>

 

 #include <m_folders.h>

 

diff --git a/plugins/Popup/src/stdafx.h b/plugins/Popup/src/stdafx.h
index c469b6501a..56b645dd55 100644
--- a/plugins/Popup/src/stdafx.h
+++ b/plugins/Popup/src/stdafx.h
@@ -61,7 +61,6 @@ https://miranda-ng.org/distr/
 #include <Uxtheme.h>

 

 #include <newpluginapi.h>

-#include <win2k.h>

 #include <m_clistint.h>

 #include <m_options.h>

 #include <m_skin.h>

diff --git a/plugins/ProfileManager/src/stdafx.h b/plugins/ProfileManager/src/stdafx.h
index 26b605671a..5d730a7b90 100644
--- a/plugins/ProfileManager/src/stdafx.h
+++ b/plugins/ProfileManager/src/stdafx.h
@@ -7,7 +7,6 @@
 #include <m_genmenu.h>

 #include <m_clist.h>

 #include <m_utils.h>

-#include <win2k.h>

 

 #include "resource.h"

 #include "version.h"

diff --git a/plugins/QuickContacts/src/stdafx.h b/plugins/QuickContacts/src/stdafx.h
index 88dab13406..3f40173ac1 100644
--- a/plugins/QuickContacts/src/stdafx.h
+++ b/plugins/QuickContacts/src/stdafx.h
@@ -39,7 +39,6 @@ Boston, MA 02111-1307, USA.
 #include <m_history.h>

 #include <m_icolib.h>

 #include <m_hotkeys.h>

-#include <win2k.h>

 

 #include <m_metacontacts.h>

 #include <m_quickcontacts.h>

diff --git a/plugins/QuickMessages/src/stdafx.h b/plugins/QuickMessages/src/stdafx.h
index e3f0bcfa72..aab8622051 100644
--- a/plugins/QuickMessages/src/stdafx.h
+++ b/plugins/QuickMessages/src/stdafx.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <m_protosvc.h>

 #include <m_srmm_int.h>

 #include <m_utils.h>

-#include <win2k.h>

 

 #include "resource.h"

 #include "version.h"

diff --git a/plugins/Rate/src/stdafx.h b/plugins/Rate/src/stdafx.h
index 3523bdd1f9..ddcb3ef2d3 100644
--- a/plugins/Rate/src/stdafx.h
+++ b/plugins/Rate/src/stdafx.h
@@ -20,7 +20,6 @@
 

 #include <windows.h>

 

-#include <win2k.h>

 #include <newpluginapi.h>

 #include <m_database.h>

 #include <m_langpack.h>

diff --git a/plugins/RecentContacts/src/stdafx.h b/plugins/RecentContacts/src/stdafx.h
index 1f9f020b49..c984a9e4af 100644
--- a/plugins/RecentContacts/src/stdafx.h
+++ b/plugins/RecentContacts/src/stdafx.h
@@ -17,7 +17,6 @@
 #include <m_hotkeys.h>

 #include <m_protosvc.h>

 #include <m_options.h>

-#include <win2k.h>

 

 #include <m_toptoolbar.h>

 

diff --git a/plugins/Restart/src/stdafx.h b/plugins/Restart/src/stdafx.h
index 13536d7f07..e8767c7f41 100644
--- a/plugins/Restart/src/stdafx.h
+++ b/plugins/Restart/src/stdafx.h
@@ -8,7 +8,6 @@
 #include <m_genmenu.h>

 #include <m_clist.h>

 #include <m_utils.h>

-#include <win2k.h>

 

 #include "resource.h"

 #include "version.h"

diff --git a/plugins/Scriver/src/stdafx.h b/plugins/Scriver/src/stdafx.h
index 62c24c9887..b439a70149 100644
--- a/plugins/Scriver/src/stdafx.h
+++ b/plugins/Scriver/src/stdafx.h
@@ -62,7 +62,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <m_xstatus.h>

 #include <m_chat_int.h>

 #include <m_srmm_int.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 4a4078f231..bbd2c7e47d 100644
--- a/plugins/SecureIM/src/commonheaders.h
+++ b/plugins/SecureIM/src/commonheaders.h
@@ -19,7 +19,6 @@
 #include <process.h>

 #include <time.h>

 

-#include <win2k.h>

 #include <newpluginapi.h>

 #include <m_contacts.h>

 #include <m_database.h>

diff --git a/plugins/SeenPlugin/src/stdafx.h b/plugins/SeenPlugin/src/stdafx.h
index 9f75e8522d..af9f7c8354 100644
--- a/plugins/SeenPlugin/src/stdafx.h
+++ b/plugins/SeenPlugin/src/stdafx.h
@@ -31,7 +31,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <malloc.h>

 #include <time.h>

 

-#include <win2k.h>

 #include <newpluginapi.h>

 #include <m_database.h>

 #include <m_langpack.h>

diff --git a/plugins/SendScreenshotPlus/src/stdafx.h b/plugins/SendScreenshotPlus/src/stdafx.h
index a4fe53bdee..11b55b6e2f 100644
--- a/plugins/SendScreenshotPlus/src/stdafx.h
+++ b/plugins/SendScreenshotPlus/src/stdafx.h
@@ -43,7 +43,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #include <string>
 using namespace std;
 
-#include <win2k.h>
 #include <msapi/vsstyle.h>
 #include <msapi/vssym32.h>
 
diff --git a/plugins/Sessions/Src/stdafx.h b/plugins/Sessions/Src/stdafx.h
index f365495e02..41cfa7aa1b 100644
--- a/plugins/Sessions/Src/stdafx.h
+++ b/plugins/Sessions/Src/stdafx.h
@@ -37,7 +37,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <m_message.h>

 #include <m_clistint.h>

 #include <m_hotkeys.h>

-#include <win2k.h>

 

 #include <m_toptoolbar.h>

 #include <m_sessions.h>

diff --git a/plugins/ShellExt/src/stdafx.h b/plugins/ShellExt/src/stdafx.h
index a40ae5dee1..c0e846187d 100644
--- a/plugins/ShellExt/src/stdafx.h
+++ b/plugins/ShellExt/src/stdafx.h
@@ -20,7 +20,6 @@
 #include <m_langpack.h>

 #include <m_options.h>

 #include <m_database.h>

-#include <win2k.h>

 

 #include "version.h"

 

diff --git a/plugins/SimpleStatusMsg/src/stdafx.h b/plugins/SimpleStatusMsg/src/stdafx.h
index 967308dedd..402d93dab3 100644
--- a/plugins/SimpleStatusMsg/src/stdafx.h
+++ b/plugins/SimpleStatusMsg/src/stdafx.h
@@ -37,7 +37,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include <m_icolib.h>

 #include <m_hotkeys.h>

 #include <m_gui.h>

-#include <win2k.h>

 

 #include <m_statusplugins.h>

 #include <m_toptoolbar.h>

diff --git a/plugins/SkypeStatusChange/src/stdafx.h b/plugins/SkypeStatusChange/src/stdafx.h
index 80a056e8ee..b289ef3b4a 100644
--- a/plugins/SkypeStatusChange/src/stdafx.h
+++ b/plugins/SkypeStatusChange/src/stdafx.h
@@ -13,7 +13,6 @@
 #include <m_options.h>

 #include <m_langpack.h>

 #include <m_utils.h>

-#include <win2k.h>

 

 struct CMPlugin : public PLUGIN<CMPlugin>

 {

diff --git a/plugins/SmileyAdd/src/stdafx.h b/plugins/SmileyAdd/src/stdafx.h
index 7de275f731..9b0df601a5 100644
--- a/plugins/SmileyAdd/src/stdafx.h
+++ b/plugins/SmileyAdd/src/stdafx.h
@@ -50,7 +50,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 

 #define NETLIB_NOLOGGING

 

-#include <win2k.h>

 #include <newpluginapi.h>

 #include <m_button.h>

 #include <m_clist.h>

diff --git a/plugins/SpellChecker/src/stdafx.h b/plugins/SpellChecker/src/stdafx.h
index 6907c7aa30..de0e4a153f 100644
--- a/plugins/SpellChecker/src/stdafx.h
+++ b/plugins/SpellChecker/src/stdafx.h
@@ -43,7 +43,6 @@ using namespace std;
 #include <m_message.h>

 #include <m_icolib.h>

 #include <m_hotkeys.h>

-#include <win2k.h>

 #include <m_system.h>

 

 //own includes

diff --git a/plugins/SplashScreen/src/stdafx.h b/plugins/SplashScreen/src/stdafx.h
index 10fd640553..67ce5b6130 100644
--- a/plugins/SplashScreen/src/stdafx.h
+++ b/plugins/SplashScreen/src/stdafx.h
@@ -27,7 +27,6 @@
 #include <time.h>

 #include <dshow.h>

 

-#include <win2k.h>

 #include <newpluginapi.h>

 #include <m_database.h>

 #include <m_clist.h>

diff --git a/plugins/StartupSilence/src/stdafx.h b/plugins/StartupSilence/src/stdafx.h
index 97a37291c3..821eee234a 100644
--- a/plugins/StartupSilence/src/stdafx.h
+++ b/plugins/StartupSilence/src/stdafx.h
@@ -15,7 +15,6 @@
 #include <m_options.h>

 #include <m_protocols.h>

 #include <m_system.h>

-#include "win2k.h"

 

 #include <m_toptoolbar.h>

 

diff --git a/plugins/StatusManager/src/stdafx.h b/plugins/StatusManager/src/stdafx.h
index 52fdc095df..79f1a1e99b 100644
--- a/plugins/StatusManager/src/stdafx.h
+++ b/plugins/StatusManager/src/stdafx.h
@@ -32,7 +32,6 @@
 #include <m_skin.h>
 #include <m_utils.h>
 #include <m_variables.h>
-#include <win2k.h>
 
 #include "version.h"
 #include "resource.h"
diff --git a/plugins/TabSRMM/src/stdafx.h b/plugins/TabSRMM/src/stdafx.h
index f676067a79..8520aa40ec 100644
--- a/plugins/TabSRMM/src/stdafx.h
+++ b/plugins/TabSRMM/src/stdafx.h
@@ -50,7 +50,6 @@
 

 #include <m_avatars.h>

 #include <m_message.h>

-#include <win2k.h>

 #include <newpluginapi.h>

 #include <m_imgsrvc.h>

 #include <m_database.h>

diff --git a/plugins/TipperYM/src/stdafx.h b/plugins/TipperYM/src/stdafx.h
index 0804c9e2af..1bc6c5d898 100644
--- a/plugins/TipperYM/src/stdafx.h
+++ b/plugins/TipperYM/src/stdafx.h
@@ -28,7 +28,6 @@ Boston, MA 02111-1307, USA.
 #include <windowsx.h>

 #include <malloc.h>

 

-#include <win2k.h>

 #include <newpluginapi.h>

 #include <m_avatars.h>

 #include <m_awaymsg.h>

diff --git a/plugins/TipperYM/src/translations.cpp b/plugins/TipperYM/src/translations.cpp
index 36bfd55bc4..3f506ac7c8 100644
--- a/plugins/TipperYM/src/translations.cpp
+++ b/plugins/TipperYM/src/translations.cpp
@@ -656,7 +656,7 @@ wchar_t *TimezoneToTime(MCONTACT hContact, const char *szModuleName, const char
 		timezone += tzi.DaylightBias / 30;

 

 	lift.QuadPart = *(__int64*)&ft;

-	lift.QuadPart -= (__int64)timezone * BIGI(30) * BIGI(60) * BIGI(10000000);

+	lift.QuadPart -= (__int64)timezone * 30ll * 60ll * 10000000ll;

 	*(__int64*)&ft = lift.QuadPart;

 	FileTimeToSystemTime(&ft, &st);

 	GetTimeFormat(LOCALE_USER_DEFAULT, TIME_NOSECONDS, &st, nullptr, buff, bufflen);

diff --git a/plugins/TooltipNotify/src/stdafx.h b/plugins/TooltipNotify/src/stdafx.h
index 2edef92a43..b1468020a3 100644
--- a/plugins/TooltipNotify/src/stdafx.h
+++ b/plugins/TooltipNotify/src/stdafx.h
@@ -24,7 +24,6 @@
 #include <m_langpack.h>

 #include <m_clc.h>

 #include <m_fontservice.h>

-#include <win2k.h>

 

 #define MODULENAME "TooltipNotify"

 

diff --git a/plugins/TopToolBar/src/stdafx.h b/plugins/TopToolBar/src/stdafx.h
index 1b2cd4f566..949f641402 100644
--- a/plugins/TopToolBar/src/stdafx.h
+++ b/plugins/TopToolBar/src/stdafx.h
@@ -5,7 +5,6 @@
 #include <commctrl.h>

 #include <stddef.h>

 

-#include <win2k.h>

 #include <newpluginapi.h>

 #include <m_database.h>

 #include <m_skin.h>

diff --git a/plugins/TrafficCounter/src/stdafx.h b/plugins/TrafficCounter/src/stdafx.h
index 01fc381ec8..8b15e10c58 100644
--- a/plugins/TrafficCounter/src/stdafx.h
+++ b/plugins/TrafficCounter/src/stdafx.h
@@ -24,7 +24,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <windowsx.h>

 #include <commctrl.h>

 

-#include <win2k.h>

 #include <m_system.h>

 

 #include <newpluginapi.h>

diff --git a/plugins/TranslitSwitcher/src/stdafx.h b/plugins/TranslitSwitcher/src/stdafx.h
index 1d97874651..eb7fc77fab 100644
--- a/plugins/TranslitSwitcher/src/stdafx.h
+++ b/plugins/TranslitSwitcher/src/stdafx.h
@@ -27,7 +27,6 @@ Boston, MA 02111-1307, USA.
 #include <m_langpack.h>

 #include <m_utils.h>

 #include <m_hotkeys.h>

-#include <win2k.h>

 #include <m_icolib.h>

 #include <m_popup.h>

 #include <m_srmm_int.h>

diff --git a/plugins/UserInfoEx/src/stdafx.h b/plugins/UserInfoEx/src/stdafx.h
index c6bcb36aea..79494a1969 100644
--- a/plugins/UserInfoEx/src/stdafx.h
+++ b/plugins/UserInfoEx/src/stdafx.h
@@ -64,7 +64,6 @@ using namespace std;
 #include <m_message.h>

 #include <m_userinfo.h>

 #include <m_email.h>

-#include <win2k.h>

 #include <msapi/vsstyle.h>

 #include <msapi/vssym32.h>

 #include <m_skin.h>

diff --git a/plugins/Variables/src/stdafx.h b/plugins/Variables/src/stdafx.h
index 5fc89bf167..7147e2e8b6 100644
--- a/plugins/Variables/src/stdafx.h
+++ b/plugins/Variables/src/stdafx.h
@@ -32,7 +32,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #include <pdh.h>

 #include <pdhmsg.h>

 

-#include <win2k.h>

 #include <newpluginapi.h>

 #include <m_langpack.h>

 #include <m_database.h>

diff --git a/plugins/VoiceService/src/stdafx.h b/plugins/VoiceService/src/stdafx.h
index 22408dfe48..b0d759deed 100644
--- a/plugins/VoiceService/src/stdafx.h
+++ b/plugins/VoiceService/src/stdafx.h
@@ -37,7 +37,6 @@ Boston, MA 02111-1307, USA.
 using namespace std;
 
 // Miranda headers
-#include <win2k.h>
 #include <newpluginapi.h>
 #include <m_system.h>
 #include <m_protocols.h>
diff --git a/plugins/WhenWasIt/src/stdafx.h b/plugins/WhenWasIt/src/stdafx.h
index 579b5d51a5..080ce8256f 100644
--- a/plugins/WhenWasIt/src/stdafx.h
+++ b/plugins/WhenWasIt/src/stdafx.h
@@ -44,7 +44,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <m_hotkeys.h>

 #include <m_message.h>

 #include <m_extraicons.h>

-#include <win2k.h>

 

 #include <m_toptoolbar.h>

 #include <m_metacontacts.h>

diff --git a/plugins/WhoUsesMyFiles/src/stdafx.h b/plugins/WhoUsesMyFiles/src/stdafx.h
index d83387ebbd..36db3d98f4 100644
--- a/plugins/WhoUsesMyFiles/src/stdafx.h
+++ b/plugins/WhoUsesMyFiles/src/stdafx.h
@@ -13,7 +13,6 @@
 #include <m_skin.h>

 #include <m_utils.h>

 #include <m_popup.h>

-#include <win2k.h>

 

 #include <m_toptoolbar.h>

 

diff --git a/plugins/WinterSpeak/src/stdafx.h b/plugins/WinterSpeak/src/stdafx.h
index ec79a75723..0778a728d6 100644
--- a/plugins/WinterSpeak/src/stdafx.h
+++ b/plugins/WinterSpeak/src/stdafx.h
@@ -11,7 +11,6 @@
 #include <m_database.h>

 #include <m_genmenu.h>

 #include <m_utils.h>

-#include <win2k.h>

 #include <m_options.h>

 #include <m_protocols.h>

 #include <m_protosvc.h>

diff --git a/plugins/XSoundNotify/src/stdafx.h b/plugins/XSoundNotify/src/stdafx.h
index 9b3fcc09e1..b11bb55a1b 100644
--- a/plugins/XSoundNotify/src/stdafx.h
+++ b/plugins/XSoundNotify/src/stdafx.h
@@ -11,7 +11,6 @@
 #include <m_langpack.h>

 #include <m_clist.h>

 #include <m_skin.h>

-#include <win2k.h>

 #include <m_options.h>

 #include <m_chat_int.h>

 

diff --git a/plugins/YARelay/src/stdafx.h b/plugins/YARelay/src/stdafx.h
index 85acbb020a..9c1ed1eb25 100644
--- a/plugins/YARelay/src/stdafx.h
+++ b/plugins/YARelay/src/stdafx.h
@@ -30,7 +30,6 @@ Features:
 #include <m_contacts.h>

 #include <m_options.h>

 #include <m_protosvc.h>

-#include <win2k.h>

 

 #include "resource.h"

 #include "version.h"

diff --git a/plugins/wbOSD/src/stdafx.h b/plugins/wbOSD/src/stdafx.h
index 2443ce67ca..41a85c54ab 100644
--- a/plugins/wbOSD/src/stdafx.h
+++ b/plugins/wbOSD/src/stdafx.h
@@ -21,7 +21,6 @@ Distributed under GNU's GPL 2 or later
 #include <m_clist.h>

 #include <m_protosvc.h>

 #include <m_ignore.h>

-#include <win2k.h>

 #include <m_message.h>

 

 #include "resource.h"