diff --git a/build/org.eclipse.cdt.autotools.docs/build-index.xml b/build/org.eclipse.cdt.autotools.docs/build-index.xml
deleted file mode 100644
index 23a8bf4de53..00000000000
--- a/build/org.eclipse.cdt.autotools.docs/build-index.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Copyright (c) 2012 Marc-Andre Laperle and others
-    This program and the accompanying materials
-    are made available under the terms of the Eclipse Public License 2.0
-    which accompanies this distribution, and is available at
-    https://www.eclipse.org/legal/epl-2.0/
-    
-    SPDX-License-Identifier: EPL-2.0
-   
-    Contributors:
-        Marc-Andre Laperle - initial API and implementation
- -->
-<project>
-	<target name="build.index" description="Builds search index" if="eclipse.running">
-		<help.buildHelpIndex manifest="plugin.xml" destination="."/>
-	</target>
-</project>
diff --git a/build/org.eclipse.cdt.autotools.docs/build.properties b/build/org.eclipse.cdt.autotools.docs/build.properties
index 46a812d6954..49e1d2ae6ee 100644
--- a/build/org.eclipse.cdt.autotools.docs/build.properties
+++ b/build/org.eclipse.cdt.autotools.docs/build.properties
@@ -6,7 +6,6 @@ bin.includes = META-INF/,\
                plugin.properties,\
                doc/,\
                tools.xml,\
-               index/,\
                images/,\
                book.css,\
                CDT/
diff --git a/build/org.eclipse.cdt.autotools.docs/plugin.xml b/build/org.eclipse.cdt.autotools.docs/plugin.xml
index 18fe954a116..547ba5de590 100644
--- a/build/org.eclipse.cdt.autotools.docs/plugin.xml
+++ b/build/org.eclipse.cdt.autotools.docs/plugin.xml
@@ -10,7 +10,6 @@
             file="tools.xml"
             primary="true">
       </toc>
-      <index path="index"/>
    </extension>
    <extension
          id="org.eclipse.cdt.autotools.docs.cheatsheets"
diff --git a/build/org.eclipse.cdt.autotools.docs/pom.xml b/build/org.eclipse.cdt.autotools.docs/pom.xml
index 60e4eef741a..0be64347fed 100644
--- a/build/org.eclipse.cdt.autotools.docs/pom.xml
+++ b/build/org.eclipse.cdt.autotools.docs/pom.xml
@@ -43,81 +43,4 @@
 			</plugin>
 		</plugins>
 	</build>
-	<profiles>
-		<profile>
-			<id>build-doc</id>
-			<activation>
-				<property>
-					<name>!skipDoc</name>
-				</property>
-			</activation>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.eclipse.tycho</groupId>
-						<artifactId>tycho-eclipse-plugin</artifactId>
-						<configuration>
-							<applicationArgs>
-								<arg>-application</arg>
-								<arg>org.eclipse.ant.core.antRunner</arg>
-								<arg>-buildfile</arg>
-								<arg>build-index.xml</arg>
-								<arg>build.index</arg>
-							</applicationArgs>
-							<dependencies>
-								<dependency>
-									<artifactId>org.apache.ant</artifactId>
-									<type>eclipse-plugin</type>
-								</dependency>
-								<dependency>
-									<artifactId>org.eclipse.help.base</artifactId>
-									<type>eclipse-plugin</type>
-								</dependency>
-								<dependency>
-									<artifactId>org.eclipse.ant.core</artifactId>
-									<type>eclipse-plugin</type>
-								</dependency>
-							</dependencies>
-						</configuration>
-						<executions>
-							<execution>
-								<goals>
-									<goal>eclipse-run</goal>
-								</goals>
-								<phase>compile</phase>
-							</execution>
-						</executions>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-		<profile>
-			<id>fake-doc</id>
-			<activation>
-				<property>
-					<name>skipDoc</name>
-				</property>
-			</activation>
-			<build>
-				<plugins>
-					<plugin>
-						<artifactId>maven-antrun-plugin</artifactId>
-						<executions>
-							<execution>
-								<phase>compile</phase>
-								<configuration>
-									<target>
-										<touch file="index/indexed_docs" mkdirs="true"/>
-									</target>
-								</configuration>
-								<goals>
-									<goal>run</goal>
-								</goals>
-							</execution>
-						</executions>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-	</profiles>
 </project>
