diff -r 0ba996a9b75d -r 613943a21004 bluetoothengine/bthid/keyboard/inc/keyboard.h
--- a/bluetoothengine/bthid/keyboard/inc/keyboard.h	Thu Aug 19 10:05:41 2010 +0300
+++ b/bluetoothengine/bthid/keyboard/inc/keyboard.h	Tue Aug 31 15:25:10 2010 +0300
@@ -22,7 +22,6 @@
 #include <e32std.h>
 #include <w32std.h>
 #include <e32event.h>
-#include <aknkeylock.h>
 
 #include "hidinterfaces.h"
 #include "hidkeys.h"
@@ -245,18 +244,12 @@
     void LaunchApplicationL(TInt aAppUid);
 
     // Checks if multimedia-key (play,stop,..) and sends to RemCon
-    TBool HandleKeyMapping(TDecodedKeyInfo& aKey, TBool aIsKeyDown,
-            TUint8 aModifiers);
-    TBool HandleKeyMappingUp(TDecodedKeyInfo& aKey, TBool aIsKeyDown,
-            TUint8 aModifiers);
-    TBool HandleKeyMappingDown(TDecodedKeyInfo& aKey, TBool aIsKeyDown,
+    TBool HandleMultimediaKeys(TUint16 aScancodeKey, TBool aIsKeyDown,
             TUint8 aModifiers);
-    TBool HandleKeyMappingLeft(TDecodedKeyInfo& aKey, TBool aIsKeyDown,
-            TUint8 aModifiers);
-    TBool HandleKeyMappingRight(TDecodedKeyInfo& aKey, TBool aIsKeyDown,
-            TUint8 aModifiers);
-    TBool HandleKeyMappingOther(TDecodedKeyInfo& aKey, TBool aIsKeyDown,
-            TUint8 aModifiers);
+    TBool HandleMultimediaKeysForNokia(TUint16 aScancodeKey,
+            TBool aIsKeyDown, TUint8 aModifiers);
+    TBool HandleMultimediaKeysForStandard(TUint16 aScancodeKey,
+            TBool aIsKeyDown, TUint8 aModifiers);
 
     TInt AppMenuId();
     TInt PhoneAppId();
@@ -267,23 +260,12 @@
     // bitmap for Multimedia key states
     enum TMmKeyDown
         {
-        ENone       = 0x00,
-        EVolUp      = 0x01,
-        EVolDown    = 0x02,
-        EPlay       = 0x04,
-        EStop       = 0x08,
-        ENext       = 0x10,
-        EPrev       = 0x20,
-        };
-    
-    // bitmap for navigation keys
-    enum TNavKeyDown
-        {
-        ELsk        = 0x01,
-        ERsk        = 0x02,
-        ESend       = 0x04,
-        EEnd        = 0x08,
-        EEsc        = 0x10
+        EVolUp = 1,
+        EVolDown = 2,
+        EPlay = 4,
+        EStop = 8,
+        ENext = 16,
+        EPrev = 32
         };
 
     void ResetBitmap(TBool aIsKeyDown, TMmKeyDown aBitmapToReset);
@@ -358,9 +340,6 @@
 
     // This timer stops key repeating after defined time to prevent endless key repeats in error cases. Fix for EMKD-7FBB9H
     CTimeOutTimer* iRepeatEndTimer;
-    
-    TUint8 iNavKeyDown;
-    RAknKeyLock iKeyLock;
     };
 
 // ----------------------------------------------------------------------