--- a/symbian3/sdkFiles.txt	Thu Jul 01 19:16:58 2010 +0100
+++ b/symbian3/sdkFiles.txt	Fri Jul 02 13:58:40 2010 +0100
@@ -5,17 +5,34 @@
 epoc32/include/a3f/mmfaudiosvrservice.hrh
 epoc32/include/a3f/mmfaudiosvruids.hrh
 epoc32/include/a3f/mmfdevsoundcustominterfaceextensions.hrh
-epoc32/include/AccMonitor.h
-epoc32/include/AccMonitorCapabilities.h
-epoc32/include/AccMonitorInfo.h
-epoc32/include/AccMonitorInfo.inl
+epoc32/include/about.mbg
+epoc32/include/aboutgsplugin.mbg
+epoc32/include/accmonitor.h
+epoc32/include/accmonitorcapabilities.h
+epoc32/include/accmonitorinfo.h
+epoc32/include/accmonitorinfo.inl
+epoc32/include/acpicons.mbg
+epoc32/include/activeidle2.mbg
+epoc32/include/activepalette2graphics.mbg
 epoc32/include/advancedpointerevent.h
+epoc32/include/advancedpointerevent.inl
 epoc32/include/agentdialog.h
+epoc32/include/aicalendarplugin2.mbg
 epoc32/include/aiftool.rh
+epoc32/include/aimcsplugin.mbg
+epoc32/include/aiwcommon.hrh
+epoc32/include/aiwgenericparam.hrh
+epoc32/include/aknfepuictrls.mbg
+epoc32/include/aknlayout.lag
+epoc32/include/aknmemorycardui.mbg
+epoc32/include/ALL_SDK.txt
+epoc32/include/animationcmd.h
+epoc32/include/aol_brand_graphics.mbg
+epoc32/include/apcontrollistplugin.mbg
 epoc32/include/apmrec.h
 epoc32/include/apmrec.inl
 epoc32/include/apmstd.h
-epoc32/include/app/BCardEng.h
+epoc32/include/app/bcardeng.h
 epoc32/include/app/btmsgtypeuid.h
 epoc32/include/app/cacheman.h
 epoc32/include/app/calalarm.h
@@ -29,7 +46,7 @@
 epoc32/include/app/caldataexchange.h
 epoc32/include/app/caldataformat.h
 epoc32/include/app/calendarconverter.h
-epoc32/include/app/CalenInterimUtils2.h
+epoc32/include/app/caleninterimutils2.h
 epoc32/include/app/calentry.h
 epoc32/include/app/calentryview.h
 epoc32/include/app/calfilechangenotification.h
@@ -46,9 +63,9 @@
 epoc32/include/app/cemailaccounts.h
 epoc32/include/app/cimattachmentwaiter.h
 epoc32/include/app/cimplainbodytext.h
-epoc32/include/app/CLmkCategorySelectorDlg.h
-epoc32/include/app/CLmkEditorDlg.h
-epoc32/include/app/CLmkLandmarkSelectorDlg.h
+epoc32/include/app/clmkcategoryselectordlg.h
+epoc32/include/app/clmkeditordlg.h
+epoc32/include/app/clmklandmarkselectordlg.h
 epoc32/include/app/cmmsaccounts.h
 epoc32/include/app/cmmssettings.h
 epoc32/include/app/cntdb.h
@@ -64,61 +81,61 @@
 epoc32/include/app/cntviewbase.h
 epoc32/include/app/cntviewsortplugin.h
 epoc32/include/app/cobexsendoperation.h
-epoc32/include/app/CPbk2SortOrderManager.h
-epoc32/include/app/CPbk2ViewState.h
-epoc32/include/app/CPbkAddressSelect.h
-epoc32/include/app/CPbkContactChangeNotifier.h
-epoc32/include/app/CPbkContactEditorDlg.h
-epoc32/include/app/CPbkContactEngine.h
-epoc32/include/app/CPbkContactItem.h
-epoc32/include/app/CPbkContactIter.h
-epoc32/include/app/CPbkDataSaveAppUi.h
-epoc32/include/app/CPbkEmailAddressSelect.h
-epoc32/include/app/CPbkEmailOverSmsAddressSelect.h
-epoc32/include/app/CPbkFieldInfo.h
-epoc32/include/app/CPbkFieldsInfo.h
-epoc32/include/app/CPbkIdleFinder.h
-epoc32/include/app/CPbkMemoryEntryAddItemDlg.h
-epoc32/include/app/CPbkMmsAddressSelect.h
-epoc32/include/app/CPbkMultipleEntryFetchDlg.h
-epoc32/include/app/CPbkPhoneNumberSelect.h
-epoc32/include/app/CPbkPhoneNumberSelectBase.h
-epoc32/include/app/CPbkPocAddressSelect.h
-epoc32/include/app/CPbkSelectFieldDlg.h
-epoc32/include/app/CPbkSingleEntryFetchDlg.h
-epoc32/include/app/CPbkSingleItemFetchDlg.h
-epoc32/include/app/CPbkSmsAddressSelect.h
-epoc32/include/app/CPbkVideoNumberSelect.h
-epoc32/include/app/CPbkViewState.h
-epoc32/include/app/CPbkVoipAddressSelect.h
-epoc32/include/app/CRichBio.h
+epoc32/include/app/cpbk2sortordermanager.h
+epoc32/include/app/cpbk2viewstate.h
+epoc32/include/app/cpbkaddressselect.h
+epoc32/include/app/cpbkcontactchangenotifier.h
+epoc32/include/app/cpbkcontacteditordlg.h
+epoc32/include/app/cpbkcontactengine.h
+epoc32/include/app/cpbkcontactitem.h
+epoc32/include/app/cpbkcontactiter.h
+epoc32/include/app/cpbkdatasaveappui.h
+epoc32/include/app/cpbkemailaddressselect.h
+epoc32/include/app/cpbkemailoversmsaddressselect.h
+epoc32/include/app/cpbkfieldinfo.h
+epoc32/include/app/cpbkfieldsinfo.h
+epoc32/include/app/cpbkidlefinder.h
+epoc32/include/app/cpbkmemoryentryadditemdlg.h
+epoc32/include/app/cpbkmmsaddressselect.h
+epoc32/include/app/cpbkmultipleentryfetchdlg.h
+epoc32/include/app/cpbkphonenumberselect.h
+epoc32/include/app/cpbkphonenumberselectbase.h
+epoc32/include/app/cpbkpocaddressselect.h
+epoc32/include/app/cpbkselectfielddlg.h
+epoc32/include/app/cpbksingleentryfetchdlg.h
+epoc32/include/app/cpbksingleitemfetchdlg.h
+epoc32/include/app/cpbksmsaddressselect.h
+epoc32/include/app/cpbkvideonumberselect.h
+epoc32/include/app/cpbkviewstate.h
+epoc32/include/app/cpbkvoipaddressselect.h
+epoc32/include/app/crichbio.h
 epoc32/include/app/csmsaccount.h
 epoc32/include/app/csmsemailfields.h
-epoc32/include/app/CVPbkContactCopier.h
-epoc32/include/app/CVPbkContactFieldIterator.h
-epoc32/include/app/CVPbkContactIdConverter.h
-epoc32/include/app/CVPbkContactLinkArray.h
-epoc32/include/app/CVPbkContactManager.h
-epoc32/include/app/CVPbkContactStoreUriArray.h
-epoc32/include/app/CVPbkContactViewDefinition.h
-epoc32/include/app/CVPbkDefaultAttribute.h
-epoc32/include/app/CVPbkFieldFilter.h
-epoc32/include/app/CVPbkFieldTypeIterator.h
-epoc32/include/app/CVPbkFieldTypeRefsList.h
-epoc32/include/app/CVPbkFieldTypeSelector.h
-epoc32/include/app/CVPbkFilteredContactView.h
-epoc32/include/app/CVPbkPhoneNumberMatchStrategy.h
-epoc32/include/app/CVPbkSortOrder.h
-epoc32/include/app/CVPbkSpeedDialAttribute.h
-epoc32/include/app/CVPbkTopContactManager.h
-epoc32/include/app/CVPbkVCardEng.h
-epoc32/include/app/CVPbkVoiceTagAttribute.h
-epoc32/include/app/CVPbkxSPContacts.h
+epoc32/include/app/cvpbkcontactcopier.h
+epoc32/include/app/cvpbkcontactfielditerator.h
+epoc32/include/app/cvpbkcontactidconverter.h
+epoc32/include/app/cvpbkcontactlinkarray.h
+epoc32/include/app/cvpbkcontactmanager.h
+epoc32/include/app/cvpbkcontactstoreuriarray.h
+epoc32/include/app/cvpbkcontactviewdefinition.h
+epoc32/include/app/cvpbkdefaultattribute.h
+epoc32/include/app/cvpbkfieldfilter.h
+epoc32/include/app/cvpbkfieldtypeiterator.h
+epoc32/include/app/cvpbkfieldtyperefslist.h
+epoc32/include/app/cvpbkfieldtypeselector.h
+epoc32/include/app/cvpbkfilteredcontactview.h
+epoc32/include/app/cvpbkphonenumbermatchstrategy.h
+epoc32/include/app/cvpbksortorder.h
+epoc32/include/app/cvpbkspeeddialattribute.h
+epoc32/include/app/cvpbktopcontactmanager.h
+epoc32/include/app/cvpbkvcardeng.h
+epoc32/include/app/cvpbkvoicetagattribute.h
+epoc32/include/app/cvpbkxspcontacts.h
 epoc32/include/app/dbwriter.h
 epoc32/include/app/emailobserverinterface.hrh
 epoc32/include/app/emailobserverplugin.h
 epoc32/include/app/emailobserverplugin.inl
-epoc32/include/app/ExtendedMTMIDS.hrh
+epoc32/include/app/extendedmtmids.hrh
 epoc32/include/app/hlplch.h
 epoc32/include/app/hlpmodel.h
 epoc32/include/app/hlpzoom.h
@@ -126,8 +143,14 @@
 epoc32/include/app/imapcmds.h
 epoc32/include/app/imapconnectionobserver.h
 epoc32/include/app/imapset.h
+epoc32/include/app/imclient.h
 epoc32/include/app/imcmmain.h
+epoc32/include/app/imconnection.h
+epoc32/include/app/imconnection.inl
 epoc32/include/app/imcvcodc.h
+epoc32/include/app/imerrors.h
+epoc32/include/app/imlauncherplugin.h
+epoc32/include/app/imlauncherplugin.inl
 epoc32/include/app/impcmtm.h
 epoc32/include/app/imsk.h
 epoc32/include/app/irmsgtypeuid.h
@@ -138,7 +161,7 @@
 epoc32/include/app/memailmailboxdata.h
 epoc32/include/app/memailmessagedata.h
 epoc32/include/app/memailobserverlistener.h
-epoc32/include/app/MessagingSDKCRKeys.h
+epoc32/include/app/messagingsdkcrkeys.h
 epoc32/include/app/miut_err.h
 epoc32/include/app/miutatch.h
 epoc32/include/app/miutconv.h
@@ -153,101 +176,101 @@
 epoc32/include/app/mmsconst.h
 epoc32/include/app/mmserrors.h
 epoc32/include/app/mmsgbiocontrol.h
-epoc32/include/app/MMsgBioControlExtension.h
-epoc32/include/app/MNcnNotification.h
-epoc32/include/app/MNcnNotification.inl
-epoc32/include/app/MPbk2ContactNameFormatter.h
-epoc32/include/app/MPbk2ContactNameFormatter2.h
-epoc32/include/app/MPbk2FieldProperty.h
-epoc32/include/app/MPbk2FieldProperty2.h
-epoc32/include/app/MPbk2FieldPropertyArray.h
-epoc32/include/app/MPbk2FieldPropertyArray2.h
-epoc32/include/app/MPbkContactDbObserver.h
-epoc32/include/app/MPbkEditorOkToExitCallback.h
-epoc32/include/app/MPbkFetchCallbacks.h
-epoc32/include/app/MPbkFetchDlgSelection.h
-epoc32/include/app/MPbkFieldData.h
-epoc32/include/app/MPbkThumbnailOperationObservers.h
+epoc32/include/app/mmsgbiocontrolextension.h
+epoc32/include/app/mncnnotification.h
+epoc32/include/app/mncnnotification.inl
+epoc32/include/app/mpbk2contactnameformatter.h
+epoc32/include/app/mpbk2contactnameformatter2.h
+epoc32/include/app/mpbk2fieldproperty.h
+epoc32/include/app/mpbk2fieldproperty2.h
+epoc32/include/app/mpbk2fieldpropertyarray.h
+epoc32/include/app/mpbk2fieldpropertyarray2.h
+epoc32/include/app/mpbkcontactdbobserver.h
+epoc32/include/app/mpbkeditoroktoexitcallback.h
+epoc32/include/app/mpbkfetchcallbacks.h
+epoc32/include/app/mpbkfetchdlgselection.h
+epoc32/include/app/mpbkfielddata.h
+epoc32/include/app/mpbkthumbnailoperationobservers.h
 epoc32/include/app/msgbiocontrol.h
-epoc32/include/app/msgbiocontrolObserver.h
-epoc32/include/app/MsgBioUids.h
-epoc32/include/app/MsgEditor.hrh
-epoc32/include/app/MVPbkBaseContact.h
-epoc32/include/app/MVPbkBaseContactField.h
-epoc32/include/app/MVPbkBaseContactFieldCollection.h
-epoc32/include/app/MVPbkBatchOperationObserver.h
-epoc32/include/app/MVPbkContactAttribute.h
-epoc32/include/app/MVPbkContactAttributeManager.h
-epoc32/include/app/MVPbkContactBookmark.h
-epoc32/include/app/MVPbkContactBookmarkCollection.h
-epoc32/include/app/MVPbkContactCopyObserver.h
-epoc32/include/app/MVPbkContactFieldBinaryData.h
-epoc32/include/app/MVPbkContactFieldData.h
-epoc32/include/app/MVPbkContactFieldDateTimeData.h
-epoc32/include/app/MVPbkContactFieldOrdering.h
-epoc32/include/app/MVPbkContactFieldSelector.h
-epoc32/include/app/MVPbkContactFieldTextData.h
-epoc32/include/app/MVPbkContactFieldUriData.h
-epoc32/include/app/MVPbkContactFindFromStoresObserver.h
-epoc32/include/app/MVPbkContactFindObserver.h
-epoc32/include/app/MVPbkContactGroup.h
-epoc32/include/app/MVPbkContactLink.h
-epoc32/include/app/MVPbkContactLinkArray.h
-epoc32/include/app/MVPbkContactLinkPacking.h
-epoc32/include/app/MVPbkContactObserver.h
-epoc32/include/app/MVPbkContactOperation.h
-epoc32/include/app/MVPbkContactOperationBase.h
-epoc32/include/app/MVPbkContactOperationFactory.h
-epoc32/include/app/MVPbkContactOperationFactory2.h
-epoc32/include/app/MVPbkContactSelector.h
-epoc32/include/app/MVPbkContactStore.h
-epoc32/include/app/MVPbkContactStore2.h
-epoc32/include/app/MVPbkContactStoreInfo.h
-epoc32/include/app/MVPbkContactStoreList.h
-epoc32/include/app/MVPbkContactStoreListObserver.h
-epoc32/include/app/MVPbkContactStoreObserver.h
-epoc32/include/app/MVPbkContactStoreProperties.h
-epoc32/include/app/MVPbkContactStoreProperties2.h
-epoc32/include/app/MVPbkContactView.h
-epoc32/include/app/MVPbkContactViewBase.h
-epoc32/include/app/MVPbkContactViewBaseChildAccessExtension.h
-epoc32/include/app/MVPbkContactViewFiltering.h
-epoc32/include/app/MVPbkContactViewObserver.h
-epoc32/include/app/MVPbkExpandable.h
-epoc32/include/app/MVPbkFieldType.h
-epoc32/include/app/MVPbkFieldTypeSelector.h
-epoc32/include/app/MVPbkObjectHierarchy.h
-epoc32/include/app/MVPbkOperationObserver.h
-epoc32/include/app/MVPbkSingleContactLinkOperationObserver.h
-epoc32/include/app/MVPbkSingleContactOperationObserver.h
-epoc32/include/app/MVPbkStoreContact.h
-epoc32/include/app/MVPbkStoreContact2.h
-epoc32/include/app/MVPbkStoreContactField.h
-epoc32/include/app/MVPbkStoreContactField2.h
-epoc32/include/app/MVPbkStoreContactFieldCollection.h
-epoc32/include/app/MVPbkStoreContactProperties.h
-epoc32/include/app/MVPbkStreamable.h
-epoc32/include/app/MVPbkViewContact.h
-epoc32/include/app/MVPbkViewContactField.h
-epoc32/include/app/MVPbkViewContactFieldCollection.h
-epoc32/include/app/NpdApi.h
+epoc32/include/app/msgbiocontrolobserver.h
+epoc32/include/app/msgbiouids.h
+epoc32/include/app/msgeditor.hrh
+epoc32/include/app/mvpbkbasecontact.h
+epoc32/include/app/mvpbkbasecontactfield.h
+epoc32/include/app/mvpbkbasecontactfieldcollection.h
+epoc32/include/app/mvpbkbatchoperationobserver.h
+epoc32/include/app/mvpbkcontactattribute.h
+epoc32/include/app/mvpbkcontactattributemanager.h
+epoc32/include/app/mvpbkcontactbookmark.h
+epoc32/include/app/mvpbkcontactbookmarkcollection.h
+epoc32/include/app/mvpbkcontactcopyobserver.h
+epoc32/include/app/mvpbkcontactfieldbinarydata.h
+epoc32/include/app/mvpbkcontactfielddata.h
+epoc32/include/app/mvpbkcontactfielddatetimedata.h
+epoc32/include/app/mvpbkcontactfieldordering.h
+epoc32/include/app/mvpbkcontactfieldselector.h
+epoc32/include/app/mvpbkcontactfieldtextdata.h
+epoc32/include/app/mvpbkcontactfielduridata.h
+epoc32/include/app/mvpbkcontactfindfromstoresobserver.h
+epoc32/include/app/mvpbkcontactfindobserver.h
+epoc32/include/app/mvpbkcontactgroup.h
+epoc32/include/app/mvpbkcontactlink.h
+epoc32/include/app/mvpbkcontactlinkarray.h
+epoc32/include/app/mvpbkcontactlinkpacking.h
+epoc32/include/app/mvpbkcontactobserver.h
+epoc32/include/app/mvpbkcontactoperation.h
+epoc32/include/app/mvpbkcontactoperationbase.h
+epoc32/include/app/mvpbkcontactoperationfactory.h
+epoc32/include/app/mvpbkcontactoperationfactory2.h
+epoc32/include/app/mvpbkcontactselector.h
+epoc32/include/app/mvpbkcontactstore.h
+epoc32/include/app/mvpbkcontactstore2.h
+epoc32/include/app/mvpbkcontactstoreinfo.h
+epoc32/include/app/mvpbkcontactstorelist.h
+epoc32/include/app/mvpbkcontactstorelistobserver.h
+epoc32/include/app/mvpbkcontactstoreobserver.h
+epoc32/include/app/mvpbkcontactstoreproperties.h
+epoc32/include/app/mvpbkcontactstoreproperties2.h
+epoc32/include/app/mvpbkcontactview.h
+epoc32/include/app/mvpbkcontactviewbase.h
+epoc32/include/app/mvpbkcontactviewbasechildaccessextension.h
+epoc32/include/app/mvpbkcontactviewfiltering.h
+epoc32/include/app/mvpbkcontactviewobserver.h
+epoc32/include/app/mvpbkexpandable.h
+epoc32/include/app/mvpbkfieldtype.h
+epoc32/include/app/mvpbkfieldtypeselector.h
+epoc32/include/app/mvpbkobjecthierarchy.h
+epoc32/include/app/mvpbkoperationobserver.h
+epoc32/include/app/mvpbksinglecontactlinkoperationobserver.h
+epoc32/include/app/mvpbksinglecontactoperationobserver.h
+epoc32/include/app/mvpbkstorecontact.h
+epoc32/include/app/mvpbkstorecontact2.h
+epoc32/include/app/mvpbkstorecontactfield.h
+epoc32/include/app/mvpbkstorecontactfield2.h
+epoc32/include/app/mvpbkstorecontactfieldcollection.h
+epoc32/include/app/mvpbkstorecontactproperties.h
+epoc32/include/app/mvpbkstreamable.h
+epoc32/include/app/mvpbkviewcontact.h
+epoc32/include/app/mvpbkviewcontactfield.h
+epoc32/include/app/mvpbkviewcontactfieldcollection.h
+epoc32/include/app/npdapi.h
 epoc32/include/app/obexheaderlist.h