diff --git a/build/org.eclipse.cdt.meson.docs/build-index.xml b/build/org.eclipse.cdt.meson.docs/build-index.xml
deleted file mode 100644
index 23a8bf4de53..00000000000
--- a/build/org.eclipse.cdt.meson.docs/build-index.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Copyright (c) 2012 Marc-Andre Laperle and others
-    This program and the accompanying materials
-    are made available under the terms of the Eclipse Public License 2.0
-    which accompanies this distribution, and is available at
-    https://www.eclipse.org/legal/epl-2.0/
-    
-    SPDX-License-Identifier: EPL-2.0
-   
-    Contributors:
-        Marc-Andre Laperle - initial API and implementation
- -->
-<project>
-	<target name="build.index" description="Builds search index" if="eclipse.running">
-		<help.buildHelpIndex manifest="plugin.xml" destination="."/>
-	</target>
-</project>
diff --git a/build/org.eclipse.cdt.meson.docs/build.properties b/build/org.eclipse.cdt.meson.docs/build.properties
index de72f5485aa..67ded601324 100644
--- a/build/org.eclipse.cdt.meson.docs/build.properties
+++ b/build/org.eclipse.cdt.meson.docs/build.properties
@@ -4,7 +4,6 @@ bin.includes = META-INF/,\
                about.html,\
                plugin.properties,\
                doc/,\
-               index/,\
                images/,\
                book.css,\
                CDT/
diff --git a/build/org.eclipse.cdt.meson.docs/plugin.xml b/build/org.eclipse.cdt.meson.docs/plugin.xml
index 21481e1702b..da05fa6c147 100644
--- a/build/org.eclipse.cdt.meson.docs/plugin.xml
+++ b/build/org.eclipse.cdt.meson.docs/plugin.xml
@@ -6,7 +6,6 @@
       <toc
             file="toc.xml"
             primary="true"/>
-      <index path="index"/>
    </extension>
 
 </plugin>
diff --git a/build/org.eclipse.cdt.meson.docs/pom.xml b/build/org.eclipse.cdt.meson.docs/pom.xml
index c040e1bf1b8..55e08a41071 100644
--- a/build/org.eclipse.cdt.meson.docs/pom.xml
+++ b/build/org.eclipse.cdt.meson.docs/pom.xml
@@ -43,81 +43,4 @@
 			</plugin>
 		</plugins>
 	</build>
-	<profiles>
-		<profile>
-			<id>build-doc</id>
-			<activation>
-				<property>
-					<name>!skipDoc</name>
-				</property>
-			</activation>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.eclipse.tycho</groupId>
-						<artifactId>tycho-eclipse-plugin</artifactId>
-						<configuration>
-							<applicationArgs>
-								<arg>-application</arg>
-								<arg>org.eclipse.ant.core.antRunner</arg>
-								<arg>-buildfile</arg>
-								<arg>build-index.xml</arg>
-								<arg>build.index</arg>
-							</applicationArgs>
-							<dependencies>
-								<dependency>
-									<artifactId>org.apache.ant</artifactId>
-									<type>eclipse-plugin</type>
-								</dependency>
-								<dependency>
-									<artifactId>org.eclipse.help.base</artifactId>
-									<type>eclipse-plugin</type>
-								</dependency>
-								<dependency>
-									<artifactId>org.eclipse.ant.core</artifactId>
-									<type>eclipse-plugin</type>
-								</dependency>
-							</dependencies>
-						</configuration>
-						<executions>
-							<execution>
-								<goals>
-									<goal>eclipse-run</goal>
-								</goals>
-								<phase>compile</phase>
-							</execution>
-						</executions>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-		<profile>
-			<id>fake-doc</id>
-			<activation>
-				<property>
-					<name>skipDoc</name>
-				</property>
-			</activation>
-			<build>
-				<plugins>
-					<plugin>
-						<artifactId>maven-antrun-plugin</artifactId>
-						<executions>
-							<execution>
-								<phase>compile</phase>
-								<configuration>
-									<target>
-										<touch file="index/indexed_docs" mkdirs="true"/>
-									</target>
-								</configuration>
-								<goals>
-									<goal>run</goal>
-								</goals>
-							</execution>
-						</executions>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-	</profiles>
 </project>
