diff --git a/help/JclTemplate.dox b/help/JclTemplate.dox
index 403aaaf7dd..33d2f02c23 100644
--- a/help/JclTemplate.dox
+++ b/help/JclTemplate.dox
@@ -401,7 +401,7 @@ CValue_9=7872391
[Configurations]
Count=6
-Current=0
+Current=4
Name0=HTML
Name1=CHM
Name2=H2
@@ -50084,7 +50084,7 @@ GenerateTopicStructure=1
OutputDir=..\jcl\help
OutputFilename=
ShowDocumentation=1
-UseXMLDocTags=1
+UseXMLDocTags=0
[Configurations\XML\AutoDocTitles]
Saved=1
@@ -50635,7 +50635,7 @@ LocalClassHierarchyAsGraphics=0
MultiLanguage_OriginalLanguage=0
NavigationPageFileLineNumber=' (%LINENUMBER%)'
NavigationPageFileRelativePath=
-NavigationPageOptions=7
+NavigationPageOptions=8199
OutputSettings0=1
OutputSettings1=1
OutputSettings2=0
diff --git a/help/VCL.doxdb_Howto.txt b/help/VCL.doxdb_Howto.txt
new file mode 100644
index 0000000000..fb123d0329
--- /dev/null
+++ b/help/VCL.doxdb_Howto.txt
@@ -0,0 +1,5 @@
+To create VCL.doxdb, compile and execute VCLLinks.exe, its project file is located at http://projectjedi.svn.sf.net/viewvc/projectjedi/trunk/helpsync/DocOMaticTools/vcllinks/
+
+Then execute:
+ - VCLLinks query VCL.xml
+ - VCLLinks convert VCL.xml VCL.doxdb
diff --git a/jcl/packages/help/Jcl.dox b/jcl/packages/help/Jcl.dox
index 977eaec556..fc9569cf32 100644
--- a/jcl/packages/help/Jcl.dox
+++ b/jcl/packages/help/Jcl.dox
@@ -25,142 +25,143 @@ ContentFile=Jclcontents.html
IndexFile=Jclidx.html
[Project Database Files]
-Count=0
+Count=1
+File0=..\..\..\help\VCL.doxdb
[Source Files]
Count=135
-File1=..\..\source\common\bzip2.pas
-File2=..\..\source\common\Jcl8087.pas
-File3=..\..\source\common\JclAnsiStrings.pas
-File4=..\..\source\common\JclBase.pas
-File5=..\..\source\common\JclCharsets.pas
-File6=..\..\source\common\JclComplex.pas
-File7=..\..\source\common\JclCompression.pas
-File8=..\..\source\common\JclCounter.pas
-File9=..\..\source\common\JclDateTime.pas
-File10=..\..\source\common\JclExprEval.pas
-File11=..\..\source\common\JclFileUtils.pas
-File12=..\..\source\common\JclIniFiles.pas
-File13=..\..\source\common\JclLogic.pas
-File14=..\..\source\common\JclMath.pas
-File15=..\..\source\common\JclMIDI.pas
-File16=..\..\source\common\JclMime.pas
-File17=..\..\source\common\JclNotify.pas
-File18=..\..\source\common\JclPCRE.pas
-File19=..\..\source\common\JclResources.pas
-File20=..\..\source\common\JclRTTI.pas
-File21=..\..\source\common\JclSchedule.pas
-File22=..\..\source\common\JclSimpleXml.pas
-File23=..\..\source\common\JclStatistics.pas
-File24=..\..\source\common\JclStreams.pas
-File25=..\..\source\common\JclStrHashMap.pas
-File26=..\..\source\common\JclStringConversions.pas
-File27=..\..\source\common\JclStringLists.pas
-File28=..\..\source\common\JclStrings.pas
-File29=..\..\source\common\JclSynch.pas
-File30=..\..\source\common\JclSysInfo.pas
-File31=..\..\source\common\JclSysUtils.pas
-File32=..\..\source\common\JclUnicode.pas
-File33=..\..\source\common\JclUnitConv.pas
-File34=..\..\source\common\JclUnitVersioning.pas
-File35=..\..\source\common\JclUnitVersioningProviders.pas
-File36=..\..\source\common\JclValidation.pas
-File37=..\..\source\common\JclWideStrings.pas
-File38=..\..\source\common\pcre.pas
-File39=..\..\source\common\zlibh.pas
-File40=..\..\source\include\crossplatform.inc
-File41=..\..\source\include\jcl.inc
-File42=..\..\source\include\jclc6.inc
-File43=..\..\source\include\jclcs1.inc
-File44=..\..\source\include\jcld6.inc
-File45=..\..\source\include\jcld7.inc
-File46=..\..\source\include\jcld8.inc
-File47=..\..\source\include\jcld9.inc
-File48=..\..\source\include\jcld10.inc
-File49=..\..\source\include\jcld11.inc
-File50=..\..\source\include\jcld12.inc
-File51=..\..\source\include\jcld14.inc
-File52=..\..\source\include\jcld15.inc
-File53=..\..\source\include\jclfpc.inc
-File54=..\..\source\include\unixonly.inc
-File55=..\..\source\include\windowsonly.inc
-File56=..\..\source\windows\Hardlinks.pas
-File57=..\..\source\windows\JclAppInst.pas
-File58=..\..\source\windows\JclCIL.pas
-File59=..\..\source\windows\JclCLR.pas
-File60=..\..\source\windows\JclCOM.pas
-File61=..\..\source\windows\JclConsole.pas
-File62=..\..\source\windows\JclDebug.pas
-File63=..\..\source\windows\JclDebugSerialization.pas
-File64=..\..\source\windows\JclDebugXMLDeserializer.pas
-File65=..\..\source\windows\JclDebugXMLSerializer.pas
-File66=..\..\source\windows\JclHookExcept.pas
-File67=..\..\source\windows\JclLANMan.pas
-File68=..\..\source\windows\JclLocales.pas
-File69=..\..\source\windows\JclMapi.pas
-File70=..\..\source\windows\JclMetadata.pas
-File71=..\..\source\windows\JclMiscel.pas
-File72=..\..\source\windows\JclMsdosSys.pas
-File73=..\..\source\windows\JclMultimedia.pas
-File74=..\..\source\windows\JclNTFS.pas
-File75=..\..\source\windows\JclPeImage.pas
-File76=..\..\source\windows\JclRegistry.pas
-File77=..\..\source\windows\JclSecurity.pas
-File78=..\..\source\windows\JclShell.pas
-File79=..\..\source\windows\JclStructStorage.pas
-File80=..\..\source\windows\JclSvcCtrl.pas
-File81=..\..\source\windows\JclTask.pas
-File82=..\..\source\windows\JclTD32.pas
-File83=..\..\source\windows\JclTimeZones.pas
-File84=..\..\source\windows\JclWin32.pas
-File85=..\..\source\windows\JclWin32Ex.pas
-File86=..\..\source\windows\JclWinMIDI.pas
-File87=..\..\source\windows\mscoree_TLB.pas
-File88=..\..\source\windows\mscorlib_TLB.pas
-File89=..\..\source\windows\MSTask.pas
-File90=..\..\source\windows\sevenzip.pas
-File91=..\..\source\windows\Snmp.pas
-File92=..\..\..\help\8087.dtx
-File93=..\..\..\help\AppInst.dtx
-File94=..\..\..\help\Base.dtx
-File95=..\..\..\help\Com.dtx
-File96=..\..\..\help\Complex.dtx
-File97=..\..\..\help\Counter.dtx
-File98=..\..\..\help\DateTime.dtx
-File99=..\..\..\help\Debug.dtx
-File100=..\..\..\help\ExprEval.dtx
-File101=..\..\..\help\FileUtils.dtx
-File102=..\..\..\help\Hardlinks.dtx
-File103=..\..\..\help\IncludedFiles.dtx
-File104=..\..\..\help\IniFiles.dtx
-File105=..\..\..\help\Jcl.dtx
-File106=..\..\..\help\LANMan.dtx
-File107=..\..\..\help\Locales.dtx
-File108=..\..\..\help\Logic.dtx
-File109=..\..\..\help\Mapi.dtx
-File110=..\..\..\help\Math.dtx
-File111=..\..\..\help\Midi.dtx
-File112=..\..\..\help\Mime.dtx
-File113=..\..\..\help\Miscel.dtx
-File114=..\..\..\help\Multimedia.dtx
-File115=..\..\..\help\Notify.dtx
-File116=..\..\..\help\NTFS.dtx
-File117=..\..\..\help\pcre.dtx
-File118=..\..\..\help\PE.dtx
-File119=..\..\..\help\Registry.dtx
-File120=..\..\..\help\RTTI.dtx
-File121=..\..\..\help\Schedule.dtx
-File122=..\..\..\help\Security.dtx
-File123=..\..\..\help\Shell.dtx
-File124=..\..\..\help\Statistics.dtx
-File125=..\..\..\help\Streams.dtx
-File126=..\..\..\help\StrHashMap.dtx
-File127=..\..\..\help\Strings.dtx
-File128=..\..\..\help\SvcCtrl.dtx
-File129=..\..\..\help\Synch.dtx
-File130=..\..\..\help\SysInfo.dtx
-File131=..\..\..\help\SysUtils.dtx
-File132=..\..\..\help\Unicode.dtx
-File133=..\..\..\help\UnitConv.dtx
-File134=..\..\..\help\WideStrings.dtx
-File135=..\..\..\help\Win32.dtx
+File0=..\..\source\common\bzip2.pas
+File1=..\..\source\common\Jcl8087.pas
+File2=..\..\source\common\JclAnsiStrings.pas
+File3=..\..\source\common\JclBase.pas
+File4=..\..\source\common\JclCharsets.pas
+File5=..\..\source\common\JclComplex.pas
+File6=..\..\source\common\JclCompression.pas
+File7=..\..\source\common\JclCounter.pas
+File8=..\..\source\common\JclDateTime.pas
+File9=..\..\source\common\JclExprEval.pas
+File10=..\..\source\common\JclFileUtils.pas
+File11=..\..\source\common\JclIniFiles.pas
+File12=..\..\source\common\JclLogic.pas
+File13=..\..\source\common\JclMath.pas
+File14=..\..\source\common\JclMIDI.pas
+File15=..\..\source\common\JclMime.pas
+File16=..\..\source\common\JclNotify.pas
+File17=..\..\source\common\JclPCRE.pas
+File18=..\..\source\common\JclResources.pas
+File19=..\..\source\common\JclRTTI.pas
+File20=..\..\source\common\JclSchedule.pas
+File21=..\..\source\common\JclSimpleXml.pas
+File22=..\..\source\common\JclStatistics.pas
+File23=..\..\source\common\JclStreams.pas
+File24=..\..\source\common\JclStrHashMap.pas
+File25=..\..\source\common\JclStringConversions.pas
+File26=..\..\source\common\JclStringLists.pas
+File27=..\..\source\common\JclStrings.pas
+File28=..\..\source\common\JclSynch.pas
+File29=..\..\source\common\JclSysInfo.pas
+File30=..\..\source\common\JclSysUtils.pas
+File31=..\..\source\common\JclUnicode.pas
+File32=..\..\source\common\JclUnitConv.pas
+File33=..\..\source\common\JclUnitVersioning.pas
+File34=..\..\source\common\JclUnitVersioningProviders.pas
+File35=..\..\source\common\JclValidation.pas
+File36=..\..\source\common\JclWideStrings.pas
+File37=..\..\source\common\pcre.pas
+File38=..\..\source\common\zlibh.pas
+File39=..\..\source\include\crossplatform.inc
+File40=..\..\source\include\jcl.inc
+File41=..\..\source\include\jclc6.inc
+File42=..\..\source\include\jclcs1.inc
+File43=..\..\source\include\jcld6.inc
+File44=..\..\source\include\jcld7.inc
+File45=..\..\source\include\jcld8.inc
+File46=..\..\source\include\jcld9.inc
+File47=..\..\source\include\jcld10.inc
+File48=..\..\source\include\jcld11.inc
+File49=..\..\source\include\jcld12.inc
+File50=..\..\source\include\jcld14.inc
+File51=..\..\source\include\jcld15.inc
+File52=..\..\source\include\jclfpc.inc
+File53=..\..\source\include\unixonly.inc
+File54=..\..\source\include\windowsonly.inc
+File55=..\..\source\windows\Hardlinks.pas
+File56=..\..\source\windows\JclAppInst.pas
+File57=..\..\source\windows\JclCIL.pas
+File58=..\..\source\windows\JclCLR.pas
+File59=..\..\source\windows\JclCOM.pas
+File60=..\..\source\windows\JclConsole.pas
+File61=..\..\source\windows\JclDebug.pas
+File62=..\..\source\windows\JclDebugSerialization.pas
+File63=..\..\source\windows\JclDebugXMLDeserializer.pas
+File64=..\..\source\windows\JclDebugXMLSerializer.pas
+File65=..\..\source\windows\JclHookExcept.pas
+File66=..\..\source\windows\JclLANMan.pas
+File67=..\..\source\windows\JclLocales.pas
+File68=..\..\source\windows\JclMapi.pas
+File69=..\..\source\windows\JclMetadata.pas
+File70=..\..\source\windows\JclMiscel.pas
+File71=..\..\source\windows\JclMsdosSys.pas
+File72=..\..\source\windows\JclMultimedia.pas
+File73=..\..\source\windows\JclNTFS.pas
+File74=..\..\source\windows\JclPeImage.pas
+File75=..\..\source\windows\JclRegistry.pas
+File76=..\..\source\windows\JclSecurity.pas
+File77=..\..\source\windows\JclShell.pas
+File78=..\..\source\windows\JclStructStorage.pas
+File79=..\..\source\windows\JclSvcCtrl.pas
+File80=..\..\source\windows\JclTask.pas
+File81=..\..\source\windows\JclTD32.pas
+File82=..\..\source\windows\JclTimeZones.pas
+File83=..\..\source\windows\JclWin32.pas
+File84=..\..\source\windows\JclWin32Ex.pas
+File85=..\..\source\windows\JclWinMIDI.pas
+File86=..\..\source\windows\mscoree_TLB.pas
+File87=..\..\source\windows\mscorlib_TLB.pas
+File88=..\..\source\windows\MSTask.pas
+File89=..\..\source\windows\sevenzip.pas
+File90=..\..\source\windows\Snmp.pas
+File91=..\..\..\help\8087.dtx
+File92=..\..\..\help\AppInst.dtx
+File93=..\..\..\help\Base.dtx
+File94=..\..\..\help\Com.dtx
+File95=..\..\..\help\Complex.dtx
+File96=..\..\..\help\Counter.dtx
+File97=..\..\..\help\DateTime.dtx
+File98=..\..\..\help\Debug.dtx
+File99=..\..\..\help\ExprEval.dtx
+File100=..\..\..\help\FileUtils.dtx
+File101=..\..\..\help\Hardlinks.dtx
+File102=..\..\..\help\IncludedFiles.dtx
+File103=..\..\..\help\IniFiles.dtx
+File104=..\..\..\help\Jcl.dtx
+File105=..\..\..\help\LANMan.dtx
+File106=..\..\..\help\Locales.dtx
+File107=..\..\..\help\Logic.dtx
+File108=..\..\..\help\Mapi.dtx
+File109=..\..\..\help\Math.dtx
+File110=..\..\..\help\Midi.dtx
+File111=..\..\..\help\Mime.dtx
+File112=..\..\..\help\Miscel.dtx
+File113=..\..\..\help\Multimedia.dtx
+File114=..\..\..\help\Notify.dtx
+File115=..\..\..\help\NTFS.dtx
+File116=..\..\..\help\pcre.dtx
+File117=..\..\..\help\PE.dtx
+File118=..\..\..\help\Registry.dtx
+File119=..\..\..\help\RTTI.dtx
+File120=..\..\..\help\Schedule.dtx
+File121=..\..\..\help\Security.dtx
+File122=..\..\..\help\Shell.dtx
+File123=..\..\..\help\Statistics.dtx
+File124=..\..\..\help\Streams.dtx
+File125=..\..\..\help\StrHashMap.dtx
+File126=..\..\..\help\Strings.dtx
+File127=..\..\..\help\SvcCtrl.dtx
+File128=..\..\..\help\Synch.dtx
+File129=..\..\..\help\SysInfo.dtx
+File130=..\..\..\help\SysUtils.dtx
+File131=..\..\..\help\Unicode.dtx
+File132=..\..\..\help\UnitConv.dtx
+File133=..\..\..\help\WideStrings.dtx
+File134=..\..\..\help\Win32.dtx
diff --git a/jcl/packages/help/JclContainers.dox b/jcl/packages/help/JclContainers.dox
index 202f790312..a152deb8fa 100644
--- a/jcl/packages/help/JclContainers.dox
+++ b/jcl/packages/help/JclContainers.dox
@@ -25,25 +25,26 @@ ContentFile=JclContainerscontents.html
IndexFile=JclContainersidx.html
[Project Database Files]
-Count=1
-File0=Jcl.doxdb
+Count=2
+File0=..\..\..\help\VCL.doxdb
+File1=Jcl.doxdb
[Source Files]
Count=17
-File1=..\..\source\common\JclAbstractContainers.pas
-File2=..\..\source\common\JclAlgorithms.pas
-File3=..\..\source\common\JclArrayLists.pas
-File4=..\..\source\common\JclArraySets.pas
-File5=..\..\source\common\JclBinaryTrees.pas
-File6=..\..\source\common\JclContainerIntf.pas
-File7=..\..\source\common\JclHashMaps.pas
-File8=..\..\source\common\JclHashSets.pas
-File9=..\..\source\common\JclLinkedLists.pas
-File10=..\..\source\common\JclQueues.pas
-File11=..\..\source\common\JclSortedMaps.pas
-File12=..\..\source\common\JclStacks.pas
-File13=..\..\source\common\JclTrees.pas
-File14=..\..\source\common\JclVectors.pas
-File15=..\..\..\help\ContainerCopies.dtx
-File16=..\..\..\help\Containers.dtx
-File17=..\..\..\help\JclContainers.dtx
+File0=..\..\source\common\JclAbstractContainers.pas
+File1=..\..\source\common\JclAlgorithms.pas
+File2=..\..\source\common\JclArrayLists.pas
+File3=..\..\source\common\JclArraySets.pas
+File4=..\..\source\common\JclBinaryTrees.pas
+File5=..\..\source\common\JclContainerIntf.pas
+File6=..\..\source\common\JclHashMaps.pas
+File7=..\..\source\common\JclHashSets.pas
+File8=..\..\source\common\JclLinkedLists.pas
+File9=..\..\source\common\JclQueues.pas
+File10=..\..\source\common\JclSortedMaps.pas
+File11=..\..\source\common\JclStacks.pas
+File12=..\..\source\common\JclTrees.pas
+File13=..\..\source\common\JclVectors.pas
+File14=..\..\..\help\ContainerCopies.dtx
+File15=..\..\..\help\Containers.dtx
+File16=..\..\..\help\JclContainers.dtx
diff --git a/jcl/packages/help/JclDeveloperTools.dox b/jcl/packages/help/JclDeveloperTools.dox
index efcae66ade..3e687597fe 100644
--- a/jcl/packages/help/JclDeveloperTools.dox
+++ b/jcl/packages/help/JclDeveloperTools.dox
@@ -25,38 +25,39 @@ ContentFile=JclDeveloperToolscontents.html
IndexFile=JclDeveloperToolsidx.html
[Project Database Files]
-Count=2
-File0=Jcl.doxdb
-File1=JclContainers.doxdb
+Count=3
+File0=..\..\..\help\VCL.doxdb
+File1=Jcl.doxdb
+File2=JclContainers.doxdb
[Source Files]
Count=29
-File1=..\..\source\common\JclCompilerUtils.pas
-File2=..\..\source\common\JclDevToolsResources.pas
-File3=..\..\source\common\JclIDEUtils.pas
-File4=..\..\source\common\JclPreProcessorAlgorithmsTemplates.pas
-File5=..\..\source\common\JclPreProcessorArrayListsTemplates.pas
-File6=..\..\source\common\JclPreProcessorArraySetsTemplates.pas
-File7=..\..\source\common\JclPreProcessorBinaryTreesTemplates.pas
-File8=..\..\source\common\JclPreProcessorContainer1DTemplates.pas
-File9=..\..\source\common\JclPreProcessorContainer2DTemplates.pas
-File10=..\..\source\common\JclPreProcessorContainerIntfTemplates.pas
-File11=..\..\source\common\JclPreProcessorContainerKnownMaps.pas
-File12=..\..\source\common\JclPreProcessorContainerKnownTypes.pas
-File13=..\..\source\common\JclPreProcessorContainerTemplates.pas
-File14=..\..\source\common\JclPreProcessorContainerTypes.pas
-File15=..\..\source\common\JclPreProcessorExcDlgTemplates.pas
-File16=..\..\source\common\JclPreProcessorHashMapsTemplates.pas
-File17=..\..\source\common\JclPreProcessorLexer.pas
-File18=..\..\source\common\JclPreProcessorLinkedListsTemplates.pas
-File19=..\..\source\common\JclPreProcessorParser.pas
-File20=..\..\source\common\JclPreProcessorQueuesTemplates.pas
-File21=..\..\source\common\JclPreProcessorSortedMapsTemplates.pas
-File22=..\..\source\common\JclPreProcessorStacksTemplates.pas
-File23=..\..\source\common\JclPreProcessorTemplates.pas
-File24=..\..\source\common\JclPreProcessorTreesTemplates.pas
-File25=..\..\source\common\JclPreProcessorVectorsTemplates.pas
-File26=..\..\source\common\JclUsesUtils.pas
-File27=..\..\source\windows\JclHelpUtils.pas
-File28=..\..\source\windows\MSHelpServices_TLB.pas
-File29=..\..\..\help\JclDeveloperTools.dtx
+File0=..\..\source\common\JclCompilerUtils.pas
+File1=..\..\source\common\JclDevToolsResources.pas
+File2=..\..\source\common\JclIDEUtils.pas
+File3=..\..\source\common\JclPreProcessorAlgorithmsTemplates.pas
+File4=..\..\source\common\JclPreProcessorArrayListsTemplates.pas
+File5=..\..\source\common\JclPreProcessorArraySetsTemplates.pas
+File6=..\..\source\common\JclPreProcessorBinaryTreesTemplates.pas
+File7=..\..\source\common\JclPreProcessorContainer1DTemplates.pas
+File8=..\..\source\common\JclPreProcessorContainer2DTemplates.pas
+File9=..\..\source\common\JclPreProcessorContainerIntfTemplates.pas
+File10=..\..\source\common\JclPreProcessorContainerKnownMaps.pas
+File11=..\..\source\common\JclPreProcessorContainerKnownTypes.pas
+File12=..\..\source\common\JclPreProcessorContainerTemplates.pas
+File13=..\..\source\common\JclPreProcessorContainerTypes.pas
+File14=..\..\source\common\JclPreProcessorExcDlgTemplates.pas
+File15=..\..\source\common\JclPreProcessorHashMapsTemplates.pas
+File16=..\..\source\common\JclPreProcessorLexer.pas
+File17=..\..\source\common\JclPreProcessorLinkedListsTemplates.pas
+File18=..\..\source\common\JclPreProcessorParser.pas
+File19=..\..\source\common\JclPreProcessorQueuesTemplates.pas
+File20=..\..\source\common\JclPreProcessorSortedMapsTemplates.pas
+File21=..\..\source\common\JclPreProcessorStacksTemplates.pas
+File22=..\..\source\common\JclPreProcessorTemplates.pas
+File23=..\..\source\common\JclPreProcessorTreesTemplates.pas
+File24=..\..\source\common\JclPreProcessorVectorsTemplates.pas
+File25=..\..\source\common\JclUsesUtils.pas
+File26=..\..\source\windows\JclHelpUtils.pas
+File27=..\..\source\windows\MSHelpServices_TLB.pas
+File28=..\..\..\help\JclDeveloperTools.dtx
diff --git a/jcl/packages/help/JclVcl.dox b/jcl/packages/help/JclVcl.dox
index 4ded047b40..db5e7b82cc 100644
--- a/jcl/packages/help/JclVcl.dox
+++ b/jcl/packages/help/JclVcl.dox
@@ -25,23 +25,24 @@ ContentFile=JclVclcontents.html
IndexFile=JclVclidx.html
[Project Database Files]
-Count=1
-File0=Jcl.doxdb
+Count=2
+File0=..\..\..\help\VCL.doxdb
+File1=Jcl.doxdb
[Source Files]
Count=15
-File1=..\..\source\vcl\JclPrint.pas
-File2=..\..\source\vcl\JclGraphUtils.pas
-File3=..\..\source\vcl\JclGraphics.pas
-File4=..\..\source\vcl\JclFont.pas
-File5=..\..\source\vcl\JclOpenDialogHooks.pas
-File6=..\..\source\vcl\JclOpenDialogFavorites.pas
-File7=..\..\source\vcl\JclVclResources.pas
-File8=..\..\source\vcl\JclVersionControl.pas
-File9=..\..\source\vcl\JclVersionCtrlCVSImpl.pas
-File10=..\..\source\vcl\JclVersionCtrlSVNImpl.pas
-File11=..\..\..\help\Bitmap32.dtx
-File12=..\..\..\help\Font.dtx
-File13=..\..\..\help\Graphics.dtx
-File14=..\..\..\help\JclVcl.dtx
-File15=..\..\..\help\Regions.dtx
+File0=..\..\source\vcl\JclPrint.pas
+File1=..\..\source\vcl\JclGraphUtils.pas
+File2=..\..\source\vcl\JclGraphics.pas
+File3=..\..\source\vcl\JclFont.pas
+File4=..\..\source\vcl\JclOpenDialogHooks.pas
+File5=..\..\source\vcl\JclOpenDialogFavorites.pas
+File6=..\..\source\vcl\JclVclResources.pas
+File7=..\..\source\vcl\JclVersionControl.pas
+File8=..\..\source\vcl\JclVersionCtrlCVSImpl.pas
+File9=..\..\source\vcl\JclVersionCtrlSVNImpl.pas
+File10=..\..\..\help\Bitmap32.dtx
+File11=..\..\..\help\Font.dtx
+File12=..\..\..\help\Graphics.dtx
+File13=..\..\..\help\JclVcl.dtx
+File14=..\..\..\help\Regions.dtx
diff --git a/jcl/packages/help/template.dox b/jcl/packages/help/template.dox
index bf09f2b37f..2c49cdb9cf 100644
--- a/jcl/packages/help/template.dox
+++ b/jcl/packages/help/template.dox
@@ -45,5 +45,5 @@ File%INDEX0%=%NAME%.doxdb
[Source Files]
Count=%CONTAINCOUNT%
<%%% START FILES %%%>
-File%INDEX%=%FILENAME%
+File%INDEX0%=%FILENAME%
<%%% END FILES %%%>
diff --git a/jcl/packages/xml/Jcl-R.xml b/jcl/packages/xml/Jcl-R.xml
index 1e97279a8a..6e34b8cfb6 100644
--- a/jcl/packages/xml/Jcl-R.xml
+++ b/jcl/packages/xml/Jcl-R.xml
@@ -9,6 +9,7 @@
+
diff --git a/jcl/packages/xml/JclContainers-R.xml b/jcl/packages/xml/JclContainers-R.xml
index 4042a6c106..4ad9453761 100644
--- a/jcl/packages/xml/JclContainers-R.xml
+++ b/jcl/packages/xml/JclContainers-R.xml
@@ -13,6 +13,7 @@
+
diff --git a/jcl/packages/xml/JclDeveloperTools-R.xml b/jcl/packages/xml/JclDeveloperTools-R.xml
index 116053d727..13712427f8 100644
--- a/jcl/packages/xml/JclDeveloperTools-R.xml
+++ b/jcl/packages/xml/JclDeveloperTools-R.xml
@@ -12,6 +12,7 @@
+
diff --git a/jcl/packages/xml/JclVcl-R.xml b/jcl/packages/xml/JclVcl-R.xml
index 0c466e3b09..6b288dd469 100644
--- a/jcl/packages/xml/JclVcl-R.xml
+++ b/jcl/packages/xml/JclVcl-R.xml
@@ -11,6 +11,7 @@
+