Update SDK list to reflect restructured headers
authorShabe Razvi <shaber@symbian.org>
Mon, 08 Mar 2010 22:38:39 +0000
changeset 438 44860545eec5
parent 437 d7a131f3184b
child 439 34a5bdee9cca
Update SDK list to reflect restructured headers
symbian3/sdkFiles.txt
--- a/symbian3/sdkFiles.txt	Mon Mar 08 17:44:41 2010 +0000
+++ b/symbian3/sdkFiles.txt	Mon Mar 08 22:38:39 2010 +0000
@@ -1,10 +1,4 @@
-epoc32/include/_sdpdefs.h
-epoc32/include/_sipcodecdefs.h
 epoc32/include/a3f/a3f_trace_ctxt.h
-epoc32/include/absolutevolumeapicontroller.h
-epoc32/include/absolutevolumeapicontrollerobserver.h
-epoc32/include/absolutevolumeapitarget.h
-epoc32/include/absolutevolumeapitargetobserver.h
 epoc32/include/accmonitor.h
 epoc32/include/accmonitorcapabilities.h
 epoc32/include/accmonitorinfo.h
@@ -12,48 +6,60 @@
 epoc32/include/advancedpointerevent.h
 epoc32/include/agentdialog.h
 epoc32/include/aiftool.rh
-epoc32/include/animation.h
 epoc32/include/animationcmd.h
-epoc32/include/animationconfig.h
-epoc32/include/animationdataloaderobserver.h
-epoc32/include/animationdataprovider.h
-epoc32/include/animationevents.h
-epoc32/include/animationframe.h
-epoc32/include/animationgroup.h
-epoc32/include/animationmixins.h
-epoc32/include/animationticker.h
-epoc32/include/animationtls.h
-epoc32/include/animator.h
-epoc32/include/ansicomp.h
-epoc32/include/apaapp.h
-epoc32/include/apacln.h
-epoc32/include/apacmdln.h
-epoc32/include/apadbase.h
-epoc32/include/apadef.h
-epoc32/include/apadoc.h
-epoc32/include/apaid.h
-epoc32/include/apamdr.h
-epoc32/include/apaproc.h
-epoc32/include/apaserverapp.h
-epoc32/include/apcaptionfile.rh
 epoc32/include/apfdef.h
-epoc32/include/apfrec.h
-epoc32/include/apgcli.h
-epoc32/include/apgctl.h
-epoc32/include/apgdoor.h
-epoc32/include/apgicnfl.h
-epoc32/include/apgnotif.h
-epoc32/include/apgtask.h
-epoc32/include/apgwgnam.h
-epoc32/include/apmfndr.h
 epoc32/include/apmrec.h
 epoc32/include/apmrec.inl
 epoc32/include/apmstd.h
 epoc32/include/app/bcardeng.h
+epoc32/include/app/btmsgtypeuid.h
+epoc32/include/app/cacheman.h
+epoc32/include/app/calalarm.h
+epoc32/include/app/calcalendarinfo.h
+epoc32/include/app/calcalendariterator.h
+epoc32/include/app/calcategory.h
+epoc32/include/app/calcategorymanager.h
+epoc32/include/app/calchangecallback.h
+epoc32/include/app/calcommon.h
+epoc32/include/app/calcontent.h
+epoc32/include/app/caldataexchange.h
+epoc32/include/app/caldataformat.h
+epoc32/include/app/calendarconverter.h
 epoc32/include/app/caleninterimutils2.h
+epoc32/include/app/calentry.h
+epoc32/include/app/calentryview.h
+epoc32/include/app/calfilechangenotification.h
+epoc32/include/app/calinstance.h
+epoc32/include/app/calinstanceview.h
+epoc32/include/app/calinterimapipanic.h
+epoc32/include/app/caliterator.h
+epoc32/include/app/calnotification.h
+epoc32/include/app/calprogresscallback.h
+epoc32/include/app/calrrule.h
+epoc32/include/app/calsession.h
+epoc32/include/app/caltime.h
+epoc32/include/app/caluser.h
+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/cmmsaccounts.h
+epoc32/include/app/cmmssettings.h
+epoc32/include/app/cntdb.h
+epoc32/include/app/cntdbobs.h
+epoc32/include/app/cntdef.h
+epoc32/include/app/cntfield.h
+epoc32/include/app/cntfilt.h
+epoc32/include/app/cntfldst.h
+epoc32/include/app/cntitem.h
+epoc32/include/app/cntsync.h
+epoc32/include/app/cntvcard.h
+epoc32/include/app/cntview.h
+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
@@ -82,6 +88,8 @@
 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
@@ -103,8 +111,30 @@
 epoc32/include/app/cvpbkvoicetagattribute.h
 epoc32/include/app/cvpbkxspcontacts.h
 epoc32/include/app/extendedmtmids.hrh
+epoc32/include/app/hlplch.h
+epoc32/include/app/hlpmodel.h
+epoc32/include/app/hlpzoom.h
+epoc32/include/app/iapprefs.h
+epoc32/include/app/imapcmds.h
+epoc32/include/app/imapconnectionobserver.h
+epoc32/include/app/imapset.h
+epoc32/include/app/imcmmain.h
+epoc32/include/app/imcvcodc.h
+epoc32/include/app/impcmtm.h
+epoc32/include/app/imsk.h
+epoc32/include/app/irmsgtypeuid.h
+epoc32/include/app/irmtmcmds.h
 epoc32/include/app/lmkerrors.h
 epoc32/include/app/messagingsdkcrkeys.h
+epoc32/include/app/miut_err.h
+epoc32/include/app/miutatch.h
+epoc32/include/app/miutconv.h
+epoc32/include/app/miutdef.h
+epoc32/include/app/miuthdr.h
+epoc32/include/app/miutmsg.h
+epoc32/include/app/miutpars.h
+epoc32/include/app/miutset.h
+epoc32/include/app/mmmssettingsobserver.h
 epoc32/include/app/mmsclient.h
 epoc32/include/app/mmsclient.inl
 epoc32/include/app/mmsconst.h
@@ -186,6 +216,7 @@
 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
@@ -196,8 +227,22 @@
 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/smcmmain.h
+epoc32/include/app/smsclnt.h
+epoc32/include/app/smscmds.h
+epoc32/include/app/smtcmtm.h
+epoc32/include/app/smtpcmds.h
+epoc32/include/app/smtpset.h
+epoc32/include/app/smut.h
+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
@@ -208,6 +253,14 @@
 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
+epoc32/include/app/vcard.inl
+epoc32/include/app/versit.h
+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
@@ -219,21 +272,19 @@
 epoc32/include/app/vpbkpublicuid.h
 epoc32/include/app/vpbksyncconstants.h
 epoc32/include/app/vpbkutils.h
-epoc32/include/apparc.h
+epoc32/include/app/vprop.h
+epoc32/include/app/vprop.inl
+epoc32/include/app/vrecur.h
+epoc32/include/app/vrecur.inl
+epoc32/include/app/vstaticutils.h
+epoc32/include/app/vtoken.h
+epoc32/include/app/vuid.h
+epoc32/include/app/vutil.h
 epoc32/include/appinfo.rh
-epoc32/include/arm_vfp.h
 epoc32/include/arp_hdr.h
-epoc32/include/asaltdefs.h
-epoc32/include/ascliclientutils.h
-epoc32/include/asclidefinitions.h
-epoc32/include/asclisession.h
-epoc32/include/asclisoundplay.h
 epoc32/include/asn1cons.h
 epoc32/include/asn1dec.h
 epoc32/include/asn1enc.h
-epoc32/include/asshdalarm.h
-epoc32/include/asshdbitflags.h
-epoc32/include/asshddefs.h
 epoc32/include/assp/omap3530_assp/gpio.h
 epoc32/include/assp/omap3530_assp/omap3530_assp_priv.h
 epoc32/include/assp/omap3530_assp/omap3530_gpio.h
@@ -249,13 +300,10 @@
 epoc32/include/assp/omap3530_shared/omap3_mstick.h
 epoc32/include/assp/omap3530_shared/tps65950.h
 epoc32/include/assp/omap3530_shared/tps65950_registers.h
-epoc32/include/assp/template_assp/template_assp.h
-epoc32/include/assp/template_assp/template_assp_priv.h
 epoc32/include/asymmetric.h
 epoc32/include/asymmetric.inl
 epoc32/include/asymmetrickeys.h
 epoc32/include/ataudioeventapi.h
-epoc32/include/attrlut.h
 epoc32/include/audioeffectbase.h
 epoc32/include/audioeffectdata.h
 epoc32/include/audioequalizerbase.h
@@ -276,7 +324,6 @@
 epoc32/include/badef.rh
 epoc32/include/badesca.h
 epoc32/include/baerrhan.h
-epoc32/include/baerror.h
 epoc32/include/baerrrsvr.rh
 epoc32/include/bafindf.h
 epoc32/include/bafl/sysutil.h
@@ -290,7 +337,6 @@
 epoc32/include/barsread.h
 epoc32/include/barsread2.h
 epoc32/include/basched.h
-epoc32/include/basicanimation.h
 epoc32/include/bassboostbase.h
 epoc32/include/bassboostdata.h
 epoc32/include/bassnd.h
@@ -303,13 +349,8 @@
 epoc32/include/bidi.h
 epoc32/include/biditext.h
 epoc32/include/bidivisual.h
-epoc32/include/bif.h
-epoc32/include/bifbase.h
-epoc32/include/biftool2.rh
 epoc32/include/big5.h
 epoc32/include/bigint.h
-epoc32/include/biodb.h
-epoc32/include/biouids.h
 epoc32/include/bitbase.h
 epoc32/include/bitdev.h
 epoc32/include/bitdev.inl
@@ -324,34 +365,18 @@
 epoc32/include/bldregional.hrh
 epoc32/include/bldvariant.hrh
 epoc32/include/bluetooth/eirdatacodec.h
-epoc32/include/bluetooth/hci/aclpacketconsts.h
-epoc32/include/bluetooth/hci/basebandpacketconsts.h
-epoc32/include/bluetooth/hci/hciconsts.h
 epoc32/include/bluetooth/hci/hcierrors.h
-epoc32/include/bluetooth/hci/hciframe.h
-epoc32/include/bluetooth/hci/hciopcodes.h
-epoc32/include/bluetooth/hci/hcitypes.h
-epoc32/include/bluetooth/hci/hctlchannelobserver.h
-epoc32/include/bluetooth/logger.h
-epoc32/include/bmpancli.h
-epoc32/include/bmpanconsts.h
-epoc32/include/bmpansrv.h
-epoc32/include/bsp.h
-epoc32/include/bsp.inl
 epoc32/include/bsul/bsul.h
 epoc32/include/bsul/ccacheddriveinfo.h
 epoc32/include/bt_sock.h
 epoc32/include/bt_subscribe.h
 epoc32/include/bt_subscribe_keybase.h
 epoc32/include/btbasebandpolicy.h
-epoc32/include/btcmtm.h
 epoc32/include/btdefcommport.h
 epoc32/include/btdevice.h
 epoc32/include/btextnotifiers.h
 epoc32/include/btextnotifiersconsts.h
-epoc32/include/btheader.h
 epoc32/include/btmanclient.h
-epoc32/include/btmsgtypeuid.h
 epoc32/include/btsdp.h
 epoc32/include/btsecurity.h
 epoc32/include/btsockaddr.h
@@ -360,203 +385,56 @@
 epoc32/include/bttypes.h
 epoc32/include/c32comm.h
 epoc32/include/c32comm.inl
-epoc32/include/cacheman.h
 epoc32/include/caf/agent.h
-epoc32/include/caf/agentfactory.h
-epoc32/include/caf/agentinterface.h
-epoc32/include/caf/attribute.h
 epoc32/include/caf/attributeset.h
-epoc32/include/caf/bitset.h
 epoc32/include/caf/caf.h
 epoc32/include/caf/caferr.h
-epoc32/include/caf/cafmimeheader.h
 epoc32/include/caf/cafpanic.h
 epoc32/include/caf/caftypes.h
 epoc32/include/caf/content.h
 epoc32/include/caf/data.h
 epoc32/include/caf/dirstreamable.h
 epoc32/include/caf/embeddedobject.h
-epoc32/include/caf/f32agentui.h
-epoc32/include/caf/importfile.h
-epoc32/include/caf/manager.h
 epoc32/include/caf/metadata.h
 epoc32/include/caf/metadataarray.h
-epoc32/include/caf/rightsinfo.h
-epoc32/include/caf/rightsmanager.h
 epoc32/include/caf/streamableptrarray.h
 epoc32/include/caf/streamableptrarray.inl
 epoc32/include/caf/stringattributeset.h
-epoc32/include/caf/supplier.h
-epoc32/include/caf/supplieroutputfile.h
 epoc32/include/caf/virtualpath.h
 epoc32/include/caf/virtualpathptr.h
-epoc32/include/calalarm.h
-epoc32/include/calcalendarinfo.h
-epoc32/include/calcalendariterator.h
-epoc32/include/calcategory.h
-epoc32/include/calcategorymanager.h
-epoc32/include/calchangecallback.h
-epoc32/include/calcommon.h
-epoc32/include/calcontent.h
-epoc32/include/caldataexchange.h
-epoc32/include/caldataformat.h
-epoc32/include/calendarconverter.h
-epoc32/include/calentry.h
-epoc32/include/calentryview.h
-epoc32/include/calfilechangenotification.h
-epoc32/include/calinstance.h
-epoc32/include/calinstanceview.h
-epoc32/include/calinterimapipanic.h
-epoc32/include/caliterator.h
-epoc32/include/calnotification.h
-epoc32/include/calprogresscallback.h
-epoc32/include/calrrule.h
-epoc32/include/calsession.h
-epoc32/include/caltime.h
-epoc32/include/caluser.h
-epoc32/include/cauthentication.h
-epoc32/include/cbioasyncwaiter.h
-epoc32/include/cbnfnode.h
-epoc32/include/cbnfparser.h
 epoc32/include/ccertattributefilter.h
 epoc32/include/cctcertinfo.h
 epoc32/include/cdbcols.h
 epoc32/include/cdblen.h
-epoc32/include/cdbover.h
-epoc32/include/cdbover.inl
 epoc32/include/cdbpreftable.h
-epoc32/include/cdbstore.h
-epoc32/include/cdbstore.inl
 epoc32/include/cdbtemp.h
 epoc32/include/cdmasmsaddr.h
-epoc32/include/cdsb.h
-epoc32/include/cdtdmodel.h
-epoc32/include/cemailaccounts.h
 epoc32/include/centralrepository.h
 epoc32/include/certificateapps.h
-epoc32/include/cfragmentedstring.h
 epoc32/include/charactersetconverter.h
 epoc32/include/charactersetconverter.inl
 epoc32/include/charconv.h
-epoc32/include/chttpformencoder.h
-epoc32/include/chttpresponse.h
-epoc32/include/cimattachmentwaiter.h
-epoc32/include/cimmobilitypolicyplugin.inl
-epoc32/include/cimplainbodytext.h
 epoc32/include/cinidata.h
