move help compiler/linker/indexer to a new module

we may want to use syntax highlighter class from svtools later,
which is not available for l10ntools

Change-Id: I5a06b77cb6935e3ef68015fb608aa26ac7c53fac

37 files changed, 86 insertions, 43 deletions

diff --git a/Makefile.top b/Makefile.top
index 9387d1e3aff1..1a15b3eafeaa 100644
--- a/Makefile.top
+++ b/Makefile.top
@@ -74,6 +74,7 @@ forms\
 formula\
 fpicker\
 framework\
+helpcompiler\
 hsqldb\
 hwpfilter\
 i18npool\
diff --git a/Module_cross_tail_build.mk b/Module_cross_tail_build.mk
index f0e5ca063f24..bf9ed3aaac51 100644
--- a/Module_cross_tail_build.mk
+++ b/Module_cross_tail_build.mk
@@ -39,6 +39,7 @@ $(eval $(call gb_Module_add_moduledirs,cross_tail_build,\
 	javaunohelper \
 	$(if $(filter DESKTOP,$(BUILD_TYPE)),\
 		l10ntools \
+		helpcompiler \
 	) \
 	o3tl \
 	oovbaapi \
diff --git a/Module_tail_build.mk b/Module_tail_build.mk
index 9c9f636fd5fb..ec9e006ecf82 100644
--- a/Module_tail_build.mk
+++ b/Module_tail_build.mk
@@ -159,6 +159,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\
 	) \
     xmerge \
 	$(if $(filter DESKTOP,$(BUILD_TYPE)), \
+	    helpcompiler \
 	    xmlhelp) \
     xmloff \
     xmlscript \
diff --git a/desktop/prj/build.lst b/desktop/prj/build.lst
index 6ec807a45361..c9644a09a253 100644
--- a/desktop/prj/build.lst
+++ b/desktop/prj/build.lst
@@ -1,3 +1,3 @@
-dt      desktop :    TRANSLATIONS:translations sfx2 stoc BERKELEYDB:berkeleydb BOOST:boost svx DESKTOP:xmlhelp sal salhelper unoil officecfg offapi filter LIBXSLT:libxslt NULL
+dt      desktop :    TRANSLATIONS:translations sfx2 stoc BERKELEYDB:berkeleydb BOOST:boost svx DESKTOP:xmlhelp sal salhelper unoil officecfg offapi filter LIBXSLT:libxslt DESKTOP:helpcompiler NULL
 dt	desktop									usr1	-	all	dt_mkout NULL
 dt	desktop\prj						nmake	-	all	dt_prj NULL
diff --git a/desktop/source/deployment/registry/help/dp_help.cxx b/desktop/source/deployment/registry/help/dp_help.cxx
index b094d20ec523..7af20604a911 100644
--- a/desktop/source/deployment/registry/help/dp_help.cxx
+++ b/desktop/source/deployment/registry/help/dp_help.cxx
@@ -42,8 +42,8 @@
 #include "unotools/pathoptions.hxx"
 
 #if !defined(ANDROID) && !defined(IOS)
-#include <l10ntools/compilehelp.hxx>
-#include <l10ntools/HelpIndexer.hxx>
+#include <helpcompiler/compilehelp.hxx>
+#include <helpcompiler/HelpIndexer.hxx>
 #endif
 #include <com/sun/star/ucb/SimpleFileAccess.hpp>
 #include <com/sun/star/ucb/XSimpleFileAccess2.hpp>
diff --git a/l10ntools/Executable_helpindexer.mk b/helpcompiler/Executable_helpindexer.mk
index c9ce8bae4790..f7249b9a66d0 100644
--- a/l10ntools/Executable_helpindexer.mk
+++ b/helpcompiler/Executable_helpindexer.mk
@@ -27,7 +27,7 @@
 $(eval $(call gb_Executable_Executable,HelpIndexer))
 
 $(eval $(call gb_Executable_use_package,HelpIndexer,\
-    l10ntools_inc \
+    helpcompiler_inc \
 ))
 
 $(eval $(call gb_Executable_use_libraries,HelpIndexer,\
@@ -44,7 +44,7 @@ $(eval $(call gb_Executable_use_externals,HelpIndexer,\
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,HelpIndexer,\
-    l10ntools/source/help/HelpIndexer_main \
+    helpcompiler/source/HelpIndexer_main \
 ))
 
 # vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/l10ntools/Executable_helplinker.mk b/helpcompiler/Executable_helplinker.mk
index 534c10a62a61..4682943c7d4b 100644
--- a/l10ntools/Executable_helplinker.mk
+++ b/helpcompiler/Executable_helplinker.mk
@@ -27,7 +27,7 @@
 $(eval $(call gb_Executable_Executable,HelpLinker))
 
 $(eval $(call gb_Executable_use_package,HelpLinker,\
-    l10ntools_inc \
+    helpcompiler_inc \
 ))
 
 $(eval $(call gb_Executable_use_libraries,HelpLinker,\
@@ -44,7 +44,7 @@ $(eval $(call gb_Executable_use_externals,HelpLinker,\
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,HelpLinker,\
-    l10ntools/source/help/HelpLinker_main \
+    helpcompiler/source/HelpLinker_main \
 ))
 
 # vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/l10ntools/Library_helplinker.mk b/helpcompiler/Library_helplinker.mk
index 8cabe50768aa..8395dd5a1467 100644
--- a/l10ntools/Library_helplinker.mk
+++ b/helpcompiler/Library_helplinker.mk
@@ -27,7 +27,7 @@
 $(eval $(call gb_Library_Library,helplinker))
 
 $(eval $(call gb_Library_use_package,helplinker,\
-    l10ntools_inc\
+    helpcompiler_inc\
 ))
 
 $(eval $(call gb_Library_add_defs,helplinker,\
@@ -48,20 +48,20 @@ $(eval $(call gb_Library_use_externals,helplinker,\
 ))
 
 $(eval $(call gb_Library_add_exception_objects,helplinker,\
-    l10ntools/source/help/HelpCompiler \
-    l10ntools/source/help/LuceneHelper \
-    l10ntools/source/help/HelpIndexer \
-    l10ntools/source/help/HelpSearch \
+    helpcompiler/source/HelpCompiler \
+    helpcompiler/source/LuceneHelper \
+    helpcompiler/source/HelpIndexer \
+    helpcompiler/source/HelpSearch \
 ))
 
 ifeq ($(strip $(OS)$(CPU)$(COM)),MACOSXPGCC)
 $(eval $(call gb_Library_add_cxxobjects,helplinker,\
-    l10ntools/source/help/HelpLinker \
+    helpcompiler/source/HelpLinker \
     , $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \
 ))
 else
 $(eval $(call gb_Library_add_exception_objects,helplinker,\
-    l10ntools/source/help/HelpLinker \
+    helpcompiler/source/HelpLinker \
 ))
 endif
 
diff --git a/helpcompiler/Makefile b/helpcompiler/Makefile
new file mode 100644
index 000000000000..ccb1c85a04da
--- /dev/null
+++ b/helpcompiler/Makefile
@@ -0,0 +1,7 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
+
+include $(module_directory)/../solenv/gbuild/partial_build.mk
+
+# vim: set noet sw=4 ts=4:
diff --git a/helpcompiler/Module_helpcompiler.mk b/helpcompiler/Module_helpcompiler.mk
new file mode 100644
index 000000000000..f0470395fe84
--- /dev/null
+++ b/helpcompiler/Module_helpcompiler.mk
@@ -0,0 +1,19 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_Module_Module,helpcompiler))
+
+$(eval $(call gb_Module_add_targets,helpcompiler,\
+    Executable_helpindexer \
+    Executable_helplinker \
+    Library_helplinker \
+    Package_inc \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/helpcompiler/Package_inc.mk b/helpcompiler/Package_inc.mk
new file mode 100644
index 000000000000..b0717b247a53
--- /dev/null
+++ b/helpcompiler/Package_inc.mk
@@ -0,0 +1,19 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+# 
+
+$(eval $(call gb_Package_Package,helpcompiler_inc,$(SRCDIR)/helpcompiler))
+
+$(eval $(call gb_Package_add_file,helpcompiler_inc,inc/helpcompiler/dllapi.h,inc/dllapi.h))
+$(eval $(call gb_Package_add_file,helpcompiler_inc,inc/helpcompiler/compilehelp.hxx,inc/compilehelp.hxx))
+$(eval $(call gb_Package_add_file,helpcompiler_inc,inc/helpcompiler/HelpCompiler.hxx,inc/HelpCompiler.hxx))
+$(eval $(call gb_Package_add_file,helpcompiler_inc,inc/helpcompiler/HelpIndexer.hxx,inc/HelpIndexer.hxx))
+$(eval $(call gb_Package_add_file,helpcompiler_inc,inc/helpcompiler/HelpLinker.hxx,inc/HelpLinker.hxx))
+$(eval $(call gb_Package_add_file,helpcompiler_inc,inc/helpcompiler/HelpSearch.hxx,inc/HelpSearch.hxx))
+
+# vim: set noet sw=4 ts=4:
diff --git a/l10ntools/source/help/HelpCompiler.hxx b/helpcompiler/inc/HelpCompiler.hxx
index 49ebd602501d..825a55c0330f 100644
--- a/l10ntools/source/help/HelpCompiler.hxx
+++ b/helpcompiler/inc/HelpCompiler.hxx
@@ -57,7 +57,7 @@
 #include <osl/process.h>
 #include <osl/file.hxx>
 
-#include <compilehelp.hxx>
+#include <helpcompiler/compilehelp.hxx>
 
 #if OSL_DEBUG_LEVEL > 2
     #include <iostream>
diff --git a/l10ntools/inc/l10ntools/HelpIndexer.hxx b/helpcompiler/inc/HelpIndexer.hxx
index f81bca3fe393..0a2fb9421719 100644
--- a/l10ntools/inc/l10ntools/HelpIndexer.hxx
+++ b/helpcompiler/inc/HelpIndexer.hxx
@@ -30,7 +30,7 @@
 #ifndef HELPINDEXER_HXX
 #define HELPINDEXER_HXX
 
-#include <l10ntools/dllapi.h>
+#include <helpcompiler/dllapi.h>
 
 #include <rtl/ustring.hxx>
 #include <set>
diff --git a/l10ntools/inc/l10ntools/HelpLinker.hxx b/helpcompiler/inc/HelpLinker.hxx
index 4befcd4669a1..f6b8ddb86040 100644
--- a/l10ntools/inc/l10ntools/HelpLinker.hxx
+++ b/helpcompiler/inc/HelpLinker.hxx
@@ -29,7 +29,7 @@
 #ifndef HELPLINKER_HXX
 #define HELPLINKER_HXX
 
-#include <l10ntools/dllapi.h>
+#include <helpcompiler/dllapi.h>
 #include <libxslt/transform.h>
 
 #ifdef AIX
diff --git a/l10ntools/inc/l10ntools/HelpSearch.hxx b/helpcompiler/inc/HelpSearch.hxx
index e4a846a926dd..e232b5ad2ff8 100644
--- a/l10ntools/inc/l10ntools/HelpSearch.hxx
+++ b/helpcompiler/inc/HelpSearch.hxx
@@ -30,7 +30,7 @@
 #ifndef HELPSEARCH_HXX
 #define HELPSEARCH_HXX
 
-#include <l10ntools/dllapi.h>
+#include <helpcompiler/dllapi.h>
 
 #include <rtl/ustring.hxx>
 #include <vector>
diff --git a/l10ntools/source/help/compilehelp.hxx b/helpcompiler/inc/compilehelp.hxx
index cbac6e6c87b9..cbac6e6c87b9 100644
--- a/l10ntools/source/help/compilehelp.hxx
+++ b/helpcompiler/inc/compilehelp.hxx
diff --git a/l10ntools/inc/l10ntools/dllapi.h b/helpcompiler/inc/dllapi.h
index 184a590944ed..184a590944ed 100644
--- a/l10ntools/inc/l10ntools/dllapi.h
+++ b/helpcompiler/inc/dllapi.h
diff --git a/helpcompiler/prj/build.lst b/helpcompiler/prj/build.lst
new file mode 100644
index 000000000000..2f74f6096c21
--- /dev/null
+++ b/helpcompiler/prj/build.lst
@@ -0,0 +1,3 @@
+tr helpcompiler : BERKELEYDB:berkeleydb EXPAT:expat LIBXSLT:libxslt CLUCENE:clucene sal NULL
+tr	helpcompiler					usr1	-	all	tr_mkout NULL
+tr	helpcompiler\prj					nmake	-	all	tr_prj NULL
diff --git a/helpcompiler/prj/d.lst b/helpcompiler/prj/d.lst
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/helpcompiler/prj/d.lst
diff --git a/l10ntools/source/help/HelpCompiler.cxx b/helpcompiler/source/HelpCompiler.cxx
index 2a5fda5a79ce..07989e4b953b 100644
--- a/l10ntools/source/help/HelpCompiler.cxx
+++ b/helpcompiler/source/HelpCompiler.cxx
@@ -27,7 +27,7 @@
  ************************************************************************/
 
 
-#include "HelpCompiler.hxx"
+#include <helpcompiler/HelpCompiler.hxx>
 #include <limits.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/l10ntools/source/help/HelpIndexer.cxx b/helpcompiler/source/HelpIndexer.cxx
index 72a0d045229e..05db910f7e17 100644
--- a/l10ntools/source/help/HelpIndexer.cxx
+++ b/helpcompiler/source/HelpIndexer.cxx
@@ -27,7 +27,7 @@
  * instead of those above.
  */
 
-#include <l10ntools/HelpIndexer.hxx>
+#include <helpcompiler/HelpIndexer.hxx>
 
 #include <rtl/string.hxx>
 #include <rtl/uri.hxx>
diff --git a/l10ntools/source/help/HelpIndexer_main.cxx b/helpcompiler/source/HelpIndexer_main.cxx
index 48e0f3eecdda..3fe04021b8d9 100644
--- a/l10ntools/source/help/HelpIndexer_main.cxx
+++ b/helpcompiler/source/HelpIndexer_main.cxx
@@ -27,7 +27,7 @@
  * instead of those above.
  */
 
-#include <l10ntools/HelpIndexer.hxx>
+#include <helpcompiler/HelpIndexer.hxx>
 #include <osl/file.hxx>
 #include <osl/process.h>
 #include <osl/thread.h>
diff --git a/l10ntools/source/help/HelpLinker.cxx b/helpcompiler/source/HelpLinker.cxx
index dd1057a3d25b..242627c0476d 100644
--- a/l10ntools/source/help/HelpLinker.cxx
+++ b/helpcompiler/source/HelpLinker.cxx
@@ -26,8 +26,8 @@
  *
  ************************************************************************/
 
-#include "HelpCompiler.hxx"
-#include "l10ntools/HelpLinker.hxx"
+#include <helpcompiler/HelpCompiler.hxx>
+#include <helpcompiler/HelpLinker.hxx>
 
 #include <map>
 
@@ -425,7 +425,7 @@ void HelpLinker::link() throw( HelpProcessingException )
         if (!bExtensionMode && xhpFileName.rfind(".xhp") != xhpFileName.length()-4)
         {
             // only work on .xhp - files
-            SAL_WARN("l10ntools",
+            SAL_WARN("helpcompiler",
                 "ERROR: input list entry '"
                     << xhpFileName
                     << "' has the wrong extension (only files with extension .xhp "
diff --git a/l10ntools/source/help/HelpLinker_main.cxx b/helpcompiler/source/HelpLinker_main.cxx
index 54ce8916d1b9..1c5ca7e3372f 100644
--- a/l10ntools/source/help/HelpLinker_main.cxx
+++ b/helpcompiler/source/HelpLinker_main.cxx
@@ -26,8 +26,8 @@
  *
  ************************************************************************/
 
-#include "HelpCompiler.hxx"
-#include "l10ntools/HelpLinker.hxx"
+#include <helpcompiler/HelpCompiler.hxx>
+#include <helpcompiler/HelpLinker.hxx>
 #include <iostream>
 #include <sal/main.h>
 
diff --git a/l10ntools/source/help/HelpSearch.cxx b/helpcompiler/source/HelpSearch.cxx
index 64c0ed16aca7..40022c22b505 100644
--- a/l10ntools/source/help/HelpSearch.cxx
+++ b/helpcompiler/source/HelpSearch.cxx
@@ -27,7 +27,7 @@
  * instead of those above.
  */
 
-#include <l10ntools/HelpSearch.hxx>
+#include <helpcompiler/HelpSearch.hxx>
 #include <osl/file.hxx>
 #include <osl/thread.hxx>
 
diff --git a/l10ntools/source/help/LuceneHelper.cxx b/helpcompiler/source/LuceneHelper.cxx
index bee9090cc2b7..bee9090cc2b7 100644
--- a/l10ntools/source/help/LuceneHelper.cxx
+++ b/helpcompiler/source/LuceneHelper.cxx
diff --git a/l10ntools/source/help/LuceneHelper.hxx b/helpcompiler/source/LuceneHelper.hxx
index a0248f836a1f..a0248f836a1f 100644
--- a/l10ntools/source/help/LuceneHelper.hxx
+++ b/helpcompiler/source/LuceneHelper.hxx
diff --git a/l10ntools/Module_l10ntools.mk b/l10ntools/Module_l10ntools.mk
index e3c11344a0c9..06b2083073ae 100644
--- a/l10ntools/Module_l10ntools.mk
+++ b/l10ntools/Module_l10ntools.mk
@@ -36,10 +36,7 @@ $(eval $(call gb_Module_add_targets,l10ntools,\
     Executable_xrmex \
     Executable_localize \
     Executable_transex3 \
-    Executable_helpindexer \
-    Executable_helplinker \
     StaticLibrary_transex \
-    Library_helplinker \
     Package_inc \
     Package_scripts \
     Package_ulfconv \
diff --git a/l10ntools/Package_inc.mk b/l10ntools/Package_inc.mk
index 025a6767d6cc..c990c154f502 100644
--- a/l10ntools/Package_inc.mk
+++ b/l10ntools/Package_inc.mk
@@ -27,14 +27,9 @@
 $(eval $(call gb_Package_Package,l10ntools_inc,$(SRCDIR)/l10ntools))
 
 $(eval $(call gb_Package_add_file,l10ntools_inc,inc/l10ntools/export.hxx,inc/export.hxx))
-$(eval $(call gb_Package_add_file,l10ntools_inc,inc/l10ntools/dllapi.h,inc/l10ntools/dllapi.h))
 $(eval $(call gb_Package_add_file,l10ntools_inc,inc/l10ntools/directory.hxx,inc/l10ntools/directory.hxx))
 $(eval $(call gb_Package_add_file,l10ntools_inc,inc/l10ntools/file.hxx,inc/l10ntools/file.hxx))
-$(eval $(call gb_Package_add_file,l10ntools_inc,inc/l10ntools/HelpIndexer.hxx,inc/l10ntools/HelpIndexer.hxx))
-$(eval $(call gb_Package_add_file,l10ntools_inc,inc/l10ntools/HelpLinker.hxx,inc/l10ntools/HelpLinker.hxx))
-$(eval $(call gb_Package_add_file,l10ntools_inc,inc/l10ntools/HelpSearch.hxx,inc/l10ntools/HelpSearch.hxx))
 $(eval $(call gb_Package_add_file,l10ntools_inc,inc/l10ntools/FCFGMerge.cfg,source/filter/merge/FCFGMerge.cfg))
-$(eval $(call gb_Package_add_file,l10ntools_inc,inc/l10ntools/compilehelp.hxx,source/help/compilehelp.hxx))
 
 
 # vim: set noet sw=4 ts=4:
diff --git a/l10ntools/prj/build.lst b/l10ntools/prj/build.lst
index c1e47969eddb..5f7fca144415 100644
--- a/l10ntools/prj/build.lst
+++ b/l10ntools/prj/build.lst
@@ -1,3 +1,3 @@
-tr l10ntools : BERKELEYDB:berkeleydb EXPAT:expat LIBXSLT:libxslt CLUCENE:clucene sal NULL
+tr l10ntools : EXPAT:expat LIBXSLT:libxslt sal NULL
 tr	l10ntools					usr1	-	all	tr_mkout NULL
 tr	l10ntools\prj					nmake	-	all	tr_prj NULL
diff --git a/nlpsolver/prj/build.lst b/nlpsolver/prj/build.lst
index d496bc84f456..b76dc4bfde5f 100644
--- a/nlpsolver/prj/build.lst
+++ b/nlpsolver/prj/build.lst
@@ -1,2 +1,2 @@
-nlpsolver	nlpsolver	:	javaunohelper unoil jurt readlicense_oo NULL
+nlpsolver	nlpsolver	:	javaunohelper unoil jurt readlicense_oo DESKTOP:helpcompiler NULL
 nlpsolver       nlpsolver\prj   nmake           -       all     nlp_prj NULL
diff --git a/sdext/prj/build.lst b/sdext/prj/build.lst
index 817553e6bf82..3e540fefe354 100644
--- a/sdext/prj/build.lst
+++ b/sdext/prj/build.lst
@@ -1,3 +1,3 @@
-dx	sdext	:	TRANSLATIONS:translations offapi comphelper unotools readlicense_oo cppu tools cppuhelper sal javaunohelper officecfg XPDF:xpdf LIBXSLT:libxslt DESKTOP:xmlhelp NULL
+dx	sdext	:	TRANSLATIONS:translations offapi comphelper unotools readlicense_oo cppu tools cppuhelper sal javaunohelper officecfg XPDF:xpdf LIBXSLT:libxslt DESKTOP:xmlhelp DESKTOP:helpcompiler NULL
 dx	sdext									usr1	-	all	sdext_mkout NULL
 dx	sdext\prj								nmake		-	all	sdext_prj NULL
diff --git a/swext/prj/build.lst b/swext/prj/build.lst
index beff5543d72b..e9de7ae55748 100644
--- a/swext/prj/build.lst
+++ b/swext/prj/build.lst
@@ -1,3 +1,3 @@
-swext swext :   officecfg TRANSLATIONS:translations DESKTOP:l10ntools javaunohelper ridljar unoil jurt APACHE_COMMONS:apache-commons readlicense_oo xsltml DESKTOP:xmlhelp NULL
+swext swext :   officecfg TRANSLATIONS:translations DESKTOP:l10ntools javaunohelper ridljar unoil jurt APACHE_COMMONS:apache-commons readlicense_oo xsltml DESKTOP:xmlhelp DESKTOP:helpcompiler NULL
 swext swext\prj    nmake   -    all    swext_prj NULL
 
diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst
index 63eab32637a4..8ecafe457560 100644
--- a/tail_build/prj/build.lst
+++ b/tail_build/prj/build.lst
@@ -1,2 +1,2 @@
-tb      tail_build : AFMS:afms APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CPPUNIT:cppunit DESKTOP:codemaker CURL:curl EXPAT:expat FONTCONFIG:fontconfig FREETYPE:freetype GLIB:glib GRAPHITE:graphite HUNSPELL:hunspell HYPHEN:hyphen ICU:icu DESKTOP:l10ntools JFREEREPORT:jfreereport JPEG:jpeg LCMS2:lcms2 LIBEXTTEXTCAT:libexttextcat LIBLANGTAG:liblangtag LIBXML2:libxml2 libxmlsec LIBXSLT:libxslt LPSOLVE:lpsolve MOZ:moz MYTHES:mythes NEON:neon NSS:nss OPENLDAP:openldap OPENSSL:openssl POSTGRESQL:postgresql PYTHON:python REDLAND:redland SAXON:saxon TRANSLATIONS:translations XPDF:xpdf ZLIB:zlib bridges cli_ure comphelper cppu cppuhelper external jurt jvmaccess jvmfwk offapi officecfg DESKTOP:rdbmaker readlicense_oo RHINO:rhino ridljar sal salhelper solenv soltools stoc ucbhelper ucpp udkapi xmlreader xsltml NULL
+tb      tail_build : AFMS:afms APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CLUCENE:clucene CPPUNIT:cppunit DESKTOP:codemaker CURL:curl EXPAT:expat FONTCONFIG:fontconfig FREETYPE:freetype GLIB:glib GRAPHITE:graphite HUNSPELL:hunspell HYPHEN:hyphen ICU:icu DESKTOP:l10ntools JFREEREPORT:jfreereport JPEG:jpeg LCMS2:lcms2 LIBEXTTEXTCAT:libexttextcat LIBLANGTAG:liblangtag LIBXML2:libxml2 libxmlsec LIBXSLT:libxslt LPSOLVE:lpsolve MOZ:moz MYTHES:mythes NEON:neon NSS:nss OPENLDAP:openldap OPENSSL:openssl POSTGRESQL:postgresql PYTHON:python REDLAND:redland SAXON:saxon TRANSLATIONS:translations XPDF:xpdf ZLIB:zlib bridges cli_ure comphelper cppu cppuhelper external jurt jvmaccess jvmfwk offapi officecfg DESKTOP:rdbmaker readlicense_oo RHINO:rhino ridljar sal salhelper solenv soltools stoc ucbhelper ucpp udkapi xmlreader xsltml NULL
 tb tail_build\prj nmake - all tb_prj   NULL
diff --git a/xmlhelp/prj/build.lst b/xmlhelp/prj/build.lst
index d9aa68210dce..0b08b2c15841 100644
--- a/xmlhelp/prj/build.lst
+++ b/xmlhelp/prj/build.lst
@@ -1,3 +1,3 @@
-xh      xmlhelp :       comphelper ucbhelper LIBXSLT:libxslt unoil BERKELEYDB:berkeleydb javaunohelper DESKTOP:l10ntools unotools NULL
+xh      xmlhelp :       comphelper ucbhelper LIBXSLT:libxslt unoil BERKELEYDB:berkeleydb javaunohelper DESKTOP:l10ntools DESKTOP:helpcompiler unotools NULL
 xh	xmlhelp									usr1	-	all	xh_mkout NULL
 xh	xmlhelp\prj					nmake	-	all	xh_prj NULL
diff --git a/xmlhelp/source/cxxhelp/provider/databases.cxx b/xmlhelp/source/cxxhelp/provider/databases.cxx
index ba26e5fbedca..1472bea879f2 100644
--- a/xmlhelp/source/cxxhelp/provider/databases.cxx
+++ b/xmlhelp/source/cxxhelp/provider/databases.cxx
@@ -38,7 +38,7 @@
 #include <algorithm>
 #include <string.h>
 
-#include <l10ntools/HelpIndexer.hxx>
+#include <helpcompiler/HelpIndexer.hxx>
 
 // Extensible help
 #include "com/sun/star/deployment/ExtensionManager.hpp"
diff --git a/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx b/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx
index 9032ba74cda0..2d1a7f84b987 100644
--- a/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx
+++ b/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx
@@ -33,7 +33,7 @@
 #include <com/sun/star/lang/Locale.hpp>
 #include <com/sun/star/script/XInvocation.hpp>
 
-#include <l10ntools/HelpSearch.hxx>
+#include <helpcompiler/HelpSearch.hxx>
 
 #if defined _MSC_VER
 #pragma warning(push)