-epoc32/include/app/Pbk2ContactNameFormatterFactory.h
-epoc32/include/app/Pbk2FieldPropertiesFactory.h
-epoc32/include/app/Pbk2FieldProperty.hrh
-epoc32/include/app/Pbk2IconId.hrh
-epoc32/include/app/Pbk2IconId.rh
-epoc32/include/app/Pbk2ViewId.hrh
-epoc32/include/app/PbkDataSaveAppUi.hrh
-epoc32/include/app/PbkFields.hrh
-epoc32/include/app/PbkIconId.hrh
-epoc32/include/app/PbkIconInfo.h
+epoc32/include/app/pbk2contactnameformatterfactory.h
+epoc32/include/app/pbk2fieldpropertiesfactory.h
+epoc32/include/app/pbk2fieldproperty.hrh
+epoc32/include/app/pbk2iconid.hrh
+epoc32/include/app/pbk2iconid.rh
+epoc32/include/app/pbk2viewid.hrh
+epoc32/include/app/pbkdatasaveappui.hrh
+epoc32/include/app/pbkfields.hrh
+epoc32/include/app/pbkiconid.hrh
+epoc32/include/app/pbkiconinfo.h
 epoc32/include/app/phbksync.h
 epoc32/include/app/pop3cmds.h
 epoc32/include/app/pop3set.h
 epoc32/include/app/popcmtm.h
-epoc32/include/app/RPbkViewResourceFile.h
-epoc32/include/app/RVPbkContactFieldDefaultPriorities.h
+epoc32/include/app/rpbkviewresourcefile.h
+epoc32/include/app/rvpbkcontactfielddefaultpriorities.h
 epoc32/include/app/smcmmain.h
 epoc32/include/app/smsclnt.h
 epoc32/include/app/smscmds.h
@@ -258,16 +281,16 @@
 epoc32/include/app/smuthdr.h
 epoc32/include/app/smutset.h
 epoc32/include/app/smutsimparam.h
-epoc32/include/app/SpdiaControl.h
-epoc32/include/app/TLmkItemIdDbCombiInfo.h
-epoc32/include/app/TPbk2IconId.h
-epoc32/include/app/TPbkContactItemField.h
-epoc32/include/app/TVPbkContactStoreUriPtr.h
-epoc32/include/app/TVPbkFieldTypeMapping.h
-epoc32/include/app/TVPbkFieldTypeParameters.h
-epoc32/include/app/TVPbkFieldVersitProperty.h
-epoc32/include/app/TVPbkStoreContactAnalyzer.h
-epoc32/include/app/TVPbkWordParserCallbackParam.h
+epoc32/include/app/spdiacontrol.h
+epoc32/include/app/tlmkitemiddbcombiinfo.h
+epoc32/include/app/tpbk2iconid.h
+epoc32/include/app/tpbkcontactitemfield.h
+epoc32/include/app/tvpbkcontactstoreuriptr.h
+epoc32/include/app/tvpbkfieldtypemapping.h
+epoc32/include/app/tvpbkfieldtypeparameters.h
+epoc32/include/app/tvpbkfieldversitproperty.h
+epoc32/include/app/tvpbkstorecontactanalyzer.h
+epoc32/include/app/tvpbkwordparsercallbackparam.h
 epoc32/include/app/vcal.h
 epoc32/include/app/vcal.inl
 epoc32/include/app/vcard.h
@@ -276,17 +299,17 @@
 epoc32/include/app/versit.inl
 epoc32/include/app/versittls.h
 epoc32/include/app/vobserv.h
-epoc32/include/app/VPbkContactStoreUris.h
-epoc32/include/app/VPbkContactView.hrh
-epoc32/include/app/VPbkContactView.rh
-epoc32/include/app/VPbkContactViewFilterBuilder.h
-epoc32/include/app/VPbkError.h
-epoc32/include/app/VPbkFieldType.hrh
-epoc32/include/app/VPbkFieldType.rh
-epoc32/include/app/VPbkFieldTypeSelectorFactory.h
-epoc32/include/app/VPbkPublicUid.h
-epoc32/include/app/VPbkSyncConstants.h
-epoc32/include/app/VPbkUtils.h
+epoc32/include/app/vpbkcontactstoreuris.h
+epoc32/include/app/vpbkcontactview.hrh
+epoc32/include/app/vpbkcontactview.rh
+epoc32/include/app/vpbkcontactviewfilterbuilder.h
+epoc32/include/app/vpbkerror.h
+epoc32/include/app/vpbkfieldtype.hrh
+epoc32/include/app/vpbkfieldtype.rh
+epoc32/include/app/vpbkfieldtypeselectorfactory.h
+epoc32/include/app/vpbkpublicuid.h
+epoc32/include/app/vpbksyncconstants.h
+epoc32/include/app/vpbkutils.h
 epoc32/include/app/vprop.h
 epoc32/include/app/vprop.inl
 epoc32/include/app/vrecur.h
@@ -296,57 +319,34 @@
 epoc32/include/app/vuid.h
 epoc32/include/app/vutil.h
 epoc32/include/appinfo.rh
+epoc32/include/appmngr2.mbg
+epoc32/include/appmngr2midlet.mbg
+epoc32/include/appmngr2sisx.mbg
+epoc32/include/appmngr2widget.mbg
+epoc32/include/apsettings.mbg
+epoc32/include/apsettingsplugin.mbg
 epoc32/include/arp_hdr.h
 epoc32/include/asn1cons.h
 epoc32/include/asn1dec.h
 epoc32/include/asn1enc.h
-epoc32/include/assp/omap3530_assp/assp.mmh
-epoc32/include/assp/omap3530_assp/CyAsSymbianStorageDriver.h
-epoc32/include/assp/omap3530_assp/gpio.h
-epoc32/include/assp/omap3530_assp/locks.h
-epoc32/include/assp/omap3530_assp/omap3530_assp_priv.h
-epoc32/include/assp/omap3530_assp/omap3530_asspreg.h
-epoc32/include/assp/omap3530_assp/omap3530_gpio.h
-epoc32/include/assp/omap3530_assp/omap3530_hardware_base.h
-epoc32/include/assp/omap3530_assp/omap3530_i2c.h
-epoc32/include/assp/omap3530_assp/omap3530_i2creg.h
-epoc32/include/assp/omap3530_assp/omap3530_irqmap.h
-epoc32/include/assp/omap3530_assp/omap3530_ktrace.h
-epoc32/include/assp/omap3530_assp/omap3530_prcm.h
-epoc32/include/assp/omap3530_assp/omap3530_timer.h
-epoc32/include/assp/omap3530_assp/omap3530_uart.h
-epoc32/include/assp/omap3530_assp/omap3530_usbc.h
-epoc32/include/assp/omap3530_shared/omap3_mstick.h
-epoc32/include/assp/omap3530_shared/tps65950.h
-epoc32/include/assp/omap3530_shared/tps65950_registers.h
+epoc32/include/aspsyncutil.mbg
 epoc32/include/asymmetric.h
 epoc32/include/asymmetric.inl
 epoc32/include/asymmetrickeys.h
-epoc32/include/ataudioeventapi.h
-epoc32/include/AudioEffectBase.h
-epoc32/include/AudioEffectData.h
-epoc32/include/AudioEqualizerBase.h
-epoc32/include/AudioEqualizerData.h
-epoc32/include/AudioEqualizerUtility.h
-epoc32/include/AudioEqualizerUtilityData.h
+epoc32/include/audioeffectbase.h
+epoc32/include/audioeffectdata.h
+epoc32/include/audioequalizerbase.h
+epoc32/include/audioequalizerdata.h
+epoc32/include/audioequalizerutility.h
+epoc32/include/audioequalizerutilitydata.h
+epoc32/include/audiofetcher.mbg
+epoc32/include/audiomessage.mbg
 epoc32/include/authority16.h
 epoc32/include/authority8.h
 epoc32/include/authoritycommon.h
-epoc32/include/authserver/aspubsubdefs.h
-epoc32/include/authserver/auth_srv_errs.h
-epoc32/include/authserver/authclient.h
-epoc32/include/authserver/authexpression.h
-epoc32/include/authserver/authexpression.inl
-epoc32/include/authserver/authmgrclient.h
-epoc32/include/authserver/authplugininterface.h
-epoc32/include/authserver/authtypes.h
-epoc32/include/authserver/idandstring.h
-epoc32/include/authserver/identity.h
-epoc32/include/authserver/plugindesc.h
-epoc32/include/authserver/plugindesc.inl
-epoc32/include/authserver/protectionkey.h
+epoc32/include/authtypeplugin.mbg
+epoc32/include/autolock.mbg
 epoc32/include/avkon.mbg
-epoc32/include/avkon.rsg
 epoc32/include/babackup.h
 epoc32/include/babitflags.h
 epoc32/include/bacell.h
@@ -370,19 +370,15 @@
 epoc32/include/barsread2.h
 epoc32/include/basched.h
 epoc32/include/baspi.h
-epoc32/include/BassBoostBase.h
-epoc32/include/BassBoostData.h
+epoc32/include/bassboostbase.h
+epoc32/include/bassboostdata.h
 epoc32/include/bassnd.h
+epoc32/include/batterypopupcontrol.mbg
 epoc32/include/bautils.h
-epoc32/include/beagle/beagle_gpio.h
-epoc32/include/beagle/iolines.h
-epoc32/include/beagle/mconf.h
-epoc32/include/beagle/variant.h
-epoc32/include/beagle/variant.mmh
-epoc32/include/beagle/variantmediadef.h
 epoc32/include/bidi.h
 epoc32/include/biditext.h
 epoc32/include/bidivisual.h
+epoc32/include/big5.h
 epoc32/include/bigint.h
 epoc32/include/bitbase.h
 epoc32/include/bitdev.h
@@ -397,7 +393,10 @@
 epoc32/include/bldprivate.hrh
 epoc32/include/bldpublic.hrh
 epoc32/include/bldregional.hrh
+epoc32/include/bldregional_apac.hrh
+epoc32/include/bldregional_japan.hrh
 epoc32/include/bldvariant.hrh
+epoc32/include/blid.mbg
 epoc32/include/bluetooth/a2dpoptimisation.h
 epoc32/include/bluetooth/a2dpoptimisationparams.h
 epoc32/include/bluetooth/btbaseband.h
@@ -405,12 +404,17 @@
 epoc32/include/bluetooth/btscoparams.h
 epoc32/include/bluetooth/dutmode.h
 epoc32/include/bluetooth/eirdatacodec.h
+epoc32/include/bluetooth/hci/bwins/commandseventsu.def
+epoc32/include/bluetooth/hci/eabi/commandseventsu.def
 epoc32/include/bluetooth/hci/hcibase.hrh
 epoc32/include/bluetooth/hci/hcierrors.h
 epoc32/include/bluetooth/hci/hctlbase.hrh
 epoc32/include/bluetooth/hci/initialisorbase.hrh
 epoc32/include/bluetooth/hci/qdpbase.hrh
 epoc32/include/bluetooth/lmoptions.h
+epoc32/include/browser.mbg
+epoc32/include/browseraudiovideoplugin.mbg
+epoc32/include/browserbitmaps.mbg
 epoc32/include/bsul/bsul.h
 epoc32/include/bsul/ccacheddriveinfo.h
 epoc32/include/bsul/clientmessage.h
@@ -423,13 +427,19 @@
 epoc32/include/btdevice.h
 epoc32/include/btextnotifiers.h
 epoc32/include/btextnotifiersconsts.h
+epoc32/include/btkeyboard.mbg
 epoc32/include/btmanclient.h
+epoc32/include/btmousebitmaps.mbg
+epoc32/include/btmtmcmds.h
+epoc32/include/btnotif.mbg
 epoc32/include/btsdp.h
 epoc32/include/btsecurity.h
 epoc32/include/btsockaddr.h
 epoc32/include/btsocketoptionlevels.h
 epoc32/include/btsyncbandwidth.h
 epoc32/include/bttypes.h
+epoc32/include/btui.mbg
+epoc32/include/bubblemanager.mbg
 epoc32/include/c32comm.h
 epoc32/include/c32comm.inl
 epoc32/include/caf/agent.h
@@ -450,7 +460,18 @@
 epoc32/include/caf/stringattributeset.h
 epoc32/include/caf/virtualpath.h
 epoc32/include/caf/virtualpathptr.h
-epoc32/include/caldavsession.h
+epoc32/include/calcsoft.mbg
+epoc32/include/calendar.mbg
+epoc32/include/calendarsearchplugin.mbg
+epoc32/include/calendarsettings.mbg
+epoc32/include/callstatus.mbg
+epoc32/include/cameraapp.mbg
+epoc32/include/cameraapp2.mbg
+epoc32/include/camerasettingsplugin.mbg
+epoc32/include/capsimageprocessor/capsimageprocessorextension.h
+epoc32/include/capsspmoutility/capsspmoutility.h
+epoc32/include/cbsuiapp.mbg
+epoc32/include/ccappdetailsviewplugin.mbg
 epoc32/include/ccertattributefilter.h
 epoc32/include/cctcertinfo.h
 epoc32/include/cdbcols.h
@@ -462,12 +483,24 @@
 epoc32/include/certificateapps.h
 epoc32/include/cflog.mmh
 epoc32/include/charactersetconverter.h
+epoc32/include/charactersetconverter.inl
 epoc32/include/charconv.h
-epoc32/include/cinidata.h
+epoc32/include/clockapp.mbg
+epoc32/include/clockapp_tab.mbg
+epoc32/include/cmailhandlerplugin.mbg
+epoc32/include/cmmanager.mbg
+epoc32/include/cmpluginpacketdata.mbg
+epoc32/include/cmpluginvpn.mbg
+epoc32/include/cmpluginwlan.mbg
 epoc32/include/cntdef.hrh
+epoc32/include/coever.h
 epoc32/include/commdb.h
 epoc32/include/commdbconnpref.h
+epoc32/include/commondialogs.mbg
 epoc32/include/commonphoneparser.h
+epoc32/include/commsdat.h
+epoc32/include/commsdattypesv1_1.h
+epoc32/include/comms-infras/commsdebugutility.h
 epoc32/include/comms-infras/commsdebugutility.mmh
 epoc32/include/comms-infras/cs_mobility_apiext.h
 epoc32/include/comms-infras/datamonitormessages.h
@@ -492,18 +525,23 @@
 epoc32/include/comms-infras/ss_fact_internal.h
 epoc32/include/comms-infras/ss_factorycontainermap.h
 epoc32/include/comms-infras/ss_protopt.h
-epoc32/include/commsdat.h
-epoc32/include/commsdattypesv1_1.h
-epoc32/include/ConeResLoader.h
+epoc32/include/coneresloader.h
 epoc32/include/connect/abclient.h
 epoc32/include/connect/abclientserver.h
 epoc32/include/connect/panic.h
 epoc32/include/connect/sbdefs.h
 epoc32/include/connect/tserverstart.h
+epoc32/include/connectionmonitorplugin.mbg
+epoc32/include/connectionmonitorui.mbg
+epoc32/include/connectionuiutilities.mbg
 epoc32/include/connectprog.h
+epoc32/include/connman.mbg
 epoc32/include/connpref.h
 epoc32/include/conpics.h
+epoc32/include/constd.h
+epoc32/include/contactssearchplugin.mbg
 epoc32/include/convdata.h
+epoc32/include/conversations.mbg
 epoc32/include/convgeneratedcpp.h
 epoc32/include/convnames.h
 epoc32/include/convutils.h
@@ -514,8 +552,10 @@
 epoc32/include/cryptospi/cryptomacapi.h
 epoc32/include/cryptospi/cryptoparams.h
 epoc32/include/cryptospi/cryptorandomapi.h
+epoc32/include/cryptospi/cryptospi_errs.h
 epoc32/include/cryptospi/cryptospistateapi.h
 epoc32/include/cryptospi/extendedcharacteristics.h
+epoc32/include/cryptospi/keys.h
 epoc32/include/cryptospi/plugincharacteristics.h
 epoc32/include/cryptospi/pluginselectorbase.h
 epoc32/include/cryptospi/ruleselector.h
@@ -525,7 +565,9 @@
 epoc32/include/cs_subconevents.inl
 epoc32/include/cs_subconparams.h
 epoc32/include/cs_subconparams.inl
+epoc32/include/csc.mbg
 epoc32/include/csch_cli.h
+epoc32/include/cshelp.mbg
 epoc32/include/cshelp/conset.hlp.hrh
 epoc32/include/cshelp/div.hlp.hrh
 epoc32/include/cshelp/find.hlp.hrh
@@ -549,7 +591,7 @@
 epoc32/include/ct/tcttokenobjecthandle.h
 epoc32/include/ct/tcttokentypeattribute.h
 epoc32/include/ctsy/tflogger.h
-epoc32/include/CustomCommandTypes.h
+epoc32/include/customcommandtypes.h
 epoc32/include/d32dbms.h
 epoc32/include/d32dbms.inl
 epoc32/include/d32dbmsconstants.h
@@ -557,8 +599,62 @@
 epoc32/include/data_caged_locations.mk
 epoc32/include/data_caging_path_literals.hrh
 epoc32/include/data_caging_paths.hrh
+epoc32/include/data_caging_paths.prf
 epoc32/include/data_caging_paths_for_iby.hrh
 epoc32/include/data_caging_paths_strings.hrh
+epoc32/include/dbgtrccomm.h
+epoc32/include/def/bmarm/domainpolicyu.def
+epoc32/include/def/bwins/agentdialogu.def
+epoc32/include/def/bwins/audiocontextfactory.def
+epoc32/include/def/bwins/devsoundadaptationinfo.def
+epoc32/include/def/bwins/domainpolicyu.def
+epoc32/include/def/bwins/licenseetsyu.def
+epoc32/include/def/bwins/mmfdevsound.def
+epoc32/include/def/bwins/restartsysu.def
+epoc32/include/def/bwins/ssmuiproviderdllu.def
+epoc32/include/def/eabi/agentdialogu.def
+epoc32/include/def/eabi/agentu.def
+epoc32/include/def/eabi/audiocontextfactory.def
+epoc32/include/def/eabi/coefepu.def
+epoc32/include/def/eabi/devsoundadaptationinfo.def
+epoc32/include/def/eabi/domainpolicyu.def
+epoc32/include/def/eabi/ecamadvsettingsu.def
+epoc32/include/def/eabi/ecamdirectviewfinderu.def
+epoc32/include/def/eabi/ecamhistogramu.def
+epoc32/include/def/eabi/ecamoverlayu.def
+epoc32/include/def/eabi/ecamsnapshotu.def
+epoc32/include/def/eabi/ecamu.def
+epoc32/include/def/eabi/eikinitu.def
+epoc32/include/def/eabi/eloclu.def
+epoc32/include/def/eabi/libegl12u.def
+epoc32/include/def/eabi/libegl13u.def
+epoc32/include/def/eabi/libegl14u.def
+epoc32/include/def/eabi/libglesv1_cm11u.def
+epoc32/include/def/eabi/libglesv2u.def
+epoc32/include/def/eabi/libopenvg10u.def
+epoc32/include/def/eabi/libopenvg11u.def
+epoc32/include/def/eabi/libopenvgu10u.def
+epoc32/include/def/eabi/libopenvgu11u.def
+epoc32/include/def/eabi/licenseetsyu.def
+epoc32/include/def/eabi/mmcommon.def
+epoc32/include/def/eabi/mmfdevsound.def
+epoc32/include/def/eabi/opengles11u.def
+epoc32/include/def/eabi/openglesu.def
+epoc32/include/def/eabi/restartsysu.def
+epoc32/include/def/eabi/ssmuiproviderdllu.def
+epoc32/include/def/eabi/wsclicku.def
+epoc32/include/def/win32/libegl12u.def
+epoc32/include/def/win32/libegl13u.def
+epoc32/include/def/win32/libegl14u.def
+epoc32/include/def/win32/libglesv1_cm11u.def
+epoc32/include/def/win32/libglesv2u.def
+epoc32/include/def/win32/libopenvg10u.def
+epoc32/include/def/win32/libopenvg11u.def
+epoc32/include/def/win32/libopenvgu10u.def
+epoc32/include/def/win32/libopenvgu11u.def
+epoc32/include/def/win32/mmcommon.def
+epoc32/include/def/win32/opengles11u.def
+epoc32/include/def/win32/openglesu.def
 epoc32/include/defaultcaps.hrh
 epoc32/include/delimitedparser16.h
 epoc32/include/delimitedparser8.h
