diff -r bad0cc58d154 -r c74b3d9f6b9e eapol/eapol_framework/eapol_symbian/group/eapmschapv2.mmp
--- a/eapol/eapol_framework/eapol_symbian/group/eapmschapv2.mmp	Tue Aug 31 15:16:37 2010 +0300
+++ b/eapol/eapol_framework/eapol_symbian/group/eapmschapv2.mmp	Wed Sep 01 12:23:57 2010 +0100
@@ -16,7 +16,7 @@
 */
 
 /*
-* %version: 15.1.14 %
+* %version: 18 %
 */
 
 #include <platform_paths.hrh>
@@ -29,8 +29,6 @@
 TARGET        eapmschapv2.dll
 UID	          0x10009d8d 0x101F8E66
 
-deffile eapmschapv2.def
-
 SOURCEPATH    ../am/type/mschapv2/symbian/plugin/src
 
 START RESOURCE 101F8E66.rss 
@@ -60,6 +58,16 @@
 	SOURCE		  eap_type_mschapv2_server.cpp
 #endif
 
+SOURCEPATH    ../am/common/symbian
+SOURCE		  eap_am_trace_symbian.cpp
+
+SOURCEPATH    ../am/type/mschapv2/symbian/plugin/src
+SOURCE		  EapMsChapV2UiConnection.cpp
+SOURCE        EapMsChapV2UiDataConnection.cpp
+SOURCE        EapMsChapV2UiMsChapV2Data.cpp
+LIBRARY       avkon.lib
+STATICLIBRARY	eapmschapv2ui.lib
+
 USERINCLUDE   ../am/type/mschapv2/symbian/plugin/inc
 USERINCLUDE   ../../eapol_common/type/mschapv2/include
 USERINCLUDE   ../../eapol_common/include
@@ -67,14 +75,16 @@
 USERINCLUDE   ../../eapol_common/am/include
 USERINCLUDE	  ../am/type/symbian/plugin/include
 USERINCLUDE   ../../eapol_common/type
-USERINCLUDE   ../am/eap_notifier/inc
+
+//SYSTEMINCLUDE /epoc32/include/ecom
+//SYSTEMINCLUDE /epoc32/include/libc
+//SYSTEMINCLUDE /epoc32/include/cshelp
 
 MW_LAYER_SYSTEMINCLUDE // For the MiddleWare domain headers.
 
 LIBRARY     euser.lib
 LIBRARY		ecom.lib
-LIBRARY     eaptools.lib eaptrace.lib
-LIBRARY     eapsymbiantools.lib
+LIBRARY     eapol.lib
 LIBRARY     edbms.lib
 LIBRARY     efsrv.lib
 LIBRARY     cone.lib
@@ -86,14 +96,8 @@
 LIBRARY     hlplch.lib
 LIBRARY		featmgr.lib
 
-LIBRARY		HbCore.lib
-LIBRARY		HbWidgets.lib
-LIBRARY   eap_notifier.lib
-
 LANG		  SC
 
-
-
 //-------------------------------------------------------------------
 
 //-------------------------------------------------------------------