-epoc32/include/clock.h
-epoc32/include/cmarkedstack.h
-epoc32/include/cmarkedstack.inl
-epoc32/include/cmmsaccounts.h
-epoc32/include/cmmssettings.h
-epoc32/include/cmsvattachment.h
-epoc32/include/cmsvmimeheaders.h
-epoc32/include/cmsvplainbodytext.h
-epoc32/include/cmsvrecipientlist.h
-epoc32/include/cmsvtechnologytypedefaultmtmsettings.h
-epoc32/include/cnftool.rh
-epoc32/include/cnode.h
-epoc32/include/cnode.inl
-epoc32/include/cnodeleteattribute.h
-epoc32/include/cntdb.h
-epoc32/include/cntdbobs.h
-epoc32/include/cntdef.h
 epoc32/include/cntdef.hrh
-epoc32/include/cntfield.h
-epoc32/include/cntfilt.h
-epoc32/include/cntfldst.h
-epoc32/include/cntitem.h
-epoc32/include/cntmodel.rh
-epoc32/include/cntsync.h
-epoc32/include/cntvcard.h
-epoc32/include/cntview.h
-epoc32/include/cntviewbase.h
-epoc32/include/cntviewfindconfig.h
-epoc32/include/cntviewfindconfig.inl
-epoc32/include/cntviewsortplugin.h
-epoc32/include/cobexsendoperation.h
-epoc32/include/coeaui.h
-epoc32/include/coeccntx.h
-epoc32/include/coecntrl.h
-epoc32/include/coecntss.h
-epoc32/include/coecobs.h
-epoc32/include/coecoloruse.h
-epoc32/include/coecontrolarray.h
-epoc32/include/coedef.h
-epoc32/include/coeerror.h
-epoc32/include/coefepff.h
-epoc32/include/coefont.h
-epoc32/include/coefontprovider.h
-epoc32/include/coehelp.h
-epoc32/include/coeinput.h
-epoc32/include/coelayoutman.h
-epoc32/include/coemain.h
-epoc32/include/coemain.inl
-epoc32/include/coemop.h
-epoc32/include/coesndpy.h
-epoc32/include/coetextdrawer.h
-epoc32/include/coeutils.h
 epoc32/include/coever.h
-epoc32/include/coeview.h
-epoc32/include/collate.h
 epoc32/include/commdb.h
-epoc32/include/commdb.inl
 epoc32/include/commdbconnpref.h
-epoc32/include/commdbconnpref.inl
 epoc32/include/commonphoneparser.h
-epoc32/include/comms-infras/api_ext_list.h
-epoc32/include/comms-infras/api_ext_msg.h
-epoc32/include/comms-infras/commsbuf.inl
-epoc32/include/comms-infras/commsbufchain.inl
-epoc32/include/comms-infras/commsbufiter.inl
-epoc32/include/comms-infras/commsbufpanic.h
-epoc32/include/comms-infras/commsbufpond.inl
-epoc32/include/comms-infras/commsbufpondop.inl
-epoc32/include/comms-infras/commsbufq.inl
-epoc32/include/comms-infras/commsbufskern.inl
+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/comms-infras/esock_params.inl
-epoc32/include/comms-infras/esock_params_internal.inl
-epoc32/include/comms-infras/esockdebugmessages.h
-epoc32/include/comms-infras/mbuf.inl
-epoc32/include/comms-infras/mbufchain.inl
-epoc32/include/comms-infras/mbufpktq.inl
-epoc32/include/comms-infras/mbufq.inl
-epoc32/include/comms-infras/metabuffer.h
-epoc32/include/comms-infras/metacontainer.h
-epoc32/include/comms-infras/metacontainer.inl
-epoc32/include/comms-infras/metadata.inl
-epoc32/include/comms-infras/metatype.h
-epoc32/include/comms-infras/metatypevariablelen.h
-epoc32/include/comms-infras/mobilitymessagesecom.inl
-epoc32/include/comms-infras/netmessages.h
-epoc32/include/comms-infras/netupsproperties.h
-epoc32/include/comms-infras/ss_refcountowner.h
-epoc32/include/comms-infras/ss_roles.inl
-epoc32/include/comms-infras/trbuf.h
-epoc32/include/commsdat.h
-epoc32/include/commsdattypesv1_1.h
-epoc32/include/commsdatutils.h
-epoc32/include/conarc.h
-epoc32/include/concnf.h
 epoc32/include/coneresloader.h
-epoc32/include/conlist.h
 epoc32/include/connect/abclient.h
 epoc32/include/connect/sbdefs.h
 epoc32/include/connectprog.h
 epoc32/include/connpref.h
-epoc32/include/conplugin.rh
-epoc32/include/consolealarmalertservermain.h
 epoc32/include/convdata.h
 epoc32/include/convgeneratedcpp.h
 epoc32/include/convnames.h
 epoc32/include/convutils.h
-epoc32/include/copydatafile.h
-epoc32/include/crulemarkedstack.h
-epoc32/include/crulemarkedstack.inl
 epoc32/include/cryptopanic.h
 epoc32/include/cryptospi/cryptobaseapi.h
 epoc32/include/cryptospi/cryptocharacteristics.h
@@ -575,19 +453,10 @@
 epoc32/include/cs_subconparams.h
 epoc32/include/cs_subconparams.inl
 epoc32/include/csch_cli.h
-epoc32/include/csendasaccounts.h
-epoc32/include/csendaseditutils.inl
-epoc32/include/csendasmessagetypes.h
 epoc32/include/cshelp/conset.hlp.hrh
 epoc32/include/cshelp/div.hlp.hrh
 epoc32/include/cshelp/find.hlp.hrh
 epoc32/include/cshelp/phob.hlp.hrh
-epoc32/include/csmsaccount.h
-epoc32/include/csmsclass0base.h
-epoc32/include/csmsemailfields.h
-epoc32/include/csmsgetdetdescinterface.inl
-epoc32/include/cstack.h
-epoc32/include/cstack.inl
 epoc32/include/csy.rh
 epoc32/include/ct.h
 epoc32/include/ct/ccttokentype.h
@@ -607,19 +476,12 @@
 epoc32/include/ct/tcttokentypeattribute.h
 epoc32/include/ctsy/tflogger.h
 epoc32/include/customcommandtypes.h
-epoc32/include/d32camerasc.inl
-epoc32/include/d32comm.h
-epoc32/include/d32comm.inl
 epoc32/include/d32dbms.h
 epoc32/include/d32dbms.inl
-epoc32/include/d32locd.h
-epoc32/include/d32locd.inl
-epoc32/include/d32resmanus.inl
 epoc32/include/data_caging_path_literals.hrh
 epoc32/include/data_caging_paths.hrh
 epoc32/include/data_caging_paths_for_iby.hrh
 epoc32/include/data_caging_paths_strings.hrh
-epoc32/include/datastor.h
 epoc32/include/defaultcaps.hrh
 epoc32/include/delimitedparser16.h
 epoc32/include/delimitedparser8.h
@@ -636,27 +498,15 @@
 epoc32/include/displaymode.h
 epoc32/include/distanceattenuationbase.h
 epoc32/include/distanceattenuationdata.h
-epoc32/include/dns_qry.h
-epoc32/include/dns_qry.inl
 epoc32/include/dopplerbase.h
 epoc32/include/dopplerdata.h
 epoc32/include/driveinfo.h
 epoc32/include/driveinfo.inl
 epoc32/include/drivers/camerasc.inl
 epoc32/include/drivers/dma.inl
-epoc32/include/drivers/iic.inl
-epoc32/include/drivers/iic_channel.inl
 epoc32/include/drivers/iic_transaction.inl
-epoc32/include/drivers/pbus.inl
-epoc32/include/drivers/pccard.inl
-epoc32/include/drivers/resourcecontrol.inl
-epoc32/include/drivers/sdio/sdiopsu.inl
 epoc32/include/drmaudiosampleplayer.h
-epoc32/include/dscitem.h
 epoc32/include/dscstorecommondefs.hrh
-epoc32/include/dscstoredefs.h
-epoc32/include/dtdnode.h
-epoc32/include/dtdnode.inl
 epoc32/include/e32atomics.h
 epoc32/include/e32base.h
 epoc32/include/e32base.inl
@@ -671,32 +521,22 @@
 epoc32/include/e32des8.h
 epoc32/include/e32err.h
 epoc32/include/e32event.h
-epoc32/include/e32hal.h
 epoc32/include/e32hashtab.h
 epoc32/include/e32keys.h
 epoc32/include/e32kpan.h
-epoc32/include/e32ktran.h
 epoc32/include/e32lang.h
 epoc32/include/e32ldr.h
-epoc32/include/e32lmsg.h
 epoc32/include/e32math.h
 epoc32/include/e32math.inl
 epoc32/include/e32modes.h
 epoc32/include/e32msgqueue.h
 epoc32/include/e32msgqueue.inl
-epoc32/include/e32notif.h
 epoc32/include/e32panic.h
-epoc32/include/e32power.h
 epoc32/include/e32property.h
 epoc32/include/e32reg.h
-epoc32/include/e32rom.h
 epoc32/include/e32std.h
 epoc32/include/e32std.inl
-epoc32/include/e32svr.h
 epoc32/include/e32test.h
-epoc32/include/e32twin.h
-epoc32/include/e32uid.h
-epoc32/include/e32ver.h
 epoc32/include/ecam.h
 epoc32/include/ecam/cameraoverlay.h
 epoc32/include/ecam/ecamcommonuids.hrh
@@ -723,63 +563,17 @@
 epoc32/include/ecom/registryinfoconst.hrh
 epoc32/include/ecom/registryinfov2.rh
 epoc32/include/ecom/resolver.h
-epoc32/include/ecom/test_bed/componentinfo.inl
-epoc32/include/ecom/test_bed/transition.inl
-epoc32/include/ecom/test_bed/unittest.inl
-epoc32/include/ecom/test_bed/unittestinfo.inl
 epoc32/include/editorundo.h
 epoc32/include/egl/egl.h
 epoc32/include/egl/eglext.h
 epoc32/include/egl/egltypes.h
 epoc32/include/eglosnativewindowtype.h
-epoc32/include/eikamnt.h
-epoc32/include/eikapp.h
-epoc32/include/eikappui.h
-epoc32/include/eikaufty.h
-epoc32/include/eikbhelp.h
-epoc32/include/eikbusymsgwin.h
 epoc32/include/eikcdlg.rsg
-epoc32/include/eikcmobs.h
 epoc32/include/eikcoctl.rsg
 epoc32/include/eikcolor.hrh
 epoc32/include/eikcore.rsg
 epoc32/include/eikctl.rsg
-epoc32/include/eikcycledef.h
-epoc32/include/eikdebug.h
-epoc32/include/eikdef.h
-epoc32/include/eikdgfty.h
-epoc32/include/eikdll.h
-epoc32/include/eikdoc.h
-epoc32/include/eikembal.h
-epoc32/include/eikenv.h
-epoc32/include/eikenv.inl
-epoc32/include/eikfctry.h
-epoc32/include/eikfutil.h
-epoc32/include/eikinfomsgwin.h
-epoc32/include/eikirfty.h
-epoc32/include/eiklibry.h
-epoc32/include/eikmobs.h
-epoc32/include/eikmsg.h
-epoc32/include/eiknotapi.h
-epoc32/include/eikpanic.h
-epoc32/include/eikpicturefactory.h
-epoc32/include/eikproc.h
-epoc32/include/eikrutil.h
-epoc32/include/eikserverapp.h
-epoc32/include/eiksfont.h
-epoc32/include/eiksrv.h
-epoc32/include/eiksrv.pan
-epoc32/include/eiksrvc.h
-epoc32/include/eiksrvs.h
-epoc32/include/eikstart.h
-epoc32/include/eiksvdef.h
-epoc32/include/eikunder.h
-epoc32/include/eikvcurs.h
-epoc32/include/elements/cftransport.inl
 epoc32/include/elements/cftransportmacro.h
-epoc32/include/elements/cftransportmsg.inl
-epoc32/include/elements/sd_roles.inl
-epoc32/include/elements/sd_std.inl
 epoc32/include/emanaged.h
 epoc32/include/emisc.h
 epoc32/include/emsinformationelement.h
@@ -789,40 +583,23 @@
 epoc32/include/environmentalreverbutilitydata.h
 epoc32/include/epos_privacynotifier.hrh
 epoc32/include/errorres.rsg
-epoc32/include/es_commsbuf.h
 epoc32/include/es_enum.h
-epoc32/include/es_enum.inl
-epoc32/include/es_enum_internal.inl
-epoc32/include/es_enum_partner.inl
-epoc32/include/es_mbuf.h
 epoc32/include/es_panic.h
-epoc32/include/es_prot.h
-epoc32/include/es_prot.inl
 epoc32/include/es_sock.h
-epoc32/include/es_sock.inl
-epoc32/include/es_sock_internal.inl
 epoc32/include/es_ver.h
 epoc32/include/es_wsms.h
 epoc32/include/es_wsms.inl
 epoc32/include/escapeutils.h
-epoc32/include/estatus.h
 epoc32/include/estlib.h
 epoc32/include/estring.h
-epoc32/include/estw32.h
 epoc32/include/et_clsvr.h
-epoc32/include/etbuffer.h
 epoc32/include/etel.inl
 epoc32/include/etel3rdparty.h
-epoc32/include/etelext.h
-epoc32/include/etelpckt.h
 epoc32/include/etelpckt.inl
-epoc32/include/etelqos.h
-epoc32/include/etelutils.h
 epoc32/include/etslotnum.h
 epoc32/include/eui_addr.h
 epoc32/include/euserhl.h
 epoc32/include/ewsd.h
-epoc32/include/exbuf.h
 epoc32/include/exifmodify.h
 epoc32/include/exifread.h
 epoc32/include/exiftag.h
@@ -838,52 +615,30 @@
 epoc32/include/ezlib.h
 epoc32/include/ezliberrorcodes.h
 epoc32/include/ezstream.h
-epoc32/include/f32dbg.h
 epoc32/include/f32file.h
 epoc32/include/f32file.inl
 epoc32/include/f32file64.h
 epoc32/include/f32file64.inl
-epoc32/include/f32fsys.h
-epoc32/include/f32fsys.inl
-epoc32/include/f32image.h
-epoc32/include/f32plugin.inl
-epoc32/include/f32tracedef.h
-epoc32/include/f32ver.h
 epoc32/include/faxdefn.h
 epoc32/include/fbs.h
-epoc32/include/fbsmessage.h
 epoc32/include/featdiscovery.h
 epoc32/include/featureinfo.h
 epoc32/include/features.hrh
 epoc32/include/featureuids.h
-epoc32/include/fepbase.h
-epoc32/include/fepbconfig.h
-epoc32/include/fepbutils.h
-epoc32/include/fepitfr.h
-epoc32/include/fepplugin.h
-epoc32/include/fepplugin.inl
 epoc32/include/filesystem_fat.h
 epoc32/include/finditemengine.h
 epoc32/include/fldbase.h
 epoc32/include/fldbltin.h
-epoc32/include/flddef.h
 epoc32/include/fldinfo.h
-epoc32/include/fldset.h
-epoc32/include/flogger.h
-epoc32/include/flogger.inl
 epoc32/include/fntstore.h
 epoc32/include/frmconst.h
-epoc32/include/frmcurs.h
 epoc32/include/frmframe.h
 epoc32/include/frmlaydt.h
