--- a/accessoryservices/accessoryserver/inc/ASYProxy/ASYProxy.h	Fri Jun 11 16:28:00 2010 +0100
+++ b/accessoryservices/accessoryserver/inc/ASYProxy/ASYProxy.h	Tue Jun 15 14:45:25 2010 +0100
@@ -180,8 +180,7 @@
 
     public:     // Friend classes
 
-        friend void CASYProxyAsyLoader::DoIssueRequestL();
-        friend void CASYProxyAsyLoader::ArrangeImplementationsL();
+        friend class CASYProxyAsyLoader;
 
     protected:  // Friend classes
 

--- a/accessoryservices/accessoryserver/inc/ASYProxy/ASYProxyAsyLoader.h	Fri Jun 11 16:28:00 2010 +0100
+++ b/accessoryservices/accessoryserver/inc/ASYProxy/ASYProxyAsyLoader.h	Tue Jun 15 14:45:25 2010 +0100
@@ -154,7 +154,7 @@
 
     public:     // Friend classes
 
-        friend void CASYProxyLoaderTimer::RunL();
+        friend class CASYProxyLoaderTimer;
 
     protected:  // Friend classes
 

--- a/accessoryservices/accessoryserver/src/accpolaudiodevicetopology/accpolselectorunit.cpp	Fri Jun 11 16:28:00 2010 +0100
+++ b/accessoryservices/accessoryserver/src/accpolaudiodevicetopology/accpolselectorunit.cpp	Tue Jun 15 14:45:25 2010 +0100
@@ -122,7 +122,7 @@
 EXPORT_C CAccPolSelectorUnit::~CAccPolSelectorUnit()
     {
     API_TRACE_( "[AccFW: ACCPOLAUDIODEVICETOPOLOGY] CAccPolSelectorUnit::~CAccPolSelectorUnit() - Enter" );
-    API_TRACE_( "[AccFW: ACCPOLAUDIODEVICETOPOLOGY] CAccPolSelectorUnit::¨CAccPolSelectorUnit() - Return" );
+    API_TRACE_( "[AccFW: ACCPOLAUDIODEVICETOPOLOGY] CAccPolSelectorUnit::~CAccPolSelectorUnit() - Return" );
     }
 
 // ---------------------------------------------------------------------------