diff --git a/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/concepts/AggregatedCallSite.java b/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/concepts/AggregatedCallSite.java
index 625ac7bd7..1789a1ff5 100644
--- a/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/concepts/AggregatedCallSite.java
+++ b/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/concepts/AggregatedCallSite.java
@@ -27,6 +27,7 @@
  *
  * @author Geneviève Bastien
  */
+@Deprecated(since="9.4", forRemoval=true)
 public class AggregatedCallSite extends WeightedTree<ICallStackSymbol> {
 
     /**
diff --git a/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/concepts/ICallStackSymbol.java b/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/concepts/ICallStackSymbol.java
index ba61b7666..3bd6e1bda 100644
--- a/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/concepts/ICallStackSymbol.java
+++ b/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/concepts/ICallStackSymbol.java
@@ -18,6 +18,7 @@
 /**
  * @author Geneviève Bastien
  */
+@Deprecated(since="9.4", forRemoval=true)
 public interface ICallStackSymbol {
 
     /**
diff --git a/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/concepts/ICpuTimeProvider.java b/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/concepts/ICpuTimeProvider.java
index 6ea349a32..77a42efdd 100644
--- a/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/concepts/ICpuTimeProvider.java
+++ b/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/concepts/ICpuTimeProvider.java
@@ -23,6 +23,7 @@
  * NOTE to developers: this interface is used with the composite host model but
  * won't be necessary anymore once the analyses populate the model directly.
  */
+@Deprecated(since="9.4", forRemoval=true)
 public interface ICpuTimeProvider {
 
     /**
diff --git a/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/concepts/ISamplingDataProvider.java b/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/concepts/ISamplingDataProvider.java
index 40e710c31..02b8985e6 100644
--- a/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/concepts/ISamplingDataProvider.java
+++ b/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/concepts/ISamplingDataProvider.java
@@ -18,6 +18,7 @@
  *
  * @author Geneviève Bastien
  */
+@Deprecated(since="9.4", forRemoval=true)
 public interface ISamplingDataProvider {
 
     /**
diff --git a/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/concepts/IThreadOnCpuProvider.java b/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/concepts/IThreadOnCpuProvider.java
index b464d20dc..75f145518 100644
--- a/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/concepts/IThreadOnCpuProvider.java
+++ b/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/concepts/IThreadOnCpuProvider.java
@@ -22,6 +22,7 @@
  * NOTE to developers: this interface is used with the composite host model but
  * won't be necessary anymore once the analyses populate the model directly.
  */
+@Deprecated(since="9.4", forRemoval=true)
 public interface IThreadOnCpuProvider {
 
     /**
diff --git a/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/concepts/ProcessStatusInterval.java b/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/concepts/ProcessStatusInterval.java
index d0fc62006..c65468d1d 100644
--- a/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/concepts/ProcessStatusInterval.java
+++ b/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/concepts/ProcessStatusInterval.java
@@ -19,6 +19,7 @@
  *
  * @author Geneviève Bastien
  */
+@Deprecated(since="9.4", forRemoval=true)
 public class ProcessStatusInterval implements ISegment {
 
     /**
diff --git a/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/model/IHostModel.java b/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/model/IHostModel.java
index b94243577..86ab69aad 100644
--- a/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/model/IHostModel.java
+++ b/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/model/IHostModel.java
@@ -34,6 +34,7 @@
  *
  * @author Geneviève Bastien
  */
+@Deprecated(since="9.4", forRemoval=true)
 public interface IHostModel {
 
     /**
diff --git a/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/model/ModelManager.java b/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/model/ModelManager.java
index e8e9645a1..080aefae3 100644
--- a/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/model/ModelManager.java
+++ b/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/model/ModelManager.java
@@ -21,6 +21,7 @@
  *
  * @author Geneviève Bastien
  */
+@Deprecated(since="9.4", forRemoval=true)
 public final class ModelManager {
 
     private static final Map<String, IHostModel> MODELS_FOR_HOST = new HashMap<>();
diff --git a/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/weighted/tree/AllGroupDescriptor.java b/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/weighted/tree/AllGroupDescriptor.java
index 3918956e9..49a79881f 100644
--- a/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/weighted/tree/AllGroupDescriptor.java
+++ b/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/weighted/tree/AllGroupDescriptor.java
@@ -18,6 +18,7 @@
  *
  * @author Geneviève Bastien
  */
+@Deprecated(since="9.4", forRemoval=true)
 public final class AllGroupDescriptor implements IWeightedTreeGroupDescriptor {
 
     private static final String ALL_NAME = "all"; //$NON-NLS-1$
diff --git a/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/weighted/tree/DepthGroupDescriptor.java b/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/weighted/tree/DepthGroupDescriptor.java
index 6a09550ba..ea2c3fdb3 100644
--- a/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/weighted/tree/DepthGroupDescriptor.java
+++ b/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/weighted/tree/DepthGroupDescriptor.java
@@ -22,6 +22,7 @@
  *
  * @author Geneviève Bastien
  */
+@Deprecated(since="9.4", forRemoval=true)
 public class DepthGroupDescriptor implements IWeightedTreeGroupDescriptor {
 
     private final int fDepth;
diff --git a/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/weighted/tree/IDataPalette.java b/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/weighted/tree/IDataPalette.java
index 61abc5a02..a055a2500 100644
--- a/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/weighted/tree/IDataPalette.java
+++ b/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/weighted/tree/IDataPalette.java
@@ -21,6 +21,7 @@
  *
  * @author Geneviève Bastien
  */
+@Deprecated(since="9.4", forRemoval=true)
 public interface IDataPalette {
 
     /**
diff --git a/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/weighted/tree/ITree.java b/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/weighted/tree/ITree.java
index f37a42467..93bee332d 100644
--- a/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/weighted/tree/ITree.java
+++ b/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/weighted/tree/ITree.java
@@ -21,6 +21,7 @@
  *
  * @author Geneviève Bastien
  */
+@Deprecated(since="9.4", forRemoval=true)
 public interface ITree {
 
     /**
diff --git a/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/weighted/tree/IWeightedTreeGroupDescriptor.java b/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/weighted/tree/IWeightedTreeGroupDescriptor.java
index cc8e77f25..fcb1721d0 100644
--- a/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/weighted/tree/IWeightedTreeGroupDescriptor.java
+++ b/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/weighted/tree/IWeightedTreeGroupDescriptor.java
@@ -49,6 +49,7 @@
  *
  * @author Geneviève Bastien
  */
+@Deprecated(since="9.4", forRemoval=true)
 public interface IWeightedTreeGroupDescriptor {
 
     /**
diff --git a/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/weighted/tree/IWeightedTreeProvider.java b/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/weighted/tree/IWeightedTreeProvider.java
index 5696b6d6a..f37a332be 100644
--- a/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/weighted/tree/IWeightedTreeProvider.java
+++ b/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/weighted/tree/IWeightedTreeProvider.java
@@ -48,6 +48,7 @@
  * @param <T>
  *            The type of the tree provided
  */
+@Deprecated(since="9.4", forRemoval=true)
 public interface IWeightedTreeProvider<@NonNull N, E, @NonNull T extends WeightedTree<N>> {
 
     /**
diff --git a/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/weighted/tree/IWeightedTreeSet.java b/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/weighted/tree/IWeightedTreeSet.java
index 8f80a2b23..680a91aca 100644
--- a/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/weighted/tree/IWeightedTreeSet.java
+++ b/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/weighted/tree/IWeightedTreeSet.java
@@ -36,6 +36,7 @@
  * @param <T>
  *            The type of the tree provided
  */
+@Deprecated(since="9.4", forRemoval=true)
 public interface IWeightedTreeSet<@NonNull N, E, @NonNull T extends WeightedTree<N>> {
 
     /**
diff --git a/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/weighted/tree/WeightedTree.java b/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/weighted/tree/WeightedTree.java
index 65071b95c..dcf2a7362 100644
--- a/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/weighted/tree/WeightedTree.java
+++ b/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/weighted/tree/WeightedTree.java
@@ -37,6 +37,7 @@
  * @param <T>
  *            The type of objects in this tree
  */
+@Deprecated(since="9.4", forRemoval=true)
 public class WeightedTree<@NonNull T> implements Comparable<WeightedTree<T>> {
 
     private final T fObject;
diff --git a/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/weighted/tree/WeightedTreeGroupBy.java b/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/weighted/tree/WeightedTreeGroupBy.java
index d8acea38c..a50cbca52 100644
--- a/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/weighted/tree/WeightedTreeGroupBy.java
+++ b/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/weighted/tree/WeightedTreeGroupBy.java
@@ -22,6 +22,7 @@
  *
  * @author Geneviève Bastien
  */
+@Deprecated(since="9.4", forRemoval=true)
 public final class WeightedTreeGroupBy {
 
     private WeightedTreeGroupBy() {
diff --git a/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/weighted/tree/WeightedTreeSet.java b/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/weighted/tree/WeightedTreeSet.java
index e172c14d9..74b993b34 100644
--- a/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/weighted/tree/WeightedTreeSet.java
+++ b/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/weighted/tree/WeightedTreeSet.java
@@ -32,6 +32,7 @@
  *            {@link ITree}, then the elements and their associated weighted
  *            trees will be grouped in a hierarchical style
  */
+@Deprecated(since="9.4", forRemoval=true)
 public class WeightedTreeSet<@NonNull N, E> implements IWeightedTreeSet<N, E, WeightedTree<N>> {
 
     private final Set<E> fRootElements = new HashSet<>();
diff --git a/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/base/CallStackElement.java b/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/base/CallStackElement.java
index 47b7bb0ae..1398d13f4 100644
--- a/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/base/CallStackElement.java
+++ b/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/base/CallStackElement.java
@@ -24,6 +24,7 @@
  *
  * @author Geneviève Bastien
  */
+@Deprecated(since="9.4", forRemoval=true)
 public class CallStackElement implements ICallStackElement {
 
     /**
diff --git a/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/base/CallStackGroupDescriptor.java b/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/base/CallStackGroupDescriptor.java
index c7908cf25..00e10ba92 100644
--- a/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/base/CallStackGroupDescriptor.java
+++ b/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/base/CallStackGroupDescriptor.java
@@ -18,6 +18,7 @@
  *
  * @author Geneviève Bastien
  */
+@Deprecated(since="9.4", forRemoval=true)
 public class CallStackGroupDescriptor implements ICallStackGroupDescriptor {
 
     private final String fName;
diff --git a/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/base/EdgeStateValue.java b/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/base/EdgeStateValue.java
index 22894e542..aa72a9d5a 100644
--- a/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/base/EdgeStateValue.java
+++ b/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/base/EdgeStateValue.java
@@ -30,6 +30,7 @@
  *
  * @author Loic Prieur-Drevon
  */
+@Deprecated(since="9.4", forRemoval=true)
 public class EdgeStateValue extends CustomStateValue {
 
     /**
diff --git a/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/base/ICallStackElement.java b/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/base/ICallStackElement.java
index 98515797c..464760cc0 100644
--- a/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/base/ICallStackElement.java
+++ b/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/base/ICallStackElement.java
@@ -28,6 +28,7 @@
  *
  * @author Geneviève Bastien
  */
+@Deprecated(since="9.4", forRemoval=true)
 public interface ICallStackElement extends ITree {
 
     /**
diff --git a/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/base/ICallStackGroupDescriptor.java b/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/base/ICallStackGroupDescriptor.java
index a69a700ea..31f8a30c5 100644
--- a/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/base/ICallStackGroupDescriptor.java
+++ b/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/base/ICallStackGroupDescriptor.java
@@ -59,6 +59,7 @@
  *
  * @author Geneviève Bastien
  */
+@Deprecated(since="9.4", forRemoval=true)
 public interface ICallStackGroupDescriptor extends IWeightedTreeGroupDescriptor {
 
     @Override
diff --git a/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/callgraph/CallGraph.java b/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/callgraph/CallGraph.java
index 2589aa122..c1176f82d 100644
--- a/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/callgraph/CallGraph.java
+++ b/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/callgraph/CallGraph.java
@@ -33,6 +33,7 @@
  *
  * @author Geneviève Bastien
  */
+@Deprecated(since="9.4", forRemoval=true)
 public class CallGraph implements IWeightedTreeSet<@NonNull ICallStackSymbol, ICallStackElement, AggregatedCallSite> {
 
     /**
diff --git a/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/callgraph/ICallGraphProvider.java b/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/callgraph/ICallGraphProvider.java
index cee168f91..ad628d261 100644
--- a/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/callgraph/ICallGraphProvider.java
+++ b/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/callgraph/ICallGraphProvider.java
@@ -32,6 +32,7 @@
  *
  * @author Geneviève Bastien
  */
+@Deprecated(since="9.4", forRemoval=true)
 public interface ICallGraphProvider extends IWeightedTreeProvider<@NonNull ICallStackSymbol, ICallStackElement, AggregatedCallSite> {
 
     /**
diff --git a/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/callgraph/SymbolAspect.java b/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/callgraph/SymbolAspect.java
index b61712b2e..5bdc09789 100644
--- a/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/callgraph/SymbolAspect.java
+++ b/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/callgraph/SymbolAspect.java
@@ -31,6 +31,7 @@
  *
  * @author Sonia Farrah
  */
+@Deprecated(since="9.4", forRemoval=true)
 public final class SymbolAspect implements ISegmentAspect {
     /**
      * A symbol aspect
diff --git a/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/flamechart/CallStack.java b/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/flamechart/CallStack.java
index 00e4d3a6f..39e3b4a0b 100644
--- a/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/flamechart/CallStack.java
+++ b/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/flamechart/CallStack.java
@@ -48,6 +48,7 @@
  *
  * @author Geneviève Bastien
  */
+@Deprecated(since="9.4", forRemoval=true)
 public class CallStack {
 
     private final @Nullable ICallStackElement fSymbolKeyElement;
diff --git a/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/flamechart/IEventCallStackProvider.java b/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/flamechart/IEventCallStackProvider.java
index 3ed24750c..9a9571177 100644
--- a/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/flamechart/IEventCallStackProvider.java
+++ b/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/flamechart/IEventCallStackProvider.java
@@ -22,6 +22,7 @@
  *
  * @author Geneviève Bastien
  */
+@Deprecated(since="9.4", forRemoval=true)
 public interface IEventCallStackProvider {
 
     /**
diff --git a/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/instrumented/CallStackDepth.java b/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/instrumented/CallStackDepth.java
index 1ff70548d..150da8922 100644
--- a/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/instrumented/CallStackDepth.java
+++ b/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/instrumented/CallStackDepth.java
@@ -22,6 +22,7 @@
  *
  * @author Geneviève Bastien
  */
+@Deprecated(since="9.4", forRemoval=true)
 public class CallStackDepth {
 
     private final CallStack fCallstack;
diff --git a/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/instrumented/ICalledFunction.java b/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/instrumented/ICalledFunction.java
index 10c452536..ede2bbfb3 100644
--- a/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/instrumented/ICalledFunction.java
+++ b/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/instrumented/ICalledFunction.java
@@ -22,6 +22,7 @@
  * @author Matthew Khouzam
  * @author Sonia Farrah
  */
+@Deprecated(since="9.4", forRemoval=true)
 public interface ICalledFunction extends INamedSegment {
 
     /**
diff --git a/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/instrumented/IFlameChartProvider.java b/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/instrumented/IFlameChartProvider.java
index 788886f88..5b3dcd084 100644
--- a/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/instrumented/IFlameChartProvider.java
+++ b/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/instrumented/IFlameChartProvider.java
@@ -30,6 +30,7 @@
  *
  * @author Geneviève Bastien
  */
+@Deprecated(since="9.4", forRemoval=true)
 public interface IFlameChartProvider extends IAnalysisModule, ISegmentStoreProvider {
 
     /**
diff --git a/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/instrumented/statesystem/CallStackHostUtils.java b/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/instrumented/statesystem/CallStackHostUtils.java
index c7c7ef7f5..5ab29196f 100644
--- a/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/instrumented/statesystem/CallStackHostUtils.java
+++ b/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/instrumented/statesystem/CallStackHostUtils.java
@@ -32,6 +32,7 @@
  *
  * @author Geneviève Bastien
  */
+@Deprecated(since="9.4", forRemoval=true)
 public final class CallStackHostUtils {
 
     private CallStackHostUtils() {
diff --git a/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/instrumented/statesystem/CallStackSeries.java b/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/instrumented/statesystem/CallStackSeries.java
index 646a225be..4ff73e331 100644
--- a/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/instrumented/statesystem/CallStackSeries.java
+++ b/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/instrumented/statesystem/CallStackSeries.java
@@ -98,6 +98,7 @@
  *
  * @author Geneviève Bastien
  */
+@Deprecated(since="9.4", forRemoval=true)
 public class CallStackSeries implements ISegmentStore<ISegment> {
 
     /**
diff --git a/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/instrumented/statesystem/CallStackStateProvider.java b/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/instrumented/statesystem/CallStackStateProvider.java
index cbfe2d3bf..0ed9cf157 100644
--- a/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/instrumented/statesystem/CallStackStateProvider.java
+++ b/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/instrumented/statesystem/CallStackStateProvider.java
@@ -84,6 +84,7 @@
  *
  * @author Patrick Tasse
  */
+@Deprecated(since="9.4", forRemoval=true)
 public abstract class CallStackStateProvider extends AbstractTmfStateProvider {
 
     /**
diff --git a/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/instrumented/statesystem/InstrumentedCallStackAnalysis.java b/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/instrumented/statesystem/InstrumentedCallStackAnalysis.java
index 26bb40687..7671f0da4 100644
--- a/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/instrumented/statesystem/InstrumentedCallStackAnalysis.java
+++ b/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/instrumented/statesystem/InstrumentedCallStackAnalysis.java
@@ -58,6 +58,7 @@
  * @author Matthew Khouzam
  * @author Geneviève Bastien
  */
+@Deprecated(since="9.4", forRemoval=true)
 public abstract class InstrumentedCallStackAnalysis extends TmfStateSystemAnalysisModule implements IFlameChartProvider, ICallGraphProvider {
 
     /** CallStack stack-attribute */
diff --git a/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/lttng2/ust/LttngUstCallStackAnalysis.java b/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/lttng2/ust/LttngUstCallStackAnalysis.java
index 405c7825f..5406044f9 100644
--- a/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/lttng2/ust/LttngUstCallStackAnalysis.java
+++ b/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/lttng2/ust/LttngUstCallStackAnalysis.java
@@ -39,6 +39,7 @@
  *
  * @author Geneviève Bastien
  */
+@Deprecated(since="9.4", forRemoval=true)
 @SuppressWarnings("restriction")
 public class LttngUstCallStackAnalysis extends InstrumentedCallStackAnalysis {
 
diff --git a/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/lttng2/ust/LttngUstCallStackAnalysisRequirement.java b/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/lttng2/ust/LttngUstCallStackAnalysisRequirement.java
index 8f8bc8ec8..71b1e59a1 100644
--- a/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/lttng2/ust/LttngUstCallStackAnalysisRequirement.java
+++ b/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/lttng2/ust/LttngUstCallStackAnalysisRequirement.java
@@ -29,6 +29,7 @@
  * @author Bernd Hufmann
  *
  */
+@Deprecated(since="9.4", forRemoval=true)
 @SuppressWarnings("restriction")
 public class LttngUstCallStackAnalysisRequirement extends TmfCompositeAnalysisRequirement {
 
diff --git a/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/sampled/callgraph/AggregatedStackTraces.java b/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/sampled/callgraph/AggregatedStackTraces.java
index beba606e0..806b56828 100644
--- a/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/sampled/callgraph/AggregatedStackTraces.java
+++ b/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/sampled/callgraph/AggregatedStackTraces.java
@@ -21,6 +21,7 @@
  *
  * @author Geneviève Bastien
  */
+@Deprecated(since="9.4", forRemoval=true)
 public class AggregatedStackTraces extends AggregatedCallSite {
 
     /**
diff --git a/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/sampled/callgraph/ProfilingCallGraphAnalysisModule.java b/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/sampled/callgraph/ProfilingCallGraphAnalysisModule.java
index 493da0438..bfd8a4923 100644
--- a/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/sampled/callgraph/ProfilingCallGraphAnalysisModule.java
+++ b/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/sampled/callgraph/ProfilingCallGraphAnalysisModule.java
@@ -47,6 +47,7 @@
  *
  * @author Geneviève Bastien
  */
+@Deprecated(since="9.4", forRemoval=true)
 public abstract class ProfilingCallGraphAnalysisModule extends TmfAbstractAnalysisModule implements ICallGraphProvider, IEventCallStackProvider {
 
     private static final MetricType WEIGHT_METRIC = new MetricType(Objects.requireNonNull(Messages.CallGraphStats_NbCalls), DataType.NUMBER, null);
diff --git a/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/symbol/CallStackSymbolFactory.java b/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/symbol/CallStackSymbolFactory.java
index ba6b073d8..d4ceeaa2a 100644
--- a/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/symbol/CallStackSymbolFactory.java
+++ b/callstack/org.eclipse.tracecompass.incubator.callstack.core/src/org/eclipse/tracecompass/incubator/callstack/core/symbol/CallStackSymbolFactory.java
@@ -23,6 +23,7 @@
  *
  * @author Geneviève Bastien
  */
+@Deprecated(since="9.4", forRemoval=true)
 public final class CallStackSymbolFactory {
 
     private static final Pattern IS_NUMBER = Pattern.compile("[0-9A-Fa-f]+");