diff --git a/doc/org.eclipse.cdt.doc.isv/build.properties b/doc/org.eclipse.cdt.doc.isv/build.properties
index 883d8df0c6c..3f9d193c2fa 100644
--- a/doc/org.eclipse.cdt.doc.isv/build.properties
+++ b/doc/org.eclipse.cdt.doc.isv/build.properties
@@ -22,9 +22,7 @@ bin.includes = META-INF/,\
                topics_Reference.xml,\
                plugin.xml,\
                plugin.properties,\
-               index/,\
                notices.html
 
-customBuildCallbacks = customBuildCallbacks.xml
 src.includes = about.html
 jars.extra.classpath = platform:/plugin/org.eclipse.cdt.core
diff --git a/doc/org.eclipse.cdt.doc.isv/buildDoc.xml b/doc/org.eclipse.cdt.doc.isv/buildDoc.xml
index e0733e861ed..8ff09a122bf 100644
--- a/doc/org.eclipse.cdt.doc.isv/buildDoc.xml
+++ b/doc/org.eclipse.cdt.doc.isv/buildDoc.xml
@@ -3,11 +3,6 @@
 
 	<target name="all">
 		<antcall target="convertSchemaToHtml" />
-		<antcall target="build.index" />
-	</target>
-
-	<target name="build.index" description="Builds search index for the plug-in: org.eclipse.cdt.doc.isv" if="eclipse.running">
-		<help.buildHelpIndex manifest="${basedir}/plugin.xml" destination="${basedir}" />
 	</target>
 
 	<target name="convertSchemaToHtml" if="eclipse.running">
