15 files changed, 128 insertions, 3672 deletions
diff --git a/plugins/yapp/common.h b/plugins/yapp/common.h
index 2b9c3a74ba..380527edca 100644
--- a/plugins/yapp/common.h
+++ b/plugins/yapp/common.h
@@ -54,7 +54,7 @@
 #include <m_popup.h>
 #include <win2k.h>
 
-#include "sdk/m_updater.h"
+#include "m_updater.h"
 
 #include <m_notify.h>
 
diff --git a/plugins/yapp/docs/m_notify.h b/plugins/yapp/docs/m_notify.h
deleted file mode 100644
index f9bce9624e..0000000000
--- a/plugins/yapp/docs/m_notify.h
+++ /dev/null
@@ -1,177 +0,0 @@
-#ifndef __m_notify_h__
-#define __m_notify_h__
-
-/*** Miranda Notify Dispatcher ************************************************\
-Notify Dispatcher provides common interface to different notification plugins
-like osd, popup, ticker etc.
-\******************************************************************************/
-
-/* Options UI event and service. The same as for miranda options */
-#define ME_NOTIFY_OPT_INITIALISE "Notify/Opt/Initialise"
-#define MS_NOTIFY_OPT_ADDPAGE "Notify/Opt/AddPage"
-
-typedef struct tagMNOTIFYACTIONINFO {
-	HICON icon;
-	char name[MAXMODULELABELLENGTH];
-	char service[MAXMODULELABELLENGTH];
-	DWORD cookie;
-} MNOTIFYACTIONINFO;
-
-// Just like miranda pluginLink... This should work faster then services,
-// we need some reactivity in notifications.
-typedef struct tagMNNOTIFYLINK
-{
-	/* Create a new notification type */
-	HANDLE (* Register)(const char *name, HICON icon);
-
-	// Create a new notification object
-	HANDLE (* Create)(HANDLE type);
-
-	// Check is handle is a valid notification object
-	int (* IsValid)(HANDLE notify);
-
-	// Set/get information about object, or type defaults
-	int (* Set)(HANDLE notifyORtype, const char *name, DBVARIANT val);
-	int (* Get)(HANDLE notifyORtype, const char *name, DBVARIANT *val);
-
-	// Set/get actions
-	int (* AddAction)(HANDLE notifyORtype, HICON icon, const char *name, const char *service, DWORD cookie);
-	int (* GetActions)(HANDLE notifyORtype, MNOTIFYACTIONINFO *actions);
-
-	// Increment/decrement refer count of notification object. Unreferred objects are destroyed
-	int (* AddRef)(HANDLE notify);
-	int (* Release)(HANDLE notify);
-
-	// Notify user
-	void (* Show)(HANDLE notify);
-	void (* Update)(HANDLE notify);
-	void (* Remove)(HANDLE notify);
-} MNOTIFYLINK;
-
-// Get the MNOTIFYLINK struct
-// result = (LRESULT)(MNOTIFYLINK*)notifyLink
-#define MS_NOTIFY_GETLINK "Notify/GetLink"
-
-// Hook this to process corresponding actions
-#define ME_NOTIFY_SHOW "Notify/Show"
-#define ME_NOTIFY_UPDATE "Notify/Update"
-#define ME_NOTIFY_REMOVE "Notify/Remove"
-
-#if !defined(MNOTIFY_NOEXTERN)
-	extern
-	#ifdef __cpluplus
-		"C"
-	#endif
-	MNOTIFYLINK *notifyLink;
-#endif
-
-#if !defined(MNOTIFY_NOHELPERS) && !defined(MNOTIFY_NOEXTERN)
-	#define MNotifyRegister(a,b)     (notifyLink?notifyLink->Register((a),(b)):0)
-	#define MNotifyCreate(a)         (notifyLink?notifyLink->Create((a)):0)
-	#define MNotifyIsValid(a)        (notifyLink?notifyLink->IsValid((a)):0)
-	#define MNotifySet(a,b,c)        (notifyLink?notifyLink->Set((a),(b),(c)):0)
-	#define MNotifyGet(a,b,c)        (notifyLink?notifyLink->Get((a),(b),(c)):0)
-	#define MNotifyAddAction(a,b,c)  (notifyLink?notifyLink->AddAction((a),(b),(c)):0)
-	#define MNotifyGetActions(a,b)   (notifyLink?notifyLink->GetActions((a),(b)):0)
-	#define MNotifyGet(a,b,c)        (notifyLink?notifyLink->Get((a),(b),(c)):0)
-	#define MNotifyAddRef(a)         (notifyLink?notifyLink->AddRef((a)):0)
-	#define MNotifyRelease(a)        (notifyLink?notifyLink->Release((a)):0)
-	#define MNotifyShow(a)           (notifyLink?notifyLink->Show(a):0)
-	#define MNotifyUpdate(a)         (notifyLink?notifyLink->Update(a):0)
-	#define MNotifyRemove(a)         (notifyLink?notifyLink->Remove(a):0)
-
-	static void __inline MNotifyGetLink()
-	{
-		notifyLink = ServiceExists(MS_NOTIFY_GETLINK) ? (MNOTIFYLINK *)CallService(MS_NOTIFY_GETLINK,0,0) : 0;
-	}
-
-	// get helpers
-	static __inline BYTE MNotifyGetByte(HANDLE notifyORtype, const char *name, BYTE defValue)
-	{
-		DBVARIANT dbv;
-		MNotifyGet(notifyORtype, name, &dbv);
-		if (dbv.type != DBVT_BYTE) return defValue;
-		return dbv.bVal;
-	}
-	static __inline WORD MNotifyGetWord(HANDLE notifyORtype, const char *name, WORD defValue)
-	{
-		DBVARIANT dbv;
-		MNotifyGet(notifyORtype, name, &dbv);
-		if (dbv.type != DBVT_WORD) return defValue;
-		return dbv.wVal;
-	}
-	static __inline DWORD MNotifyGetDWord(HANDLE notifyORtype, const char *name, DWORD defValue)
-	{
-		DBVARIANT dbv;
-		MNotifyGet(notifyORtype, name, &dbv);
-		if (dbv.type != DBVT_DWORD) return defValue;
-		return dbv.dVal;
-	}
-	static __inline const char *MNotifyGetString(HANDLE notifyORtype, const char *name, const char *defValue)
-	{
-		DBVARIANT dbv;
-		MNotifyGet(notifyORtype, name, &dbv);
-		if (dbv.type != DBVT_ASCIIZ) return defValue;
-		return dbv.pszVal;
-	}
-	static __inline const WCHAR *MNotifyGetWString(HANDLE notifyORtype, const char *name, const WCHAR *defValue)
-	{
-		DBVARIANT dbv;
-		MNotifyGet(notifyORtype, name, &dbv);
-		if (dbv.type != DBVT_WCHAR) return defValue;
-		return dbv.pwszVal;
-	}
-
-	// set helpers
-	static __inline void MNotifySetByte(HANDLE notifyORtype, const char *name, BYTE value)
-	{
-		DBVARIANT dbv;
-		dbv.type = DBVT_BYTE;
-		dbv.bVal = value;
-		MNotifySet(notifyORtype, name, dbv);
-	}
-	static __inline void MNotifySetWord(HANDLE notifyORtype, const char *name, WORD value)
-	{
-		DBVARIANT dbv;
-		dbv.type = DBVT_WORD;
-		dbv.wVal = value;
-		MNotifySet(notifyORtype, name, dbv);
-	}
-	static __inline void MNotifySetDWord(HANDLE notifyORtype, const char *name, DWORD value)
-	{
-		DBVARIANT dbv;
-		dbv.type = DBVT_DWORD;
-		dbv.dVal = value;
-		MNotifySet(notifyORtype, name, dbv);
-	}
-	static __inline void MNotifySetString(HANDLE notifyORtype, const char *name, const char *value)
-	{
-		DBVARIANT dbv;
-		dbv.type = DBVT_ASCIIZ;
-		dbv.pszVal = (char *)value;
-		MNotifySet(notifyORtype, name, dbv);
-	}
-	static __inline void MNotifySetWString(HANDLE notifyORtype, const char *name, const WCHAR *value)
-	{
-		DBVARIANT dbv;
-		dbv.type = DBVT_WCHAR;
-		dbv.pwszVal = (WCHAR *)value;
-		MNotifySet(notifyORtype, name, dbv);
-	}
-#endif
-
-// Common options for Get/Set actions
-#define NFOPT_TYPENAME  "General/TypeName"
-#define NFOPT_ICON      "General/Icon"
-#define NFOPT_CONTACT   "General/Contact"
-#define NFOPT_EVENT     "General/Event"
-#define NFOPT_TEXT      "General/Text"
-#define NFOPT_TEXTW     "General/TextW"
-#define NFOPT_TITLE     "General/Title"
-#define NFOPT_TITLEW    "General/TitleW"
-#define NFOPT_BACKCOLOR "General/BackColor"
-#define NFOPT_TEXTCOLOR "General/TextColor"
-#define NFOPT_TIMEOUT   "General/Timeout"
-//#define NFOPT_ONDESTROY "General/OnDestroy"
-
-#endif // __m_notify_h__
diff --git a/plugins/yapp/popup_history.h b/plugins/yapp/popup_history.h
index 3830eeeaee..f79b6ee7af 100644
--- a/plugins/yapp/popup_history.h
+++ b/plugins/yapp/popup_history.h
@@ -1,7 +1,7 @@
 #ifndef __popup_history_h__
 #define __popup_history_h__
 
-#include "sdk/m_ieview.h" //need this for special renderers
+#include "m_ieview.h" //need this for special renderers
 
 /****HISTORY ++ STUFF ***/
 //there's no include file for h++ yet
diff --git a/plugins/yapp/popups2.dep b/plugins/yapp/popups2.dep
deleted file mode 100644
index 4ef53cb5cd..0000000000
--- a/plugins/yapp/popups2.dep
+++ /dev/null
@@ -1,228 +0,0 @@
-# Microsoft Developer Studio Generated Dependency File, included by popups2.mak
-
-.\message_pump.cpp : \
-	"..\..\include\m_avatars.h"\
-	"..\..\include\m_clist.h"\
-	"..\..\include\m_clui.h"\
-	"..\..\include\m_database.h"\
-	"..\..\include\m_fontservice.h"\
-	"..\..\include\m_idle.h"\
-	"..\..\include\m_langpack.h"\
-	"..\..\include\m_notify.h"\
-	"..\..\include\m_options.h"\
-	"..\..\include\m_plugins.h"\
-	"..\..\include\m_popup.h"\
-	"..\..\include\m_skin.h"\
-	"..\..\include\m_system.h"\
-	"..\..\include\m_updater.h"\
-	"..\..\include\m_utils.h"\
-	"..\..\include\newpluginapi.h"\
-	"..\..\include\statusmodes.h"\
-	".\common.h"\
-	".\message_pump.h"\
-	".\options.h"\
-	".\popwin.h"\
-	".\services.h"\
-	
-
-.\notify_imp.cpp : \
-	"..\..\include\m_avatars.h"\
-	"..\..\include\m_clist.h"\
-	"..\..\include\m_clui.h"\
-	"..\..\include\m_database.h"\
-	"..\..\include\m_fontservice.h"\
-	"..\..\include\m_idle.h"\
-	"..\..\include\m_langpack.h"\
-	"..\..\include\m_notify.h"\
-	"..\..\include\m_options.h"\
-	"..\..\include\m_plugins.h"\
-	"..\..\include\m_popup.h"\
-	"..\..\include\m_skin.h"\
-	"..\..\include\m_system.h"\
-	"..\..\include\m_updater.h"\
-	"..\..\include\m_utils.h"\
-	"..\..\include\newpluginapi.h"\
-	"..\..\include\statusmodes.h"\
-	".\common.h"\
-	".\docs\m_popup2.h"\
-	".\message_pump.h"\
-	".\notify.h"\
-	
-
-.\options.cpp : \
-	"..\..\include\m_avatars.h"\
-	"..\..\include\m_clist.h"\
-	"..\..\include\m_clui.h"\
-	"..\..\include\m_database.h"\
-	"..\..\include\m_fontservice.h"\
-	"..\..\include\m_idle.h"\
-	"..\..\include\m_langpack.h"\
-	"..\..\include\m_notify.h"\
-	"..\..\include\m_options.h"\
-	"..\..\include\m_plugins.h"\
-	"..\..\include\m_popup.h"\
-	"..\..\include\m_skin.h"\
-	"..\..\include\m_system.h"\
-	"..\..\include\m_updater.h"\
-	"..\..\include\m_utils.h"\
-	"..\..\include\newpluginapi.h"\
-	"..\..\include\statusmodes.h"\
-	".\common.h"\
-	".\options.h"\
-	".\popwin.h"\
-	".\str_utils.h"\
-	
-
-.\popup_history.cpp : \
-	"..\..\include\m_avatars.h"\
-	"..\..\include\m_clist.h"\
-	"..\..\include\m_clui.h"\
-	"..\..\include\m_database.h"\
-	"..\..\include\m_fontservice.h"\
-	"..\..\include\m_idle.h"\
-	"..\..\include\m_langpack.h"\
-	"..\..\include\m_notify.h"\
-	"..\..\include\m_options.h"\
-	"..\..\include\m_plugins.h"\
-	"..\..\include\m_popup.h"\
-	"..\..\include\m_skin.h"\
-	"..\..\include\m_system.h"\
-	"..\..\include\m_updater.h"\
-	"..\..\include\m_utils.h"\
-	"..\..\include\newpluginapi.h"\
-	"..\..\include\statusmodes.h"\
-	".\common.h"\
-	".\m_ieview.h"\
-	".\popup_history.h"\
-	
-
-.\popup_history_dlg.cpp : \
-	"..\..\include\m_avatars.h"\
-	"..\..\include\m_clist.h"\
-	"..\..\include\m_clui.h"\
-	"..\..\include\m_database.h"\
-	"..\..\include\m_fontservice.h"\
-	"..\..\include\m_idle.h"\
-	"..\..\include\m_langpack.h"\
-	"..\..\include\m_notify.h"\
-	"..\..\include\m_options.h"\
-	"..\..\include\m_plugins.h"\
-	"..\..\include\m_popup.h"\
-	"..\..\include\m_skin.h"\
-	"..\..\include\m_system.h"\
-	"..\..\include\m_updater.h"\
-	"..\..\include\m_utils.h"\
-	"..\..\include\newpluginapi.h"\
-	"..\..\include\statusmodes.h"\
-	".\common.h"\
-	".\m_ieview.h"\
-	".\popup_history.h"\
-	
-
-.\popups2.cpp : \
-	"..\..\include\m_avatars.h"\
-	"..\..\include\m_clist.h"\
-	"..\..\include\m_clui.h"\
-	"..\..\include\m_database.h"\
-	"..\..\include\m_fontservice.h"\
-	"..\..\include\m_idle.h"\
-	"..\..\include\m_langpack.h"\
-	"..\..\include\m_notify.h"\
-	"..\..\include\m_options.h"\
-	"..\..\include\m_plugins.h"\
-	"..\..\include\m_popup.h"\
-	"..\..\include\m_skin.h"\
-	"..\..\include\m_system.h"\
-	"..\..\include\m_updater.h"\
-	"..\..\include\m_utils.h"\
-	"..\..\include\newpluginapi.h"\
-	"..\..\include\statusmodes.h"\
-	".\common.h"\
-	".\m_ieview.h"\
-	".\message_pump.h"\
-	".\notify.h"\
-	".\options.h"\
-	".\popup_history.h"\
-	".\popups2.h"\
-	".\popwin.h"\
-	".\str_utils.h"\
-	".\version.h"\
-	
-
-.\popwin.cpp : \
-	"..\..\include\m_avatars.h"\
-	"..\..\include\m_clist.h"\
-	"..\..\include\m_clui.h"\
-	"..\..\include\m_database.h"\
-	"..\..\include\m_fontservice.h"\
-	"..\..\include\m_idle.h"\
-	"..\..\include\m_langpack.h"\
-	"..\..\include\m_notify.h"\
-	"..\..\include\m_options.h"\
-	"..\..\include\m_plugins.h"\
-	"..\..\include\m_popup.h"\
-	"..\..\include\m_skin.h"\
-	"..\..\include\m_system.h"\
-	"..\..\include\m_updater.h"\
-	"..\..\include\m_utils.h"\
-	"..\..\include\newpluginapi.h"\
-	"..\..\include\statusmodes.h"\
-	".\common.h"\
-	".\message_pump.h"\
-	".\options.h"\
-	".\popwin.h"\
-	".\str_utils.h"\
-	
-
-.\services.cpp : \
-	"..\..\include\m_avatars.h"\
-	"..\..\include\m_clist.h"\
-	"..\..\include\m_clui.h"\
-	"..\..\include\m_database.h"\
-	"..\..\include\m_fontservice.h"\
-	"..\..\include\m_idle.h"\
-	"..\..\include\m_langpack.h"\
-	"..\..\include\m_notify.h"\
-	"..\..\include\m_options.h"\
-	"..\..\include\m_plugins.h"\
-	"..\..\include\m_popup.h"\
-	"..\..\include\m_skin.h"\
-	"..\..\include\m_system.h"\
-	"..\..\include\m_updater.h"\
-	"..\..\include\m_utils.h"\
-	"..\..\include\newpluginapi.h"\
-	"..\..\include\statusmodes.h"\
-	".\common.h"\
-	".\m_ieview.h"\
-	".\message_pump.h"\
-	".\popup_history.h"\
-	".\popwin.h"\
-	".\services.h"\
-	".\str_utils.h"\
-	
-
-.\str_utils.cpp : \
-	"..\..\include\m_avatars.h"\
-	"..\..\include\m_clist.h"\
-	"..\..\include\m_clui.h"\
-	"..\..\include\m_database.h"\
-	"..\..\include\m_fontservice.h"\
-	"..\..\include\m_idle.h"\
-	"..\..\include\m_langpack.h"\
-	"..\..\include\m_notify.h"\
-	"..\..\include\m_options.h"\
-	"..\..\include\m_plugins.h"\
-	"..\..\include\m_popup.h"\
-	"..\..\include\m_skin.h"\
-	"..\..\include\m_system.h"\
-	"..\..\include\m_updater.h"\
-	"..\..\include\m_utils.h"\
-	"..\..\include\newpluginapi.h"\
-	"..\..\include\statusmodes.h"\
-	".\common.h"\
-	".\str_utils.h"\
-	
-
-.\resource.rc : \
-	".\PPh2.ico"\
-	
diff --git a/plugins/yapp/popups2.dsp b/plugins/yapp/popups2.dsp
deleted file mode 100644
index 3afcccb670..0000000000
--- a/plugins/yapp/popups2.dsp
+++ /dev/null
@@ -1,249 +0,0 @@
-# Microsoft Developer Studio Project File - Name="yapp" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=yapp - Win32 Debug Unicode
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "popups2.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "popups2.mak" CFG="yapp - Win32 Debug Unicode"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "yapp - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "yapp - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "yapp - Win32 Release Unicode" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "yapp - Win32 Debug Unicode" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "yapp - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "yapp_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /Zi /O1 /I "../../../include" /I "." /I "docs" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "POPUPS2_EXPORTS" /FR /Yu"common.h" /FD /c
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x419 /d "NDEBUG"
-# ADD RSC /l 0x419 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib /nologo /dll /map /debug /machine:I386 /out:"../../bin/Release/Plugins/yapp.dll" /filealign:512
-# SUBTRACT LINK32 /pdb:none /incremental:yes
-
-!ELSEIF  "$(CFG)" == "yapp - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "yapp_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "POPUPS2_EXPORTS" /FR /Yu"common.h" /FD /GZ /c
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x419 /d "_DEBUG"
-# ADD RSC /l 0x419 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib /nologo /dll /debug /machine:I386 /out:"../../bin/Debug/plugins/yapp.dll" /pdbtype:sept
-# SUBTRACT LINK32 /pdb:none /incremental:no
-
-!ELSEIF  "$(CFG)" == "yapp - Win32 Release Unicode"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "yapp___Win32_Release_Unicode"
-# PROP BASE Intermediate_Dir "yapp___Win32_Release_Unicode"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release_Unicode"
-# PROP Intermediate_Dir "Release_Unicode"
-# PROP Ignore_Export_Lib 1
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MD /W3 /GX /Zi /O1 /I "../../include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "NO_GZIP" /D "PNG_NO_STDIO" /D "PNG_NO_CONSOLE_IO" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MD /W3 /O1 /I "../../../include" /I "." /I "docs" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "UNICODE" /D "_USRDLL" /D "POPUPS2_EXPORTS" /FR /Yu"common.h" /FD /c
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x419 /d "NDEBUG"
-# ADD RSC /l 0x419 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /map /debug /machine:I386 /out:"../../bin/Release/Plugins/yapp.dll" /filealign:512
-# SUBTRACT BASE LINK32 /pdb:none /incremental:yes
-# ADD LINK32 unicows.lib kernel32.lib user32.lib gdi32.lib /nologo /dll /map /machine:I386 /nodefaultlib:"kernel32.lib user32.lib gdi32.lib" /out:"../../bin/Release Unicode/Plugins/yapp.dll" /filealign:512
-# SUBTRACT LINK32 /pdb:none /incremental:yes /debug
-
-!ELSEIF  "$(CFG)" == "yapp - Win32 Debug Unicode"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "yapp___Win32_Debug_Unicode"
-# PROP BASE Intermediate_Dir "yapp___Win32_Debug_Unicode"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug_Unicode"
-# PROP Intermediate_Dir "Debug_Unicode"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "NO_GZIP" /D "PNG_NO_STDIO" /D "PNG_NO_CONSOLE_IO" /FR /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../../include" /I "." /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "UNICODE" /D "_USRDLL" /D "POPUPS2_EXPORTS" /FR /Yu"common.h" /FD /GZ /c
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x419 /d "_DEBUG"
-# ADD RSC /l 0x419 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib /nologo /dll /debug /machine:I386 /out:"../../bin/Debug/plugins/yapp.dll" /pdbtype:sept
-# SUBTRACT BASE LINK32 /pdb:none /incremental:no
-# ADD LINK32 unicows.lib kernel32.lib user32.lib gdi32.lib /nologo /dll /debug /machine:I386 /out:"../../bin/Debug Unicode/plugins/yapp.dll" /pdbtype:sept
-# SUBTRACT LINK32 /pdb:none /incremental:no
-
-!ENDIF 
-
-# Begin Target
-
-# Name "yapp - Win32 Release"
-# Name "yapp - Win32 Debug"
-# Name "yapp - Win32 Release Unicode"
-# Name "yapp - Win32 Debug Unicode"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=.\message_pump.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\notify_imp.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\options.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\popup_history.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\popup_history_dlg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\popups2.cpp
-# ADD CPP /Yc"common.h"
-# End Source File
-# Begin Source File
-
-SOURCE=.\popwin.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\services.cpp
-# End Source File
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\resource.rc
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\common.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\message_pump.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\notify.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\options.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\popup_history.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\popups2.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\popwin.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\resource.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\services.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\version.h
-# End Source File
-# End Group
-# Begin Source File
-
-SOURCE=.\PPh2.ico
-# End Source File
-# End Target
-# End Project
diff --git a/plugins/yapp/popups2.dsw b/plugins/yapp/popups2.dsw
deleted file mode 100644
index 9410992cd7..0000000000
--- a/plugins/yapp/popups2.dsw
+++ /dev/null
@@ -1,33 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "yapp"=.\popups2.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-    begin source code control
-    "$/Miranda/miranda/plugins/yapp", FLIAAAAA
-    .
-    end source code control
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
diff --git a/plugins/yapp/popups2.mak b/plugins/yapp/popups2.mak
deleted file mode 100644
index 85ec196e2d..0000000000
--- a/plugins/yapp/popups2.mak
+++ /dev/null
@@ -1,634 +0,0 @@
-# Microsoft Developer Studio Generated NMAKE File, Based on popups2.dsp
-!IF "$(CFG)" == ""
-CFG=yapp - Win32 Release Unicode
-!MESSAGE No configuration specified. Defaulting to yapp - Win32 Release Unicode.
-!ENDIF
-
-!IF "$(CFG)" != "yapp - Win32 Release" && "$(CFG)" != "yapp - Win32 Debug" && "$(CFG)" != "yapp - Win32 Release Unicode" && "$(CFG)" != "yapp - Win32 Debug Unicode"
-!MESSAGE Invalid configuration "$(CFG)" specified.
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "popups2.mak" CFG="yapp - Win32 Debug Unicode"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "yapp - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "yapp - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "yapp - Win32 Release Unicode" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "yapp - Win32 Debug Unicode" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE
-!ERROR An invalid configuration is specified.
-!ENDIF
-
-!IF "$(OS)" == "Windows_NT"
-NULL=
-!ELSE
-NULL=nul
-!ENDIF
-
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "yapp - Win32 Release"
-
-OUTDIR=.\Release
-INTDIR=.\Release
-
-ALL : "..\..\bin\Release\Plugins\yapp.dll"
-
-
-CLEAN :
-	-@erase "$(INTDIR)\message_pump.obj"
-	-@erase "$(INTDIR)\notify_imp.obj"
-	-@erase "$(INTDIR)\options.obj"
-	-@erase "$(INTDIR)\popup_history.obj"
-	-@erase "$(INTDIR)\popup_history_dlg.obj"
-	-@erase "$(INTDIR)\popups2.obj"
-	-@erase "$(INTDIR)\popups2.pch"
-	-@erase "$(INTDIR)\popwin.obj"
-	-@erase "$(INTDIR)\resource.res"
-	-@erase "$(INTDIR)\services.obj"
-	-@erase "$(INTDIR)\str_utils.obj"
-	-@erase "$(INTDIR)\vc60.idb"
-	-@erase "$(INTDIR)\vc60.pdb"
-	-@erase "$(OUTDIR)\yapp.exp"
-	-@erase "$(OUTDIR)\yapp.lib"
-	-@erase "$(OUTDIR)\yapp.map"
-	-@erase "$(OUTDIR)\yapp.pdb"
-	-@erase "..\..\bin\Release\Plugins\yapp.dll"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP_PROJ=/nologo /MD /W3 /GX /Zi /O1 /I "../../include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "POPUPS2_EXPORTS" /Fp"$(INTDIR)\popups2.pch" /Yu"common.h" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
-MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32
-RSC_PROJ=/l 0x419 /fo"$(INTDIR)\resource.res" /d "NDEBUG"
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\popups2.bsc"
-BSC32_SBRS= \
-
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib /nologo /dll /incremental:no /pdb:"$(OUTDIR)\yapp.pdb" /map:"$(INTDIR)\yapp.map" /debug /machine:I386 /out:"../../bin/Release/Plugins/yapp.dll" /implib:"$(OUTDIR)\yapp.lib" /filealign:512
-LINK32_OBJS= \
-	"$(INTDIR)\message_pump.obj" \
-	"$(INTDIR)\notify_imp.obj" \
-	"$(INTDIR)\options.obj" \
-	"$(INTDIR)\popup_history.obj" \
-	"$(INTDIR)\popup_history_dlg.obj" \
-	"$(INTDIR)\popups2.obj" \
-	"$(INTDIR)\popwin.obj" \
-	"$(INTDIR)\services.obj" \
-	"$(INTDIR)\str_utils.obj" \
-	"$(INTDIR)\resource.res"
-
-"..\..\bin\Release\Plugins\yapp.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ELSEIF  "$(CFG)" == "yapp - Win32 Debug"
-
-OUTDIR=.\Debug
-INTDIR=.\Debug
-# Begin Custom Macros
-OutDir=.\Debug
-# End Custom Macros
-
-ALL : "..\..\bin\Debug\plugins\yapp.dll" "$(OUTDIR)\popups2.bsc"
-
-
-CLEAN :
-	-@erase "$(INTDIR)\message_pump.obj"
-	-@erase "$(INTDIR)\message_pump.sbr"
-	-@erase "$(INTDIR)\notify_imp.obj"
-	-@erase "$(INTDIR)\notify_imp.sbr"
-	-@erase "$(INTDIR)\options.obj"
-	-@erase "$(INTDIR)\options.sbr"
-	-@erase "$(INTDIR)\popup_history.obj"
-	-@erase "$(INTDIR)\popup_history.sbr"
-	-@erase "$(INTDIR)\popup_history_dlg.obj"
-	-@erase "$(INTDIR)\popup_history_dlg.sbr"
-	-@erase "$(INTDIR)\popups2.obj"
-	-@erase "$(INTDIR)\popups2.pch"
-	-@erase "$(INTDIR)\popups2.sbr"
-	-@erase "$(INTDIR)\popwin.obj"
-	-@erase "$(INTDIR)\popwin.sbr"
-	-@erase "$(INTDIR)\resource.res"
-	-@erase "$(INTDIR)\services.obj"
-	-@erase "$(INTDIR)\services.sbr"
-	-@erase "$(INTDIR)\str_utils.obj"
-	-@erase "$(INTDIR)\str_utils.sbr"
-	-@erase "$(INTDIR)\vc60.idb"
-	-@erase "$(INTDIR)\vc60.pdb"
-	-@erase "$(OUTDIR)\popups2.bsc"
-	-@erase "$(OUTDIR)\yapp.exp"
-	-@erase "$(OUTDIR)\yapp.lib"
-	-@erase "$(OUTDIR)\yapp.pdb"
-	-@erase "..\..\bin\Debug\plugins\yapp.dll"
-	-@erase "..\..\bin\Debug\plugins\yapp.ilk"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "POPUPS2_EXPORTS" /FR"$(INTDIR)\\" /Fp"$(INTDIR)\popups2.pch" /Yu"common.h" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c
-MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32
-RSC_PROJ=/l 0x419 /fo"$(INTDIR)\resource.res" /d "_DEBUG"
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\popups2.bsc"
-BSC32_SBRS= \
-	"$(INTDIR)\message_pump.sbr" \
-	"$(INTDIR)\notify_imp.sbr" \
-	"$(INTDIR)\options.sbr" \
-	"$(INTDIR)\popup_history.sbr" \
-	"$(INTDIR)\popup_history_dlg.sbr" \
-	"$(INTDIR)\popups2.sbr" \
-	"$(INTDIR)\popwin.sbr" \
-	"$(INTDIR)\services.sbr" \
-	"$(INTDIR)\str_utils.sbr"
-
-"$(OUTDIR)\popups2.bsc" : "$(OUTDIR)" $(BSC32_SBRS)
-    $(BSC32) @<<
-  $(BSC32_FLAGS) $(BSC32_SBRS)
-<<
-
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib /nologo /dll /incremental:yes /pdb:"$(OUTDIR)\yapp.pdb" /debug /machine:I386 /out:"../../bin/Debug/plugins/yapp.dll" /implib:"$(OUTDIR)\yapp.lib" /pdbtype:sept
-LINK32_OBJS= \
-	"$(INTDIR)\message_pump.obj" \
-	"$(INTDIR)\notify_imp.obj" \
-	"$(INTDIR)\options.obj" \
-	"$(INTDIR)\popup_history.obj" \
-	"$(INTDIR)\popup_history_dlg.obj" \
-	"$(INTDIR)\popups2.obj" \
-	"$(INTDIR)\popwin.obj" \
-	"$(INTDIR)\services.obj" \
-	"$(INTDIR)\str_utils.obj" \
-	"$(INTDIR)\resource.res"
-
-"..\..\bin\Debug\plugins\yapp.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ELSEIF  "$(CFG)" == "yapp - Win32 Release Unicode"
-
-OUTDIR=.\Release_Unicode
-INTDIR=.\Release_Unicode
-
-ALL : "..\..\bin\Release Unicode\Plugins\yapp.dll"
-
-
-CLEAN :
-	-@erase "$(INTDIR)\message_pump.obj"
-	-@erase "$(INTDIR)\notify_imp.obj"
-	-@erase "$(INTDIR)\options.obj"
-	-@erase "$(INTDIR)\popup_history.obj"
-	-@erase "$(INTDIR)\popup_history_dlg.obj"
-	-@erase "$(INTDIR)\popups2.obj"
-	-@erase "$(INTDIR)\popups2.pch"
-	-@erase "$(INTDIR)\popwin.obj"
-	-@erase "$(INTDIR)\resource.res"
-	-@erase "$(INTDIR)\services.obj"
-	-@erase "$(INTDIR)\str_utils.obj"
-	-@erase "$(INTDIR)\vc60.idb"
-	-@erase "$(INTDIR)\vc60.pdb"
-	-@erase "$(OUTDIR)\yapp.exp"
-	-@erase "$(OUTDIR)\yapp.lib"
-	-@erase "$(OUTDIR)\yapp.map"
-	-@erase "$(OUTDIR)\yapp.pdb"
-	-@erase "..\..\bin\Release Unicode\Plugins\yapp.dll"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP_PROJ=/nologo /MD /W3 /GX /Zi /O1 /I "../../include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "UNICODE" /D "_USRDLL" /D "POPUPS2_EXPORTS" /Fp"$(INTDIR)\popups2.pch" /Yu"common.h" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
-MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32
-RSC_PROJ=/l 0x419 /fo"$(INTDIR)\resource.res" /d "NDEBUG"
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\popups2.bsc"
-BSC32_SBRS= \
-
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib /nologo /dll /incremental:no /pdb:"$(OUTDIR)\yapp.pdb" /map:"$(INTDIR)\yapp.map" /debug /machine:I386 /out:"../../bin/Release Unicode/Plugins/yapp.dll" /implib:"$(OUTDIR)\yapp.lib" /filealign:512
-LINK32_OBJS= \
-	"$(INTDIR)\message_pump.obj" \
-	"$(INTDIR)\notify_imp.obj" \
-	"$(INTDIR)\options.obj" \
-	"$(INTDIR)\popup_history.obj" \
-	"$(INTDIR)\popup_history_dlg.obj" \
-	"$(INTDIR)\popups2.obj" \
-	"$(INTDIR)\popwin.obj" \
-	"$(INTDIR)\services.obj" \
-	"$(INTDIR)\str_utils.obj" \
-	"$(INTDIR)\resource.res"
-
-"..\..\bin\Release Unicode\Plugins\yapp.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ELSEIF  "$(CFG)" == "yapp - Win32 Debug Unicode"
-
-OUTDIR=.\Debug_Unicode
-INTDIR=.\Debug_Unicode
-# Begin Custom Macros
-OutDir=.\Debug_Unicode
-# End Custom Macros
-
-ALL : "..\..\bin\Debug Unicode\plugins\yapp.dll" "$(OUTDIR)\popups2.bsc"
-
-
-CLEAN :
-	-@erase "$(INTDIR)\message_pump.obj"
-	-@erase "$(INTDIR)\message_pump.sbr"
-	-@erase "$(INTDIR)\notify_imp.obj"
-	-@erase "$(INTDIR)\notify_imp.sbr"
-	-@erase "$(INTDIR)\options.obj"
-	-@erase "$(INTDIR)\options.sbr"
-	-@erase "$(INTDIR)\popup_history.obj"
-	-@erase "$(INTDIR)\popup_history.sbr"
-	-@erase "$(INTDIR)\popup_history_dlg.obj"
-	-@erase "$(INTDIR)\popup_history_dlg.sbr"
-	-@erase "$(INTDIR)\popups2.obj"
-	-@erase "$(INTDIR)\popups2.pch"
-	-@erase "$(INTDIR)\popups2.sbr"
-	-@erase "$(INTDIR)\popwin.obj"
-	-@erase "$(INTDIR)\popwin.sbr"
-	-@erase "$(INTDIR)\resource.res"
-	-@erase "$(INTDIR)\services.obj"
-	-@erase "$(INTDIR)\services.sbr"
-	-@erase "$(INTDIR)\str_utils.obj"
-	-@erase "$(INTDIR)\str_utils.sbr"
-	-@erase "$(INTDIR)\vc60.idb"
-	-@erase "$(INTDIR)\vc60.pdb"
-	-@erase "$(OUTDIR)\popups2.bsc"
-	-@erase "$(OUTDIR)\yapp.exp"
-	-@erase "$(OUTDIR)\yapp.lib"
-	-@erase "$(OUTDIR)\yapp.pdb"
-	-@erase "..\..\bin\Debug Unicode\plugins\yapp.dll"
-	-@erase "..\..\bin\Debug Unicode\plugins\yapp.ilk"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "UNICODE" /D "_USRDLL" /D "POPUPS2_EXPORTS" /FR"$(INTDIR)\\" /Fp"$(INTDIR)\popups2.pch" /Yu"common.h" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c
-MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32
-RSC_PROJ=/l 0x419 /fo"$(INTDIR)\resource.res" /d "_DEBUG"
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\popups2.bsc"
-BSC32_SBRS= \
-	"$(INTDIR)\message_pump.sbr" \
-	"$(INTDIR)\notify_imp.sbr" \
-	"$(INTDIR)\options.sbr" \
-	"$(INTDIR)\popup_history.sbr" \
-	"$(INTDIR)\popup_history_dlg.sbr" \
-	"$(INTDIR)\popups2.sbr" \
-	"$(INTDIR)\popwin.sbr" \
-	"$(INTDIR)\services.sbr" \
-	"$(INTDIR)\str_utils.sbr"
-
-"$(OUTDIR)\popups2.bsc" : "$(OUTDIR)" $(BSC32_SBRS)
-    $(BSC32) @<<
-  $(BSC32_FLAGS) $(BSC32_SBRS)
-<<
-
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib /nologo /dll /incremental:yes /pdb:"$(OUTDIR)\yapp.pdb" /debug /machine:I386 /out:"../../bin/Debug Unicode/plugins/yapp.dll" /implib:"$(OUTDIR)\yapp.lib" /pdbtype:sept
-LINK32_OBJS= \
-	"$(INTDIR)\message_pump.obj" \
-	"$(INTDIR)\notify_imp.obj" \
-	"$(INTDIR)\options.obj" \
-	"$(INTDIR)\popup_history.obj" \
-	"$(INTDIR)\popup_history_dlg.obj" \
-	"$(INTDIR)\popups2.obj" \
-	"$(INTDIR)\popwin.obj" \
-	"$(INTDIR)\services.obj" \
-	"$(INTDIR)\str_utils.obj" \
-	"$(INTDIR)\resource.res"
-
-"..\..\bin\Debug Unicode\plugins\yapp.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ENDIF
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $<
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $<
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $<
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $<
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $<
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $<
-<<
-
-
-!IF "$(NO_EXTERNAL_DEPS)" != "1"
-!IF EXISTS("popups2.dep")
-!INCLUDE "popups2.dep"
-!ELSE
-!MESSAGE Warning: cannot find "popups2.dep"
-!ENDIF
-!ENDIF
-
-
-!IF "$(CFG)" == "yapp - Win32 Release" || "$(CFG)" == "yapp - Win32 Debug" || "$(CFG)" == "yapp - Win32 Release Unicode" || "$(CFG)" == "yapp - Win32 Debug Unicode"
-SOURCE=.\message_pump.cpp
-
-!IF  "$(CFG)" == "yapp - Win32 Release"
-
-
-"$(INTDIR)\message_pump.obj" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\popups2.pch"
-
-
-!ELSEIF  "$(CFG)" == "yapp - Win32 Debug"
-
-
-"$(INTDIR)\message_pump.obj"	"$(INTDIR)\message_pump.sbr" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\popups2.pch"
-
-
-!ELSEIF  "$(CFG)" == "yapp - Win32 Release Unicode"
-
-
-"$(INTDIR)\message_pump.obj" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\popups2.pch"
-
-
-!ELSEIF  "$(CFG)" == "yapp - Win32 Debug Unicode"
-
-
-"$(INTDIR)\message_pump.obj"	"$(INTDIR)\message_pump.sbr" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\popups2.pch"
-
-
-!ENDIF
-
-SOURCE=.\notify_imp.cpp
-
-!IF  "$(CFG)" == "yapp - Win32 Release"
-
-
-"$(INTDIR)\notify_imp.obj" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\popups2.pch"
-
-
-!ELSEIF  "$(CFG)" == "yapp - Win32 Debug"
-
-
-"$(INTDIR)\notify_imp.obj"	"$(INTDIR)\notify_imp.sbr" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\popups2.pch"
-
-
-!ELSEIF  "$(CFG)" == "yapp - Win32 Release Unicode"
-
-
-"$(INTDIR)\notify_imp.obj" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\popups2.pch"
-
-
-!ELSEIF  "$(CFG)" == "yapp - Win32 Debug Unicode"
-
-
-"$(INTDIR)\notify_imp.obj"	"$(INTDIR)\notify_imp.sbr" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\popups2.pch"
-
-
-!ENDIF
-
-SOURCE=.\options.cpp
-
-!IF  "$(CFG)" == "yapp - Win32 Release"
-
-
-"$(INTDIR)\options.obj" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\popups2.pch"
-
-
-!ELSEIF  "$(CFG)" == "yapp - Win32 Debug"
-
-
-"$(INTDIR)\options.obj"	"$(INTDIR)\options.sbr" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\popups2.pch"
-
-
-!ELSEIF  "$(CFG)" == "yapp - Win32 Release Unicode"
-
-
-"$(INTDIR)\options.obj" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\popups2.pch"
-
-
-!ELSEIF  "$(CFG)" == "yapp - Win32 Debug Unicode"
-
-
-"$(INTDIR)\options.obj"	"$(INTDIR)\options.sbr" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\popups2.pch"
-
-
-!ENDIF
-
-SOURCE=.\popup_history.cpp
-
-!IF  "$(CFG)" == "yapp - Win32 Release"
-
-
-"$(INTDIR)\popup_history.obj" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\popups2.pch"
-
-
-!ELSEIF  "$(CFG)" == "yapp - Win32 Debug"
-
-
-"$(INTDIR)\popup_history.obj"	"$(INTDIR)\popup_history.sbr" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\popups2.pch"
-
-
-!ELSEIF  "$(CFG)" == "yapp - Win32 Release Unicode"
-
-
-"$(INTDIR)\popup_history.obj" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\popups2.pch"
-
-
-!ELSEIF  "$(CFG)" == "yapp - Win32 Debug Unicode"
-
-
-"$(INTDIR)\popup_history.obj"	"$(INTDIR)\popup_history.sbr" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\popups2.pch"
-
-
-!ENDIF
-
-SOURCE=.\popup_history_dlg.cpp
-
-!IF  "$(CFG)" == "yapp - Win32 Release"
-
-
-"$(INTDIR)\popup_history_dlg.obj" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\popups2.pch"
-
-
-!ELSEIF  "$(CFG)" == "yapp - Win32 Debug"
-
-
-"$(INTDIR)\popup_history_dlg.obj"	"$(INTDIR)\popup_history_dlg.sbr" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\popups2.pch"
-
-
-!ELSEIF  "$(CFG)" == "yapp - Win32 Release Unicode"
-
-
-"$(INTDIR)\popup_history_dlg.obj" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\popups2.pch"
-
-
-!ELSEIF  "$(CFG)" == "yapp - Win32 Debug Unicode"
-
-
-"$(INTDIR)\popup_history_dlg.obj"	"$(INTDIR)\popup_history_dlg.sbr" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\popups2.pch"
-
-
-!ENDIF
-
-SOURCE=.\popups2.cpp
-
-!IF  "$(CFG)" == "yapp - Win32 Release"
-
-CPP_SWITCHES=/nologo /MD /W3 /GX /Zi /O1 /I "../../include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "POPUPS2_EXPORTS" /Fp"$(INTDIR)\popups2.pch" /Yc"common.h" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
-
-"$(INTDIR)\popups2.obj"	"$(INTDIR)\popups2.pch" : $(SOURCE) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ELSEIF  "$(CFG)" == "yapp - Win32 Debug"
-
-CPP_SWITCHES=/nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "POPUPS2_EXPORTS" /FR"$(INTDIR)\\" /Fp"$(INTDIR)\popups2.pch" /Yc"common.h" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c
-
-"$(INTDIR)\popups2.obj"	"$(INTDIR)\popups2.sbr"	"$(INTDIR)\popups2.pch" : $(SOURCE) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ELSEIF  "$(CFG)" == "yapp - Win32 Release Unicode"
-
-CPP_SWITCHES=/nologo /MD /W3 /GX /Zi /O1 /I "../../include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "UNICODE" /D "_USRDLL" /D "POPUPS2_EXPORTS" /Fp"$(INTDIR)\popups2.pch" /Yc"common.h" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
-
-"$(INTDIR)\popups2.obj"	"$(INTDIR)\popups2.pch" : $(SOURCE) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ELSEIF  "$(CFG)" == "yapp - Win32 Debug Unicode"
-
-CPP_SWITCHES=/nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "UNICODE" /D "_USRDLL" /D "POPUPS2_EXPORTS" /FR"$(INTDIR)\\" /Fp"$(INTDIR)\popups2.pch" /Yc"common.h" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c
-
-"$(INTDIR)\popups2.obj"	"$(INTDIR)\popups2.sbr"	"$(INTDIR)\popups2.pch" : $(SOURCE) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ENDIF
-
-SOURCE=.\popwin.cpp
-
-!IF  "$(CFG)" == "yapp - Win32 Release"
-
-
-"$(INTDIR)\popwin.obj" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\popups2.pch"
-
-
-!ELSEIF  "$(CFG)" == "yapp - Win32 Debug"
-
-
-"$(INTDIR)\popwin.obj"	"$(INTDIR)\popwin.sbr" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\popups2.pch"
-
-
-!ELSEIF  "$(CFG)" == "yapp - Win32 Release Unicode"
-
-
-"$(INTDIR)\popwin.obj" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\popups2.pch"
-
-
-!ELSEIF  "$(CFG)" == "yapp - Win32 Debug Unicode"
-
-
-"$(INTDIR)\popwin.obj"	"$(INTDIR)\popwin.sbr" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\popups2.pch"
-
-
-!ENDIF
-
-SOURCE=.\services.cpp
-
-!IF  "$(CFG)" == "yapp - Win32 Release"
-
-
-"$(INTDIR)\services.obj" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\popups2.pch"
-
-
-!ELSEIF  "$(CFG)" == "yapp - Win32 Debug"
-
-
-"$(INTDIR)\services.obj"	"$(INTDIR)\services.sbr" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\popups2.pch"
-
-
-!ELSEIF  "$(CFG)" == "yapp - Win32 Release Unicode"
-
-
-"$(INTDIR)\services.obj" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\popups2.pch"
-
-
-!ELSEIF  "$(CFG)" == "yapp - Win32 Debug Unicode"
-
-
-"$(INTDIR)\services.obj"	"$(INTDIR)\services.sbr" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\popups2.pch"
-
-
-!ENDIF
-
-SOURCE=.\str_utils.cpp
-
-!IF  "$(CFG)" == "yapp - Win32 Release"
-
-
-"$(INTDIR)\str_utils.obj" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\popups2.pch"
-
-
-!ELSEIF  "$(CFG)" == "yapp - Win32 Debug"
-
-
-"$(INTDIR)\str_utils.obj"	"$(INTDIR)\str_utils.sbr" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\popups2.pch"
-
-
-!ELSEIF  "$(CFG)" == "yapp - Win32 Release Unicode"
-
-
-"$(INTDIR)\str_utils.obj" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\popups2.pch"
-
-
-!ELSEIF  "$(CFG)" == "yapp - Win32 Debug Unicode"
-
-
-"$(INTDIR)\str_utils.obj"	"$(INTDIR)\str_utils.sbr" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\popups2.pch"
-
-
-!ENDIF
-
-SOURCE=.\resource.rc
-
-"$(INTDIR)\resource.res" : $(SOURCE) "$(INTDIR)"
-	$(RSC) $(RSC_PROJ) $(SOURCE)
-
-
-
-!ENDIF
diff --git a/plugins/yapp/popups2.vcproj b/plugins/yapp/popups2.vcproj
deleted file mode 100644
index 6bda8aaed5..0000000000
--- a/plugins/yapp/popups2.vcproj
+++ /dev/null
@@ -1,422 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7.10"
-	Name="yapp"
-	ProjectGUID="{B6FC188B-8E54-4197-9444-8BADE9AA75E2}"
-	RootNamespace="yapp"
-	SccProjectName=""
-	SccLocalPath="">
-	<Platforms>
-		<Platform
-			Name="Win32"/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)/Plugins"
-			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)/Obj/$(ProjectName)"
-			ConfigurationType="2"
-			CharacterSet="1">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="./docs;../../include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;POPUPS2_EXPORTS;_UNICODE;UNICODE"
-				MinimalRebuild="TRUE"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="TRUE"
-				UsePrecompiledHeader="3"
-				PrecompiledHeaderThrough="common.h"
-				WarningLevel="3"
-				DebugInformationFormat="4"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="unicows.lib comctl32.lib"
-				LinkIncremental="2"
-				GenerateDebugInformation="TRUE"
-				SubSystem="2"
-				TargetMachine="1"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)/Plugins"
-			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)/Obj/$(ProjectName)"
-			ConfigurationType="2"
-			CharacterSet="1"
-			WholeProgramOptimization="TRUE">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="3"
-				GlobalOptimizations="TRUE"
-				InlineFunctionExpansion="1"
-				FavorSizeOrSpeed="2"
-				OmitFramePointers="FALSE"
-				AdditionalIncludeDirectories="./docs;../../include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;POPUPS2_EXPORTS;_UNICODE;UNICODE;MICROSOFT_LAYER_FOR_UNICODE=1"
-				StringPooling="TRUE"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="3"
-				PrecompiledHeaderThrough="common.h"
-				WarningLevel="3"
-				DebugInformationFormat="3"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="vc7to6.lib comctl32.lib oldnames.lib"
-				LinkIncremental="1"
-				AdditionalLibraryDirectories="../../lib"
-				IgnoreAllDefaultLibraries="TRUE"
-				IgnoreDefaultLibraryNames="Kernel32.lib Advapi32.lib User32.lib Gdi32.lib Shell32.lib Comdlg32.lib Version.lib Mpr.lib Rasapi32.lib Winmm.lib Winspool.lib Vfw32.lib Secur32.lib Oleacc.lib Oledlg.lib Sensapi.lib"
-				GenerateDebugInformation="TRUE"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				TargetMachine="1"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Debug Unicode|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)/Plugins"
-			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)/Obj/$(ProjectName)"
-			ConfigurationType="2"
-			CharacterSet="1">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="./docs;../../include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;POPUPS2_EXPORTS;_UNICODE;UNICODE"
-				MinimalRebuild="TRUE"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="TRUE"
-				UsePrecompiledHeader="3"
-				PrecompiledHeaderThrough="common.h"
-				WarningLevel="3"
-				DebugInformationFormat="4"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				IgnoreImportLibrary="TRUE"
-				AdditionalDependencies="unicows.lib comctl32.lib"
-				LinkIncremental="2"
-				GenerateDebugInformation="TRUE"
-				SubSystem="2"
-				TargetMachine="1"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Release Unicode|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)/Plugins"
-			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)/Obj/$(ProjectName)"
-			ConfigurationType="2"
-			CharacterSet="1"
-			WholeProgramOptimization="FALSE">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="3"
-				GlobalOptimizations="TRUE"
-				FavorSizeOrSpeed="2"
-				OmitFramePointers="FALSE"
-				OptimizeForProcessor="0"
-				AdditionalIncludeDirectories="./docs;../../include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;POPUPS2_EXPORTS;_UNICODE;UNICODE;MICROSOFT_LAYER_FOR_UNICODE=1"
-				StringPooling="TRUE"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="TRUE"
-				UsePrecompiledHeader="3"
-				PrecompiledHeaderThrough="common.h"
-				WarningLevel="3"
-				DebugInformationFormat="3"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				IgnoreImportLibrary="TRUE"
-				AdditionalDependencies="vc7to6.lib comctl32.lib oldnames.lib"
-				AdditionalLibraryDirectories="../../lib"
-				IgnoreAllDefaultLibraries="TRUE"
-				IgnoreDefaultLibraryNames="Kernel32.lib Advapi32.lib User32.lib Gdi32.lib Shell32.lib Comdlg32.lib Version.lib Mpr.lib Rasapi32.lib Winmm.lib Winspool.lib Vfw32.lib Secur32.lib Oleacc.lib Oledlg.lib Sensapi.lib"
-				GenerateDebugInformation="TRUE"
-				GenerateMapFile="TRUE"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				TargetMachine="1"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
-			<File
-				RelativePath=".\message_pump.cpp">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;POPUPS2_EXPORTS;_UNICODE;UNICODE"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;POPUPS2_EXPORTS;_UNICODE;UNICODE"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug Unicode|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;POPUPS2_EXPORTS;_UNICODE;UNICODE"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release Unicode|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;POPUPS2_EXPORTS;_UNICODE;UNICODE"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\notify_imp.cpp">
-			</File>
-			<File
-				RelativePath=".\options.cpp">
-			</File>
-			<File
-				RelativePath=".\popup_history.cpp">
-			</File>
-			<File
-				RelativePath=".\popup_history_dlg.cpp">
-			</File>
-			<File
-				RelativePath=".\popups2.cpp">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="1"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="1"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug Unicode|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="1"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release Unicode|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="1"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\popwin.cpp">
-			</File>
-			<File
-				RelativePath=".\services.cpp">
-			</File>
-			<File
-				RelativePath=".\str_utils.cpp">
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
-			<File
-				RelativePath=".\common.h">
-			</File>
-			<File
-				RelativePath=".\message_pump.h">
-			</File>
-			<File
-				RelativePath=".\notify.h">
-			</File>
-			<File
-				RelativePath=".\options.h">
-			</File>
-			<File
-				RelativePath=".\popup_history.h">
-			</File>
-			<File
-				RelativePath=".\popups2.h">
-			</File>
-			<File
-				RelativePath=".\popwin.h">
-			</File>
-			<File
-				RelativePath=".\resource.h">
-			</File>
-			<File
-				RelativePath=".\services.h">
-			</File>
-			<File
-				RelativePath=".\str_utils.h">
-			</File>
-			<File
-				RelativePath=".\version.h">
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
-			<File
-				RelativePath=".\popups2.rc">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="TRUE">
-					<Tool
-						Name="VCResourceCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="TRUE">
-					<Tool
-						Name="VCResourceCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug Unicode|Win32"
-					ExcludedFromBuild="TRUE">
-					<Tool
-						Name="VCResourceCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release Unicode|Win32"
-					ExcludedFromBuild="TRUE">
-					<Tool
-						Name="VCResourceCompilerTool"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\resource.rc">
-			</File>
-			<File
-				RelativePath=".\version.rc">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="TRUE">
-					<Tool
-						Name="VCResourceCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="TRUE">
-					<Tool
-						Name="VCResourceCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug Unicode|Win32"
-					ExcludedFromBuild="TRUE">
-					<Tool
-						Name="VCResourceCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release Unicode|Win32"
-					ExcludedFromBuild="TRUE">
-					<Tool
-						Name="VCResourceCompilerTool"/>
-				</FileConfiguration>
-			</File>
-		</Filter>
-		<File
-			RelativePath=".\ReadMe.txt">
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/plugins/yapp/popups2_10.sln b/plugins/yapp/popups2_10.sln
new file mode 100644
index 0000000000..be594c7498
--- /dev/null
+++ b/plugins/yapp/popups2_10.sln
@@ -0,0 +1,38 @@
+
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "yapp", "popups2_10.vcxproj", "{B6FC188B-8E54-4197-9444-8BADE9AA75E2}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug Unicode|Win32 = Debug Unicode|Win32
+		Debug Unicode|x64 = Debug Unicode|x64
+		Debug|Win32 = Debug|Win32
+		Debug|x64 = Debug|x64
+		Release Unicode|Win32 = Release Unicode|Win32
+		Release Unicode|x64 = Release Unicode|x64
+		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{B6FC188B-8E54-4197-9444-8BADE9AA75E2}.Debug Unicode|Win32.ActiveCfg = Debug Unicode|Win32
+		{B6FC188B-8E54-4197-9444-8BADE9AA75E2}.Debug Unicode|Win32.Build.0 = Debug Unicode|Win32
+		{B6FC188B-8E54-4197-9444-8BADE9AA75E2}.Debug Unicode|x64.ActiveCfg = Debug Unicode|x64
+		{B6FC188B-8E54-4197-9444-8BADE9AA75E2}.Debug Unicode|x64.Build.0 = Debug Unicode|x64
+		{B6FC188B-8E54-4197-9444-8BADE9AA75E2}.Debug|Win32.ActiveCfg = Debug|Win32
+		{B6FC188B-8E54-4197-9444-8BADE9AA75E2}.Debug|Win32.Build.0 = Debug|Win32
+		{B6FC188B-8E54-4197-9444-8BADE9AA75E2}.Debug|x64.ActiveCfg = Debug|x64
+		{B6FC188B-8E54-4197-9444-8BADE9AA75E2}.Debug|x64.Build.0 = Debug|x64
+		{B6FC188B-8E54-4197-9444-8BADE9AA75E2}.Release Unicode|Win32.ActiveCfg = Release Unicode|Win32
+		{B6FC188B-8E54-4197-9444-8BADE9AA75E2}.Release Unicode|Win32.Build.0 = Release Unicode|Win32
+		{B6FC188B-8E54-4197-9444-8BADE9AA75E2}.Release Unicode|x64.ActiveCfg = Release Unicode|x64
+		{B6FC188B-8E54-4197-9444-8BADE9AA75E2}.Release Unicode|x64.Build.0 = Release Unicode|x64
+		{B6FC188B-8E54-4197-9444-8BADE9AA75E2}.Release|Win32.ActiveCfg = Release|Win32
+		{B6FC188B-8E54-4197-9444-8BADE9AA75E2}.Release|Win32.Build.0 = Release|Win32
+		{B6FC188B-8E54-4197-9444-8BADE9AA75E2}.Release|x64.ActiveCfg = Release|x64
+		{B6FC188B-8E54-4197-9444-8BADE9AA75E2}.Release|x64.Build.0 = Release|x64
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/plugins/yapp/popups2_10.vcxproj b/plugins/yapp/popups2_10.vcxproj
index 0a478034d3..955135adf9 100644
--- a/plugins/yapp/popups2_10.vcxproj
+++ b/plugins/yapp/popups2_10.vcxproj
@@ -51,20 +51,24 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
+    <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Unicode|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
@@ -110,15 +114,23 @@
     <IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'">true</IgnoreImportLibrary>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'">$(SolutionDir)$(Configuration)/Plugins\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'">$(SolutionDir)$(Configuration)/Obj/$(ProjectName)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|x64'">$(SolutionDir)$(Configuration)64/Plugins\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|x64'">$(SolutionDir)$(Configuration)64/Obj/$(ProjectName)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Configuration)64/Plugins\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Configuration)64/Obj/$(ProjectName)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release Unicode|x64'">$(SolutionDir)$(Configuration)64/Plugins\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release Unicode|x64'">$(SolutionDir)$(Configuration)64/Obj/$(ProjectName)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Configuration)64/Plugins\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Configuration)64/Obj/$(ProjectName)\</IntDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>./docs;../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>./docs;../../include;../ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;POPUPS2_EXPORTS;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <BufferSecurityCheck>true</BufferSecurityCheck>
       <PrecompiledHeaderFile>common.h</PrecompiledHeaderFile>
       <WarningLevel>Level3</WarningLevel>
