3 files changed, 10 insertions, 24 deletions
diff --git a/plugins/Exchange/src/exchange.cpp b/plugins/Exchange/src/exchange.cpp
index 0a0ef5f291..d9932b1b80 100644
--- a/plugins/Exchange/src/exchange.cpp
+++ b/plugins/Exchange/src/exchange.cpp
@@ -38,14 +38,10 @@ PLUGININFOEX pluginInfo = {
 	__AUTHORWEB,
 	UNICODE_AWARE,
   {0x2fd0df15, 0x7098, 0x41ce, {0xaa, 0x92, 0xff, 0x62, 0x18, 0x06, 0xe3, 0x8b}} //{2fd0df15-7098-41ce-aa92-ff621806e38b}
-}; //not used
-
-//OLD_MIRANDAPLUGININFO_SUPPORT;
+};
 
 extern "C" __declspec(dllexport) PLUGININFOEX *MirandaPluginInfoEx(DWORD) 
 {
-//	Log("%s", "Entering function " __FUNCTION__);
-//	Log("%s", "Leaving function " __FUNCTION__);
 	return &pluginInfo;
 }
 
@@ -53,39 +49,27 @@ extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = {MIID_EXCHANG
 
 extern "C" int __declspec(dllexport) Load()
 {
-//	Log("%s", "Entering function " __FUNCTION__);
-	//pluginLink = link;
 	mir_getLP( &pluginInfo );
-//	Log("%s", "Initialising miranda memory functions");
-//	InitializeMirandaMemFunctions();
 	hiMailIcon = LoadIcon(hInstance, MAKEINTRESOURCE(IDI_MAIL));
-//	Log("%s", "Creating service functions ...");
 	InitServices();
-//	Log("%s", "Hooking events ...");	
 	HookEvents();
 	return 0;
 }
 
 extern "C" int __declspec(dllexport) Unload()
 {
-//	Log("%s", "Entering function " __FUNCTION__);
-//	Log("%s", "Unhooking events ...");
-	
-//	Log("%s", "Destroying service functions ...");
 	DestroyServices();
-//	DestroyEvents();
 	UnhookEvents();
-	
-//	Log("%s", "Leaving function " __FUNCTION__);
 	return 0;
 }
 
-extern "C" bool WINAPI DllMain(HINSTANCE hinstDLL,DWORD fdwReason,LPVOID)
+/////////////////////////////////////////////////////////////////////////////////////////
+
+BOOL WINAPI DllMain(HINSTANCE hinstDLL,DWORD fdwReason,LPVOID)
 {
 	hInstance = hinstDLL; //save global instance
 	if (fdwReason == DLL_PROCESS_ATTACH)
-		{
-			DisableThreadLibraryCalls(hinstDLL);
-		}
+		DisableThreadLibraryCalls(hinstDLL);
+
 	return TRUE;
-}
-\ No newline at end of file
+}
diff --git a/plugins/Exchange/src/stdafx.h b/plugins/Exchange/src/stdafx.h
index 54a29c3752..1358ddbb07 100644
--- a/plugins/Exchange/src/stdafx.h
+++ b/plugins/Exchange/src/stdafx.h
@@ -39,7 +39,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <m_options.h>
 #include <m_clist.h>
 #include <m_langpack.h>
-#include "m_utils.h"
+#include <m_utils.h>
+#include <m_plugin.h>
 
 #include "resource.h"
 #include "version.h"
diff --git a/plugins/Rate/src/stdafx.h b/plugins/Rate/src/stdafx.h
index e04a7de369..be91171499 100644
--- a/plugins/Rate/src/stdafx.h
+++ b/plugins/Rate/src/stdafx.h
@@ -28,6 +28,7 @@
 #include <m_database.h>
 #include <m_langpack.h>
 #include <m_extraicons.h>
+#include <m_plugin.h>
 
 #include "resource.h"
 #include "version.h"