@@ -569,14 +665,23 @@
 epoc32/include/delimitedpathsegment8.h
 epoc32/include/delimitedquery16.h
 epoc32/include/delimitedquery8.h
+epoc32/include/devdiagapp.mbg
+epoc32/include/devdiagconnectivitysuiteplugin.mbg
+epoc32/include/devdiagcoveragesuiteplugin.mbg
+epoc32/include/devdiaghardwaresuiteplugin.mbg
+epoc32/include/devdiagservicessuiteplugin.mbg
+epoc32/include/devencgsplugin.mbg
 epoc32/include/dial.h
 epoc32/include/dial.inl
 epoc32/include/dial_consts.h
+epoc32/include/dialer.mbg
+epoc32/include/disconnectdlgui.mbg
 epoc32/include/displaymode.h
-epoc32/include/DistanceAttenuationBase.h
-epoc32/include/DistanceAttenuationData.h
-epoc32/include/DopplerBase.h
-epoc32/include/DopplerData.h
+epoc32/include/distanceattenuationbase.h
+epoc32/include/distanceattenuationdata.h
+epoc32/include/dopplerbase.h
+epoc32/include/dopplerdata.h
+epoc32/include/downloadmgruilib.mbg
 epoc32/include/driveinfo.h
 epoc32/include/driveinfo.inl
 epoc32/include/drivers/camerasc.h
@@ -595,8 +700,12 @@
 epoc32/include/drivers/usbcshared.inl
 epoc32/include/drivers/usbdi_channel.h
 epoc32/include/drivers/usbdi_hub.h
-epoc32/include/DrmAudioSamplePlayer.h
+epoc32/include/drivers/usbware_config.mmh
+epoc32/include/drmaudiosampleplayer.h
+epoc32/include/drmencryptor.mbg
+epoc32/include/drmrightsmanager.mbg
 epoc32/include/dscstorecommondefs.hrh
+epoc32/include/dummyviewfinder.mbg
 epoc32/include/e32atomics.h
 epoc32/include/e32base.h
 epoc32/include/e32base.inl
@@ -628,6 +737,7 @@
 epoc32/include/e32std.inl
 epoc32/include/e32test.h
 epoc32/include/e32utrace.mmh
+epoc32/include/easydialing.mbg
 epoc32/include/ecam.h
 epoc32/include/ecam/cameradirectviewfinderuidif.hrh
 epoc32/include/ecam/cameraoverlay.h
@@ -647,6 +757,7 @@
 epoc32/include/ecamuids.hrh
 epoc32/include/ecamuidsconst.hrh
 epoc32/include/ecamuidsdef.hrh
+epoc32/include/ecmtclient.h
 epoc32/include/ecom/ecom.h
 epoc32/include/ecom/ecomerrorcodes.h
 epoc32/include/ecom/ecomresolverparams.h
@@ -660,31 +771,30 @@
 epoc32/include/ecom/registryinfov2.rh
 epoc32/include/ecom/registryinfov3.rh
 epoc32/include/ecom/resolver.h
-epoc32/include/EGL/egl.h
-epoc32/include/EGL/eglext.h
-epoc32/include/EGL/egltypes.h
-epoc32/include/EGL/egluids.hrh
-epoc32/include/eglosnativewindowtype.h
-epoc32/include/eikcdlg.rsg
-epoc32/include/eikcoctl.rsg
+epoc32/include/editorundo.h
+epoc32/include/egl/egl.h
+epoc32/include/egl/eglext.h
+epoc32/include/egl/egltypes.h
+epoc32/include/egl/egluids.hrh
 epoc32/include/eikcolor.hrh
-epoc32/include/eikcore.rsg
-epoc32/include/eikctl.rsg
 epoc32/include/elements/cftransportmacro.h
 epoc32/include/elements/metadata.h
 epoc32/include/elements/metadata.inl
 epoc32/include/elements/sd_mintercept.mmh
+epoc32/include/emailwidgeticon.mbg
+epoc32/include/emailwidgetsettings.mbg
 epoc32/include/emanaged.h
 epoc32/include/emisc.h
 epoc32/include/emsinformationelement.h
 epoc32/include/emsinformationelement.inl
 epoc32/include/emspictureie.inl
-epoc32/include/EnvironmentalReverbBase.h
-epoc32/include/EnvironmentalReverbData.h
-epoc32/include/EnvironmentalReverbUtility.h
-epoc32/include/EnvironmentalReverbUtilityData.h
-epoc32/include/EPos_PrivacyNotifier.hrh
-epoc32/include/errorres.rsg
+epoc32/include/environmentalreverbbase.h
+epoc32/include/environmentalreverbdata.h
+epoc32/include/environmentalreverbutility.h
+epoc32/include/environmentalreverbutilitydata.h
+epoc32/include/epos_privacynotifier.hrh
+epoc32/include/eposlmglcategories.mbg
+epoc32/include/equalizer.mbg
 epoc32/include/errors/generic/emailerr.ra
 epoc32/include/errors/generic/emailerr.rls
 epoc32/include/errors/generic/irerr.ra
@@ -696,6 +806,8 @@
 epoc32/include/es_wsms.h
 epoc32/include/es_wsms.inl
 epoc32/include/escapeutils.h
+epoc32/include/esmrcasplugin.mbg
+epoc32/include/esmrgui.mbg
 epoc32/include/estlib.h
 epoc32/include/estring.h
 epoc32/include/et_clsvr.h
@@ -707,12 +819,24 @@
 epoc32/include/etslotnum.h
 epoc32/include/eui_addr.h
 epoc32/include/euserhl.h
+epoc32/include/eventmessageapi.h
+epoc32/include/eventmessageapibase.h
+epoc32/include/eventmessageapidefs.h
+epoc32/include/eventmessageapifactory.h
+epoc32/include/eventmessageapiinternaldata.h
+epoc32/include/eventmessagekeyobserversymbian.h
+epoc32/include/eventmessagekeywatchersymbian.h
+epoc32/include/evteditor.mbg
+epoc32/include/evthandlerserver.mbg
+epoc32/include/evtinfonote.mbg
+epoc32/include/evtmgmtui.mbg
 epoc32/include/ewsd.h
-epoc32/include/ExifModify.h
-epoc32/include/ExifRead.h
-epoc32/include/ExifTag.h
+epoc32/include/exifmodify.h
+epoc32/include/exifread.h
+epoc32/include/exiftag.h
 epoc32/include/exifutility.h
 epoc32/include/ext_hdr.h
+epoc32/include/extensionmanager.mbg
 epoc32/include/exterror.h
 epoc32/include/ezbufman.h
 epoc32/include/ezcompressor.h
@@ -727,18 +851,31 @@
 epoc32/include/f32file.inl
 epoc32/include/f32file64.h
 epoc32/include/f32file64.inl
+epoc32/include/f32notification.h
 epoc32/include/faxdefn.h
 epoc32/include/fbs.h
+epoc32/include/fbsmessage.h
 epoc32/include/featdiscovery.h
 epoc32/include/featureinfo.h
 epoc32/include/features.hrh
 epoc32/include/featureuids.h
+epoc32/include/filebrowser_extraicons.mbg
+epoc32/include/filelist.mbg
+epoc32/include/filemanager.mbg
+epoc32/include/filessearchplugin.mbg
+epoc32/include/filesystem_automounter.h
+epoc32/include/filesystem_exfat.h
 epoc32/include/filesystem_fat.h
 epoc32/include/finditemengine.h
 epoc32/include/fldbase.h
 epoc32/include/fldbltin.h
 epoc32/include/fldinfo.h
+epoc32/include/flogger.h
+epoc32/include/flogger.inl
+epoc32/include/fmradio.mbg
 epoc32/include/fntstore.h
+epoc32/include/fotaserver.mbg
+epoc32/include/freestyleemailui.mbg
 epoc32/include/frmconst.h
 epoc32/include/frmframe.h
 epoc32/include/frmlaydt.h
@@ -747,33 +884,69 @@
 epoc32/include/frmtlay.h
 epoc32/include/frmtview.h
 epoc32/include/frmvis.h
+epoc32/include/fsccallplugin.mbg
+epoc32/include/fscpocplugin.mbg
+epoc32/include/fscsaveascontactplugin.mbg
+epoc32/include/fscsendplugin.mbg
+epoc32/include/fsuidatamtm.mbg
+epoc32/include/ganes.mbg
+epoc32/include/gb2312.h
+epoc32/include/gbk.h
 epoc32/include/gcc.h
+epoc32/include/gcc_mingw/gcc_mingw.h
 epoc32/include/gcc_mingw/gcc_mingw_3_4_2.h
 epoc32/include/gcce/gcce.h
 epoc32/include/gdi.h
 epoc32/include/gdi.inl
 epoc32/include/gifscaler.h
-epoc32/include/GLES/egl.h
-epoc32/include/GLES/egltypes.h
-epoc32/include/GLES/gl.h
-epoc32/include/GLES/glext.h
-epoc32/include/GLES/glextplatform.h
-epoc32/include/GLES/glplatform.h
-epoc32/include/GLES/legacy_egl_1_1/egl.h
-epoc32/include/GLES/legacy_egl_1_1/egltypes.h
-epoc32/include/GLES/openglesuids.hrh
-epoc32/include/GLES2/gl2.h
-epoc32/include/GLES2/gl2ext.h
-epoc32/include/GLES2/gl2extplatform.h
-epoc32/include/GLES2/gl2platform.h
-epoc32/include/GLES2/openglesuids.hrh
+epoc32/include/gles/egl.h
+epoc32/include/gles/egltypes.h
+epoc32/include/gles/gl.h
+epoc32/include/gles/glext.h
+epoc32/include/gles/glextplatform.h
+epoc32/include/gles/glplatform.h
+epoc32/include/gles/legacy_egl_1_1/egl.h
+epoc32/include/gles/legacy_egl_1_1/egltypes.h
+epoc32/include/gles/openglesuids.hrh
+epoc32/include/gles2/gl2.h
+epoc32/include/gles2/gl2ext.h
+epoc32/include/gles2/gl2extplatform.h
+epoc32/include/gles2/gl2platform.h
+epoc32/include/gles2/openglesuids.hrh
+epoc32/include/glxicons.mbg
 epoc32/include/gmxmlparser.h
+epoc32/include/gnrlsearchuisvg.mbg
+epoc32/include/google_brand_graphics.mbg
 epoc32/include/gprsprog.h
+epoc32/include/graphics/def/bwins/directgdiadapteru.def
+epoc32/include/graphics/def/bwins/fbsrasterizeru.def
+epoc32/include/graphics/def/bwins/graphicsresourceadapteru.def
+epoc32/include/graphics/def/eabi/directgdiadapteru.def
+epoc32/include/graphics/def/eabi/fbsrasterizeru.def
+epoc32/include/graphics/def/eabi/graphicsresourceadapteru.def
 epoc32/include/graphics/eglsynchelper.h
 epoc32/include/graphics/fbsdefs.h
 epoc32/include/graphics/streammap.h
 epoc32/include/graphics/symbianstream.h
 epoc32/include/graphicsaccelerator.h
+epoc32/include/gridroot.mbg
+epoc32/include/gsaccplugin.mbg
+epoc32/include/gsadminplugin.mbg
+epoc32/include/gsappsplugin.mbg
+epoc32/include/gscallbarringplugin.mbg
+epoc32/include/gscalldivertplugin.mbg
+epoc32/include/gscallplugin.mbg
+epoc32/include/gsconnsettingsplugin.mbg
+epoc32/include/gsconplugin.mbg
+epoc32/include/gsdasplugin.mbg
+epoc32/include/gsdatacallplugin.mbg
+epoc32/include/gsdevdiagplugin.mbg
+epoc32/include/gsdevicemanagementplugin.mbg
+epoc32/include/gsdisplayplugin.mbg
+epoc32/include/gsfwicon.mbg
+epoc32/include/gsgenplugin.mbg
+epoc32/include/gsinstallationsplugin.mbg
+epoc32/include/gslangplugin.mbg
 epoc32/include/gsmubuf.h
 epoc32/include/gsmuelem.h
 epoc32/include/gsmuelem.inl
@@ -792,10 +965,23 @@
 epoc32/include/gsmuset.inl
 epoc32/include/gsmustor.h
 epoc32/include/gsmustor.inl
+epoc32/include/gsnetworkplugin.mbg
+epoc32/include/gsopticaljoystickplugin.mbg
+epoc32/include/gspdataplugin.mbg
+epoc32/include/gspeninputplugin.mbg
+epoc32/include/gspowersavingqueryplugin.mbg
+epoc32/include/gsprofilesplugin.mbg
+epoc32/include/gsrfsplugin.mbg
+epoc32/include/gssecplugin.mbg
+epoc32/include/gssenplugin.mbg
+epoc32/include/gssipsettingsplugin.mbg
+epoc32/include/gssynchronisationplugin.mbg
+epoc32/include/gstelplugin.mbg
+epoc32/include/gsvmbxplugin.mbg
+epoc32/include/gsvoicerecorderplugin.mbg
+epoc32/include/gsxdmplugin.mbg
 epoc32/include/gulfont.hrh
 epoc32/include/gulftflg.hrh
-epoc32/include/hal.h
-epoc32/include/hal_data.h
 epoc32/include/hash.h
 epoc32/include/httpstringconstants.h
 epoc32/include/hwrmhaptics.h
@@ -807,6 +993,7 @@
 epoc32/include/hwrmpowerstatesdkpskeys.h
 epoc32/include/hwrmvibra.h
 epoc32/include/hwrmvibrasdkcrkeys.h
+epoc32/include/iaupdate.mbg
 epoc32/include/icl/exifimagedisplay.hrh
 epoc32/include/icl/exifimagedisplayext.h
 epoc32/include/icl/geniclimagedisplay.hrh
@@ -855,6 +1042,8 @@
 epoc32/include/imageprocessor/imageprocessorpreview.h
 epoc32/include/imageprocessor/imageprocessorprogressinfo.h
 epoc32/include/imagetransform.h
+epoc32/include/imcvuiapp.mbg
+epoc32/include/imgprintbitmaps.mbg
 epoc32/include/in_chk.h
 epoc32/include/in_hdr.h
 epoc32/include/in_pkt.h
@@ -863,18 +1052,21 @@
 epoc32/include/in6_opt.h
 epoc32/include/inet6err.h
 epoc32/include/inetprottextutils.h
-epoc32/include/iniparser.h
 epoc32/include/ip_subconparams.h
 epoc32/include/ip_subconparams.inl
 epoc32/include/ip4_hdr.h
 epoc32/include/ip6_hdr.h
 epoc32/include/ir_sock.h
+epoc32/include/irs.h
 epoc32/include/isbaseof.h
 epoc32/include/issame.h
-epoc32/include/kernel/hal_int.h
+epoc32/include/jisx0201.h
+epoc32/include/jisx0208.h
+epoc32/include/jisx0212.h
 epoc32/include/kernel/kern_ext.mmh
-epoc32/include/KHR/khrplatform.h
+epoc32/include/khr/khrplatform.h
 epoc32/include/khronos_types.h
+epoc32/include/landmarks.mbg
 epoc32/include/lbs.h
 epoc32/include/lbs.inl
 epoc32/include/lbs/epos_privacynotifier.hrh
@@ -898,7 +1090,9 @@
 epoc32/include/lbspositioninfo.h
 epoc32/include/lbsrequestor.h
 epoc32/include/lbssatellite.h
-epoc32/include/lbsSuplPsyAdaptation.h
+epoc32/include/lbssuplpsyadaptation
+epoc32/include/lbssuplpsyadaptation.h
+epoc32/include/lcdui.mbg
 epoc32/include/libc/_ansi.h
 epoc32/include/libc/arpa/ftp.h
 epoc32/include/libc/arpa/inet.h
@@ -965,36 +1159,46 @@
 epoc32/include/libc/unistd.h
 epoc32/include/linebreak.h
 epoc32/include/linkedfonts.h
-epoc32/include/ListenerDopplerBase.h
-epoc32/include/ListenerLocationBase.h
-epoc32/include/ListenerOrientationBase.h
+epoc32/include/listenerdopplerbase.h
+epoc32/include/listenerlocationbase.h
+epoc32/include/listenerorientationbase.h
+epoc32/include/lmkui.mbg
+epoc32/include/lmrefapp.mbg
+epoc32/include/loadgen_extraicons.mbg
 epoc32/include/localtypes.h
-epoc32/include/LocationBase.h
-epoc32/include/LocationData.h
+epoc32/include/locationbase.h
+epoc32/include/locationdata.h
+epoc32/include/lockapp.mbg
+epoc32/include/locpsysettings.mbg
+epoc32/include/locsuplsettings.mbg
+epoc32/include/locsysuiview.mbg
 epoc32/include/logcli.h
 epoc32/include/logcli.inl
 epoc32/include/logclientchangeobserver.h
 epoc32/include/logeng.h
 epoc32/include/logfilterandeventconstants.hrh
+epoc32/include/logs.mbg
 epoc32/include/logsmspdudata.h
 epoc32/include/logview.h
 epoc32/include/logview.inl
 epoc32/include/logviewchangeobserver.h
+epoc32/include/logwrap.h
 epoc32/include/logwrap.hrh
 epoc32/include/logwrap.inl
-epoc32/include/logwrap.h
 epoc32/include/logwrapconst.h
-epoc32/include/LoudnessBase.h
-epoc32/include/LoudnessData.h
-epoc32/include/mateventcompleteobserver.h
-epoc32/include/MAudioEffectObserver.h
-epoc32/include/MAudioEqualizerObserver.h
-epoc32/include/MBassBoostObserver.h
+epoc32/include/loudnessbase.h
+epoc32/include/loudnessdata.h
+epoc32/include/matrixmenudata.mbg
+epoc32/include/maudioeffectobserver.h
+epoc32/include/maudioequalizerobserver.h
+epoc32/include/mbassboostobserver.h
 epoc32/include/mbmstypes.h
+epoc32/include/mceextraicons.mbg
 epoc32/include/mcertstore.h
+epoc32/include/mcesettingsgspluginicons.mbg
 epoc32/include/mctcertapps.h
-epoc32/include/MCustomCommand.h
-epoc32/include/MCustomInterface.h
+epoc32/include/mcustomcommand.h
+epoc32/include/mcustominterface.h
 epoc32/include/mda/client/utility.h
 epoc32/include/mda/common/audio.h
 epoc32/include/mda/common/audio.hrh
@@ -1015,22 +1219,27 @@
 epoc32/include/mdaaudiosampleeditor.h
 epoc32/include/mdaaudiosampleplayer.h
 epoc32/include/mdaaudiotoneplayer.h
+epoc32/include/mdaframeinfo.h
 epoc32/include/mdaimageconverter.h
 epoc32/include/mdf/codecapiresolver.hrh
 epoc32/include/mdf/codecapiuids.hrh
 epoc32/include/mdf/puloaderuids.hrh
-epoc32/include/MDistanceAttenuationObserver.h
-epoc32/include/MDopplerObserver.h
+epoc32/include/mdistanceattenuationobserver.h
+epoc32/include/mdopplerobserver.h
+epoc32/include/mediafilelist.mbg
+epoc32/include/mediasettings.mbg
 epoc32/include/medobsrv.h
