diff -r f1c49de2a7ee -r 4fa861cc1ff5 sf_config/config/inc/bldpublic.hrh
--- a/sf_config/config/inc/bldpublic.hrh	Wed Apr 21 10:23:46 2010 +0100
+++ b/sf_config/config/inc/bldpublic.hrh	Wed Apr 28 09:51:11 2010 +0100
@@ -1647,12 +1647,12 @@
 /** #__LAYOUT_240_320 
 Device supports 240x320 resolution (QVGA)
 */
-#define __LAYOUT_240_320                                   
+#undef __LAYOUT_240_320                                   
 
 /** #__LAYOUT_240_320_LARGE_SCREEN 
 "Device supports 240x320 resolution (QVGA2 for larger screens, portrait)"
 */
-#define __LAYOUT_240_320_LARGE_SCREEN                      
+#undef __LAYOUT_240_320_LARGE_SCREEN                      
 
 /** #__LAYOUT_240_320_QVGA3 
 Device supports 240x320 resolution (QVGA3)
@@ -1662,12 +1662,12 @@
 /** #__LAYOUT_320_240 
 Device supports 320x240 resolution (QVGA landscape)
 */
-#define __LAYOUT_320_240                                   
+#undef __LAYOUT_320_240                                   
 
 /** #__LAYOUT_320_240_LARGE_SCREEN 
 "Device supports 320x240 resolution (QVGA2 for larger screens, landscape)"
 */
-#define __LAYOUT_320_240_LARGE_SCREEN                      
+#undef __LAYOUT_320_240_LARGE_SCREEN                      
 
 /** #__LAYOUT_320_240_QVGA3 
 Device supports 320x240 resolution (QVGA3)
@@ -1703,7 +1703,7 @@
 /** #__MEDIA_TRANSFER_PROTOCOL 
 Device supports MTP application.
 */
-#undef __MEDIA_TRANSFER_PROTOCOL                          
+#define __MEDIA_TRANSFER_PROTOCOL                          
 
 /** #__MMS_POSTCARD 
 Flag is used ro incorporate Postcard application into the release.
@@ -1747,7 +1747,7 @@
 /** #__OMA_POC 
 OMA Push-to-talk over Cellular.
 */
-#define __OMA_POC                                          
+#undef __OMA_POC                                          
 
 /** #__ON_SCREEN_DIALER 
 This flag indicates that the dialer.dll is included to the rom image and
@@ -1957,7 +1957,7 @@
 /** #__SYNCML_DM_OBEX 
 Device supports device management over OBEX.
 */
-#undef __SYNCML_DM_OBEX                                   
+#define __SYNCML_DM_OBEX                                   
 
 /** #__SYNCML_DM_OTA 
 SyncML DM OMA provisioning adapter.