-epoc32/include/frmpage.h
 epoc32/include/frmparam.h
 epoc32/include/frmprint.h
 epoc32/include/frmtlay.h
 epoc32/include/frmtview.h
 epoc32/include/frmvis.h
-epoc32/include/ftpprot.h
-epoc32/include/ftpsess.h
 epoc32/include/gb2312.h
 epoc32/include/gbk.h
 epoc32/include/gcc_mingw/gcc_mingw_3_4_2.h
@@ -891,10 +646,6 @@
 epoc32/include/gdi.h
 epoc32/include/gdi.inl
 epoc32/include/gdr.h
-epoc32/include/gfp.h
-epoc32/include/gfxtranseffect/gfxtransclient.h
-epoc32/include/gfxtranseffect/gfxtransdatatype.h
-epoc32/include/gfxtranseffect/gfxtranseffect.h
 epoc32/include/gifscaler.h
 epoc32/include/gles/gl.h
 epoc32/include/gles/glext.h
@@ -906,27 +657,9 @@
 epoc32/include/gles2/gl2platform.h
 epoc32/include/gmxmlparser.h
 epoc32/include/gprsprog.h
-epoc32/include/graphics/blendingalgorithms.h
-epoc32/include/graphics/blendingalgorithms.inl
-epoc32/include/graphics/compositionsurfaceupdate.h
 epoc32/include/graphics/eglsynchelper.h
-epoc32/include/graphics/extensioncontainer.h
-epoc32/include/graphics/lookuptable.h
 epoc32/include/graphics/streammap.h
-epoc32/include/graphics/surfaceconfiguration.inl
-epoc32/include/graphics/surfaceupdateclient.h
-epoc32/include/graphics/wsdisplaycontrol.h
-epoc32/include/graphics/wsdisplaymapping.h
-epoc32/include/graphics/wsdisplaypolicy.h
-epoc32/include/graphics/wsscreendeviceutils.h
-epoc32/include/graphics/wstestscreencapture.h
 epoc32/include/graphicsaccelerator.h
-epoc32/include/grdcells.h
-epoc32/include/grddef.h
-epoc32/include/grdprint.h
-epoc32/include/grdprint.inl
-epoc32/include/grdstd.h
-epoc32/include/grdstd.inl
 epoc32/include/gsmubuf.h
 epoc32/include/gsmuelem.h
 epoc32/include/gsmuelem.inl
@@ -945,75 +678,12 @@
 epoc32/include/gsmuset.inl
 epoc32/include/gsmustor.h
 epoc32/include/gsmustor.inl
-epoc32/include/gulalign.h
-epoc32/include/gulbordr.h
-epoc32/include/gulcolor.h
-epoc32/include/guldef.h
-epoc32/include/gulfont.h
 epoc32/include/gulfont.hrh
 epoc32/include/gulftflg.hrh
-epoc32/include/gulgcmap.h
-epoc32/include/gulicon.h
-epoc32/include/gulpanic.h
-epoc32/include/gulsprite.h
-epoc32/include/gulutil.h
 epoc32/include/hal.h
 epoc32/include/hal_data.h
 epoc32/include/hash.h
-epoc32/include/hlpconstants.h
-epoc32/include/hlplch.h
-epoc32/include/hlpmodel.h
-epoc32/include/hlpzoom.h
-epoc32/include/hsdataobserver.h
-epoc32/include/hsexception.h
-epoc32/include/hswidget.h
-epoc32/include/hswidgetpublisher.h
-epoc32/include/http.h
-epoc32/include/http/cauthenticationfilterinterface.h
-epoc32/include/http/cecomfilter.h
-epoc32/include/http/framework/cheadercodec.h
-epoc32/include/http/framework/cprotocolhandler.h
-epoc32/include/http/framework/cprottransaction.h
-epoc32/include/http/framework/crxdata.h
-epoc32/include/http/framework/csecuritypolicy.h
-epoc32/include/http/framework/csecuritypolicy.inl
-epoc32/include/http/framework/ctxdata.h
-epoc32/include/http/framework/mrxdataobserver.h
-epoc32/include/http/framework/rheaderfield.h
-epoc32/include/http/mhttpauthenticationcallback.h
-epoc32/include/http/mhttpdataoptimiser.h
-epoc32/include/http/mhttpdatasupplier.h
-epoc32/include/http/mhttpfilter.h
-epoc32/include/http/mhttpfilterbase.h
-epoc32/include/http/mhttpfiltercreationcallback.h
-epoc32/include/http/mhttpsessioneventcallback.h
-epoc32/include/http/mhttptransactioncallback.h
-epoc32/include/http/rhttpconnectioninfo.h
-epoc32/include/http/rhttpfiltercollection.h
-epoc32/include/http/rhttpheaders.h
-epoc32/include/http/rhttpmessage.h
-epoc32/include/http/rhttppropertyset.h
-epoc32/include/http/rhttprequest.h
-epoc32/include/http/rhttpresponse.h
-epoc32/include/http/rhttpsession.h
-epoc32/include/http/rhttptransaction.h
-epoc32/include/http/rhttptransactionpropertyset.h
-epoc32/include/http/tfilterconfigurationiter.h
-epoc32/include/http/tfilterinformation.h
-epoc32/include/http/thttpevent.h
-epoc32/include/http/thttpevent.inl
-epoc32/include/http/thttpfilterhandle.h
-epoc32/include/http/thttpfilteriterator.h
-epoc32/include/http/thttpfilterregistration.h
-epoc32/include/http/thttphdrfielditer.h
-epoc32/include/http/thttphdrval.h
-epoc32/include/httperr.h
-epoc32/include/httpstd.h
 epoc32/include/httpstringconstants.h
-epoc32/include/hwrm/hwrmpluginservice.inl
-epoc32/include/hwrm/hwrmpowerstateplugin.inl
-epoc32/include/hwrm/hwrmtargetmodifierplugin.inl
-epoc32/include/hwrm/hwrmuipluginservice.inl
 epoc32/include/hwrmhaptics.h
 epoc32/include/hwrmhapticsactuatorobserver.h
 epoc32/include/hwrmhapticsobserver.h
@@ -1023,7 +693,6 @@
 epoc32/include/hwrmpowerstatesdkpskeys.h
 epoc32/include/hwrmvibra.h
 epoc32/include/hwrmvibrasdkcrkeys.h
-epoc32/include/iapprefs.h
 epoc32/include/icl/exifimagedisplayext.h
 epoc32/include/icl/icl_propertyuids.h
 epoc32/include/icl/icl_propertyuids.hrh
@@ -1044,11 +713,9 @@
 epoc32/include/icl/imagetransformpaniccodes.h
 epoc32/include/icl/imagetransformplugin.h
 epoc32/include/icl/imagetransformpluginext.h
-epoc32/include/icl/jpegyuvdecoder.h
 epoc32/include/icl/orientationtransformextension.h
 epoc32/include/icl/overlaytransformextension.h
 epoc32/include/icl/squeezetransformextension.h
-epoc32/include/iclanimationdataprovider.h
 epoc32/include/iclexif.h
 epoc32/include/iclexifimageframe.h
 epoc32/include/icmp6_hdr.h
@@ -1068,59 +735,29 @@
 epoc32/include/imageprocessor/imageprocessorpreview.h
 epoc32/include/imageprocessor/imageprocessorprogressinfo.h
 epoc32/include/imagetransform.h
-epoc32/include/imapcmds.h
-epoc32/include/imapconnectionobserver.h
-epoc32/include/imapset.h
-epoc32/include/imcmmain.h
-epoc32/include/imcmutil.h
-epoc32/include/imcvcodc.h
-epoc32/include/imcvcodc.inl
-epoc32/include/imcvdata.h
-epoc32/include/imcvrecv.inl
-epoc32/include/imcvsend.inl
-epoc32/include/imcvtext.h
-epoc32/include/impcmtm.h
-epoc32/include/imsk.h
-epoc32/include/imutdll.h
-epoc32/include/in6_if.h
-epoc32/include/in6_opt.h
 epoc32/include/in_chk.h
 epoc32/include/in_hdr.h
-epoc32/include/in_iface.h
 epoc32/include/in_pkt.h
 epoc32/include/in_sock.h
-epoc32/include/inbuf.h
+epoc32/include/in6_if.h
+epoc32/include/in6_opt.h
 epoc32/include/inet6err.h
 epoc32/include/inetprottextutils.h
-epoc32/include/ineturi.h
-epoc32/include/ineturilist.h
-epoc32/include/ineturilistdef.h
-epoc32/include/ip4_hdr.h
-epoc32/include/ip6_hdr.h
 epoc32/include/ip_subconparams.h
 epoc32/include/ip_subconparams.inl
-epoc32/include/ipaddr.h
+epoc32/include/ip4_hdr.h
+epoc32/include/ip6_hdr.h
 epoc32/include/ir_sock.h
-epoc32/include/ircmtm.h
-epoc32/include/irheader.h
-epoc32/include/irmsgtypeuid.h
-epoc32/include/irmtmcmds.h
-epoc32/include/irs.h
 epoc32/include/isbaseof.h
 epoc32/include/issame.h
 epoc32/include/jisx0201.h
 epoc32/include/jisx0208.h
 epoc32/include/jisx0212.h
-epoc32/include/kernel/arm/vfpsupport.h
 epoc32/include/kernel/hal_int.h
 epoc32/include/khr/khrplatform.h
 epoc32/include/khronos_types.h
 epoc32/include/lbs.h
 epoc32/include/lbs.inl
-epoc32/include/lbs/lbsadmin.inl
-epoc32/include/lbs/lbsassistancedatabase.inl
-epoc32/include/lbs/lbsassistancedatabuilderset.inl
-epoc32/include/lbs/lbsassistancedatasourcemodule.inl
 epoc32/include/lbs/lbsipc.hrh
 epoc32/include/lbsareainfo.h
 epoc32/include/lbsclasstypes.h
@@ -1189,7 +826,6 @@
 epoc32/include/libc/sys/times.h
 epoc32/include/libc/sys/unistd.h
 epoc32/include/libc/sys/wait.h
-epoc32/include/liblogger.h
 epoc32/include/linebreak.h
 epoc32/include/linkedfonts.h
 epoc32/include/listenerdopplerbase.h
@@ -1201,8 +837,6 @@
 epoc32/include/logcli.h
 epoc32/include/logcli.inl
 epoc32/include/logclientchangeobserver.h
-epoc32/include/logcntdef.h
-epoc32/include/logdef.h
 epoc32/include/logeng.h
 epoc32/include/logview.h
 epoc32/include/logview.inl
@@ -1214,26 +848,16 @@
 epoc32/include/logwrapconst.h
 epoc32/include/loudnessbase.h
 epoc32/include/loudnessdata.h
-epoc32/include/lst.h
 epoc32/include/mateventcompleteobserver.h
 epoc32/include/maudioeffectobserver.h
 epoc32/include/maudioequalizerobserver.h
 epoc32/include/mbassboostobserver.h
 epoc32/include/mbmstypes.h
 epoc32/include/mcertstore.h
-epoc32/include/mclient.h
 epoc32/include/mctcertapps.h
-epoc32/include/mctcertstore.h
-epoc32/include/mctkeystore.inl
-epoc32/include/mctwritablecertstore.h
-epoc32/include/mctwritablecertstore.inl
 epoc32/include/mcustomcommand.h
 epoc32/include/mcustominterface.h
-epoc32/include/mda/client/base.h
-epoc32/include/mda/client/controller.h
-epoc32/include/mda/client/port.h
 epoc32/include/mda/client/utility.h
-epoc32/include/mda/client/video.inl
 epoc32/include/mda/common/audio.h
 epoc32/include/mda/common/audio.hrh
 epoc32/include/mda/common/audiostream.hrh
@@ -1251,31 +875,12 @@
 epoc32/include/mdaaudiotoneplayer.h
 epoc32/include/mdaframeinfo.h
 epoc32/include/mdaimageconverter.h
-epoc32/include/mdataproviderobserver.h
-epoc32/include/mdf/mdfprocessingunit.inl
-epoc32/include/mdf/mdfpuloader.inl
 epoc32/include/mdistanceattenuationobserver.h
 epoc32/include/mdopplerobserver.h
-epoc32/include/mdptx.h
 epoc32/include/medobsrv.h
-epoc32/include/memmodel/emul/platform.h
-epoc32/include/memmodel/epoc/mmubase/kblockmap.h
-epoc32/include/mentact.h
 epoc32/include/menvironmentalreverbobserver.h
 epoc32/include/metadatabase.h
-epoc32/include/metafile.h
-epoc32/include/mframeworksp.h
 epoc32/include/midiclientutility.h
-epoc32/include/miut_err.h
-epoc32/include/miutatch.h
-epoc32/include/miutconv.h
-epoc32/include/miutdef.h
-epoc32/include/miuthdr.h
-epoc32/include/miuthdr.inl
-epoc32/include/miutlog.h
-epoc32/include/miutmsg.h
-epoc32/include/miutpars.h
-epoc32/include/miutset.h
 epoc32/include/miutstd.hrh
 epoc32/include/mlistenerdopplerobserver.h
 epoc32/include/mlistenerlocationobserver.h
@@ -1291,7 +896,6 @@
 epoc32/include/mmf/common/mmfcontrollerframework.h
 epoc32/include/mmf/common/mmfcontrollerframeworkbase.h
 epoc32/include/mmf/common/mmfcontrollerpluginresolver.h
-epoc32/include/mmf/common/mmfdrmcustomcommands.h
 epoc32/include/mmf/common/mmfdurationinfocustomcommands.h
 epoc32/include/mmf/common/mmffourcc.h
 epoc32/include/mmf/common/mmfipc.h
@@ -1323,6 +927,7 @@
 epoc32/include/mmf/devvideo/devvideoplay.inl
 epoc32/include/mmf/devvideo/devvideoplugininterfaceuids.hrh
 epoc32/include/mmf/devvideo/devvideorecord.h
+epoc32/include/mmf/devvideo/devvideorecord.h
 epoc32/include/mmf/devvideo/devvideorecord.inl
 epoc32/include/mmf/devvideo/h263.h
 epoc32/include/mmf/devvideo/mpeg4visual.h
@@ -1353,18 +958,11 @@
 epoc32/include/mmf/server/mmfformat.inl
 epoc32/include/mmf/server/mmfhwdevice.inl
 epoc32/include/mmf/server/mmfsubthreadbase.h
-epoc32/include/mmf/server/mmfswcodecwrapper.h
 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/mmfclntutility.h
-epoc32/include/mmmssettingsobserver.h
-epoc32/include/mmssettingsproxybase.inl
-epoc32/include/mmsvattachmentmanager.h
-epoc32/include/mmsvattachmentmanagersync.h
-epoc32/include/mmsvstoremanager.h
-epoc32/include/mobexnotify.h
 epoc32/include/morientationobserver.h
 epoc32/include/mparser.h
 epoc32/include/mroomlevelobserver.h
@@ -1372,53 +970,13 @@
 epoc32/include/msourcelocationobserver.h
 epoc32/include/msourceorientationobserver.h
 epoc32/include/mstereowideningobserver.h
-epoc32/include/msvapi.h
-epoc32/include/msvapi.inl
-epoc32/include/msvarray.h
-epoc32/include/msventry.h
-epoc32/include/msventry.inl
-epoc32/include/msventryscheduledata.h
-epoc32/include/msvfind.h
-epoc32/include/msvfind.inl
-epoc32/include/msvftext.h
-epoc32/include/msvftext.inl
-epoc32/include/msvids.h
-epoc32/include/msvipc.h
-epoc32/include/msvipc.inl
-epoc32/include/msvoffpeaktime.h
-epoc32/include/msvrcpt.h
-epoc32/include/msvrcpt.inl
-epoc32/include/msvreg.h
-epoc32/include/msvreg.inl
-epoc32/include/msvruids.h
-epoc32/include/msvscheduledentry.h
-epoc32/include/msvscheduledentry.inl
-epoc32/include/msvschedulepackage.h
-epoc32/include/msvschedulesend.h
-epoc32/include/msvschedulesend.inl
-epoc32/include/msvschedulesettings.h
-epoc32/include/msvsenderroraction.h
-epoc32/include/msvstd.h
 epoc32/include/msvstd.hrh
-epoc32/include/msvstd.inl
-epoc32/include/msvstore.h
-epoc32/include/msvsysagentaction.h
-epoc32/include/msvuids.h
-epoc32/include/msvutils.h
-epoc32/include/mtclbase.h
-epoc32/include/mtclreg.h
-epoc32/include/mtmdef.h
 epoc32/include/mtmdef.hrh
-epoc32/include/mtmuibas.h
-epoc32/include/mtmuids.h
-epoc32/include/mtp/rptpipframework.h
-epoc32/include/mtsr.h
 epoc32/include/mtud.hrh
-epoc32/include/mtud.rh
-epoc32/include/mtudcbas.h
-epoc32/include/mtudreg.h
-epoc32/include/mtuireg.h
-epoc32/include/mturutils.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/activefavouritesdbnotifier.h
 epoc32/include/mw/aiwcommon.h
@@ -1604,22 +1162,66 @@
 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
+epoc32/include/mw/animationdataprovider.h
+epoc32/include/mw/animationevents.h
+epoc32/include/mw/animationframe.h
+epoc32/include/mw/animationgroup.h
+epoc32/include/mw/animationmixins.h
+epoc32/include/mw/animationticker.h
+epoc32/include/mw/animationtls.h
+epoc32/include/mw/animator.h
+epoc32/include/mw/ansicomp.h
+epoc32/include/mw/apaapp.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/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/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/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/asaltdefs.h
+epoc32/include/mw/ascliclientutils.h
+epoc32/include/mw/asclidefinitions.h
+epoc32/include/mw/asclisession.h
+epoc32/include/mw/asclisoundplay.h
+epoc32/include/mw/asshdalarm.h
+epoc32/include/mw/asshdbitflags.h
+epoc32/include/mw/asshddefs.h
+epoc32/include/mw/attrlut.h
 epoc32/include/mw/avkon.hrh
 epoc32/include/mw/avkon.rh
 epoc32/include/mw/avkonicons.hrh
+epoc32/include/mw/basicanimation.h
+epoc32/include/mw/bif.h
+epoc32/include/mw/biodb.h
+epoc32/include/mw/biouids.h
+epoc32/include/mw/bmpancli.h
+epoc32/include/mw/bmpanconsts.h
+epoc32/include/mw/bmpansrv.h
 epoc32/include/mw/brctldefs.h
 epoc32/include/mw/brctldialogsprovider.h
 epoc32/include/mw/brctldownloadobserver.h
@@ -1632,6 +1234,7 @@
 epoc32/include/mw/browserplugininterface.h
 epoc32/include/mw/browseruiinternalcrkeys.h
 epoc32/include/mw/browseruisdkcrkeys.h
+epoc32/include/mw/bsp.h
 epoc32/include/mw/btnotifierapi.h
 epoc32/include/mw/btserversdkcrkeys.h
 epoc32/include/mw/cakncommondialogsbase.h
@@ -1642,17 +1245,26 @@
 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/cdownloadmgruibase.h
 epoc32/include/mw/cdownloadmgruidownloadmenu.h
 epoc32/include/mw/cdownloadmgruidownloadslist.h
 epoc32/include/mw/cdownloadmgruilibregistry.h
 epoc32/include/mw/cdownloadmgruiuserinteractions.h
+epoc32/include/mw/cdtdmodel.h
 epoc32/include/mw/cecombrowserplugininterface.h
+epoc32/include/mw/cfragmentedstring.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/clock.h
 epoc32/include/mw/cmapplicationsettingsui.h
+epoc32/include/mw/cmarkedstack.h
 epoc32/include/mw/cmconnectionmethod.h
 epoc32/include/mw/cmconnectionmethod.inl
 epoc32/include/mw/cmconnectionmethoddef.h
@@ -1672,12 +1284,51 @@
 epoc32/include/mw/cmpluginvpndef.h
 epoc32/include/mw/cmpluginwlandef.h
 epoc32/include/mw/cmsettingsui.h
+epoc32/include/mw/cmsvattachment.h
+epoc32/include/mw/cmsvmimeheaders.h
+epoc32/include/mw/cmsvplainbodytext.h
+epoc32/include/mw/cmsvrecipientlist.h
+epoc32/include/mw/cmsvtechnologytypedefaultmtmsettings.h
+epoc32/include/mw/cnftool.rh
+epoc32/include/mw/cnode.h
+epoc32/include/mw/cnodeleteattribute.h
+epoc32/include/mw/coeaui.h
+epoc32/include/mw/coeccntx.h
+epoc32/include/mw/coecntrl.h
+epoc32/include/mw/coecobs.h
+epoc32/include/mw/coecoloruse.h
+epoc32/include/mw/coecontrolarray.h
+epoc32/include/mw/coedef.h
+epoc32/include/mw/coeerror.h
+epoc32/include/mw/coefepff.h
+epoc32/include/mw/coefont.h
+epoc32/include/mw/coefontprovider.h
+epoc32/include/mw/coehelp.h
+epoc32/include/mw/coeinput.h
+epoc32/include/mw/coelayoutman.h
+epoc32/include/mw/coemain.h
+epoc32/include/mw/coemain.inl
+epoc32/include/mw/coemop.h
+epoc32/include/mw/coesndpy.h
+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/conarc.h
+epoc32/include/mw/concnf.h
+epoc32/include/mw/conlist.h
+epoc32/include/mw/conplugin.rh
 epoc32/include/mw/contentlistingfactory.h
+epoc32/include/mw/copydatafile.h
 epoc32/include/mw/coreapplicationuissdkcrkeys.h
+epoc32/include/mw/crulemarkedstack.h
 epoc32/include/mw/csatelliteinfoui.h
+epoc32/include/mw/csendasaccounts.h
+epoc32/include/mw/csendasmessagetypes.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
@@ -1686,10 +1337,16 @@
 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
+epoc32/include/mw/eikamnt.h
+epoc32/include/mw/eikapp.h
+epoc32/include/mw/eikappui.h
+epoc32/include/mw/eikaufty.h
 epoc32/include/mw/eikbctrl.h
 epoc32/include/mw/eikbgfty.h
+epoc32/include/mw/eikbhelp.h
 epoc32/include/mw/eikbtgpc.h
 epoc32/include/mw/eikbtgps.h
 epoc32/include/mw/eikbtgrp.h
@@ -1703,22 +1360,31 @@
 epoc32/include/mw/eikclb.h
 epoc32/include/mw/eikclbd.h
 epoc32/include/mw/eikcmbut.h
+epoc32/include/mw/eikcmobs.h
 epoc32/include/mw/eikcoctlpanic.h
 epoc32/include/mw/eikcolib.h
 epoc32/include/mw/eikconso.h
 epoc32/include/mw/eikctgrp.h
 epoc32/include/mw/eikctlib.h
+epoc32/include/mw/eikdef.h
 epoc32/include/mw/eikdialg.pan
+epoc32/include/mw/eikdll.h
+epoc32/include/mw/eikdoc.h
 epoc32/include/mw/eikdpage.h
 epoc32/include/mw/eikdpobs.h
 epoc32/include/mw/eikedwin.h
 epoc32/include/mw/eikedwin.pan
 epoc32/include/mw/eikedwob.h
+epoc32/include/mw/eikembal.h
+epoc32/include/mw/eikenv.h
+epoc32/include/mw/eikenv.inl
+epoc32/include/mw/eikfctry.h
 epoc32/include/mw/eikfnlab.h
 epoc32/include/mw/eikform.pan
 epoc32/include/mw/eikfpne.h
 epoc32/include/mw/eikfrlb.h
 epoc32/include/mw/eikfrlbd.h
+epoc32/include/mw/eikfutil.h
 epoc32/include/mw/eikgted.h
 epoc32/include/mw/eikhfdlg.h
 epoc32/include/mw/eikhkeyc.h
@@ -1738,12 +1404,17 @@
 epoc32/include/mw/eikmfne.h
 epoc32/include/mw/eikmfne.pan
 epoc32/include/mw/eikmnbut.h
+epoc32/include/mw/eikmobs.h
 epoc32/include/mw/eikmover.h
+epoc32/include/mw/eikmsg.h
+epoc32/include/mw/eiknotapi.h
 epoc32/include/mw/eikon.hrh
 epoc32/include/mw/eikon.rh
 epoc32/include/mw/eikon.rsg
+epoc32/include/mw/eikproc.h
 epoc32/include/mw/eikprogi.h
 epoc32/include/mw/eikrted.h
+epoc32/include/mw/eikrutil.h
 epoc32/include/mw/eiksbfrm.h
 epoc32/include/mw/eiksbobs.h
 epoc32/include/mw/eikscbut.h
@@ -1753,10 +1424,13 @@
 epoc32/include/mw/eikspace.h
 epoc32/include/mw/eikspane.h
 epoc32/include/mw/eikspmod.h
+epoc32/include/mw/eikstart.h
 epoc32/include/mw/eiktbar.h
 epoc32/include/mw/eikthumb.h
 epoc32/include/mw/eiktxlbm.h
 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
@@ -1790,6 +1464,7 @@
 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
 epoc32/include/mw/favouritesdbincremental.h
@@ -1806,9 +1481,72 @@
 epoc32/include/mw/favouritessession.h
 epoc32/include/mw/favouritessession.inl
 epoc32/include/mw/favouriteswapap.h
+epoc32/include/mw/fepbase.h
+epoc32/include/mw/fepbconfig.h
+epoc32/include/mw/fepbutils.h
+epoc32/include/mw/fepplugin.h
+epoc32/include/mw/fepplugin.inl
 epoc32/include/mw/flash_ui.h
 epoc32/include/mw/fontids.hrh
+epoc32/include/mw/grdcells.h
+epoc32/include/mw/grddef.h
+epoc32/include/mw/grdprint.h
+epoc32/include/mw/grdprint.inl
+epoc32/include/mw/grdstd.h
+epoc32/include/mw/grdstd.inl
+epoc32/include/mw/gulalign.h
+epoc32/include/mw/gulbordr.h
+epoc32/include/mw/gulcolor.h
+epoc32/include/mw/guldef.h
+epoc32/include/mw/gulfont.h
+epoc32/include/mw/gulicon.h
+epoc32/include/mw/gulutil.h
+epoc32/include/mw/http.h
+epoc32/include/mw/http/cauthenticationfilterinterface.h
+epoc32/include/mw/http/cecomfilter.h
+epoc32/include/mw/http/framework/cheadercodec.h
+epoc32/include/mw/http/framework/cprotocolhandler.h
+epoc32/include/mw/http/framework/cprottransaction.h
+epoc32/include/mw/http/framework/crxdata.h
+epoc32/include/mw/http/framework/csecuritypolicy.h
+epoc32/include/mw/http/framework/csecuritypolicy.inl
+epoc32/include/mw/http/framework/ctxdata.h
+epoc32/include/mw/http/framework/mrxdataobserver.h
+epoc32/include/mw/http/framework/rheaderfield.h
+epoc32/include/mw/http/mhttpauthenticationcallback.h
+epoc32/include/mw/http/mhttpdatasupplier.h
+epoc32/include/mw/http/mhttpfilter.h
+epoc32/include/mw/http/mhttpfilterbase.h
+epoc32/include/mw/http/mhttpfiltercreationcallback.h
+epoc32/include/mw/http/mhttpsessioneventcallback.h
+epoc32/include/mw/http/mhttptransactioncallback.h
+epoc32/include/mw/http/rhttpconnectioninfo.h
+epoc32/include/mw/http/rhttpfiltercollection.h
+epoc32/include/mw/http/rhttpheaders.h
+epoc32/include/mw/http/rhttpmessage.h
+epoc32/include/mw/http/rhttppropertyset.h
+epoc32/include/mw/http/rhttprequest.h
+epoc32/include/mw/http/rhttpresponse.h
+epoc32/include/mw/http/rhttpsession.h
+epoc32/include/mw/http/rhttptransaction.h
+epoc32/include/mw/http/rhttptransactionpropertyset.h
+epoc32/include/mw/http/tfilterconfigurationiter.h
+epoc32/include/mw/http/tfilterinformation.h
+epoc32/include/mw/http/thttpevent.h
+epoc32/include/mw/http/thttpevent.inl
+epoc32/include/mw/http/thttpfilterhandle.h
+epoc32/include/mw/http/thttpfilteriterator.h
+epoc32/include/mw/http/thttpfilterregistration.h
+epoc32/include/mw/http/thttphdrfielditer.h
+epoc32/include/mw/http/thttphdrval.h
 epoc32/include/mw/httpdownloadmgrcommon.h
+epoc32/include/mw/httperr.h
+epoc32/include/mw/httpstd.h
+epoc32/include/mw/iclanimationdataprovider.h
+epoc32/include/mw/ineturi.h
+epoc32/include/mw/ineturilist.h
+epoc32/include/mw/ineturilistdef.h
+epoc32/include/mw/ipaddr.h
 epoc32/include/mw/jri.h
 epoc32/include/mw/lafpanic.h
 epoc32/include/mw/lafpublc.h
@@ -1842,6 +1580,7 @@
 epoc32/include/mw/lbttriggeringsystemsettings.h
 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
@@ -1856,12 +1595,18 @@
 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/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/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
@@ -1892,15 +1637,69 @@
 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
+epoc32/include/mw/msvfind.h
+epoc32/include/mw/msvftext.h
+epoc32/include/mw/msvids.h
+epoc32/include/mw/msvoffpeaktime.h
+epoc32/include/mw/msvrcpt.h
+epoc32/include/mw/msvreg.h
+epoc32/include/mw/msvruids.h
+epoc32/include/mw/msvscheduledentry.h
+epoc32/include/mw/msvschedulepackage.h
+epoc32/include/mw/msvschedulesend.h
+epoc32/include/mw/msvschedulesettings.h
+epoc32/include/mw/msvsenderroraction.h
+epoc32/include/mw/msvstd.h
+epoc32/include/mw/msvstore.h
+epoc32/include/mw/msvsysagentaction.h
+epoc32/include/mw/msvuids.h
+epoc32/include/mw/mtclbase.h
+epoc32/include/mw/mtclreg.h
+epoc32/include/mw/mtmdef.h
+epoc32/include/mw/mtmuibas.h
+epoc32/include/mw/mtmuids.h
+epoc32/include/mw/mtsr.h
+epoc32/include/mw/mtud.rh
+epoc32/include/mw/mtudcbas.h
+epoc32/include/mw/mtudreg.h
+epoc32/include/mw/mtuireg.h
+epoc32/include/mw/mturutils.h
+epoc32/include/mw/mwappluginsp.h
+epoc32/include/mw/mwbxmlconverterobserver.h
 epoc32/include/mw/np_defines.h
 epoc32/include/mw/npapi.h
 epoc32/include/mw/npupp.h
+epoc32/include/mw/obex.h
+epoc32/include/mw/obexbase.h
+epoc32/include/mw/obexbaseobject.h
+epoc32/include/mw/obexbttransportinfo.h
+epoc32/include/mw/obexclient.h
+epoc32/include/mw/obexconstants.h
+epoc32/include/mw/obexfinalpacketobserver.h
+epoc32/include/mw/obexheaders.h
+epoc32/include/mw/obexirtransportinfo.h
+epoc32/include/mw/obexobjects.h
+epoc32/include/mw/obexpanics.h
+epoc32/include/mw/obexserver.h
+epoc32/include/mw/obextransportinfo.h
+epoc32/include/mw/obextypes.h
+epoc32/include/mw/obexusbtransportinfo.h
 epoc32/include/mw/obsolete/protypes.h
 epoc32/include/mw/ocrcommon.h
 epoc32/include/mw/ocrsrv.h
 epoc32/include/mw/oma2agent.h
+epoc32/include/mw/playerinformationtarget.h
+epoc32/include/mw/playerinformationtargetobserver.h
 epoc32/include/mw/pluginadapterinterface.h
+epoc32/include/mw/pragmamessage.h
 epoc32/include/mw/prcpucfg.h
+epoc32/include/mw/prninf.h
+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
@@ -1922,14 +1721,62 @@
 epoc32/include/mw/ptiuserdictionary.inl
 epoc32/include/mw/rconnmon.h
 epoc32/include/mw/rdrmhelper.h
+epoc32/include/mw/regpsdll.h
+epoc32/include/mw/remconbatterytarget.h
+epoc32/include/mw/remconbatterytargetobserver.h
+epoc32/include/mw/remcondatabaseawaremediabrowsetarget.h
+epoc32/include/mw/remcondatabaseawaremedialibrarybrowse.h
+epoc32/include/mw/remcondatabaseawaremedialibrarybrowseobserver.h
+epoc32/include/mw/remcondatabaseawarenowplayingbrowse.h
+epoc32/include/mw/remcondatabaseawarenowplayingbrowseobserver.h
+epoc32/include/mw/remcondatabaseawarenowplayingtarget.h
+epoc32/include/mw/remcondatabaseawarenowplayingtargetobserver.h
+epoc32/include/mw/remcondatabaseunawaremediabrowsetarget.h
+epoc32/include/mw/remcondatabaseunawaremedialibrarybrowse.h
+epoc32/include/mw/remcondatabaseunawaremedialibrarybrowseobserver.h
+epoc32/include/mw/remcondatabaseunawarenowplayingbrowse.h
+epoc32/include/mw/remcondatabaseunawarenowplayingbrowseobserver.h
+epoc32/include/mw/remcondatabaseunawarenowplayingtarget.h
+epoc32/include/mw/remcondatabaseunawarenowplayingtargetobserver.h
+epoc32/include/mw/remcongroupnavigationtarget.h
+epoc32/include/mw/remcongroupnavigationtargetobserver.h
+epoc32/include/mw/remconmediaattributeid.h
+epoc32/include/mw/remconmediabrowsepanic.h
+epoc32/include/mw/remconmediabrowsetypes.h
+epoc32/include/mw/remconmediaerror.h
+epoc32/include/mw/remconmediainformationtarget.h
+epoc32/include/mw/remconmediainformationtargetobserver.h
+epoc32/include/mw/remconstatusapicontroller.h
+epoc32/include/mw/remconstatusapicontrollerobserver.h
+epoc32/include/mw/rsendas.h
+epoc32/include/mw/rsendasmessage.h
 epoc32/include/mw/rsendocument.h
 epoc32/include/mw/rsfwmountentry.h
 epoc32/include/mw/rsfwmountentryitem.h
 epoc32/include/mw/rsfwmountman.h
+epoc32/include/mw/rtcp.h
+epoc32/include/mw/rtp.h
+epoc32/include/mw/schedulebaseservermtm.h
+epoc32/include/mw/schsend.rh
 epoc32/include/mw/screensaverplugin.h
 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
+epoc32/include/mw/sdpcodecerr.h
+epoc32/include/mw/sdpcodecstringpool.h
+epoc32/include/mw/sdpconnectionfield.h
+epoc32/include/mw/sdpdocument.h
+epoc32/include/mw/sdpfmtattributefield.h
+epoc32/include/mw/sdpkeyfield.h
+epoc32/include/mw/sdpmediafield.h
+epoc32/include/mw/sdporiginfield.h
+epoc32/include/mw/sdprepeatfield.h
+epoc32/include/mw/sdprtpmapvalue.h
+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
@@ -1937,6 +1784,8 @@
 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
@@ -1974,18 +1823,146 @@
 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
+epoc32/include/mw/sip_subconparams.h
+epoc32/include/mw/sip_subconparams.inl
+epoc32/include/mw/sipacceptcontactheader.h
+epoc32/include/mw/sipacceptencodingheader.h
+epoc32/include/mw/sipacceptheader.h
+epoc32/include/mw/sipacceptlanguageheader.h
+epoc32/include/mw/sipaddress.h
+epoc32/include/mw/sipaddressheaderbase.h
+epoc32/include/mw/sipalloweventsheader.h
+epoc32/include/mw/sipallowheader.h
+epoc32/include/mw/sipauthenticateheaderbase.h
+epoc32/include/mw/sipauthheaderbase.h
+epoc32/include/mw/sipauthorizationheader.h
+epoc32/include/mw/sipauthorizationheaderbase.h
+epoc32/include/mw/sipcallidheader.h
+epoc32/include/mw/sipclientresolverconfigcrkeys.h
+epoc32/include/mw/sipclienttransaction.h
+epoc32/include/mw/sipcodecerr.h
+epoc32/include/mw/sipconcreteprofileobserver.h
+epoc32/include/mw/sipconnection.h
+epoc32/include/mw/sipconnectionobserver.h
+epoc32/include/mw/sipconnpref.h
+epoc32/include/mw/sipconnpref.inl
+epoc32/include/mw/sipcontactheader.h
+epoc32/include/mw/sipcontentdispositionheader.h
+epoc32/include/mw/sipcontentencodingheader.h
+epoc32/include/mw/sipcontenttypeheader.h
+epoc32/include/mw/sipcseqheader.h
+epoc32/include/mw/sipdefs.h
+epoc32/include/mw/sipdialog.h
+epoc32/include/mw/sipdialogassocbase.h
+epoc32/include/mw/siperr.h
+epoc32/include/mw/sipeventheader.h
+epoc32/include/mw/sipexpiresheader.h
+epoc32/include/mw/sipextensionheader.h
+epoc32/include/mw/sipfromheader.h
+epoc32/include/mw/sipfromtoheaderbase.h
+epoc32/include/mw/sipheaderbase.h
+epoc32/include/mw/siphlerr.h
+epoc32/include/mw/siphttpdigest.h
+epoc32/include/mw/siphttpdigestchallengeobserver.h
+epoc32/include/mw/siphttpdigestchallengeobserver2.h
+epoc32/include/mw/sipinvitedialogassoc.h
+epoc32/include/mw/sipmanagedprofile.h
+epoc32/include/mw/sipmanagedprofileregistry.h
+epoc32/include/mw/sipmessageelements.h
+epoc32/include/mw/sipnotifydialogassoc.h
+epoc32/include/mw/sipobserver.h
+epoc32/include/mw/sipparameterheaderbase.h
+epoc32/include/mw/sippassociateduriheader.h
+epoc32/include/mw/sipprofile.h
+epoc32/include/mw/sipprofilealrcontroller.h
+epoc32/include/mw/sipprofilealrobserver.h
+epoc32/include/mw/sipprofileregistry.h
+epoc32/include/mw/sipprofileregistrybase.h
+epoc32/include/mw/sipprofileregistryobserver.h
+epoc32/include/mw/sipprofileservercrkeys.h
+epoc32/include/mw/sipprofiletypeinfo.h
+epoc32/include/mw/sipproxyauthenticateheader.h
+epoc32/include/mw/sipproxyauthorizationheader.h
+epoc32/include/mw/sipproxyrequireheader.h
+epoc32/include/mw/siprackheader.h
+epoc32/include/mw/sipreferdialogassoc.h
+epoc32/include/mw/siprefertoheader.h
+epoc32/include/mw/siprefresh.h
+epoc32/include/mw/sipregistrationbinding.h
+epoc32/include/mw/sipregistrationcontext.h
+epoc32/include/mw/sipreplytoheader.h
+epoc32/include/mw/siprequestelements.h
+epoc32/include/mw/siprequireheader.h
+epoc32/include/mw/sipresolvedclient.h
+epoc32/include/mw/sipresolvedclient2.h
+epoc32/include/mw/sipresponseelements.h
+epoc32/include/mw/sipretryafterheader.h
+epoc32/include/mw/siprouteheader.h
+epoc32/include/mw/siprouteheaderbase.h
+epoc32/include/mw/siprseqheader.h
+epoc32/include/mw/sipsdkcrkeys.h
+epoc32/include/mw/sipsecurityclientheader.h
+epoc32/include/mw/sipsecurityheaderbase.h
+epoc32/include/mw/sipservertransaction.h
+epoc32/include/mw/sipstrings.h
+epoc32/include/mw/sipsubscribedialogassoc.h
+epoc32/include/mw/sipsubscriptionstateheader.h
+epoc32/include/mw/sipsupportedheader.h
+epoc32/include/mw/siptimestampheader.h
+epoc32/include/mw/siptoheader.h
+epoc32/include/mw/siptokenheaderbase.h
+epoc32/include/mw/siptransactionbase.h
+epoc32/include/mw/sipunsignedintheaderbase.h
+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/swi/pkgremover.h
+epoc32/include/mw/swi/pkgremovererrors.h
+epoc32/include/mw/telsess.h
 epoc32/include/mw/thirdpartybitmap.pal
+epoc32/include/mw/thttpfields.h
+epoc32/include/mw/tldlistdef.h
+epoc32/include/mw/tmsvsystemprogress.h
 epoc32/include/mw/touchfeedback.h
 epoc32/include/mw/touchfeedbackspec.h
 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/mwappluginsp.h
-epoc32/include/mwbxmlconverterobserver.h
-epoc32/include/nd_err.h
-epoc32/include/netconerror.h
+epoc32/include/mw/tuladdressstringtokenizer.h
+epoc32/include/mw/tulpanics.h
+epoc32/include/mw/tulphonenumberutils.h
+epoc32/include/mw/tulstringresourcereader.h
+epoc32/include/mw/tultextresourceutils.h
+epoc32/include/mw/tz.h
+epoc32/include/mw/tzconverter.h
+epoc32/include/mw/tzdefines.h
+epoc32/include/mw/tzid.h
+epoc32/include/mw/tzid.inl
+epoc32/include/mw/tzlocalizationdatatypes.h
+epoc32/include/mw/tzlocalizationdatatypes.inl
+epoc32/include/mw/tzlocalizedcityrecord.inl
+epoc32/include/mw/tzlocalizer.h
+epoc32/include/mw/tzupdate.h
+epoc32/include/mw/uikon/eikalsrv.h
+epoc32/include/mw/viewcli.h
+epoc32/include/mw/vtzrules.h
+epoc32/include/mw/vwsdef.h
+epoc32/include/mw/wapattrdf.h
+epoc32/include/mw/wapengstd.h
+epoc32/include/mw/waplog.h
+epoc32/include/mw/wappdef.h
+epoc32/include/mw/waptestutils.h
+epoc32/include/mw/wbconverter.h
+epoc32/include/mw/wsp/wsptypes.h
+epoc32/include/mw/xmlelemt.h
+epoc32/include/mw/xmllib.h
 epoc32/include/networkemulator/cnetworkemulatorsetupcommdb.h
 epoc32/include/networkemulator/cprotocoltypes.h
 epoc32/include/networkemulator/cuccsdevicecontrol.h
@@ -1994,164 +1971,426 @@
 epoc32/include/networkemulator/networkemulatorcontrol.h
 epoc32/include/networkemulator/uccs_errorcodes.h
 epoc32/include/networking/dnd_err.h
-epoc32/include/networking/packetlogger.h
 epoc32/include/networking/qos3gpp_subconparams.h
 epoc32/include/networking/qos3gpp_subconparams.inl
-epoc32/include/networking/vj.inl
-epoc32/include/networking/vjcomp.inl
 epoc32/include/nifman.h
 epoc32/include/nifvar.h
-epoc32/include/nkernsmp/arm/arm_gic.h
-epoc32/include/nkernsmp/arm/arm_scu.h
-epoc32/include/nkernsmp/arm/arm_tmr.h
-epoc32/include/nkernsmp/x86/apic.h
 epoc32/include/non_foundation_paths.hrh
 epoc32/include/numberconversion.h
-epoc32/include/obex.h
-epoc32/include/obex/internal/obextransportconstants.h
-epoc32/include/obexbase.h
-epoc32/include/obexbaseobject.h
-epoc32/include/obexbttransportinfo.h
-epoc32/include/obexclient.h
-epoc32/include/obexclientmtm.h
-epoc32/include/obexconstants.h
-epoc32/include/obexfinalpacketobserver.h
-epoc32/include/obexheader.h
-epoc32/include/obexheaderlist.h
-epoc32/include/obexheaders.h
-epoc32/include/obexinternalutils.h
-epoc32/include/obexirtransportinfo.h
-epoc32/include/obexobjects.h
-epoc32/include/obexpanics.h
-epoc32/include/obexsendop.h
-epoc32/include/obexserver.h
-epoc32/include/obexservermtm.h
-epoc32/include/obextransportinfo.h
-epoc32/include/obextypes.h
-epoc32/include/obexusbtransportinfo.h
-epoc32/include/offop.h
-epoc32/include/offop.inl
 epoc32/include/openfont.h
 epoc32/include/openfontlinkedtypefaceelementspec.h
-epoc32/include/openmax/il/core/omxilloaderif.inl
 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/panprog.h
-epoc32/include/partitions.h
 epoc32/include/pathconfiguration.hrh
 epoc32/include/pathinfo.h
+epoc32/include/pcstore/uid.h
 epoc32/include/pdrport.h
 epoc32/include/pdrrecrd.h
 epoc32/include/pdrstore.h
-epoc32/include/phbksync.h
-epoc32/include/pkcs10attr.h
 epoc32/include/pkixcertchain.h
 epoc32/include/pkixvalidationresult.h
+epoc32/include/platform/accpolcommonnamevaluepairs.h
+epoc32/include/platform/apmfndr.h
+epoc32/include/platform/app/btcmtm.h
+epoc32/include/platform/app/btheader.h
+epoc32/include/platform/app/cimmobilitypolicyplugin.inl
+epoc32/include/platform/app/cntmodel.rh
+epoc32/include/platform/app/cntviewfindconfig.h
+epoc32/include/platform/app/cntviewfindconfig.inl
+epoc32/include/platform/app/csmsgetdetdescinterface.inl
+epoc32/include/platform/app/hlpconstants.h
+epoc32/include/platform/app/imcmutil.h
+epoc32/include/platform/app/imcvcodc.inl
+epoc32/include/platform/app/imcvdata.h
+epoc32/include/platform/app/imcvrecv.inl
+epoc32/include/platform/app/imcvsend.inl
+epoc32/include/platform/app/imcvtext.h
+epoc32/include/platform/app/imutdll.h
+epoc32/include/platform/app/ircmtm.h
+epoc32/include/platform/app/irheader.h
+epoc32/include/platform/app/miuthdr.inl
+epoc32/include/platform/app/miutlog.h
+epoc32/include/platform/app/obexclientmtm.h
+epoc32/include/platform/app/obexheader.h
+epoc32/include/platform/app/obexinternalutils.h
+epoc32/include/platform/app/obexsendop.h
+epoc32/include/platform/app/obexservermtm.h
+epoc32/include/platform/app/offop.h
+epoc32/include/platform/app/offop.inl
+epoc32/include/platform/app/smsclnt.inl
+epoc32/include/platform/app/smuthdr.inl
+epoc32/include/platform/app/smutset.inl
+epoc32/include/platform/arm_vfp.h
+epoc32/include/platform/assp/template_assp/template_assp.h
+epoc32/include/platform/assp/template_assp/template_assp_priv.h
+epoc32/include/platform/baerror.h
+epoc32/include/platform/bluetooth/hci/aclpacketconsts.h
+epoc32/include/platform/bluetooth/hci/basebandpacketconsts.h
+epoc32/include/platform/bluetooth/hci/hciconsts.h
+epoc32/include/platform/bluetooth/hci/hciframe.h
+epoc32/include/platform/bluetooth/hci/hciopcodes.h
+epoc32/include/platform/bluetooth/hci/hcitypes.h
+epoc32/include/platform/bluetooth/hci/hctlchannelobserver.h
+epoc32/include/platform/bluetooth/logger.h
+epoc32/include/platform/caf/agentfactory.h
+epoc32/include/platform/caf/agentinterface.h
+epoc32/include/platform/caf/attribute.h
+epoc32/include/platform/caf/bitset.h
+epoc32/include/platform/caf/cafmimeheader.h
+epoc32/include/platform/caf/f32agentui.h
+epoc32/include/platform/caf/importfile.h
+epoc32/include/platform/caf/manager.h
+epoc32/include/platform/caf/rightsinfo.h
+epoc32/include/platform/caf/rightsmanager.h
+epoc32/include/platform/caf/supplier.h
+epoc32/include/platform/caf/supplieroutputfile.h
+epoc32/include/platform/cauthentication.h
+epoc32/include/platform/cdbover.h
+epoc32/include/platform/cdbover.inl
+epoc32/include/platform/cdbstore.h
+epoc32/include/platform/cdbstore.inl
+epoc32/include/platform/cdsb.h
+epoc32/include/platform/collate.h
+epoc32/include/platform/commdb.inl
+epoc32/include/platform/commdbconnpref.inl
+epoc32/include/platform/commsdatutils.h
+epoc32/include/platform/comms-infras/api_ext_list.h
+epoc32/include/platform/comms-infras/api_ext_msg.h
+epoc32/include/platform/comms-infras/commsbuf.inl
+epoc32/include/platform/comms-infras/commsbufchain.inl
+epoc32/include/platform/comms-infras/commsbufiter.inl
+epoc32/include/platform/comms-infras/commsbufpanic.h
+epoc32/include/platform/comms-infras/commsbufpond.inl
+epoc32/include/platform/comms-infras/commsbufpondop.inl
+epoc32/include/platform/comms-infras/commsbufq.inl
+epoc32/include/platform/comms-infras/commsbufskern.inl
+epoc32/include/platform/comms-infras/esock_params.inl
+epoc32/include/platform/comms-infras/esock_params_internal.inl
+epoc32/include/platform/comms-infras/esockdebugmessages.h
+epoc32/include/platform/comms-infras/mbuf.inl
+epoc32/include/platform/comms-infras/mbufchain.inl
+epoc32/include/platform/comms-infras/mbufpktq.inl
+epoc32/include/platform/comms-infras/mbufq.inl
+epoc32/include/platform/comms-infras/metabuffer.h
+epoc32/include/platform/comms-infras/metacontainer.h
+epoc32/include/platform/comms-infras/metacontainer.inl
+epoc32/include/platform/comms-infras/metadata.inl
+epoc32/include/platform/comms-infras/metatype.h
+epoc32/include/platform/comms-infras/metatypevariablelen.h
+epoc32/include/platform/comms-infras/mobilitymessagesecom.inl
+epoc32/include/platform/comms-infras/netmessages.h
+epoc32/include/platform/comms-infras/netupsproperties.h
+epoc32/include/platform/comms-infras/ss_refcountowner.h
+epoc32/include/platform/comms-infras/ss_roles.inl
+epoc32/include/platform/comms-infras/trbuf.h
+epoc32/include/platform/d32camerasc.inl
+epoc32/include/platform/d32comm.h
+epoc32/include/platform/d32comm.inl
+epoc32/include/platform/d32locd.h
+epoc32/include/platform/d32locd.inl
+epoc32/include/platform/d32resmanus.inl
+epoc32/include/platform/datastor.h
+epoc32/include/platform/dns_qry.h
+epoc32/include/platform/dns_qry.inl
+epoc32/include/platform/drivers/iic.inl
+epoc32/include/platform/drivers/iic_channel.inl
+epoc32/include/platform/drivers/pbus.inl
+epoc32/include/platform/drivers/pccard.inl
+epoc32/include/platform/drivers/resourcecontrol.inl
+epoc32/include/platform/drivers/sdio/sdiopsu.inl
+epoc32/include/platform/e32hal.h
+epoc32/include/platform/e32ktran.h
+epoc32/include/platform/e32lmsg.h
+epoc32/include/platform/e32notif.h
+epoc32/include/platform/e32power.h
+epoc32/include/platform/e32rom.h
+epoc32/include/platform/e32svr.h
+epoc32/include/platform/e32twin.h
+epoc32/include/platform/e32uid.h
+epoc32/include/platform/e32ver.h
+epoc32/include/platform/ecom/test_bed/componentinfo.inl
+epoc32/include/platform/ecom/test_bed/transition.inl
+epoc32/include/platform/ecom/test_bed/unittest.inl
+epoc32/include/platform/ecom/test_bed/unittestinfo.inl
+epoc32/include/platform/elements/cftransport.inl
+epoc32/include/platform/elements/cftransportmsg.inl
+epoc32/include/platform/elements/sd_roles.inl
+epoc32/include/platform/elements/sd_std.inl
+epoc32/include/platform/es_commsbuf.h
+epoc32/include/platform/es_enum.inl
+epoc32/include/platform/es_enum_internal.inl
+epoc32/include/platform/es_enum_partner.inl
+epoc32/include/platform/es_mbuf.h
+epoc32/include/platform/es_prot.h
+epoc32/include/platform/es_prot.inl
+epoc32/include/platform/es_sock.inl
+epoc32/include/platform/es_sock_internal.inl
+epoc32/include/platform/estw32.h
+epoc32/include/platform/etbuffer.h
+epoc32/include/platform/etelext.h
+epoc32/include/platform/etelpckt.h
+epoc32/include/platform/etelqos.h
+epoc32/include/platform/etelutils.h
+epoc32/include/platform/f32dbg.h
+epoc32/include/platform/f32fsys.h
+epoc32/include/platform/f32fsys.inl
+epoc32/include/platform/f32image.h
+epoc32/include/platform/f32plugin.inl
+epoc32/include/platform/f32tracedef.h
+epoc32/include/platform/f32ver.h
+epoc32/include/platform/fbsmessage.h
+epoc32/include/platform/fepitfr.h
+epoc32/include/platform/flddef.h
+epoc32/include/platform/fldset.h
+epoc32/include/platform/flogger.h
+epoc32/include/platform/flogger.inl
+epoc32/include/platform/frmcurs.h
+epoc32/include/platform/frmpage.h
+epoc32/include/platform/gfp.h
+epoc32/include/platform/graphics/blendingalgorithms.h
+epoc32/include/platform/graphics/blendingalgorithms.inl
+epoc32/include/platform/graphics/compositionsurfaceupdate.h
+epoc32/include/platform/graphics/extensioncontainer.h
+epoc32/include/platform/graphics/lookuptable.h
+epoc32/include/platform/graphics/surfaceconfiguration.inl
+epoc32/include/platform/graphics/surfaceupdateclient.h
+epoc32/include/platform/graphics/wsdisplaycontrol.h
+epoc32/include/platform/graphics/wsdisplaymapping.h
+epoc32/include/platform/graphics/wsdisplaypolicy.h
+epoc32/include/platform/graphics/wsscreendeviceutils.h
+epoc32/include/platform/graphics/wstestscreencapture.h
+epoc32/include/platform/hwrm/hwrmpluginservice.inl
+epoc32/include/platform/hwrm/hwrmpowerstateplugin.inl
+epoc32/include/platform/hwrm/hwrmtargetmodifierplugin.inl
+epoc32/include/platform/hwrm/hwrmuipluginservice.inl
+epoc32/include/platform/icl/jpegyuvdecoder.h
+epoc32/include/platform/in_iface.h
+epoc32/include/platform/kernel/arm/vfpsupport.h
+epoc32/include/platform/lbs/lbsadmin.inl
+epoc32/include/platform/lbs/lbsassistancedatabase.inl
+epoc32/include/platform/lbs/lbsassistancedatabuilderset.inl
+epoc32/include/platform/lbs/lbsassistancedatasourcemodule.inl
+epoc32/include/platform/liblogger.h
+epoc32/include/platform/logcntdef.h
+epoc32/include/platform/mctcertstore.h
+epoc32/include/platform/mctkeystore.inl
+epoc32/include/platform/mctwritablecertstore.h
+epoc32/include/platform/mctwritablecertstore.inl
+epoc32/include/platform/mda/client/base.h
+epoc32/include/platform/mda/client/controller.h
+epoc32/include/platform/mda/client/port.h
+epoc32/include/platform/mda/client/video.inl
+epoc32/include/platform/mdf/mdfprocessingunit.inl
+epoc32/include/platform/mdf/mdfpuloader.inl
+epoc32/include/platform/memmodel/emul/platform.h
+epoc32/include/platform/memmodel/epoc/mmubase/kblockmap.h
+epoc32/include/platform/metafile.h
+epoc32/include/platform/mmf/common/mmfdrmcustomcommands.h
+epoc32/include/platform/mmf/server/mmfswcodecwrapper.h
+epoc32/include/platform/mw/_sdpdefs.h
+epoc32/include/platform/mw/_sipcodecdefs.h
 epoc32/include/platform/mw/aknlayout.lag
+epoc32/include/platform/mw/apacln.h
+epoc32/include/platform/mw/apaserverapp.h
+epoc32/include/platform/mw/apfrec.h
+epoc32/include/platform/mw/apgaplst.h
+epoc32/include/platform/mw/apgnotif.h
+epoc32/include/platform/mw/bifbase.h
+epoc32/include/platform/mw/biftool2.rh
+epoc32/include/platform/mw/bsp.inl
+epoc32/include/platform/mw/cmarkedstack.inl
+epoc32/include/platform/mw/cnode.inl
+epoc32/include/platform/mw/coecntss.h
+epoc32/include/platform/mw/consolealarmalertservermain.h
+epoc32/include/platform/mw/crulemarkedstack.inl
+epoc32/include/platform/mw/csendaseditutils.inl
+epoc32/include/platform/mw/cstack.inl
+epoc32/include/platform/mw/dscitem.h
+epoc32/include/platform/mw/dscstoredefs.h
+epoc32/include/platform/mw/dtdnode.inl
+epoc32/include/platform/mw/eikbusymsgwin.h
+epoc32/include/platform/mw/eikcycledef.h
+epoc32/include/platform/mw/eikdebug.h
+epoc32/include/platform/mw/eikdgfty.h
+epoc32/include/platform/mw/eikinfomsgwin.h
+epoc32/include/platform/mw/eikirfty.h
+epoc32/include/platform/mw/eiklibry.h
+epoc32/include/platform/mw/eikpanic.h
+epoc32/include/platform/mw/eikpicturefactory.h
+epoc32/include/platform/mw/eikserverapp.h
+epoc32/include/platform/mw/eiksfont.h
+epoc32/include/platform/mw/eiksrv.h
+epoc32/include/platform/mw/eiksrv.pan
+epoc32/include/platform/mw/eiksrvc.h
+epoc32/include/platform/mw/eiksrvs.h
+epoc32/include/platform/mw/eiksvdef.h
+epoc32/include/platform/mw/exbuf.h
+epoc32/include/platform/mw/ftpprot.h
+epoc32/include/platform/mw/ftpsess.h
+epoc32/include/platform/mw/gfxtranseffect/gfxtransclient.h
+epoc32/include/platform/mw/gfxtranseffect/gfxtransdatatype.h
+epoc32/include/platform/mw/gfxtranseffect/gfxtranseffect.h
+epoc32/include/platform/mw/gulgcmap.h
+epoc32/include/platform/mw/gulpanic.h
+epoc32/include/platform/mw/gulsprite.h
+epoc32/include/platform/mw/hsdataobserver.h
+epoc32/include/platform/mw/hsexception.h
+epoc32/include/platform/mw/hswidget.h
+epoc32/include/platform/mw/hswidgetpublisher.h
+epoc32/include/platform/mw/http/mhttpdataoptimiser.h
+epoc32/include/platform/mw/inbuf.h
 epoc32/include/platform/mw/loc/sc/drmcommon.loc
+epoc32/include/platform/mw/mclient.h
+epoc32/include/platform/mw/mentact.h
+epoc32/include/platform/mw/mmssettingsproxybase.inl
+epoc32/include/platform/mw/mmsvstoremanager.h
+epoc32/include/platform/mw/msvapi.inl
+epoc32/include/platform/mw/msvarray.h
+epoc32/include/platform/mw/msventry.inl
+epoc32/include/platform/mw/msvfind.inl
+epoc32/include/platform/mw/msvftext.inl
+epoc32/include/platform/mw/msvipc.h
+epoc32/include/platform/mw/msvipc.inl
+epoc32/include/platform/mw/msvrcpt.inl
+epoc32/include/platform/mw/msvreg.inl
+epoc32/include/platform/mw/msvscheduledentry.inl
+epoc32/include/platform/mw/msvschedulesend.inl
+epoc32/include/platform/mw/msvstd.inl
+epoc32/include/platform/mw/msvutils.h
+epoc32/include/platform/mw/mtp/rptpipframework.h
+epoc32/include/platform/mw/obex/internal/obextransportconstants.h
+epoc32/include/platform/mw/pnp/pnp.h
+epoc32/include/platform/mw/push/ccontenthandlerbase.h
+epoc32/include/platform/mw/push/ccontenthandlerbase.inl
+epoc32/include/platform/mw/push/cpushhandlerbase.h
+epoc32/include/platform/mw/push/cpushhandlerbase.inl
+epoc32/include/platform/mw/push/cwappushmsgutils.inl
+epoc32/include/platform/mw/push/pluginkiller.h
+epoc32/include/platform/mw/push/pushlog.h
+epoc32/include/platform/mw/push/pushmessage.h
+epoc32/include/platform/mw/push/unknownmimedefs.h
+epoc32/include/platform/mw/pushentry.h
+epoc32/include/platform/mw/pushentry.inl
+epoc32/include/platform/mw/regpsdll.inl
+epoc32/include/platform/mw/rtp.inl
+epoc32/include/platform/mw/sipaccessnetworkinfo.inl
+epoc32/include/platform/mw/sipbearermonitor.inl
+epoc32/include/platform/mw/sipnattraversalcontroller.inl
+epoc32/include/platform/mw/sipnattraversalcontrollerinitparams.inl
+epoc32/include/platform/mw/sipprofileagent.inl
+epoc32/include/platform/mw/sipprofileagentinitparams.inl
+epoc32/include/platform/mw/sipresolvedclient.inl
+epoc32/include/platform/mw/sipresolvedclient2.inl
+epoc32/include/platform/mw/sipsystemstatemonitor.inl
+epoc32/include/platform/mw/tnonoperationmtmdata.h
+epoc32/include/platform/mw/tzlocalizedtimezonerecord.inl
+epoc32/include/platform/mw/uiklaf/private/lafappui.h
+epoc32/include/platform/mw/uiklaf/private/lafenv.h
+epoc32/include/platform/mw/uiklaf/private/lafmsg.h
+epoc32/include/platform/mw/uiklaf/private/lafnotcap.h
+epoc32/include/platform/mw/uiklaf/private/lafspane.h
+epoc32/include/platform/mw/uiklaf/private/lafsrv.h
+epoc32/include/platform/mw/uiklaf/private/lafvcurs.h
+epoc32/include/platform/mw/uikon/eikalsup.h
+epoc32/include/platform/mw/uikon/eiknfysv.h
+epoc32/include/platform/mw/uikon/eiksvfty.h
+epoc32/include/platform/mw/vwsappst.h
+epoc32/include/platform/mw/waptestutils.inl
+epoc32/include/platform/nd_err.h
+epoc32/include/platform/netconerror.h
+epoc32/include/platform/networking/packetlogger.h
+epoc32/include/platform/networking/vj.inl
+epoc32/include/platform/networking/vjcomp.inl
+epoc32/include/platform/nkernsmp/arm/arm_gic.h
+epoc32/include/platform/nkernsmp/arm/arm_scu.h
+epoc32/include/platform/nkernsmp/arm/arm_tmr.h
+epoc32/include/platform/nkernsmp/x86/apic.h
+epoc32/include/platform/openmax/il/core/omxilloaderif.inl
+epoc32/include/platform/panprog.h
+epoc32/include/platform/partitions.h
+epoc32/include/platform/pkcs10attr.h
+epoc32/include/platform/power.h
+epoc32/include/platform/redircli.h
+epoc32/include/platform/redirstr.h
+epoc32/include/platform/remcon/clienttype.h
+epoc32/include/platform/remcon/messagetype.h
+epoc32/include/platform/remcon/remconextapi1.h
+epoc32/include/platform/remcon/remconinterfacebase.h
+epoc32/include/platform/remcon/remconinterfaceif.h
+epoc32/include/platform/rscommon.inl
+epoc32/include/platform/rsstd.inl
+epoc32/include/platform/s32crypt.inl
+epoc32/include/platform/savenotf.h
+epoc32/include/platform/savepriv.h
+epoc32/include/platform/scmbytestreamutil.inl
+epoc32/include/platform/scmtrace.h
+epoc32/include/platform/scs/cleanuputils.inl
+epoc32/include/platform/ss_std.inl
+epoc32/include/platform/ssm/clayerdlldatadefs.rh
+epoc32/include/platform/ssm/ssmcmdconditions.rh
+epoc32/include/platform/ssm/ssmgracefulshutdown_patch.h
+epoc32/include/platform/ssm/startandretrynotifications.h
+epoc32/include/platform/startupdomaindefs.h
+epoc32/include/platform/stringpoolerr.h
+epoc32/include/platform/stringtablesupport.h
+epoc32/include/platform/tools/elfdefs.h
+epoc32/include/platform/txtfmstm.h
+epoc32/include/platform/txtmrtsr.h
+epoc32/include/platform/txtuids.h
+epoc32/include/platform/wins/winscomm.h
+epoc32/include/platform/wins/winscomm.inl
+epoc32/include/platform/xml/contentprocessor.h
+epoc32/include/platform/xml/contentsource.h
+epoc32/include/platform/xml/documentparameters.h
+epoc32/include/platform/xml/extension.h
+epoc32/include/platform/xml/plugins/charsetconverter.h
+epoc32/include/platform/xml/plugins/contentprocessorinitparams.h
+epoc32/include/platform/xml/plugins/dictionarycodepage.h
+epoc32/include/platform/xml/plugins/elementstack.h
+epoc32/include/platform/xml/plugins/parserinitparams.h
+epoc32/include/platform/xml/plugins/parserinterface.h
+epoc32/include/platform/xml/plugins/stringdictionary.h
+epoc32/include/platform/xml/utils/xmlengxestrings.inl
+epoc32/include/platform/xml/wbxmlparsererrors.h
+epoc32/include/platform/xml/xmlframeworkconstants.h
+epoc32/include/platform/xml/xmlparsererrors.h
 epoc32/include/platform_paths.hrh
 epoc32/include/platformstaticfeatures.hrh
-epoc32/include/playerinformationtarget.h
-epoc32/include/playerinformationtargetobserver.h
 epoc32/include/plpsess.inl
 epoc32/include/pls.h
-epoc32/include/pnp/pnp.h
 epoc32/include/pointerevent.h
-epoc32/include/pop3cmds.h
-epoc32/include/pop3set.h
-epoc32/include/popcmtm.h
-epoc32/include/power.h
-epoc32/include/pragmamessage.h
 epoc32/include/privateruntimeids.hrh
 epoc32/include/privatestaticfeatures.hrh
-epoc32/include/prninf.h
-epoc32/include/prnprev.h
-epoc32/include/prnsetup.h
-epoc32/include/prnuids.h
 epoc32/include/productvariant.hrh
 epoc32/include/publicruntimeids.hrh
 epoc32/include/publicstaticfeatures.hrh
 epoc32/include/punycodeconverter.h
-epoc32/include/push/ccontenthandlerbase.h
-epoc32/include/push/ccontenthandlerbase.inl
-epoc32/include/push/cpushhandlerbase.h
-epoc32/include/push/cpushhandlerbase.inl
-epoc32/include/push/cwappushmsgutils.inl
-epoc32/include/push/pluginkiller.h
-epoc32/include/push/pushlog.h
-epoc32/include/push/pushmessage.h
-epoc32/include/push/unknownmimedefs.h
-epoc32/include/pushentry.h
-epoc32/include/pushentry.inl
 epoc32/include/random.h
-epoc32/include/record.h
-epoc32/include/redircli.h
-epoc32/include/redirstr.h
-epoc32/include/regpsdll.h
-epoc32/include/regpsdll.inl
-epoc32/include/remcon/clienttype.h
-epoc32/include/remcon/messagetype.h
 epoc32/include/remcon/playertype.h
-epoc32/include/remcon/remconextapi1.h
-epoc32/include/remcon/remconinterfacebase.h
 epoc32/include/remcon/remconinterfacefeatures.h
-epoc32/include/remcon/remconinterfaceif.h
 epoc32/include/remconabsvolcontroller.h
 epoc32/include/remconabsvolcontrollerobserver.h
 epoc32/include/remconabsvoltarget.h
 epoc32/include/remconabsvoltargetobserver.h
 epoc32/include/remconaddress.h
-epoc32/include/remconbatterytarget.h
-epoc32/include/remconbatterytargetobserver.h
 epoc32/include/remconcoreapi.h
 epoc32/include/remconcoreapicontroller.h
 epoc32/include/remconcoreapicontrollerobserver.h
 epoc32/include/remconcoreapitarget.h
 epoc32/include/remconcoreapitargetobserver.h
-epoc32/include/remcondatabaseawaremediabrowsetarget.h
-epoc32/include/remcondatabaseawaremedialibrarybrowse.h
-epoc32/include/remcondatabaseawaremedialibrarybrowseobserver.h
-epoc32/include/remcondatabaseawarenowplayingbrowse.h
-epoc32/include/remcondatabaseawarenowplayingbrowseobserver.h
-epoc32/include/remcondatabaseawarenowplayingtarget.h
-epoc32/include/remcondatabaseawarenowplayingtargetobserver.h
-epoc32/include/remcondatabaseunawaremediabrowsetarget.h
-epoc32/include/remcondatabaseunawaremedialibrarybrowse.h
-epoc32/include/remcondatabaseunawaremedialibrarybrowseobserver.h
-epoc32/include/remcondatabaseunawarenowplayingbrowse.h
-epoc32/include/remcondatabaseunawarenowplayingbrowseobserver.h
-epoc32/include/remcondatabaseunawarenowplayingtarget.h
-epoc32/include/remcondatabaseunawarenowplayingtargetobserver.h
 epoc32/include/remconerrorobserver.h
-epoc32/include/remcongroupnavigationtarget.h
-epoc32/include/remcongroupnavigationtargetobserver.h
 epoc32/include/remconinterfaceselector.h
-epoc32/include/remconmediaattributeid.h
-epoc32/include/remconmediabrowsepanic.h
-epoc32/include/remconmediabrowsetypes.h
-epoc32/include/remconmediaerror.h
-epoc32/include/remconmediainformationtarget.h
-epoc32/include/remconmediainformationtargetobserver.h
 epoc32/include/remconserverpanic.h
-epoc32/include/remconstatusapicontroller.h
-epoc32/include/remconstatusapicontrollerobserver.h
 epoc32/include/remcontrackinfocontroller.h
 epoc32/include/remcontrackinfocontrollerobserver.h
 epoc32/include/remcontrackinfotarget.h
 epoc32/include/remcontrackinfotargetobserver.h
 epoc32/include/roomlevelbase.h
 epoc32/include/roomleveldata.h
-epoc32/include/rscommon.inl
-epoc32/include/rsendas.h
-epoc32/include/rsendasmessage.h
-epoc32/include/rsstd.inl
-epoc32/include/rtcp.h
-epoc32/include/rtp.h
-epoc32/include/rtp.inl
 epoc32/include/rvct/rvct.h
 epoc32/include/s32btree.h
 epoc32/include/s32btree.inl
@@ -2159,7 +2398,6 @@
 epoc32/include/s32buf.inl
 epoc32/include/s32cont.h
 epoc32/include/s32cont.inl
-epoc32/include/s32crypt.inl
 epoc32/include/s32file.h
 epoc32/include/s32file.inl
 epoc32/include/s32mem.h
@@ -2176,41 +2414,17 @@
 epoc32/include/s32strm.inl
 epoc32/include/s32ucmp.h
 epoc32/include/sacls.h
-epoc32/include/savenotf.h
-epoc32/include/savepriv.h
 epoc32/include/sbque.h
-epoc32/include/schedulebaseservermtm.h
 epoc32/include/schinfo.h
 epoc32/include/schsend.hrh
-epoc32/include/schsend.rh
 epoc32/include/schtask.h
 epoc32/include/schtime.h
-epoc32/include/scmbytestreamutil.inl
-epoc32/include/scmtrace.h
-epoc32/include/scs/cleanuputils.inl
-epoc32/include/sdpattributefield.h
-epoc32/include/sdpbandwidthfield.h
-epoc32/include/sdpcodecconstants.h
-epoc32/include/sdpcodecerr.h
 epoc32/include/sdpcodecstringconstants.h
-epoc32/include/sdpcodecstringpool.h
-epoc32/include/sdpconnectionfield.h
-epoc32/include/sdpdocument.h
-epoc32/include/sdpfmtattributefield.h
-epoc32/include/sdpkeyfield.h
-epoc32/include/sdpmediafield.h
-epoc32/include/sdporiginfield.h
-epoc32/include/sdprepeatfield.h
-epoc32/include/sdprtpmapvalue.h
-epoc32/include/sdptimefield.h
-epoc32/include/sdptypedtime.h
 epoc32/include/securesocket.h
 epoc32/include/securesocketinterface.h
 epoc32/include/securitydefs.h
 epoc32/include/securitydefs.inl
 epoc32/include/securityerr.h
-epoc32/include/sendas2.h
-epoc32/include/sendasserver.rh
 epoc32/include/sensordatacompensationtypes.h
 epoc32/include/sensordatacompensator.h
 epoc32/include/sensrvaccelerometersensor.h
@@ -2235,119 +2449,11 @@
 epoc32/include/shapeinfo.h
 epoc32/include/shiftjis.h
 epoc32/include/signed.h
-epoc32/include/sip.h
-epoc32/include/sip_subconevents.h
-epoc32/include/sip_subconevents.inl
-epoc32/include/sip_subconparams.h
-epoc32/include/sip_subconparams.inl
-epoc32/include/sipacceptcontactheader.h
-epoc32/include/sipacceptencodingheader.h
-epoc32/include/sipacceptheader.h
-epoc32/include/sipacceptlanguageheader.h
-epoc32/include/sipaccessnetworkinfo.inl
-epoc32/include/sipaddress.h
-epoc32/include/sipaddressheaderbase.h
-epoc32/include/sipalloweventsheader.h
-epoc32/include/sipallowheader.h
-epoc32/include/sipauthenticateheaderbase.h
-epoc32/include/sipauthheaderbase.h
-epoc32/include/sipauthorizationheader.h
-epoc32/include/sipauthorizationheaderbase.h
-epoc32/include/sipbearermonitor.inl
-epoc32/include/sipcallidheader.h
-epoc32/include/sipclientresolverconfigcrkeys.h
-epoc32/include/sipclienttransaction.h
-epoc32/include/sipcodecerr.h
-epoc32/include/sipconcreteprofileobserver.h
-epoc32/include/sipconnection.h
-epoc32/include/sipconnectionobserver.h
-epoc32/include/sipconnpref.h
-epoc32/include/sipconnpref.inl
-epoc32/include/sipcontactheader.h
-epoc32/include/sipcontentdispositionheader.h
-epoc32/include/sipcontentencodingheader.h
-epoc32/include/sipcontenttypeheader.h
-epoc32/include/sipcseqheader.h
-epoc32/include/sipdefs.h
-epoc32/include/sipdialog.h
-epoc32/include/sipdialogassocbase.h
-epoc32/include/siperr.h
-epoc32/include/sipeventheader.h
-epoc32/include/sipexpiresheader.h
-epoc32/include/sipextensionheader.h
-epoc32/include/sipfromheader.h
-epoc32/include/sipfromtoheaderbase.h
-epoc32/include/sipheaderbase.h
-epoc32/include/siphlerr.h
-epoc32/include/siphttpdigest.h
-epoc32/include/siphttpdigestchallengeobserver.h
-epoc32/include/siphttpdigestchallengeobserver2.h
-epoc32/include/sipinvitedialogassoc.h
-epoc32/include/sipmanagedprofile.h
-epoc32/include/sipmanagedprofileregistry.h
-epoc32/include/sipmessageelements.h
-epoc32/include/sipnattraversalcontroller.inl
-epoc32/include/sipnattraversalcontrollerinitparams.inl
-epoc32/include/sipnotifydialogassoc.h
-epoc32/include/sipobserver.h
-epoc32/include/sipparameterheaderbase.h
-epoc32/include/sippassociateduriheader.h
-epoc32/include/sipprofile.h
-epoc32/include/sipprofileagent.inl
-epoc32/include/sipprofileagentinitparams.inl
-epoc32/include/sipprofilealrcontroller.h
-epoc32/include/sipprofilealrobserver.h
-epoc32/include/sipprofileregistry.h
-epoc32/include/sipprofileregistrybase.h
-epoc32/include/sipprofileregistryobserver.h
-epoc32/include/sipprofileservercrkeys.h
-epoc32/include/sipprofiletypeinfo.h
-epoc32/include/sipproxyauthenticateheader.h
-epoc32/include/sipproxyauthorizationheader.h
-epoc32/include/sipproxyrequireheader.h
-epoc32/include/siprackheader.h
-epoc32/include/sipreferdialogassoc.h
-epoc32/include/siprefertoheader.h
-epoc32/include/siprefresh.h
-epoc32/include/sipregistrationbinding.h
-epoc32/include/sipregistrationcontext.h
-epoc32/include/sipreplytoheader.h
-epoc32/include/siprequestelements.h
-epoc32/include/siprequireheader.h
-epoc32/include/sipresolvedclient.h
-epoc32/include/sipresolvedclient.inl
-epoc32/include/sipresolvedclient2.h
-epoc32/include/sipresolvedclient2.inl
-epoc32/include/sipresponseelements.h
-epoc32/include/sipretryafterheader.h
-epoc32/include/siprouteheader.h
-epoc32/include/siprouteheaderbase.h
-epoc32/include/siprseqheader.h
-epoc32/include/sipsdkcrkeys.h
-epoc32/include/sipsecurityclientheader.h
-epoc32/include/sipsecurityheaderbase.h
-epoc32/include/sipservertransaction.h
 epoc32/include/sipstrconsts.h
-epoc32/include/sipstrings.h
-epoc32/include/sipsubscribedialogassoc.h
-epoc32/include/sipsubscriptionstateheader.h
-epoc32/include/sipsupportedheader.h
-epoc32/include/sipsystemstatemonitor.inl
-epoc32/include/siptimestampheader.h
-epoc32/include/siptoheader.h
-epoc32/include/siptokenheaderbase.h
-epoc32/include/siptransactionbase.h
-epoc32/include/sipunsignedintheaderbase.h
-epoc32/include/sipunsupportedheader.h
-epoc32/include/sipwwwauthenticateheader.h
 epoc32/include/sizemode.h
-epoc32/include/smcmmain.h
 epoc32/include/smilattributes.h
 epoc32/include/smilelements.h
 epoc32/include/smilgenericelements.h
-epoc32/include/smsclnt.h
-epoc32/include/smsclnt.inl
-epoc32/include/smscmds.h
 epoc32/include/smss.hrh
 epoc32/include/smsuact.h
 epoc32/include/smsuaddr.h
@@ -2357,34 +2463,18 @@
 epoc32/include/smsuset.inl
 epoc32/include/smsustrm.h
 epoc32/include/smsustrm.inl
-epoc32/include/smtcmtm.h
-epoc32/include/smtpcmds.h
-epoc32/include/smtpset.h
-epoc32/include/smut.h
-epoc32/include/smuthdr.h
-epoc32/include/smuthdr.inl
-epoc32/include/smutset.h
-epoc32/include/smutset.inl
-epoc32/include/smutsimparam.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/spriteanimation.h
 epoc32/include/spriteanimationclient.h
 epoc32/include/sqldb.h
-epoc32/include/ss_std.inl
 epoc32/include/ssl.h
 epoc32/include/ssl_compatibility.h
 epoc32/include/sslerr.h
-epoc32/include/ssm/clayerdlldatadefs.rh
 epoc32/include/ssm/clayerswp.hrh
-epoc32/include/ssm/ssmcmdconditions.rh
-epoc32/include/ssm/ssmgracefulshutdown_patch.h
-epoc32/include/ssm/startandretrynotifications.h
-epoc32/include/startupdomaindefs.h
 epoc32/include/stdapis/_ctype.h
 epoc32/include/stdapis/arpa/nameser_compat.h
 epoc32/include/stdapis/boost/aligned_storage.hpp
@@ -2497,10 +2587,10 @@
 epoc32/include/stdapis/boost/function/detail/function_iterate.hpp
 epoc32/include/stdapis/boost/function/detail/maybe_include.hpp
 epoc32/include/stdapis/boost/function/detail/prologue.hpp
+epoc32/include/stdapis/boost/function/function_base.hpp
+epoc32/include/stdapis/boost/function/function_template.hpp
 epoc32/include/stdapis/boost/function/function2.hpp
 epoc32/include/stdapis/boost/function/function3.hpp
-epoc32/include/stdapis/boost/function/function_base.hpp
-epoc32/include/stdapis/boost/function/function_template.hpp
 epoc32/include/stdapis/boost/function_equal.hpp
 epoc32/include/stdapis/boost/functional.hpp
 epoc32/include/stdapis/boost/functional/detail/container_fwd.hpp
@@ -3311,15 +3401,16 @@
 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/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
@@ -3332,14 +3423,12 @@
 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/dlfcn.h
 epoc32/include/stdapis/err.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
@@ -3356,8 +3445,8 @@
 epoc32/include/stdapis/glib-2.0/glib/gfileutils.h
 epoc32/include/stdapis/glib-2.0/glib/ghash.h
 epoc32/include/stdapis/glib-2.0/glib/ghook.h
+epoc32/include/stdapis/glib-2.0/glib/gi18n.h
 epoc32/include/stdapis/glib-2.0/glib/gi18n-lib.h
-epoc32/include/stdapis/glib-2.0/glib/gi18n.h
 epoc32/include/stdapis/glib-2.0/glib/giochannel.h
 epoc32/include/stdapis/glib-2.0/glib/gkeyfile.h
 epoc32/include/stdapis/glib-2.0/glib/glist.h
@@ -3395,6 +3484,7 @@
 epoc32/include/stdapis/glib-2.0/glib/gwin32.h
 epoc32/include/stdapis/glib-2.0/glib_global.h
 epoc32/include/stdapis/glib-2.0/glibconfig.h
+epoc32/include/stdapis/glib-2.0/glib-object.h
 epoc32/include/stdapis/glib-2.0/glowmem.h
 epoc32/include/stdapis/glib-2.0/gmodule.h
 epoc32/include/stdapis/glib-2.0/gobject/gboxed.h
@@ -3801,13 +3891,9 @@
 epoc32/include/stringloader.h
 epoc32/include/stringpool.h
 epoc32/include/stringpool.inl
-epoc32/include/stringpoolerr.h
-epoc32/include/stringtablesupport.h
 epoc32/include/strng.h
 epoc32/include/strng.inl
 epoc32/include/swap.h
-epoc32/include/swi/pkgremover.h
-epoc32/include/swi/pkgremovererrors.h
 epoc32/include/symcpp.h
 epoc32/include/syncmlalertinfo.h
 epoc32/include/syncmlclient.h
@@ -3826,7 +3912,6 @@
 epoc32/include/tcp_hdr.h
 epoc32/include/tcpseq.h
 epoc32/include/telephony.inl
-epoc32/include/telsess.h
 epoc32/include/test/datawrapper.inl
 epoc32/include/test/fileservplugin.h
 epoc32/include/test/rfileloggermacro.h
@@ -3839,14 +3924,9 @@
 epoc32/include/textcursor.h
 epoc32/include/textresolver.h
 epoc32/include/textresolver.hrh
-epoc32/include/thttpfields.h
 epoc32/include/tia637.h
 epoc32/include/tinternetdate.h
-epoc32/include/tldlistdef.h
-epoc32/include/tmsvsystemprogress.h
-epoc32/include/tnonoperationmtmdata.h
 epoc32/include/tools/certapp-api.h
-epoc32/include/tools/elfdefs.h
 epoc32/include/tools/stlport/rlocks.h
 epoc32/include/tools/stlport/stl/_alloc_old.h
 epoc32/include/tools/stlport/stl/_sparc_atomic.h
@@ -3895,59 +3975,26 @@
 epoc32/include/tools/stlport/stl/pointers/_tools.h
 epoc32/include/tools/stlport/using/export
 epoc32/include/tranp.h
-epoc32/include/tsendasclientpanic.h
-epoc32/include/tsendasmessagetypefilter.h
 epoc32/include/tsy.hrh
 epoc32/include/tsy.rh
-epoc32/include/tuladdressstringtokenizer.h
-epoc32/include/tulpanics.h
-epoc32/include/tulphonenumberutils.h
-epoc32/include/tulstringresourcereader.h
-epoc32/include/tultextresourceutils.h
 epoc32/include/txtetext.h
 epoc32/include/txtetext.inl
 epoc32/include/txtfmlyr.h
 epoc32/include/txtfmlyr.inl
-epoc32/include/txtfmstm.h
 epoc32/include/txtfrmat.h
 epoc32/include/txtfrmat.inl
 epoc32/include/txtglobl.h
 epoc32/include/txtglobl.inl
 epoc32/include/txtlaydc.h
 epoc32/include/txtmfmtx.h
-epoc32/include/txtmrtsr.h
 epoc32/include/txtrich.h
 epoc32/include/txtrich.inl
 epoc32/include/txtstyle.h
 epoc32/include/txtstyle.inl
-epoc32/include/txtuids.h
 epoc32/include/typerel.h
-epoc32/include/tz.h
-epoc32/include/tzconverter.h
-epoc32/include/tzdefines.h
-epoc32/include/tzid.h
-epoc32/include/tzid.inl
-epoc32/include/tzlocalizationdatatypes.h
-epoc32/include/tzlocalizationdatatypes.inl
-epoc32/include/tzlocalizedcityrecord.inl
-epoc32/include/tzlocalizedtimezonerecord.inl
-epoc32/include/tzlocalizer.h
-epoc32/include/tzupdate.h
 epoc32/include/udp_hdr.h
-epoc32/include/uid.h
-epoc32/include/uiklaf/private/lafappui.h
-epoc32/include/uiklaf/private/lafenv.h
-epoc32/include/uiklaf/private/lafmsg.h
-epoc32/include/uiklaf/private/lafnotcap.h
-epoc32/include/uiklaf/private/lafspane.h
-epoc32/include/uiklaf/private/lafsrv.h
-epoc32/include/uiklaf/private/lafvcurs.h
 epoc32/include/uikon.hrh
 epoc32/include/uikon.rh
-epoc32/include/uikon/eikalsrv.h
-epoc32/include/uikon/eikalsup.h
-epoc32/include/uikon/eiknfysv.h
-epoc32/include/uikon/eiksvfty.h
 epoc32/include/unified_editor.h
 epoc32/include/unifiedcertstore.h
 epoc32/include/ups/ups.hrh
@@ -3962,53 +4009,23 @@
 epoc32/include/uriutilscommon.h
 epoc32/include/utf.h
 epoc32/include/variant/symbian_os.hrh
-epoc32/include/vcal.h
-epoc32/include/vcal.inl
-epoc32/include/vcard.h
-epoc32/include/vcard.inl
 epoc32/include/versioninfo.h
 epoc32/include/versioninfo.inl
-epoc32/include/versit.h
-epoc32/include/versit.inl
-epoc32/include/versittls.h
 epoc32/include/vg/1.0/openvg.h
 epoc32/include/vg/1.0/vgu.h
 epoc32/include/videoplayer.h
 epoc32/include/videorecorder.h
-epoc32/include/viewcli.h
-epoc32/include/vobserv.h
-epoc32/include/vprop.h
-epoc32/include/vprop.inl
-epoc32/include/vrecur.h
-epoc32/include/vrecur.inl
-epoc32/include/vstaticutils.h
-epoc32/include/vtoken.h
-epoc32/include/vtzrules.h
-epoc32/include/vuid.h
-epoc32/include/vutil.h
-epoc32/include/vwsappst.h
-epoc32/include/vwsdef.h
 epoc32/include/w32adll.h
 epoc32/include/w32click.h
 epoc32/include/w32std.h
 epoc32/include/w32stdgraphic.h
 epoc32/include/wap_sock.h
-epoc32/include/wapattrdf.h
-epoc32/include/wapengstd.h
-epoc32/include/waplog.h
 epoc32/include/wapmessage.h
 epoc32/include/wapmsgerr.h
-epoc32/include/wappdef.h
-epoc32/include/waptestutils.h
-epoc32/include/waptestutils.inl
-epoc32/include/wbconverter.h
 epoc32/include/wf/wfc.h
 epoc32/include/wf/wfcext.h
 epoc32/include/wf/wfcplatform.h
-epoc32/include/wins/winscomm.h
-epoc32/include/wins/winscomm.inl
 epoc32/include/wlansdkpskeys.h
-epoc32/include/wsp/wsptypes.h
 epoc32/include/wspdecoder.h
 epoc32/include/wspencoder.h
 epoc32/include/wtlscert.h
@@ -4023,10 +4040,7 @@
 epoc32/include/x509keys.h
 epoc32/include/x520ava.h
 epoc32/include/xml/contenthandler.h
-epoc32/include/xml/contentprocessor.h
 epoc32/include/xml/contentprocessoruids.h
-epoc32/include/xml/contentsource.h
-epoc32/include/xml/documentparameters.h
 epoc32/include/xml/dom/xmlengattr.h
 epoc32/include/xml/dom/xmlengattr.inl
 epoc32/include/xml/dom/xmlengbinarycontainer.h
@@ -4077,30 +4091,16 @@
 epoc32/include/xml/dom/xmlengxpathexpression.inl
 epoc32/include/xml/dom/xmlengxpathresult.inl
 epoc32/include/xml/dom/xmlengxpathutils.inl
-epoc32/include/xml/extension.h
 epoc32/include/xml/matchdata.h
 epoc32/include/xml/parser.h
 epoc32/include/xml/parserfeature.h
-epoc32/include/xml/plugins/charsetconverter.h
-epoc32/include/xml/plugins/contentprocessorinitparams.h
-epoc32/include/xml/plugins/dictionarycodepage.h
-epoc32/include/xml/plugins/elementstack.h
-epoc32/include/xml/plugins/parserinitparams.h
-epoc32/include/xml/plugins/parserinterface.h
-epoc32/include/xml/plugins/stringdictionary.h
 epoc32/include/xml/stringdictionarycollection.h
 epoc32/include/xml/taginfo.h
-epoc32/include/xml/utils/xmlengxestrings.inl
 epoc32/include/xml/wbxmlextensionhandler.h
-epoc32/include/xml/wbxmlparsererrors.h
-epoc32/include/xml/xmlframeworkconstants.h
 epoc32/include/xml/xmlframeworkerrors.h
-epoc32/include/xml/xmlparsererrors.h
-epoc32/include/xmlelemt.h
 epoc32/include/xmlentityreferences.h
-epoc32/include/xmllib.h
 epoc32/include/ziparchive.h
 epoc32/include/zipfile.h
 epoc32/include/zipfilemember.h
 epoc32/include/zipfilememberinputstream.h
-epoc32/include/zipfilememberiterator.h
+epoc32/include/zipfilememberiterator.h
\ No newline at end of file