--- a/src/hbservers/hbdevicedialogappserver/hbdevicedialogappserver.pro	Tue Jul 06 14:36:53 2010 +0300
+++ b/src/hbservers/hbdevicedialogappserver/hbdevicedialogappserver.pro	Wed Aug 18 10:05:37 2010 +0300
@@ -42,13 +42,16 @@
 
     TARGET.CAPABILITY = ProtServ SwEvent TrustedUI ReadDeviceData
     TARGET.UID3 = 0x20022FC5
+    MMP_RULES += SMPSAFE
     LIBS += -lapgrfx -lws32 -lavkon -lcone -leikcore -lapparc -lefsrv
 
     myrssrules = \
     "hidden = KAppIsHidden;"
     RSS_RULES += myrssrules
-    MMP_RULES += "SYSTEMINCLUDE $${EPOCROOT}epoc32/include/middleware"
-    MMP_RULES += "SYSTEMINCLUDE $${EPOCROOT}epoc32/include/mw"
+
+    exists($${EPOCROOT}epoc32/include/mw) {
+        INCLUDEPATH += $${EPOCROOT}epoc32/include/mw
+    }
 }
 
 include($${HB_SOURCE_DIR}/src/hbcore/devicedialogbase/devicedialogdebug/devicedialogtrace.pri)