--- a/symbian3/sdkFiles.txt	Wed Mar 31 11:21:29 2010 +0100
+++ b/symbian3/sdkFiles.txt	Wed Mar 31 12:45:08 2010 +0100
@@ -1,17 +1,21 @@
 epoc32/include/a3f/a3f_trace_ctxt.h
-epoc32/include/accmonitor.h
-epoc32/include/accmonitorcapabilities.h
-epoc32/include/accmonitorinfo.h
-epoc32/include/accmonitorinfo.inl
+epoc32/include/a3f/a3ffourcclookupuids.hrh
+epoc32/include/a3f/audioprocessingunituids.hrh
+epoc32/include/a3f/devsoundadaptationinfo.hrh
+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/advancedpointerevent.h
 epoc32/include/agentdialog.h
 epoc32/include/aiftool.rh
-epoc32/include/animationcmd.h
-epoc32/include/apfdef.h
 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
@@ -25,7 +29,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
@@ -42,9 +46,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
@@ -60,57 +64,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/extendedmtmids.hrh
+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/hlplch.h
 epoc32/include/app/hlpmodel.h
 epoc32/include/app/hlpzoom.h
@@ -125,7 +133,12 @@
 epoc32/include/app/irmsgtypeuid.h
 epoc32/include/app/irmtmcmds.h
 epoc32/include/app/lmkerrors.h
-epoc32/include/app/messagingsdkcrkeys.h
+epoc32/include/app/memailapplaunchdata.h
+epoc32/include/app/memaildata.h
+epoc32/include/app/memailmailboxdata.h
+epoc32/include/app/memailmessagedata.h
+epoc32/include/app/memailobserverlistener.h
+epoc32/include/app/MessagingSDKCRKeys.h
 epoc32/include/app/miut_err.h
 epoc32/include/app/miutatch.h
 epoc32/include/app/miutconv.h
@@ -140,99 +153,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/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/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
@@ -243,16 +258,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
@@ -261,17 +276,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
@@ -285,8 +300,12 @@
 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
@@ -304,15 +323,28 @@
 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/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/avkon.mbg
 epoc32/include/avkon.rsg
 epoc32/include/babackup.h
@@ -337,19 +369,20 @@
 epoc32/include/barsread.h
 epoc32/include/barsread2.h
 epoc32/include/basched.h
-epoc32/include/bassboostbase.h
-epoc32/include/bassboostdata.h
+epoc32/include/baspi.h
+epoc32/include/BassBoostBase.h
+epoc32/include/BassBoostData.h
 epoc32/include/bassnd.h
 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
@@ -358,16 +391,30 @@
 epoc32/include/bitmaptransforms.h
 epoc32/include/bitmaptransforms.inl
 epoc32/include/bitmtrans/bitmtranspanic.h
+epoc32/include/bitmtrans/bitmtransuids.hrh
 epoc32/include/bitstd.h
 epoc32/include/bldcodeline.hrh
 epoc32/include/bldprivate.hrh
 epoc32/include/bldpublic.hrh
 epoc32/include/bldregional.hrh
 epoc32/include/bldvariant.hrh
+epoc32/include/bluetooth/a2dpoptimisation.h
+epoc32/include/bluetooth/a2dpoptimisationparams.h
+epoc32/include/bluetooth/btbaseband.h
+epoc32/include/bluetooth/btlogger.mmh
+epoc32/include/bluetooth/btscoparams.h
+epoc32/include/bluetooth/dutmode.h
 epoc32/include/bluetooth/eirdatacodec.h
+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/bsul/bsul.h
 epoc32/include/bsul/ccacheddriveinfo.h
+epoc32/include/bsul/clientmessage.h
+epoc32/include/bsul/inifile.h
 epoc32/include/bt_sock.h
 epoc32/include/bt_subscribe.h
 epoc32/include/bt_subscribe_keybase.h
@@ -392,6 +439,7 @@
 epoc32/include/caf/cafpanic.h
 epoc32/include/caf/caftypes.h
 epoc32/include/caf/content.h
+epoc32/include/caf/content.inl
 epoc32/include/caf/data.h
 epoc32/include/caf/dirstreamable.h
 epoc32/include/caf/embeddedobject.h
@@ -402,35 +450,59 @@
 epoc32/include/caf/stringattributeset.h
 epoc32/include/caf/virtualpath.h
 epoc32/include/caf/virtualpathptr.h
+epoc32/include/caldavsession.h
 epoc32/include/ccertattributefilter.h
 epoc32/include/cctcertinfo.h
 epoc32/include/cdbcols.h
 epoc32/include/cdblen.h
 epoc32/include/cdbpreftable.h
 epoc32/include/cdbtemp.h
-epoc32/include/cdmasmsaddr.h
+epoc32/include/cenrepnotifyhandler.h
 epoc32/include/centralrepository.h
 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/cntdef.hrh
-epoc32/include/coever.h
 epoc32/include/commdb.h
 epoc32/include/commdbconnpref.h
 epoc32/include/commonphoneparser.h
+epoc32/include/comms-infras/commsdebugutility.mmh
+epoc32/include/comms-infras/cs_mobility_apiext.h
+epoc32/include/comms-infras/datamonitormessages.h
+epoc32/include/comms-infras/datamonitormessages.inl
+epoc32/include/comms-infras/es_event.h
+epoc32/include/comms-infras/es_mobility_apiext.h
+epoc32/include/comms-infras/es_parameterbundle.h
+epoc32/include/comms-infras/es_parameterfamily.inl
+epoc32/include/comms-infras/es_parameterset.h
+epoc32/include/comms-infras/es_protbinder.h
+epoc32/include/comms-infras/es_sap.h
+epoc32/include/comms-infras/esock_params.h
+epoc32/include/comms-infras/ss_apiext_register.h
+epoc32/include/comms-infras/ss_common.h
+epoc32/include/comms-infras/ss_commsprov_internal.h
+epoc32/include/comms-infras/ss_connlegacy.h
+epoc32/include/comms-infras/ss_connprov.h
+epoc32/include/comms-infras/ss_connselect.h
+epoc32/include/comms-infras/ss_connsettings.h
+epoc32/include/comms-infras/ss_cprnodeinterfaces.h
+epoc32/include/comms-infras/ss_datatransfer.h
+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/comms-infras/cs_mobility_apiext.h
-epoc32/include/comms-infras/datamonitormessages.inl
-epoc32/include/comms-infras/es_mobility_apiext.h
-epoc32/include/comms-infras/esock_params.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/connectprog.h
 epoc32/include/connpref.h
+epoc32/include/conpics.h
 epoc32/include/convdata.h
 epoc32/include/convgeneratedcpp.h
 epoc32/include/convnames.h
@@ -445,6 +517,7 @@
 epoc32/include/cryptospi/cryptospistateapi.h
 epoc32/include/cryptospi/extendedcharacteristics.h
 epoc32/include/cryptospi/plugincharacteristics.h
+epoc32/include/cryptospi/pluginselectorbase.h
 epoc32/include/cryptospi/ruleselector.h
 epoc32/include/cryptotokenregistryinfo.rh
 epoc32/include/cs_port.h
@@ -463,6 +536,7 @@
 epoc32/include/ct/ccttokentypeinfo.h
 epoc32/include/ct/interfaceuid.hrh
 epoc32/include/ct/mcttoken.h
+epoc32/include/ct/mcttokeninterface.h
 epoc32/include/ct/mcttokenobject.h
 epoc32/include/ct/mcttokentype.h
 epoc32/include/ct/mcttokentypefilter.h
@@ -475,9 +549,12 @@
 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
+epoc32/include/d32public.h
+epoc32/include/data_caged_locations.mk
 epoc32/include/data_caging_path_literals.hrh
 epoc32/include/data_caging_paths.hrh
 epoc32/include/data_caging_paths_for_iby.hrh
@@ -496,16 +573,29 @@
 epoc32/include/dial.inl
 epoc32/include/dial_consts.h
 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/driveinfo.h
 epoc32/include/driveinfo.inl
+epoc32/include/drivers/camerasc.h
 epoc32/include/drivers/camerasc.inl
-epoc32/include/drivers/dma.inl
+epoc32/include/drivers/elocd.mmh
+epoc32/include/drivers/iic_transaction.h
 epoc32/include/drivers/iic_transaction.inl
-epoc32/include/drmaudiosampleplayer.h
+epoc32/include/drivers/otgdi.h
+epoc32/include/drivers/usbc.h
+epoc32/include/drivers/usbc.inl
+epoc32/include/drivers/usbcdesc.h
+epoc32/include/drivers/usbcque.h
+epoc32/include/drivers/usbcsc.h
+epoc32/include/drivers/usbcsc.inl
+epoc32/include/drivers/usbcshared.h
+epoc32/include/drivers/usbcshared.inl
+epoc32/include/drivers/usbdi_channel.h
+epoc32/include/drivers/usbdi_hub.h
+epoc32/include/DrmAudioSamplePlayer.h
 epoc32/include/dscstorecommondefs.hrh
 epoc32/include/e32atomics.h
 epoc32/include/e32base.h
@@ -537,9 +627,14 @@
 epoc32/include/e32std.h
 epoc32/include/e32std.inl
 epoc32/include/e32test.h
+epoc32/include/e32utrace.mmh
 epoc32/include/ecam.h
+epoc32/include/ecam/cameradirectviewfinderuidif.hrh
 epoc32/include/ecam/cameraoverlay.h
+epoc32/include/ecam/ecamadvsettingsintfuids.hrh
+epoc32/include/ecam/ecamcommonuidif.hrh
 epoc32/include/ecam/ecamcommonuids.hrh
+epoc32/include/ecam/ecamcommonuidsconst.hrh
 epoc32/include/ecam/ecamconstants.h
 epoc32/include/ecam/ecamdirectviewfinder.h
 epoc32/include/ecam/ecamdirectviewfinderuids.hrh
@@ -550,6 +645,7 @@
 epoc32/include/ecamerrors.h
 epoc32/include/ecamimageprocessing.h
 epoc32/include/ecamuids.hrh
+epoc32/include/ecamuidsconst.hrh
 epoc32/include/ecamuidsdef.hrh
 epoc32/include/ecom/ecom.h
 epoc32/include/ecom/ecomerrorcodes.h
@@ -562,11 +658,12 @@
 epoc32/include/ecom/registryinfo.rh
 epoc32/include/ecom/registryinfoconst.hrh
 epoc32/include/ecom/registryinfov2.rh
+epoc32/include/ecom/registryinfov3.rh
 epoc32/include/ecom/resolver.h
-epoc32/include/editorundo.h
-epoc32/include/egl/egl.h
-epoc32/include/egl/eglext.h
-epoc32/include/egl/egltypes.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
@@ -574,15 +671,24 @@
 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/emanaged.h
 epoc32/include/emisc.h
 epoc32/include/emsinformationelement.h
-epoc32/include/environmentalreverbbase.h
-epoc32/include/environmentalreverbdata.h
-epoc32/include/environmentalreverbutility.h
-epoc32/include/environmentalreverbutilitydata.h
-epoc32/include/epos_privacynotifier.hrh
+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/errors/generic/emailerr.ra
+epoc32/include/errors/generic/emailerr.rls
+epoc32/include/errors/generic/irerr.ra
+epoc32/include/errors/generic/irerr.rls
 epoc32/include/es_enum.h
 epoc32/include/es_panic.h
 epoc32/include/es_sock.h
@@ -593,16 +699,18 @@
 epoc32/include/estlib.h
 epoc32/include/estring.h
 epoc32/include/et_clsvr.h
+epoc32/include/et_struc.h
 epoc32/include/etel.inl
 epoc32/include/etel3rdparty.h
+epoc32/include/eteldefaultqos.h
 epoc32/include/etelpckt.inl
 epoc32/include/etslotnum.h
 epoc32/include/eui_addr.h
 epoc32/include/euserhl.h
 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/exterror.h
@@ -639,26 +747,32 @@
 epoc32/include/frmtlay.h
 epoc32/include/frmtview.h
 epoc32/include/frmvis.h
-epoc32/include/gb2312.h
-epoc32/include/gbk.h
+epoc32/include/gcc.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/gdr.h
 epoc32/include/gifscaler.h
-epoc32/include/gles/gl.h
-epoc32/include/gles/glext.h
-epoc32/include/gles/glextplatform.h
-epoc32/include/gles/glplatform.h
-epoc32/include/gles2/gl2.h
-epoc32/include/gles2/gl2ext.h
-epoc32/include/gles2/gl2extplatform.h
-epoc32/include/gles2/gl2platform.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/gmxmlparser.h
 epoc32/include/gprsprog.h
 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/gsmubuf.h
 epoc32/include/gsmuelem.h
@@ -693,10 +807,14 @@
 epoc32/include/hwrmpowerstatesdkpskeys.h
 epoc32/include/hwrmvibra.h
 epoc32/include/hwrmvibrasdkcrkeys.h
+epoc32/include/icl/exifimagedisplay.hrh
 epoc32/include/icl/exifimagedisplayext.h
+epoc32/include/icl/geniclimagedisplay.hrh
 epoc32/include/icl/icl_propertyuids.h
 epoc32/include/icl/icl_propertyuids.hrh
 epoc32/include/icl/icl_uids.hrh
+epoc32/include/icl/icl_uids_const.hrh
+epoc32/include/icl/icl_uids_def.hrh
 epoc32/include/icl/imagecodec.h
 epoc32/include/icl/imagecodecdata.h
 epoc32/include/icl/imageconstruct.h
@@ -713,6 +831,7 @@
 epoc32/include/icl/imagetransformpaniccodes.h
 epoc32/include/icl/imagetransformplugin.h
 epoc32/include/icl/imagetransformpluginext.h
+epoc32/include/icl/mngimagedisplay.hrh
 epoc32/include/icl/orientationtransformextension.h
 epoc32/include/icl/overlaytransformextension.h
 epoc32/include/icl/squeezetransformextension.h
@@ -726,6 +845,7 @@
 epoc32/include/imageframeconst.h
 epoc32/include/imageframeconst.hrh
 epoc32/include/imageframeformats.hrh
+epoc32/include/imageprocessor/imageprocessor.h
 epoc32/include/imageprocessor/imageprocessor_uids.hrh
 epoc32/include/imageprocessor/imageprocessoreffect.h
 epoc32/include/imageprocessor/imageprocessorinputinfo.h
@@ -743,6 +863,7 @@
 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
@@ -750,15 +871,20 @@
 epoc32/include/ir_sock.h
 epoc32/include/isbaseof.h
 epoc32/include/issame.h
-epoc32/include/jisx0201.h
-epoc32/include/jisx0208.h
-epoc32/include/jisx0212.h
 epoc32/include/kernel/hal_int.h
-epoc32/include/khr/khrplatform.h
+epoc32/include/kernel/kern_ext.mmh
+epoc32/include/KHR/khrplatform.h
 epoc32/include/khronos_types.h
 epoc32/include/lbs.h
 epoc32/include/lbs.inl
+epoc32/include/lbs/epos_privacynotifier.hrh
+epoc32/include/lbs/lbshostsettings.h
+epoc32/include/lbs/lbshostsettingsclasstypes.h
 epoc32/include/lbs/lbsipc.hrh
+epoc32/include/lbs/lbsprivacycontroller.h
+epoc32/include/lbs/lbssuplpush.h
+epoc32/include/lbs/lbssuplpushcommon.h
+epoc32/include/lbs/lbssuplpushreceiver.h
 epoc32/include/lbsareainfo.h
 epoc32/include/lbsclasstypes.h
 epoc32/include/lbscommon.h
@@ -772,7 +898,7 @@
 epoc32/include/lbspositioninfo.h
 epoc32/include/lbsrequestor.h
 epoc32/include/lbssatellite.h
-epoc32/include/lexical.h
+epoc32/include/lbsSuplPsyAdaptation.h
 epoc32/include/libc/_ansi.h
 epoc32/include/libc/arpa/ftp.h
 epoc32/include/libc/arpa/inet.h
@@ -787,6 +913,7 @@
 epoc32/include/libc/ieeefp.h
 epoc32/include/libc/limits.h
 epoc32/include/libc/locale.h
+epoc32/include/libc/machine/ieeefp.h
 epoc32/include/libc/machine/types.h
 epoc32/include/libc/math.h
 epoc32/include/libc/netdb.h
@@ -815,91 +942,111 @@
 epoc32/include/libc/string.h
 epoc32/include/libc/sys/_types.h
 epoc32/include/libc/sys/config.h
+epoc32/include/libc/sys/dirent.h
+epoc32/include/libc/sys/errno.h
+epoc32/include/libc/sys/fcntl.h
 epoc32/include/libc/sys/file.h
 epoc32/include/libc/sys/ioctl.h
 epoc32/include/libc/sys/param.h
+epoc32/include/libc/sys/reent.h
+epoc32/include/libc/sys/resource.h
 epoc32/include/libc/sys/serial.h
+epoc32/include/libc/sys/signal.h
 epoc32/include/libc/sys/socket.h
 epoc32/include/libc/sys/stat.h
 epoc32/include/libc/sys/stdio_t.h
 epoc32/include/libc/sys/time.h
 epoc32/include/libc/sys/times.h
+epoc32/include/libc/sys/types.h
+epoc32/include/libc/sys/types1.h
 epoc32/include/libc/sys/unistd.h
 epoc32/include/libc/sys/wait.h
+epoc32/include/libc/time.h
+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/localtypes.h
-epoc32/include/locationbase.h
-epoc32/include/locationdata.h
+epoc32/include/LocationBase.h
+epoc32/include/LocationData.h
 epoc32/include/logcli.h
 epoc32/include/logcli.inl
 epoc32/include/logclientchangeobserver.h
 epoc32/include/logeng.h
+epoc32/include/logfilterandeventconstants.hrh
+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.rsg
+epoc32/include/logwrap.h
 epoc32/include/logwrapconst.h
-epoc32/include/loudnessbase.h
-epoc32/include/loudnessdata.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/MAudioEffectObserver.h
+epoc32/include/MAudioEqualizerObserver.h
+epoc32/include/MBassBoostObserver.h
 epoc32/include/mbmstypes.h
 epoc32/include/mcertstore.h
 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
 epoc32/include/mda/common/audiostream.hrh
+epoc32/include/mda/common/base.h
 epoc32/include/mda/common/base.hrh
 epoc32/include/mda/common/base.inl
 epoc32/include/mda/common/gsmaudio.h
 epoc32/include/mda/common/gsmaudio.hrh
 epoc32/include/mda/common/port.hrh
+epoc32/include/mda/common/resource.h
 epoc32/include/mda/common/resource.hrh
+epoc32/include/mda/common/video.h
 epoc32/include/mda/common/video.hrh
