diff -r 7d48bed6ce0c -r 987c9837762f telutils/phoneparser/group/phoneparser.mmp
--- a/telutils/phoneparser/group/phoneparser.mmp	Tue Aug 31 15:45:17 2010 +0300
+++ b/telutils/phoneparser/group/phoneparser.mmp	Wed Sep 01 12:15:03 2010 +0100
@@ -25,40 +25,39 @@
 CAPABILITY CAP_GENERAL_DLL
 
 SOURCEPATH      ../src
-SOURCE          phonegsmparser.cpp 
-SOURCE          cphonegsmparser.cpp 
-SOURCE          cphonegsmparserbase.cpp 
-SOURCE          cphonegsmparserresult.cpp 
-SOURCE          cphonegsmssparser.cpp 
-SOURCE          cphonegsmsshandler.cpp 
-SOURCE          cphonegsmsimcontrolparser.cpp 
-SOURCE          cphonegsmsimcontrolhandler.cpp 
-SOURCE          cphonegsmphonenumberparser.cpp 
-SOURCE          cphonegsmphonenumberhandler.cpp 
-SOURCE          cphonegsmoptioncontainer.cpp 
-SOURCE          cphonegsmhandlercontainer.cpp 
-SOURCE          cphonegsmdummyparser.cpp 
-SOURCE          cphonegsmmischandler.cpp 
-SOURCE          cphonegsmparsercontainer.cpp 
-SOURCE          cphonegsmsscallparser.cpp 
-SOURCE          cphonegsmsscallhandler.cpp 
-SOURCE          cphonegsmmanufacturerparser.cpp 
-SOURCE          cphonegsmmanufacturerhandler.cpp 
-SOURCE          cphonegsmpcnprocedureparser.cpp 
-SOURCE          cphonegsmpcnprocedurehandler.cpp 
-SOURCE          cphonegsmemergencynumberparser.cpp 
-SOURCE          cphonegsmemergencynumberhandler.cpp 
-SOURCE          cphoneparserfeatures.cpp 
-SOURCE          cphonevoipnumberparser.cpp 
-SOURCE          cphonevoipnumberhandler.cpp 
+SOURCE          PhoneGsmParser.cpp
+SOURCE          CPhoneGsmParser.cpp
+SOURCE          CPhoneGsmParserBase.cpp
+SOURCE          CPhoneGsmParserResult.cpp
+SOURCE          CPhoneGsmSsParser.cpp
+SOURCE          CPhoneGsmSsHandler.cpp
+SOURCE          CPhoneGsmSimControlParser.cpp
+SOURCE          CPhoneGsmSimControlHandler.cpp
+SOURCE          CPhoneGsmPhoneNumberParser.cpp
+SOURCE          CPhoneGsmPhoneNumberHandler.cpp
+SOURCE          CPhoneGsmOptionContainer.cpp
+SOURCE          CPhoneGsmHandlerContainer.cpp
+SOURCE          CPhoneGsmDummyParser.cpp
+SOURCE          CPhoneGsmMiscHandler.cpp
+SOURCE          CPhoneGsmParserContainer.cpp
+SOURCE          CPhoneGsmSsCallParser.cpp
+SOURCE          CPhoneGsmSsCallHandler.cpp
+SOURCE          CPhoneGsmManufacturerParser.cpp
+SOURCE          CPhoneGsmManufacturerHandler.cpp
+SOURCE          CPhoneGsmPcnProcedureParser.cpp
+SOURCE          CPhoneGsmPcnProcedureHandler.cpp
+SOURCE          CPhoneGsmEmergencyNumberParser.cpp
+SOURCE          CPhoneGsmEmergencyNumberHandler.cpp
+SOURCE          CPhoneParserFeatures.cpp
+SOURCE          CPhoneVoipNumberParser.cpp
+SOURCE          CPhoneVoipNumberHandler.cpp
+SOURCE          CPhoneGsmImeiParser.cpp
 
 USERINCLUDE     ../inc 
 
-// <-- QT PHONE START-->
 // Default system include paths for MW layer modules.
-MW_LAYER_SYSTEMINCLUDE  
-// <-- QT PHONE END-->
-SYSTEMINCLUDE   ../../../inc // telephonyservices internal headers 
+APP_LAYER_SYSTEMINCLUDE	//for Phone Settings domain API headers
+SYSTEMINCLUDE   ../../../inc    // Telephonyservices internal headers
 
 LIBRARY         euser.lib