diff -r 1ddbe54d0645 -r ccb4f6b3db21 resourcemgmt/hwresourcesmgr/test/data/featreg/RemovableFeatures.iby
--- a/resourcemgmt/hwresourcesmgr/test/data/featreg/RemovableFeatures.iby	Thu Aug 19 11:09:10 2010 +0300
+++ b/resourcemgmt/hwresourcesmgr/test/data/featreg/RemovableFeatures.iby	Tue Aug 31 16:29:05 2010 +0300
@@ -17,18 +17,18 @@
 #define __REMOVABLEFEATURES_IBY__
 
 #define SYMBIAN_EXCLUDE_FAX
-#define SYMBIAN_EXCLUDE_PRINT
-#define SYMBIAN_EXCLUDE_MMC
+#undef __UPNP_PRINT_FRAMEWORK
+#undef __MMC
 #define SYMBIAN_EXCLUDE_RTP_RTCP
 #define SYMBIAN_EXCLUDE_PC_CONNECTIVITY_EXCEPT_SECURE_BACKUP
-#define SYMBIAN_EXCLUDE_INFRARED
-#define SYMBIAN_EXCLUDE_BLUETOOTH
+#undef __IRDA
+#undef __BT
 #define SYMBIAN_EXCLUDE_OBEX
-#define SYMBIAN_EXCLUDE_USB
+#undef __USB
 #define SYMBIAN_EXCLUDE_DRM_AGENT_PLUGINS
-#define SYMBIAN_EXCLUDE_IPSEC
+#undef __IPSEC
 #define SYMBIAN_EXCLUDE_QOS_PROTPLUGINS
-#define SYMBIAN_EXCLUDE_DHCP
+#undef __DHCP
 #define SYMBIAN_EXCLUDE_MOBILEIP
 #define SYMBIAN_EXCLUDE_LOCATION
 #define SYMBIAN_EXCLUDE_SIP
@@ -36,13 +36,13 @@
 #define SYMBIAN_EXCLUDE_OMA_DATASYNC
 #define SYMBIAN_EXCLUDE_OMA_DEVMAN
 #define SYMBIAN_EXCLUDE_OMA_DS_HOSTSERVERS
-#define SYMBIAN_EXCLUDE_MTP
+#undef __MTP_PROTOCOL_SUPPORT
 
 // Include HWRM features by uncommenting their exclusion macros
-//#define SYMBIAN_EXCLUDE_FMTX
-//#define SYMBIAN_EXCLUDE_VIBRA
-//#define SYMBIAN_EXCLUDE_AMBIENT_LIGHT_SENSOR
-//#define SYMBIAN_EXCLUDE_COVER_DISPLAY
-//#define SYMBIAN_EXCLUDE_KEYPAD_NO_SLIDER
+//#undef FF_FMTX
+//#undef __VIBRA
+//#undef __SERIES60_AMBIENT_LIGHT_SENSOR
+//#undef __COVER_DISPLAY
+//#undef __SERIES60_KEYPAD_NO_SLIDER
 
 #endif