-epoc32/include/MEnvironmentalReverbObserver.h
+epoc32/include/menvironmentalreverbobserver.h
+epoc32/include/messagessearchplugin.mbg
 epoc32/include/metadatabase.h
+epoc32/include/microsoft_brand_graphics.mbg
 epoc32/include/midiclientutility.h
 epoc32/include/miutstd.hrh
-epoc32/include/MListenerDopplerObserver.h
-epoc32/include/MListenerLocationObserver.h
-epoc32/include/MListenerOrientationObserver.h
-epoc32/include/MLocationObserver.h
-epoc32/include/MLoudnessObserver.h
+epoc32/include/mlistenerdopplerobserver.h
+epoc32/include/mlistenerlocationobserver.h
+epoc32/include/mlistenerorientationobserver.h
+epoc32/include/mlocationobserver.h
+epoc32/include/mloudnessobserver.h
 epoc32/include/mm/conversioncoefficient.h
 epoc32/include/mm/mmcaf.h
 epoc32/include/mmf/common/midistandardcustomcommands.h
@@ -1107,121 +1316,186 @@
 epoc32/include/mmf/server/mmfdatasource.h
 epoc32/include/mmf/server/mmfdatasourcesink.hrh
 epoc32/include/mmf/server/mmfdes.h
+epoc32/include/mmf/server/mmfdevsoundcustominterfaceobserver.h
 epoc32/include/mmf/server/mmfdevsoundcustominterfacesupport.h
+epoc32/include/mmf/server/mmfdevsoundcustominterfacesupportclasses.h
 epoc32/include/mmf/server/mmffile.h
 epoc32/include/mmf/server/mmfformat.h
 epoc32/include/mmf/server/mmfformat.inl
 epoc32/include/mmf/server/mmfhwdevice.h
 epoc32/include/mmf/server/mmfhwdevice.inl
+epoc32/include/mmf/server/mmfhwdevicecmds.h
 epoc32/include/mmf/server/mmfsubthreadbase.h
 epoc32/include/mmf/server/mmfswcodecwrappercustominterfacesuids.hrh
 epoc32/include/mmf/server/mmfurl.h
 epoc32/include/mmf/server/mmfvideoframebuffer.h
 epoc32/include/mmf/server/sounddevice.h
 epoc32/include/mmf/server/sounddevice.inl
+epoc32/include/mmf/server/taskconfig.h
 epoc32/include/mmfaudioiointerfaceuids.hrh
 epoc32/include/mmfclntutility.h
 epoc32/include/mmfcontrollerimplementationuids.hrh
 epoc32/include/mmfformatimplementationuids.hrh
 epoc32/include/mmfplugininterfaceuids.hrh
-epoc32/include/MOrientationObserver.h
+epoc32/include/mmsui.mbg
+epoc32/include/mnrefprovider.mbg
+epoc32/include/morientationobserver.h
 epoc32/include/mparser.h
-epoc32/include/MRoomLevelObserver.h
-epoc32/include/MSourceDopplerObserver.h
-epoc32/include/MSourceLocationObserver.h
-epoc32/include/MSourceOrientationObserver.h
-epoc32/include/MStereoWideningObserver.h
+epoc32/include/mpx.mbg
+epoc32/include/mpxaddtracksdialog.mbg
+epoc32/include/mpxcollectionview.mbg
+epoc32/include/mpxcollectionviewhg.mbg
+epoc32/include/mpxcommonplaybackview.mbg
+epoc32/include/mpxcommonui.mbg
+epoc32/include/mpxdbhgplugin.mbg
+epoc32/include/mpxdbplugin.mbg
+epoc32/include/mpxembeddedplaybackview.mbg
+epoc32/include/mpxmainview.mbg
+epoc32/include/mpxmediakeyhandler.mbg
+epoc32/include/mpxpodcastcollectionview.mbg
+epoc32/include/mpxpodcastdbplugin.mbg
+epoc32/include/mpxpodcastplaybackview.mbg
+epoc32/include/mpxscreensaverplugin.mbg
+epoc32/include/mpxupnpplaybackview.mbg
+epoc32/include/mpxvideoplaybackcontrols.mbg
+epoc32/include/mroomlevelobserver.h
+epoc32/include/msgeditor.mbg
+epoc32/include/msgeditor_ah.mbg
+epoc32/include/msgmailutils.mbg
+epoc32/include/msgrelay.h
+epoc32/include/msgsession.h
+epoc32/include/msgtypes.h
+epoc32/include/msgurlhandler.mbg
+epoc32/include/msourcedopplerobserver.h
+epoc32/include/msourcelocationobserver.h
+epoc32/include/msourceorientationobserver.h
+epoc32/include/mstereowideningobserver.h
 epoc32/include/msvstd.hrh
 epoc32/include/mtmdef.hrh
 epoc32/include/mtmuidef.hrh
 epoc32/include/mtmuidsdef.hrh
 epoc32/include/mtp/mtpdataproviderconfig.hrh
 epoc32/include/mtud.hrh
+epoc32/include/muiu.mbg
+epoc32/include/mulsliderwidget.mbg
+epoc32/include/multicaluidialog.mbg
+epoc32/include/multimediasearchplugin.mbg
+epoc32/include/musichomescreenicons.mbg
+epoc32/include/musicwidgeticon.mbg
+epoc32/include/musindicatoricons.mbg
+epoc32/include/mussettingsplugin.mbg
+epoc32/include/musui.mbg
+epoc32/include/musui_aif.mbg
+epoc32/include/musuiicons.mbg
+epoc32/include/musuitoolbaricons.mbg
 epoc32/include/mw/absolutevolumeapi.h
 epoc32/include/mw/absolutevolumeapicontroller.h
 epoc32/include/mw/absolutevolumeapicontrollerobserver.h
 epoc32/include/mw/absolutevolumeapitarget.h
 epoc32/include/mw/absolutevolumeapitargetobserver.h
-epoc32/include/mw/ActiveApDb.h
+epoc32/include/mw/activeapdb.h
 epoc32/include/mw/activefavouritesdbnotifier.h
-epoc32/include/mw/AiwCommon.h
-epoc32/include/mw/AiwCommon.hrh
-epoc32/include/mw/AiwCommon.rh
-epoc32/include/mw/AiwGenericParam.h
-epoc32/include/mw/AiwGenericParam.hrh
-epoc32/include/mw/AiwGenericParam.inl
-epoc32/include/mw/AiwServiceHandler.h
-epoc32/include/mw/AiwVariant.h
-epoc32/include/mw/AiwVariant.inl
-epoc32/include/mw/AiwVariantType.hrh
+epoc32/include/mw/activeqt/activeqt
+epoc32/include/mw/activeqt/headers.pri
+epoc32/include/mw/activeqt/qaxaggregated
+epoc32/include/mw/activeqt/qaxaggregated.h
+epoc32/include/mw/activeqt/qaxbase
+epoc32/include/mw/activeqt/qaxbase.h
+epoc32/include/mw/activeqt/qaxbindable
+epoc32/include/mw/activeqt/qaxbindable.h
+epoc32/include/mw/activeqt/qaxclass
+epoc32/include/mw/activeqt/qaxfactory
+epoc32/include/mw/activeqt/qaxfactory.h
+epoc32/include/mw/activeqt/qaxobject
+epoc32/include/mw/activeqt/qaxobject.h
+epoc32/include/mw/activeqt/qaxscript
+epoc32/include/mw/activeqt/qaxscript.h
+epoc32/include/mw/activeqt/qaxscriptengine
+epoc32/include/mw/activeqt/qaxscriptmanager
+epoc32/include/mw/activeqt/qaxselect
+epoc32/include/mw/activeqt/qaxselect.h
+epoc32/include/mw/activeqt/qaxtypes.h
+epoc32/include/mw/activeqt/qaxwidget
+epoc32/include/mw/activeqt/qaxwidget.h
+epoc32/include/mw/aiwcommon.h
+epoc32/include/mw/aiwcommon.hrh
+epoc32/include/mw/aiwcommon.rh
+epoc32/include/mw/aiwgenericparam.h
+epoc32/include/mw/aiwgenericparam.hrh
+epoc32/include/mw/aiwgenericparam.inl
+epoc32/include/mw/aiwservicehandler.h
+epoc32/include/mw/aiwvariant.h
+epoc32/include/mw/aiwvariant.inl
+epoc32/include/mw/aiwvarianttype.hrh
 epoc32/include/mw/aknanim.hrh
 epoc32/include/mw/aknanim.rh
 epoc32/include/mw/aknapp.h
 epoc32/include/mw/aknappui.h
-epoc32/include/mw/AknBidiTextUtils.h
-epoc32/include/mw/AknBitmapAnimation.h
+epoc32/include/mw/aknbiditextutils.h
+epoc32/include/mw/aknbitmapanimation.h
 epoc32/include/mw/aknborders.h
 epoc32/include/mw/aknbutton.h
 epoc32/include/mw/akncheckboxsettingpage.h
 epoc32/include/mw/aknchoicelist.h
 epoc32/include/mw/aknclearer.h
-epoc32/include/mw/AknColourSelectionGrid.h
-epoc32/include/mw/AknCommonDialogs.h
-epoc32/include/mw/AknCommonDialogsDynMem.h
+epoc32/include/mw/akncolourselectiongrid.h
+epoc32/include/mw/akncommondialogs.h
+epoc32/include/mw/akncommondialogsdynmem.h
 epoc32/include/mw/aknconsts.h
 epoc32/include/mw/akncontext.h
-epoc32/include/mw/AknControl.h
+epoc32/include/mw/akncontrol.h
 epoc32/include/mw/akncustomtreeordering.h
-epoc32/include/mw/AknDef.h
-epoc32/include/mw/AknDef.hrh
-epoc32/include/mw/AknDesCArrayDecorator.h
-epoc32/include/mw/AknDialog.h
-epoc32/include/mw/AknDlgShut.h
-epoc32/include/mw/AknDoc.h
-epoc32/include/mw/aknEditStateIndicator.h
+epoc32/include/mw/akndef.h
+epoc32/include/mw/akndef.hrh
+epoc32/include/mw/akndescarraydecorator.h
+epoc32/include/mw/akndialog.h
+epoc32/include/mw/akndlgshut.h
+epoc32/include/mw/akndoc.h
+epoc32/include/mw/akneditstateindicator.h
 epoc32/include/mw/aknedsts.h
 epoc32/include/mw/aknedstsobs.h
 epoc32/include/mw/aknenv.h
-epoc32/include/mw/AknFontAccess.h
-epoc32/include/mw/AknFontCategory.hrh
-epoc32/include/mw/AknFontIdOffsets.hrh
-epoc32/include/mw/AknFontSpecification.h
-epoc32/include/mw/AknForm.h
-epoc32/include/mw/AknGlobalConfirmationQuery.h
-epoc32/include/mw/AknGlobalListMsgQuery.h
-epoc32/include/mw/AknGlobalListQuery.h
-epoc32/include/mw/AknGlobalMsgQuery.h
-epoc32/include/mw/AknGlobalNote.h
-epoc32/include/mw/AknGlobalProgressDialog.h
-epoc32/include/mw/AknGMSStyleGrid.h
-epoc32/include/mw/AknGrid.h
-epoc32/include/mw/AknGridM.h
-epoc32/include/mw/AknGridView.h
+epoc32/include/mw/aknfontaccess.h
+epoc32/include/mw/aknfontcategory.hrh
+epoc32/include/mw/aknfontidoffsets.hrh
+epoc32/include/mw/aknfontspecification.h
+epoc32/include/mw/aknform.h
+epoc32/include/mw/aknglobalconfirmationquery.h
+epoc32/include/mw/akngloballistmsgquery.h
+epoc32/include/mw/akngloballistquery.h
+epoc32/include/mw/aknglobalmsgquery.h
+epoc32/include/mw/aknglobalnote.h
+epoc32/include/mw/aknglobalprogressdialog.h
+epoc32/include/mw/akngmsstylegrid.h
+epoc32/include/mw/akngrid.h
+epoc32/include/mw/akngridm.h
+epoc32/include/mw/akngridview.h
 epoc32/include/mw/aknhlistpanic.h
-epoc32/include/mw/AknIconArray.h
-epoc32/include/mw/AknIconHeader.h
-epoc32/include/mw/AknIconHeader.inl
-epoc32/include/mw/AknIconObserver.h
-epoc32/include/mw/AknIconSrvClient.h
-epoc32/include/mw/AknIconUtils.h
-epoc32/include/mw/AknIconUtils.inl
-epoc32/include/mw/AknIndicatorContainer.h
-epoc32/include/mw/AknInfoPopupNoteController.h
+epoc32/include/mw/akniconarray.h
+epoc32/include/mw/akniconheader.h
+epoc32/include/mw/akniconheader.inl
+epoc32/include/mw/akniconobserver.h
+epoc32/include/mw/akniconsrvclient.h
+epoc32/include/mw/akniconutils.h
+epoc32/include/mw/akniconutils.inl
+epoc32/include/mw/aknindicatorcontainer.h
+epoc32/include/mw/akninfopopupnotecontroller.h
 epoc32/include/mw/akninfrm.h
-epoc32/include/mw/AknInputLanguageInfo.h
+epoc32/include/mw/akninputlanguageinfo.h
 epoc32/include/mw/aknintermediate.h
-epoc32/include/mw/AknInternalIconUtils.h
+epoc32/include/mw/akninternaliconutils.h
 epoc32/include/mw/aknipfed.h
 epoc32/include/mw/aknkeylock.h
-epoc32/include/mw/AknLayout2Id.h
-epoc32/include/mw/AknLayoutFont.h
-epoc32/include/mw/AknListBoxLayoutDecorator.h
-epoc32/include/mw/AknListBoxSettingPage.h
+epoc32/include/mw/aknlayout2id.h
+epoc32/include/mw/aknlayoutfont.h
+epoc32/include/mw/aknlistboxlayoutdecorator.h
+epoc32/include/mw/aknlistboxsettingpage.h
 epoc32/include/mw/aknlistquerycontrol.h
 epoc32/include/mw/aknlistquerydialog.h
 epoc32/include/mw/aknlists.h
 epoc32/include/mw/aknlocationed.h
 epoc32/include/mw/aknlongtapdetector.h
+epoc32/include/mw/aknmarkingmodeobserver.h
 epoc32/include/mw/aknmessagequerycontrol.h
 epoc32/include/mw/aknmessagequerydialog.h
 epoc32/include/mw/aknmfnecommandobserver.h
@@ -1229,88 +1503,88 @@
 epoc32/include/mw/aknmultilinequerycontrol.h
 epoc32/include/mw/aknnavi.h
 epoc32/include/mw/aknnavide.h
-epoc32/include/mw/AknNaviDecoratorObserver.h
+epoc32/include/mw/aknnavidecoratorobserver.h
 epoc32/include/mw/aknnavilabel.h
-epoc32/include/mw/AknNaviObserver.h
+epoc32/include/mw/aknnaviobserver.h
 epoc32/include/mw/aknnotecontrol.h
 epoc32/include/mw/aknnotedialog.h
 epoc32/include/mw/aknnotewrappers.h
-epoc32/include/mw/AknNotify.h
-epoc32/include/mw/AknNotifyStd.h
+epoc32/include/mw/aknnotify.h
+epoc32/include/mw/aknnotifystd.h
 epoc32/include/mw/aknnumed.h
-epoc32/include/mw/AknNumEdwin.h
-epoc32/include/mw/Aknnumseced.h
-epoc32/include/mw/AknPanic.h
+epoc32/include/mw/aknnumedwin.h
+epoc32/include/mw/aknnumseced.h
+epoc32/include/mw/aknpanic.h
 epoc32/include/mw/aknpasswordsettingpage.h
-epoc32/include/mw/AknPictographDrawerInterface.h
-epoc32/include/mw/AknPictographInterface.h
-epoc32/include/mw/AknPictographInterface.inl
+epoc32/include/mw/aknpictographdrawerinterface.h
+epoc32/include/mw/aknpictographinterface.h
+epoc32/include/mw/aknpictographinterface.inl
 epoc32/include/mw/aknpointereventsuppressor.h
-epoc32/include/mw/aknPopup.h
-epoc32/include/mw/AknPopupFader.h
-epoc32/include/mw/AknPopupField.h
-epoc32/include/mw/AknPopupFieldList.h
-epoc32/include/mw/AknPopupFieldText.h
-epoc32/include/mw/aknPopupHeadingPane.h
+epoc32/include/mw/aknpopup.h
+epoc32/include/mw/aknpopupfader.h
+epoc32/include/mw/aknpopupfield.h
+epoc32/include/mw/aknpopupfieldlist.h
+epoc32/include/mw/aknpopupfieldtext.h
+epoc32/include/mw/aknpopupheadingpane.h
 epoc32/include/mw/aknpopuplayout.h
-epoc32/include/mw/AknPopupNotify.h
+epoc32/include/mw/aknpopupnotify.h
 epoc32/include/mw/aknpopupsettingpage.h
-epoc32/include/mw/AknPreviewPopUpContentProvider.h
-epoc32/include/mw/AknPreviewPopUpController.h
-epoc32/include/mw/AknPreviewPopUpObserver.h
-epoc32/include/mw/AknProgressDialog.h
+epoc32/include/mw/aknpreviewpopupcontentprovider.h
+epoc32/include/mw/aknpreviewpopupcontroller.h
+epoc32/include/mw/aknpreviewpopupobserver.h
+epoc32/include/mw/aknprogressdialog.h
 epoc32/include/mw/aknprogresstimer.h
-epoc32/include/mw/aknQueryControl.h
+epoc32/include/mw/aknquerycontrol.h
 epoc32/include/mw/aknquerydata.h
-epoc32/include/mw/AknQueryDialog.h
-epoc32/include/mw/AknQueryValue.h
-epoc32/include/mw/AknQueryValueDate.h
-epoc32/include/mw/AknQueryValueDuration.h
-epoc32/include/mw/AknQueryValueNumber.h
-epoc32/include/mw/AknQueryValuePhone.h
-epoc32/include/mw/AknQueryValueText.h
-epoc32/include/mw/AknQueryValueTime.h
+epoc32/include/mw/aknquerydialog.h
+epoc32/include/mw/aknqueryvalue.h
+epoc32/include/mw/aknqueryvaluedate.h
+epoc32/include/mw/aknqueryvalueduration.h
+epoc32/include/mw/aknqueryvaluenumber.h
+epoc32/include/mw/aknqueryvaluephone.h
+epoc32/include/mw/aknqueryvaluetext.h
+epoc32/include/mw/aknqueryvaluetime.h
 epoc32/include/mw/aknradiobuttonsettingpage.h
-epoc32/include/mw/AknsBasicBackgroundControlContext.h
+epoc32/include/mw/aknsbasicbackgroundcontrolcontext.h
 epoc32/include/mw/aknscbut.h
-epoc32/include/mw/AknsConstants.h
+epoc32/include/mw/aknsconstants.h
 epoc32/include/mw/aknsconstants.hrh
-epoc32/include/mw/AknsControlContext.h
-epoc32/include/mw/AknScreenMode.h
+epoc32/include/mw/aknscontrolcontext.h
+epoc32/include/mw/aknscreenmode.h
 epoc32/include/mw/aknscrlb.h
-epoc32/include/mw/AknsDataContext.h
-epoc32/include/mw/AknsDrawUtils.h
+epoc32/include/mw/aknsdatacontext.h
+epoc32/include/mw/aknsdrawutils.h
 epoc32/include/mw/aknselectionlist.h
-epoc32/include/mw/AknServerApp.h
+epoc32/include/mw/aknserverapp.h
 epoc32/include/mw/aknsettingitemlist.h
 epoc32/include/mw/aknsettingpage.h
 epoc32/include/mw/aknsfld.h
-epoc32/include/mw/AknsFrameBackgroundControlContext.h
+epoc32/include/mw/aknsframebackgroundcontrolcontext.h
 epoc32/include/mw/aknsinglecolumnstyletreelist.h
 epoc32/include/mw/aknsinglestyletreelist.h