diff --git a/doc/org.eclipse.cdt.doc.isv/customBuildCallbacks.xml b/doc/org.eclipse.cdt.doc.isv/customBuildCallbacks.xml
deleted file mode 100644
index 2aed4949403..00000000000
--- a/doc/org.eclipse.cdt.doc.isv/customBuildCallbacks.xml
+++ /dev/null
@@ -1,159 +0,0 @@
-<!-- ===================================================================== -->
-<!-- Custom targets called from a project's generated build.xml            -->
-<!-- Set customBuildCallbacks=<path/to/this/file> in your build.properties.-->
-<!-- ===================================================================== -->
-<project name="Build specific targets and properties" default="noDefault">
-
-	<!-- ===================================================================== -->
-	<!-- Default target                                                        -->
-	<!-- ===================================================================== -->
-	<target name="noDefault">
-		<echo message="This file must be called with explicit targets" />
-	</target>
-	
-	<!-- ===================================================================== -->
-	<!-- Steps to do before the target build.jars                              -->
-	<!-- Available parameters :                                                -->
-	<!--   build.result.folder - folder to contain the build results           -->
-	<!-- ===================================================================== -->
-	<target name="pre.build.jars">
-		<ant antfile="buildDoc.xml"/>
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do after the target build.jars                               -->
-	<!-- Available parameters :                                                -->
-	<!--   build.result.folder - folder to contain the build results           -->
-	<!-- ===================================================================== -->
-	<target name="post.build.jars">
-	</target>
-	
-	<!-- ===================================================================== -->
-	<!-- Steps to do before the target build.sources                           -->
-	<!-- Available parameters :                                                -->
-	<!--   build.result.folder - folder to contain the build results           -->
-	<!-- ===================================================================== -->
-	<target name="pre.build.sources">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do after the target build.sources                            -->
-	<!-- Available parameters :                                                -->
-	<!--   build.result.folder - folder to contain the build results           -->
-	<!-- ===================================================================== -->
-	<target name="post.build.sources">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do before the compilation target <name>                      -->
-	<!-- Substitute "name" with the name of the compilation target, eg @dot    -->
-	<!-- Available parameters :                                                -->
-	<!--   source.foldern : n = 1 ... N, the source folders                    -->
-	<!--   target.folder  : where the results of the compilation go            -->
-	<!--   <name>.classpath : name = name of the compilation target. A         -->
-	<!--                      reference to the classpath structure.            -->
-	<!-- ===================================================================== -->
-	<target name="pre.name">
-	</target>
-
-	<target name="pre.@dot">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do during the compilation target <name>, after the compile   -->
-	<!-- but before jaring.  Substitute "name" with the name of the compilation-->
-	<!-- target, eg @dot                                                       -->
-	<!-- Available parameters :                                                -->
-	<!--   source.foldern : n = 1 ... N, the source folders                    -->
-	<!--   target.folder  : where the results of the compilation go            -->
-	<!--   <name>.classpath : name = name of the compilation target. A         -->
-	<!--                      reference to the classpath structure.            -->
-	<!-- ===================================================================== -->
-	<target name="post.compile.name">
-	</target>
-
-	<target name="post.compile.@dot">
-	</target>
-	
-	<!-- ===================================================================== -->
-	<!-- Steps to do after the compilation target <name>                       -->
-	<!-- Substitute "name" with the name of the compilation target, eg @dot    -->
-	<!-- Available parameters :                                                -->
-	<!--   jar.location - the location of the compilation results              -->
-	<!--   <name>.classpath : name = name of the compilation target. A         -->
-	<!--                      reference to the classpath structure.            -->
-	<!-- ===================================================================== -->
-	<target name="post.name">
-	</target>
-
-	<target name="post.@dot">
-	</target>
-	
-	<!-- ===================================================================== -->
-	<!-- Steps to do before the target gather.bin.parts                         -->
-	<!-- Available parameters :                                                -->
-	<!--   build.result.folder - folder containing the build results           -->
-	<!--   target.folder - destination folder                                  -->
-	<!-- ===================================================================== -->
-	<target name="pre.gather.bin.parts">
-	</target>
-		
-	<!-- ===================================================================== -->
-	<!-- Steps to do after the target gather.bin.parts                         -->
-	<!-- Available parameters :                                                -->
-	<!--   build.result.folder - folder containing the build results           -->
-	<!--   target.folder - destination folder                                  -->
-	<!-- ===================================================================== -->
-	<target name="post.gather.bin.parts">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do before the target gather.sources                          -->
-	<!-- Available parameters :                                                -->
-	<!--   destination.temp.folder - destination folder                        -->
-	<!-- ===================================================================== -->
-	<target name="pre.gather.sources">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do after the target gather.sources                           -->
-	<!-- Available parameters :                                                -->
-	<!--   destination.temp.folder - destination folder                        -->
-	<!-- ===================================================================== -->
-	<target name="post.gather.sources">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do before the target gather.logs                             -->
-	<!-- Available parameters :                                                -->
-	<!--   destination.temp.folder - destination folder                        -->
-	<!-- ===================================================================== -->
-	<target name="pre.gather.logs">        
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do after the target gather.logs                              -->
-	<!-- Available parameters :                                                -->
-	<!--   destination.temp.folder - destination folder                        -->
-	<!-- ===================================================================== -->
-	<target name="post.gather.logs">       
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do before the target clean                                   -->
-	<!-- Available parameters :                                                -->
-	<!--   destination.temp.folder - destination folder                        -->
-	<!-- ===================================================================== -->
-	<target name="pre.clean">              
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do after the target clean                                    -->
-	<!-- Available parameters :                                                -->
-	<!--   plugin.destination - final destination of the build                 -->
-	<!--   build.result.folder - results of the compilation                    -->
-	<!--   temp.folder - temporary folder                                      -->
-	<!-- ===================================================================== -->
-	<target name="post.clean">             
-	</target>
-</project>
diff --git a/doc/org.eclipse.cdt.doc.isv/plugin.xml b/doc/org.eclipse.cdt.doc.isv/plugin.xml
index 870c647db77..8fd83704689 100644
--- a/doc/org.eclipse.cdt.doc.isv/plugin.xml
+++ b/doc/org.eclipse.cdt.doc.isv/plugin.xml
@@ -12,7 +12,6 @@
       <toc
             primary="false"
             file="topics_Reference.xml"/>
