6 files changed, 13 insertions, 16 deletions
diff --git a/plugins/ContactsPlus/src/main.cpp b/plugins/ContactsPlus/src/main.cpp
index a34c8ed315..77a50dc048 100644
--- a/plugins/ContactsPlus/src/main.cpp
+++ b/plugins/ContactsPlus/src/main.cpp
@@ -21,7 +21,7 @@
 //
 // -----------------------------------------------------------------------------
 
-#include "contacts.h"
+#include "stdafx.h"
 
 CLIST_INTERFACE *pcli;
 
@@ -51,7 +51,7 @@ PLUGININFOEX pluginInfo = {
 	{ 0x0324785E, 0x74CE, 0x4600, { 0xB7, 0x81, 0x85, 0x17, 0x73, 0xB3, 0xEF, 0xC5 } }
 };
 
-BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
+BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD, LPVOID)
 {
 	hInst = hinstDLL;
 	return TRUE;
@@ -111,7 +111,7 @@ static bool CheckContactsServiceSupport(const char* szProto)
 		return false;
 }
 
-static int HookPreBuildContactMenu(WPARAM hContact, LPARAM lParam)
+static int HookPreBuildContactMenu(WPARAM hContact, LPARAM)
 {
 	char *szProto = GetContactProto(hContact);
 	int bVisible = FALSE;
@@ -128,7 +128,7 @@ static int HookPreBuildContactMenu(WPARAM hContact, LPARAM lParam)
 	return 0;
 }
 
-static int HookModulesLoaded(WPARAM wParam, LPARAM lParam)
+static int HookModulesLoaded(WPARAM, LPARAM)
 {
 	char* modules[2] = { 0 };
 
@@ -160,7 +160,7 @@ static int HookContactSettingChanged(WPARAM hContact, LPARAM lParam)
 	return 0;
 }
 
-static int HookContactDeleted(WPARAM wParam, LPARAM lParam)
+static int HookContactDeleted(WPARAM wParam, LPARAM)
 {  // if our contact gets deleted close his window
 	HWND h = WindowList_Find(ghSendWindowList, wParam);
 
@@ -173,7 +173,7 @@ static int HookContactDeleted(WPARAM wParam, LPARAM lParam)
 	return 0;
 }
 
-static INT_PTR ServiceSendCommand(WPARAM wParam, LPARAM lParam)
+static INT_PTR ServiceSendCommand(WPARAM wParam, LPARAM)
 {
 	//find window for hContact
 	HWND hWnd = WindowList_Find(ghSendWindowList, wParam);
@@ -186,13 +186,13 @@ static INT_PTR ServiceSendCommand(WPARAM wParam, LPARAM lParam)
 	return 0;
 }
 
-static INT_PTR ServiceReceiveCommand(WPARAM wParam, LPARAM lParam)
+static INT_PTR ServiceReceiveCommand(WPARAM, LPARAM lParam)
 {
 	CreateDialogParam(hInst, MAKEINTRESOURCE(IDD_RECEIVE), NULL, RecvDlgProc, lParam);
 	return 0;
 }
 
-extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion)
+extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD)
 {
 	return &pluginInfo;
 }
diff --git a/plugins/ContactsPlus/src/receive.cpp b/plugins/ContactsPlus/src/receive.cpp
index 4f46d4db21..0d5f3f600c 100644
--- a/plugins/ContactsPlus/src/receive.cpp
+++ b/plugins/ContactsPlus/src/receive.cpp
@@ -21,7 +21,7 @@
 //
 // -----------------------------------------------------------------------------
 
-#include "contacts.h"
+#include "stdafx.h"
 
 /* TRecvContactsData */
 
@@ -56,7 +56,7 @@ TReceivedItem* TRecvContactsData::AddReceivedItem()
 }
 
 
-static int RecvDlg_Resize(HWND hwndDlg,LPARAM lParam,UTILRESIZECONTROL *urc)
+static int RecvDlg_Resize(HWND, LPARAM, UTILRESIZECONTROL *urc)
 {
 	switch (urc->wId) {
 	case IDC_CONTACTS:
diff --git a/plugins/ContactsPlus/src/send.cpp b/plugins/ContactsPlus/src/send.cpp
index d7454dfc84..38a11e0b45 100644
--- a/plugins/ContactsPlus/src/send.cpp
+++ b/plugins/ContactsPlus/src/send.cpp
@@ -21,7 +21,7 @@
 //
 // -----------------------------------------------------------------------------
 
-#include "contacts.h"
+#include "stdafx.h"
 
 
 /* TSendProcessList */
diff --git a/plugins/ContactsPlus/src/stdafx.cpp b/plugins/ContactsPlus/src/stdafx.cxx
index d9883c8dbe..6fb37564b7 100644
--- a/plugins/ContactsPlus/src/stdafx.cpp
+++ b/plugins/ContactsPlus/src/stdafx.cxx
@@ -15,4 +15,4 @@ You should have received a copy of the GNU General Public License
 along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "contacts.h"
-\ No newline at end of file
+#include "stdafx.h"
+\ No newline at end of file
diff --git a/plugins/ContactsPlus/src/contacts.h b/plugins/ContactsPlus/src/stdafx.h
index 3183c942b8..0d52891be5 100644
--- a/plugins/ContactsPlus/src/contacts.h
+++ b/plugins/ContactsPlus/src/stdafx.h
@@ -21,9 +21,6 @@
 //
 // ---------------------------------------------------------------------------
 
-#define _CRT_SECURE_NO_WARNINGS
-#define _CRT_NONSTDC_NO_WARNINGS
-
 #include <windows.h>
 #include <commctrl.h>
 #include <malloc.h>
diff --git a/plugins/ContactsPlus/src/utils.cpp b/plugins/ContactsPlus/src/utils.cpp
index f523873c27..c6a9b6ed87 100644
--- a/plugins/ContactsPlus/src/utils.cpp
+++ b/plugins/ContactsPlus/src/utils.cpp
@@ -21,7 +21,7 @@
 //
 // ---------------------------------------------------------------------------
 
-#include "contacts.h"
+#include "stdafx.h"
 
 /* a strlennull() that likes NULL */
 size_t __fastcall strlennull(const char *string)