@@ -133,6 +145,7 @@
       <DataExecutionPrevention>
       </DataExecutionPrevention>
       <TargetMachine>MachineX86</TargetMachine>
+      <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -141,7 +154,7 @@
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
       <WholeProgramOptimization>true</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>./docs;../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>./docs;../../include;../ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;POPUPS2_EXPORTS;_UNICODE;UNICODE;MICROSOFT_LAYER_FOR_UNICODE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <ExceptionHandling>
@@ -154,6 +167,7 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
     </ClCompile>
     <Link>
       <AdditionalDependencies>comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -173,11 +187,11 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>./docs;../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>./docs;../../include;../ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;POPUPS2_EXPORTS;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <BufferSecurityCheck>true</BufferSecurityCheck>
       <PrecompiledHeaderFile>common.h</PrecompiledHeaderFile>
       <WarningLevel>Level3</WarningLevel>
@@ -197,12 +211,12 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'">
     <ClCompile>
-      <Optimization>MinSpace</Optimization>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+      <Optimization>Full</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
       <WholeProgramOptimization>true</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>./docs;../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>./docs;../../include;../ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;POPUPS2_EXPORTS;_UNICODE;UNICODE;MICROSOFT_LAYER_FOR_UNICODE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <ExceptionHandling>
@@ -228,6 +242,70 @@
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Unicode|x64'">
+    <ClCompile>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <Optimization>Full</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
+      <OmitFramePointers>false</OmitFramePointers>
+      <AdditionalIncludeDirectories>./docs;../../include;../ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+    <Link>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <Optimization>Full</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
+      <OmitFramePointers>false</OmitFramePointers>
+      <AdditionalIncludeDirectories>./docs;../../include;../ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+    <Link>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|x64'">
+    <ClCompile>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|x64'">
+    <ClCompile>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <AdditionalIncludeDirectories>./docs;../../include;../ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <AdditionalIncludeDirectories>./docs;../../include;../ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="message_pump.cpp">
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'">WIN32;_DEBUG;_WINDOWS;_USRDLL;POPUPS2_EXPORTS;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
diff --git a/plugins/yapp/popups2_8.sln b/plugins/yapp/popups2_8.sln
deleted file mode 100644
index 9a3c8b6ec7..0000000000
--- a/plugins/yapp/popups2_8.sln
+++ /dev/null
@@ -1,19 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "popups2", "popups2_8.vcproj", "{B6FC188B-8E54-4197-9444-8BADE9AA75E2}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Release|Win32 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{B6FC188B-8E54-4197-9444-8BADE9AA75E2}.Debug|Win32.ActiveCfg = Debug|Win32
-		{B6FC188B-8E54-4197-9444-8BADE9AA75E2}.Debug|Win32.Build.0 = Debug|Win32
-		{B6FC188B-8E54-4197-9444-8BADE9AA75E2}.Release|Win32.ActiveCfg = Release|Win32
-		{B6FC188B-8E54-4197-9444-8BADE9AA75E2}.Release|Win32.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/plugins/yapp/popups2_8.vcproj b/plugins/yapp/popups2_8.vcproj
deleted file mode 100644
index 1978893d8d..0000000000
--- a/plugins/yapp/popups2_8.vcproj
+++ /dev/null
@@ -1,591 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8,00"
-	Name="yapp"
-	ProjectGUID="{B6FC188B-8E54-4197-9444-8BADE9AA75E2}"
-	RootNamespace="popups2"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)/Plugins"
-			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)/Obj/$(ProjectName)"
-			ConfigurationType="2"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="./docs;../../include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;POPUPS2_EXPORTS;_UNICODE;UNICODE"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="true"
-				PrecompiledHeaderThrough="common.h"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-				DisableSpecificWarnings="4996"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="unicows.lib comctl32.lib"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)/Plugins"
-			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)/Obj/$(ProjectName)"
-			ConfigurationType="2"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="3"
-				InlineFunctionExpansion="1"
-				FavorSizeOrSpeed="2"
-				OmitFramePointers="false"
-				AdditionalIncludeDirectories="./docs;../../include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;POPUPS2_EXPORTS;_UNICODE;UNICODE;MICROSOFT_LAYER_FOR_UNICODE=1"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				PrecompiledHeaderThrough="common.h"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				DisableSpecificWarnings="4996"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="comctl32.lib"
-				LinkIncremental="1"
-				IgnoreDefaultLibraryNames="Kernel32.lib Advapi32.lib User32.lib Gdi32.lib Shell32.lib Comdlg32.lib Version.lib Mpr.lib Rasapi32.lib Winmm.lib Winspool.lib Vfw32.lib Secur32.lib Oleacc.lib Oledlg.lib Sensapi.lib"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug Unicode|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)/Plugins"
-			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)/Obj/$(ProjectName)"
-			ConfigurationType="2"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="./docs;../../include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;POPUPS2_EXPORTS;_UNICODE;UNICODE"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="true"
-				PrecompiledHeaderThrough="common.h"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-				DisableSpecificWarnings="4996"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				IgnoreImportLibrary="true"
-				AdditionalDependencies="unicows.lib comctl32.lib"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release Unicode|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)/Plugins"
-			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)/Obj/$(ProjectName)"
-			ConfigurationType="2"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="3"
-				FavorSizeOrSpeed="2"
-				OmitFramePointers="false"
-				AdditionalIncludeDirectories="./docs;../../include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;POPUPS2_EXPORTS;_UNICODE;UNICODE;MICROSOFT_LAYER_FOR_UNICODE=1"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="true"
-				PrecompiledHeaderThrough="common.h"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				DisableSpecificWarnings="4996"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				IgnoreImportLibrary="true"
-				AdditionalDependencies="comctl32.lib"
-				IgnoreDefaultLibraryNames="Kernel32.lib Advapi32.lib User32.lib Gdi32.lib Shell32.lib Comdlg32.lib Version.lib Mpr.lib Rasapi32.lib Winmm.lib Winspool.lib Vfw32.lib Secur32.lib Oleacc.lib Oledlg.lib Sensapi.lib"
-				GenerateDebugInformation="true"
-				GenerateMapFile="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath=".\message_pump.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;POPUPS2_EXPORTS;_UNICODE;UNICODE"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;POPUPS2_EXPORTS;_UNICODE;UNICODE"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug Unicode|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;POPUPS2_EXPORTS;_UNICODE;UNICODE"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release Unicode|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;POPUPS2_EXPORTS;_UNICODE;UNICODE"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\notify_imp.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\options.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\popup_history.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\popup_history_dlg.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\popups2.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug Unicode|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release Unicode|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="1"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\popwin.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\services.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\str_utils.cpp"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath=".\common.h"
-				>
-			</File>
-			<File
-				RelativePath=".\message_pump.h"
-				>
-			</File>
-			<File
-				RelativePath=".\notify.h"
-				>
-			</File>
-			<File
-				RelativePath=".\options.h"
-				>
-			</File>
-			<File
-				RelativePath=".\popup_history.h"
-				>
-			</File>
-			<File
-				RelativePath=".\popups2.h"
-				>
-			</File>
-			<File
-				RelativePath=".\popwin.h"
-				>
-			</File>
-			<File
-				RelativePath=".\resource.h"
-				>
-			</File>
-			<File
-				RelativePath=".\services.h"
-				>
-			</File>
-			<File
-				RelativePath=".\str_utils.h"
-				>
-			</File>
-			<File
-				RelativePath=".\version.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-			<File
-				RelativePath=".\popups2.rc"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCResourceCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCResourceCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug Unicode|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCResourceCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release Unicode|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCResourceCompilerTool"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\resource.rc"
-				>
-			</File>
-			<File
-				RelativePath=".\version.rc"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCResourceCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCResourceCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug Unicode|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCResourceCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release Unicode|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCResourceCompilerTool"
-					/>
-				</FileConfiguration>
-			</File>
-		</Filter>
-		<File
-			RelativePath=".\ReadMe.txt"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/plugins/yapp/popups2_9.vcproj b/plugins/yapp/popups2_9.vcproj
deleted file mode 100644
index 4668ea38dc..0000000000
--- a/plugins/yapp/popups2_9.vcproj
+++ /dev/null
@@ -1,980 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="yapp"
-	ProjectGUID="{B6FC188B-8E54-4197-9444-8BADE9AA75E2}"
-	RootNamespace="yapp"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)/Plugins"
-			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)/Obj/$(ProjectName)"
-			ConfigurationType="2"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="./docs;../../include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;POPUPS2_EXPORTS;_UNICODE;UNICODE"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="true"
-				PrecompiledHeaderThrough="common.h"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-				DisableSpecificWarnings="4996"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="unicows.lib comctl32.lib"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)64/Plugins"
-			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)64/Obj/$(ProjectName)"
-			ConfigurationType="2"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="./docs;../../include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;POPUPS2_EXPORTS;_UNICODE;UNICODE"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="true"
-				PrecompiledHeaderThrough="common.h"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				DisableSpecificWarnings="4996"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="c:\miranda im\plugins\$(ProjectName).dll"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)/Plugins"
-			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)/Obj/$(ProjectName)"
-			ConfigurationType="2"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="3"
-				InlineFunctionExpansion="1"
-				FavorSizeOrSpeed="2"
-				WholeProgramOptimization="true"
-				AdditionalIncludeDirectories="./docs;../../include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;POPUPS2_EXPORTS;_UNICODE;UNICODE;MICROSOFT_LAYER_FOR_UNICODE=1"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				FloatingPointModel="2"
-				RuntimeTypeInfo="false"
-				PrecompiledHeaderThrough="common.h"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				DisableSpecificWarnings="4996"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				IgnoreImportLibrary="true"
-				AdditionalDependencies="comctl32.lib"
-				IgnoreDefaultLibraryNames="Kernel32.lib Advapi32.lib User32.lib Gdi32.lib Shell32.lib Comdlg32.lib Version.lib Mpr.lib Rasapi32.lib Winmm.lib Winspool.lib Vfw32.lib Secur32.lib Oleacc.lib Oledlg.lib Sensapi.lib"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="0"
-				LinkTimeCodeGeneration="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(IntDir)/$(TargetName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(ConfigurationName)64"
-			IntermediateDirectory="$(ConfigurationName)64"
-			ConfigurationType="2"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="1"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="2"
-				WholeProgramOptimization="true"
-				AdditionalIncludeDirectories="./docs;../../include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;POPUPS2_EXPORTS;_UNICODE;UNICODE;MICROSOFT_LAYER_FOR_UNICODE=1"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				FloatingPointModel="2"
-				RuntimeTypeInfo="false"
-				PrecompiledHeaderThrough="common.h"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				DisableSpecificWarnings="4996"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="c:\miranda im\plugins\$(ProjectName).dll"
-				LinkIncremental="1"
-				IgnoreDefaultLibraryNames=""
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				LinkTimeCodeGeneration="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug Unicode|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)/Plugins"
-			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)/Obj/$(ProjectName)"
-			ConfigurationType="2"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="./docs;../../../include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;POPUPS2_EXPORTS;_UNICODE;UNICODE"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="true"
-				PrecompiledHeaderThrough="common.h"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-				DisableSpecificWarnings="4996"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				IgnoreImportLibrary="true"
-				AdditionalDependencies="unicows.lib comctl32.lib"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(IntDir)/$(TargetName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug Unicode|x64"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)64/Plugins"
-			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)64/Obj/$(ProjectName)"
-			ConfigurationType="2"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="./docs;../../../include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;POPUPS2_EXPORTS;_UNICODE;UNICODE"
-				RuntimeLibrary="3"
-				PrecompiledHeaderThrough="common.h"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				DisableSpecificWarnings="4996"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				IgnoreImportLibrary="true"
-				OutputFile="c:\miranda im\plugins\$(ProjectName).dll"
-				AdditionalManifestDependencies=""
-				GenerateDebugInformation="true"
-				RandomizedBaseAddress="1"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release Unicode|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)/Plugins"
-			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)/Obj/$(ProjectName)"
-			ConfigurationType="2"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="1"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="2"
-				WholeProgramOptimization="true"
-				AdditionalIncludeDirectories="./docs;../../include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;POPUPS2_EXPORTS;_UNICODE;UNICODE;MICROSOFT_LAYER_FOR_UNICODE=1"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				FloatingPointModel="2"
-				RuntimeTypeInfo="false"
-				PrecompiledHeaderThrough="common.h"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				DisableSpecificWarnings="4996"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="comctl32.lib"
-				IgnoreDefaultLibraryNames="Kernel32.lib Advapi32.lib User32.lib Gdi32.lib Shell32.lib Comdlg32.lib Version.lib Mpr.lib Rasapi32.lib Winmm.lib Winspool.lib Vfw32.lib Secur32.lib Oleacc.lib Oledlg.lib Sensapi.lib"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				RandomizedBaseAddress="1"
-				ImportLibrary="$(IntDir)/$(TargetName).lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release Unicode|x64"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)64/Plugins"
-			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)64/Obj/$(ProjectName)"
-			ConfigurationType="2"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="3"
-				InlineFunctionExpansion="1"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="2"
-				WholeProgramOptimization="true"
-				AdditionalIncludeDirectories="./docs;../../include;..\..\..\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;POPUPS2_EXPORTS;_UNICODE;UNICODE;MICROSOFT_LAYER_FOR_UNICODE=1"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				FloatingPointModel="2"
-				RuntimeTypeInfo="false"
-				PrecompiledHeaderThrough="common.h"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				DisableSpecificWarnings="4996"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				IgnoreDefaultLibraryNames=""
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				RandomizedBaseAddress="1"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath=".\message_pump.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\notify_imp.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\options.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\popup_history.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\popup_history_dlg.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\popups2.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug Unicode|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug Unicode|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release Unicode|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release Unicode|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="1"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\popwin.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\services.cpp"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath=".\common.h"
-				>
-			</File>
-			<File
-				RelativePath=".\message_pump.h"
-				>
-			</File>
-			<File
-				RelativePath=".\notify.h"
-				>
-			</File>
-			<File
-				RelativePath=".\options.h"
-				>
-			</File>
-			<File
-				RelativePath=".\popup_history.h"
-				>
-			</File>
-			<File
-				RelativePath=".\popups2.h"
-				>
-			</File>
-			<File
-				RelativePath=".\popwin.h"
-				>
-			</File>
-			<File
-				RelativePath=".\resource.h"
-				>
-			</File>
-			<File
-				RelativePath=".\services.h"
-				>
-			</File>
-			<File
-				RelativePath=".\version.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-			<File
-				RelativePath=".\popups2.rc"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCResourceCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCResourceCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCResourceCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCResourceCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug Unicode|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCResourceCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug Unicode|x64"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCResourceCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release Unicode|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCResourceCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release Unicode|x64"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCResourceCompilerTool"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\resource.rc"
-				>
-			</File>
-			<File
-				RelativePath=".\version.rc"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCResourceCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCResourceCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCResourceCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCResourceCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug Unicode|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCResourceCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug Unicode|x64"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCResourceCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release Unicode|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCResourceCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release Unicode|x64"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCResourceCompilerTool"
-					/>
-				</FileConfiguration>
-			</File>
-		</Filter>
-		<File
-			RelativePath=".\ReadMe.txt"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/plugins/yapp/sdk/m_ieview.h b/plugins/yapp/sdk/m_ieview.h
deleted file mode 100644
index 732d2849e7..0000000000
--- a/plugins/yapp/sdk/m_ieview.h
+++ /dev/null
@@ -1,177 +0,0 @@
-/*
-
-IEView Plugin for Miranda IM
-Copyright (C) 2005  Piotr Piastucki
-
-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_IEVIEW_INCLUDED
-#define M_IEVIEW_INCLUDED
-
-#define MS_IEVIEW_WINDOW  "IEVIEW/NewWindow"
-#define MS_IEVIEW_EVENT	  "IEVIEW/Event"
-#define MS_IEVIEW_UTILS   "IEVIEW/Utils"
-
-#define ME_IEVIEW_OPTIONSCHANGED  "IEVIEW/OptionsChanged"
-#define ME_IEVIEW_NOTIFICATION  "IEVIEW/Notification"
-
-#define IEW_CREATE  1               // create new window (control)
-#define IEW_DESTROY 2               // destroy control
-#define IEW_SETPOS  3               // set window position and size
-#define IEW_SCROLLBOTTOM 4          // scroll text to bottom
-
-//#define IEWM_SRMM     0             // regular SRMM
-#define IEWM_TABSRMM  1             // TabSRMM-compatible HTML builder
-#define IEWM_SCRIVER  3             // Scriver-compatible HTML builder
-#define IEWM_MUCC     4             // MUCC group chats GUI
-#define IEWM_CHAT     5             // chat.dll group chats GUI
-#define IEWM_HISTORY  6             // history viewer
-
-typedef struct {
-	int			cbSize;             // size of the strusture
-	int			iType;				// one of IEW_* values
-	DWORD		dwMode;				// compatibility mode - one of IEWM_* values
-	DWORD		dwFlags;			// flags, one of IEWF_* values
-	HWND		parent;             // parent window HWND
-	HWND 		hwnd;               // IEW_CREATE returns WebBrowser control's HWND here
-	int			x;                  // IE control horizontal position
-	int			y;                  // IE control vertical position
-	int			cx;                 // IE control horizontal size
-	int			cy;                 // IE control vertical size
-
-} IEVIEWWINDOW;
-
-#define IEEDF_UNICODE 		1          // if set pszText is a pointer to wchar_t string instead of char string
-#define IEEDF_UNICODE_TEXT	1          // if set pszText is a pointer to wchar_t string instead of char string
-#define IEEDF_UNICODE_NICK	2          // if set pszNick is a pointer to wchar_t string instead of char string
-#define IEEDF_UNICODE_TEXT2	4          // if set pszText2 is a pointer to wchar_t string instead of char string
-/* The following flags are valid only for message events (IEED_EVENT_MESSAGE) */
-#define IEEDF_FORMAT_FONT	0x00000100 // if set pszFont (font name) is valid and should be used
-#define IEEDF_FORMAT_SIZE	0x00000200 // if set fontSize is valid and should be used
-#define IEEDF_FORMAT_COLOR	0x00000400 // if set color is valid and should be used
-#define IEEDF_FORMAT_STYLE	0x00000800 // if set fontSize is valid and should be used
-
-#define IEEDF_READ			0x00001000 // if set
-#define IEEDF_SENT			0x00002000 // if set
-#define IEEDF_RTL			0x00004000 //
-
-#define IEED_EVENT_MESSAGE			0x0001 // message
-#define IEED_EVENT_STATUSCHANGE		0x0002 // status change
-#define IEED_EVENT_FILE				0x0003 // file
-#define IEED_EVENT_URL				0x0004 // url
-#define IEED_EVENT_ERRMSG           0x0005 // error message
-#define IEED_EVENT_SYSTEM           0x0006 // system event
-
-#define IEED_MUCC_EVENT_MESSAGE		0x0001 // message
-#define IEED_MUCC_EVENT_TOPIC		0x0002 // topic change
-#define IEED_MUCC_EVENT_JOINED		0x0003 // user joined
-#define IEED_MUCC_EVENT_LEFT		0x0004 // user left
-#define IEED_MUCC_EVENT_ERROR		0x0005 // error
-
-#define IEED_GC_EVENT_HIGHLIGHT 	0x8000
-#define IEED_GC_EVENT_MESSAGE   	0x0001
-#define IEED_GC_EVENT_TOPIC     	0x0002
-#define IEED_GC_EVENT_JOIN      	0x0003
-#define IEED_GC_EVENT_PART      	0x0004
-#define IEED_GC_EVENT_QUIT      	0x0006
-#define IEED_GC_EVENT_NICK      	0x0007
-#define IEED_GC_EVENT_ACTION    	0x0008
-#define IEED_GC_EVENT_KICK      	0x0009
-#define IEED_GC_EVENT_NOTICE    	0x000A
-#define IEED_GC_EVENT_INFORMATION   0x000B
-#define IEED_GC_EVENT_ADDSTATUS     0x000C
-#define IEED_GC_EVENT_REMOVESTATUS  0x000D
-
-#define IE_FONT_BOLD			0x000100	// Bold font flag
-#define IE_FONT_ITALIC			0x000200	// Italic font flag
-#define IE_FONT_UNDERLINE		0x000400	// Underlined font flags
-
-typedef struct tagIEVIEWEVENTDATA {
-	int			cbSize;
-	int			iType;				// Event type, one of MUCC_EVENT_* values
-	DWORD		dwFlags;			// Event flags - IEEF_*
-	const char *fontName;			// Text font name
-	int			fontSize;			// Text font size (in pixels)
-	int         fontStyle;          // Text font style (combination of IE_FONT_* flags)
-	COLORREF	color;				// Text color
-	union {
-		const char *pszNick;		// Nick, usage depends on type of event
-		const wchar_t *pszNickW;    // Nick - Unicode
-	};
-	union {
-		const char *pszText;			// Text, usage depends on type of event
-		const wchar_t *pszTextW;			// Text - Unicode
-	};
-	DWORD		dwData;				// DWORD data e.g. status
-	BOOL		bIsMe;				// TRUE if the event is related to the user
-	DWORD		time;				// Time of the event
-	struct tagIEVIEWEVENTDATA *next;
-	union {
-		const char *pszText2;			// Text, usage depends on type of event
-		const wchar_t *pszText2W;		// Text - Unicode
-	};
-} IEVIEWEVENTDATA;
-
-#define IEE_LOG_DB_EVENTS  	1       // log specified number of DB events
-#define IEE_CLEAR_LOG		2       // clear log
-#define IEE_GET_SELECTION	3       // get selected text
-#define IEE_SAVE_DOCUMENT	4       // save current document
-#define IEE_LOG_MEM_EVENTS 	5       // log specified number of IEView events
-
-#define IEEF_RTL          1           // turn on RTL support
-#define IEEF_NO_UNICODE   2           // disable Unicode support
-#define IEEF_NO_SCROLLING 4           // do not scroll logs to bottom
-
-#define IEVIEWEVENT_SIZE_V1 28
-#define IEVIEWEVENT_SIZE_V2 32
-#define IEVIEWEVENT_SIZE_V3 36
-
-typedef struct {
-	int			cbSize;             // size of the strusture
-	int			iType;				// one of IEE_* values
-	DWORD		dwFlags;			// one of IEEF_* values
-	HWND		hwnd;               // HWND returned by IEW_CREATE
-	HANDLE      hContact;           // contact
-	union {
-		HANDLE 		hDbEventFirst;      // first event to log, when IEE_LOG_EVENTS returns it will contain
-										// the last event actually logged or NULL if no event was logged (IEE_LOG_EVENTS)
-		IEVIEWEVENTDATA *eventData;	    // the pointer to an array of IEVIEWEVENTDATA objects (IEE_LOG_IEV_EVENTS)
-	};
-	int 		count;              // number of events to log
-	int         codepage;           // ANSI codepage
-	const char *pszProto;			// Name of the protocol
-} IEVIEWEVENT;
-
-typedef struct {
-	int cbSize;                //size of the structure
-	const char* Protocolname;  //protocol to use... if you have defined a protocol, u can
-                             //use your own protocol name. Smiley add wil automatically
-                             //select the smileypack that is defined for your protocol.
-                             //Or, use "Standard" for standard smiley set. Or "ICQ", "MSN"
-                             //if you prefer those icons.
-                             //If not found or NULL: "Standard" will be used
-	int xPosition;             //Postition to place the selectwindow
-	int yPosition;             // "
-	int Direction;             //Direction (i.e. size upwards/downwards/etc) of the window 0, 1, 2, 3
-  	HWND hwndTarget;           //Window, where to send the message when smiley is selected.
-	UINT targetMessage;        //Target message, to be sent.
-	LPARAM targetWParam;       //Target WParam to be sent (LParam will be char* to select smiley)
-                             //see the example file.
-} IEVIEWSHOWSMILEYSEL;
-
-#endif
-
diff --git a/plugins/yapp/sdk/m_updater.h b/plugins/yapp/sdk/m_updater.h
deleted file mode 100644
index 488d3722ce..0000000000
--- a/plugins/yapp/sdk/m_updater.h
+++ /dev/null
@@ -1,150 +0,0 @@
-#ifndef _M_UPDATER_H
-#define _M_UPDATER_H
-
-// NOTES:
-// - For langpack updates, include a string of the following format in the langpack text file:
-//    ";FLID: <file listing name> <version>"
-//    version must be four numbers seperated by '.', in the range 0-255 inclusive
-// - Updater will disable plugins that are downloaded but were not active prior to the update (this is so that, if an archive contains e.g. ansi and 
-//    unicode versions, the correct plugin will be the only one active after the new version is installed)...so if you add a support plugin, you may need 
-//    to install an ini file to make the plugin activate when miranda restarts after the update
-// - Updater will replace all dlls that have the same internal shortName as a downloaded update dll (this is so that msn1.dll and msn2.dll, for example,
-//    will both be updated) - so if you have a unicode and a non-unicode version of a plugin in your archive, you should make the internal names different (which will break automatic 
-//    updates from the file listing if there is only one file listing entry for both versions, unless you use the 'MS_UPDATE_REGISTER' service below)
-// - Updater will install all files in the root of the archive into the plugins folder, except for langpack files that contain the FLID string which go into the root folder (same
-//    folder as miranda32.exe)...all folders in the archive will also be copied to miranda's root folder, and their contents transferred into the new folders. The only exception is a 
-//    special folder called 'root_files' - if there is a folder by that name in the archive, it's contents will also be copied into miranda's root folder - this is intended to be used 
-//    to install additional dlls etc that a plugin may require)
-
-// if you set Update.szUpdateURL to the following value when registering, as well as setting your beta site and version data,
-// Updater will ignore szVersionURL and pbVersionPrefix, and attempt to find the file listing URL's from the backend XML data.
-// for this to work, the plugin name in pluginInfo.shortName must match the file listing exactly (except for case)
-#define UPDATER_AUTOREGISTER		"UpdaterAUTOREGISTER"
-// Updater will also use the backend xml data if you provide URL's that reference the miranda file listing for updates (so you can use that method 
-// if e.g. your plugin shortName does not match the file listing) - it will grab the file listing id from the end of these URLs
-
-typedef struct Update_tag {
-  int cbSize;     
-  char *szComponentName;		// component name as it will appear in the UI (will be translated before displaying)
-
-  char *szVersionURL;			// URL where the current version can be found (NULL to disable)
-  BYTE *pbVersionPrefix;		// bytes occuring in VersionURL before the version, used to locate the version information within the URL data
-								// (note that this URL could point at a binary file - dunno why, but it could :)
-  int cpbVersionPrefix;			// number of bytes pointed to by pbVersionPrefix
-  char *szUpdateURL;			// URL where dll/zip is located
-								// set to UPDATER_AUTOREGISTER if you want Updater to find the file listing URLs (ensure plugin shortName matches file listing!)
-
-  char *szBetaVersionURL;		// URL where the beta version can be found (NULL to disable betas)
-  BYTE *pbBetaVersionPrefix;	// bytes occuring in VersionURL before the version, used to locate the version information within the URL data
-  int cpbBetaVersionPrefix;		// number of bytes pointed to by pbVersionPrefix
-  char *szBetaUpdateURL;		// URL where dll/zip is located
-
-  BYTE *pbVersion;				// bytes of current version, used for comparison with those in VersionURL
-  int cpbVersion;				// number of bytes pointed to by pbVersion
-
-  char *szBetaChangelogURL;		// url for displaying changelog for beta versions
-} Update;
-
-// register a comonent with Updater
-//
-// wparam = 0
-// lparam = (LPARAM)&Update
-#define MS_UPDATE_REGISTER      "Update/Register"
-
-// utility functions to create a version string from a DWORD or from pluginInfo
-// point buf at a buffer at least 16 chars wide - but note the version string returned may be shorter
-//
-__inline static char *CreateVersionString(DWORD version, char *buf) {
-	mir_snprintf(buf, 16, "%d.%d.%d.%d", (version >> 24) & 0xFF, (version >> 16) & 0xFF, (version >> 8) & 0xFF, version & 0xFF);
-	return buf;
-}
-
-__inline static char *CreateVersionStringPlugin(PLUGININFO *pluginInfo, char *buf) {
-	return CreateVersionString(pluginInfo->version, buf);
-}
-
-__inline static char *CreateVersionStringPluginEx(PLUGININFOEX *pluginInfo, char *buf) {
-	return CreateVersionString(pluginInfo->version, buf);
-}
-
-
-// register the 'easy' way - use this method if you have no beta URL and the plugin is on the miranda file listing
-// NOTE: the plugin version string on the file listing must be the string version of the version in pluginInfo (i.e. 0.0.0.1,
-// four numbers between 0 and 255 inclusivem, so no letters, brackets, etc.)
-//
-// wParam = (int)fileID				- this is the file ID from the file listing (i.e. the number at the end of the download link)
-// lParam = (PLUGININFO*)&pluginInfo
-#define MS_UPDATE_REGISTERFL	"Update/RegisterFL"
-
-// this function can be used to 'unregister' components - useful for plugins that register non-plugin/langpack components and
-// may need to change those components on the fly
-// lParam = (char *)szComponentName
-#define MS_UPDATE_UNREGISTER	"Update/Unregister"
-
-// this event is fired when the startup process is complete, but NOT if a restart is imminent
-// it is designed for status managment plugins to use as a trigger for beggining their own startup process
-// wParam = lParam = 0 (unused)
-// (added in version 0.1.6.0)
-#define ME_UPDATE_STARTUPDONE	"Update/StartupDone"
-
-// this service can be used to enable/disable Updater's global status control
-// it can be called from the StartupDone event handler
-// wParam = (BOOL)enable
-// lParam = 0
-// (added in version 0.1.6.0)
-#define MS_UPDATE_ENABLESTATUSCONTROL	"Update/EnableStatusControl"
-
-// An description of usage of the above service and event:
-// Say you are a status control plugin that normally sets protocol or global statuses in your ModulesLoaded event handler.
-// In order to make yourself 'Updater compatible', you would move the status control code from ModulesLoaded to another function, 
-// say DoStartup. Then, in ModulesLoaded you would check for the existence of the MS_UPDATE_ENABLESTATUSCONTROL service.
-// If it does not exist, call DoStartup. If it does exist, hook the ME_UPDATE_STARTUPDONE event and call DoStartup from there. You may
-// also wish to call MS_UPDATE_ENABLESTATUSCONTROL with wParam == FALSE at this time, to disable Updater's own status control feature.
-
-// this service can be used to determine whether updates are possible for a component with the given name
-// wParam = 0
-// lParam = (char *)szComponentName
-// returns TRUE if updates are supported, FALSE otherwise
-#define MS_UPDATE_ISUPDATESUPPORTED		"Update/IsUpdateSupported"
-
-#endif
-
-
-/////////////// Usage Example ///////////////
-
-#ifdef EXAMPLE_CODE
-
-// you need to #include "m_updater.h" and HookEvent(ME_SYSTEM_MODULESLOADED, OnModulesLoaded) in your Load function...
-
-int OnModulesLoaded(WPARAM wParam, LPARAM lParam) {
-
-	Update update = {0}; // for c you'd use memset or ZeroMemory...
-	char szVersion[16];
-
-	update.cbSize = sizeof(Update);
-
-	update.szComponentName = pluginInfo.shortName;
-	update.pbVersion = (BYTE *)CreateVersionString(&pluginInfo, szVersion);
-	update.cpbVersion = strlen((char *)update.pbVersion);
-
-	// these are the three lines that matter - the archive, the page containing the version string, and the text (or data) 
-	// before the version that we use to locate it on the page
-	// (note that if the update URL and the version URL point to standard file listing entries, the backend xml
-	// data will be used to check for updates rather than the actual web page - this is not true for beta urls)
-	update.szUpdateURL = "http://scottellis.com.au:81/test/updater.zip";
-	update.szVersionURL = "http://scottellis.com.au:81/test/updater_test.html";
-	update.pbVersionPrefix = (BYTE *)"Updater version ";
-	
-	update.cpbVersionPrefix = strlen((char *)update.pbVersionPrefix);
-
-	// do the same for the beta versions of the above struct members if you wish to allow beta updates from another URL
-
-	CallService(MS_UPDATE_REGISTER, 0, (WPARAM)&update);
-
-	// Alternatively, to register a plugin with e.g. file ID 2254 on the file listing...
-	// CallService(MS_UPDATE_REGISTERFL, (WPARAM)2254, (LPARAM)&pluginInfo);
-
-	return 0;
-}
-
-#endif