diff -r ebfee66fde93 -r 84197e66a4bd messagingappbase/obexmtms/Rom/obex.hby
--- a/messagingappbase/obexmtms/Rom/obex.hby	Fri Jun 04 10:25:39 2010 +0100
+++ b/messagingappbase/obexmtms/Rom/obex.hby	Fri Jun 11 13:35:48 2010 +0300
@@ -20,17 +20,17 @@
 REM Messaging OBEX MTM is not included in this ROM, because it depends on excluded OBEX
 #else
 
-#ifdef SYMBIAN_EXCLUDE_INFRARED
+#ifndef __IRDA 
 REM Infrared watcher is not included in this ROM, because it depends on excluded INFRARED
 #else
 data=MULTI_LINGUIFY(RSC ZSYSTEM\Data\irwatcher		System\Data\irwatcher)
-#endif // SYMBIAN_EXCLUDE_INFRARED
+#endif // __IRDA
 
-#ifdef SYMBIAN_EXCLUDE_BLUETOOTH
+#ifndef __BT
 REM Bluetooth watcher is not included in this ROM, because it depends on excluded BLUETOOTH
 #else
 REM data=MULTI_LINGUIFY(RSC ZSYSTEM\Data\btwatcher		System\Data\btwatcher)
-#endif // SYMBIAN_EXCLUDE_BLUETOOTH
+#endif // __BT
 
 #endif // SYMBIAN_EXCLUDE_OBEX