--- a/messagingapp/msgappfw/msghistory/msghistory.pro	Thu Jun 17 09:57:06 2010 +0100
+++ b/messagingapp/msgappfw/msghistory/msghistory.pro	Thu Jul 22 16:32:06 2010 +0100
@@ -17,7 +17,6 @@
 TARGET = msghistory
 DEPENDPATH += . inc src
 INCLUDEPATH += .
-INCLUDEPATH += ../../msgutils/s60qconversions/inc
 INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE
 
 DEFINES += MSGHISTORY_DLL
@@ -51,8 +50,15 @@
 				 src/msghistoryprivate.cpp \
 				 src/msgitem.cpp
 
-
+defBlock = \      
+	  "$${LITERAL_HASH}if defined(EABI)" \
+	  "DEFFILE  ../eabi/msghistory.def" \
+             "$${LITERAL_HASH}else" \
+             "DEFFILE  ../bwins/msghistory.def" \
+             "$${LITERAL_HASH}endif"
+	
+MMP_RULES += defBlock
 
 LIBS += -lcsserverclientapi \
         -lcsutils \
-        -ls60qconversions 
\ No newline at end of file
+        -lxqutils