+epoc32/include/mda/common/video.inl
 epoc32/include/mdaaudioinputstream.h
 epoc32/include/mdaaudiooutputstream.h
 epoc32/include/mdaaudiosampleeditor.h
 epoc32/include/mdaaudiosampleplayer.h
 epoc32/include/mdaaudiotoneplayer.h
-epoc32/include/mdaframeinfo.h
 epoc32/include/mdaimageconverter.h
-epoc32/include/mdistanceattenuationobserver.h
-epoc32/include/mdopplerobserver.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/medobsrv.h
-epoc32/include/menvironmentalreverbobserver.h
+epoc32/include/MEnvironmentalReverbObserver.h
 epoc32/include/metadatabase.h
 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
 epoc32/include/mmf/common/mmfaudio.h
 epoc32/include/mmf/common/mmfbase.h
+epoc32/include/mmf/common/mmfbase.hrh
 epoc32/include/mmf/common/mmfcontroller.h
 epoc32/include/mmf/common/mmfcontrollerframework.h
 epoc32/include/mmf/common/mmfcontrollerframeworkbase.h
+epoc32/include/mmf/common/mmfcontrollerframeworkclasses.h
 epoc32/include/mmf/common/mmfcontrollerpluginresolver.h
 epoc32/include/mmf/common/mmfdurationinfocustomcommands.h
 epoc32/include/mmf/common/mmffourcc.h
 epoc32/include/mmf/common/mmfipc.h
 epoc32/include/mmf/common/mmfipc.inl
+epoc32/include/mmf/common/mmfipcserver.h
 epoc32/include/mmf/common/mmfipcserver.inl
 epoc32/include/mmf/common/mmfmeta.h
 epoc32/include/mmf/common/mmfmidi.h
@@ -918,7 +1065,6 @@
 epoc32/include/mmf/common/speechrecognitiondatatest.h
 epoc32/include/mmf/devasr/devasr.h
 epoc32/include/mmf/devasr/devasrcommon.h
-epoc32/include/mmf/devasr/devasruids.hrh
 epoc32/include/mmf/devvideo/avc.h
 epoc32/include/mmf/devvideo/devvideobase.h
 epoc32/include/mmf/devvideo/devvideobase.inl
@@ -935,8 +1081,17 @@
 epoc32/include/mmf/devvideo/vc1.h
 epoc32/include/mmf/devvideo/videoplayhwdevice.h
 epoc32/include/mmf/devvideo/videorecordhwdevice.h
+epoc32/include/mmf/plugin/cmmfdevsoundcibitrateimplementationuid.hrh
+epoc32/include/mmf/plugin/cmmfdevsoundcifileblocklengthimpluid.hrh
+epoc32/include/mmf/plugin/mmfaudioiointerfaceuids.hrh
+epoc32/include/mmf/plugin/mmfcodecimplementationuids.hrh
+epoc32/include/mmf/plugin/mmfcontrollerimplementationuids.hrh
+epoc32/include/mmf/plugin/mmfdevsoundcustominterface.hrh
 epoc32/include/mmf/plugin/mmfformatimplementationuids.hrh
+epoc32/include/mmf/plugin/mmfglblaudioeffect.hrh
+epoc32/include/mmf/plugin/mmfhwdeviceimplementationuids.hrh
 epoc32/include/mmf/plugin/mmfplugininterfaceuids.hrh
+epoc32/include/mmf/plugin/mmfsbccodecimplementationuids.hrh
 epoc32/include/mmf/server/devsoundstandardcustominterfaces.h
 epoc32/include/mmf/server/mmfaudioinput.h
 epoc32/include/mmf/server/mmfaudiooutput.h
@@ -946,6 +1101,7 @@
 epoc32/include/mmf/server/mmfcodec.h
 epoc32/include/mmf/server/mmfdatabuffer.h
 epoc32/include/mmf/server/mmfdatapath.h
+epoc32/include/mmf/server/mmfdatapath2.h
 epoc32/include/mmf/server/mmfdatapathproxy.h
 epoc32/include/mmf/server/mmfdatasink.h
 epoc32/include/mmf/server/mmfdatasource.h
@@ -955,102 +1111,112 @@
 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/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/mmfaudioiointerfaceuids.hrh
 epoc32/include/mmfclntutility.h
-epoc32/include/morientationobserver.h
+epoc32/include/mmfcontrollerimplementationuids.hrh
+epoc32/include/mmfformatimplementationuids.hrh
+epoc32/include/mmfplugininterfaceuids.hrh
+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/MRoomLevelObserver.h
+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/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/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
@@ -1063,86 +1229,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/aknsutils.h
-epoc32/include/mw/aknswallpaperutils.h
+epoc32/include/mw/aknstyluspopupmenu.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
@@ -1153,14 +1321,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
@@ -1174,34 +1342,35 @@
 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
 epoc32/include/mw/apadoc.h
+epoc32/include/mw/apaflrec.h
 epoc32/include/mw/apaid.h
 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
@@ -1213,10 +1382,12 @@
 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
 epoc32/include/mw/biodb.h
+epoc32/include/mw/bioscmds.h
 epoc32/include/mw/biouids.h
 epoc32/include/mw/bmpancli.h
 epoc32/include/mw/bmpanconsts.h
@@ -1236,18 +1407,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
@@ -1256,11 +1427,13 @@
 epoc32/include/mw/cdtdmodel.h
 epoc32/include/mw/cecombrowserplugininterface.h
 epoc32/include/mw/cfragmentedstring.h
+epoc32/include/mw/chttpclienttransaction.h
 epoc32/include/mw/chttpformencoder.h
 epoc32/include/mw/chttpresponse.h
-epoc32/include/mw/clfcontentlisting.h
-epoc32/include/mw/clfcontentlisting.hrh
-epoc32/include/mw/clfcontentlisting.rh
+epoc32/include/mw/chttpservice.h
+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
@@ -1269,8 +1442,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
@@ -1312,30 +1485,31 @@
 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/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
@@ -1366,6 +1540,7 @@
 epoc32/include/mw/eikctgrp.h
 epoc32/include/mw/eikctlib.h
 epoc32/include/mw/eikdef.h
+epoc32/include/mw/eikdialg.h
 epoc32/include/mw/eikdialg.pan
 epoc32/include/mw/eikdll.h
 epoc32/include/mw/eikdoc.h
@@ -1399,7 +1574,11 @@
 epoc32/include/mw/eiklbi.h
 epoc32/include/mw/eiklbm.h
 epoc32/include/mw/eiklbo.h
+epoc32/include/mw/eiklbv.h
+epoc32/include/mw/eiklbx.h
 epoc32/include/mw/eiklbx.pan
+epoc32/include/mw/eikmenub.h
+epoc32/include/mw/eikmenup.h
 epoc32/include/mw/eikmfne.h
 epoc32/include/mw/eikmfne.pan
 epoc32/include/mw/eikmnbut.h
@@ -1430,39 +1609,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
@@ -1487,6 +1666,7 @@
 epoc32/include/mw/fepplugin.inl
 epoc32/include/mw/flash_ui.h
 epoc32/include/mw/fontids.hrh
+epoc32/include/mw/graphics/clock/displayaddition.h
 epoc32/include/mw/grdcells.h
 epoc32/include/mw/grddef.h
 epoc32/include/mw/grdprint.h
@@ -1500,6 +1680,7 @@
 epoc32/include/mw/gulfont.h
 epoc32/include/mw/gulicon.h
 epoc32/include/mw/gulutil.h
+epoc32/include/mw/hlplch.h
 epoc32/include/mw/http.h
 epoc32/include/mw/http/cauthenticationfilterinterface.h
 epoc32/include/mw/http/cecomfilter.h
@@ -1540,6 +1721,8 @@
 epoc32/include/mw/http/thttphdrval.h
 epoc32/include/mw/httpdownloadmgrcommon.h
 epoc32/include/mw/httperr.h
+epoc32/include/mw/httpheaderiter.h
+epoc32/include/mw/httpservice.h
 epoc32/include/mw/httpstd.h
 epoc32/include/mw/iclanimationdataprovider.h
 epoc32/include/mw/ineturi.h
@@ -1580,62 +1763,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/mmfropcustomcommandconstants.h
-epoc32/include/mw/mmgfetchcanceler.h
-epoc32/include/mw/mmgfetchverifier.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/mmsvattachmentmanager.h
 epoc32/include/mw/mmsvattachmentmanagersync.h
 epoc32/include/mw/mobexnotify.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/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/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
@@ -1689,7 +1875,11 @@
 epoc32/include/mw/obsolete/protypes.h
 epoc32/include/mw/ocrcommon.h
 epoc32/include/mw/ocrsrv.h
-epoc32/include/mw/oma2agent.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/playerinformationtarget.h
 epoc32/include/mw/playerinformationtargetobserver.h
 epoc32/include/mw/pluginadapterinterface.h
@@ -1699,30 +1889,32 @@
 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/rconnmon.h
 epoc32/include/mw/rdrmhelper.h
 epoc32/include/mw/regpsdll.h
+epoc32/include/mw/remcon/avrcpspec.h
 epoc32/include/mw/remconbatterytarget.h
 epoc32/include/mw/remconbatterytargetobserver.h
+epoc32/include/mw/remconbeareravrcp.h
 epoc32/include/mw/remcondatabaseawaremediabrowsetarget.h
 epoc32/include/mw/remcondatabaseawaremedialibrarybrowse.h
 epoc32/include/mw/remcondatabaseawaremedialibrarybrowseobserver.h
@@ -1749,7 +1941,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
@@ -1757,10 +1949,11 @@
 epoc32/include/mw/rtp.h
 epoc32/include/mw/schedulebaseservermtm.h
 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
@@ -1777,51 +1970,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
@@ -1918,13 +2111,14 @@
 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/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
 epoc32/include/mw/tmsvsystemprogress.h
 epoc32/include/mw/touchfeedback.h
@@ -1932,8 +2126,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
@@ -1946,6 +2140,7 @@
 epoc32/include/mw/tzid.inl
 epoc32/include/mw/tzlocalizationdatatypes.h
 epoc32/include/mw/tzlocalizationdatatypes.inl
+epoc32/include/mw/tzlocalizedcityrecord.h
 epoc32/include/mw/tzlocalizedcityrecord.inl
 epoc32/include/mw/tzlocalizer.h
 epoc32/include/mw/tzupdate.h
@@ -1970,42 +2165,62 @@
 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
 epoc32/include/networking/qos3gpp_subconparams.inl
 epoc32/include/nifman.h
+epoc32/include/nifman_internal.h
 epoc32/include/nifvar.h
+epoc32/include/nkern/nkern_ext.mmh
+epoc32/include/nkernsmp/nkern_ext.mmh
 epoc32/include/non_foundation_paths.hrh
 epoc32/include/numberconversion.h
+epoc32/include/obex/transport/obextransport.hrh
+epoc32/include/oem/simlockuikeys.h
 epoc32/include/openfont.h
 epoc32/include/openfontlinkedtypefaceelementspec.h
-epoc32/include/orientationbase.h
-epoc32/include/orientationdata.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/padding.h
 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/pcstore/checkeduid.h
+epoc32/include/pcstore/descriptors.h
+epoc32/include/pcstore/directfilestore.h
+epoc32/include/pcstore/pcstore.h
+epoc32/include/pcstore/pcstoredef.h
+epoc32/include/pcstore/storeexception.h
+epoc32/include/pcstore/storereadstream.h
+epoc32/include/pcstore/storewritestream.h
+epoc32/include/pcstore/streamid.h
 epoc32/include/pcstore/uid.h
 epoc32/include/pdrport.h
-epoc32/include/pdrrecrd.h
+epoc32/include/PDRRECRD.H
 epoc32/include/pdrstore.h
 epoc32/include/pkixcertchain.h
 epoc32/include/pkixvalidationresult.h
 epoc32/include/platform_paths.hrh
-epoc32/include/platformstaticfeatures.hrh
-epoc32/include/plpsess.inl
+epoc32/include/PlatformStaticFeatures.hrh
 epoc32/include/pls.h
 epoc32/include/pointerevent.h
 epoc32/include/privateruntimeids.hrh
-epoc32/include/privatestaticfeatures.hrh
-epoc32/include/productvariant.hrh
+epoc32/include/PrivateStaticFeatures.hrh
+epoc32/include/ProductVariant.hrh
+epoc32/include/PtiKoreanQwertyCoreCRDefs.h
 epoc32/include/publicruntimeids.hrh
-epoc32/include/publicstaticfeatures.hrh
+epoc32/include/PublicStaticFeatures.hrh
 epoc32/include/punycodeconverter.h
 epoc32/include/random.h
 epoc32/include/remcon/playertype.h
 epoc32/include/remcon/remconinterfacefeatures.h
+epoc32/include/remcon/remconservercaps.mmh
 epoc32/include/remconabsvolcontroller.h
 epoc32/include/remconabsvolcontrollerobserver.h
 epoc32/include/remconabsvoltarget.h
@@ -2023,8 +2238,9 @@
 epoc32/include/remcontrackinfocontrollerobserver.h
 epoc32/include/remcontrackinfotarget.h
 epoc32/include/remcontrackinfotargetobserver.h
-epoc32/include/roomlevelbase.h
-epoc32/include/roomleveldata.h
+epoc32/include/RoomLevelBase.h
+epoc32/include/RoomLevelData.h
+epoc32/include/rsconfig.mmh
 epoc32/include/rvct/rvct.h
 epoc32/include/s32btree.h
 epoc32/include/s32btree.inl
@@ -2048,11 +2264,14 @@
 epoc32/include/s32strm.inl
 epoc32/include/s32ucmp.h
 epoc32/include/sacls.h
+epoc32/include/saclscommon.h
+epoc32/include/saclsdefines.h
 epoc32/include/sbque.h
 epoc32/include/schinfo.h
 epoc32/include/schsend.hrh
 epoc32/include/schtask.h
 epoc32/include/schtime.h
+epoc32/include/scs/scsclient.h
 epoc32/include/sdpcodecstringconstants.h
 epoc32/include/securesocket.h
 epoc32/include/securesocketinterface.h
@@ -2080,14 +2299,20 @@
 epoc32/include/sensrvproximitysensor.h
 epoc32/include/sensrvtappingsensor.h
 epoc32/include/sensrvtypes.h
+epoc32/include/serialdriverext.h
 epoc32/include/shapeinfo.h
-epoc32/include/shiftjis.h
 epoc32/include/signed.h
 epoc32/include/sipstrconsts.h
 epoc32/include/sizemode.h
 epoc32/include/smilattributes.h
 epoc32/include/smilelements.h
 epoc32/include/smilgenericelements.h
+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
 epoc32/include/smsuact.h
 epoc32/include/smsuaddr.h
@@ -2097,20 +2322,32 @@
 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/speechrecognitionuids.hrh
 epoc32/include/speechrecognitionutility.h
 epoc32/include/speechrecognitionutilityobserver.h
-epoc32/include/spriteanimationclient.h
 epoc32/include/sqldb.h
 epoc32/include/ssl.h
 epoc32/include/ssl_compatibility.h
 epoc32/include/sslerr.h
 epoc32/include/ssm/clayerswp.hrh
+epoc32/include/ssm/cmdpersistreboots.hrh
+epoc32/include/ssm/conditiontypes.hrh
+epoc32/include/ssm/ssmadaptation.hrh
+epoc32/include/ssm/ssmcmd.hrh
+epoc32/include/ssm/ssmstates.hrh
+epoc32/include/ssm/ssmsubstates.hrh
+epoc32/include/ssm/starter.hrh
+epoc32/include/starter.hrh
+epoc32/include/startup.hrh
+epoc32/include/stdapis/_ansi.h
 epoc32/include/stdapis/_ctype.h
+epoc32/include/stdapis/arpa/inet.h
+epoc32/include/stdapis/arpa/nameser.h
 epoc32/include/stdapis/arpa/nameser_compat.h
+epoc32/include/stdapis/assert.h
 epoc32/include/stdapis/boost/aligned_storage.hpp
 epoc32/include/stdapis/boost/any.hpp
 epoc32/include/stdapis/boost/archive/archive_exception.hpp
@@ -2165,11 +2402,12 @@
 epoc32/include/stdapis/boost/concept_archetype.hpp
 epoc32/include/stdapis/boost/concept_check.hpp
 epoc32/include/stdapis/boost/config.hpp
+epoc32/include/stdapis/boost/config/abi_prefix.hpp
+epoc32/include/stdapis/boost/config/abi_suffix.hpp
 epoc32/include/stdapis/boost/config/auto_link.hpp
 epoc32/include/stdapis/boost/config/compiler/metrowerks.hpp
 epoc32/include/stdapis/boost/config/no_tr1/complex.hpp
 epoc32/include/stdapis/boost/config/no_tr1/utility.hpp
-epoc32/include/stdapis/boost/config/platform/win32.hpp
 epoc32/include/stdapis/boost/config/select_compiler_config.hpp
 epoc32/include/stdapis/boost/config/select_platform_config.hpp
 epoc32/include/stdapis/boost/config/select_stdlib_config.hpp
@@ -2185,6 +2423,8 @@
 epoc32/include/stdapis/boost/detail/atomic_count_win32.hpp
 epoc32/include/stdapis/boost/detail/bad_weak_ptr.hpp
 epoc32/include/stdapis/boost/detail/binary_search.hpp
+epoc32/include/stdapis/boost/detail/call_traits.hpp
+epoc32/include/stdapis/boost/detail/compressed_pair.hpp
 epoc32/include/stdapis/boost/detail/dynamic_bitset.hpp
 epoc32/include/stdapis/boost/detail/indirect_traits.hpp
 epoc32/include/stdapis/boost/detail/interlocked.hpp
@@ -2214,6 +2454,9 @@
 epoc32/include/stdapis/boost/detail/sp_counted_impl.hpp
 epoc32/include/stdapis/boost/detail/templated_streams.hpp
 epoc32/include/stdapis/boost/detail/workaround.hpp
+epoc32/include/stdapis/boost/dynamic_bitset.hpp
+epoc32/include/stdapis/boost/dynamic_bitset/config.hpp
+epoc32/include/stdapis/boost/dynamic_bitset/dynamic_bitset.hpp
 epoc32/include/stdapis/boost/dynamic_bitset_fwd.hpp
 epoc32/include/stdapis/boost/dynamic_property_map.hpp
 epoc32/include/stdapis/boost/enable_shared_from_this.hpp
@@ -2254,6 +2497,7 @@
 epoc32/include/stdapis/boost/graph/dag_shortest_paths.hpp
 epoc32/include/stdapis/boost/graph/depth_first_search.hpp
 epoc32/include/stdapis/boost/graph/detail/adj_list_edge_iterator.hpp
+epoc32/include/stdapis/boost/graph/detail/adjacency_list.hpp
 epoc32/include/stdapis/boost/graph/detail/array_binary_tree.hpp
 epoc32/include/stdapis/boost/graph/detail/bitset_adaptor.hpp
 epoc32/include/stdapis/boost/graph/detail/edge.hpp
@@ -2282,6 +2526,7 @@
 epoc32/include/stdapis/boost/graph/graph_utility.hpp
 epoc32/include/stdapis/boost/graph/graphviz.hpp
 epoc32/include/stdapis/boost/graph/gursoy_atun_layout.hpp
+epoc32/include/stdapis/boost/graph/incremental_components.hpp
 epoc32/include/stdapis/boost/graph/isomorphism.hpp
 epoc32/include/stdapis/boost/graph/iteration_macros.hpp
 epoc32/include/stdapis/boost/graph/iteration_macros_undef.hpp
@@ -2329,6 +2574,7 @@
 epoc32/include/stdapis/boost/intrusive_ptr.hpp
 epoc32/include/stdapis/boost/io/ios_state.hpp
 epoc32/include/stdapis/boost/io_fwd.hpp
+epoc32/include/stdapis/boost/iterator.hpp
 epoc32/include/stdapis/boost/iterator/counting_iterator.hpp
 epoc32/include/stdapis/boost/iterator/detail/config_def.hpp
 epoc32/include/stdapis/boost/iterator/detail/config_undef.hpp
@@ -2369,6 +2615,7 @@
 epoc32/include/stdapis/boost/math/common_factor.hpp
 epoc32/include/stdapis/boost/math/common_factor_ct.hpp
 epoc32/include/stdapis/boost/math/common_factor_rt.hpp
+epoc32/include/stdapis/boost/math/complex.hpp
 epoc32/include/stdapis/boost/math/complex/acos.hpp
 epoc32/include/stdapis/boost/math/complex/acosh.hpp
 epoc32/include/stdapis/boost/math/complex/asin.hpp
@@ -2379,6 +2626,9 @@
 epoc32/include/stdapis/boost/math/complex/fabs.hpp
 epoc32/include/stdapis/boost/math/octonion.hpp
 epoc32/include/stdapis/boost/math/quaternion.hpp
+epoc32/include/stdapis/boost/math/special_functions/acosh.hpp
+epoc32/include/stdapis/boost/math/special_functions/asinh.hpp
+epoc32/include/stdapis/boost/math/special_functions/atanh.hpp
 epoc32/include/stdapis/boost/math/special_functions/detail/series.hpp
 epoc32/include/stdapis/boost/math/special_functions/expm1.hpp
 epoc32/include/stdapis/boost/math/special_functions/hypot.hpp
@@ -2394,7 +2644,9 @@
 epoc32/include/stdapis/boost/mpl/apply.hpp
 epoc32/include/stdapis/boost/mpl/apply_fwd.hpp
 epoc32/include/stdapis/boost/mpl/apply_wrap.hpp
+epoc32/include/stdapis/boost/mpl/arg.hpp
 epoc32/include/stdapis/boost/mpl/arg_fwd.hpp
+epoc32/include/stdapis/boost/mpl/assert.hpp
 epoc32/include/stdapis/boost/mpl/at.hpp
 epoc32/include/stdapis/boost/mpl/at_fwd.hpp
 epoc32/include/stdapis/boost/mpl/aux_/adl_barrier.hpp
@@ -2411,6 +2663,7 @@
 epoc32/include/stdapis/boost/mpl/aux_/comparison_op.hpp
 epoc32/include/stdapis/boost/mpl/aux_/config/adl.hpp
 epoc32/include/stdapis/boost/mpl/aux_/config/arrays.hpp
+epoc32/include/stdapis/boost/mpl/aux_/config/bind.hpp
 epoc32/include/stdapis/boost/mpl/aux_/config/compiler.hpp
 epoc32/include/stdapis/boost/mpl/aux_/config/ctps.hpp
 epoc32/include/stdapis/boost/mpl/aux_/config/dtp.hpp
@@ -2421,21 +2674,25 @@
 epoc32/include/stdapis/boost/mpl/aux_/config/has_xxx.hpp
 epoc32/include/stdapis/boost/mpl/aux_/config/integral.hpp
 epoc32/include/stdapis/boost/mpl/aux_/config/intel.hpp
+epoc32/include/stdapis/boost/mpl/aux_/config/lambda.hpp
 epoc32/include/stdapis/boost/mpl/aux_/config/msvc.hpp
 epoc32/include/stdapis/boost/mpl/aux_/config/msvc_typename.hpp
 epoc32/include/stdapis/boost/mpl/aux_/config/nttp.hpp
+epoc32/include/stdapis/boost/mpl/aux_/config/operators.hpp
 epoc32/include/stdapis/boost/mpl/aux_/config/overload_resolution.hpp
 epoc32/include/stdapis/boost/mpl/aux_/config/preprocessor.hpp
 epoc32/include/stdapis/boost/mpl/aux_/config/static_constant.hpp
 epoc32/include/stdapis/boost/mpl/aux_/config/ttp.hpp
 epoc32/include/stdapis/boost/mpl/aux_/config/typeof.hpp
 epoc32/include/stdapis/boost/mpl/aux_/config/use_preprocessed.hpp
+epoc32/include/stdapis/boost/mpl/aux_/config/workaround.hpp
 epoc32/include/stdapis/boost/mpl/aux_/contains_impl.hpp
 epoc32/include/stdapis/boost/mpl/aux_/empty_impl.hpp
 epoc32/include/stdapis/boost/mpl/aux_/find_if_pred.hpp
 epoc32/include/stdapis/boost/mpl/aux_/fold_impl.hpp
 epoc32/include/stdapis/boost/mpl/aux_/front_impl.hpp
 epoc32/include/stdapis/boost/mpl/aux_/full_lambda.hpp
+epoc32/include/stdapis/boost/mpl/aux_/has_apply.hpp
 epoc32/include/stdapis/boost/mpl/aux_/has_begin.hpp
 epoc32/include/stdapis/boost/mpl/aux_/has_key_impl.hpp
 epoc32/include/stdapis/boost/mpl/aux_/has_size.hpp
@@ -2463,17 +2720,30 @@
 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
+epoc32/include/stdapis/boost/mpl/aux_/preprocessed/plain/advance_forward.hpp
+epoc32/include/stdapis/boost/mpl/aux_/preprocessed/plain/and.hpp
+epoc32/include/stdapis/boost/mpl/aux_/preprocessed/plain/apply.hpp
+epoc32/include/stdapis/boost/mpl/aux_/preprocessed/plain/apply_fwd.hpp
+epoc32/include/stdapis/boost/mpl/aux_/preprocessed/plain/apply_wrap.hpp
+epoc32/include/stdapis/boost/mpl/aux_/preprocessed/plain/arg.hpp
+epoc32/include/stdapis/boost/mpl/aux_/preprocessed/plain/bind.hpp
 epoc32/include/stdapis/boost/mpl/aux_/preprocessed/plain/bind_fwd.hpp
 epoc32/include/stdapis/boost/mpl/aux_/preprocessed/plain/equal_to.hpp
+epoc32/include/stdapis/boost/mpl/aux_/preprocessed/plain/fold_impl.hpp
+epoc32/include/stdapis/boost/mpl/aux_/preprocessed/plain/full_lambda.hpp
 epoc32/include/stdapis/boost/mpl/aux_/preprocessed/plain/greater.hpp
 epoc32/include/stdapis/boost/mpl/aux_/preprocessed/plain/greater_equal.hpp
+epoc32/include/stdapis/boost/mpl/aux_/preprocessed/plain/iter_fold_if_impl.hpp
+epoc32/include/stdapis/boost/mpl/aux_/preprocessed/plain/iter_fold_impl.hpp
 epoc32/include/stdapis/boost/mpl/aux_/preprocessed/plain/less.hpp
 epoc32/include/stdapis/boost/mpl/aux_/preprocessed/plain/list.hpp
 epoc32/include/stdapis/boost/mpl/aux_/preprocessed/plain/minus.hpp
 epoc32/include/stdapis/boost/mpl/aux_/preprocessed/plain/or.hpp
+epoc32/include/stdapis/boost/mpl/aux_/preprocessed/plain/placeholders.hpp
 epoc32/include/stdapis/boost/mpl/aux_/preprocessed/plain/plus.hpp
 epoc32/include/stdapis/boost/mpl/aux_/preprocessed/plain/quote.hpp
 epoc32/include/stdapis/boost/mpl/aux_/preprocessed/plain/reverse_fold_impl.hpp
@@ -2490,8 +2760,11 @@
 epoc32/include/stdapis/boost/mpl/aux_/ptr_to_ref.hpp
 epoc32/include/stdapis/boost/mpl/aux_/push_back_impl.hpp
 epoc32/include/stdapis/boost/mpl/aux_/push_front_impl.hpp
+epoc32/include/stdapis/boost/mpl/aux_/reverse_fold_impl.hpp
+epoc32/include/stdapis/boost/mpl/aux_/reverse_iter_fold_impl.hpp
 epoc32/include/stdapis/boost/mpl/aux_/size_impl.hpp
 epoc32/include/stdapis/boost/mpl/aux_/static_cast.hpp
+epoc32/include/stdapis/boost/mpl/aux_/template_arity.hpp
 epoc32/include/stdapis/boost/mpl/aux_/template_arity_fwd.hpp
 epoc32/include/stdapis/boost/mpl/aux_/traits_lambda_spec.hpp
 epoc32/include/stdapis/boost/mpl/aux_/type_wrapper.hpp
@@ -2503,6 +2776,8 @@
 epoc32/include/stdapis/boost/mpl/base.hpp
 epoc32/include/stdapis/boost/mpl/begin_end.hpp
 epoc32/include/stdapis/boost/mpl/begin_end_fwd.hpp
+epoc32/include/stdapis/boost/mpl/bind.hpp
+epoc32/include/stdapis/boost/mpl/bind_fwd.hpp
 epoc32/include/stdapis/boost/mpl/bool.hpp
 epoc32/include/stdapis/boost/mpl/bool_fwd.hpp
 epoc32/include/stdapis/boost/mpl/clear.hpp
@@ -2514,6 +2789,7 @@
 epoc32/include/stdapis/boost/mpl/distance_fwd.hpp
 epoc32/include/stdapis/boost/mpl/empty.hpp
 epoc32/include/stdapis/boost/mpl/empty_fwd.hpp
+epoc32/include/stdapis/boost/mpl/equal_to.hpp
 epoc32/include/stdapis/boost/mpl/erase_fwd.hpp
 epoc32/include/stdapis/boost/mpl/erase_key_fwd.hpp
 epoc32/include/stdapis/boost/mpl/eval_if.hpp
@@ -2524,8 +2800,11 @@
 epoc32/include/stdapis/boost/mpl/front.hpp
 epoc32/include/stdapis/boost/mpl/front_fwd.hpp
 epoc32/include/stdapis/boost/mpl/front_inserter.hpp
+epoc32/include/stdapis/boost/mpl/greater.hpp
+epoc32/include/stdapis/boost/mpl/greater_equal.hpp
 epoc32/include/stdapis/boost/mpl/has_key.hpp
 epoc32/include/stdapis/boost/mpl/has_key_fwd.hpp
+epoc32/include/stdapis/boost/mpl/has_xxx.hpp
 epoc32/include/stdapis/boost/mpl/identity.hpp
 epoc32/include/stdapis/boost/mpl/if.hpp
 epoc32/include/stdapis/boost/mpl/insert_fwd.hpp
@@ -2542,7 +2821,21 @@
 epoc32/include/stdapis/boost/mpl/iterator_range.hpp
 epoc32/include/stdapis/boost/mpl/iterator_tags.hpp
 epoc32/include/stdapis/boost/mpl/key_type_fwd.hpp
+epoc32/include/stdapis/boost/mpl/lambda.hpp
+epoc32/include/stdapis/boost/mpl/lambda_fwd.hpp
+epoc32/include/stdapis/boost/mpl/less.hpp
+epoc32/include/stdapis/boost/mpl/limits/arity.hpp
+epoc32/include/stdapis/boost/mpl/limits/list.hpp
+epoc32/include/stdapis/boost/mpl/limits/vector.hpp
+epoc32/include/stdapis/boost/mpl/list.hpp
+epoc32/include/stdapis/boost/mpl/list/aux_/begin_end.hpp
+epoc32/include/stdapis/boost/mpl/list/aux_/clear.hpp
+epoc32/include/stdapis/boost/mpl/list/aux_/empty.hpp
+epoc32/include/stdapis/boost/mpl/list/aux_/front.hpp
+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_/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
@@ -2551,52 +2844,97 @@
 epoc32/include/stdapis/boost/mpl/list/aux_/size.hpp
 epoc32/include/stdapis/boost/mpl/list/aux_/tag.hpp
 epoc32/include/stdapis/boost/mpl/list/list0.hpp
+epoc32/include/stdapis/boost/mpl/list/list10.hpp
+epoc32/include/stdapis/boost/mpl/list/list20.hpp
 epoc32/include/stdapis/boost/mpl/logical.hpp
 epoc32/include/stdapis/boost/mpl/long.hpp
 epoc32/include/stdapis/boost/mpl/long_fwd.hpp
 epoc32/include/stdapis/boost/mpl/max_element.hpp
 epoc32/include/stdapis/boost/mpl/min_max.hpp
+epoc32/include/stdapis/boost/mpl/minus.hpp
 epoc32/include/stdapis/boost/mpl/multiplies.hpp
 epoc32/include/stdapis/boost/mpl/negate.hpp
 epoc32/include/stdapis/boost/mpl/next.hpp
 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
+epoc32/include/stdapis/boost/mpl/placeholders.hpp
+epoc32/include/stdapis/boost/mpl/plus.hpp
 epoc32/include/stdapis/boost/mpl/pop_back_fwd.hpp
+epoc32/include/stdapis/boost/mpl/pop_front.hpp
 epoc32/include/stdapis/boost/mpl/pop_front_fwd.hpp
 epoc32/include/stdapis/boost/mpl/prior.hpp
 epoc32/include/stdapis/boost/mpl/protect.hpp
+epoc32/include/stdapis/boost/mpl/push_back.hpp
 epoc32/include/stdapis/boost/mpl/push_back_fwd.hpp
+epoc32/include/stdapis/boost/mpl/push_front.hpp
 epoc32/include/stdapis/boost/mpl/push_front_fwd.hpp
+epoc32/include/stdapis/boost/mpl/quote.hpp
 epoc32/include/stdapis/boost/mpl/reverse_fold.hpp
 epoc32/include/stdapis/boost/mpl/reverse_iter_fold.hpp
 epoc32/include/stdapis/boost/mpl/same_as.hpp
 epoc32/include/stdapis/boost/mpl/sequence_tag.hpp
 epoc32/include/stdapis/boost/mpl/sequence_tag_fwd.hpp
+epoc32/include/stdapis/boost/mpl/set/aux_/at_impl.hpp
+epoc32/include/stdapis/boost/mpl/set/aux_/begin_end_impl.hpp
+epoc32/include/stdapis/boost/mpl/set/aux_/clear_impl.hpp
+epoc32/include/stdapis/boost/mpl/set/aux_/empty_impl.hpp
 epoc32/include/stdapis/boost/mpl/set/aux_/erase_impl.hpp
 epoc32/include/stdapis/boost/mpl/set/aux_/erase_key_impl.hpp
+epoc32/include/stdapis/boost/mpl/set/aux_/has_key_impl.hpp
 epoc32/include/stdapis/boost/mpl/set/aux_/insert_impl.hpp
+epoc32/include/stdapis/boost/mpl/set/aux_/item.hpp
+epoc32/include/stdapis/boost/mpl/set/aux_/iterator.hpp
 epoc32/include/stdapis/boost/mpl/set/aux_/key_type_impl.hpp
 epoc32/include/stdapis/boost/mpl/set/aux_/set0.hpp
+epoc32/include/stdapis/boost/mpl/set/aux_/size_impl.hpp
+epoc32/include/stdapis/boost/mpl/set/aux_/tag.hpp
 epoc32/include/stdapis/boost/mpl/set/aux_/value_type_impl.hpp
+epoc32/include/stdapis/boost/mpl/set/set0.hpp
+epoc32/include/stdapis/boost/mpl/size.hpp
 epoc32/include/stdapis/boost/mpl/size_fwd.hpp
 epoc32/include/stdapis/boost/mpl/size_t.hpp
 epoc32/include/stdapis/boost/mpl/size_t_fwd.hpp
 epoc32/include/stdapis/boost/mpl/sizeof.hpp
+epoc32/include/stdapis/boost/mpl/tag.hpp
+epoc32/include/stdapis/boost/mpl/times.hpp
 epoc32/include/stdapis/boost/mpl/transform.hpp
 epoc32/include/stdapis/boost/mpl/value_type_fwd.hpp
+epoc32/include/stdapis/boost/mpl/vector.hpp
+epoc32/include/stdapis/boost/mpl/vector/aux_/at.hpp
 epoc32/include/stdapis/boost/mpl/vector/aux_/back.hpp
+epoc32/include/stdapis/boost/mpl/vector/aux_/begin_end.hpp
+epoc32/include/stdapis/boost/mpl/vector/aux_/clear.hpp
+epoc32/include/stdapis/boost/mpl/vector/aux_/empty.hpp
+epoc32/include/stdapis/boost/mpl/vector/aux_/front.hpp
+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_/pop_back.hpp
+epoc32/include/stdapis/boost/mpl/vector/aux_/pop_front.hpp
 epoc32/include/stdapis/boost/mpl/vector/aux_/preprocessed/plain/vector10.hpp
 epoc32/include/stdapis/boost/mpl/vector/aux_/preprocessed/plain/vector20.hpp
+epoc32/include/stdapis/boost/mpl/vector/aux_/preprocessed/typeof_based/vector10.hpp
+epoc32/include/stdapis/boost/mpl/vector/aux_/preprocessed/typeof_based/vector20.hpp
+epoc32/include/stdapis/boost/mpl/vector/aux_/push_back.hpp
+epoc32/include/stdapis/boost/mpl/vector/aux_/push_front.hpp
+epoc32/include/stdapis/boost/mpl/vector/aux_/size.hpp
+epoc32/include/stdapis/boost/mpl/vector/aux_/tag.hpp
 epoc32/include/stdapis/boost/mpl/vector/aux_/vector0.hpp
+epoc32/include/stdapis/boost/mpl/vector/vector0.hpp
+epoc32/include/stdapis/boost/mpl/vector/vector10.hpp
+epoc32/include/stdapis/boost/mpl/vector/vector20.hpp
 epoc32/include/stdapis/boost/mpl/void.hpp
 epoc32/include/stdapis/boost/mpl/void_fwd.hpp
 epoc32/include/stdapis/boost/multi_array.hpp
+epoc32/include/stdapis/boost/multi_array/algorithm.hpp
+epoc32/include/stdapis/boost/multi_array/base.hpp
 epoc32/include/stdapis/boost/multi_array/collection_concept.hpp
 epoc32/include/stdapis/boost/multi_array/concept_checks.hpp
 epoc32/include/stdapis/boost/multi_array/copy_array.hpp
@@ -2604,6 +2942,7 @@
 epoc32/include/stdapis/boost/multi_array/extent_range.hpp
 epoc32/include/stdapis/boost/multi_array/index_gen.hpp
 epoc32/include/stdapis/boost/multi_array/index_range.hpp
+epoc32/include/stdapis/boost/multi_array/iterator.hpp
 epoc32/include/stdapis/boost/multi_array/multi_array_ref.hpp
 epoc32/include/stdapis/boost/multi_array/range_list.hpp
 epoc32/include/stdapis/boost/multi_array/storage_order.hpp
@@ -2621,6 +2960,7 @@
 epoc32/include/stdapis/boost/multi_index/detail/copy_map.hpp
 epoc32/include/stdapis/boost/multi_index/detail/def_ctor_tuple_cons.hpp
 epoc32/include/stdapis/boost/multi_index/detail/duplicates_iterator.hpp
+epoc32/include/stdapis/boost/multi_index/detail/has_tag.hpp
 epoc32/include/stdapis/boost/multi_index/detail/hash_index_args.hpp
 epoc32/include/stdapis/boost/multi_index/detail/hash_index_iterator.hpp
 epoc32/include/stdapis/boost/multi_index/detail/hash_index_node.hpp
@@ -2656,6 +2996,7 @@
 epoc32/include/stdapis/boost/multi_index/detail/value_compare.hpp
 epoc32/include/stdapis/boost/multi_index/hashed_index.hpp
 epoc32/include/stdapis/boost/multi_index/hashed_index_fwd.hpp
+epoc32/include/stdapis/boost/multi_index/identity.hpp
 epoc32/include/stdapis/boost/multi_index/identity_fwd.hpp
 epoc32/include/stdapis/boost/multi_index/indexed_by.hpp
 epoc32/include/stdapis/boost/multi_index/key_extractors.hpp
@@ -2668,13 +3009,20 @@
 epoc32/include/stdapis/boost/multi_index/safe_mode_errors.hpp
 epoc32/include/stdapis/boost/multi_index/sequenced_index.hpp
 epoc32/include/stdapis/boost/multi_index/sequenced_index_fwd.hpp
+epoc32/include/stdapis/boost/multi_index/tag.hpp
 epoc32/include/stdapis/boost/multi_index_container.hpp
 epoc32/include/stdapis/boost/multi_index_container_fwd.hpp
+epoc32/include/stdapis/boost/next_prior.hpp
 epoc32/include/stdapis/boost/noncopyable.hpp
 epoc32/include/stdapis/boost/none.hpp
 epoc32/include/stdapis/boost/numeric/conversion/bounds.hpp
+epoc32/include/stdapis/boost/numeric/conversion/cast.hpp
 epoc32/include/stdapis/boost/numeric/conversion/conversion_traits.hpp
+epoc32/include/stdapis/boost/numeric/conversion/converter.hpp
 epoc32/include/stdapis/boost/numeric/conversion/converter_policies.hpp
+epoc32/include/stdapis/boost/numeric/conversion/detail/bounds.hpp
+epoc32/include/stdapis/boost/numeric/conversion/detail/conversion_traits.hpp
+epoc32/include/stdapis/boost/numeric/conversion/detail/converter.hpp
 epoc32/include/stdapis/boost/numeric/conversion/detail/int_float_mixture.hpp
 epoc32/include/stdapis/boost/numeric/conversion/detail/is_subranged.hpp
 epoc32/include/stdapis/boost/numeric/conversion/detail/meta.hpp
@@ -2683,7 +3031,9 @@
 epoc32/include/stdapis/boost/numeric/conversion/int_float_mixture_enum.hpp
 epoc32/include/stdapis/boost/numeric/conversion/sign_mixture_enum.hpp
 epoc32/include/stdapis/boost/numeric/conversion/udt_builtin_mixture_enum.hpp
+epoc32/include/stdapis/boost/operators.hpp
 epoc32/include/stdapis/boost/optional.hpp
+epoc32/include/stdapis/boost/optional/optional.hpp
 epoc32/include/stdapis/boost/optional/optional_fwd.hpp
 epoc32/include/stdapis/boost/pending/bucket_sorter.hpp
 epoc32/include/stdapis/boost/pending/container_traits.hpp
@@ -2691,6 +3041,7 @@
 epoc32/include/stdapis/boost/pending/ct_if.hpp
 epoc32/include/stdapis/boost/pending/detail/disjoint_sets.hpp
 epoc32/include/stdapis/boost/pending/detail/property.hpp
+epoc32/include/stdapis/boost/pending/disjoint_sets.hpp
 epoc32/include/stdapis/boost/pending/indirect_cmp.hpp
 epoc32/include/stdapis/boost/pending/integer_log2.hpp
 epoc32/include/stdapis/boost/pending/integer_range.hpp
@@ -2698,6 +3049,7 @@
 epoc32/include/stdapis/boost/pending/lowest_bit.hpp
 epoc32/include/stdapis/boost/pending/mutable_heap.hpp
 epoc32/include/stdapis/boost/pending/mutable_queue.hpp
+epoc32/include/stdapis/boost/pending/property.hpp
 epoc32/include/stdapis/boost/pending/property_serialize.hpp
 epoc32/include/stdapis/boost/pending/queue.hpp
 epoc32/include/stdapis/boost/pending/relaxed_heap.hpp
@@ -2705,6 +3057,7 @@
 epoc32/include/stdapis/boost/pointee.hpp
 epoc32/include/stdapis/boost/pointer_cast.hpp
 epoc32/include/stdapis/boost/pointer_to_other.hpp
+epoc32/include/stdapis/boost/preprocessor.hpp
 epoc32/include/stdapis/boost/preprocessor/arithmetic.hpp
 epoc32/include/stdapis/boost/preprocessor/arithmetic/add.hpp
 epoc32/include/stdapis/boost/preprocessor/arithmetic/dec.hpp
@@ -2714,36 +3067,58 @@
 epoc32/include/stdapis/boost/preprocessor/arithmetic/mod.hpp
 epoc32/include/stdapis/boost/preprocessor/arithmetic/mul.hpp
 epoc32/include/stdapis/boost/preprocessor/arithmetic/sub.hpp
+epoc32/include/stdapis/boost/preprocessor/array.hpp
 epoc32/include/stdapis/boost/preprocessor/array/data.hpp
 epoc32/include/stdapis/boost/preprocessor/array/elem.hpp
 epoc32/include/stdapis/boost/preprocessor/array/insert.hpp
+epoc32/include/stdapis/boost/preprocessor/array/pop_back.hpp
+epoc32/include/stdapis/boost/preprocessor/array/pop_front.hpp
+epoc32/include/stdapis/boost/preprocessor/array/push_back.hpp
+epoc32/include/stdapis/boost/preprocessor/array/push_front.hpp
 epoc32/include/stdapis/boost/preprocessor/array/remove.hpp
 epoc32/include/stdapis/boost/preprocessor/array/replace.hpp
 epoc32/include/stdapis/boost/preprocessor/array/reverse.hpp
+epoc32/include/stdapis/boost/preprocessor/array/size.hpp
 epoc32/include/stdapis/boost/preprocessor/cat.hpp
 epoc32/include/stdapis/boost/preprocessor/comma_if.hpp
 epoc32/include/stdapis/boost/preprocessor/comparison.hpp
 epoc32/include/stdapis/boost/preprocessor/comparison/equal.hpp
+epoc32/include/stdapis/boost/preprocessor/comparison/greater.hpp
+epoc32/include/stdapis/boost/preprocessor/comparison/greater_equal.hpp
+epoc32/include/stdapis/boost/preprocessor/comparison/less.hpp
 epoc32/include/stdapis/boost/preprocessor/comparison/less_equal.hpp
 epoc32/include/stdapis/boost/preprocessor/comparison/not_equal.hpp
+epoc32/include/stdapis/boost/preprocessor/config/config.hpp
+epoc32/include/stdapis/boost/preprocessor/config/limits.hpp
 epoc32/include/stdapis/boost/preprocessor/control.hpp
 epoc32/include/stdapis/boost/preprocessor/control/deduce_d.hpp
 epoc32/include/stdapis/boost/preprocessor/control/detail/edg/while.hpp
+epoc32/include/stdapis/boost/preprocessor/control/detail/while.hpp
 epoc32/include/stdapis/boost/preprocessor/control/expr_if.hpp
 epoc32/include/stdapis/boost/preprocessor/control/expr_iif.hpp
+epoc32/include/stdapis/boost/preprocessor/control/if.hpp
 epoc32/include/stdapis/boost/preprocessor/control/iif.hpp
+epoc32/include/stdapis/boost/preprocessor/control/while.hpp
 epoc32/include/stdapis/boost/preprocessor/debug.hpp
+epoc32/include/stdapis/boost/preprocessor/debug/assert.hpp
 epoc32/include/stdapis/boost/preprocessor/debug/error.hpp
 epoc32/include/stdapis/boost/preprocessor/debug/line.hpp
 epoc32/include/stdapis/boost/preprocessor/detail/auto_rec.hpp
 epoc32/include/stdapis/boost/preprocessor/detail/check.hpp
 epoc32/include/stdapis/boost/preprocessor/detail/is_binary.hpp
 epoc32/include/stdapis/boost/preprocessor/detail/is_unary.hpp
+epoc32/include/stdapis/boost/preprocessor/empty.hpp
+epoc32/include/stdapis/boost/preprocessor/enum.hpp
 epoc32/include/stdapis/boost/preprocessor/enum_params.hpp
 epoc32/include/stdapis/boost/preprocessor/enum_shifted_params.hpp
 epoc32/include/stdapis/boost/preprocessor/facilities.hpp
+epoc32/include/stdapis/boost/preprocessor/facilities/apply.hpp
+epoc32/include/stdapis/boost/preprocessor/facilities/empty.hpp
 epoc32/include/stdapis/boost/preprocessor/facilities/expand.hpp
+epoc32/include/stdapis/boost/preprocessor/facilities/identity.hpp
 epoc32/include/stdapis/boost/preprocessor/facilities/intercept.hpp
+epoc32/include/stdapis/boost/preprocessor/identity.hpp
+epoc32/include/stdapis/boost/preprocessor/inc.hpp
 epoc32/include/stdapis/boost/preprocessor/iterate.hpp
 epoc32/include/stdapis/boost/preprocessor/iteration.hpp
 epoc32/include/stdapis/boost/preprocessor/iteration/detail/bounds/lower1.hpp
@@ -2752,57 +3127,110 @@
 epoc32/include/stdapis/boost/preprocessor/iteration/detail/iter/forward1.hpp
 epoc32/include/stdapis/boost/preprocessor/iteration/detail/local.hpp
 epoc32/include/stdapis/boost/preprocessor/iteration/detail/start.hpp
+epoc32/include/stdapis/boost/preprocessor/iteration/iterate.hpp
+epoc32/include/stdapis/boost/preprocessor/iteration/local.hpp
 epoc32/include/stdapis/boost/preprocessor/iteration/self.hpp
 epoc32/include/stdapis/boost/preprocessor/library.hpp
+epoc32/include/stdapis/boost/preprocessor/list.hpp
 epoc32/include/stdapis/boost/preprocessor/list/adt.hpp
 epoc32/include/stdapis/boost/preprocessor/list/append.hpp
+epoc32/include/stdapis/boost/preprocessor/list/at.hpp
+epoc32/include/stdapis/boost/preprocessor/list/cat.hpp
 epoc32/include/stdapis/boost/preprocessor/list/detail/edg/fold_left.hpp
 epoc32/include/stdapis/boost/preprocessor/list/detail/edg/fold_right.hpp
+epoc32/include/stdapis/boost/preprocessor/list/detail/fold_left.hpp
+epoc32/include/stdapis/boost/preprocessor/list/detail/fold_right.hpp
+epoc32/include/stdapis/boost/preprocessor/list/enum.hpp
 epoc32/include/stdapis/boost/preprocessor/list/filter.hpp
 epoc32/include/stdapis/boost/preprocessor/list/first_n.hpp
+epoc32/include/stdapis/boost/preprocessor/list/fold_left.hpp
+epoc32/include/stdapis/boost/preprocessor/list/fold_right.hpp
+epoc32/include/stdapis/boost/preprocessor/list/for_each.hpp
 epoc32/include/stdapis/boost/preprocessor/list/for_each_i.hpp
 epoc32/include/stdapis/boost/preprocessor/list/for_each_product.hpp
 epoc32/include/stdapis/boost/preprocessor/list/rest_n.hpp
+epoc32/include/stdapis/boost/preprocessor/list/reverse.hpp
+epoc32/include/stdapis/boost/preprocessor/list/size.hpp
 epoc32/include/stdapis/boost/preprocessor/list/to_tuple.hpp
+epoc32/include/stdapis/boost/preprocessor/list/transform.hpp
+epoc32/include/stdapis/boost/preprocessor/logical.hpp
+epoc32/include/stdapis/boost/preprocessor/logical/and.hpp
 epoc32/include/stdapis/boost/preprocessor/logical/bitand.hpp
 epoc32/include/stdapis/boost/preprocessor/logical/bitnor.hpp
 epoc32/include/stdapis/boost/preprocessor/logical/bitor.hpp
 epoc32/include/stdapis/boost/preprocessor/logical/bitxor.hpp
+epoc32/include/stdapis/boost/preprocessor/logical/bool.hpp
 epoc32/include/stdapis/boost/preprocessor/logical/compl.hpp
 epoc32/include/stdapis/boost/preprocessor/logical/nor.hpp
+epoc32/include/stdapis/boost/preprocessor/logical/not.hpp
+epoc32/include/stdapis/boost/preprocessor/logical/or.hpp
 epoc32/include/stdapis/boost/preprocessor/logical/xor.hpp
 epoc32/include/stdapis/boost/preprocessor/punctuation.hpp
 epoc32/include/stdapis/boost/preprocessor/punctuation/comma.hpp
+epoc32/include/stdapis/boost/preprocessor/punctuation/comma_if.hpp
 epoc32/include/stdapis/boost/preprocessor/punctuation/paren.hpp
 epoc32/include/stdapis/boost/preprocessor/punctuation/paren_if.hpp
+epoc32/include/stdapis/boost/preprocessor/repeat.hpp
 epoc32/include/stdapis/boost/preprocessor/repeat_2nd.hpp
 epoc32/include/stdapis/boost/preprocessor/repetition.hpp
 epoc32/include/stdapis/boost/preprocessor/repetition/deduce_r.hpp
 epoc32/include/stdapis/boost/preprocessor/repetition/deduce_z.hpp
 epoc32/include/stdapis/boost/preprocessor/repetition/detail/edg/for.hpp
+epoc32/include/stdapis/boost/preprocessor/repetition/detail/for.hpp
+epoc32/include/stdapis/boost/preprocessor/repetition/enum.hpp
 epoc32/include/stdapis/boost/preprocessor/repetition/enum_binary_params.hpp
+epoc32/include/stdapis/boost/preprocessor/repetition/enum_params.hpp
 epoc32/include/stdapis/boost/preprocessor/repetition/enum_params_with_a_default.hpp
 epoc32/include/stdapis/boost/preprocessor/repetition/enum_params_with_defaults.hpp
 epoc32/include/stdapis/boost/preprocessor/repetition/enum_shifted.hpp
 epoc32/include/stdapis/boost/preprocessor/repetition/enum_shifted_binary_params.hpp
+epoc32/include/stdapis/boost/preprocessor/repetition/enum_shifted_params.hpp
 epoc32/include/stdapis/boost/preprocessor/repetition/enum_trailing.hpp
 epoc32/include/stdapis/boost/preprocessor/repetition/enum_trailing_binary_params.hpp
 epoc32/include/stdapis/boost/preprocessor/repetition/enum_trailing_params.hpp
+epoc32/include/stdapis/boost/preprocessor/repetition/for.hpp
+epoc32/include/stdapis/boost/preprocessor/repetition/repeat.hpp
 epoc32/include/stdapis/boost/preprocessor/repetition/repeat_from_to.hpp
 epoc32/include/stdapis/boost/preprocessor/selection.hpp
 epoc32/include/stdapis/boost/preprocessor/selection/max.hpp
 epoc32/include/stdapis/boost/preprocessor/selection/min.hpp
 epoc32/include/stdapis/boost/preprocessor/seq.hpp
+epoc32/include/stdapis/boost/preprocessor/seq/cat.hpp
 epoc32/include/stdapis/boost/preprocessor/seq/detail/split.hpp
+epoc32/include/stdapis/boost/preprocessor/seq/elem.hpp
+epoc32/include/stdapis/boost/preprocessor/seq/enum.hpp
+epoc32/include/stdapis/boost/preprocessor/seq/filter.hpp
+epoc32/include/stdapis/boost/preprocessor/seq/first_n.hpp
+epoc32/include/stdapis/boost/preprocessor/seq/fold_left.hpp
+epoc32/include/stdapis/boost/preprocessor/seq/fold_right.hpp
+epoc32/include/stdapis/boost/preprocessor/seq/for_each.hpp
+epoc32/include/stdapis/boost/preprocessor/seq/for_each_i.hpp
+epoc32/include/stdapis/boost/preprocessor/seq/for_each_product.hpp
+epoc32/include/stdapis/boost/preprocessor/seq/insert.hpp
+epoc32/include/stdapis/boost/preprocessor/seq/pop_back.hpp
+epoc32/include/stdapis/boost/preprocessor/seq/pop_front.hpp
+epoc32/include/stdapis/boost/preprocessor/seq/push_back.hpp
+epoc32/include/stdapis/boost/preprocessor/seq/push_front.hpp
+epoc32/include/stdapis/boost/preprocessor/seq/remove.hpp
+epoc32/include/stdapis/boost/preprocessor/seq/replace.hpp
+epoc32/include/stdapis/boost/preprocessor/seq/rest_n.hpp
+epoc32/include/stdapis/boost/preprocessor/seq/reverse.hpp
+epoc32/include/stdapis/boost/preprocessor/seq/seq.hpp
+epoc32/include/stdapis/boost/preprocessor/seq/size.hpp
 epoc32/include/stdapis/boost/preprocessor/seq/subseq.hpp
 epoc32/include/stdapis/boost/preprocessor/seq/to_array.hpp
+epoc32/include/stdapis/boost/preprocessor/seq/to_tuple.hpp
+epoc32/include/stdapis/boost/preprocessor/seq/transform.hpp
 epoc32/include/stdapis/boost/preprocessor/slot.hpp
 epoc32/include/stdapis/boost/preprocessor/slot/detail/def.hpp
 epoc32/include/stdapis/boost/preprocessor/slot/detail/shared.hpp
+epoc32/include/stdapis/boost/preprocessor/slot/slot.hpp
 epoc32/include/stdapis/boost/preprocessor/stringize.hpp
 epoc32/include/stdapis/boost/preprocessor/tuple.hpp
 epoc32/include/stdapis/boost/preprocessor/tuple/eat.hpp
+epoc32/include/stdapis/boost/preprocessor/tuple/elem.hpp
 epoc32/include/stdapis/boost/preprocessor/tuple/rem.hpp
+epoc32/include/stdapis/boost/preprocessor/tuple/reverse.hpp
 epoc32/include/stdapis/boost/preprocessor/tuple/to_list.hpp
 epoc32/include/stdapis/boost/preprocessor/tuple/to_seq.hpp
 epoc32/include/stdapis/boost/progress.hpp
@@ -2819,6 +3247,7 @@
 epoc32/include/stdapis/boost/ptr_container/detail/static_move_ptr.hpp
 epoc32/include/stdapis/boost/ptr_container/detail/throw_exception.hpp
 epoc32/include/stdapis/boost/ptr_container/detail/void_ptr_iterator.hpp
+epoc32/include/stdapis/boost/ptr_container/exception.hpp
 epoc32/include/stdapis/boost/ptr_container/indirect_fun.hpp
 epoc32/include/stdapis/boost/ptr_container/nullable.hpp
 epoc32/include/stdapis/boost/ptr_container/ptr_array.hpp
@@ -2831,6 +3260,7 @@
 epoc32/include/stdapis/boost/ptr_container/ptr_set.hpp
 epoc32/include/stdapis/boost/ptr_container/ptr_set_adapter.hpp
 epoc32/include/stdapis/boost/ptr_container/ptr_vector.hpp
+epoc32/include/stdapis/boost/random.hpp
 epoc32/include/stdapis/boost/random/additive_combine.hpp
 epoc32/include/stdapis/boost/random/bernoulli_distribution.hpp
 epoc32/include/stdapis/boost/random/binomial_distribution.hpp
@@ -2865,18 +3295,24 @@
 epoc32/include/stdapis/boost/random/variate_generator.hpp
 epoc32/include/stdapis/boost/random/xor_combine.hpp
 epoc32/include/stdapis/boost/range/begin.hpp
+epoc32/include/stdapis/boost/range/config.hpp
 epoc32/include/stdapis/boost/range/const_iterator.hpp
 epoc32/include/stdapis/boost/range/const_reverse_iterator.hpp
 epoc32/include/stdapis/boost/range/detail/common.hpp
 epoc32/include/stdapis/boost/range/detail/implementation_help.hpp
 epoc32/include/stdapis/boost/range/detail/sfinae.hpp
 epoc32/include/stdapis/boost/range/difference_type.hpp
+epoc32/include/stdapis/boost/range/empty.hpp
 epoc32/include/stdapis/boost/range/end.hpp
 epoc32/include/stdapis/boost/range/functions.hpp
+epoc32/include/stdapis/boost/range/iterator.hpp
+epoc32/include/stdapis/boost/range/iterator_range.hpp
 epoc32/include/stdapis/boost/range/rbegin.hpp
 epoc32/include/stdapis/boost/range/rend.hpp
 epoc32/include/stdapis/boost/range/result_iterator.hpp
+epoc32/include/stdapis/boost/range/reverse_iterator.hpp
 epoc32/include/stdapis/boost/range/reverse_result_iterator.hpp
+epoc32/include/stdapis/boost/range/size.hpp
 epoc32/include/stdapis/boost/range/size_type.hpp
 epoc32/include/stdapis/boost/range/sub_range.hpp
 epoc32/include/stdapis/boost/range/value_type.hpp
@@ -2886,6 +3322,7 @@
 epoc32/include/stdapis/boost/serialization/access.hpp
 epoc32/include/stdapis/boost/serialization/base_object.hpp
 epoc32/include/stdapis/boost/serialization/binary_object.hpp
+epoc32/include/stdapis/boost/serialization/config.hpp
 epoc32/include/stdapis/boost/serialization/export.hpp
 epoc32/include/stdapis/boost/serialization/extended_type_info.hpp
 epoc32/include/stdapis/boost/serialization/extended_type_info_typeid.hpp
@@ -2901,6 +3338,7 @@
 epoc32/include/stdapis/boost/serialization/tracking_enum.hpp
 epoc32/include/stdapis/boost/serialization/traits.hpp
 epoc32/include/stdapis/boost/serialization/type_info_implementation.hpp
+epoc32/include/stdapis/boost/serialization/utility.hpp
 epoc32/include/stdapis/boost/serialization/version.hpp
 epoc32/include/stdapis/boost/serialization/void_cast.hpp
 epoc32/include/stdapis/boost/serialization/void_cast_fwd.hpp
@@ -2910,8 +3348,10 @@
 epoc32/include/stdapis/boost/static_assert.hpp
 epoc32/include/stdapis/boost/static_warning.hpp
 epoc32/include/stdapis/boost/strong_typedef.hpp
+epoc32/include/stdapis/boost/throw_exception.hpp
 epoc32/include/stdapis/boost/timer.hpp
 epoc32/include/stdapis/boost/tuple/detail/tuple_basic.hpp
+epoc32/include/stdapis/boost/tuple/tuple.hpp
 epoc32/include/stdapis/boost/type.hpp
 epoc32/include/stdapis/boost/type_traits.hpp
 epoc32/include/stdapis/boost/type_traits/add_const.hpp
@@ -2919,9 +3359,12 @@
 epoc32/include/stdapis/boost/type_traits/add_pointer.hpp
 epoc32/include/stdapis/boost/type_traits/add_reference.hpp
 epoc32/include/stdapis/boost/type_traits/add_volatile.hpp
+epoc32/include/stdapis/boost/type_traits/aligned_storage.hpp
 epoc32/include/stdapis/boost/type_traits/alignment_of.hpp
 epoc32/include/stdapis/boost/type_traits/broken_compiler_spec.hpp
 epoc32/include/stdapis/boost/type_traits/composite_traits.hpp
+epoc32/include/stdapis/boost/type_traits/config.hpp
+epoc32/include/stdapis/boost/type_traits/conversion_traits.hpp
 epoc32/include/stdapis/boost/type_traits/cv_traits.hpp
 epoc32/include/stdapis/boost/type_traits/detail/bool_trait_def.hpp
 epoc32/include/stdapis/boost/type_traits/detail/bool_trait_undef.hpp
@@ -2955,6 +3398,7 @@
 epoc32/include/stdapis/boost/type_traits/ice.hpp
 epoc32/include/stdapis/boost/type_traits/integral_constant.hpp
 epoc32/include/stdapis/boost/type_traits/intrinsics.hpp
+epoc32/include/stdapis/boost/type_traits/is_abstract.hpp
 epoc32/include/stdapis/boost/type_traits/is_arithmetic.hpp
 epoc32/include/stdapis/boost/type_traits/is_array.hpp
 epoc32/include/stdapis/boost/type_traits/is_base_and_derived.hpp
@@ -2962,6 +3406,7 @@
 epoc32/include/stdapis/boost/type_traits/is_class.hpp
 epoc32/include/stdapis/boost/type_traits/is_compound.hpp
 epoc32/include/stdapis/boost/type_traits/is_const.hpp
+epoc32/include/stdapis/boost/type_traits/is_convertible.hpp
 epoc32/include/stdapis/boost/type_traits/is_empty.hpp
 epoc32/include/stdapis/boost/type_traits/is_enum.hpp
 epoc32/include/stdapis/boost/type_traits/is_float.hpp
@@ -2977,6 +3422,7 @@
 epoc32/include/stdapis/boost/type_traits/is_pointer.hpp
 epoc32/include/stdapis/boost/type_traits/is_polymorphic.hpp
 epoc32/include/stdapis/boost/type_traits/is_reference.hpp
+epoc32/include/stdapis/boost/type_traits/is_same.hpp
 epoc32/include/stdapis/boost/type_traits/is_scalar.hpp
 epoc32/include/stdapis/boost/type_traits/is_signed.hpp
 epoc32/include/stdapis/boost/type_traits/is_stateless.hpp
@@ -2997,10 +3443,12 @@
 epoc32/include/stdapis/boost/type_traits/same_traits.hpp
 epoc32/include/stdapis/boost/type_traits/transform_traits.hpp
 epoc32/include/stdapis/boost/type_traits/type_with_alignment.hpp
+epoc32/include/stdapis/boost/utility.hpp
 epoc32/include/stdapis/boost/utility/addressof.hpp
 epoc32/include/stdapis/boost/utility/base_from_member.hpp
 epoc32/include/stdapis/boost/utility/compare_pointees.hpp
 epoc32/include/stdapis/boost/utility/detail/result_of_iterate.hpp
+epoc32/include/stdapis/boost/utility/enable_if.hpp
 epoc32/include/stdapis/boost/utility/result_of.hpp
 epoc32/include/stdapis/boost/utility/value_init.hpp
 epoc32/include/stdapis/boost/variant.hpp
@@ -3010,7 +3458,10 @@
 epoc32/include/stdapis/boost/variant/detail/apply_visitor_delayed.hpp
 epoc32/include/stdapis/boost/variant/detail/apply_visitor_unary.hpp
 epoc32/include/stdapis/boost/variant/detail/backup_holder.hpp
+epoc32/include/stdapis/boost/variant/detail/bool_trait_def.hpp
+epoc32/include/stdapis/boost/variant/detail/bool_trait_undef.hpp
 epoc32/include/stdapis/boost/variant/detail/cast_storage.hpp
+epoc32/include/stdapis/boost/variant/detail/config.hpp
 epoc32/include/stdapis/boost/variant/detail/enable_recursive.hpp
 epoc32/include/stdapis/boost/variant/detail/enable_recursive_fwd.hpp
 epoc32/include/stdapis/boost/variant/detail/forced_return.hpp
@@ -3019,6 +3470,7 @@
 epoc32/include/stdapis/boost/variant/detail/has_trivial_move.hpp
 epoc32/include/stdapis/boost/variant/detail/initializer.hpp
 epoc32/include/stdapis/boost/variant/detail/make_variant_list.hpp
+epoc32/include/stdapis/boost/variant/detail/move.hpp
 epoc32/include/stdapis/boost/variant/detail/over_sequence.hpp
 epoc32/include/stdapis/boost/variant/detail/substitute.hpp
 epoc32/include/stdapis/boost/variant/detail/substitute_fwd.hpp
@@ -3029,22 +3481,24 @@
 epoc32/include/stdapis/boost/variant/recursive_wrapper.hpp
 epoc32/include/stdapis/boost/variant/recursive_wrapper_fwd.hpp
 epoc32/include/stdapis/boost/variant/static_visitor.hpp
+epoc32/include/stdapis/boost/variant/variant.hpp
 epoc32/include/stdapis/boost/variant/variant_fwd.hpp
 epoc32/include/stdapis/boost/variant/visitor_ptr.hpp
 epoc32/include/stdapis/boost/vector_property_map.hpp
+epoc32/include/stdapis/boost/version.hpp
 epoc32/include/stdapis/boost/visit_each.hpp
 epoc32/include/stdapis/boost/weak_ptr.hpp
 epoc32/include/stdapis/crypt.h
-epoc32/include/stdapis/dbus-1.0/dbus/dbus.h
+epoc32/include/stdapis/ctype.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
@@ -3057,12 +3511,17 @@
 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
+epoc32/include/stdapis/errno.h
+epoc32/include/stdapis/fcntl.h
 epoc32/include/stdapis/fenv.h
 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
@@ -3079,8 +3538,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-lib.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/giochannel.h
 epoc32/include/stdapis/glib-2.0/glib/gkeyfile.h
 epoc32/include/stdapis/glib-2.0/glib/glist.h
@@ -3118,7 +3577,6 @@
 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
@@ -3145,23 +3603,66 @@
 epoc32/include/stdapis/inttypes.h
 epoc32/include/stdapis/langinfo.h
 epoc32/include/stdapis/libm_aliases.h
+epoc32/include/stdapis/libxml2/libxml2_c14n.h
+epoc32/include/stdapis/libxml2/libxml2_chvalid.h
+epoc32/include/stdapis/libxml2/libxml2_dict.h
+epoc32/include/stdapis/libxml2/libxml2_encoding.h
+epoc32/include/stdapis/libxml2/libxml2_entities.h
+epoc32/include/stdapis/libxml2/libxml2_globals.h
+epoc32/include/stdapis/libxml2/libxml2_hash.h
 epoc32/include/stdapis/libxml2/libxml2_htmlparser.h
 epoc32/include/stdapis/libxml2/libxml2_htmltree.h
+epoc32/include/stdapis/libxml2/libxml2_list.h
+epoc32/include/stdapis/libxml2/libxml2_modules.h
+epoc32/include/stdapis/libxml2/libxml2_parser.h
+epoc32/include/stdapis/libxml2/libxml2_parserinternals.h
+epoc32/include/stdapis/libxml2/libxml2_sax.h
+epoc32/include/stdapis/libxml2/libxml2_sax2.h
+epoc32/include/stdapis/libxml2/libxml2_schemasinternals.h
+epoc32/include/stdapis/libxml2/libxml2_threads.h
+epoc32/include/stdapis/libxml2/libxml2_tree.h
+epoc32/include/stdapis/libxml2/libxml2_uri.h
+epoc32/include/stdapis/libxml2/libxml2_valid.h
+epoc32/include/stdapis/libxml2/libxml2_xinclude.h
+epoc32/include/stdapis/libxml2/libxml2_xlink.h
+epoc32/include/stdapis/libxml2/libxml2_xmlerror.h
+epoc32/include/stdapis/libxml2/libxml2_xmlexports.h
+epoc32/include/stdapis/libxml2/libxml2_xmlio.h
+epoc32/include/stdapis/libxml2/libxml2_xmlmemory.h
+epoc32/include/stdapis/libxml2/libxml2_xmlreader.h
 epoc32/include/stdapis/libxml2/libxml2_xmlsave.h
 epoc32/include/stdapis/libxml2/libxml2_xmlschemas.h
+epoc32/include/stdapis/libxml2/libxml2_xmlschemasglobals.h
 epoc32/include/stdapis/libxml2/libxml2_xmlschemastypes.h
+epoc32/include/stdapis/libxml2/libxml2_xmlstring.h
+epoc32/include/stdapis/libxml2/libxml2_xmlversion.h
 epoc32/include/stdapis/libxml2/libxml2_xmlwriter.h
+epoc32/include/stdapis/libxml2/libxml2_xpath.h
+epoc32/include/stdapis/libxml2/libxml2_xpathinternals.h
+epoc32/include/stdapis/libxml2/libxml2_xpointer.h
+epoc32/include/stdapis/libxml2/xmlengconfig.h
+epoc32/include/stdapis/libxml2/xmlengxeconfig.h
+epoc32/include/stdapis/limits.h
+epoc32/include/stdapis/locale.h
 epoc32/include/stdapis/machine/_inttypes.h
 epoc32/include/stdapis/machine/_limits.h
 epoc32/include/stdapis/machine/_stdint.h
+epoc32/include/stdapis/machine/_types.h
 epoc32/include/stdapis/machine/endian.h
+epoc32/include/stdapis/machine/param.h
+epoc32/include/stdapis/machine/setjmp.h
+epoc32/include/stdapis/machine/signal.h
+epoc32/include/stdapis/math.h
 epoc32/include/stdapis/md5.h
+epoc32/include/stdapis/memory.h
 epoc32/include/stdapis/monetary.h
 epoc32/include/stdapis/net/if.h
 epoc32/include/stdapis/net/if_var.h
 epoc32/include/stdapis/net/radix.h
 epoc32/include/stdapis/net/route.h
 epoc32/include/stdapis/netconfig.h
+epoc32/include/stdapis/netdb.h
+epoc32/include/stdapis/netinet/in.h
 epoc32/include/stdapis/netinet6/in6.h
 epoc32/include/stdapis/netinet6/in6_var.h
 epoc32/include/stdapis/nsswitch.h
@@ -3175,6 +3676,8 @@
 epoc32/include/stdapis/openssl/comp.h
 epoc32/include/stdapis/openssl/conf.h
 epoc32/include/stdapis/openssl/conf_api.h
+epoc32/include/stdapis/openssl/crypto.h
+epoc32/include/stdapis/openssl/des.h
 epoc32/include/stdapis/openssl/des_old.h
 epoc32/include/stdapis/openssl/dh.h
 epoc32/include/stdapis/openssl/dsa.h
@@ -3182,25 +3685,32 @@
 epoc32/include/stdapis/openssl/dtls1.h
 epoc32/include/stdapis/openssl/e_os2.h
 epoc32/include/stdapis/openssl/engine.h
+epoc32/include/stdapis/openssl/err.h
 epoc32/include/stdapis/openssl/evp.h
 epoc32/include/stdapis/openssl/hmac.h
 epoc32/include/stdapis/openssl/kssl.h
 epoc32/include/stdapis/openssl/lhash.h
 epoc32/include/stdapis/openssl/md2.h
+epoc32/include/stdapis/openssl/md5.h
 epoc32/include/stdapis/openssl/obj_mac.h
+epoc32/include/stdapis/openssl/objects.h
+epoc32/include/stdapis/openssl/ocsp.h
 epoc32/include/stdapis/openssl/opensslconf.h
 epoc32/include/stdapis/openssl/opensslv.h
 epoc32/include/stdapis/openssl/ossl_typ.h
 epoc32/include/stdapis/openssl/pem.h
 epoc32/include/stdapis/openssl/pem2.h
+epoc32/include/stdapis/openssl/pkcs12.h
 epoc32/include/stdapis/openssl/pkcs7.h
 epoc32/include/stdapis/openssl/pq_compat.h
 epoc32/include/stdapis/openssl/pqueue.h
 epoc32/include/stdapis/openssl/rand.h
+epoc32/include/stdapis/openssl/rc2.h
 epoc32/include/stdapis/openssl/rc4.h
 epoc32/include/stdapis/openssl/rsa.h
 epoc32/include/stdapis/openssl/safestack.h
 epoc32/include/stdapis/openssl/sha.h
+epoc32/include/stdapis/openssl/ssl.h
 epoc32/include/stdapis/openssl/ssl2.h
 epoc32/include/stdapis/openssl/ssl23.h
 epoc32/include/stdapis/openssl/ssl3.h
@@ -3220,16 +3730,24 @@
 epoc32/include/stdapis/pthread.h
 epoc32/include/stdapis/pthreadalias.h
 epoc32/include/stdapis/pthreadtypes.h
+epoc32/include/stdapis/pwd.h
 epoc32/include/stdapis/regex.h
 epoc32/include/stdapis/resolv.h
 epoc32/include/stdapis/sched.h
 epoc32/include/stdapis/semaphore.h
+epoc32/include/stdapis/setjmp.h
+epoc32/include/stdapis/signal.h
 epoc32/include/stdapis/signgam.h
 epoc32/include/stdapis/spawn.h
 epoc32/include/stdapis/sqlite3.h
 epoc32/include/stdapis/staticlibinit_gcce.h
+epoc32/include/stdapis/stdarg.h
+epoc32/include/stdapis/stdarg_e.h
 epoc32/include/stdapis/stdbool.h
+epoc32/include/stdapis/stddef.h
 epoc32/include/stdapis/stdint.h
+epoc32/include/stdapis/stdio.h
+epoc32/include/stdapis/stdlib.h
 epoc32/include/stdapis/stlport/algorithm
 epoc32/include/stdapis/stlport/bitset
 epoc32/include/stdapis/stlport/cassert
@@ -3241,12 +3759,14 @@
 epoc32/include/stdapis/stlport/cmath
 epoc32/include/stdapis/stlport/complex
 epoc32/include/stdapis/stlport/config/_epilog.h
+epoc32/include/stdapis/stlport/config/_gcc.h
 epoc32/include/stdapis/stlport/config/_msvc_warnings_off.h
 epoc32/include/stdapis/stlport/config/_prolog.h
 epoc32/include/stdapis/stlport/config/stl_as400.h
 epoc32/include/stdapis/stlport/config/stl_confix.h
 epoc32/include/stdapis/stlport/config/stl_epoc.h
 epoc32/include/stdapis/stlport/config/stl_gcce.h
+epoc32/include/stdapis/stlport/config/stl_gccxml.h
 epoc32/include/stdapis/stlport/config/stl_msvc.h
 epoc32/include/stdapis/stlport/config/stl_mwerks.h
 epoc32/include/stdapis/stlport/config/stl_rvct.h
@@ -3256,6 +3776,14 @@
 epoc32/include/stdapis/stlport/config/stlcomp.h
 epoc32/include/stdapis/stlport/csetjmp
 epoc32/include/stdapis/stlport/csignal
+epoc32/include/stdapis/stlport/cstd/cctype
+epoc32/include/stdapis/stlport/cstd/cerrno
+epoc32/include/stdapis/stlport/cstd/cfloat
+epoc32/include/stdapis/stlport/cstd/climits
+epoc32/include/stdapis/stlport/cstd/clocale
+epoc32/include/stdapis/stlport/cstd/cmath
+epoc32/include/stdapis/stlport/cstd/csetjmp
+epoc32/include/stdapis/stlport/cstd/csignal
 epoc32/include/stdapis/stlport/cstd/cstdarg
 epoc32/include/stdapis/stlport/cstd/cstddef
 epoc32/include/stdapis/stlport/cstd/cstdio
@@ -3264,8 +3792,26 @@
 epoc32/include/stdapis/stlport/cstd/ctime
 epoc32/include/stdapis/stlport/cstd/cwchar
 epoc32/include/stdapis/stlport/cstd/cwctype
+epoc32/include/stdapis/stlport/cstd/locale.h
+epoc32/include/stdapis/stlport/cstd/math.h
+epoc32/include/stdapis/stlport/cstd/setjmp.h
+epoc32/include/stdapis/stlport/cstd/stdarg.h
+epoc32/include/stdapis/stlport/cstd/stddef.h
+epoc32/include/stdapis/stlport/cstd/stdio.h
+epoc32/include/stdapis/stlport/cstd/stdlib.h
+epoc32/include/stdapis/stlport/cstd/string.h
+epoc32/include/stdapis/stlport/cstd/time.h
 epoc32/include/stdapis/stlport/cstd/wchar.h
 epoc32/include/stdapis/stlport/cstd/wctype.h
+epoc32/include/stdapis/stlport/cstdarg
+epoc32/include/stdapis/stlport/cstddef
+epoc32/include/stdapis/stlport/cstdio
+epoc32/include/stdapis/stlport/cstdlib
+epoc32/include/stdapis/stlport/cstring
+epoc32/include/stdapis/stlport/ctime
+epoc32/include/stdapis/stlport/ctype.h
+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
@@ -3287,7 +3833,9 @@
 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
@@ -3295,18 +3843,28 @@
 epoc32/include/stdapis/stlport/numeric
 epoc32/include/stdapis/stlport/ostream
 epoc32/include/stdapis/stlport/ostream.h
+epoc32/include/stdapis/stlport/pthread.h
 epoc32/include/stdapis/stlport/pthread_alloc
 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
 epoc32/include/stdapis/stlport/stack
+epoc32/include/stdapis/stlport/stdarg.h
+epoc32/include/stdapis/stlport/stddef.h
 epoc32/include/stdapis/stlport/stdexcept
+epoc32/include/stdapis/stlport/stdio.h
 epoc32/include/stdapis/stlport/stdio_streambuf
 epoc32/include/stdapis/stlport/stdiostream.h
+epoc32/include/stdapis/stlport/stdlib.h
 epoc32/include/stdapis/stlport/stl/_abbrevs.h
 epoc32/include/stdapis/stlport/stl/_algo.c
 epoc32/include/stdapis/stlport/stl/_algo.h
@@ -3330,9 +3888,11 @@
 epoc32/include/stdapis/stlport/stl/_construct.h
 epoc32/include/stdapis/stlport/stl/_ctraits_fns.h
 epoc32/include/stdapis/stlport/stl/_ctype.c
+epoc32/include/stdapis/stlport/stl/_ctype.h
 epoc32/include/stdapis/stlport/stl/_cwchar.h
 epoc32/include/stdapis/stlport/stl/_deque.c
 epoc32/include/stdapis/stlport/stl/_deque.h
+epoc32/include/stdapis/stlport/stl/_epilog.h
 epoc32/include/stdapis/stlport/stl/_exception.h
 epoc32/include/stdapis/stlport/stl/_fstream.c
 epoc32/include/stdapis/stlport/stl/_fstream.h
@@ -3357,6 +3917,7 @@
 epoc32/include/stdapis/stlport/stl/_iterator_base.h
 epoc32/include/stdapis/stlport/stl/_iterator_old.h
 epoc32/include/stdapis/stlport/stl/_limits.c
+epoc32/include/stdapis/stlport/stl/_limits.h
 epoc32/include/stdapis/stlport/stl/_list.c
 epoc32/include/stdapis/stlport/stl/_list.h
 epoc32/include/stdapis/stlport/stl/_locale.h
@@ -3378,6 +3939,7 @@
 epoc32/include/stdapis/stlport/stl/_ostream.h
 epoc32/include/stdapis/stlport/stl/_ostreambuf_iterator.h
 epoc32/include/stdapis/stlport/stl/_pair.h
+epoc32/include/stdapis/stlport/stl/_prolog.h
 epoc32/include/stdapis/stlport/stl/_pthread_alloc.c
 epoc32/include/stdapis/stlport/stl/_pthread_alloc.h
 epoc32/include/stdapis/stlport/stl/_ptrs_specialize.h
@@ -3430,26 +3992,159 @@
 epoc32/include/stdapis/stlport/stl/concept_checks.h
 epoc32/include/stdapis/stlport/stl/debug/_debug.c
 epoc32/include/stdapis/stlport/stl/debug/_debug.h
+epoc32/include/stdapis/stlport/stl/debug/_deque.h
+epoc32/include/stdapis/stlport/stl/debug/_hashtable.h
+epoc32/include/stdapis/stlport/stl/debug/_iterator.h
+epoc32/include/stdapis/stlport/stl/debug/_list.h
+epoc32/include/stdapis/stlport/stl/debug/_relops_cont.h
+epoc32/include/stdapis/stlport/stl/debug/_relops_hash_cont.h
+epoc32/include/stdapis/stlport/stl/debug/_slist.h
+epoc32/include/stdapis/stlport/stl/debug/_string.h
+epoc32/include/stdapis/stlport/stl/debug/_tree.h
+epoc32/include/stdapis/stlport/stl/debug/_vector.h
 epoc32/include/stdapis/stlport/stl/msl_string.h
 epoc32/include/stdapis/stlport/stl/type_traits.h
+epoc32/include/stdapis/stlport/stl/wrappers/_deque.h
+epoc32/include/stdapis/stlport/stl/wrappers/_hash_map.h
+epoc32/include/stdapis/stlport/stl/wrappers/_hash_set.h
+epoc32/include/stdapis/stlport/stl/wrappers/_list.h
+epoc32/include/stdapis/stlport/stl/wrappers/_map.h
 epoc32/include/stdapis/stlport/stl/wrappers/_mmap.h
+epoc32/include/stdapis/stlport/stl/wrappers/_set.h
+epoc32/include/stdapis/stlport/stl/wrappers/_slist.h
+epoc32/include/stdapis/stlport/stl/wrappers/_vector.h
 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
+epoc32/include/stdapis/stlport/using/h/fstream.h
+epoc32/include/stdapis/stlport/using/h/iomanip.h
+epoc32/include/stdapis/stlport/using/h/iostream.h
+epoc32/include/stdapis/stlport/using/h/ostream.h
+epoc32/include/stdapis/stlport/using/h/streambuf.h
+epoc32/include/stdapis/stlport/using/h/strstream.h
+epoc32/include/stdapis/stlport/using/iomanip
+epoc32/include/stdapis/stlport/using/ios
+epoc32/include/stdapis/stlport/using/iosfwd
+epoc32/include/stdapis/stlport/using/iostream
+epoc32/include/stdapis/stlport/using/istream
+epoc32/include/stdapis/stlport/using/locale
+epoc32/include/stdapis/stlport/using/ostream
+epoc32/include/stdapis/stlport/using/sstream
+epoc32/include/stdapis/stlport/using/streambuf
+epoc32/include/stdapis/stlport/using/strstream
 epoc32/include/stdapis/stlport/utility
 epoc32/include/stdapis/stlport/valarray
 epoc32/include/stdapis/stlport/vector
+epoc32/include/stdapis/stlport/wchar.h
+epoc32/include/stdapis/stlport/wctype.h
+epoc32/include/stdapis/stlport/wrap_std/complex
+epoc32/include/stdapis/stlport/wrap_std/fstream
+epoc32/include/stdapis/stlport/wrap_std/h/fstream.h
+epoc32/include/stdapis/stlport/wrap_std/h/iostream.h
+epoc32/include/stdapis/stlport/wrap_std/h/streambuf.h
+epoc32/include/stdapis/stlport/wrap_std/h/strstream.h
+epoc32/include/stdapis/stlport/wrap_std/iomanip
+epoc32/include/stdapis/stlport/wrap_std/ios
+epoc32/include/stdapis/stlport/wrap_std/iosfwd
+epoc32/include/stdapis/stlport/wrap_std/iostream
+epoc32/include/stdapis/stlport/wrap_std/istream
+epoc32/include/stdapis/stlport/wrap_std/locale
+epoc32/include/stdapis/stlport/wrap_std/ostream
+epoc32/include/stdapis/stlport/wrap_std/sstream
+epoc32/include/stdapis/stlport/wrap_std/streambuf
+epoc32/include/stdapis/stlport/wrap_std/strstream
+epoc32/include/stdapis/stlportv5/algorithm
+epoc32/include/stdapis/stlportv5/bitset
+epoc32/include/stdapis/stlportv5/cassert
+epoc32/include/stdapis/stlportv5/cctype
+epoc32/include/stdapis/stlportv5/cerrno
+epoc32/include/stdapis/stlportv5/cfloat
 epoc32/include/stdapis/stlportv5/ciso646
+epoc32/include/stdapis/stlportv5/climits
+epoc32/include/stdapis/stlportv5/clocale
+epoc32/include/stdapis/stlportv5/cmath
+epoc32/include/stdapis/stlportv5/complex
+epoc32/include/stdapis/stlportv5/csetjmp
+epoc32/include/stdapis/stlportv5/csignal
+epoc32/include/stdapis/stlportv5/cstdarg
+epoc32/include/stdapis/stlportv5/cstddef
+epoc32/include/stdapis/stlportv5/cstdio
+epoc32/include/stdapis/stlportv5/cstdlib
+epoc32/include/stdapis/stlportv5/cstring
+epoc32/include/stdapis/stlportv5/ctime
+epoc32/include/stdapis/stlportv5/cwchar
+epoc32/include/stdapis/stlportv5/cwctype
+epoc32/include/stdapis/stlportv5/deque
+epoc32/include/stdapis/stlportv5/exception
 epoc32/include/stdapis/stlportv5/exception_winscw.h
+epoc32/include/stdapis/stlportv5/fstream
+epoc32/include/stdapis/stlportv5/fstream.h
+epoc32/include/stdapis/stlportv5/functional
+epoc32/include/stdapis/stlportv5/hash_map
+epoc32/include/stdapis/stlportv5/hash_set
+epoc32/include/stdapis/stlportv5/iomanip
+epoc32/include/stdapis/stlportv5/iomanip.h
+epoc32/include/stdapis/stlportv5/ios
+epoc32/include/stdapis/stlportv5/ios.h
+epoc32/include/stdapis/stlportv5/iosfwd
+epoc32/include/stdapis/stlportv5/iostream
+epoc32/include/stdapis/stlportv5/iostream.h
 epoc32/include/stdapis/stlportv5/iso646.h
+epoc32/include/stdapis/stlportv5/istream
+epoc32/include/stdapis/stlportv5/istream.h
+epoc32/include/stdapis/stlportv5/iterator
 epoc32/include/stdapis/stlportv5/libstdcppwsd.h
+epoc32/include/stdapis/stlportv5/limits
+epoc32/include/stdapis/stlportv5/list
+epoc32/include/stdapis/stlportv5/locale
+epoc32/include/stdapis/stlportv5/map
+epoc32/include/stdapis/stlportv5/mem.h
+epoc32/include/stdapis/stlportv5/memory
+epoc32/include/stdapis/stlportv5/new
+epoc32/include/stdapis/stlportv5/numeric
+epoc32/include/stdapis/stlportv5/ostream
+epoc32/include/stdapis/stlportv5/ostream.h
+epoc32/include/stdapis/stlportv5/pthread_alloc
+epoc32/include/stdapis/stlportv5/queue
+epoc32/include/stdapis/stlportv5/rope
+epoc32/include/stdapis/stlportv5/set
+epoc32/include/stdapis/stlportv5/slist
+epoc32/include/stdapis/stlportv5/sstream
+epoc32/include/stdapis/stlportv5/stack
 epoc32/include/stdapis/stlportv5/stdcpp_support.h
+epoc32/include/stdapis/stlportv5/stdexcept
+epoc32/include/stdapis/stlportv5/stdiostream.h
+epoc32/include/stdapis/stlportv5/stl/_abbrevs.h
+epoc32/include/stdapis/stlportv5/stl/_algo.c
+epoc32/include/stdapis/stlportv5/stl/_algo.h
+epoc32/include/stdapis/stlportv5/stl/_algobase.c
+epoc32/include/stdapis/stlportv5/stl/_algobase.h
+epoc32/include/stdapis/stlportv5/stl/_alloc.c
+epoc32/include/stdapis/stlportv5/stl/_alloc.h
+epoc32/include/stdapis/stlportv5/stl/_auto_ptr.h
+epoc32/include/stdapis/stlportv5/stl/_bitset.c
+epoc32/include/stdapis/stlportv5/stl/_bitset.h
+epoc32/include/stdapis/stlportv5/stl/_bvector.h
 epoc32/include/stdapis/stlportv5/stl/_carray.h
 epoc32/include/stdapis/stlportv5/stl/_cctype.h
+epoc32/include/stdapis/stlportv5/stl/_check_config.h
 epoc32/include/stdapis/stlportv5/stl/_clocale.h
+epoc32/include/stdapis/stlportv5/stl/_cmath.h
+epoc32/include/stdapis/stlportv5/stl/_codecvt.h
+epoc32/include/stdapis/stlportv5/stl/_collate.h
+epoc32/include/stdapis/stlportv5/stl/_complex.c
+epoc32/include/stdapis/stlportv5/stl/_complex.h
+epoc32/include/stdapis/stlportv5/stl/_config_compat_post.h
+epoc32/include/stdapis/stlportv5/stl/_construct.h
 epoc32/include/stdapis/stlportv5/stl/_csetjmp.h
 epoc32/include/stdapis/stlportv5/stl/_csignal.h
 epoc32/include/stdapis/stlportv5/stl/_cstdarg.h
@@ -3458,19 +4153,114 @@
 epoc32/include/stdapis/stlportv5/stl/_cstdlib.h
 epoc32/include/stdapis/stlportv5/stl/_cstring.h
 epoc32/include/stdapis/stlportv5/stl/_ctime.h
+epoc32/include/stdapis/stlportv5/stl/_ctraits_fns.h
+epoc32/include/stdapis/stlportv5/stl/_ctype.h
+epoc32/include/stdapis/stlportv5/stl/_cwchar.h
 epoc32/include/stdapis/stlportv5/stl/_cwctype.h
+epoc32/include/stdapis/stlportv5/stl/_deque.c
+epoc32/include/stdapis/stlportv5/stl/_deque.h
+epoc32/include/stdapis/stlportv5/stl/_epilog.h
+epoc32/include/stdapis/stlportv5/stl/_exception.h
+epoc32/include/stdapis/stlportv5/stl/_fstream.c
+epoc32/include/stdapis/stlportv5/stl/_fstream.h
+epoc32/include/stdapis/stlportv5/stl/_function.h
+epoc32/include/stdapis/stlportv5/stl/_function_adaptors.h
+epoc32/include/stdapis/stlportv5/stl/_function_base.h
+epoc32/include/stdapis/stlportv5/stl/_hash_fun.h
+epoc32/include/stdapis/stlportv5/stl/_hash_map.h
+epoc32/include/stdapis/stlportv5/stl/_hash_set.h
+epoc32/include/stdapis/stlportv5/stl/_hashtable.c
+epoc32/include/stdapis/stlportv5/stl/_hashtable.h
+epoc32/include/stdapis/stlportv5/stl/_heap.c
+epoc32/include/stdapis/stlportv5/stl/_heap.h
+epoc32/include/stdapis/stlportv5/stl/_ios.c
+epoc32/include/stdapis/stlportv5/stl/_ios.h
+epoc32/include/stdapis/stlportv5/stl/_ios_base.h
 epoc32/include/stdapis/stlportv5/stl/_ioserr.h