-      <index path="index/"/>
    </extension>
 
 </plugin>
diff --git a/doc/org.eclipse.cdt.doc.isv/pom.xml b/doc/org.eclipse.cdt.doc.isv/pom.xml
index 40bc2071d0f..f11a2679abd 100644
--- a/doc/org.eclipse.cdt.doc.isv/pom.xml
+++ b/doc/org.eclipse.cdt.doc.isv/pom.xml
@@ -86,6 +86,13 @@
 									<type>eclipse-plugin</type>
 								</dependency>
 							</dependencies>
+							<repositories>
+								<repository>
+									<id>platform</id>
+									<layout>p2</layout>
+									<url>${help-docs-eclipserun-repo}</url>
+								</repository>
+							</repositories>
 						</configuration>
 						<executions>
 							<execution>
@@ -138,33 +145,5 @@
 				</plugins>
 			</build>
 		</profile>
-		<profile>
-			<id>fake-doc</id>
-			<activation>
-				<property>
-					<name>skipDoc</name>
-				</property>
-			</activation>
-			<build>
-				<plugins>
-					<plugin>
-						<artifactId>maven-antrun-plugin</artifactId>
-						<executions>
-							<execution>
-								<phase>compile</phase>
-								<configuration>
-									<target>
-										<touch file="index/indexed_docs" mkdirs="true" />
-									</target>
-								</configuration>
-								<goals>
-									<goal>run</goal>
-								</goals>
-							</execution>
-						</executions>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
 	</profiles>
 </project>
diff --git a/doc/org.eclipse.cdt.doc.user/build.properties b/doc/org.eclipse.cdt.doc.user/build.properties
index aee29b82fa8..84c5f6693dc 100644
--- a/doc/org.eclipse.cdt.doc.user/build.properties
+++ b/doc/org.eclipse.cdt.doc.user/build.properties
@@ -12,8 +12,6 @@
 #     IBM Corporation - initial API and implementation
 ###############################################################################
 
-customBuildCallbacks=customBuildCallbacks.xml
-
 bin.includes = about.html,\
                concepts/,\
                contexts_CDT.xml,\
@@ -40,9 +38,7 @@ bin.includes = about.html,\
                cheatsheets/,\
                intro/,\
                notices.html,\
-               book.css,\
-               index*/
+               book.css
 
-bin.excludes = build.properties,\
-			   customBuildCallbacks.xml
+bin.excludes = build.properties
 src.includes = about.html
