3 files changed, 17 insertions, 43 deletions
diff --git a/plugins/IgnoreState/src/Version.h b/plugins/IgnoreState/src/Version.h
index 144d1878f5..752ae468b9 100644
--- a/plugins/IgnoreState/src/Version.h
+++ b/plugins/IgnoreState/src/Version.h
@@ -4,14 +4,8 @@
 #define __BUILD_NUM					0
 
 #define __FILEVERSION_STRING		__MAJOR_VERSION,__MINOR_VERSION,__RELEASE_NUM,__BUILD_NUM
-#define __FILEVERSION_DOTS			__MAJOR_VERSION.__MINOR_VERSION.__RELEASE_NUM.__BUILD_NUM
 
-#define __STRINGIFY_IMPL(x)			#x
-#define __STRINGIFY(x)				__STRINGIFY_IMPL(x)
-#define __VERSION_STRING			__STRINGIFY(__FILEVERSION_DOTS)
-
-#define __PLUGIN_NAME				"Ignore State"
-#define __INTERNAL_NAME				"IgnoreState"
+#define __PLUGIN_NAME				"Ignore state"
 #define __FILENAME					"IgnoreState.dll"
 #define __DESCRIPTION 				"Shows ignore state of contact in contacts list."
 #define __AUTHOR					"Kildor"
diff --git a/plugins/IgnoreState/src/commonheaders.h b/plugins/IgnoreState/src/commonheaders.h
index b7e495d570..8b019ab20d 100644
--- a/plugins/IgnoreState/src/commonheaders.h
+++ b/plugins/IgnoreState/src/commonheaders.h
@@ -21,9 +21,6 @@
 #ifndef COMMHEADERS_H
 #define COMMHEADERS_H
 
-#define MIRANDA_VER    0x0A00
-//#define WIN32_LEAN_AND_MEAN		// Exclude rarely-used stuff from Windows headers
-
 #define _CRT_SECURE_NO_WARNINGS
 #define _WIN32_WINNT 0x0501
 
@@ -31,40 +28,23 @@
 #define _WIN32_IE 0x0501
 #endif
 
-
-//needed by m_utils.h
-#include <stdio.h>
-
-// needed by m_icolib.h > r9256
-#include <stddef.h>
-
-
-//Miranda API headers
 #include <windows.h>
-#include <win2k.h>
 #include <commctrl.h>
+
+#include <win2k.h>
 #include <newpluginapi.h>
 #include <m_database.h>
-#include <m_system.h>
-//#include <m_protocols.h>
-#include <m_utils.h>
 #include <m_ignore.h>
-#include <m_clist.h>
 #include <m_skin.h>
 #include <m_options.h>
 #include <m_langpack.h>
-#include <m_icolib.h>
+#include <m_extraicons.h>
+
 #include "resource.h"
 #include "Version.h"
 
-//external SDK headers
-#include <m_extraicons.h>
-
 #define MODULENAME "IgnoreState"
 
-/* 3f6acec5-df0e-4d33-a272-e3630addb6c8 */
-#define MIID_IGNORESRATE {0x3f6acec5, 0xdf0e, 0x4d33, {0xa2, 0x72, 0xe3, 0x63, 0x0a, 0xdd, 0xb6, 0xc8}}
-
 struct IGNOREITEMS
 {
 	TCHAR* name;
diff --git a/plugins/IgnoreState/src/main.cpp b/plugins/IgnoreState/src/main.cpp
index 1ce767badf..f25fbd35db 100644
--- a/plugins/IgnoreState/src/main.cpp
+++ b/plugins/IgnoreState/src/main.cpp
@@ -57,7 +57,7 @@ PLUGININFOEX pluginInfo={
 	__COPYRIGHT,
 	__AUTHORWEB,
 	UNICODE_AWARE,
-	// a6872bcd-f2a1-41b8-b2f1-dd7cec055734
+	// A6872BCD-F2A1-41B8-B2F1-DD7CEC055734
 	{0xa6872bcd, 0xf2a1, 0x41b8, {0xb2, 0xf1, 0xdd, 0x7c, 0xec, 0x05, 0x57, 0x34}}
 };
 
@@ -131,17 +131,17 @@ VOID fill_filter(void)
 
 int onModulesLoaded(WPARAM wParam,LPARAM lParam)
 {
-	HookEvent(ME_OPT_INITIALISE, onOptInitialise);
-
-	//IcoLib support
-	Icon_Register(g_hInst, LPGEN("Ignore State"), iconList, SIZEOF(iconList));
-
-	fill_filter();
-
-	hExtraIcon = ExtraIcon_Register("ignore", LPGEN("Ignore State"), "ignore_full");
-
-	// Set initial value for all contacts
-	HANDLE hContact = db_find_first();
+	HookEvent(ME_OPT_INITIALISE, onOptInitialise);
+
+	//IcoLib support
+	Icon_Register(g_hInst, LPGEN("Ignore State"), iconList, SIZEOF(iconList));
+
+	fill_filter();
+
+	hExtraIcon = ExtraIcon_Register("ignore", LPGEN("Ignore State"), "ignore_full");
+
+	// Set initial value for all contacts
+	HANDLE hContact = db_find_first();
 	while (hContact != NULL) {
 		applyExtraImage(hContact);
 		hContact = db_find_next(hContact);