--- a/ncdengine/engine/src/catalogsdebug.cpp	Fri Jun 11 16:24:30 2010 +0100
+++ b/ncdengine/engine/src/catalogsdebug.cpp	Tue Jun 15 13:36:10 2010 +0100
@@ -331,23 +331,26 @@
     {
     VA_LIST list;
     VA_START( list, aFmt );
-
+    HBufC8* buffer = NULL;
+    HBufC* buffer16 = NULL;
+    HBufC8* buffer16to8  = NULL;
+    
     if( iOutput & EOutputExtLogger )
         if( !DebugHeap()->IsEnabled( iType ) ) return;
 
     // Disable debug heap (if installed) to prevent infinite recursion.
     TBool debugHeapActive = RCatalogsDebugHeap::Activate( EFalse );
 
-    HBufC8* buffer = HBufC8::New( KCatalogsDebugBufferSize );
+    buffer = HBufC8::New( KCatalogsDebugBufferSize );
     if ( buffer == NULL ) goto exit1;
 
     PrintGeneral( buffer->Des() );
     
-    HBufC* buffer16 = HBufC::New( KCatalogsDebugBufferSize );
+    buffer16 = HBufC::New( KCatalogsDebugBufferSize );
     if ( buffer16 == NULL ) goto exit2;
     buffer16->Des().AppendFormatList( aFmt, list );
 
-    HBufC8* buffer16to8 = HBufC8::New( buffer16->Length() );
+    buffer16to8 = HBufC8::New( buffer16->Length() );
     if ( buffer16to8 == NULL ) goto exit3;
     buffer16to8->Des().Copy( *buffer16 );
 

--- a/ncdengine/provider/server/inc/ncdfavoritemanagerimpl.h	Fri Jun 11 16:24:30 2010 +0100
+++ b/ncdengine/provider/server/inc/ncdfavoritemanagerimpl.h	Tue Jun 15 13:36:10 2010 +0100
@@ -192,8 +192,6 @@
     MNcdStorageManager& iStorageManager;       
     
 protected:
-
-    class CNcdTemporaryFavorites;
     
     CNcdFavoriteManager( CNcdGeneralManager& aGeneralManager );
     

--- a/ncdengine/provider/server/inc/ncdloadnodeoperationimpl.h	Fri Jun 11 16:24:30 2010 +0100
+++ b/ncdengine/provider/server/inc/ncdloadnodeoperationimpl.h	Tue Jun 15 13:36:10 2010 +0100
@@ -89,6 +89,7 @@
                                   public MCatalogsHttpObserver,
                                   public MNcdParserDataBlocksObserver
     {
+protected:
 class CNcdNodeIconMap;    
 public: