7 files changed, 9 insertions, 17 deletions
diff --git a/helpcompiler/source/BasCodeTagger.cxx b/helpcompiler/source/BasCodeTagger.cxx
index 369c49c389d5..1b4797b403b9 100644
--- a/helpcompiler/source/BasCodeTagger.cxx
+++ b/helpcompiler/source/BasCodeTagger.cxx
@@ -8,6 +8,7 @@
  */
 
 #include <BasCodeTagger.hxx>
+#include <iostream>
 
 LibXmlTreeWalker::LibXmlTreeWalker( xmlDocPtr doc )
 {
diff --git a/helpcompiler/source/HelpCompiler.cxx b/helpcompiler/source/HelpCompiler.cxx
index b612071aba18..70159a2c65fd 100644
--- a/helpcompiler/source/HelpCompiler.cxx
+++ b/helpcompiler/source/HelpCompiler.cxx
@@ -18,16 +18,15 @@
  */
 
 
+#include <algorithm>
 #include <memory>
 #include <HelpCompiler.hxx>
 #include <BasCodeTagger.hxx>
-#include <limits.h>
+#include <iostream>
 #include <stdlib.h>
 #include <string.h>
-#include <libxslt/xslt.h>
 #include <libxslt/xsltInternals.h>
 #include <libxslt/transform.h>
-#include <libxslt/xsltutils.h>
 #include <osl/thread.hxx>
 #include <chrono>
 #include <rtl/character.hxx>
diff --git a/helpcompiler/source/HelpIndexer.cxx b/helpcompiler/source/HelpIndexer.cxx
index 25ff6ef0b09e..d8f0b82a4f20 100644
--- a/helpcompiler/source/HelpIndexer.cxx
+++ b/helpcompiler/source/HelpIndexer.cxx
@@ -11,14 +11,14 @@
 
 #include <rtl/string.hxx>
 #include <rtl/uri.hxx>
-#include <rtl/ustrbuf.hxx>
 #include <o3tl/runtimetooustring.hxx>
 #include <osl/file.hxx>
 #include <osl/thread.h>
-#include <algorithm>
 #include <memory>
 
 #include "LuceneHelper.hxx"
+#include <CLucene.h>
+#include <CLucene/analysis/LanguageBasedAnalyzer.h>
 
 using namespace lucene::document;
 
diff --git a/helpcompiler/source/HelpIndexer_main.cxx b/helpcompiler/source/HelpIndexer_main.cxx
index eb1220c34c2b..0919e89eb004 100644
--- a/helpcompiler/source/HelpIndexer_main.cxx
+++ b/helpcompiler/source/HelpIndexer_main.cxx
@@ -14,8 +14,6 @@
 #include <string>
 #include <iostream>
 
-#include "LuceneHelper.hxx"
-
 int main(int argc, char **argv)
 {
     try
diff --git a/helpcompiler/source/HelpLinker.cxx b/helpcompiler/source/HelpLinker.cxx
index f32e242f0867..fc5894b080ad 100644
--- a/helpcompiler/source/HelpLinker.cxx
+++ b/helpcompiler/source/HelpLinker.cxx
@@ -20,20 +20,14 @@
 #include <HelpCompiler.hxx>
 #include <HelpLinker.hxx>
 
-#include <map>
+#include <algorithm>
+#include <fstream>
 
 #include <string.h>
-#include <limits.h>
 
-#include <libxslt/xslt.h>
-#include <libxslt/xsltutils.h>
-#include <libxslt/functions.h>
-#include <libxslt/extensions.h>
+#include <libxslt/transform.h>
 
-#include <sal/main.h>
 #include <sal/types.h>
-#include <osl/time.h>
-#include <rtl/bootstrap.hxx>
 #include <o3tl/char16_t2wchar_t.hxx>
 #include <sal/log.hxx>
 
diff --git a/helpcompiler/source/HelpSearch.cxx b/helpcompiler/source/HelpSearch.cxx
index 75a15bc4fcf0..982e672c4573 100644
--- a/helpcompiler/source/HelpSearch.cxx
+++ b/helpcompiler/source/HelpSearch.cxx
@@ -12,6 +12,7 @@
 #include <osl/thread.hxx>
 
 #include "LuceneHelper.hxx"
+#include <CLucene.h>
 
 HelpSearch::HelpSearch(OUString const &indexDir)
 {
diff --git a/helpcompiler/source/LuceneHelper.hxx b/helpcompiler/source/LuceneHelper.hxx
index dae1f2462f86..a84346e25faf 100644
--- a/helpcompiler/source/LuceneHelper.hxx
+++ b/helpcompiler/source/LuceneHelper.hxx
@@ -15,7 +15,6 @@
 #endif
 
 #include <CLucene.h>
-#include <CLucene/analysis/LanguageBasedAnalyzer.h>
 
 #if defined(__GNUC__)
 #  pragma GCC visibility pop