From a40ccbb5ba271641134586898e69df4855a7f687 Mon Sep 17 00:00:00 2001
From: Gluzskiy Alexandr <sss@sss.chaoslab.ru>
Date: Tue, 5 Mar 2013 00:04:28 +0200
Subject: merged with miranda_ng main repo

---
 src/commonheaders.h | 24 ++++++------------------
 1 file changed, 6 insertions(+), 18 deletions(-)

(limited to 'src/commonheaders.h')

diff --git a/src/commonheaders.h b/src/commonheaders.h
index 37f79d5..e2ffb38 100755
--- a/src/commonheaders.h
+++ b/src/commonheaders.h
@@ -15,26 +15,17 @@
 // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #ifndef COMMONHEADERS_H
 #define COMMONHEADERS_H
-#define MIRANDA_VER  0x0A00
 //windows
 #include <windows.h>
 #include <shlobj.h>
 #include <io.h>
-#include <uxtheme.h>
 #include <shlwapi.h>
-#include <richedit.h>
-//c
-#include <locale.h>
-#include <errno.h>
-#include <time.h>
+
 //c++
-#include <iostream>
 #include <map>
 using std::map;
 #include <list>
 using std::list;
-#include <vector>
-using std::vector;
 #include <string>
 using std::string;
 using std::wstring;
@@ -62,25 +53,22 @@ using std::fstream;
 #include <m_database.h>
 #include <m_options.h>
 #include <m_langpack.h>
-#include <m_clist.h>
 #include <m_clui.h>
-#include <m_icolib.h>
 #include <m_skin.h>
 #include <m_protomod.h>
-#include <m_protosvc.h>
-#include <m_netlib.h>
 #include <m_jabber.h>
 #include <m_icqplus.h>
 #include <m_message.h>
 #include <m_cluiframes.h>
 #include <m_icolib.h>
-#include "m_extraicons.h"
-#include "m_metacontacts.h"
-#include "win2k.h"
-#include "resource.h"
+#include <m_extraicons.h>
+#include <win2k.h>
 
+#include <m_metacontacts.h>
 
 //internal
+#include "resource.h"
+#include "Version.h"
 #include "constants.h"
 #include "log.h"
 #include "globals.h"
-- 
cgit v1.2.3