diff --git a/doc/org.eclipse.cdt.doc.user/customBuildCallbacks.xml b/doc/org.eclipse.cdt.doc.user/customBuildCallbacks.xml
deleted file mode 100644
index 53a5bbd0435..00000000000
--- a/doc/org.eclipse.cdt.doc.user/customBuildCallbacks.xml
+++ /dev/null
@@ -1,163 +0,0 @@
-<!-- ===================================================================== -->
-<!-- Custom targets called from a project's generated build.xml            -->
-<!-- Set customBuildCallbacks=<path/to/this/file> in your build.properties.-->
-<!-- ===================================================================== -->
-<project name="Build specific targets and properties" default="noDefault">
-
-	<!-- ===================================================================== -->
-	<!-- Default target                                                        -->
-	<!-- ===================================================================== -->
-	<target name="noDefault">
-		<echo message="This file must be called with explicit targets" />
-	</target>
-	
-	<!-- ===================================================================== -->
-	<!-- Steps to do before the target build.jars                              -->
-	<!-- Available parameters :                                                -->
-	<!--   build.result.folder - folder to contain the build results           -->
-	<!-- ===================================================================== -->
-	<target name="pre.build.jars">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do after the target build.jars                               -->
-	<!-- Available parameters :                                                -->
-	<!--   build.result.folder - folder to contain the build results           -->
-	<!-- ===================================================================== -->
-	<target name="post.build.jars">
-		<antcall target="build.index"/>		
-	</target>
-
-	<target name="build.index" description="Builds search index for the plug-in: org.eclipse.rse.doc.user." if="eclipse.running">
-		<help.buildHelpIndex manifest="plugin.xml" destination="."/>
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do before the target build.sources                           -->
-	<!-- Available parameters :                                                -->
-	<!--   build.result.folder - folder to contain the build results           -->
-	<!-- ===================================================================== -->
-	<target name="pre.build.sources">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do after the target build.sources                            -->
-	<!-- Available parameters :                                                -->
-	<!--   build.result.folder - folder to contain the build results           -->
-	<!-- ===================================================================== -->
-	<target name="post.build.sources">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do before the compilation target <name>                      -->
-	<!-- Substitute "name" with the name of the compilation target, eg @dot    -->
-	<!-- Available parameters :                                                -->
-	<!--   source.foldern : n = 1 ... N, the source folders                    -->
-	<!--   target.folder  : where the results of the compilation go            -->
-	<!--   <name>.classpath : name = name of the compilation target. A         -->
-	<!--                      reference to the classpath structure.            -->
-	<!-- ===================================================================== -->
-	<target name="pre.name">
-	</target>
-
-	<target name="pre.@dot">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do during the compilation target <name>, after the compile   -->
-	<!-- but before jaring.  Substitute "name" with the name of the compilation-->
-	<!-- target, eg @dot                                                       -->
-	<!-- Available parameters :                                                -->
-	<!--   source.foldern : n = 1 ... N, the source folders                    -->
-	<!--   target.folder  : where the results of the compilation go            -->
-	<!--   <name>.classpath : name = name of the compilation target. A         -->
-	<!--                      reference to the classpath structure.            -->
-	<!-- ===================================================================== -->
-	<target name="post.compile.name">
-	</target>
-
-	<target name="post.compile.@dot">
-	</target>
-	
-	<!-- ===================================================================== -->
-	<!-- Steps to do after the compilation target <name>                       -->
-	<!-- Substitute "name" with the name of the compilation target, eg @dot    -->
-	<!-- Available parameters :                                                -->
-	<!--   jar.Location - the location of the compilation results              -->
-	<!--   <name>.classpath : name = name of the compilation target. A         -->
-	<!--                      reference to the classpath structure.            -->
-	<!-- ===================================================================== -->
-	<target name="post.name">
-	</target>
-
-	<target name="post.@dot">
-	</target>
-	
-	<!-- ===================================================================== -->
-	<!-- Steps to do before the target gather.bin.parts                         -->
-	<!-- Available parameters :                                                -->
-	<!--   build.result.folder - folder containing the build results           -->
-	<!--   target.folder - destination folder                                  -->
-	<!-- ===================================================================== -->
-	<target name="pre.gather.bin.parts">
-	</target>
-		
-	<!-- ===================================================================== -->
-	<!-- Steps to do after the target gather.bin.parts                         -->
-	<!-- Available parameters :                                                -->
-	<!--   build.result.folder - folder containing the build results           -->
-	<!--   target.folder - destination folder                                  -->
-	<!-- ===================================================================== -->
-	<target name="post.gather.bin.parts">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do before the target gather.sources                          -->
-	<!-- Available parameters :                                                -->
-	<!--   destination.temp.folder - destination folder                        -->
-	<!-- ===================================================================== -->
-	<target name="pre.gather.sources">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do after the target gather.sources                           -->
-	<!-- Available parameters :                                                -->
-	<!--   destination.temp.folder - destination folder                        -->
-	<!-- ===================================================================== -->
-	<target name="post.gather.sources">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do before the target gather.logs                             -->
-	<!-- Available parameters :                                                -->
-	<!--   destination.temp.folder - destination folder                        -->
-	<!-- ===================================================================== -->
-	<target name="pre.gather.logs">        
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do after the target gather.logs                              -->
-	<!-- Available parameters :                                                -->
-	<!--   destination.temp.folder - destination folder                        -->
-	<!-- ===================================================================== -->
-	<target name="post.gather.logs">       
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do before the target clean                                   -->
-	<!-- Available parameters :                                                -->
-	<!--   destination.temp.folder - destination folder                        -->
-	<!-- ===================================================================== -->
-	<target name="pre.clean">              
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do after the target clean                                    -->
-	<!-- Available parameters :                                                -->
-	<!--   plugin.destination - final destination of the build                 -->
-	<!--   build.result.folder - results of the compilation                    -->
-	<!--   temp.folder - temporary folder                                      -->
-	<!-- ===================================================================== -->
-	<target name="post.clean">             
-	</target>
-</project>
diff --git a/doc/org.eclipse.cdt.doc.user/plugin.xml b/doc/org.eclipse.cdt.doc.user/plugin.xml
index dc5d78ea802..7b2e925384b 100644
--- a/doc/org.eclipse.cdt.doc.user/plugin.xml
+++ b/doc/org.eclipse.cdt.doc.user/plugin.xml
@@ -14,7 +14,6 @@
             file="toc.xml"
             primary="true">
       </toc>