-epoc32/include/mw/AknsItemData.h
-epoc32/include/mw/AknsItemID.h
-epoc32/include/mw/AknsItemID.inl
-epoc32/include/mw/AknsLayeredBackgroundControlContext.h
+epoc32/include/mw/aknsitemdata.h
+epoc32/include/mw/aknsitemid.h
+epoc32/include/mw/aknsitemid.inl
+epoc32/include/mw/aknslayeredbackgroundcontrolcontext.h
 epoc32/include/mw/aknslider.h
 epoc32/include/mw/aknslidersettingpage.h
-epoc32/include/mw/AknsListBoxBackgroundControlContext.h
-epoc32/include/mw/aknSoundinfo.h
+epoc32/include/mw/aknslistboxbackgroundcontrolcontext.h
+epoc32/include/mw/aknsoundinfo.h
 epoc32/include/mw/aknsoundsystem.h
-epoc32/include/mw/AknsRlEffect.h
-epoc32/include/mw/AknsRlEffectContext.h
-epoc32/include/mw/AknsRlParameter.h
-epoc32/include/mw/AknsSkinInstance.h
+epoc32/include/mw/aknsrleffect.h
+epoc32/include/mw/aknsrleffectcontext.h
+epoc32/include/mw/aknsrlparameter.h
+epoc32/include/mw/aknsskininstance.h
 epoc32/include/mw/aknstaticnotedialog.h
 epoc32/include/mw/aknstyluspopupmenu.h
-epoc32/include/mw/AknsUtils.h
-epoc32/include/mw/AknsWallpaperUtils.h
+epoc32/include/mw/aknsutils.h
+epoc32/include/mw/aknswallpaperutils.h
 epoc32/include/mw/akntabgrp.h
-epoc32/include/mw/AknTabObserver.h
-epoc32/include/mw/AknTextDecorationMetrics.h
+epoc32/include/mw/akntabobserver.h
+epoc32/include/mw/akntextdecorationmetrics.h
 epoc32/include/mw/akntextsettingpage.h
 epoc32/include/mw/akntitle.h
-epoc32/include/mw/AknTitlePaneObserver.h
+epoc32/include/mw/akntitlepaneobserver.h
 epoc32/include/mw/akntoolbar.h
 epoc32/include/mw/akntoolbarextension.h
 epoc32/include/mw/akntoolbarobserver.h
@@ -1321,14 +1595,14 @@
 epoc32/include/mw/akntreelistconstants.h
 epoc32/include/mw/akntreelistobserver.h
 epoc32/include/mw/aknuniteditor.h
-epoc32/include/mw/AknUtils.h
+epoc32/include/mw/aknutils.h
 epoc32/include/mw/aknview.h
-epoc32/include/mw/aknViewAppUi.h
-epoc32/include/mw/Aknvolumecontrol.h
+epoc32/include/mw/aknviewappui.h
+epoc32/include/mw/aknvolumecontrol.h
 epoc32/include/mw/aknvolumesettingpage.h
-epoc32/include/mw/AknWaitDialog.h
-epoc32/include/mw/AknWaitNoteWrapper.h
-epoc32/include/mw/AknWsEventObserver.h
+epoc32/include/mw/aknwaitdialog.h
+epoc32/include/mw/aknwaitnotewrapper.h
+epoc32/include/mw/aknwseventobserver.h
 epoc32/include/mw/animation.h
 epoc32/include/mw/animationconfig.h
 epoc32/include/mw/animationdataloaderobserver.h
@@ -1342,7 +1616,7 @@
 epoc32/include/mw/animator.h
 epoc32/include/mw/ansicomp.h
 epoc32/include/mw/apaapp.h
-epoc32/include/mw/ApAccessPointItem.h
+epoc32/include/mw/apaccesspointitem.h
 epoc32/include/mw/apacmdln.h
 epoc32/include/mw/apadbase.h
 epoc32/include/mw/apadef.h
@@ -1352,25 +1626,25 @@
 epoc32/include/mw/apamdr.h
 epoc32/include/mw/apaproc.h
 epoc32/include/mw/apcaptionfile.rh
-epoc32/include/mw/ApDataHandler.h
-epoc32/include/mw/ApEngineConsts.h
-epoc32/include/mw/ApEngineVer.h
+epoc32/include/mw/apdatahandler.h
+epoc32/include/mw/apengineconsts.h
+epoc32/include/mw/apenginever.h
 epoc32/include/mw/apgcli.h
 epoc32/include/mw/apgctl.h
 epoc32/include/mw/apgdoor.h
 epoc32/include/mw/apgicnfl.h
 epoc32/include/mw/apgtask.h
 epoc32/include/mw/apgwgnam.h
-epoc32/include/mw/ApListItem.h
-epoc32/include/mw/ApListItemList.h
-epoc32/include/mw/ApNetworkItem.h
-epoc32/include/mw/ApNetworkItemList.h
-epoc32/include/mw/ApNetworks.h
+epoc32/include/mw/aplistitem.h
+epoc32/include/mw/aplistitemlist.h
+epoc32/include/mw/apnetworkitem.h
+epoc32/include/mw/apnetworkitemlist.h
+epoc32/include/mw/apnetworks.h
 epoc32/include/mw/apparc.h
-epoc32/include/mw/ApSelect.h
-epoc32/include/mw/ApSettingsHandlerCommons.h
-epoc32/include/mw/ApSettingsHandlerUI.h
-epoc32/include/mw/ApUtils.h
+epoc32/include/mw/apselect.h
+epoc32/include/mw/apsettingshandlercommons.h
+epoc32/include/mw/apsettingshandlerui.h
+epoc32/include/mw/aputils.h
 epoc32/include/mw/asaltdefs.h
 epoc32/include/mw/ascliclientutils.h
 epoc32/include/mw/asclidefinitions.h
@@ -1382,7 +1656,7 @@
 epoc32/include/mw/attrlut.h
 epoc32/include/mw/avkon.hrh
 epoc32/include/mw/avkon.rh
-epoc32/include/mw/AvkonIcons.hrh
+epoc32/include/mw/avkonicons.hrh
 epoc32/include/mw/basicanimation.h
 epoc32/include/mw/bif.h
 epoc32/include/mw/biocmtm.h
@@ -1407,18 +1681,18 @@
 epoc32/include/mw/bsp.h
 epoc32/include/mw/btnotifierapi.h
 epoc32/include/mw/btserversdkcrkeys.h
-epoc32/include/mw/CAknCommonDialogsBase.h
-epoc32/include/mw/CAknFileNamePromptDialog.h
-epoc32/include/mw/CAknFileSelectionDialog.h
-epoc32/include/mw/CAknMemorySelectionDialog.h
-epoc32/include/mw/CAknMemorySelectionDialogMultiDrive.h
-epoc32/include/mw/CAknMemorySelectionSettingItem.h
-epoc32/include/mw/CAknMemorySelectionSettingItemMultiDrive.h
-epoc32/include/mw/CAknMemorySelectionSettingPage.h
+epoc32/include/mw/cakncommondialogsbase.h
+epoc32/include/mw/caknfilenamepromptdialog.h
+epoc32/include/mw/caknfileselectiondialog.h
+epoc32/include/mw/caknmemoryselectiondialog.h
+epoc32/include/mw/caknmemoryselectiondialogmultidrive.h
+epoc32/include/mw/caknmemoryselectionsettingitem.h
+epoc32/include/mw/caknmemoryselectionsettingitemmultidrive.h
+epoc32/include/mw/caknmemoryselectionsettingpage.h
 epoc32/include/mw/cbioasyncwaiter.h
 epoc32/include/mw/cbnfnode.h
 epoc32/include/mw/cbnfparser.h
-epoc32/include/mw/CDirectoryLocalizer.h
+epoc32/include/mw/cdirectorylocalizer.h
 epoc32/include/mw/cdownloadmgruibase.h
 epoc32/include/mw/cdownloadmgruidownloadmenu.h
 epoc32/include/mw/cdownloadmgruidownloadslist.h
@@ -1429,11 +1703,12 @@
 epoc32/include/mw/cfragmentedstring.h
 epoc32/include/mw/chttpclienttransaction.h
 epoc32/include/mw/chttpformencoder.h
+epoc32/include/mw/chttpnetworkconnectioninfo.h
 epoc32/include/mw/chttpresponse.h
 epoc32/include/mw/chttpservice.h
-epoc32/include/mw/CLFContentListing.h
-epoc32/include/mw/CLFContentListing.hrh
-epoc32/include/mw/CLFContentListing.rh
+epoc32/include/mw/clfcontentlisting.h
+epoc32/include/mw/clfcontentlisting.hrh
+epoc32/include/mw/clfcontentlisting.rh
 epoc32/include/mw/clock.h
 epoc32/include/mw/cmapplicationsettingsui.h
 epoc32/include/mw/cmarkedstack.h
@@ -1442,8 +1717,8 @@
 epoc32/include/mw/cmconnectionmethoddef.h
 epoc32/include/mw/cmdefconnvalues.h
 epoc32/include/mw/cmdestination.h
-epoc32/include/mw/CMessageAddress.h
-epoc32/include/mw/CMessageData.h
+epoc32/include/mw/cmessageaddress.h
+epoc32/include/mw/cmessagedata.h
 epoc32/include/mw/cmgenconnsettings.h
 epoc32/include/mw/cmmanager.h
 epoc32/include/mw/cmmanager.inl
@@ -1485,31 +1760,85 @@
 epoc32/include/mw/coetextdrawer.h
 epoc32/include/mw/coeutils.h
 epoc32/include/mw/coeview.h
-epoc32/include/mw/CommonDialogs.hrh
-epoc32/include/mw/CommonDialogs.rh
+epoc32/include/mw/commondialogs.hrh
+epoc32/include/mw/commondialogs.rh
 epoc32/include/mw/conarc.h
 epoc32/include/mw/concnf.h
 epoc32/include/mw/confndr.h
 epoc32/include/mw/conlist.h
 epoc32/include/mw/conplugin.rh
-epoc32/include/mw/ContentListingFactory.h
+epoc32/include/mw/contentlistingfactory.h
 epoc32/include/mw/copydatafile.h
-epoc32/include/mw/CoreApplicationUIsSDKCRKeys.h
+epoc32/include/mw/coreapplicationuissdkcrkeys.h
 epoc32/include/mw/crulemarkedstack.h
-epoc32/include/mw/CSatelliteInfoUI.h
+epoc32/include/mw/csatelliteinfoui.h
 epoc32/include/mw/csendasaccounts.h
 epoc32/include/mw/csendasmessagetypes.h
-epoc32/include/mw/CSendingServiceInfo.h
+epoc32/include/mw/csendingserviceinfo.h
 epoc32/include/mw/csmsclass0base.h
 epoc32/include/mw/cstack.h
+epoc32/include/mw/cwrt/appmgtdefs.h
+epoc32/include/mw/cwrt/appmgtinterface.h
+epoc32/include/mw/cwrt/capability.h
+epoc32/include/mw/cwrt/clientinfo.h
+epoc32/include/mw/cwrt/condition.h
+epoc32/include/mw/cwrt/configurationserviceinterface.h
+epoc32/include/mw/cwrt/cwrtregistry.h
+epoc32/include/mw/cwrt/cwrtregistryclient.h
+epoc32/include/mw/cwrt/dmdownloadproperties.h
+epoc32/include/mw/cwrt/dmdownloadstatus.h
+epoc32/include/mw/cwrt/downloadmgtclient.h
+epoc32/include/mw/cwrt/downloadmgtclientdefs.h
+epoc32/include/mw/cwrt/downloadmgtserviceinterface.h
+epoc32/include/mw/cwrt/errdefs.h
+epoc32/include/mw/cwrt/eventmessageapiservice.h
+epoc32/include/mw/cwrt/eventmessageapiserviceinterface.h
+epoc32/include/mw/cwrt/eventmessageapiserviceplugin.h
+epoc32/include/mw/cwrt/iterable.h
+epoc32/include/mw/cwrt/nativeappupdatedefs.h
+epoc32/include/mw/cwrt/nativeappupdateserviceinterface.h
+epoc32/include/mw/cwrt/runtimeinfoservicedefs.h
+epoc32/include/mw/cwrt/runtimeinfoserviceinterface.h
+epoc32/include/mw/cwrt/secmgrdefs.h
+epoc32/include/mw/cwrt/secsession.h
+epoc32/include/mw/cwrt/securestorage.h
+epoc32/include/mw/cwrt/securestorageclient.h
+epoc32/include/mw/cwrt/securestorageclientsymbian.h
+epoc32/include/mw/cwrt/securitymanager.h
+epoc32/include/mw/cwrt/service.h
+epoc32/include/mw/cwrt/servicebase.h
+epoc32/include/mw/cwrt/servicehandler.h
+epoc32/include/mw/cwrt/serviceinterfaceinfo.h
+epoc32/include/mw/cwrt/serviceipc.h
+epoc32/include/mw/cwrt/serviceipcclient.h
+epoc32/include/mw/cwrt/serviceipcdefs.h
+epoc32/include/mw/cwrt/serviceipcobserver.h
+epoc32/include/mw/cwrt/serviceipcrequest.h
+epoc32/include/mw/cwrt/serviceipcserver.h
+epoc32/include/mw/cwrt/serviceipcserversession.h
+epoc32/include/mw/cwrt/serviceplugininterface.h
+epoc32/include/mw/cwrt/servicesecurityinterface.h
+epoc32/include/mw/cwrt/sfwerrorhandler.h
+epoc32/include/mw/cwrt/sfwexception.h
+epoc32/include/mw/cwrt/sfwlog.h
+epoc32/include/mw/cwrt/sfwservicelogger.h
+epoc32/include/mw/cwrt/storage.h
+epoc32/include/mw/cwrt/trustsession.h
+epoc32/include/mw/cwrt/usercondition.h
+epoc32/include/mw/cwrt/userconditionhandler.h
+epoc32/include/mw/cwrt/webappupdateinterface.h
+epoc32/include/mw/cwrt/widgetpropertyvalue.h
+epoc32/include/mw/cwrt/widgetregistryclientwrt.h
+epoc32/include/mw/cwrt/widgetregistryconstants.h
+epoc32/include/mw/cwrt/widgetregistrydata.h
 epoc32/include/mw/dclcrkeys.h
-epoc32/include/mw/DirectoryLocalizer.rh
-epoc32/include/mw/DocumentHandler.h
+epoc32/include/mw/directorylocalizer.rh
+epoc32/include/mw/documenthandler.h
 epoc32/include/mw/downloadmgrclient.h
 epoc32/include/mw/downloadslistdlgobserver.h
-epoc32/include/mw/DRMHelper.h
-epoc32/include/mw/DRMHelperServerInternalCRKeys.h
-epoc32/include/mw/DRMLicenseChecker.h
+epoc32/include/mw/drmhelper.h
+epoc32/include/mw/drmhelperserverinternalcrkeys.h
+epoc32/include/mw/drmlicensechecker.h
 epoc32/include/mw/dtdnode.h
 epoc32/include/mw/eikalert.h
 epoc32/include/mw/eikalign.h
@@ -1588,7 +1917,6 @@
 epoc32/include/mw/eiknotapi.h
 epoc32/include/mw/eikon.hrh
 epoc32/include/mw/eikon.rh
-epoc32/include/mw/eikon.rsg
 epoc32/include/mw/eikproc.h
 epoc32/include/mw/eikprogi.h
 epoc32/include/mw/eikrted.h
@@ -1609,39 +1937,39 @@
 epoc32/include/mw/eiktxlbx.h
 epoc32/include/mw/eikunder.h
 epoc32/include/mw/eikvcurs.h
-epoc32/include/mw/EPos_CPosLandmark.h
-epoc32/include/mw/EPos_CPosLandmarkCategory.h
-epoc32/include/mw/EPos_CPosLandmarkDatabase.h
+epoc32/include/mw/epos_cposlandmark.h
+epoc32/include/mw/epos_cposlandmarkcategory.h
+epoc32/include/mw/epos_cposlandmarkdatabase.h
 epoc32/include/mw/epos_cposlandmarkdatabaseextended.h
-epoc32/include/mw/EPos_CPosLandmarkEncoder.h
-epoc32/include/mw/EPos_CPosLandmarkParser.h
-epoc32/include/mw/EPos_CPosLandmarkSearch.h
-epoc32/include/mw/EPos_CPosLmAreaCriteria.h
-epoc32/include/mw/EPos_CPosLmCategoryCriteria.h
-epoc32/include/mw/EPos_CPosLmCategoryManager.h
-epoc32/include/mw/EPos_CPosLmCatNameCriteria.h
-epoc32/include/mw/EPos_CPosLmCompositeCriteria.h
-epoc32/include/mw/EPos_CPosLmDatabaseManager.h
-epoc32/include/mw/EPos_CPosLmDatabaseManagerPluginBase.h
-epoc32/include/mw/EPos_CPosLmDisplayData.h
-epoc32/include/mw/EPos_CPosLmDisplayItem.h
-epoc32/include/mw/EPos_CPosLmIdListCriteria.h
-epoc32/include/mw/EPos_CPosLmItemIterator.h
-epoc32/include/mw/EPos_CPosLmMultiDbSearch.h
-epoc32/include/mw/EPos_CPosLmNearestCriteria.h
-epoc32/include/mw/EPos_CPosLmOperation.h
-epoc32/include/mw/EPos_CPosLmOperation.inl
-epoc32/include/mw/EPos_CPosLmPartialReadParameters.h
-epoc32/include/mw/EPos_CPosLmSearchCriteria.h
-epoc32/include/mw/EPos_CPosLmTextCriteria.h
-epoc32/include/mw/EPos_HPosLmDatabaseInfo.h
-epoc32/include/mw/EPos_Landmarks.h
+epoc32/include/mw/epos_cposlandmarkencoder.h
+epoc32/include/mw/epos_cposlandmarkparser.h
+epoc32/include/mw/epos_cposlandmarksearch.h
+epoc32/include/mw/epos_cposlmareacriteria.h
+epoc32/include/mw/epos_cposlmcategorycriteria.h
+epoc32/include/mw/epos_cposlmcategorymanager.h
+epoc32/include/mw/epos_cposlmcatnamecriteria.h
+epoc32/include/mw/epos_cposlmcompositecriteria.h
+epoc32/include/mw/epos_cposlmdatabasemanager.h
+epoc32/include/mw/epos_cposlmdatabasemanagerpluginbase.h
+epoc32/include/mw/epos_cposlmdisplaydata.h
+epoc32/include/mw/epos_cposlmdisplayitem.h
+epoc32/include/mw/epos_cposlmidlistcriteria.h
+epoc32/include/mw/epos_cposlmitemiterator.h
+epoc32/include/mw/epos_cposlmmultidbsearch.h
+epoc32/include/mw/epos_cposlmnearestcriteria.h
+epoc32/include/mw/epos_cposlmoperation.h
+epoc32/include/mw/epos_cposlmoperation.inl
+epoc32/include/mw/epos_cposlmpartialreadparameters.h
+epoc32/include/mw/epos_cposlmsearchcriteria.h
+epoc32/include/mw/epos_cposlmtextcriteria.h
+epoc32/include/mw/epos_hposlmdatabaseinfo.h
+epoc32/include/mw/epos_landmarks.h
 epoc32/include/mw/epos_poslandmarkserialization.h
 epoc32/include/mw/epos_poslmcategoryserialization.h
-epoc32/include/mw/EPos_TPosLmDatabaseEvent.h
-epoc32/include/mw/EPos_TPosLmDatabaseSettings.h
-epoc32/include/mw/EPos_TPosLmSortPref.h
-epoc32/include/mw/ErrorUI.h
+epoc32/include/mw/epos_tposlmdatabaseevent.h
+epoc32/include/mw/epos_tposlmdatabasesettings.h
+epoc32/include/mw/epos_tposlmsortpref.h
+epoc32/include/mw/errorui.h
 epoc32/include/mw/estatus.h
 epoc32/include/mw/extendedconnpref.h
 epoc32/include/mw/favouritesdb.h
@@ -1691,9 +2019,11 @@
 epoc32/include/mw/http/framework/csecuritypolicy.h
 epoc32/include/mw/http/framework/csecuritypolicy.inl
 epoc32/include/mw/http/framework/ctxdata.h
