let VS2010 be damnned

git-svn-id: http://svn.miranda-ng.org/main/trunk@285 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

110 files changed, 110 insertions, 110 deletions

diff --git a/src/modules/addcontact/addcontact.cpp b/src/modules/addcontact/addcontact.cpp
index 0be08b93ba..9491599846 100644
--- a/src/modules/addcontact/addcontact.cpp
+++ b/src/modules/addcontact/addcontact.cpp
@@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software

 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

-#include "commonheaders.h"

+#include "..\..\core\commonheaders.h"

 

 INT_PTR CALLBACK AddContactDlgProc(HWND hdlg,UINT msg,WPARAM wparam,LPARAM lparam)

 {

diff --git a/src/modules/autoaway/autoaway.cpp b/src/modules/autoaway/autoaway.cpp
index 9805535173..46bc9c917b 100644
--- a/src/modules/autoaway/autoaway.cpp
+++ b/src/modules/autoaway/autoaway.cpp
@@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software

 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

-#include "commonheaders.h"

+#include "..\..\core\commonheaders.h"

 

 #define AA_MODULE "AutoAway"

 

diff --git a/src/modules/button/button.cpp b/src/modules/button/button.cpp
index b6265dfa7a..b65796f13e 100644
--- a/src/modules/button/button.cpp
+++ b/src/modules/button/button.cpp
@@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software

 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

-#include "commonheaders.h"

+#include "..\..\core\commonheaders.h"

 #include <initguid.h>

 #include <oleacc.h>

 

diff --git a/src/modules/clist/Docking.cpp b/src/modules/clist/Docking.cpp
index 8dd61cdc37..df9e9508a5 100644
--- a/src/modules/clist/Docking.cpp
+++ b/src/modules/clist/Docking.cpp
@@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software

 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

-#include "commonheaders.h"

+#include "..\..\core\commonheaders.h"

 #include "clc.h"

 

 #define WM_DOCKCALLBACK   (WM_USER+121)

diff --git a/src/modules/clist/clc.cpp b/src/modules/clist/clc.cpp
index 1994706992..4b3e8dbd11 100644
--- a/src/modules/clist/clc.cpp
+++ b/src/modules/clist/clc.cpp
@@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software

 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

-#include "commonheaders.h"

+#include "..\..\core\commonheaders.h"

 #include "clc.h"

 

 int InitGenMenu( void );

diff --git a/src/modules/clist/clcfiledrop.cpp b/src/modules/clist/clcfiledrop.cpp
index aae299d7b8..beff769bce 100644
--- a/src/modules/clist/clcfiledrop.cpp
+++ b/src/modules/clist/clcfiledrop.cpp
@@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software

 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

-#include "commonheaders.h"

+#include "..\..\core\commonheaders.h"

 #include "clc.h"

 #include <shlobj.h>

 

diff --git a/src/modules/clist/clcidents.cpp b/src/modules/clist/clcidents.cpp
index 7cb18760fe..37a7bb7f0e 100644
--- a/src/modules/clist/clcidents.cpp
+++ b/src/modules/clist/clcidents.cpp
@@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software

 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

-#include "commonheaders.h"

+#include "..\..\core\commonheaders.h"

 #include "clc.h"

 

 /* the CLC uses 3 different ways to identify elements in its list, this file

diff --git a/src/modules/clist/clcitems.cpp b/src/modules/clist/clcitems.cpp
index cc338d5ec9..f5c0e87300 100644
--- a/src/modules/clist/clcitems.cpp
+++ b/src/modules/clist/clcitems.cpp
@@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software

 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

-#include "commonheaders.h"

+#include "..\..\core\commonheaders.h"

 #include "clc.h"

 

 //routines for managing adding/removal of items in the list, including sorting

diff --git a/src/modules/clist/clcmsgs.cpp b/src/modules/clist/clcmsgs.cpp
index a46777939d..d81b6335c5 100644
--- a/src/modules/clist/clcmsgs.cpp
+++ b/src/modules/clist/clcmsgs.cpp
@@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software

 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

-#include "commonheaders.h"

+#include "..\..\core\commonheaders.h"

 #include "clc.h"

 

 //processing of all the CLM_ messages incoming

diff --git a/src/modules/clist/clcutils.cpp b/src/modules/clist/clcutils.cpp
index 3205066e2f..7e376fb27d 100644
--- a/src/modules/clist/clcutils.cpp
+++ b/src/modules/clist/clcutils.cpp
@@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software

 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

-#include "commonheaders.h"

+#include "..\..\core\commonheaders.h"

 #include "clc.h"

 

 //loads of stuff that didn't really fit anywhere else

diff --git a/src/modules/clist/clistcore.cpp b/src/modules/clist/clistcore.cpp
index 27121d6515..6821b3a577 100644
--- a/src/modules/clist/clistcore.cpp
+++ b/src/modules/clist/clistcore.cpp
@@ -21,7 +21,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

 

-#include "commonheaders.h"

+#include "..\..\core\commonheaders.h"

 #include "clc.h"

 #include "genmenu.h"

 

diff --git a/src/modules/clist/clistevents.cpp b/src/modules/clist/clistevents.cpp
index 20f5995c4e..4958934c9828 100644
--- a/src/modules/clist/clistevents.cpp
+++ b/src/modules/clist/clistevents.cpp
@@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software

 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

-#include "commonheaders.h"

+#include "..\..\core\commonheaders.h"

 #include "clc.h"

 

 struct CListEvent

diff --git a/src/modules/clist/clistmenus.cpp b/src/modules/clist/clistmenus.cpp
index 1b01f51ea3..15e8ebc1b2 100644
--- a/src/modules/clist/clistmenus.cpp
+++ b/src/modules/clist/clistmenus.cpp
@@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software

 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

-#include "commonheaders.h"

+#include "..\..\core\commonheaders.h"

 #pragma hdrstop

 

 #include "m_hotkeys.h"

diff --git a/src/modules/clist/clistmod.cpp b/src/modules/clist/clistmod.cpp
index 7de958342b..ab8ca13965 100644
--- a/src/modules/clist/clistmod.cpp
+++ b/src/modules/clist/clistmod.cpp
@@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software

 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

-#include "commonheaders.h"

+#include "..\..\core\commonheaders.h"

 #include "clc.h"

 

 INT_PTR AddMainMenuItem(WPARAM wParam, LPARAM lParam);

diff --git a/src/modules/clist/clistsettings.cpp b/src/modules/clist/clistsettings.cpp
index df92386ded..0efc919ba8 100644
--- a/src/modules/clist/clistsettings.cpp
+++ b/src/modules/clist/clistsettings.cpp
@@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software

 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

-#include "commonheaders.h"

+#include "..\..\core\commonheaders.h"

 #include "clc.h"

 

 SortedList* clistCache = NULL;

diff --git a/src/modules/clist/clisttray.cpp b/src/modules/clist/clisttray.cpp
index 2292020c48..c708d3f1a8 100644
--- a/src/modules/clist/clisttray.cpp
+++ b/src/modules/clist/clisttray.cpp
@@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software

 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

-#include "commonheaders.h"

+#include "..\..\core\commonheaders.h"

 #include "clc.h"

 

 #define TOOLTIP_TOLERANCE 5

diff --git a/src/modules/clist/clui.cpp b/src/modules/clist/clui.cpp
index 13ebf74a21..07a4270aa7 100644
--- a/src/modules/clist/clui.cpp
+++ b/src/modules/clist/clui.cpp
@@ -20,7 +20,7 @@
   along with this program; if not, write to the Free Software

   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

-#include "commonheaders.h"

+#include "..\..\core\commonheaders.h"

 #include "../database/profilemanager.h"

 #include "clc.h"

 

diff --git a/src/modules/clist/cluiservices.cpp b/src/modules/clist/cluiservices.cpp
index c6b6efda71..2d8f06ab2f 100644
--- a/src/modules/clist/cluiservices.cpp
+++ b/src/modules/clist/cluiservices.cpp
@@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software

 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

-#include "commonheaders.h"

+#include "..\..\core\commonheaders.h"

 #include "clc.h"

 

 static INT_PTR GetHwnd(WPARAM, LPARAM)

diff --git a/src/modules/clist/contact.cpp b/src/modules/clist/contact.cpp
index f996dd11ac..d122ef4836 100644
--- a/src/modules/clist/contact.cpp
+++ b/src/modules/clist/contact.cpp
@@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software

 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

-#include "commonheaders.h"

+#include "..\..\core\commonheaders.h"

 #include "clc.h"

 

 extern HANDLE hContactIconChangedEvent;

diff --git a/src/modules/clist/genmenu.cpp b/src/modules/clist/genmenu.cpp
index 8d795e67a5..56a86bab43 100644
--- a/src/modules/clist/genmenu.cpp
+++ b/src/modules/clist/genmenu.cpp
@@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software

 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

-#include "commonheaders.h"

+#include "..\..\core\commonheaders.h"

 #include "genmenu.h"

 

 static bool bIsGenMenuInited;

diff --git a/src/modules/clist/genmenuopt.cpp b/src/modules/clist/genmenuopt.cpp
index 9ee1e6c5b4..eb413f94ac 100644
--- a/src/modules/clist/genmenuopt.cpp
+++ b/src/modules/clist/genmenuopt.cpp
@@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software

 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

-#include "commonheaders.h"

+#include "..\..\core\commonheaders.h"

 #include "genmenu.h"

 

 #define STR_SEPARATOR _T("-----------------------------------")

diff --git a/src/modules/clist/groups.cpp b/src/modules/clist/groups.cpp
index 0693c25036..287f16b83a 100644
--- a/src/modules/clist/groups.cpp
+++ b/src/modules/clist/groups.cpp
@@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software

 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

-#include "commonheaders.h"

+#include "..\..\core\commonheaders.h"

 #include "clc.h"

 

 HANDLE hGroupChangeEvent;

diff --git a/src/modules/clist/keyboard.cpp b/src/modules/clist/keyboard.cpp
index 2c9cdce69c..b03c7bac03 100644
--- a/src/modules/clist/keyboard.cpp
+++ b/src/modules/clist/keyboard.cpp
@@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software

 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

-#include "commonheaders.h"

+#include "..\..\core\commonheaders.h"

 #include "clc.h"

 #include <m_hotkeys.h>

 

diff --git a/src/modules/clist/movetogroup.cpp b/src/modules/clist/movetogroup.cpp
index 9924bef2aa..4cdda53de8 100644
--- a/src/modules/clist/movetogroup.cpp
+++ b/src/modules/clist/movetogroup.cpp
@@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software

 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

-#include "commonheaders.h"

+#include "..\..\core\commonheaders.h"

 

 HANDLE hOnCntMenuBuild;

 HGENMENU hMoveToGroupItem=0, hPriorityItem = 0, hFloatingItem = 0;

diff --git a/src/modules/clist/protocolorder.cpp b/src/modules/clist/protocolorder.cpp
index ff77babfec..546ae01d03 100644
--- a/src/modules/clist/protocolorder.cpp
+++ b/src/modules/clist/protocolorder.cpp
@@ -25,7 +25,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 // written by daniel vijge

 // gpl license ect...

 

-#include "commonheaders.h"

+#include "..\..\core\commonheaders.h"

 #include "clc.h"

 

 typedef struct tagProtocolData

diff --git a/src/modules/contacts/contacts.cpp b/src/modules/contacts/contacts.cpp
index f8bc787286..002c58dc6d 100644
--- a/src/modules/contacts/contacts.cpp
+++ b/src/modules/contacts/contacts.cpp
@@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software

 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

-#include "commonheaders.h"

+#include "..\..\core\commonheaders.h"

 

 #define NAMEORDERCOUNT 8

 static TCHAR* nameOrderDescr[ NAMEORDERCOUNT ] =

diff --git a/src/modules/database/database.cpp b/src/modules/database/database.cpp
index 9c9aab8146..904fea37b6 100644
--- a/src/modules/database/database.cpp
+++ b/src/modules/database/database.cpp
@@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software

 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

-#include "commonheaders.h"

+#include "..\..\core\commonheaders.h"

 #include "profilemanager.h"

 #include "../srfile/file.h"

 

diff --git a/src/modules/database/dbini.cpp b/src/modules/database/dbini.cpp
index 46b622f2a9..b1051236f8 100644
--- a/src/modules/database/dbini.cpp
+++ b/src/modules/database/dbini.cpp
@@ -21,7 +21,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

 

-#include "commonheaders.h"

+#include "..\..\core\commonheaders.h"

 #include "../srfile/file.h"

 

 static bool bModuleInitialized = false;

diff --git a/src/modules/database/dblists.cpp b/src/modules/database/dblists.cpp
index 02332ab283..491a6ed33b 100644
--- a/src/modules/database/dblists.cpp
+++ b/src/modules/database/dblists.cpp
@@ -21,7 +21,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

 

-#include "commonheaders.h"

+#include "..\..\core\commonheaders.h"

 

 /* a simple sorted list implementation */

 

diff --git a/src/modules/database/dbutils.cpp b/src/modules/database/dbutils.cpp
index 1e73ddd18e..7d644b02eb 100644
--- a/src/modules/database/dbutils.cpp
+++ b/src/modules/database/dbutils.cpp
@@ -21,7 +21,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

 

-#include "commonheaders.h"

+#include "..\..\core\commonheaders.h"

 #include "profilemanager.h"

 

 static int CompareEventTypes( const DBEVENTTYPEDESCR* p1, const DBEVENTTYPEDESCR* p2 )

diff --git a/src/modules/database/profilemanager.cpp b/src/modules/database/profilemanager.cpp
index 06cd356d7c..67d100b3cd 100644
--- a/src/modules/database/profilemanager.cpp
+++ b/src/modules/database/profilemanager.cpp
@@ -21,7 +21,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

 

-#include "commonheaders.h"

+#include "..\..\core\commonheaders.h"

 #include "profilemanager.h"

 #include <sys/stat.h>

 

diff --git a/src/modules/findadd/findadd.cpp b/src/modules/findadd/findadd.cpp
index 48dc0163eb..527a3cda63 100644
--- a/src/modules/findadd/findadd.cpp
+++ b/src/modules/findadd/findadd.cpp
@@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software

 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

-#include "commonheaders.h"

+#include "..\..\core\commonheaders.h"

 #include "findadd.h"

 

 #define TIMERID_THROBBER   111

diff --git a/src/modules/findadd/searchresults.cpp b/src/modules/findadd/searchresults.cpp
index 4c8b7cf46c..f3b3066999 100644
--- a/src/modules/findadd/searchresults.cpp
+++ b/src/modules/findadd/searchresults.cpp
@@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software

 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

-#include "commonheaders.h"

+#include "..\..\core\commonheaders.h"

 #include "findadd.h"

 

 enum {

diff --git a/src/modules/fonts/FontOptions.cpp b/src/modules/fonts/FontOptions.cpp
index cbd19d23de..801f023141 100644
--- a/src/modules/fonts/FontOptions.cpp
+++ b/src/modules/fonts/FontOptions.cpp
@@ -21,7 +21,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

 

-#include "commonheaders.h"

+#include "..\..\core\commonheaders.h"

 #include "FontService.h"

 

 // *_w2 is working copy of list

diff --git a/src/modules/fonts/FontService.cpp b/src/modules/fonts/FontService.cpp
index f0f1afae16..f8e977f9b3 100644
--- a/src/modules/fonts/FontService.cpp
+++ b/src/modules/fonts/FontService.cpp
@@ -21,7 +21,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

 

-#include "commonheaders.h"

+#include "..\..\core\commonheaders.h"

 #include "m_fontservice.h"

 

 #include "FontService.h"

diff --git a/src/modules/fonts/services.cpp b/src/modules/fonts/services.cpp
index 3106060d8b..2681855c90 100644
--- a/src/modules/fonts/services.cpp
+++ b/src/modules/fonts/services.cpp
@@ -21,7 +21,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

 

-#include "commonheaders.h"

+#include "..\..\core\commonheaders.h"

 #include "FontService.h"

 

 COLORREF GetColorFromDefault(COLORREF cl);

diff --git a/src/modules/help/about.cpp b/src/modules/help/about.cpp
index 37c949260a..b3594c4dc0 100644
--- a/src/modules/help/about.cpp
+++ b/src/modules/help/about.cpp
@@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software

 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

-#include "commonheaders.h"

+#include "..\..\core\commonheaders.h"

 

 #if defined( _UNICODE )

 	#define STR_VERSION_FORMAT "%s%S%S"

diff --git a/src/modules/help/help.cpp b/src/modules/help/help.cpp
index 432049e2d1..32c6a8528d 100644
--- a/src/modules/help/help.cpp
+++ b/src/modules/help/help.cpp
@@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software

 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

-#include "commonheaders.h"

+#include "..\..\core\commonheaders.h"

 

 INT_PTR CALLBACK DlgProcAbout(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam);

 

diff --git a/src/modules/history/history.cpp b/src/modules/history/history.cpp
index 3b6b805a7f..adc29f469c 100644
--- a/src/modules/history/history.cpp
+++ b/src/modules/history/history.cpp
@@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software

 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

-#include "commonheaders.h"

+#include "..\..\core\commonheaders.h"

 

 #define SUMMARY     0

 #define DETAIL      1

diff --git a/src/modules/icolib/extracticon.cpp b/src/modules/icolib/extracticon.cpp
index a886d6510d..f1ce824575 100644
--- a/src/modules/icolib/extracticon.cpp
+++ b/src/modules/icolib/extracticon.cpp
@@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software

 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

-#include "commonheaders.h"

+#include "..\..\core\commonheaders.h"

 

 #ifdef _ASSERT

 #undef _ASSERT

diff --git a/src/modules/icolib/skin2icons.cpp b/src/modules/icolib/skin2icons.cpp
index a1a3e670b2..8ebc39a334 100644
--- a/src/modules/icolib/skin2icons.cpp
+++ b/src/modules/icolib/skin2icons.cpp
@@ -21,7 +21,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

 

-#include "commonheaders.h"

+#include "..\..\core\commonheaders.h"

 

 #include "IcoLib.h"

 

diff --git a/src/modules/idle/idle.cpp b/src/modules/idle/idle.cpp
index bc8b3ec4ef..c44875c473 100644
--- a/src/modules/idle/idle.cpp
+++ b/src/modules/idle/idle.cpp
@@ -21,7 +21,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

 

-#include "commonheaders.h"

+#include "..\..\core\commonheaders.h"

 

 #define IDLEMOD "Idle"

 #define IDL_USERIDLECHECK "UserIdleCheck"

diff --git a/src/modules/ignore/ignore.cpp b/src/modules/ignore/ignore.cpp
index 18ded9d972..0017ae7e15 100644
--- a/src/modules/ignore/ignore.cpp
+++ b/src/modules/ignore/ignore.cpp
@@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software

 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

-#include "commonheaders.h"

+#include "..\..\core\commonheaders.h"

 

 #define IGNOREEVENT_MAX  7

 

diff --git a/src/modules/keybindings/keybindings.cpp b/src/modules/keybindings/keybindings.cpp
index 6255cc78e9..ee208de504 100644
--- a/src/modules/keybindings/keybindings.cpp
+++ b/src/modules/keybindings/keybindings.cpp
@@ -21,7 +21,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

 

-#include "commonheaders.h"

+#include "..\..\core\commonheaders.h"

 #include "keybindings.h"

 #include "m_keybindings.h"

 

diff --git a/src/modules/langpack/langpack.cpp b/src/modules/langpack/langpack.cpp
index 0603a24b90..8950bc61c5 100644
--- a/src/modules/langpack/langpack.cpp
+++ b/src/modules/langpack/langpack.cpp
@@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software

 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

-#include "commonheaders.h"

+#include "..\..\core\commonheaders.h"

 

 #include "../netlib/netlib.h"

 

diff --git a/src/modules/langpack/lpservices.cpp b/src/modules/langpack/lpservices.cpp
index 26586dfda3..3f7ae689e6 100644
--- a/src/modules/langpack/lpservices.cpp
+++ b/src/modules/langpack/lpservices.cpp
@@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software

 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

-#include "commonheaders.h"

+#include "..\..\core\commonheaders.h"

 

 #if defined( _UNICODE )

 	#define FLAGS LANG_UNICODE

diff --git a/src/modules/netlib/netlib.cpp b/src/modules/netlib/netlib.cpp
index 7cd39b1d7a..1a6a583679 100644
--- a/src/modules/netlib/netlib.cpp
+++ b/src/modules/netlib/netlib.cpp
@@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software

 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

-#include "commonheaders.h"

+#include "..\..\core\commonheaders.h"

 #include "netlib.h"

 

 static BOOL bModuleInitialized = FALSE;

diff --git a/src/modules/netlib/netlibautoproxy.cpp b/src/modules/netlib/netlibautoproxy.cpp
index e169cf9c89..173faa138d 100644
--- a/src/modules/netlib/netlibautoproxy.cpp
+++ b/src/modules/netlib/netlibautoproxy.cpp
@@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software

 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

-#include "commonheaders.h"

+#include "..\..\core\commonheaders.h"

 #include "netlib.h"

 

 #include <wininet.h>

diff --git a/src/modules/netlib/netlibbind.cpp b/src/modules/netlib/netlibbind.cpp
index 5fb9c252cc..d1133f9514 100644
--- a/src/modules/netlib/netlibbind.cpp
+++ b/src/modules/netlib/netlibbind.cpp
@@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software

 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

-#include "commonheaders.h"

+#include "..\..\core\commonheaders.h"

 #include "netlib.h"

 

 bool BindSocketToPort(const char *szPorts, SOCKET s, SOCKET s6, int* portn)

diff --git a/src/modules/netlib/netlibhttp.cpp b/src/modules/netlib/netlibhttp.cpp
index 2893344ade..8fba0eed1c 100644
--- a/src/modules/netlib/netlibhttp.cpp
+++ b/src/modules/netlib/netlibhttp.cpp
@@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software

 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

-#include "commonheaders.h"

+#include "..\..\core\commonheaders.h"

 #include "../plugins/zlib/zlib.h"

 #include "netlib.h"

 

diff --git a/src/modules/netlib/netlibhttpproxy.cpp b/src/modules/netlib/netlibhttpproxy.cpp
index 153d53660f..decef4e285 100644
--- a/src/modules/netlib/netlibhttpproxy.cpp
+++ b/src/modules/netlib/netlibhttpproxy.cpp
@@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software

 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

-#include "commonheaders.h"

+#include "..\..\core\commonheaders.h"

 #include "netlib.h"

 

 typedef enum

diff --git a/src/modules/netlib/netliblog.cpp b/src/modules/netlib/netliblog.cpp
index fb3fe1d5f2..4dced62c5c 100644
--- a/src/modules/netlib/netliblog.cpp
+++ b/src/modules/netlib/netliblog.cpp
@@ -21,7 +21,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

 

-#include "commonheaders.h"

+#include "..\..\core\commonheaders.h"

 #include "netlib.h"

 #include "../srfile/file.h"

 

diff --git a/src/modules/netlib/netlibopenconn.cpp b/src/modules/netlib/netlibopenconn.cpp
index f24906b20c..5ee3200308 100644
--- a/src/modules/netlib/netlibopenconn.cpp
+++ b/src/modules/netlib/netlibopenconn.cpp
@@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software

 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

-#include "commonheaders.h"

+#include "..\..\core\commonheaders.h"

 #include "netlib.h"

 

 extern CRITICAL_SECTION csNetlibUser;

diff --git a/src/modules/netlib/netlibopts.cpp b/src/modules/netlib/netlibopts.cpp
index 0c562a5cff..7a74c8612f 100644
--- a/src/modules/netlib/netlibopts.cpp
+++ b/src/modules/netlib/netlibopts.cpp
@@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software

 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

-#include "commonheaders.h"

+#include "..\..\core\commonheaders.h"

 #include "netlib.h"

 

 struct NetlibTempSettings 

diff --git a/src/modules/netlib/netlibpktrecver.cpp b/src/modules/netlib/netlibpktrecver.cpp
index 9722324a4f..85f65aa617 100644
--- a/src/modules/netlib/netlibpktrecver.cpp
+++ b/src/modules/netlib/netlibpktrecver.cpp
@@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software

 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

-#include "commonheaders.h"

+#include "..\..\core\commonheaders.h"

 #include "netlib.h"

 

 INT_PTR NetlibPacketRecverCreate(WPARAM wParam,LPARAM lParam)

diff --git a/src/modules/netlib/netlibsecurity.cpp b/src/modules/netlib/netlibsecurity.cpp
index c20dcf10a1..a8da8af514 100644
--- a/src/modules/netlib/netlibsecurity.cpp
+++ b/src/modules/netlib/netlibsecurity.cpp
@@ -20,7 +20,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

 

-#include "commonheaders.h"

+#include "..\..\core\commonheaders.h"

 #include "netlib.h"

 

 #define SECURITY_WIN32

diff --git a/src/modules/netlib/netlibsock.cpp b/src/modules/netlib/netlibsock.cpp
index 8ec6a473f5..251d95e0fd 100644
--- a/src/modules/netlib/netlibsock.cpp
+++ b/src/modules/netlib/netlibsock.cpp
@@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software

 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

-#include "commonheaders.h"

+#include "..\..\core\commonheaders.h"

 #include "netlib.h"

 

 extern HANDLE hConnectionHeaderMutex, hSendEvent, hRecvEvent;

diff --git a/src/modules/netlib/netlibssl.cpp b/src/modules/netlib/netlibssl.cpp
index 2db769a3da..96a9a52348 100644
--- a/src/modules/netlib/netlibssl.cpp
+++ b/src/modules/netlib/netlibssl.cpp
@@ -21,7 +21,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

 

-#include "commonheaders.h"

+#include "..\..\core\commonheaders.h"

 #include <m_popup.h>

 #include "netlib.h"

 

diff --git a/src/modules/netlib/netlibupnp.cpp b/src/modules/netlib/netlibupnp.cpp
index 935801d330..080fed019d 100644
--- a/src/modules/netlib/netlibupnp.cpp
+++ b/src/modules/netlib/netlibupnp.cpp
@@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software

 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

-#include "commonheaders.h"

+#include "..\..\core\commonheaders.h"

 #include "netlib.h"

 

 static const char search_request_msg[] =

diff --git a/src/modules/options/descbutton.cpp b/src/modules/options/descbutton.cpp
index 2e5d55c7a4..773d3893b3 100644
--- a/src/modules/options/descbutton.cpp
+++ b/src/modules/options/descbutton.cpp
@@ -23,7 +23,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

 

-#include "commonheaders.h"

+#include "..\..\core\commonheaders.h"

 #include "m_descbutton.h"

 

 extern HINSTANCE hMirandaInst;

diff --git a/src/modules/options/filter.cpp b/src/modules/options/filter.cpp
index 116899d44e..0088220266 100644
--- a/src/modules/options/filter.cpp
+++ b/src/modules/options/filter.cpp
@@ -21,7 +21,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

 

-#include "commonheaders.h"

+#include "..\..\core\commonheaders.h"

 #include "filter.h"

 

 HANDLE hOptionsInitialize;

diff --git a/src/modules/options/headerbar.cpp b/src/modules/options/headerbar.cpp
index a2407d2aab..b4acd701d6 100644
--- a/src/modules/options/headerbar.cpp
+++ b/src/modules/options/headerbar.cpp
@@ -23,7 +23,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

 

-#include "commonheaders.h"

+#include "..\..\core\commonheaders.h"

 #include "m_iconheader.h"

 

 extern HINSTANCE hMirandaInst;

diff --git a/src/modules/options/iconheader.cpp b/src/modules/options/iconheader.cpp
index 9ab44b0852..669fd2345a 100644
--- a/src/modules/options/iconheader.cpp
+++ b/src/modules/options/iconheader.cpp
@@ -23,7 +23,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

 

-#include "commonheaders.h"

+#include "..\..\core\commonheaders.h"

 #include "m_iconheader.h"

 

 

diff --git a/src/modules/options/options.cpp b/src/modules/options/options.cpp
index 0366d99062..d8d09f8967 100644
--- a/src/modules/options/options.cpp
+++ b/src/modules/options/options.cpp
@@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software

 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

-#include "commonheaders.h"

+#include "..\..\core\commonheaders.h"

 #include "filter.h"

 

 #define OPENOPTIONSDIALOG_OLD_SIZE 12

diff --git a/src/modules/plugins/newplugins.cpp b/src/modules/plugins/newplugins.cpp
index 14cafcea4a..1b73fb9a2d 100644
--- a/src/modules/plugins/newplugins.cpp
+++ b/src/modules/plugins/newplugins.cpp
@@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software

 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

-#include "commonheaders.h"

+#include "..\..\core\commonheaders.h"

 

 // block these plugins

 #define DEFMOD_REMOVED_UIPLUGINOPTS     21

diff --git a/src/modules/protocols/protoaccs.cpp b/src/modules/protocols/protoaccs.cpp
index b4a2b64f4f..36176560e6 100644
--- a/src/modules/protocols/protoaccs.cpp
+++ b/src/modules/protocols/protoaccs.cpp
@@ -21,7 +21,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

 

-#include "commonheaders.h"

+#include "..\..\core\commonheaders.h"

 

 #include "../clist/clc.h"

 

diff --git a/src/modules/protocols/protochains.cpp b/src/modules/protocols/protochains.cpp
index f7f3729806..a49cdee424 100644
--- a/src/modules/protocols/protochains.cpp
+++ b/src/modules/protocols/protochains.cpp
@@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software

 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

-#include "commonheaders.h"

+#include "..\..\core\commonheaders.h"

 #include <m_protomod.h>

 

 //Protocol chain is list of integers "0".."n", with network protocol named "p"

diff --git a/src/modules/protocols/protocols.cpp b/src/modules/protocols/protocols.cpp
index be423e8017..9d51b754ed 100644
--- a/src/modules/protocols/protocols.cpp
+++ b/src/modules/protocols/protocols.cpp
@@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software

 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

-#include "commonheaders.h"

+#include "..\..\core\commonheaders.h"

 

 int LoadProtoChains(void);

 int LoadProtoOptions( void );

diff --git a/src/modules/protocols/protodir.cpp b/src/modules/protocols/protodir.cpp
index 7a110268ef..bb024d06c4 100644
--- a/src/modules/protocols/protodir.cpp
+++ b/src/modules/protocols/protodir.cpp
@@ -21,7 +21,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

 

-#include "commonheaders.h"

+#include "..\..\core\commonheaders.h"

 

 #if 0

 

diff --git a/src/modules/protocols/protoint.cpp b/src/modules/protocols/protoint.cpp
index dec59cce98..0acabb84a2 100644
--- a/src/modules/protocols/protoint.cpp
+++ b/src/modules/protocols/protoint.cpp
@@ -21,7 +21,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

 

-#include "commonheaders.h"

+#include "..\..\core\commonheaders.h"

 

 char** __fastcall Proto_FilesMatrixA( TCHAR **files );

 void FreeFilesMatrix( TCHAR ***files );

diff --git a/src/modules/protocols/protoopts.cpp b/src/modules/protocols/protoopts.cpp
index d1212c3790..344166f2e4 100644
--- a/src/modules/protocols/protoopts.cpp
+++ b/src/modules/protocols/protoopts.cpp
@@ -21,7 +21,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

 

-#include "commonheaders.h"

+#include "..\..\core\commonheaders.h"

 

 #define LBN_MY_CHECK	0x1000

 #define LBN_MY_RENAME	0x1001

diff --git a/src/modules/skin/hotkeys.cpp b/src/modules/skin/hotkeys.cpp
index cd87fda1a7..1d3c0cdd6b 100644
--- a/src/modules/skin/hotkeys.cpp
+++ b/src/modules/skin/hotkeys.cpp
@@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software

 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

-#include "commonheaders.h"

+#include "..\..\core\commonheaders.h"

 #include <m_hotkeys.h>

 

 #define DBMODULENAME "SkinHotKeys"

diff --git a/src/modules/skin/skinicons.cpp b/src/modules/skin/skinicons.cpp
index 9bfb0cf655..b8febacf3a 100644
--- a/src/modules/skin/skinicons.cpp
+++ b/src/modules/skin/skinicons.cpp
@@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software

 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

-#include "commonheaders.h"

+#include "..\..\core\commonheaders.h"

 #include <io.h>

 

 struct StandardIconDescription

diff --git a/src/modules/skin/sounds.cpp b/src/modules/skin/sounds.cpp
index 734c319ac9..8c6865f012 100644
--- a/src/modules/skin/sounds.cpp
+++ b/src/modules/skin/sounds.cpp
@@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software

 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

-#include "commonheaders.h"

+#include "..\..\core\commonheaders.h"

 

 struct SoundItem {

 	char*  name;

diff --git a/src/modules/srauth/auth.cpp b/src/modules/srauth/auth.cpp
index d62c4af4f4..4b0c02cca6 100644
--- a/src/modules/srauth/auth.cpp
+++ b/src/modules/srauth/auth.cpp
@@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software

 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

-#include "commonheaders.h"

+#include "..\..\core\commonheaders.h"

 

 #define MS_AUTH_SHOWREQUEST	"Auth/ShowRequest"

 #define MS_AUTH_SHOWADDED	"Auth/ShowAdded"

diff --git a/src/modules/srauth/authdialogs.cpp b/src/modules/srauth/authdialogs.cpp
index 07651da4ce..367c8790ac 100644
--- a/src/modules/srauth/authdialogs.cpp
+++ b/src/modules/srauth/authdialogs.cpp
@@ -21,7 +21,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

 

-#include "commonheaders.h"

+#include "..\..\core\commonheaders.h"

 

 INT_PTR CALLBACK DlgProcAdded(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)

 {

diff --git a/src/modules/srawaymsg/awaymsg.cpp b/src/modules/srawaymsg/awaymsg.cpp
index 39383e5367..818a95b3a6 100644
--- a/src/modules/srawaymsg/awaymsg.cpp
+++ b/src/modules/srawaymsg/awaymsg.cpp
@@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software

 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

-#include "commonheaders.h"

+#include "..\..\core\commonheaders.h"

 

 int LoadAwayMessageSending(void);

 

diff --git a/src/modules/srawaymsg/sendmsg.cpp b/src/modules/srawaymsg/sendmsg.cpp
index 09cfcc77ad..653a9823e4 100644
--- a/src/modules/srawaymsg/sendmsg.cpp
+++ b/src/modules/srawaymsg/sendmsg.cpp
@@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software

 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

-#include "commonheaders.h"

+#include "..\..\core\commonheaders.h"

 

 extern bool prochotkey;

 

diff --git a/src/modules/sremail/email.cpp b/src/modules/sremail/email.cpp
index 251963a406..33fc707036 100644
--- a/src/modules/sremail/email.cpp
+++ b/src/modules/sremail/email.cpp
@@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software

 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

-#include "commonheaders.h"

+#include "..\..\core\commonheaders.h"

 

 static HANDLE hEMailMenuItem;

 

diff --git a/src/modules/srfile/file.cpp b/src/modules/srfile/file.cpp
index 37f7d15a1f..bb0129dada 100644
--- a/src/modules/srfile/file.cpp
+++ b/src/modules/srfile/file.cpp
@@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software

 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

-#include "commonheaders.h"

+#include "..\..\core\commonheaders.h"

 #include "file.h"

 

 TCHAR* PFTS_StringToTchar( int flags, const PROTOCHAR* s );

diff --git a/src/modules/srfile/fileexistsdlg.cpp b/src/modules/srfile/fileexistsdlg.cpp
index d97d6d8da2..f5b28753dc 100644
--- a/src/modules/srfile/fileexistsdlg.cpp
+++ b/src/modules/srfile/fileexistsdlg.cpp
@@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software

 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

-#include "commonheaders.h"

+#include "..\..\core\commonheaders.h"

 #include <shlobj.h>

 #include <sys/types.h>

 #include <sys/stat.h>

diff --git a/src/modules/srfile/fileopts.cpp b/src/modules/srfile/fileopts.cpp
index 3107f109a3..1449c4c38b 100644
--- a/src/modules/srfile/fileopts.cpp
+++ b/src/modules/srfile/fileopts.cpp
@@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software

 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

-#include "commonheaders.h"

+#include "..\..\core\commonheaders.h"

 #include "file.h"

 

 #define VSCAN_MCAFEE      1

diff --git a/src/modules/srfile/filerecvdlg.cpp b/src/modules/srfile/filerecvdlg.cpp
index 451a27e8bc..83e6b0077e 100644
--- a/src/modules/srfile/filerecvdlg.cpp
+++ b/src/modules/srfile/filerecvdlg.cpp
@@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software

 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

-#include "commonheaders.h"

+#include "..\..\core\commonheaders.h"

 #include "file.h"

 

 #define MAX_MRU_DIRS    5

diff --git a/src/modules/srfile/filesenddlg.cpp b/src/modules/srfile/filesenddlg.cpp
index 94c24a2479..ea29aa2b00 100644
--- a/src/modules/srfile/filesenddlg.cpp
+++ b/src/modules/srfile/filesenddlg.cpp
@@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software

 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

-#include "commonheaders.h"

+#include "..\..\core\commonheaders.h"

 #include <sys/types.h>

 #include <sys/stat.h>

 #include "file.h"

diff --git a/src/modules/srfile/filexferdlg.cpp b/src/modules/srfile/filexferdlg.cpp
index 4a6f40436b..c4a41e750f 100644
--- a/src/modules/srfile/filexferdlg.cpp
+++ b/src/modules/srfile/filexferdlg.cpp
@@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software

 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

-#include "commonheaders.h"

+#include "..\..\core\commonheaders.h"

 #include <io.h>

 #include "file.h"

 

diff --git a/src/modules/srfile/ftmanager.cpp b/src/modules/srfile/ftmanager.cpp
index a219d2188a..b2c5dde516 100644
--- a/src/modules/srfile/ftmanager.cpp
+++ b/src/modules/srfile/ftmanager.cpp
@@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software

 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

-#include "commonheaders.h"

+#include "..\..\core\commonheaders.h"

 #include "file.h"

 

 static HWND hwndFtMgr = NULL;

diff --git a/src/modules/srurl/url.cpp b/src/modules/srurl/url.cpp
index a6dfb9141f..7ae23cd01e 100644
--- a/src/modules/srurl/url.cpp
+++ b/src/modules/srurl/url.cpp
@@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software

 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

-#include "commonheaders.h"

+#include "..\..\core\commonheaders.h"

 #include <m_url.h>

 #include "url.h"

 

diff --git a/src/modules/srurl/urldialogs.cpp b/src/modules/srurl/urldialogs.cpp
index 294e3be4da..0c6fb2f21e 100644
--- a/src/modules/srurl/urldialogs.cpp
+++ b/src/modules/srurl/urldialogs.cpp
@@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software

 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

-#include "commonheaders.h"

+#include "..\..\core\commonheaders.h"

 #include "url.h"

 

 INT_PTR CALLBACK DlgProcUrlSend(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam);

diff --git a/src/modules/updatenotify/updatenotify.cpp b/src/modules/updatenotify/updatenotify.cpp
index 5b2162a041..581e13c8e9 100644
--- a/src/modules/updatenotify/updatenotify.cpp
+++ b/src/modules/updatenotify/updatenotify.cpp
@@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software

 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

-#include "commonheaders.h"

+#include "..\..\core\commonheaders.h"

 

 #define UN_MOD               "UpdateNotify"

 #define UN_ENABLE            "UpdateNotifyEnable"

diff --git a/src/modules/userinfo/contactinfo.cpp b/src/modules/userinfo/contactinfo.cpp
index dc66067bbf..c8fcc9de0c 100644
--- a/src/modules/userinfo/contactinfo.cpp
+++ b/src/modules/userinfo/contactinfo.cpp
@@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software

 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

-#include "commonheaders.h"

+#include "..\..\core\commonheaders.h"

 

 static HFONT hEmailFont=NULL;

 static HCURSOR hHandCursor=NULL;

diff --git a/src/modules/userinfo/stdinfo.cpp b/src/modules/userinfo/stdinfo.cpp
index 89f6ab0f45..68de7a531d 100644
--- a/src/modules/userinfo/stdinfo.cpp
+++ b/src/modules/userinfo/stdinfo.cpp
@@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software

 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

-#include "commonheaders.h"

+#include "..\..\core\commonheaders.h"

 

 INT_PTR CALLBACK ContactDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam);

 

diff --git a/src/modules/userinfo/userinfo.cpp b/src/modules/userinfo/userinfo.cpp
index a17b2d4c71..77729dd416 100644
--- a/src/modules/userinfo/userinfo.cpp
+++ b/src/modules/userinfo/userinfo.cpp
@@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software

 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

-#include "commonheaders.h"

+#include "..\..\core\commonheaders.h"

 #define UPDATEANIMFRAMES 20

 

 int DetailsInit(WPARAM wParam,LPARAM lParam);

diff --git a/src/modules/useronline/useronline.cpp b/src/modules/useronline/useronline.cpp
index 23371de267..8c6bf49eb5 100644
--- a/src/modules/useronline/useronline.cpp
+++ b/src/modules/useronline/useronline.cpp
@@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software

 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

-#include "commonheaders.h"

+#include "..\..\core\commonheaders.h"

 

 static int uniqueEventId=0;

 

diff --git a/src/modules/utils/bmpfilter.cpp b/src/modules/utils/bmpfilter.cpp
index 6f92eba126..2496c2dcc2 100644
--- a/src/modules/utils/bmpfilter.cpp
+++ b/src/modules/utils/bmpfilter.cpp
@@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software

 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

-#include "commonheaders.h"

+#include "..\..\core\commonheaders.h"

 #include <olectl.h>

 

 #include "m_png.h"

diff --git a/src/modules/utils/colourpicker.cpp b/src/modules/utils/colourpicker.cpp
index ec1a87153c..0f2f9bf8f8 100644
--- a/src/modules/utils/colourpicker.cpp
+++ b/src/modules/utils/colourpicker.cpp
@@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software

 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

-#include "commonheaders.h"

+#include "..\..\core\commonheaders.h"

 

 static LRESULT CALLBACK ColourPickerWndProc(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam)

 {

diff --git a/src/modules/utils/hyperlink.cpp b/src/modules/utils/hyperlink.cpp
index 62d307a958..7ed16f6857 100644
--- a/src/modules/utils/hyperlink.cpp
+++ b/src/modules/utils/hyperlink.cpp
@@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software

 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

-#include "commonheaders.h"

+#include "..\..\core\commonheaders.h"

 

 struct HyperlinkWndData {

 	HFONT hEnableFont,hDisableFont;

diff --git a/src/modules/utils/imgconv.cpp b/src/modules/utils/imgconv.cpp
index e25953e471..431ae3343d 100644
--- a/src/modules/utils/imgconv.cpp
+++ b/src/modules/utils/imgconv.cpp
@@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software

 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

-#include "commonheaders.h"

+#include "..\..\core\commonheaders.h"

 

 typedef DWORD ARGB;

 

diff --git a/src/modules/utils/md5.cpp b/src/modules/utils/md5.cpp
index 0fcaccb9ae..3fb835abdd 100644
--- a/src/modules/utils/md5.cpp
+++ b/src/modules/utils/md5.cpp
@@ -53,7 +53,7 @@
 

 // (C) 2005 Joe @ Whale - changed to compile with Miranda

 

-#include "commonheaders.h"

+#include "..\..\core\commonheaders.h"

 

 

 #define T_MASK ((mir_md5_word_t)~0)

diff --git a/src/modules/utils/openurl.cpp b/src/modules/utils/openurl.cpp
index ef66d89f8c..02ea139090 100644
--- a/src/modules/utils/openurl.cpp
+++ b/src/modules/utils/openurl.cpp
@@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software

 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

-#include "commonheaders.h"

+#include "..\..\core\commonheaders.h"

 #include <ctype.h>

 

 #define DDEMESSAGETIMEOUT  1000

diff --git a/src/modules/utils/path.cpp b/src/modules/utils/path.cpp
index 80333a3075..ff6a5550bb 100644
--- a/src/modules/utils/path.cpp
+++ b/src/modules/utils/path.cpp
@@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software

 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

-#include "commonheaders.h"

+#include "..\..\core\commonheaders.h"

 #include "../database/profilemanager.h"

 #include "../srfile/file.h"

 

diff --git a/src/modules/utils/resizer.cpp b/src/modules/utils/resizer.cpp
index ea0daa057a..31806f644e 100644
--- a/src/modules/utils/resizer.cpp
+++ b/src/modules/utils/resizer.cpp
@@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software

 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

-#include "commonheaders.h"

+#include "..\..\core\commonheaders.h"

 

 typedef struct {

 	DWORD  helpID;

diff --git a/src/modules/utils/sha1.cpp b/src/modules/utils/sha1.cpp
index c89a60ca46..3900d67fff 100644
--- a/src/modules/utils/sha1.cpp
+++ b/src/modules/utils/sha1.cpp
@@ -34,7 +34,7 @@
  *

  * ***** END LICENSE BLOCK ***** */

 

-#include "commonheaders.h"

+#include "..\..\core\commonheaders.h"

 

 static void shaHashBlock(mir_sha1_ctx *ctx);

 

diff --git a/src/modules/utils/timeutils.cpp b/src/modules/utils/timeutils.cpp
index a0d4c02e46..0b39d47ea9 100644
--- a/src/modules/utils/timeutils.cpp
+++ b/src/modules/utils/timeutils.cpp
@@ -23,7 +23,7 @@ implements services to handle location - based timezones, instead of
 simple UTC offsets.

 */

 

-#include "commonheaders.h"

+#include "..\..\core\commonheaders.h"

 

 //KB167296

 void UnixTimeToFileTime(time_t ts, LPFILETIME pft)

diff --git a/src/modules/utils/timezones.cpp b/src/modules/utils/timezones.cpp
index 7d22cbec1e..5c2a2d800d 100644
--- a/src/modules/utils/timezones.cpp
+++ b/src/modules/utils/timezones.cpp
@@ -23,7 +23,7 @@ implements services to handle location - based timezones, instead of
 simple UTC offsets.

 */

 

-#include <commonheaders.h>

+#include <..\..\core\commonheaders.h>

 

 TIME_API tmi;

 

diff --git a/src/modules/utils/utf.cpp b/src/modules/utils/utf.cpp
index ad6683d2ed..670f9f5edf 100644
--- a/src/modules/utils/utf.cpp
+++ b/src/modules/utils/utf.cpp
@@ -24,7 +24,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

 

-#include "commonheaders.h"

+#include "..\..\core\commonheaders.h"

 

 /* number of following bytes in sequence based on first byte value (for bytes above 0x7f) */

 static const char utf8_length[128] =

diff --git a/src/modules/utils/utils.cpp b/src/modules/utils/utils.cpp
index 9e81b3084b..bbd6deb19f 100644
--- a/src/modules/utils/utils.cpp
+++ b/src/modules/utils/utils.cpp
@@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software

 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

-#include "commonheaders.h"

+#include "..\..\core\commonheaders.h"

 

 INT_PTR ResizeDialog(WPARAM wParam,LPARAM lParam);

 int InitOpenUrl(void);

diff --git a/src/modules/utils/windowlist.cpp b/src/modules/utils/windowlist.cpp
index b7ea59eb58..ac1e34f569 100644
--- a/src/modules/utils/windowlist.cpp
+++ b/src/modules/utils/windowlist.cpp
@@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software

 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

-#include "commonheaders.h"

+#include "..\..\core\commonheaders.h"

 

 static WINDOWLISTENTRY *windowList=NULL;

 static int windowListCount=0;

diff --git a/src/modules/visibility/visibility.cpp b/src/modules/visibility/visibility.cpp
index aa319cf715..13c9d6b191 100644
--- a/src/modules/visibility/visibility.cpp
+++ b/src/modules/visibility/visibility.cpp
@@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software

 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

-#include "commonheaders.h"

+#include "..\..\core\commonheaders.h"

 

 static void SetListGroupIcons(HWND hwndList,HANDLE hFirstItem,HANDLE hParentItem,int *groupChildCount)

 {

diff --git a/src/modules/xml/xmlApi.cpp b/src/modules/xml/xmlApi.cpp
index 08887dd448..45acae2381 100644
--- a/src/modules/xml/xmlApi.cpp
+++ b/src/modules/xml/xmlApi.cpp
@@ -21,7 +21,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

 

-#include "commonheaders.h"

+#include "..\..\core\commonheaders.h"

 #include "xmlParser.h"

 

 static HXML xmlapiCreateNode( LPCTSTR name, LPCTSTR text, char isDeclaration )

diff --git a/src/modules/xml/xmlParser.cpp b/src/modules/xml/xmlParser.cpp
index 3d8dfd7b4c..fdcd644be0 100644
--- a/src/modules/xml/xmlParser.cpp
+++ b/src/modules/xml/xmlParser.cpp
@@ -50,7 +50,7 @@
 ****************************************************************************

 */

 

-#include "commonheaders.h"

+#include "..\..\core\commonheaders.h"

 #include "xmlParser.h"

 

 #include <memory.h>