+epoc32/include/stdapis/stlportv5/stl/_iosfwd.h
 epoc32/include/stdapis/stlportv5/stl/_iostream_string.h
+epoc32/include/stdapis/stlportv5/stl/_istream.c
+epoc32/include/stdapis/stlportv5/stl/_istream.h
+epoc32/include/stdapis/stlportv5/stl/_istreambuf_iterator.h
+epoc32/include/stdapis/stlportv5/stl/_iterator.h
+epoc32/include/stdapis/stlportv5/stl/_iterator_base.h
+epoc32/include/stdapis/stlportv5/stl/_iterator_old.h
+epoc32/include/stdapis/stlportv5/stl/_limits.c
+epoc32/include/stdapis/stlportv5/stl/_limits.h
+epoc32/include/stdapis/stlportv5/stl/_list.c
+epoc32/include/stdapis/stlportv5/stl/_list.h
+epoc32/include/stdapis/stlportv5/stl/_locale.h
+epoc32/include/stdapis/stlportv5/stl/_map.h
 epoc32/include/stdapis/stlportv5/stl/_mbstate_t.h
+epoc32/include/stdapis/stlportv5/stl/_messages_facets.h
+epoc32/include/stdapis/stlportv5/stl/_monetary.c
+epoc32/include/stdapis/stlportv5/stl/_monetary.h
 epoc32/include/stdapis/stlportv5/stl/_move_construct_fwk.h
+epoc32/include/stdapis/stlportv5/stl/_new.h
+epoc32/include/stdapis/stlportv5/stl/_null_stream.h
+epoc32/include/stdapis/stlportv5/stl/_num_get.c
+epoc32/include/stdapis/stlportv5/stl/_num_get.h
+epoc32/include/stdapis/stlportv5/stl/_num_put.c
+epoc32/include/stdapis/stlportv5/stl/_num_put.h
+epoc32/include/stdapis/stlportv5/stl/_numeric.c
+epoc32/include/stdapis/stlportv5/stl/_numeric.h
+epoc32/include/stdapis/stlportv5/stl/_numpunct.h
+epoc32/include/stdapis/stlportv5/stl/_ostream.c
+epoc32/include/stdapis/stlportv5/stl/_ostream.h
+epoc32/include/stdapis/stlportv5/stl/_ostreambuf_iterator.h
+epoc32/include/stdapis/stlportv5/stl/_pair.h
+epoc32/include/stdapis/stlportv5/stl/_prolog.h
+epoc32/include/stdapis/stlportv5/stl/_pthread_alloc.h
+epoc32/include/stdapis/stlportv5/stl/_ptrs_specialize.h
+epoc32/include/stdapis/stlportv5/stl/_queue.h
+epoc32/include/stdapis/stlportv5/stl/_range_errors.h
+epoc32/include/stdapis/stlportv5/stl/_raw_storage_iter.h
+epoc32/include/stdapis/stlportv5/stl/_relops_cont.h
+epoc32/include/stdapis/stlportv5/stl/_relops_hash_cont.h
+epoc32/include/stdapis/stlportv5/stl/_rope.c
+epoc32/include/stdapis/stlportv5/stl/_rope.h
+epoc32/include/stdapis/stlportv5/stl/_set.h
+epoc32/include/stdapis/stlportv5/stl/_slist.c
+epoc32/include/stdapis/stlportv5/stl/_slist.h
+epoc32/include/stdapis/stlportv5/stl/_slist_base.c
+epoc32/include/stdapis/stlportv5/stl/_slist_base.h
+epoc32/include/stdapis/stlportv5/stl/_sstream.c
+epoc32/include/stdapis/stlportv5/stl/_sstream.h
+epoc32/include/stdapis/stlportv5/stl/_stack.h
 epoc32/include/stdapis/stlportv5/stl/_stdexcept.h
 epoc32/include/stdapis/stlportv5/stl/_stdexcept_base.h
 epoc32/include/stdapis/stlportv5/stl/_stlport_version.h
+epoc32/include/stdapis/stlportv5/stl/_stream_iterator.h
+epoc32/include/stdapis/stlportv5/stl/_streambuf.c
+epoc32/include/stdapis/stlportv5/stl/_streambuf.h
+epoc32/include/stdapis/stlportv5/stl/_string.c
+epoc32/include/stdapis/stlportv5/stl/_string.h
 epoc32/include/stdapis/stlportv5/stl/_string_base.h
+epoc32/include/stdapis/stlportv5/stl/_string_fwd.h
+epoc32/include/stdapis/stlportv5/stl/_string_hash.h
+epoc32/include/stdapis/stlportv5/stl/_string_io.c
+epoc32/include/stdapis/stlportv5/stl/_string_io.h
 epoc32/include/stdapis/stlportv5/stl/_string_npos.h
 epoc32/include/stdapis/stlportv5/stl/_string_operators.h
+epoc32/include/stdapis/stlportv5/stl/_strstream.h
+epoc32/include/stdapis/stlportv5/stl/_tempbuf.c
+epoc32/include/stdapis/stlportv5/stl/_tempbuf.h
+epoc32/include/stdapis/stlportv5/stl/_threads.c
+epoc32/include/stdapis/stlportv5/stl/_threads.h
+epoc32/include/stdapis/stlportv5/stl/_time_facets.c
+epoc32/include/stdapis/stlportv5/stl/_time_facets.h
+epoc32/include/stdapis/stlportv5/stl/_tree.c
+epoc32/include/stdapis/stlportv5/stl/_tree.h
+epoc32/include/stdapis/stlportv5/stl/_uninitialized.h
 epoc32/include/stdapis/stlportv5/stl/_unordered_map.h
 epoc32/include/stdapis/stlportv5/stl/_unordered_set.h
+epoc32/include/stdapis/stlportv5/stl/_valarray.c
+epoc32/include/stdapis/stlportv5/stl/_valarray.h
+epoc32/include/stdapis/stlportv5/stl/_vector.c
+epoc32/include/stdapis/stlportv5/stl/_vector.h
+epoc32/include/stdapis/stlportv5/stl/c_locale.h
+epoc32/include/stdapis/stlportv5/stl/char_traits.h
+epoc32/include/stdapis/stlportv5/stl/concept_checks.h
 epoc32/include/stdapis/stlportv5/stl/config/_gcc.h
 epoc32/include/stdapis/stlportv5/stl/config/_mwerks.h
 epoc32/include/stdapis/stlportv5/stl/config/_native_headers.h
@@ -3479,14 +4269,31 @@
 epoc32/include/stdapis/stlportv5/stl/config/compat.h
 epoc32/include/stdapis/stlportv5/stl/config/features.h
 epoc32/include/stdapis/stlportv5/stl/config/host.h
+epoc32/include/stdapis/stlportv5/stl/config/stl_confix.h
+epoc32/include/stdapis/stlportv5/stl/config/stl_gcce.h
+epoc32/include/stdapis/stlportv5/stl/config/stl_rvct.h
 epoc32/include/stdapis/stlportv5/stl/config/stl_symbian.h
+epoc32/include/stdapis/stlportv5/stl/config/stl_winscw.h
 epoc32/include/stdapis/stlportv5/stl/config/user_config.h
+epoc32/include/stdapis/stlportv5/stl/msl_string.h
 epoc32/include/stdapis/stlportv5/stl/type_manips.h
+epoc32/include/stdapis/stlportv5/stl/type_traits.h
+epoc32/include/stdapis/stlportv5/streambuf
+epoc32/include/stdapis/stlportv5/streambuf.h
+epoc32/include/stdapis/stlportv5/string
+epoc32/include/stdapis/stlportv5/strstream
+epoc32/include/stdapis/stlportv5/strstream.h
+epoc32/include/stdapis/stlportv5/typeinfo
 epoc32/include/stdapis/stlportv5/typeinfo_winscw.h
 epoc32/include/stdapis/stlportv5/unordered_map
 epoc32/include/stdapis/stlportv5/unordered_set
+epoc32/include/stdapis/stlportv5/using/cstring
+epoc32/include/stdapis/stlportv5/utility
+epoc32/include/stdapis/stlportv5/valarray
+epoc32/include/stdapis/stlportv5/vector
 epoc32/include/stdapis/stlportv5/wsd_locales.h
 epoc32/include/stdapis/stlportv5/wsd_streams.h
+epoc32/include/stdapis/string.h
 epoc32/include/stdapis/strings.h
 epoc32/include/stdapis/sys/_iovec.h
 epoc32/include/stdapis/sys/_null.h
@@ -3494,81 +4301,365 @@
 epoc32/include/stdapis/sys/_sigset.h
 epoc32/include/stdapis/sys/_timespec.h
 epoc32/include/stdapis/sys/_timeval.h
+epoc32/include/stdapis/sys/_types.h
 epoc32/include/stdapis/sys/aeselect.h
 epoc32/include/stdapis/sys/cdefs.h
+epoc32/include/stdapis/sys/dirent.h
+epoc32/include/stdapis/sys/endian.h
+epoc32/include/stdapis/sys/errno.h
+epoc32/include/stdapis/sys/event.h
+epoc32/include/stdapis/sys/fcntl.h
+epoc32/include/stdapis/sys/file.h
 epoc32/include/stdapis/sys/filio.h
 epoc32/include/stdapis/sys/ioccom.h
+epoc32/include/stdapis/sys/ioctl.h
 epoc32/include/stdapis/sys/ipc.h
+epoc32/include/stdapis/sys/limits.h
+epoc32/include/stdapis/sys/md5.h
 epoc32/include/stdapis/sys/mman.h
 epoc32/include/stdapis/sys/msg.h
+epoc32/include/stdapis/sys/param.h
 epoc32/include/stdapis/sys/queue.h
+epoc32/include/stdapis/sys/resource.h
 epoc32/include/stdapis/sys/select.h
 epoc32/include/stdapis/sys/sem.h
+epoc32/include/stdapis/sys/serial.h
 epoc32/include/stdapis/sys/shm.h
+epoc32/include/stdapis/sys/signal.h
+epoc32/include/stdapis/sys/socket.h
 epoc32/include/stdapis/sys/sockio.h
+epoc32/include/stdapis/sys/stat.h
+epoc32/include/stdapis/sys/stdint.h
 epoc32/include/stdapis/sys/sysctl.h
 epoc32/include/stdapis/sys/syslimits.h
+epoc32/include/stdapis/sys/time.h
+epoc32/include/stdapis/sys/times.h
 epoc32/include/stdapis/sys/timespec.h
 epoc32/include/stdapis/sys/ttycom.h
+epoc32/include/stdapis/sys/types.h
 epoc32/include/stdapis/sys/uio.h
 epoc32/include/stdapis/sys/un.h
+epoc32/include/stdapis/sys/unistd.h
 epoc32/include/stdapis/sys/utsname.h
+epoc32/include/stdapis/sys/wait.h
 epoc32/include/stdapis/sysexits.h
+epoc32/include/stdapis/time.h
+epoc32/include/stdapis/unistd.h
 epoc32/include/stdapis/utime.h
 epoc32/include/stdapis/utmp.h
+epoc32/include/stdapis/wchar.h
+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/strng.h
-epoc32/include/strng.inl
 epoc32/include/swap.h
+epoc32/include/syborg/variantmediadef.h
 epoc32/include/symcpp.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/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/tia637.h
 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
+epoc32/include/tools/stlport/cassert
+epoc32/include/tools/stlport/cctype
+epoc32/include/tools/stlport/cerrno
+epoc32/include/tools/stlport/cfloat
+epoc32/include/tools/stlport/ciso646
+epoc32/include/tools/stlport/climits
+epoc32/include/tools/stlport/clocale
+epoc32/include/tools/stlport/cmath
+epoc32/include/tools/stlport/complex
+epoc32/include/tools/stlport/csetjmp
+epoc32/include/tools/stlport/csignal
+epoc32/include/tools/stlport/cstdarg
+epoc32/include/tools/stlport/cstddef
+epoc32/include/tools/stlport/cstdio
+epoc32/include/tools/stlport/cstdlib
+epoc32/include/tools/stlport/cstring
+epoc32/include/tools/stlport/ctime
+epoc32/include/tools/stlport/ctype.h
+epoc32/include/tools/stlport/cwchar
+epoc32/include/tools/stlport/cwctype
+epoc32/include/tools/stlport/deque
+epoc32/include/tools/stlport/errno.h
+epoc32/include/tools/stlport/exception
+epoc32/include/tools/stlport/exception.h
+epoc32/include/tools/stlport/float.h
+epoc32/include/tools/stlport/fstream
+epoc32/include/tools/stlport/fstream.h
+epoc32/include/tools/stlport/functional
+epoc32/include/tools/stlport/hash_map
+epoc32/include/tools/stlport/hash_set
+epoc32/include/tools/stlport/iomanip
+epoc32/include/tools/stlport/iomanip.h
+epoc32/include/tools/stlport/ios
+epoc32/include/tools/stlport/ios.h
+epoc32/include/tools/stlport/iosfwd
+epoc32/include/tools/stlport/iostream
+epoc32/include/tools/stlport/iostream.h
+epoc32/include/tools/stlport/iso646.h
+epoc32/include/tools/stlport/istream
+epoc32/include/tools/stlport/istream.h
+epoc32/include/tools/stlport/iterator
+epoc32/include/tools/stlport/limits
+epoc32/include/tools/stlport/limits.h
+epoc32/include/tools/stlport/list
+epoc32/include/tools/stlport/locale
+epoc32/include/tools/stlport/locale.h
+epoc32/include/tools/stlport/map
+epoc32/include/tools/stlport/math.h
+epoc32/include/tools/stlport/mem.h
+epoc32/include/tools/stlport/memory
+epoc32/include/tools/stlport/new
+epoc32/include/tools/stlport/new.h
+epoc32/include/tools/stlport/numeric
+epoc32/include/tools/stlport/ostream
+epoc32/include/tools/stlport/ostream.h
+epoc32/include/tools/stlport/pthread.h
+epoc32/include/tools/stlport/pthread_alloc
+epoc32/include/tools/stlport/queue
 epoc32/include/tools/stlport/rlocks.h
+epoc32/include/tools/stlport/rope
+epoc32/include/tools/stlport/set
+epoc32/include/tools/stlport/setjmp.h
+epoc32/include/tools/stlport/signal.h
+epoc32/include/tools/stlport/slist
+epoc32/include/tools/stlport/sstream
+epoc32/include/tools/stlport/stack
+epoc32/include/tools/stlport/stdarg.h
+epoc32/include/tools/stlport/stddef.h
+epoc32/include/tools/stlport/stdexcept
+epoc32/include/tools/stlport/stdio.h
+epoc32/include/tools/stlport/stdiostream.h
+epoc32/include/tools/stlport/stdlib.h
+epoc32/include/tools/stlport/stl/_abbrevs.h
+epoc32/include/tools/stlport/stl/_algo.c
+epoc32/include/tools/stlport/stl/_algo.h
+epoc32/include/tools/stlport/stl/_algobase.c
+epoc32/include/tools/stlport/stl/_algobase.h
+epoc32/include/tools/stlport/stl/_alloc.c
+epoc32/include/tools/stlport/stl/_alloc.h
 epoc32/include/tools/stlport/stl/_alloc_old.h
+epoc32/include/tools/stlport/stl/_auto_ptr.h
+epoc32/include/tools/stlport/stl/_bitset.c
+epoc32/include/tools/stlport/stl/_bitset.h
+epoc32/include/tools/stlport/stl/_bvector.h
+epoc32/include/tools/stlport/stl/_carray.h
+epoc32/include/tools/stlport/stl/_cctype.h
+epoc32/include/tools/stlport/stl/_check_config.h
+epoc32/include/tools/stlport/stl/_clocale.h
+epoc32/include/tools/stlport/stl/_cmath.h
+epoc32/include/tools/stlport/stl/_codecvt.h
+epoc32/include/tools/stlport/stl/_collate.h
+epoc32/include/tools/stlport/stl/_complex.c
+epoc32/include/tools/stlport/stl/_complex.h
+epoc32/include/tools/stlport/stl/_config_compat_post.h
+epoc32/include/tools/stlport/stl/_construct.h
+epoc32/include/tools/stlport/stl/_csetjmp.h
+epoc32/include/tools/stlport/stl/_csignal.h
+epoc32/include/tools/stlport/stl/_cstdarg.h
+epoc32/include/tools/stlport/stl/_cstddef.h
+epoc32/include/tools/stlport/stl/_cstdio.h
+epoc32/include/tools/stlport/stl/_cstdlib.h
+epoc32/include/tools/stlport/stl/_cstring.h
+epoc32/include/tools/stlport/stl/_ctime.h
+epoc32/include/tools/stlport/stl/_ctraits_fns.h
+epoc32/include/tools/stlport/stl/_ctype.h
+epoc32/include/tools/stlport/stl/_cwchar.h
+epoc32/include/tools/stlport/stl/_cwctype.h
+epoc32/include/tools/stlport/stl/_deque.c
+epoc32/include/tools/stlport/stl/_deque.h
+epoc32/include/tools/stlport/stl/_epilog.h
+epoc32/include/tools/stlport/stl/_exception.h
+epoc32/include/tools/stlport/stl/_fstream.c
+epoc32/include/tools/stlport/stl/_fstream.h
+epoc32/include/tools/stlport/stl/_function.h
+epoc32/include/tools/stlport/stl/_function_adaptors.h
+epoc32/include/tools/stlport/stl/_function_base.h
+epoc32/include/tools/stlport/stl/_hash_fun.h
+epoc32/include/tools/stlport/stl/_hash_map.h
+epoc32/include/tools/stlport/stl/_hash_set.h
+epoc32/include/tools/stlport/stl/_hashtable.c
+epoc32/include/tools/stlport/stl/_hashtable.h
+epoc32/include/tools/stlport/stl/_heap.c
+epoc32/include/tools/stlport/stl/_heap.h
+epoc32/include/tools/stlport/stl/_ios.c
+epoc32/include/tools/stlport/stl/_ios.h
+epoc32/include/tools/stlport/stl/_ios_base.h
+epoc32/include/tools/stlport/stl/_ioserr.h
+epoc32/include/tools/stlport/stl/_iosfwd.h
+epoc32/include/tools/stlport/stl/_iostream_string.h
+epoc32/include/tools/stlport/stl/_istream.c
+epoc32/include/tools/stlport/stl/_istream.h
+epoc32/include/tools/stlport/stl/_istreambuf_iterator.h
+epoc32/include/tools/stlport/stl/_iterator.h
+epoc32/include/tools/stlport/stl/_iterator_base.h
+epoc32/include/tools/stlport/stl/_iterator_old.h
+epoc32/include/tools/stlport/stl/_limits.c
+epoc32/include/tools/stlport/stl/_limits.h
+epoc32/include/tools/stlport/stl/_list.c
+epoc32/include/tools/stlport/stl/_list.h
+epoc32/include/tools/stlport/stl/_locale.h
+epoc32/include/tools/stlport/stl/_map.h
+epoc32/include/tools/stlport/stl/_mbstate_t.h
+epoc32/include/tools/stlport/stl/_messages_facets.h
+epoc32/include/tools/stlport/stl/_monetary.c
+epoc32/include/tools/stlport/stl/_monetary.h
+epoc32/include/tools/stlport/stl/_move_construct_fwk.h
+epoc32/include/tools/stlport/stl/_new.h
+epoc32/include/tools/stlport/stl/_null_stream.h
+epoc32/include/tools/stlport/stl/_num_get.c
+epoc32/include/tools/stlport/stl/_num_get.h
+epoc32/include/tools/stlport/stl/_num_put.c
+epoc32/include/tools/stlport/stl/_num_put.h
+epoc32/include/tools/stlport/stl/_numeric.c
+epoc32/include/tools/stlport/stl/_numeric.h
+epoc32/include/tools/stlport/stl/_numpunct.h
+epoc32/include/tools/stlport/stl/_ostream.c
+epoc32/include/tools/stlport/stl/_ostream.h
+epoc32/include/tools/stlport/stl/_ostreambuf_iterator.h
+epoc32/include/tools/stlport/stl/_pair.h
+epoc32/include/tools/stlport/stl/_prolog.h
+epoc32/include/tools/stlport/stl/_pthread_alloc.h
+epoc32/include/tools/stlport/stl/_ptrs_specialize.h
+epoc32/include/tools/stlport/stl/_queue.h
+epoc32/include/tools/stlport/stl/_range_errors.h
+epoc32/include/tools/stlport/stl/_raw_storage_iter.h
+epoc32/include/tools/stlport/stl/_relops_cont.h
+epoc32/include/tools/stlport/stl/_relops_hash_cont.h
+epoc32/include/tools/stlport/stl/_rope.c
+epoc32/include/tools/stlport/stl/_rope.h
+epoc32/include/tools/stlport/stl/_set.h
+epoc32/include/tools/stlport/stl/_slist.c
+epoc32/include/tools/stlport/stl/_slist.h
+epoc32/include/tools/stlport/stl/_slist_base.c
+epoc32/include/tools/stlport/stl/_slist_base.h
 epoc32/include/tools/stlport/stl/_sparc_atomic.h