+epoc32/include/mw/http/framework/httplogger.h
 epoc32/include/mw/http/framework/mrxdataobserver.h
 epoc32/include/mw/http/framework/rheaderfield.h
 epoc32/include/mw/http/mhttpauthenticationcallback.h
+epoc32/include/mw/http/mhttpdataoptimiser.h
 epoc32/include/mw/http/mhttpdatasupplier.h
 epoc32/include/mw/http/mhttpfilter.h
 epoc32/include/mw/http/mhttpfilterbase.h
@@ -1763,65 +2093,65 @@
 epoc32/include/mw/lbttriggeringsystemsettingschangeeventnotifier.h
 epoc32/include/mw/lbttriggeringsystemsettingschangeeventobserver.h
 epoc32/include/mw/logdef.h
-epoc32/include/mw/MAknFileFilter.h
-epoc32/include/mw/MAknFileSelectionObserver.h
-epoc32/include/mw/MAknMemorySelectionObserver.h
-epoc32/include/mw/MCLFChangedItemObserver.h
-epoc32/include/mw/MCLFContentListingEngine.h
-epoc32/include/mw/MCLFCustomGrouper.h
-epoc32/include/mw/MCLFCustomSorter.h
-epoc32/include/mw/MCLFItem.h
-epoc32/include/mw/MCLFItemListModel.h
-epoc32/include/mw/MCLFModifiableItem.h
-epoc32/include/mw/MCLFOperationObserver.h
-epoc32/include/mw/MCLFPostFilter.h
-epoc32/include/mw/MCLFProcessObserver.h
-epoc32/include/mw/MCLFSortingStyle.h
+epoc32/include/mw/maknfilefilter.h
+epoc32/include/mw/maknfileselectionobserver.h
+epoc32/include/mw/maknmemoryselectionobserver.h
+epoc32/include/mw/mclfchangeditemobserver.h
+epoc32/include/mw/mclfcontentlistingengine.h
+epoc32/include/mw/mclfcustomgrouper.h
+epoc32/include/mw/mclfcustomsorter.h
+epoc32/include/mw/mclfitem.h
+epoc32/include/mw/mclfitemlistmodel.h
+epoc32/include/mw/mclfmodifiableitem.h
+epoc32/include/mw/mclfoperationobserver.h
+epoc32/include/mw/mclfpostfilter.h
+epoc32/include/mw/mclfprocessobserver.h
+epoc32/include/mw/mclfsortingstyle.h
 epoc32/include/mw/mdataproviderobserver.h
 epoc32/include/mw/mdptx.h
-epoc32/include/mw/MediaFileTypes.hrh
-epoc32/include/mw/MemoryManager.h
+epoc32/include/mw/mediafiletypes.hrh
+epoc32/include/mw/memorymanager.h
 epoc32/include/mw/mframeworksp.h
-epoc32/include/mw/MGFetch.h
+epoc32/include/mw/mgfetch.h
 epoc32/include/mw/mhttpcontentsink.h
 epoc32/include/mw/mhttpcontentsource.h
-epoc32/include/mw/MMFROPCustomCommandConstants.h
-epoc32/include/mw/MMGFetchCanceler.h
-epoc32/include/mw/MMGFetchVerifier.h
+epoc32/include/mw/mhttpserviceauthentication.h
+epoc32/include/mw/mmfropcustomcommandconstants.h
+epoc32/include/mw/mmgfetchcanceler.h
+epoc32/include/mw/mmgfetchverifier.h
 epoc32/include/mw/mmsvattachmentmanager.h
 epoc32/include/mw/mmsvattachmentmanagersync.h
 epoc32/include/mw/mobexnotify.h
-epoc32/include/mw/mosshangulinputeventobserver.h
-epoc32/include/mw/MProEngActiveProfileObserver.h
-epoc32/include/mw/MProEngAlertToneSeeker.h
-epoc32/include/mw/MProEngAlertToneSeekerObserver.h
-epoc32/include/mw/MProEngEngine.h
-epoc32/include/mw/MProEngNotifyHandler.h
-epoc32/include/mw/MProEngProfile.h
-epoc32/include/mw/MProEngProfileActivationObserver.h
-epoc32/include/mw/MProEngProfileName.h
-epoc32/include/mw/MProEngProfileNameArray.h
-epoc32/include/mw/MProEngProfileNameArrayObserver.h
-epoc32/include/mw/MProEngProfileObserver.h
-epoc32/include/mw/MProEngTones.h
-epoc32/include/mw/MProEngToneSettings.h
-epoc32/include/mw/MSenAuthenticationProvider.h
+epoc32/include/mw/mproengactiveprofileobserver.h
+epoc32/include/mw/mproengalerttoneseeker.h
+epoc32/include/mw/mproengalerttoneseekerobserver.h
+epoc32/include/mw/mproengengine.h
+epoc32/include/mw/mproengnotifyhandler.h
+epoc32/include/mw/mproengprofile.h
+epoc32/include/mw/mproengprofileactivationobserver.h
+epoc32/include/mw/mproengprofilename.h
+epoc32/include/mw/mproengprofilenamearray.h
+epoc32/include/mw/mproengprofilenamearrayobserver.h
+epoc32/include/mw/mproengprofileobserver.h
+epoc32/include/mw/mproengtones.h
+epoc32/include/mw/mproengtonesettings.h
+epoc32/include/mw/msenauthenticationprovider.h
 epoc32/include/mw/msencobrandinginterface.h
-epoc32/include/mw/MSenConsumerPolicy.h
-epoc32/include/mw/MSenContentHandlerClient.h
-epoc32/include/mw/MSenElement.h
-epoc32/include/mw/MSenFragment.h
-epoc32/include/mw/MSenHostlet.h
-epoc32/include/mw/MSenHostletRequest.h
-epoc32/include/mw/MSenHostletResponse.h
-epoc32/include/mw/MSenIdentityProviderIdArray.h
-epoc32/include/mw/MSenMessage.h
-epoc32/include/mw/MSenProperties.h
-epoc32/include/mw/MSenProperty.h
-epoc32/include/mw/MSenProviderPolicy.h
-epoc32/include/mw/MSenServiceConsumer.h
-epoc32/include/mw/MSenServiceDescription.h
-epoc32/include/mw/MSenServicePolicy.h
+epoc32/include/mw/msenconsumerpolicy.h
+epoc32/include/mw/msencontenthandlerclient.h
+epoc32/include/mw/msenelement.h
+epoc32/include/mw/msenfragment.h
+epoc32/include/mw/msenhostlet.h
+epoc32/include/mw/msenhostletrequest.h
+epoc32/include/mw/msenhostletresponse.h
+epoc32/include/mw/msenidentityprovideridarray.h
+epoc32/include/mw/msenmessage.h
+epoc32/include/mw/msenproperties.h
+epoc32/include/mw/msenproperty.h
+epoc32/include/mw/msenproviderpolicy.h
+epoc32/include/mw/msenserviceconsumer.h
+epoc32/include/mw/msenservicedescription.h
+epoc32/include/mw/msenservicepolicy.h
 epoc32/include/mw/msvapi.h
 epoc32/include/mw/msventry.h
 epoc32/include/mw/msventryscheduledata.h
@@ -1875,11 +2205,156 @@
 epoc32/include/mw/obsolete/protypes.h
 epoc32/include/mw/ocrcommon.h
 epoc32/include/mw/ocrsrv.h
-epoc32/include/mw/Oma2Agent.h
-epoc32/include/mw/osscombination.h
-epoc32/include/mw/osshangulinputcontext.h
-epoc32/include/mw/osshanja.h
-epoc32/include/mw/osskeyboard.h
+epoc32/include/mw/oma2agent.h
+epoc32/include/mw/phonon/abstractaudiooutput
+epoc32/include/mw/phonon/abstractaudiooutput.h
+epoc32/include/mw/phonon/abstractmediastream
+epoc32/include/mw/phonon/abstractmediastream.h
+epoc32/include/mw/phonon/abstractvideooutput
+epoc32/include/mw/phonon/abstractvideooutput.h
+epoc32/include/mw/phonon/addoninterface
+epoc32/include/mw/phonon/addoninterface.h
+epoc32/include/mw/phonon/audiocapturedevice
+epoc32/include/mw/phonon/audiocapturedevicemodel
+epoc32/include/mw/phonon/audiochanneldescription
+epoc32/include/mw/phonon/audiochanneldescriptionmodel
+epoc32/include/mw/phonon/audiooutput
+epoc32/include/mw/phonon/audiooutput.h
+epoc32/include/mw/phonon/audiooutputdevice
+epoc32/include/mw/phonon/audiooutputdevicemodel
+epoc32/include/mw/phonon/audiooutputinterface
+epoc32/include/mw/phonon/audiooutputinterface.h
+epoc32/include/mw/phonon/audiooutputinterface40
+epoc32/include/mw/phonon/audiooutputinterface42
+epoc32/include/mw/phonon/backendcapabilities
+epoc32/include/mw/phonon/backendcapabilities.h
+epoc32/include/mw/phonon/backendinterface
+epoc32/include/mw/phonon/backendinterface.h
+epoc32/include/mw/phonon/effect
+epoc32/include/mw/phonon/effect.h
+epoc32/include/mw/phonon/effectdescription
+epoc32/include/mw/phonon/effectdescriptionmodel
+epoc32/include/mw/phonon/effectinterface
+epoc32/include/mw/phonon/effectinterface.h
+epoc32/include/mw/phonon/effectparameter
+epoc32/include/mw/phonon/effectparameter.h
+epoc32/include/mw/phonon/effectwidget
+epoc32/include/mw/phonon/effectwidget.h
+epoc32/include/mw/phonon/global
+epoc32/include/mw/phonon/headers.pri
+epoc32/include/mw/phonon/mediacontroller
+epoc32/include/mw/phonon/mediacontroller.h
+epoc32/include/mw/phonon/medianode
+epoc32/include/mw/phonon/medianode.h
+epoc32/include/mw/phonon/mediaobject
+epoc32/include/mw/phonon/mediaobject.h
+epoc32/include/mw/phonon/mediaobjectinterface
+epoc32/include/mw/phonon/mediaobjectinterface.h
+epoc32/include/mw/phonon/mediasource
+epoc32/include/mw/phonon/mediasource.h
+epoc32/include/mw/phonon/objectdescription
+epoc32/include/mw/phonon/objectdescription.h
+epoc32/include/mw/phonon/objectdescriptiondata
+epoc32/include/mw/phonon/objectdescriptionmodel
+epoc32/include/mw/phonon/objectdescriptionmodel.h
+epoc32/include/mw/phonon/objectdescriptionmodeldata
+epoc32/include/mw/phonon/path
+epoc32/include/mw/phonon/path.h
+epoc32/include/mw/phonon/phonon
+epoc32/include/mw/phonon/phonon_export.h
+epoc32/include/mw/phonon/phonondefs.h
+epoc32/include/mw/phonon/phononnamespace.h
+epoc32/include/mw/phonon/private/abstractaudiooutput_p.h
+epoc32/include/mw/phonon/private/abstractmediastream_p.h
+epoc32/include/mw/phonon/private/abstractvideooutput_p.h
+epoc32/include/mw/phonon/private/audiooutput_p.h
+epoc32/include/mw/phonon/private/audiooutputadaptor_p.h
+epoc32/include/mw/phonon/private/backendcapabilities_p.h
+epoc32/include/mw/phonon/private/effect_p.h
+epoc32/include/mw/phonon/private/effectparameter_p.h
+epoc32/include/mw/phonon/private/effectwidget_p.h
+epoc32/include/mw/phonon/private/factory_p.h
+epoc32/include/mw/phonon/private/frontendinterface_p.h
+epoc32/include/mw/phonon/private/globalconfig_p.h
+epoc32/include/mw/phonon/private/globalstatic_p.h
+epoc32/include/mw/phonon/private/iodevicestream_p.h
+epoc32/include/mw/phonon/private/medianode_p.h
+epoc32/include/mw/phonon/private/medianodedestructionhandler_p.h
+epoc32/include/mw/phonon/private/mediaobject_p.h
+epoc32/include/mw/phonon/private/mediasource_p.h
+epoc32/include/mw/phonon/private/objectdescription_p.h
+epoc32/include/mw/phonon/private/objectdescriptionmodel_p.h
+epoc32/include/mw/phonon/private/path_p.h
+epoc32/include/mw/phonon/private/phonondefs_p.h
+epoc32/include/mw/phonon/private/phononnamespace_p.h
+epoc32/include/mw/phonon/private/qsettingsgroup_p.h
+epoc32/include/mw/phonon/private/seekslider_p.h
+epoc32/include/mw/phonon/private/streaminterface_p.h
+epoc32/include/mw/phonon/private/videowidget_p.h
+epoc32/include/mw/phonon/private/volumefadereffect_p.h
+epoc32/include/mw/phonon/private/volumeslider_p.h
+epoc32/include/mw/phonon/seekslider
+epoc32/include/mw/phonon/seekslider.h
+epoc32/include/mw/phonon/streaminterface
+epoc32/include/mw/phonon/streaminterface.h
+epoc32/include/mw/phonon/subtitledescription
+epoc32/include/mw/phonon/subtitledescriptionmodel
+epoc32/include/mw/phonon/videoplayer
+epoc32/include/mw/phonon/videoplayer.h
+epoc32/include/mw/phonon/videowidget
+epoc32/include/mw/phonon/videowidget.h
+epoc32/include/mw/phonon/videowidgetinterface
+epoc32/include/mw/phonon/videowidgetinterface.h
+epoc32/include/mw/phonon/volumefadereffect
+epoc32/include/mw/phonon/volumefadereffect.h
+epoc32/include/mw/phonon/volumefaderinterface
+epoc32/include/mw/phonon/volumefaderinterface.h
+epoc32/include/mw/phonon/volumeslider
+epoc32/include/mw/phonon/volumeslider.h
+epoc32/include/mw/phonon_compat/phonon/abstractaudiooutput
+epoc32/include/mw/phonon_compat/phonon/abstractmediastream
+epoc32/include/mw/phonon_compat/phonon/abstractvideooutput
+epoc32/include/mw/phonon_compat/phonon/addoninterface
+epoc32/include/mw/phonon_compat/phonon/audiocapturedevice
+epoc32/include/mw/phonon_compat/phonon/audiocapturedevicemodel
+epoc32/include/mw/phonon_compat/phonon/audiochanneldescription
+epoc32/include/mw/phonon_compat/phonon/audiochanneldescriptionmodel
+epoc32/include/mw/phonon_compat/phonon/audiooutput
+epoc32/include/mw/phonon_compat/phonon/audiooutputdevice
+epoc32/include/mw/phonon_compat/phonon/audiooutputdevicemodel
+epoc32/include/mw/phonon_compat/phonon/audiooutputinterface
+epoc32/include/mw/phonon_compat/phonon/audiooutputinterface40
+epoc32/include/mw/phonon_compat/phonon/audiooutputinterface42
+epoc32/include/mw/phonon_compat/phonon/backendcapabilities
+epoc32/include/mw/phonon_compat/phonon/backendinterface
+epoc32/include/mw/phonon_compat/phonon/effect
+epoc32/include/mw/phonon_compat/phonon/effectdescription
+epoc32/include/mw/phonon_compat/phonon/effectdescriptionmodel
+epoc32/include/mw/phonon_compat/phonon/effectinterface
+epoc32/include/mw/phonon_compat/phonon/effectparameter
+epoc32/include/mw/phonon_compat/phonon/effectwidget
+epoc32/include/mw/phonon_compat/phonon/global
+epoc32/include/mw/phonon_compat/phonon/mediacontroller
+epoc32/include/mw/phonon_compat/phonon/medianode
+epoc32/include/mw/phonon_compat/phonon/mediaobject
+epoc32/include/mw/phonon_compat/phonon/mediaobjectinterface
+epoc32/include/mw/phonon_compat/phonon/mediasource
+epoc32/include/mw/phonon_compat/phonon/objectdescription
+epoc32/include/mw/phonon_compat/phonon/objectdescriptiondata
+epoc32/include/mw/phonon_compat/phonon/objectdescriptionmodel
+epoc32/include/mw/phonon_compat/phonon/objectdescriptionmodeldata
+epoc32/include/mw/phonon_compat/phonon/path
+epoc32/include/mw/phonon_compat/phonon/phonon
+epoc32/include/mw/phonon_compat/phonon/seekslider
+epoc32/include/mw/phonon_compat/phonon/streaminterface
+epoc32/include/mw/phonon_compat/phonon/subtitledescription
+epoc32/include/mw/phonon_compat/phonon/subtitledescriptionmodel
+epoc32/include/mw/phonon_compat/phonon/videoplayer
+epoc32/include/mw/phonon_compat/phonon/videowidget
+epoc32/include/mw/phonon_compat/phonon/videowidgetinterface
+epoc32/include/mw/phonon_compat/phonon/volumefadereffect
+epoc32/include/mw/phonon_compat/phonon/volumefaderinterface
+epoc32/include/mw/phonon_compat/phonon/volumeslider
 epoc32/include/mw/playerinformationtarget.h
 epoc32/include/mw/playerinformationtargetobserver.h
 epoc32/include/mw/pluginadapterinterface.h
@@ -1889,25 +2364,29 @@
 epoc32/include/mw/prnprev.h
 epoc32/include/mw/prnsetup.h
 epoc32/include/mw/prnuids.h
-epoc32/include/mw/ProEngFactory.h
-epoc32/include/mw/Profile.hrh
-epoc32/include/mw/ProfileEngineSDKCRKeys.h
+epoc32/include/mw/proengfactory.h
+epoc32/include/mw/profile.hrh
+epoc32/include/mw/profileenginesdkcrkeys.h
 epoc32/include/mw/prtypes.h
-epoc32/include/mw/PtiCompositionDataIF.h
-epoc32/include/mw/PtiCore.h
-epoc32/include/mw/PtiDefs.h
-epoc32/include/mw/PtiDefs.inl
-epoc32/include/mw/PtiEngine.h
-epoc32/include/mw/PtiKeyMappings.h
-epoc32/include/mw/PtiLanguage.h
-epoc32/include/mw/PtiLanguage.inl
-epoc32/include/mw/PtiLanguageDatabase.h
-epoc32/include/mw/PtiObserver.h
-epoc32/include/mw/PtiUids.hrh
-epoc32/include/mw/PtiUserDicEntry.h
-epoc32/include/mw/PtiUserDicEntry.inl
-epoc32/include/mw/PtiUserDictionary.h
-epoc32/include/mw/PtiUserDictionary.inl
+epoc32/include/mw/pticompositiondataif.h
+epoc32/include/mw/pticore.h
+epoc32/include/mw/ptidefs.h
+epoc32/include/mw/ptidefs.inl
+epoc32/include/mw/ptiengine.h
+epoc32/include/mw/ptikeymappings.h
+epoc32/include/mw/ptilanguage.h
+epoc32/include/mw/ptilanguage.inl
+epoc32/include/mw/ptilanguagedatabase.h
+epoc32/include/mw/ptiobserver.h
+epoc32/include/mw/ptiuids.hrh
+epoc32/include/mw/ptiuserdicentry.h
+epoc32/include/mw/ptiuserdicentry.inl
+epoc32/include/mw/ptiuserdictionary.h
+epoc32/include/mw/ptiuserdictionary.inl
+epoc32/include/mw/qmobilityglobal.h
+epoc32/include/mw/qnetworkconfigmanager.h
+epoc32/include/mw/qnetworkconfiguration.h
+epoc32/include/mw/qnetworksession.h
 epoc32/include/mw/rconnmon.h
 epoc32/include/mw/rdrmhelper.h
 epoc32/include/mw/regpsdll.h
@@ -1941,7 +2420,7 @@
 epoc32/include/mw/remconstatusapicontrollerobserver.h
 epoc32/include/mw/rsendas.h
 epoc32/include/mw/rsendasmessage.h
-epoc32/include/mw/RSenDocument.h
+epoc32/include/mw/rsendocument.h
 epoc32/include/mw/rsfwmountentry.h
 epoc32/include/mw/rsfwmountentryitem.h
 epoc32/include/mw/rsfwmountman.h
@@ -1951,9 +2430,9 @@
 epoc32/include/mw/schsend.rh
 epoc32/include/mw/schsend_panic.h
 epoc32/include/mw/screensaverplugin.h
