1 files changed, 32 insertions, 31 deletions
diff --git a/plugins/NewXstatusNotify/src/common.h b/plugins/NewXstatusNotify/src/common.h
index dd739eff71..473a51c1fc 100644
--- a/plugins/NewXstatusNotify/src/common.h
+++ b/plugins/NewXstatusNotify/src/common.h
@@ -30,50 +30,44 @@
 
 #define _WIN32_WINNT 0x0500
 #define WINVER 0x0600
-#define MIRANDA_VER 0x0A00
 
-//Standard Windows "libraries"
 #include <windows.h>
 #include <mmsystem.h>
 #include <commctrl.h>
 #include <commdlg.h>
 #include <shellapi.h>
 #include <time.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <tchar.h>
 #include <malloc.h>
 
 #include <newpluginapi.h>
-#include <m_system.h>
-#include <m_system_cpp.h>
-#include <statusmodes.h>
 #include <win2k.h>
+#include <m_button.h>
+#include <m_clc.h>
+#include <m_database.h>
+#include <m_genmenu.h>
+#include <m_history.h>
+#include <m_icolib.h>
+#include <m_ignore.h>
+#include <m_langpack.h>
+#include <m_message.h>
+#include <m_options.h>
+#include <m_popup.h>
+#include <m_protosvc.h>
+#include <m_skin.h>
+#include <m_userinfo.h>
+#include <m_xstatus.h>
+#include <m_extraicons.h>
+
+#include <m_metacontacts.h>
+#include <m_toptoolbar.h>
 
-#include "m_awaymsg.h"
-#include "m_button.h"
-#include "m_clc.h"
-#include "m_database.h"
-#include "m_genmenu.h"
-#include "m_history.h"
-#include "m_icolib.h"
-#include "m_ignore.h"
-#include "m_langpack.h"
-#include "m_message.h"
-#include "m_options.h"
-#include "m_popup.h"
-#include "m_protosvc.h"
-#include "m_skin.h"
-#include "m_system.h"
-#include "m_userinfo.h"
-#include "m_utils.h"
-#include "m_xstatus.h"
-#include "m_extraicons.h"
-
-#include "m_metacontacts.h"
-#include "m_toptoolbar.h"
 #include "resource.h"
-
+#include "indsnd.h"
+#include "options.h"
+#include "popup.h"
+#include "utils.h"
+#include "version.h"
+#include "xstatus.h"
 
 #define MODULE "NewStatusNotify"
 
@@ -151,4 +145,11 @@ Cast them to (int) if you need them that way.
 
 #define TMR_CONNECTIONTIMEOUT		10000
 
+extern OPTIONS opt;
+extern LIST<DBEVENT> eventList;
+extern TEMPLATES templates;
+extern HINSTANCE hInst;
+extern HANDLE hEnableDisableMenu;
+extern STATUS StatusList[STATUS_COUNT];
+
 #endif //COMMON_H