--- a/radioengine/utils/src/cradioaccessoryobserver.cpp	Tue Jul 06 14:16:27 2010 +0300
+++ b/radioengine/utils/src/cradioaccessoryobserver.cpp	Wed Aug 18 09:49:03 2010 +0300
@@ -24,15 +24,18 @@
 #include "cradioenginelogger.h"
 
 #ifdef ASW_CORE_AUDIO_PLATFORM_VERSION // Nokia specific adaptation
-#include <accpolpropgenericid.h>
+//#include <accpolpropgenericid.h>
+#include <AccPolGenericIdDefinitions.h>
 
 #ifndef __WINS__
-
-const TUint KPhysicalConnectionBitmask = KPCNokiaAV | KPCWired;
+// See accpolpropgenericid.h definitions KPCNokiaAV == 0x20000,
+// Forced to use hard coded value here to avoid including from epoc32/include/internal
+const TUint KPhysicalConnectionBitmask = 0x20000 | KPCWired;
 
 #else
-
-const TUint KPhysicalConnectionBitmask = 0x20000 | 0x1;
+// See accpolpropgenericid.h definitions KPCNokiaAV == 0x20000, 
+// Forced to use hard coded value here to avoid including from epoc32/include/internal
+const TUint KPhysicalConnectionBitmask = 0x20000 | KPCWired;
 
 #endif // __WINS__
 
@@ -116,7 +119,7 @@
     TBool accessoryFound = EFalse;
 
     LOG_FORMAT( "Connected accessories count = %d", iAccPolGenIdArr.Count());
-    for ( TInt i = 0; i < iAccPolGenIdArr.Count() && !accessoryFound; i++ )
+    for ( TInt i = 0; i < iAccPolGenIdArr.Count() && !accessoryFound; ++i )
         {
         TAccPolGenericID accPolGenId = iAccPolGenIdArr.GetGenericIDL( i );
 
@@ -237,7 +240,7 @@
 
     iSavedAccessories.Reset();
 
-    for ( TInt i = 0; i < iAccPolGenIdArr.Count(); i++ )
+    for ( TInt i = 0; i < iAccPolGenIdArr.Count(); ++i )
         {
         iSavedAccessories.AppendL( iAccPolGenIdArr.GetGenericIDL( i ) );
         LOG_FORMAT( "- accessory in slot %d: %d",
@@ -255,7 +258,7 @@
     LEVEL2( LOG_METHOD_AUTO );
     TInt removedAccessories( 0 );
 
-    for ( TInt i = 0; i < iSavedAccessories.Count(); i++ )
+    for ( TInt i = 0; i < iSavedAccessories.Count(); ++i )
         {
         TAccPolGenericID savedAcc = iSavedAccessories[i];
 
@@ -293,7 +296,7 @@
     LEVEL2( LOG_METHOD_AUTO );
     TInt addedAccessories( 0 );
 
-    for ( TInt i = 0; i < iAccPolGenIdArr.Count(); i++ )
+    for ( TInt i = 0; i < iAccPolGenIdArr.Count(); ++i )
         {
         TAccPolGenericID freshAcc = iAccPolGenIdArr.GetGenericIDL( i );