-epoc32/include/mw/ScreensaverpluginIntDef.h
-epoc32/include/mw/ScreensaverpluginIntDef.hrh
-epoc32/include/mw/ScreensaverpluginIntDef.inl
+epoc32/include/mw/screensaverpluginintdef.h
+epoc32/include/mw/screensaverpluginintdef.hrh
+epoc32/include/mw/screensaverpluginintdef.inl
 epoc32/include/mw/sdpattributefield.h
 epoc32/include/mw/sdpbandwidthfield.h
 epoc32/include/mw/sdpcodecconstants.h
@@ -1970,51 +2449,51 @@
 epoc32/include/mw/sdptimefield.h
 epoc32/include/mw/sdptypedtime.h
 epoc32/include/mw/seconsdkcrkeys.h
-epoc32/include/mw/SenBaseAttribute.h
-epoc32/include/mw/SenBaseElement.h
-epoc32/include/mw/SenBaseFragment.h
-epoc32/include/mw/SenCredential.h
-epoc32/include/mw/SenCredential2.h
+epoc32/include/mw/senbaseattribute.h
+epoc32/include/mw/senbaseelement.h
+epoc32/include/mw/senbasefragment.h
+epoc32/include/mw/sencredential.h
+epoc32/include/mw/sencredential2.h
 epoc32/include/mw/sencryptoutils.h
 epoc32/include/mw/sendas2.h
 epoc32/include/mw/sendasserver.rh
-epoc32/include/mw/SenDateUtils.h
-epoc32/include/mw/SenDomFragment.h
-epoc32/include/mw/SenDomFragmentBase.h
+epoc32/include/mw/sendateutils.h
+epoc32/include/mw/sendomfragment.h
+epoc32/include/mw/sendomfragmentbase.h
 epoc32/include/mw/sendui.h
-epoc32/include/mw/SendUiConsts.h
-epoc32/include/mw/SenduiMtmUids.h
-epoc32/include/mw/SenElement.h
-epoc32/include/mw/SenFacet.h
-epoc32/include/mw/SenFragment.h
-epoc32/include/mw/SenFragmentBase.h
-epoc32/include/mw/SenHostletConnection.h
-epoc32/include/mw/SenHttpTransportProperties.h
-epoc32/include/mw/SenIdentityProvider.h
-epoc32/include/mw/SenIdentityProviderIdArray8.h
-epoc32/include/mw/SenNameSpace.h
-epoc32/include/mw/SenParser.h
+epoc32/include/mw/senduiconsts.h
+epoc32/include/mw/senduimtmuids.h
+epoc32/include/mw/senelement.h
+epoc32/include/mw/senfacet.h
+epoc32/include/mw/senfragment.h
+epoc32/include/mw/senfragmentbase.h
+epoc32/include/mw/senhostletconnection.h
+epoc32/include/mw/senhttptransportproperties.h
+epoc32/include/mw/senidentityprovider.h
+epoc32/include/mw/senidentityprovideridarray8.h
+epoc32/include/mw/sennamespace.h
+epoc32/include/mw/senparser.h
 epoc32/include/mw/senpointermap.h
-epoc32/include/mw/SenServiceConnection.h
+epoc32/include/mw/senserviceconnection.h
 epoc32/include/mw/senserviceconnectioninterfaces.h
-epoc32/include/mw/SenServiceManager.h
-epoc32/include/mw/SenServicePattern.h
-epoc32/include/mw/SenSoapConstants.h
-epoc32/include/mw/SenSoapEnvelope.h
-epoc32/include/mw/SenSoapEnvelope2.h
-epoc32/include/mw/SenSoapFault.h
-epoc32/include/mw/SenSoapFault2.h
-epoc32/include/mw/SenSoapMessage.h
-epoc32/include/mw/SenSoapMessage2.h
-epoc32/include/mw/SenTransportProperties.h
-epoc32/include/mw/SenWsSecurityHeader.h
-epoc32/include/mw/SenWsSecurityHeader2.h
-epoc32/include/mw/SenXmlConstants.h
-epoc32/include/mw/SenXmlElement.h
-epoc32/include/mw/SenXmlProperties.h
-epoc32/include/mw/SenXmlReader.h
-epoc32/include/mw/SenXmlServiceDescription.h
-epoc32/include/mw/SenXmlUtils.h
+epoc32/include/mw/senservicemanager.h
+epoc32/include/mw/senservicepattern.h
+epoc32/include/mw/sensoapconstants.h
+epoc32/include/mw/sensoapenvelope.h
+epoc32/include/mw/sensoapenvelope2.h
+epoc32/include/mw/sensoapfault.h
+epoc32/include/mw/sensoapfault2.h
+epoc32/include/mw/sensoapmessage.h
+epoc32/include/mw/sensoapmessage2.h
+epoc32/include/mw/sentransportproperties.h
+epoc32/include/mw/senwssecurityheader.h
+epoc32/include/mw/senwssecurityheader2.h
+epoc32/include/mw/senxmlconstants.h
+epoc32/include/mw/senxmlelement.h
+epoc32/include/mw/senxmlproperties.h
+epoc32/include/mw/senxmlreader.h
+epoc32/include/mw/senxmlservicedescription.h
+epoc32/include/mw/senxmlutils.h
 epoc32/include/mw/sip.h
 epoc32/include/mw/sip_subconevents.h
 epoc32/include/mw/sip_subconevents.inl
@@ -2111,12 +2590,13 @@
 epoc32/include/mw/sipunsupportedheader.h
 epoc32/include/mw/sipwwwauthenticateheader.h
 epoc32/include/mw/spriteanimation.h
-epoc32/include/mw/StartupItem.hrh
-epoc32/include/mw/StartupItem.rh
+epoc32/include/mw/startupitem.hrh
+epoc32/include/mw/startupitem.rh
+epoc32/include/mw/svgtrasterizerkeydefs.hrh
 epoc32/include/mw/swi/pkgremover.h
 epoc32/include/mw/swi/pkgremovererrors.h
 epoc32/include/mw/telsess.h
-epoc32/include/mw/ThirdPartyBitmap.pal
+epoc32/include/mw/thirdpartybitmap.pal
 epoc32/include/mw/thttpfields.h
 epoc32/include/mw/thttpheadervaluevariant.h
 epoc32/include/mw/tldlistdef.h
@@ -2126,8 +2606,8 @@
 epoc32/include/mw/touchlogicalfeedback.h
 epoc32/include/mw/tsendasclientpanic.h
 epoc32/include/mw/tsendasmessagetypefilter.h
-epoc32/include/mw/TSendingCapabilities.h
-epoc32/include/mw/TSendingCapabilities.inl
+epoc32/include/mw/tsendingcapabilities.h
+epoc32/include/mw/tsendingcapabilities.inl
 epoc32/include/mw/tuladdressstringtokenizer.h
 epoc32/include/mw/tulpanics.h
 epoc32/include/mw/tulphonenumberutils.h
@@ -2151,19 +2631,13 @@
 epoc32/include/mw/wapattrdf.h
 epoc32/include/mw/wapengstd.h
 epoc32/include/mw/waplog.h
+epoc32/include/mw/wapmessage.h
 epoc32/include/mw/wappdef.h
 epoc32/include/mw/waptestutils.h
 epoc32/include/mw/wbconverter.h
 epoc32/include/mw/wsp/wsptypes.h
 epoc32/include/mw/xmlelemt.h
 epoc32/include/mw/xmllib.h
-epoc32/include/networkemulator/cnetworkemulatorsetupcommdb.h
-epoc32/include/networkemulator/cprotocoltypes.h
-epoc32/include/networkemulator/cuccsdevicecontrol.h
-epoc32/include/networkemulator/cuccsdeviceprotocol.h
-epoc32/include/networkemulator/mucctransport.h
-epoc32/include/networkemulator/networkemulatorcontrol.h
-epoc32/include/networkemulator/uccs_errorcodes.h
 epoc32/include/networking/dnd_err.h
 epoc32/include/networking/packetlogger.mmh
 epoc32/include/networking/qos3gpp_subconparams.h
@@ -2174,23 +2648,41 @@
 epoc32/include/nkern/nkern_ext.mmh
 epoc32/include/nkernsmp/nkern_ext.mmh
 epoc32/include/non_foundation_paths.hrh
+epoc32/include/notespluginicons.mbg
+epoc32/include/npdlib.mbg
+epoc32/include/nsmldmsync.mbg
+epoc32/include/nsmldssync.mbg
 epoc32/include/numberconversion.h
 epoc32/include/obex/transport/obextransport.hrh
 epoc32/include/oem/simlockuikeys.h
+epoc32/include/oggvorbiscodec/bwins/oggvorbisfloatutilu.def
+epoc32/include/oggvorbiscodec/bwins/oggvorbisintutilu.def
+epoc32/include/oggvorbiscodec/eabi/oggvorbisfloatutilu.def
+epoc32/include/oggvorbiscodec/eabi/oggvorbisintutilu.def
 epoc32/include/openfont.h
 epoc32/include/openfontlinkedtypefaceelementspec.h
 epoc32/include/openmax/il/core/omxilcontentpipeif.hrh
 epoc32/include/openmax/il/core/omxilloaderif.hrh
 epoc32/include/openmax/il/loader/omxilcomponentif.hrh
-epoc32/include/OrientationBase.h
-epoc32/include/OrientationData.h
+epoc32/include/operationinformation.h
+epoc32/include/orientationbase.h
+epoc32/include/orientationdata.h
+epoc32/include/ostprotdefs.h
+epoc32/include/ovi_brand_graphics.mbg
 epoc32/include/padding.h
+epoc32/include/paintcursor.mbg
 epoc32/include/palette.h
 epoc32/include/panerr.h
 epoc32/include/panorama/panorama.h
 epoc32/include/panorama/panoramauids.hrh
 epoc32/include/pathconfiguration.hrh
 epoc32/include/pathinfo.h
+epoc32/include/pbk2rclcallplugin.mbg
+epoc32/include/pbk2rclengine.mbg
+epoc32/include/pbk2rclpocplugin.mbg
+epoc32/include/pbk2rclsaveascontactplugin.mbg
+epoc32/include/pbk2rclsendbusinesscardplugin.mbg
+epoc32/include/pbk2rclsendplugin.mbg
 epoc32/include/pcstore/checkeduid.h
 epoc32/include/pcstore/descriptors.h
 epoc32/include/pcstore/directfilestore.h
@@ -2202,21 +2694,45 @@
 epoc32/include/pcstore/streamid.h
 epoc32/include/pcstore/uid.h
 epoc32/include/pdrport.h
-epoc32/include/PDRRECRD.H
 epoc32/include/pdrstore.h
+epoc32/include/peninputfingerhwr.mbg
+epoc32/include/peninputgenerichwr.mbg
+epoc32/include/peninputgenericitut.mbg
+epoc32/include/peninputgenericvkb.mbg
+epoc32/include/peninputhwrboxcn.mbg
+epoc32/include/peninputhwrboxjp.mbg
+epoc32/include/peninputhwrfscn.mbg
+epoc32/include/peninputmodeswitcher.mbg
+epoc32/include/peninputsplititut.mbg
+epoc32/include/peninputsplitqwerty.mbg
+epoc32/include/peninputvkbcn.mbg
+epoc32/include/peninputvkbjp.mbg
+epoc32/include/peninputvkbkr.mbg
+epoc32/include/phonebook.mbg
+epoc32/include/phonebook2.mbg
+epoc32/include/phonebook2ece.mbg
+epoc32/include/phoneui.mbg
+epoc32/include/piprofilerui_extraicons.mbg
 epoc32/include/pkixcertchain.h
 epoc32/include/pkixvalidationresult.h
-epoc32/include/platform_paths.hrh
-epoc32/include/PlatformStaticFeatures.hrh
 epoc32/include/pls.h
 epoc32/include/pointerevent.h
+epoc32/include/postcard.mbg
+epoc32/include/presenceicons.mbg
+epoc32/include/presencetrafficlights.mbg
 epoc32/include/privateruntimeids.hrh
-epoc32/include/PrivateStaticFeatures.hrh
-epoc32/include/ProductVariant.hrh
-epoc32/include/PtiKoreanQwertyCoreCRDefs.h
+epoc32/include/privatestaticfeatures.hrh
+epoc32/include/productvariant.hrh
+epoc32/include/provisioningcx.mbg
+epoc32/include/pslncallimageplugin.mbg
+epoc32/include/pslngsplugin.mbg
+epoc32/include/pslnicon.mbg
+epoc32/include/psu2.mbg
+epoc32/include/psuigsplugin.mbg
 epoc32/include/publicruntimeids.hrh
-epoc32/include/PublicStaticFeatures.hrh
+epoc32/include/publicstaticfeatures.hrh
 epoc32/include/punycodeconverter.h
+epoc32/include/pushmtm.mbg
 epoc32/include/random.h
 epoc32/include/remcon/playertype.h
 epoc32/include/remcon/remconinterfacefeatures.h
@@ -2226,6 +2742,7 @@
 epoc32/include/remconabsvoltarget.h
 epoc32/include/remconabsvoltargetobserver.h
 epoc32/include/remconaddress.h
+epoc32/include/remconclient.h
 epoc32/include/remconcoreapi.h
 epoc32/include/remconcoreapicontroller.h
 epoc32/include/remconcoreapicontrollerobserver.h
@@ -2233,15 +2750,21 @@
 epoc32/include/remconcoreapitargetobserver.h
 epoc32/include/remconerrorobserver.h
 epoc32/include/remconinterfaceselector.h
+epoc32/include/remconserver.h
 epoc32/include/remconserverpanic.h
 epoc32/include/remcontrackinfocontroller.h
 epoc32/include/remcontrackinfocontrollerobserver.h
 epoc32/include/remcontrackinfotarget.h
 epoc32/include/remcontrackinfotargetobserver.h
-epoc32/include/RoomLevelBase.h
-epoc32/include/RoomLevelData.h
+epoc32/include/ringbc.mbg
+epoc32/include/roomlevelbase.h
+epoc32/include/roomleveldata.h
 epoc32/include/rsconfig.mmh
+epoc32/include/rsfwgsplugin.mbg
 epoc32/include/rvct/rvct.h
+epoc32/include/rvct2_1.h
+epoc32/include/rvct2_2.h
+epoc32/include/rvct2_2/rvct2_2.h
 epoc32/include/s32btree.h
 epoc32/include/s32btree.inl
 epoc32/include/s32buf.h
@@ -2263,9 +2786,15 @@
 epoc32/include/s32strm.h
 epoc32/include/s32strm.inl
 epoc32/include/s32ucmp.h
+epoc32/include/s60features.xml
+epoc32/include/s60features_apac.xml
+epoc32/include/s60features_japan.xml
+epoc32/include/s60features_korea.xml
 epoc32/include/sacls.h
 epoc32/include/saclscommon.h
 epoc32/include/saclsdefines.h
+epoc32/include/satellite.mbg
+epoc32/include/satui.mbg
 epoc32/include/sbque.h
 epoc32/include/schinfo.h
 epoc32/include/schsend.hrh
@@ -2278,6 +2807,9 @@
 epoc32/include/securitydefs.h
 epoc32/include/securitydefs.inl
 epoc32/include/securityerr.h
+epoc32/include/senatomentry.h
+epoc32/include/senatomfeed.h
+epoc32/include/senatommessage.h
 epoc32/include/sensordatacompensationtypes.h
 epoc32/include/sensordatacompensator.h
 epoc32/include/sensrvaccelerometersensor.h
@@ -2299,18 +2831,22 @@
 epoc32/include/sensrvproximitysensor.h
 epoc32/include/sensrvtappingsensor.h
 epoc32/include/sensrvtypes.h
-epoc32/include/serialdriverext.h
+epoc32/include/servicehelpplugin.mbg
 epoc32/include/shapeinfo.h
+epoc32/include/shiftjis.h
 epoc32/include/signed.h
+epoc32/include/simlockuikeys.h
 epoc32/include/sipstrconsts.h
 epoc32/include/sizemode.h
 epoc32/include/smilattributes.h
 epoc32/include/smilelements.h
+epoc32/include/smiley.mbg
 epoc32/include/smilgenericelements.h
-epoc32/include/SmlDataFormat.h
-epoc32/include/SmlDataFormat.hrh
-epoc32/include/SmlDataFormat.rh
-epoc32/include/SmlDataProvider.h
+epoc32/include/smilplayer.mbg
+epoc32/include/smldataformat.h
+epoc32/include/smldataformat.hrh
+epoc32/include/smldataformat.rh
+epoc32/include/smldataprovider.h
 epoc32/include/smldmadapter.h
 epoc32/include/smldmadapter.inl
 epoc32/include/smss.hrh
@@ -2322,13 +2858,21 @@
 epoc32/include/smsuset.inl
 epoc32/include/smsustrm.h
 epoc32/include/smsustrm.inl
-epoc32/include/SourceDopplerBase.h
-epoc32/include/SourceLocationBase.h
-epoc32/include/SourceOrientationBase.h
+epoc32/include/sourcedopplerbase.h
+epoc32/include/sourcelocationbase.h
+epoc32/include/sourceorientationbase.h
+epoc32/include/spdctrl.mbg
 epoc32/include/speechrecognitionuids.hrh
 epoc32/include/speechrecognitionutility.h
 epoc32/include/speechrecognitionutilityobserver.h
+epoc32/include/speeddialgsplugin.mbg
+epoc32/include/splashscreen.mbg
+epoc32/include/spriteanimationclient.h
 epoc32/include/sqldb.h
+epoc32/include/src/tools/uic/qclass_lib_map.h
+epoc32/include/srchuiapp.mbg
+epoc32/include/srchuiindevicesvg.mbg
+epoc32/include/srchuiresviewpluginicons.mbg
 epoc32/include/ssl.h
 epoc32/include/ssl_compatibility.h
 epoc32/include/sslerr.h
@@ -2342,6 +2886,7 @@
 epoc32/include/ssm/starter.hrh
 epoc32/include/starter.hrh
 epoc32/include/startup.hrh
+epoc32/include/startup.mbg
 epoc32/include/stdapis/_ansi.h
 epoc32/include/stdapis/_ctype.h
 epoc32/include/stdapis/arpa/inet.h
@@ -2720,7 +3265,7 @@
 epoc32/include/stdapis/boost/mpl/aux_/nttp_decl.hpp
 epoc32/include/stdapis/boost/mpl/aux_/numeric_cast_utils.hpp
 epoc32/include/stdapis/boost/mpl/aux_/numeric_op.hpp
-epoc32/include/stdapis/boost/mpl/aux_/O1_size_impl.hpp
+epoc32/include/stdapis/boost/mpl/aux_/o1_size_impl.hpp
 epoc32/include/stdapis/boost/mpl/aux_/overload_names.hpp
 epoc32/include/stdapis/boost/mpl/aux_/pop_front_impl.hpp
 epoc32/include/stdapis/boost/mpl/aux_/preprocessed/plain/advance_backward.hpp
@@ -2835,7 +3380,7 @@
 epoc32/include/stdapis/boost/mpl/list/aux_/include_preprocessed.hpp
 epoc32/include/stdapis/boost/mpl/list/aux_/item.hpp
 epoc32/include/stdapis/boost/mpl/list/aux_/iterator.hpp
-epoc32/include/stdapis/boost/mpl/list/aux_/O1_size.hpp
+epoc32/include/stdapis/boost/mpl/list/aux_/o1_size.hpp
 epoc32/include/stdapis/boost/mpl/list/aux_/pop_front.hpp
 epoc32/include/stdapis/boost/mpl/list/aux_/preprocessed/plain/list10.hpp
 epoc32/include/stdapis/boost/mpl/list/aux_/preprocessed/plain/list20.hpp
@@ -2858,8 +3403,8 @@
 epoc32/include/stdapis/boost/mpl/next_prior.hpp
 epoc32/include/stdapis/boost/mpl/not.hpp
 epoc32/include/stdapis/boost/mpl/numeric_cast.hpp