+epoc32/include/tools/stlport/stl/_sstream.c
+epoc32/include/tools/stlport/stl/_sstream.h
+epoc32/include/tools/stlport/stl/_stack.h
+epoc32/include/tools/stlport/stl/_stdexcept.h
+epoc32/include/tools/stlport/stl/_stdexcept_base.h
+epoc32/include/tools/stlport/stl/_stlport_version.h
+epoc32/include/tools/stlport/stl/_stream_iterator.h
+epoc32/include/tools/stlport/stl/_streambuf.c
+epoc32/include/tools/stlport/stl/_streambuf.h
+epoc32/include/tools/stlport/stl/_string.c
+epoc32/include/tools/stlport/stl/_string.h
+epoc32/include/tools/stlport/stl/_string_base.h
+epoc32/include/tools/stlport/stl/_string_fwd.h
+epoc32/include/tools/stlport/stl/_string_hash.h
+epoc32/include/tools/stlport/stl/_string_io.c
+epoc32/include/tools/stlport/stl/_string_io.h
+epoc32/include/tools/stlport/stl/_string_npos.h
+epoc32/include/tools/stlport/stl/_string_operators.h
 epoc32/include/tools/stlport/stl/_string_sum.h
 epoc32/include/tools/stlport/stl/_string_sum_methods.h
 epoc32/include/tools/stlport/stl/_string_workaround.h
+epoc32/include/tools/stlport/stl/_strstream.h
+epoc32/include/tools/stlport/stl/_tempbuf.c
+epoc32/include/tools/stlport/stl/_tempbuf.h
+epoc32/include/tools/stlport/stl/_threads.c
+epoc32/include/tools/stlport/stl/_threads.h
+epoc32/include/tools/stlport/stl/_time_facets.c
+epoc32/include/tools/stlport/stl/_time_facets.h
+epoc32/include/tools/stlport/stl/_tree.c
+epoc32/include/tools/stlport/stl/_tree.h
 epoc32/include/tools/stlport/stl/_typeinfo.h
+epoc32/include/tools/stlport/stl/_uninitialized.h
+epoc32/include/tools/stlport/stl/_unordered_map.h
+epoc32/include/tools/stlport/stl/_unordered_set.h
+epoc32/include/tools/stlport/stl/_valarray.c
+epoc32/include/tools/stlport/stl/_valarray.h
+epoc32/include/tools/stlport/stl/_vector.c
+epoc32/include/tools/stlport/stl/_vector.h
 epoc32/include/tools/stlport/stl/boost_type_traits.h
+epoc32/include/tools/stlport/stl/c_locale.h
+epoc32/include/tools/stlport/stl/char_traits.h
+epoc32/include/tools/stlport/stl/concept_checks.h
 epoc32/include/tools/stlport/stl/config/_aix.h
 epoc32/include/tools/stlport/stl/config/_apcc.h
 epoc32/include/tools/stlport/stl/config/_apple.h
@@ -3582,9 +4673,11 @@
 epoc32/include/tools/stlport/stl/config/_dec_vms.h
 epoc32/include/tools/stlport/stl/config/_detect_dll_or_lib.h
 epoc32/include/tools/stlport/stl/config/_dm.h
+epoc32/include/tools/stlport/stl/config/_epilog.h
 epoc32/include/tools/stlport/stl/config/_evc.h
 epoc32/include/tools/stlport/stl/config/_freebsd.h
 epoc32/include/tools/stlport/stl/config/_fujitsu.h
+epoc32/include/tools/stlport/stl/config/_gcc.h
 epoc32/include/tools/stlport/stl/config/_hpacc.h
 epoc32/include/tools/stlport/stl/config/_hpux.h
 epoc32/include/tools/stlport/stl/config/_ibm.h
@@ -3597,17 +4690,80 @@
 epoc32/include/tools/stlport/stl/config/_mlc.h
 epoc32/include/tools/stlport/stl/config/_msvc.h
 epoc32/include/tools/stlport/stl/config/_mwccnlm.h
+epoc32/include/tools/stlport/stl/config/_mwerks.h
+epoc32/include/tools/stlport/stl/config/_native_headers.h
 epoc32/include/tools/stlport/stl/config/_netware.h
 epoc32/include/tools/stlport/stl/config/_openbsd.h
+epoc32/include/tools/stlport/stl/config/_prolog.h
 epoc32/include/tools/stlport/stl/config/_sgi.h
 epoc32/include/tools/stlport/stl/config/_solaris.h
 epoc32/include/tools/stlport/stl/config/_sunprocc.h
 epoc32/include/tools/stlport/stl/config/_symantec.h
+epoc32/include/tools/stlport/stl/config/_system.h
 epoc32/include/tools/stlport/stl/config/_warnings_off.h
 epoc32/include/tools/stlport/stl/config/_watcom.h
+epoc32/include/tools/stlport/stl/config/_windows.h
+epoc32/include/tools/stlport/stl/config/compat.h
+epoc32/include/tools/stlport/stl/config/features.h
+epoc32/include/tools/stlport/stl/config/host.h
+epoc32/include/tools/stlport/stl/config/stl_confix.h
 epoc32/include/tools/stlport/stl/config/stl_mycomp.h
+epoc32/include/tools/stlport/stl/config/user_config.h
+epoc32/include/tools/stlport/stl/debug/_debug.c
+epoc32/include/tools/stlport/stl/debug/_debug.h
+epoc32/include/tools/stlport/stl/debug/_deque.h
+epoc32/include/tools/stlport/stl/debug/_hashtable.h
+epoc32/include/tools/stlport/stl/debug/_iterator.h
+epoc32/include/tools/stlport/stl/debug/_list.h
+epoc32/include/tools/stlport/stl/debug/_slist.h
+epoc32/include/tools/stlport/stl/debug/_string.h
+epoc32/include/tools/stlport/stl/debug/_string_sum_methods.h
+epoc32/include/tools/stlport/stl/debug/_tree.h
+epoc32/include/tools/stlport/stl/debug/_vector.h
+epoc32/include/tools/stlport/stl/msl_string.h
+epoc32/include/tools/stlport/stl/pointers/_deque.h
+epoc32/include/tools/stlport/stl/pointers/_list.h
+epoc32/include/tools/stlport/stl/pointers/_set.h
+epoc32/include/tools/stlport/stl/pointers/_slist.h
 epoc32/include/tools/stlport/stl/pointers/_tools.h
+epoc32/include/tools/stlport/stl/pointers/_vector.h
+epoc32/include/tools/stlport/stl/type_manips.h
+epoc32/include/tools/stlport/stl/type_traits.h
+epoc32/include/tools/stlport/streambuf
+epoc32/include/tools/stlport/streambuf.h
+epoc32/include/tools/stlport/string
+epoc32/include/tools/stlport/string.h
+epoc32/include/tools/stlport/strstream
+epoc32/include/tools/stlport/strstream.h
+epoc32/include/tools/stlport/time.h
+epoc32/include/tools/stlport/typeinfo
+epoc32/include/tools/stlport/typeinfo.h
+epoc32/include/tools/stlport/unordered_map
+epoc32/include/tools/stlport/unordered_set
+epoc32/include/tools/stlport/using/cstring
 epoc32/include/tools/stlport/using/export
+epoc32/include/tools/stlport/using/fstream
+epoc32/include/tools/stlport/using/h/fstream.h
+epoc32/include/tools/stlport/using/h/iomanip.h
+epoc32/include/tools/stlport/using/h/iostream.h
+epoc32/include/tools/stlport/using/h/ostream.h
+epoc32/include/tools/stlport/using/h/streambuf.h
+epoc32/include/tools/stlport/using/h/strstream.h
+epoc32/include/tools/stlport/using/iomanip
+epoc32/include/tools/stlport/using/ios
+epoc32/include/tools/stlport/using/iosfwd
+epoc32/include/tools/stlport/using/iostream
+epoc32/include/tools/stlport/using/istream
+epoc32/include/tools/stlport/using/locale
+epoc32/include/tools/stlport/using/ostream
+epoc32/include/tools/stlport/using/sstream
+epoc32/include/tools/stlport/using/streambuf
+epoc32/include/tools/stlport/using/strstream
+epoc32/include/tools/stlport/utility
+epoc32/include/tools/stlport/valarray
+epoc32/include/tools/stlport/vector
+epoc32/include/tools/stlport/wchar.h
+epoc32/include/tools/stlport/wctype.h
 epoc32/include/tranp.h
 epoc32/include/tsy.hrh
 epoc32/include/tsy.rh
@@ -3627,9 +4783,17 @@
 epoc32/include/txtstyle.inl
 epoc32/include/typerel.h
 epoc32/include/udp_hdr.h
+epoc32/include/uiklaf/private/pluginuid.hrh
 epoc32/include/uikon.hrh
 epoc32/include/uikon.rh
-epoc32/include/unified_editor.h
+epoc32/include/uloggerclient.h
+epoc32/include/uloggercommands.h
+epoc32/include/uloggerdatatypes.h
+epoc32/include/uloggerinputplugin.h
+epoc32/include/uloggeroutputplugin.h
+epoc32/include/uloggerplugin.h
+epoc32/include/uloggerplugin.inl
+epoc32/include/uloggershared.h
 epoc32/include/unifiedcertstore.h
 epoc32/include/ups/ups.hrh
 epoc32/include/ups/upsclient.h
@@ -3641,14 +4805,27 @@
 epoc32/include/uricommon.h
 epoc32/include/uriutils.h
 epoc32/include/uriutilscommon.h
+epoc32/include/usb/hostms/policyplugin.hrh
+epoc32/include/usb/hostms/policypluginnotifier.hrh
+epoc32/include/usb/usblogger.mmh
+epoc32/include/usbhost/internal/fdcplugin.hrh
+epoc32/include/usbhost/internal/fdfcaps.mmh
+epoc32/include/usbman.rh
 epoc32/include/utf.h
-epoc32/include/variant/symbian_os.hrh
+epoc32/include/variant/platform_paths.hrh
+epoc32/include/variant/Symbian_OS.hrh
 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.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/w32adll.h
 epoc32/include/w32click.h
 epoc32/include/w32std.h
@@ -3656,9 +4833,10 @@
 epoc32/include/wap_sock.h
 epoc32/include/wapmessage.h
 epoc32/include/wapmsgerr.h
-epoc32/include/wf/wfc.h
-epoc32/include/wf/wfcext.h
-epoc32/include/wf/wfcplatform.h
+epoc32/include/WF/openwfcuids.hrh
+epoc32/include/WF/wfc.h
+epoc32/include/WF/wfcext.h
+epoc32/include/WF/wfcplatform.h
 epoc32/include/wlansdkpskeys.h
 epoc32/include/wspdecoder.h
 epoc32/include/wspencoder.h
@@ -3673,6 +4851,7 @@
 epoc32/include/x509gn.h
 epoc32/include/x509keys.h
 epoc32/include/x520ava.h
+epoc32/include/xml/attribute.h
 epoc32/include/xml/contenthandler.h
 epoc32/include/xml/contentprocessoruids.h
 epoc32/include/xml/dom/xmlengattr.h
@@ -3690,6 +4869,8 @@
 epoc32/include/xml/dom/xmlengdatacontainer.h
 epoc32/include/xml/dom/xmlengdatacontainer.inl
 epoc32/include/xml/dom/xmlengdataserializer.h
+epoc32/include/xml/dom/xmlengdeserializer.h
+epoc32/include/xml/dom/xmlengdeserializerdom.h
 epoc32/include/xml/dom/xmlengdocument.h
 epoc32/include/xml/dom/xmlengdocument.inl
 epoc32/include/xml/dom/xmlengdocumentfragment.h
@@ -3703,27 +4884,43 @@
 epoc32/include/xml/dom/xmlengentityreference.h
 epoc32/include/xml/dom/xmlengentityreference.inl
 epoc32/include/xml/dom/xmlengerrors.h
+epoc32/include/xml/dom/xmlengextendedcontenthandler.h
 epoc32/include/xml/dom/xmlengfilecontainer.h
 epoc32/include/xml/dom/xmlengfilecontainer.inl
 epoc32/include/xml/dom/xmlengnamespace.h
 epoc32/include/xml/dom/xmlengnamespace.inl
+epoc32/include/xml/dom/xmlengnamespaceresolver.h
 epoc32/include/xml/dom/xmlengnode.h
 epoc32/include/xml/dom/xmlengnode.inl
 epoc32/include/xml/dom/xmlengnodefilter.h
 epoc32/include/xml/dom/xmlengnodelist.h
 epoc32/include/xml/dom/xmlengnodelist.inl
 epoc32/include/xml/dom/xmlengnodelist_impl.h
+epoc32/include/xml/dom/xmlengnodeset.h
 epoc32/include/xml/dom/xmlengnodeset.inl
 epoc32/include/xml/dom/xmlengoutputstream.h
+epoc32/include/xml/dom/xmlengparsingoptions.h
 epoc32/include/xml/dom/xmlengprocessinginstruction.h
 epoc32/include/xml/dom/xmlengprocessinginstruction.inl
 epoc32/include/xml/dom/xmlengserializationoptions.h
+epoc32/include/xml/dom/xmlengserializeerrors.h
+epoc32/include/xml/dom/xmlengserializer.h
 epoc32/include/xml/dom/xmlengtext.h
 epoc32/include/xml/dom/xmlengtext.inl
 epoc32/include/xml/dom/xmlenguserdata.h
+epoc32/include/xml/dom/xmlengxformsinstancemap.h
+epoc32/include/xml/dom/xmlengxpath.h
+epoc32/include/xml/dom/xmlengxpathconfiguration.h
+epoc32/include/xml/dom/xmlengxpatherrors.h
+epoc32/include/xml/dom/xmlengxpathevaluationcontext.h
+epoc32/include/xml/dom/xmlengxpathevaluator.h
 epoc32/include/xml/dom/xmlengxpathevaluator.inl
+epoc32/include/xml/dom/xmlengxpathexpression.h
 epoc32/include/xml/dom/xmlengxpathexpression.inl
+epoc32/include/xml/dom/xmlengxpathextensionfunction.h
+epoc32/include/xml/dom/xmlengxpathresult.h
 epoc32/include/xml/dom/xmlengxpathresult.inl
+epoc32/include/xml/dom/xmlengxpathutils.h
 epoc32/include/xml/dom/xmlengxpathutils.inl
 epoc32/include/xml/matchdata.h
 epoc32/include/xml/parser.h
@@ -3732,9 +4929,39 @@
 epoc32/include/xml/taginfo.h
 epoc32/include/xml/wbxmlextensionhandler.h
 epoc32/include/xml/xmlframeworkerrors.h
+epoc32/include/xmlengattr.h
+epoc32/include/xmlengbinarycontainer.h
+epoc32/include/xmlengcdatasection.h
+epoc32/include/xmlengcharacterdata.h
+epoc32/include/xmlengchunkcontainer.h
+epoc32/include/xmlengcomment.h
+epoc32/include/xmlengdatacontainer.h
+epoc32/include/xmlengdataserializer.h
+epoc32/include/xmlengdocument.h
+epoc32/include/xmlengdocumentfragment.h
+epoc32/include/xmlengdom.h
+epoc32/include/xmlengdomimplementation.h
+epoc32/include/xmlengdomparser.h
+epoc32/include/xmlengdomutils.h
+epoc32/include/xmlengelement.h
+epoc32/include/xmlengentityreference.h
+epoc32/include/xmlengerrors.h
+epoc32/include/xmlengfilecontainer.h
+epoc32/include/xmlengnamespace.h
+epoc32/include/xmlengnode.h
+epoc32/include/xmlengnodefilter.h
+epoc32/include/xmlengnodelist.h
+epoc32/include/xmlengnodelist_impl.h
+epoc32/include/xmlengoutputstream.h
+epoc32/include/xmlengprocessinginstruction.h
+epoc32/include/xmlengserializationoptions.h
+epoc32/include/xmlengtext.h
+epoc32/include/xmlenguserdata.h
 epoc32/include/xmlentityreferences.h
+epoc32/include/zconf.h
 epoc32/include/ziparchive.h
 epoc32/include/zipfile.h
 epoc32/include/zipfilemember.h
 epoc32/include/zipfilememberinputstream.h
-epoc32/include/zipfilememberiterator.h
\ No newline at end of file
+epoc32/include/zipfilememberiterator.h
+epoc32/include/zlib.h