diff -r 388a17646e40 -r 0feebc799606 localconnectivityservice/obexserviceman/utils/src/vMessageHandler.cpp
--- a/localconnectivityservice/obexserviceman/utils/src/vMessageHandler.cpp	Tue Feb 02 00:45:58 2010 +0200
+++ b/localconnectivityservice/obexserviceman/utils/src/vMessageHandler.cpp	Fri Mar 19 09:42:38 2010 +0200
@@ -22,17 +22,21 @@
 #include "obexutilsdebug.h"
 #include "etelmm.h"
 #include <BTSapDomainPSKeys.h>
-#include <smut.h> // KUidMsgTypeSMS
-#include <smuthdr.h>
+#include <app/smut.h> // KUidMsgTypeSMS
+#ifdef NO101APPDEPFIXES_NEW
+#include <app/smuthdr.h>
+#endif //NO101APPDEPFIXES_NEW
+
 #include <gsmupdu.h>
 #include <txtrich.h>
 #include <msvuids.h>
 
-#include <csmsaccount.h>
+#include <app/csmsaccount.h>
 
+#ifdef NO101APPDEPFIXES_NEW
 // SMUT Unbranch
-#include <csmsgetdetdescinterface.h>
-
+#include <app/csmsgetdetdescinterface.h>
+#endif //NO101APPDEPFIXES_NEW
 
 // ================= MEMBER FUNCTIONS =======================
 TBool CSapVMessageParser::HandleMessageL(CObexBufObject*  aReceivedObject, const TUid aMtmID,
@@ -429,8 +433,12 @@
 //
 void CSapVMessageParser::SaveSmsToInboxL(CMsvSession* aMsvSession, CRichText* aMessage)
 {
-    FLOG( _L( " CSapVMessageParser: SaveSmsToInboxL\t" ) );
-
+    #ifndef NO101APPDEPFIXES_NEW
+    (void) aMsvSession; 
+    (void) aMessage; 
+    #endif //NO101APPDEPFIXES_NEW
+    #ifdef NO101APPDEPFIXES_NEW
+    FLOG( _L( " CSapVMessageParser: SaveSmsToInboxL\t" ) ); 
     CSmsHeader* header=CSmsHeader::NewL(CSmsPDU::ESmsDeliver, *aMessage );
     CleanupStack::PushL(header); // 1st push
     header->SetFromAddressL(Address());
@@ -505,6 +513,7 @@
     CleanupStack::PopAndDestroy(header);
 
     FLOG( _L( " CSapVMessageParser: SaveSmsToInboxL: Done\t" ) );
+    #endif  //NO101APPDEPFIXES_NEW
 }
 
 // ---------------------------------------------------------
@@ -514,6 +523,12 @@
 //
 void CSapVMessageParser::SaveSmsToSentL(CMsvSession* aMsvSession, CRichText* aMessage)
 {
+    #ifndef NO101APPDEPFIXES_NEW
+    (void) aMsvSession; 
+    (void) aMessage; 
+    #endif //NO101APPDEPFIXES_NEW
+    
+    #ifdef NO101APPDEPFIXES_NEW
     FLOG( _L( " CSapVMessageParser: SaveSmsToSentL\t" ) );
 
     CSmsHeader* header = CSmsHeader::NewL( CSmsPDU::ESmsSubmit, *aMessage );
@@ -607,6 +622,7 @@
     CleanupStack::PopAndDestroy(header);
 
     FLOG( _L( " CSapVMessageParser: SaveSmsToSentL: Done\t" ) );
+    #endif  //NO101APPDEPFIXES_NEW
 }
 
 //  End of File