-      <index path="index"/>
    </extension>
 
 <!-- ============================================================================= -->
diff --git a/doc/org.eclipse.cdt.doc.user/pom.xml b/doc/org.eclipse.cdt.doc.user/pom.xml
index 6ac2b2c507e..e908b2df1b2 100644
--- a/doc/org.eclipse.cdt.doc.user/pom.xml
+++ b/doc/org.eclipse.cdt.doc.user/pom.xml
@@ -101,80 +101,5 @@
 				</plugins>
 			</build>
 		</profile>
-		<profile>
-			<id>build-doc</id>
-			<activation>
-				<property>
-					<name>!skipDoc</name>
-				</property>
-			</activation>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.eclipse.tycho</groupId>
-						<artifactId>tycho-eclipse-plugin</artifactId>
-						<configuration>
-							<applicationArgs>
-								<arg>-application</arg>
-								<arg>org.eclipse.ant.core.antRunner</arg>
-								<arg>-buildfile</arg>
-								<arg>customBuildCallbacks.xml</arg>
-								<arg>build.index</arg>
-							</applicationArgs>
-							<dependencies>
-								<dependency>
-									<artifactId>org.apache.ant</artifactId>
-									<type>eclipse-plugin</type>
-								</dependency>
-								<dependency>
-									<artifactId>org.eclipse.help.base</artifactId>
-									<type>eclipse-plugin</type>
-								</dependency>
-								<dependency>
-									<artifactId>org.eclipse.ant.core</artifactId>
-									<type>eclipse-plugin</type>
-								</dependency>
-							</dependencies>
-						</configuration>
-						<executions>
-							<execution>
-								<goals>
-									<goal>eclipse-run</goal>
-								</goals>
-								<phase>compile</phase>
-							</execution>
-						</executions>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-		<profile>
-			<id>fake-doc</id>
-			<activation>
-				<property>
-					<name>skipDoc</name>
-				</property>
-			</activation>
-			<build>
-				<plugins>
-					<plugin>
-						<artifactId>maven-antrun-plugin</artifactId>
-						<executions>
-							<execution>
-								<phase>compile</phase>
-								<configuration>
-									<target>
-										<touch file="index/indexed_docs" mkdirs="true"/>
-									</target>
-								</configuration>
-								<goals>
-									<goal>run</goal>
-								</goals>
-							</execution>
-						</executions>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
 	</profiles>
 </project>
