4 files changed, 27 insertions, 25 deletions
diff --git a/plugins/NotifyAnything/src/Version.h b/plugins/NotifyAnything/src/Version.h
new file mode 100644
index 0000000000..eb60355219
--- /dev/null
+++ b/plugins/NotifyAnything/src/Version.h
@@ -0,0 +1,14 @@
+#define __MAJOR_VERSION				0
+#define __MINOR_VERSION				0
+#define __RELEASE_NUM				2
+#define __BUILD_NUM					8
+
+#define __FILEVERSION_STRING		__MAJOR_VERSION,__MINOR_VERSION,__RELEASE_NUM,__BUILD_NUM
+
+#define __PLUGIN_NAME				"NotifyAnything"
+#define __FILENAME					"NotifyAnything.dll"
+#define __DESCRIPTION 				"Displays popups for custom events, triggered by UDP packages."
+#define __AUTHOR					"Daniel Wesslen, Korney San"
+#define __AUTHOREMAIL				"wesslen@users.sourceforge.net, kora@users.sourceforge.net"
+#define __AUTHORWEB					"http://miranda-ng.org/"
+#define __COPYRIGHT					"© 2003 Daniel Wesslen"
diff --git a/plugins/NotifyAnything/src/common.h b/plugins/NotifyAnything/src/common.h
index fc58f65940..ff1f9c2588 100644
--- a/plugins/NotifyAnything/src/common.h
+++ b/plugins/NotifyAnything/src/common.h
@@ -1,34 +1,26 @@
-// disable warnings about underscore in stdc functions
-#pragma warning(disable: 4996)
+#define _CRT_SECURE_NO_DEPRECATE
 
 #include <windows.h>
-
-#include <string.h>
-#include <stdio.h>
-#include <winsock.h>
 #include <time.h>
-#include <stdio.h>
 #include <direct.h>
 #include <process.h>
-#include <sys/types.h>
-#include <sys/timeb.h>
-
 #include <string>
 #include <map>
 #include <set>
 #include <vector>
 
 #include "newpluginapi.h"
-#include "m_system_cpp.h"
 #include "m_options.h"
 #include "m_skin.h"
 #include "m_langpack.h"
 #include "m_database.h"
-#include "m_utils.h"
-
 #include "m_popup.h"
+
 #include "m_LogService.h"
 
+#include "resource.h"
+#include "Version.h"
+
 extern HINSTANCE hInst;
 
 const char PlugName[] = "NotifyAnything";
diff --git a/plugins/NotifyAnything/src/main.cpp b/plugins/NotifyAnything/src/main.cpp
index 7ef581fb24..e82a525b98 100644
--- a/plugins/NotifyAnything/src/main.cpp
+++ b/plugins/NotifyAnything/src/main.cpp
@@ -71,16 +71,16 @@ int hLangpack;
 
 PLUGININFOEX pluginInfo = {
 	sizeof(PLUGININFOEX),
-	"NotifyAnything",
-	PLUGIN_MAKE_VERSION(0, 0, 2, 8),
-	"Displays popups for custom events, triggered by UDP packages.",
-	"Daniel Wesslén, Korney San",
-	"wesslen@users.sourceforge.net, kora@users.sourceforge.net",
-	"Public Domain 2003 Daniel Wesslén",
-	"http://miranda-ng.org",
+	__PLUGIN_NAME,
+	PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
+	__DESCRIPTION,
+	__AUTHOR,
+	__AUTHOREMAIL,
+	__COPYRIGHT,
+	__AUTHORWEB,
 	UNICODE_AWARE,
 	// {E92874EC-594A-4A2F-BDED-C0BE8B5A45D1}
-	{ 0xe92874ec, 0x594a, 0x4a2f, { 0xbd, 0xed, 0xc0, 0xbe, 0x8b, 0x5a, 0x45, 0xd1 }}
+	{0xe92874ec, 0x594a, 0x4a2f, {0xbd, 0xed, 0xc0, 0xbe, 0x8b, 0x5a, 0x45, 0xd1}}
 };
 
 BOOL WINAPI DllMain(HINSTANCE hi, DWORD, LPVOID)
diff --git a/plugins/NotifyAnything/src/options.cpp b/plugins/NotifyAnything/src/options.cpp
index 7574cbf867..5b02963ec7 100644
--- a/plugins/NotifyAnything/src/options.cpp
+++ b/plugins/NotifyAnything/src/options.cpp
@@ -1,8 +1,4 @@
-
-#include <windows.h>
-
 #include "common.h"
-#include "resource.h"
 
 NASettings g_settings;