-epoc32/include/stdapis/boost/mpl/O1_size.hpp
-epoc32/include/stdapis/boost/mpl/O1_size_fwd.hpp
+epoc32/include/stdapis/boost/mpl/o1_size.hpp
+epoc32/include/stdapis/boost/mpl/o1_size_fwd.hpp
 epoc32/include/stdapis/boost/mpl/or.hpp
 epoc32/include/stdapis/boost/mpl/pair.hpp
 epoc32/include/stdapis/boost/mpl/pair_view.hpp
@@ -2915,7 +3460,7 @@
 epoc32/include/stdapis/boost/mpl/vector/aux_/include_preprocessed.hpp
 epoc32/include/stdapis/boost/mpl/vector/aux_/item.hpp
 epoc32/include/stdapis/boost/mpl/vector/aux_/iterator.hpp
-epoc32/include/stdapis/boost/mpl/vector/aux_/O1_size.hpp
+epoc32/include/stdapis/boost/mpl/vector/aux_/o1_size.hpp
 epoc32/include/stdapis/boost/mpl/vector/aux_/pop_back.hpp
 epoc32/include/stdapis/boost/mpl/vector/aux_/pop_front.hpp
 epoc32/include/stdapis/boost/mpl/vector/aux_/preprocessed/plain/vector10.hpp
@@ -3490,15 +4035,16 @@
 epoc32/include/stdapis/boost/weak_ptr.hpp
 epoc32/include/stdapis/crypt.h
 epoc32/include/stdapis/ctype.h
+epoc32/include/stdapis/dbus-1.0/dbus/dbus.h
 epoc32/include/stdapis/dbus-1.0/dbus/dbus-address.h
 epoc32/include/stdapis/dbus-1.0/dbus/dbus-arch-deps.h
 epoc32/include/stdapis/dbus-1.0/dbus/dbus-bus.h
 epoc32/include/stdapis/dbus-1.0/dbus/dbus-connection.h
 epoc32/include/stdapis/dbus-1.0/dbus/dbus-errors.h
+epoc32/include/stdapis/dbus-1.0/dbus/dbus-glib.h
 epoc32/include/stdapis/dbus-1.0/dbus/dbus-glib-bindings.h
 epoc32/include/stdapis/dbus-1.0/dbus/dbus-glib-error-enum.h
 epoc32/include/stdapis/dbus-1.0/dbus/dbus-glib-lowlevel.h
-epoc32/include/stdapis/dbus-1.0/dbus/dbus-glib.h
 epoc32/include/stdapis/dbus-1.0/dbus/dbus-gtype-specialized.h
 epoc32/include/stdapis/dbus-1.0/dbus/dbus-macros.h
 epoc32/include/stdapis/dbus-1.0/dbus/dbus-memory.h
@@ -3511,7 +4057,6 @@
 epoc32/include/stdapis/dbus-1.0/dbus/dbus-signature.h
 epoc32/include/stdapis/dbus-1.0/dbus/dbus-threads.h
 epoc32/include/stdapis/dbus-1.0/dbus/dbus-types.h
-epoc32/include/stdapis/dbus-1.0/dbus/dbus.h
 epoc32/include/stdapis/dirent.h
 epoc32/include/stdapis/dlfcn.h
 epoc32/include/stdapis/err.h
@@ -3521,7 +4066,6 @@
 epoc32/include/stdapis/float.h
 epoc32/include/stdapis/ftw.h
 epoc32/include/stdapis/getopt.h
-epoc32/include/stdapis/glib-2.0/glib-object.h
 epoc32/include/stdapis/glib-2.0/glib.h
 epoc32/include/stdapis/glib-2.0/glib/galloca.h
 epoc32/include/stdapis/glib-2.0/glib/garray.h
@@ -3538,8 +4082,8 @@
 epoc32/include/stdapis/glib-2.0/glib/gfileutils.h
 epoc32/include/stdapis/glib-2.0/glib/ghash.h
 epoc32/include/stdapis/glib-2.0/glib/ghook.h
+epoc32/include/stdapis/glib-2.0/glib/gi18n.h
 epoc32/include/stdapis/glib-2.0/glib/gi18n-lib.h
-epoc32/include/stdapis/glib-2.0/glib/gi18n.h
 epoc32/include/stdapis/glib-2.0/glib/giochannel.h
 epoc32/include/stdapis/glib-2.0/glib/gkeyfile.h
 epoc32/include/stdapis/glib-2.0/glib/glist.h
@@ -3577,6 +4121,7 @@
 epoc32/include/stdapis/glib-2.0/glib/gwin32.h
 epoc32/include/stdapis/glib-2.0/glib_global.h
 epoc32/include/stdapis/glib-2.0/glibconfig.h
+epoc32/include/stdapis/glib-2.0/glib-object.h
 epoc32/include/stdapis/glib-2.0/glowmem.h
 epoc32/include/stdapis/glib-2.0/gmodule.h
 epoc32/include/stdapis/glib-2.0/gobject/gboxed.h
@@ -3641,6 +4186,8 @@
 epoc32/include/stdapis/libxml2/libxml2_xpathinternals.h
 epoc32/include/stdapis/libxml2/libxml2_xpointer.h
 epoc32/include/stdapis/libxml2/xmlengconfig.h
+epoc32/include/stdapis/libxml2/xmlengtriodef.h
+epoc32/include/stdapis/libxml2/xmlengtrionan.h
 epoc32/include/stdapis/libxml2/xmlengxeconfig.h
 epoc32/include/stdapis/limits.h
 epoc32/include/stdapis/locale.h
@@ -3813,7 +4360,6 @@
 epoc32/include/stdapis/stlport/cwchar
 epoc32/include/stdapis/stlport/cwctype
 epoc32/include/stdapis/stlport/deque
-epoc32/include/stdapis/stlport/exception
 epoc32/include/stdapis/stlport/exception.h
 epoc32/include/stdapis/stlport/fstream
 epoc32/include/stdapis/stlport/fstream.h
@@ -3832,13 +4378,11 @@
 epoc32/include/stdapis/stlport/iterator
 epoc32/include/stdapis/stlport/limits
 epoc32/include/stdapis/stlport/list
-epoc32/include/stdapis/stlport/locale
 epoc32/include/stdapis/stlport/locale.h
 epoc32/include/stdapis/stlport/map
 epoc32/include/stdapis/stlport/math.h
 epoc32/include/stdapis/stlport/mem.h
 epoc32/include/stdapis/stlport/memory
-epoc32/include/stdapis/stlport/new
 epoc32/include/stdapis/stlport/new.h
 epoc32/include/stdapis/stlport/numeric
 epoc32/include/stdapis/stlport/ostream
@@ -3848,12 +4392,9 @@
 epoc32/include/stdapis/stlport/queue
 epoc32/include/stdapis/stlport/rope
 epoc32/include/stdapis/stlport/runtime/exception.h
-epoc32/include/stdapis/stlport/runtime/new
 epoc32/include/stdapis/stlport/runtime/new.h
 epoc32/include/stdapis/stlport/runtime/numeric
-epoc32/include/stdapis/stlport/runtime/typeinfo
 epoc32/include/stdapis/stlport/runtime/typeinfo.h
-epoc32/include/stdapis/stlport/set
 epoc32/include/stdapis/stlport/setjmp.h
 epoc32/include/stdapis/stlport/slist
 epoc32/include/stdapis/stlport/sstream
@@ -4016,12 +4557,10 @@
 epoc32/include/stdapis/stlport/stl_user_config.h
 epoc32/include/stdapis/stlport/streambuf
 epoc32/include/stdapis/stlport/streambuf.h
-epoc32/include/stdapis/stlport/string
 epoc32/include/stdapis/stlport/string.h
 epoc32/include/stdapis/stlport/strstream
 epoc32/include/stdapis/stlport/strstream.h
 epoc32/include/stdapis/stlport/time.h
-epoc32/include/stdapis/stlport/typeinfo
 epoc32/include/stdapis/stlport/typeinfo.h
 epoc32/include/stdapis/stlport/using/cstring
 epoc32/include/stdapis/stlport/using/fstream
@@ -4351,95 +4890,52 @@
 epoc32/include/stdapis/wctype.h
 epoc32/include/stdapis/zconf.h
 epoc32/include/stdapis/zlib.h
-epoc32/include/StereoWideningBase.h
-epoc32/include/StereoWideningData.h
-epoc32/include/StereoWideningUtility.h
-epoc32/include/StereoWideningUtilityData.h
-epoc32/include/StringLoader.h
+epoc32/include/stereowideningbase.h
+epoc32/include/stereowideningdata.h
+epoc32/include/stereowideningutility.h
+epoc32/include/stereowideningutilitydata.h
+epoc32/include/stringloader.h
 epoc32/include/stringpool.h
 epoc32/include/stringpool.inl
+epoc32/include/svgtuicontrol.mbg
 epoc32/include/swap.h
-epoc32/include/syborg/variantmediadef.h
+epoc32/include/symbianbasictags.rh
+epoc32/include/symbiancontexts.rh
+epoc32/include/symbiantags.rh
 epoc32/include/symcpp.h
-epoc32/include/syncml/SmlDataSyncDefs.h
-epoc32/include/SyncMLAlertInfo.h
-epoc32/include/SyncMLClient.h
-epoc32/include/SyncMLClientDM.h
-epoc32/include/SyncMLClientDS.h
-epoc32/include/SyncMLContactSuiteProgressClient.h
-epoc32/include/SyncMLDataFilter.h
-epoc32/include/SyncMLDataFilter.hrh
-epoc32/include/SyncMLDataFilter.rh
-epoc32/include/SyncMLDef.h
-epoc32/include/SyncMLErr.h
-epoc32/include/SyncMLHistory.h
-epoc32/include/SyncMLObservers.h
-epoc32/include/SyncMLTransportProperties.h
+epoc32/include/syncml/smldatasyncdefs.h
+epoc32/include/syncmlalertinfo.h
+epoc32/include/syncmlclient.h
+epoc32/include/syncmlclientdm.h
+epoc32/include/syncmlclientds.h
+epoc32/include/syncmlcontactsuiteprogressclient.h
+epoc32/include/syncmldatafilter.h
+epoc32/include/syncmldatafilter.hrh
+epoc32/include/syncmldatafilter.rh
+epoc32/include/syncmldef.h
+epoc32/include/syncmlerr.h
+epoc32/include/syncmlhistory.h
+epoc32/include/syncmlobservers.h
+epoc32/include/syncmltransportproperties.h
+epoc32/include/sysap.mbg
+epoc32/include/systemmonitor/configuration.h
+epoc32/include/systemmonitor/eventlog.h
+epoc32/include/systemmonitor/instrumentationhandler.h
+epoc32/include/systemmonitor/locking.h
+epoc32/include/systemmonitor/recordtypes.h
+epoc32/include/systemmonitor/systemmonitor.h
+epoc32/include/systemmonitor/systemmonitorerrors.h
+epoc32/include/systemmonitor/utilities.h
 epoc32/include/sysutil.h
 epoc32/include/tagma.h
 epoc32/include/tcp_hdr.h
 epoc32/include/tcpseq.h
 epoc32/include/telephony.inl
-epoc32/include/test/activecallback.h
-epoc32/include/test/blockitems.h
-epoc32/include/test/commandprocessor.h
-epoc32/include/test/cteflogger.h
-epoc32/include/test/ctefunitserver.h
-epoc32/include/test/dataaccess.h
-epoc32/include/test/datadictionary.h
-epoc32/include/test/datawrapper.h
-epoc32/include/test/datawrapper.inl
-epoc32/include/test/fileservplugin.h
-epoc32/include/test/rfilelogger.h
-epoc32/include/test/rfileloggermacro.h
-epoc32/include/test/sysstartplugin.h
-epoc32/include/test/tefexportconst.h
-epoc32/include/test/tefresult.h
-epoc32/include/test/tefscriptutils.h
-epoc32/include/test/tefshareddata.h
-epoc32/include/test/tefshareddata.inl
-epoc32/include/test/teftimer.h
-epoc32/include/test/tefunit.h
-epoc32/include/test/tefunit.inl
-epoc32/include/test/TEFUtils.h
-epoc32/include/test/testblockcontroller.h
-epoc32/include/test/testblockcontroller.inl
-epoc32/include/test/testexecuteclient.h
-epoc32/include/test/testexecutelog.h
-epoc32/include/test/testexecutelogbase.h
-epoc32/include/test/testexecutelogger.h
-epoc32/include/test/testexecutepipslog.h
-epoc32/include/test/testexecuteserverbase.h
-epoc32/include/test/testexecuteserverutils.h
-epoc32/include/test/testexecuteserverutils.inl
-epoc32/include/test/testexecutestepbase.h
-epoc32/include/test/testserver2.h
-epoc32/include/test/testshareddata.h
-epoc32/include/test/testshareddata.inl
-epoc32/include/test/wrapperutilsplugin.h
-epoc32/include/testconfigfileparser.h
-epoc32/include/testconfigfileparser.inl
 epoc32/include/textcursor.h
 epoc32/include/textresolver.h
 epoc32/include/textresolver.hrh
 epoc32/include/tinternetdate.h
 epoc32/include/tools/certapp-api.h
-epoc32/include/tools/coredump/coredumpinterface.h
-epoc32/include/tools/coredump/coredumpserverapi.h
-epoc32/include/tools/coredump/crashdata.h
-epoc32/include/tools/coredump/crashdatasave.h
-epoc32/include/tools/coredump/crashdatasave.inl
-epoc32/include/tools/coredump/crashdatasource.h
-epoc32/include/tools/coredump/debuglogging.h
-epoc32/include/tools/coredump/executabledata.h
-epoc32/include/tools/coredump/formatterapi.h
-epoc32/include/tools/coredump/formatterapi.inl
-epoc32/include/tools/coredump/optionconfig.h
-epoc32/include/tools/coredump/plugindata.h
-epoc32/include/tools/coredump/processdata.h
-epoc32/include/tools/coredump/streamelement.h
-epoc32/include/tools/coredump/symbianelfdefs.h
-epoc32/include/tools/coredump/threaddata.h
 epoc32/include/tools/stlport/algorithm
 epoc32/include/tools/stlport/assert.h
 epoc32/include/tools/stlport/bitset
@@ -4764,7 +5260,11 @@
 epoc32/include/tools/stlport/vector
 epoc32/include/tools/stlport/wchar.h
 epoc32/include/tools/stlport/wctype.h
+epoc32/include/toolsclientsession.h
+epoc32/include/touchscreencalib.mbg
 epoc32/include/tranp.h
+epoc32/include/trkapp_200170bb.mbg
+epoc32/include/trui_icons.mbg
 epoc32/include/tsy.hrh
 epoc32/include/tsy.rh
 epoc32/include/txtetext.h
@@ -4783,6 +5283,8 @@
 epoc32/include/txtstyle.inl
 epoc32/include/typerel.h
 epoc32/include/udp_hdr.h
+epoc32/include/uiklaf/private/bwins/uiklafu.def
+epoc32/include/uiklaf/private/eabi/uiklafu.def
 epoc32/include/uiklaf/private/pluginuid.hrh
 epoc32/include/uikon.hrh
 epoc32/include/uikon.rh
@@ -4794,7 +5296,10 @@
 epoc32/include/uloggerplugin.h
 epoc32/include/uloggerplugin.inl
 epoc32/include/uloggershared.h
+epoc32/include/unified_editor.h
 epoc32/include/unifiedcertstore.h
+epoc32/include/uniutils.mbg
+epoc32/include/upnpgspluginrsc.mbg
 epoc32/include/ups/ups.hrh
 epoc32/include/ups/upsclient.h
 epoc32/include/ups/upsconst.h
@@ -4811,33 +5316,55 @@
 epoc32/include/usbhost/internal/fdcplugin.hrh
 epoc32/include/usbhost/internal/fdfcaps.mmh
 epoc32/include/usbman.rh
+epoc32/include/usbui.mbg
 epoc32/include/utf.h
-epoc32/include/variant/platform_paths.hrh
-epoc32/include/variant/Symbian_OS.hrh
+epoc32/include/variant/featurelists/s60public.txt
+epoc32/include/variant/symbian_os.hrh
+epoc32/include/variatedbitmaps.mbg
+epoc32/include/vccontrolpanelplugin.mbg
+epoc32/include/vcommand.mbg
+epoc32/include/vcxhgmyvideos.mbg
+epoc32/include/vcxhgmyvideosicons.mbg
 epoc32/include/versioninfo.h
 epoc32/include/versioninfo.inl
-epoc32/include/VG/1.0/openvg.h
-epoc32/include/VG/1.0/vgu.h
-epoc32/include/VG/1.1/openvg.h
-epoc32/include/VG/1.1/vgu.h
-epoc32/include/VG/openvg.h
-epoc32/include/VG/openvguids.hrh
-epoc32/include/VG/vgu.h
+epoc32/include/vg/1.0/openvg.h
+epoc32/include/vg/1.0/vgu.h
+epoc32/include/vg/1.1/openvg.h
+epoc32/include/vg/1.1/vgu.h
+epoc32/include/vg/openvg.h
+epoc32/include/vg/openvguids.hrh
+epoc32/include/vg/vgu.h
 epoc32/include/videoplayer.h
 epoc32/include/videorecorder.h
-epoc32/include/vpnapidefs.h
+epoc32/include/videotelui.mbg
+epoc32/include/vimpst_servicetab_default.mbg
+epoc32/include/vimpstui.mbg
+epoc32/include/vm.mbg
+epoc32/include/voicerecorder.mbg
+epoc32/include/voiceui.mbg
+epoc32/include/vpnmanagementui.mbg
 epoc32/include/w32adll.h
 epoc32/include/w32click.h
 epoc32/include/w32std.h
 epoc32/include/w32stdgraphic.h
 epoc32/include/wap_sock.h
-epoc32/include/wapmessage.h
-epoc32/include/wapmsgerr.h
-epoc32/include/WF/openwfcuids.hrh
-epoc32/include/WF/wfc.h
-epoc32/include/WF/wfcext.h
-epoc32/include/WF/wfcplatform.h
+epoc32/include/webkit.mbg
+epoc32/include/webkiticons.mbg
+epoc32/include/webkitutilsicons.mbg
+epoc32/include/wf/openwfcuids.hrh
+epoc32/include/wf/wfc.h
+epoc32/include/wf/wfcext.h
+epoc32/include/wf/wfcplatform.h
+epoc32/include/widgetmanager.mbg
+epoc32/include/wifiprot.mbg
+epoc32/include/wlanplugin.mbg
 epoc32/include/wlansdkpskeys.h
+epoc32/include/wmdrmdla.mbg
+epoc32/include/wngdoor.h
+epoc32/include/wngmodel.h
+epoc32/include/wngmodel.inl
+epoc32/include/wsficons.mbg
+epoc32/include/wsfwlaninfosorting.mbg
 epoc32/include/wspdecoder.h
 epoc32/include/wspencoder.h
 epoc32/include/wtlscert.h
@@ -4927,6 +5454,11 @@
 epoc32/include/xml/parserfeature.h
 epoc32/include/xml/stringdictionarycollection.h
 epoc32/include/xml/taginfo.h
+epoc32/include/xml/utils/xmlengmem.h
+epoc32/include/xml/utils/xmlengutils.h
+epoc32/include/xml/utils/xmlengxestd.h
+epoc32/include/xml/utils/xmlengxestrings.h
+epoc32/include/xml/utils/xmlengxestrings.inl
 epoc32/include/xml/wbxmlextensionhandler.h
 epoc32/include/xml/xmlframeworkerrors.h
 epoc32/include/xmlengattr.h
@@ -4958,6 +5490,12 @@
 epoc32/include/xmlengtext.h
 epoc32/include/xmlenguserdata.h
 epoc32/include/xmlentityreferences.h
+epoc32/include/yahoo_brand_graphics.mbg
+epoc32/include/z/private/102073ca/backup_registration.xml
+epoc32/include/z/private/1027509e/backup_registration.xml
+epoc32/include/z/private/10281861/backup_registration.xml
+epoc32/include/z/private/10282bc4/rules/locbtgpspsypscontextstate.rul
+epoc32/include/z/private/10282bc4/settings/10282c74/locbtgpspsypscontextstate.xml
 epoc32/include/zconf.h
 epoc32/include/ziparchive.h
 epoc32/include/zipfile.h