diff --git a/pom.xml b/pom.xml
index 100537c659e..ef15f150a60 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,7 +35,7 @@
 
 		<!-- When changing this value, consider also bumping the version numbers of all the docs plug-ins (those with build-doc profile in pom.xml)
 		     so that compare&replace does not replace the the newly built docs because the only change is in the filtered out index/* resources. -->
-		<help-docs-eclipserun-repo>https://download.eclipse.org/eclipse/updates/4.37/R-4.37-202509050730/</help-docs-eclipserun-repo>
+		<help-docs-eclipserun-repo>https://download.eclipse.org/eclipse/updates/4.39/R-4.39-202602260420/</help-docs-eclipserun-repo>
 
 		<tycho.scmUrl>scm:git:https://github.com/eclipse-cdt/cdt</tycho.scmUrl>
 		<!-- Some old tests, like CDescriptorOldTests, fail due to reflection access. Therefore we add-opens to make that pass -->
@@ -1002,48 +1002,6 @@
 					<groupId>org.eclipse.tycho</groupId>
 					<artifactId>tycho-eclipse-plugin</artifactId>
 					<version>${tycho-version}</version>
-					<configuration>
-						<applicationArgs>
-							<arg>-application</arg>
-							<arg>org.eclipse.ant.core.antRunner</arg>
-							<arg>-buildfile</arg>
-							<arg>customBuildCallbacks.xml</arg>
-							<arg>build.index</arg>
-						</applicationArgs>
-						<dependencies>
-							<dependency>
-								<artifactId>org.apache.ant</artifactId>
-								<type>eclipse-plugin</type>
-							</dependency>
-							<dependency>
-								<artifactId>org.eclipse.help.base</artifactId>
-								<type>eclipse-plugin</type>
-							</dependency>
-							<dependency>
-								<artifactId>org.eclipse.ant.core</artifactId>
-								<type>eclipse-plugin</type>
-							</dependency>
-						</dependencies>
-						<!-- This needs to be explicitely set now, see https://bugs.eclipse.org/bugs/show_bug.cgi?id=395281 -->
-						<repositories>
-							<repository>
-								<id>platform</id>
-								<layout>p2</layout>
-								<url>${help-docs-eclipserun-repo}</url>
-							</repository>
-						</repositories>
-					</configuration>
-					<executions>
-						<execution>
-							<goals>
-								<goal>eclipse-run</goal>
-							</goals>
-							<phase>compile</phase>
-							<configuration>
-								<executionEnvironment>JavaSE-21</executionEnvironment>
-							</configuration>
-						</execution>
-					</executions>
 				</plugin>
 				<plugin>
 					<groupId>org.eclipse.tycho</groupId>
diff --git a/remote/org.eclipse.remote.doc.isv/pom.xml b/remote/org.eclipse.remote.doc.isv/pom.xml
index 14b29a12c71..dcf0bda7487 100644
--- a/remote/org.eclipse.remote.doc.isv/pom.xml
+++ b/remote/org.eclipse.remote.doc.isv/pom.xml
@@ -92,33 +92,5 @@
 				</plugins>
 			</build>
 		</profile>
-		<profile>
-			<id>fake-doc</id>
-			<activation>
-				<property>
-					<name>skipDoc</name>
-				</property>
-			</activation>
-			<build>
-				<plugins>
-					<plugin>
-						<artifactId>maven-antrun-plugin</artifactId>
-						<executions>
-							<execution>
-								<phase>compile</phase>
-								<configuration>
-									<target>
-										<touch file="index/indexed_docs" mkdirs="true" />
-									</target>
-								</configuration>
-								<goals>
-									<goal>run</goal>
-								</goals>
-							</execution>
-						</executions>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
 	</profiles>
 </project>