diff -r e4ebb16b39ea -r 603d3f8b6302 plugins/contacts/symbian/contactsmodel/contactsmodel.pro
--- a/plugins/contacts/symbian/contactsmodel/contactsmodel.pro	Fri Sep 17 08:34:34 2010 +0300
+++ b/plugins/contacts/symbian/contactsmodel/contactsmodel.pro	Mon Oct 04 01:37:06 2010 +0300
@@ -13,7 +13,7 @@
 # Nokia Corporation - initial contribution.
 #
 # Contributors:
-# 
+#
 # Description:
 #
 #
@@ -24,7 +24,10 @@
                              "./group/cntview.mmp"\
                              "./group/template.mmp"\
                              "./groupsql/cntsrv.mmp"\
-                             "./groupsql/cntplsql.mmp"
+                             "./groupsql/cntplsql.mmp"\
+                             "./cntmatchlog/group/cntmatchlog.mmp"\
+                             "./cntvcard/cntvcard.mmp"\
+                             "./cntphone/cntphone.mmp"
 
 # Exports
 deploy.path = /
@@ -34,28 +37,30 @@
 iby.sources = cntmodel.iby cntplsql.iby
 
 for(iby, iby.sources):BLD_INF_RULES.prj_exports += "groupsql/$$iby $$deploy.path$$iby.path/$$iby"
+BLD_INF_RULES.prj_exports += "cntmatchlog/group/cntmatchlog.iby $$deploy.path$$iby.path/cntmatchlog.iby"
 
 # Headers
-headers.path = epoc32/include
-headers.sources = inc/cntdef.h\
-                  inc/cntdb.h\
-                  inc/cntdbobs.h\
-                  inc/cntfield.h\
-                  inc/cntfldst.h\
-                  inc/cntfilt.h\ 
-                  inc/cntitem.h\ 
-                  inc/cntview.h\
-                  inc/cntviewbase.h\
-                  inc/cntsync.h\
-                  inc/cntviewfindconfig.h\
-                  inc/cntviewfindconfig.inl\
-                  inc/cntviewsortplugin.h\
-                  inc/cntmodel.rh\
-                  inc/cntdef.hrh\
-                  inc/cntviewstore.h\
-                  inc/cntpredictivesearch.h\
-                  cntvcard/cntvcard.h\
-                 
+BLD_INF_RULES.prj_exports += "./inc/cntdef.h              /epoc32/include/cntdef.h"\
+                             "./inc/cntdb.h               /epoc32/include/cntdb.h"\
+                             "./inc/cntdbobs.h            /epoc32/include/cntdbobs.h"\
+                             "./inc/cntfield.h            /epoc32/include/cntfield.h"\
+                             "./inc/cntfldst.h            /epoc32/include/cntfldst.h"\
+                             "./inc/cntfilt.h             /epoc32/include/cntfilt.h"\
+                             "./inc/cntitem.h             /epoc32/include/cntitem.h"\
+                             "./inc/cntview.h             /epoc32/include/cntview.h"\
+                             "./inc/cntviewbase.h         /epoc32/include/cntviewbase.h"\
+                             "./inc/cntsync.h             /epoc32/include/cntsync.h"\
+                             "./inc/cntviewfindconfig.h   /epoc32/include/cntviewfindconfig.h"\
+                             "./inc/cntviewfindconfig.inl /epoc32/include/cntviewfindconfig.inl"\
+                             "./inc/cntviewsortplugin.h   /epoc32/include/cntviewsortplugin.h"\
+                             "./inc/cntmodel.rh           /epoc32/include/cntmodel.rh"\
+                             "./inc/cntdef.hrh            /epoc32/include/cntdef.hrh"\
+                             "./cntvcard/cntvcard.h       /epoc32/include/cntvcard.h"\
+                             "./inc/cntviewstore.h        /epoc32/include/cntviewstore.h"
 
-for(header, headers.sources):BLD_INF_RULES.prj_exports += "$$header $$deploy.path$$headers.path/$$basename(header)"
+BLD_INF_RULES.prj_exports += "./inc/cntphonenumparser.h APP_LAYER_PLATFORM_EXPORT_PATH(cntphonenumparser.h)"\
+                             "./inc/cntviewsortpluginbase.h APP_LAYER_PLATFORM_EXPORT_PATH(cntviewsortpluginbase.h)"\
+                             "./inc/cntsyncecom.h APP_LAYER_PLATFORM_EXPORT_PATH(cntsyncecom.h)"\
+                             "./inc/cntconvertercallback.h APP_LAYER_PLATFORM_EXPORT_PATH(cntconvertercallback.h)"\
+                             "./inc/cntdb_internal.h APP_LAYER_PLATFORM_EXPORT_PATH(cntdb_internal.h)"