--- a/connectivitymodules/SeCon/servers/syncserver/group/sconsyncserver.mmp	Fri Sep 17 14:03:31 2010 +0530
+++ b/connectivitymodules/SeCon/servers/syncserver/group/sconsyncserver.mmp	Fri Sep 17 19:29:17 2010 +0530
@@ -44,11 +44,14 @@
 USERINCLUDE     ../../../clients/syncclient/inc
 SOURCE          scondataproviderinfo.cpp
 
-USERINCLUDE     ..\inc
+USERINCLUDE     ../inc
 
 // Default system include paths
 APP_LAYER_SYSTEMINCLUDE
 
+// For temporary use only
+SYSTEMINCLUDE   /epoc32/include/syncml
+
 DEBUGLIBRARY    flogger.lib
 LIBRARY         euser.lib
 LIBRARY         efsrv.lib

--- a/connectivitymodules/SeCon/servers/syncserver/inc/sconasynchandler.h	Fri Sep 17 14:03:31 2010 +0530
+++ b/connectivitymodules/SeCon/servers/syncserver/inc/sconasynchandler.h	Fri Sep 17 19:29:17 2010 +0530
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -22,7 +22,7 @@
 #include <e32base.h>
 #include <f32file.h>
 
-#include <syncml/SmlDataSyncDefs.h>
+#include <SmlDataSyncDefs.h>
 #include <stringpool.h>
 
 #include "cscontimeout.h"

--- a/connectivitymodules/SeCon/servers/syncserver/inc/sconsyncrelationship.h	Fri Sep 17 14:03:31 2010 +0530
+++ b/connectivitymodules/SeCon/servers/syncserver/inc/sconsyncrelationship.h	Fri Sep 17 19:29:17 2010 +0530
@@ -22,7 +22,7 @@
 #include <e32base.h>
 #include <f32file.h> 
 #include <s32file.h>
-#include <syncml/smldatasyncdefs.h>
+#include <smldatasyncdefs.h>
 #include <syncmldef.h>
 
 class CDictionaryFileStore;

--- a/omads/omadsextensions/adapters/mediads/group/mediads.mmp	Fri Sep 17 14:03:31 2010 +0530
+++ b/omads/omadsextensions/adapters/mediads/group/mediads.mmp	Fri Sep 17 19:29:17 2010 +0530
@@ -42,6 +42,8 @@
 
 APP_LAYER_SYSTEMINCLUDE
 
+// For temporary use only
+SYSTEMINCLUDE   /epoc32/include/syncml 
 
 START RESOURCE  mediadsprovider.rss
 HEADER

--- a/omads/omadsextensions/adapters/mediads/inc/snapshotitem.h	Fri Sep 17 14:03:31 2010 +0530
+++ b/omads/omadsextensions/adapters/mediads/inc/snapshotitem.h	Fri Sep 17 19:29:17 2010 +0530
@@ -20,7 +20,7 @@
 #define __SNAPSHOTITEM_H__
 
 // INCLUDES
-#include <syncml/SmlDataSyncDefs.h>
+#include <SmlDataSyncDefs.h>
 #include <hash.h>
 #include "mediadsproviderdefs.h"
 #include "songitem.h"