7 files changed, 1 insertions, 40 deletions
diff --git a/plugins/YAMN/src/proto/netlib.cpp b/plugins/YAMN/src/proto/netlib.cpp
index cfe3b20c48..0ae92f6f33 100644
--- a/plugins/YAMN/src/proto/netlib.cpp
+++ b/plugins/YAMN/src/proto/netlib.cpp
@@ -5,8 +5,6 @@
  */
 
 #include "..\yamn.h"
-#include "m_netlib.h"
-#include "netlib.h"
 
 //--------------------------------------------------------------------------------------------------
 //--------------------------------------------------------------------------------------------------
@@ -14,9 +12,6 @@
 BOOL SSLLoaded=FALSE;
 HANDLE hNetlibUser=NULL;
 
-extern PVOID TLSCtx;
-extern PVOID SSLCtx;
-
 void __stdcall	SSL_DebugLog(const char *fmt, ...)
 {
 	char		str[ 4096 ];
diff --git a/plugins/YAMN/src/proto/netlib.h b/plugins/YAMN/src/proto/netlib.h
index 90ad3613a5..17259cf219 100644
--- a/plugins/YAMN/src/proto/netlib.h
+++ b/plugins/YAMN/src/proto/netlib.h
@@ -1,10 +1,6 @@
 #ifndef __NETLIB_H
 #define __NETLIB_H
 
-#include "netclient.h"
-
-#pragma warning( disable : 4290 )
-
 class CNLClient: public CNetClient
 {
 public:
diff --git a/plugins/YAMN/src/proto/pop3/pop3.cpp b/plugins/YAMN/src/proto/pop3/pop3.cpp
index bae04363cb..d3f14af9a1 100644
--- a/plugins/YAMN/src/proto/pop3/pop3.cpp
+++ b/plugins/YAMN/src/proto/pop3/pop3.cpp
@@ -23,12 +23,7 @@
  *
  */
 
-#pragma warning( disable : 4290 )
-
 #include "..\..\yamn.h"
-#include "pop3.h"
-
-extern void __stdcall	SSL_DebugLog( const char *fmt, ... );
 
 //--------------------------------------------------------------------------------------------------
 //--------------------------------------------------------------------------------------------------
diff --git a/plugins/YAMN/src/proto/pop3/pop3.h b/plugins/YAMN/src/proto/pop3/pop3.h
index 4d49f80bec..c65dc2ee26 100644
--- a/plugins/YAMN/src/proto/pop3/pop3.h
+++ b/plugins/YAMN/src/proto/pop3/pop3.h
@@ -1,9 +1,6 @@
 #ifndef __POP3_H
 #define __POP3_H
 
-#include "../../debug.h"
-#include "../netlib.h"				//NetLib client
-
 #define DOTLINE(s)	((((s)[-2]=='\r') || ((s)[-2]=='\n')) && ((s)[-1]=='.') && (((s)[0]=='\r') || ((s)[0]=='\n') || ((s)[0]=='\0')))	// be careful, it's different to ESR's pop3.c ;-)
 #define ENDLINE(s)	(((s)[0]=='\r') || ((s)[0]=='\n'))	//endline
 #define OKLINE(s)	(((s)[0]=='+') && (((s)[1]=='o') || ((s)[1]=='O')) && (((s)[2]=='k') || ((s)[2]=='K')))	// +OK
diff --git a/plugins/YAMN/src/proto/pop3/pop3comm.cpp b/plugins/YAMN/src/proto/pop3/pop3comm.cpp
index 7573484e8c..9514293cf3 100644
--- a/plugins/YAMN/src/proto/pop3/pop3comm.cpp
+++ b/plugins/YAMN/src/proto/pop3/pop3comm.cpp
@@ -10,12 +10,7 @@
 */
 
 
-#pragma warning( disable : 4290 )
 #include "../../yamn.h"
-#include "../../main.h"
-#include "pop3.h"
-#include "pop3comm.h"		//all we need for POP3 account (POP3 account= YAMN account + some more POP3 specified members)
-#include <m_netlib.h>		//socket thorugh proxy functions
 
 #define ERRORSTR_MAXLEN	1024	//in wide-chars
 
@@ -128,7 +123,7 @@ HYAMNPROTOPLUGIN POP3Plugin			= NULL;
 YAMN_PROTOREGISTRATION POP3ProtocolRegistration =
 {
 	"POP3 protocol (internal)",
-	YAMN_VERSION_C,
+	__VERSION_STRING,
 	"© 2002-2004 majvan | 2005-2007 tweety, yb",
 	"Mail notifier and browser for Miranda NG. Included POP3 protocol.",
 	"francois.mean@skynet.be",
diff --git a/plugins/YAMN/src/proto/pop3/pop3comm.h b/plugins/YAMN/src/proto/pop3/pop3comm.h
index c7eb01b5a1..8d75d0876d 100644
--- a/plugins/YAMN/src/proto/pop3/pop3comm.h
+++ b/plugins/YAMN/src/proto/pop3/pop3comm.h
@@ -1,20 +1,6 @@
 #ifndef __POP3COMM_H
 #define __POP3COMM_H
 
-#include <windows.h>
-#include "pop3.h"
-
-#include "m_protoplugin.h"
-//We can use synchro.h because this is internal plugin. If you use external plugin,
-//and you want to use SO for your plugin, you can use YAMN's SO.
-//All you need is to include synchro.h and use YAMN's exported synchronization functions.
-#include "m_synchro.h"
-
-//For mail exported functions defintions
-#include "m_mails.h"
-
-#include "../../debug.h"
-					
 #define	POP3_FILEVERSION	1	//Version of aditional information stored in book file
 
 typedef struct CPOP3Account: public CAccount
diff --git a/plugins/YAMN/src/proto/pop3/pop3opt.cpp b/plugins/YAMN/src/proto/pop3/pop3opt.cpp
index baebcd0bbd..72696430ab 100644
--- a/plugins/YAMN/src/proto/pop3/pop3opt.cpp
+++ b/plugins/YAMN/src/proto/pop3/pop3opt.cpp
@@ -5,9 +5,6 @@
 */
 
 #include "../../yamn.h"
-#include "../../main.h"
-#include "pop3comm.h"
-#include "pop3opt.h"
 
 //--------------------------------------------------------------------------------------------------