diff -r 889504eac4fb -r 604ca70b6235 xml/libxml2libs/test/common/romkit_include/featuredatabase.xml
--- a/xml/libxml2libs/test/common/romkit_include/featuredatabase.xml	Tue Aug 31 17:02:56 2010 +0300
+++ b/xml/libxml2libs/test/common/romkit_include/featuredatabase.xml	Wed Sep 01 12:37:34 2010 +0100
@@ -20,8 +20,6 @@
 
 -->
 
-
-
 <featuredatabase>
 	<featureset ibyname="feature.iby" hfilename="featureuids.h" namespace="NFeature">
 		<hfileheader interfacestatus="@released" interfacevisibility="@publishedAll">
@@ -46,19 +44,19 @@
 			<hrhmacro exclude="SYMBIAN_EXCLUDE_FAX"/>
 		</feature>		
 		<feature name="Print" statusflags="0x00000001" uid="0x10279807">
-			<hrhmacro include="__UPNP_PRINT_FRAMEWORK"/>
+			<hrhmacro exclude="SYMBIAN_EXCLUDE_PRINT"/>
 		</feature>
 		<feature name="Bluetooth" statusflags="0x00000001" uid="0x10279808">
-			<hrhmacro include="__BT"/>
+			<hrhmacro exclude="SYMBIAN_EXCLUDE_BLUETOOTH"/>
 		</feature>
 		<feature name="Infrared" statusflags="0x00000001" uid="0x10279809">
-			<hrhmacro include="__IRDA"/>
+			<hrhmacro exclude="SYMBIAN_EXCLUDE_INFRARED"/>
 		</feature>
 		<feature name="Mmc" statusflags="0x00000001" uid="0x1027980A">
-			<hrhmacro include="__MMC"/>
+			<hrhmacro exclude="SYMBIAN_EXCLUDE_MMC"/>
 		</feature>
 		<feature name="Usb" statusflags="0x00000001" uid="0x1027980B">
-			<hrhmacro include="__USB"/>
+			<hrhmacro exclude="SYMBIAN_EXCLUDE_USB"/>
 		</feature>
 		<feature name="Obex" statusflags="0x00000001" uid="0x1027980C">
 			<hrhmacro exclude="SYMBIAN_EXCLUDE_OBEX"/>
@@ -82,16 +80,16 @@
 			<hrhmacro exclude="SYMBIAN_EXCLUDE_QOS_PROTPLUGINS"/>
 		</feature>
 		<feature name="IPSec" statusflags="0x00000001" uid="0x10279814">
-			<hrhmacro include="__IPSEC"/>
+			<hrhmacro exclude="SYMBIAN_EXCLUDE_IPSEC"/>
 		</feature>
 		<feature name="Dhcp" statusflags="0x00000001" uid="0x10279815">
-			<hrhmacro include="__DHCP"/>
+			<hrhmacro exclude="SYMBIAN_EXCLUDE_DHCP"/>
 		</feature>
 		<feature name="Connectivity" statusflags="0x00000001" uid="0x10279816">
 			<hrhmacro exclude="SYMBIAN_EXCLUDE_PC_CONNECTIVITY_EXCEPT_SECURE_BACKUP"/>
 		</feature>
 		<feature name="MTP" statusflags="0x00000001" uid="0x10279817">
-			<hrhmacro include="__MTP_PROTOCOL_SUPPORT"/>
+			<hrhmacro exclude="SYMBIAN_EXCLUDE_MTP"/>
 		</feature>
 		<feature name="Location" statusflags="0x00000001" uid="0x10281818"></feature>
 		<feature name="MobileIP" statusflags="0x00000001" uid="0x10281819"></feature>
@@ -101,16 +99,16 @@
 			<hrhmacro exclude="SYMBIAN_EXCLUDE_OMA_DS_HOSTSERVERS"/>
 		</feature>
 		<feature name="Vibra" statusflags="0x00000001" uid="0x102835AE">
-			<hrhmacro include="__VIBRA"/>
+			<hrhmacro exclude="SYMBIAN_EXCLUDE_VIBRA"/>
 		</feature>
 		<feature name="AmbientLightSensor" statusflags="0x00000001" uid="0x102835AF">
-			<hrhmacro include="__SERIES60_AMBIENT_LIGHT_SENSOR"/>
+			<hrhmacro exclude="SYMBIAN_EXCLUDE_AMBIENT_LIGHT_SENSOR"/>
 		</feature>
 		<feature name="CoverDisplay" statusflags="0x00000001" uid="0x102835B0">
-			<hrhmacro include="__COVER_DISPLAY"/>
+			<hrhmacro exclude="SYMBIAN_EXCLUDE_COVER_DISPLAY"/>
 		</feature>
 		<feature name="KeypadNoSlider" statusflags="0x00000001" uid="0x102835B1">
-			<hrhmacro include="__SERIES60_KEYPAD_NO_SLIDER"/>
+			<hrhmacro exclude="SYMBIAN_EXCLUDE_KEYPAD_NO_SLIDER"/>
 		</feature>
 		<feature name="LocationManagement" statusflags="0x00000001" uid="0x10279818">
 			<hrhmacro exclude="SYMBIAN_EXCLUDE_LOCATION_MANAGEMENT"/>
@@ -119,7 +117,7 @@
 			<hrhmacro include="SYMBIAN_INCLUDE_LOCATION_API_VARIANT2"/>
 		</feature>
 		<feature name="BluetoothGPSPositioningPlugin" statusflags="0x00000000" uid="0x10285D6A">
-			<hrhmacro include="__BLUETOOTHGPSPSY"/>
+			<hrhmacro include="SYMBIAN_INCLUDE_BLUETOOTH_GPS_PM"/>
 		</feature>
 		<feature name="DefaultPositioningPlugin" statusflags="0x00000000" uid="0x10285D6B">
 			<hrhmacro include="SYMBIAN_INCLUDE_DEFAULT_PM"/>
@@ -134,16 +132,16 @@
 			<hrhmacro include="SYMBIAN_INCLUDE_LOCATION_ADVANCED_DIALOG"/>
 		</feature>
 		<feature name="CsVideoTelephony" statusflags="0x00000001" uid="0x10285A22">
-			<hrhmacro include="__CS_VIDEO_TELEPHONY"/>
+			<hrhmacro exclude="SYMBIAN_EXCLUDE_CS_VIDEO_TELEPHONY"/>
 		</feature>
 		<feature name="EmergencyCallsEnabledInOfflineMode" statusflags="0x00000001" uid="0x10285A23">
-			<hrhmacro include="__COMMON_TSY__EMERGENCY_CALLS_ENABLED_IN_OFFLINE_MODE"/>
+			<hrhmacro exclude="SYMBIAN_EXCLUDE_EMERGENCY_CALLS_ENABLED_IN_OFFLINE_MODE"/>
 		</feature>
 		<feature name="DriveModeCanRestrictMtCalls" statusflags="0x00000001" uid="0x10285A24">
-			<hrhmacro include="__DRIVE_MODE"/>
+			<hrhmacro exclude="SYMBIAN_EXCLUDE_DRIVE_MODE_CAN_RESTRICT_MT_CALLS"/>
 		</feature>
 		<feature name="FmTx" statusflags="0x00000001" uid="0x10285DD6">
- 			<hrhmacro include="FF_FMTX"/>
+ 			<hrhmacro exclude="SYMBIAN_EXCLUDE_FMTX"/>
  		</feature>
 		<!-- PREQ 2051 - Variation Support - Start -->
 		<feature name="Libxml2" statusflags="0x00000001" uid="0x10286747">