diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/HttpServerDecorator.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/HttpServerDecorator.java
index 41330ffbe4c..e740b913726 100644
--- a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/HttpServerDecorator.java
+++ b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/HttpServerDecorator.java
@@ -8,7 +8,6 @@
 import static datadog.trace.bootstrap.instrumentation.decorator.http.HttpResourceDecorator.HTTP_RESOURCE_DECORATOR;
 
 import datadog.appsec.api.blocking.BlockingException;
-import datadog.context.InferredProxyContext;
 import datadog.context.propagation.Propagators;
 import datadog.trace.api.Config;
 import datadog.trace.api.DDTags;
@@ -31,6 +30,7 @@
 import datadog.trace.bootstrap.instrumentation.api.AgentSpanLink;
 import datadog.trace.bootstrap.instrumentation.api.AgentTracer;
 import datadog.trace.bootstrap.instrumentation.api.ErrorPriorities;
+import datadog.trace.bootstrap.instrumentation.api.InferredProxyContext;
 import datadog.trace.bootstrap.instrumentation.api.InternalSpanTypes;
 import datadog.trace.bootstrap.instrumentation.api.ResourceNamePriorities;
 import datadog.trace.bootstrap.instrumentation.api.TagContext;
@@ -56,7 +56,7 @@
 public abstract class HttpServerDecorator<REQUEST, CONNECTION, RESPONSE, REQUEST_CARRIER>
     extends ServerDecorator {
 
-  class InferredProxySpanGroup implements AgentSpan {
+  static class InferredProxySpanGroup implements AgentSpan {
     private final AgentSpan inferredProxySpan;
     private final AgentSpan serverSpan;
 
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/CoreTracer.java b/dd-trace-core/src/main/java/datadog/trace/core/CoreTracer.java
index 99fca082ecd..2c51878ff44 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/CoreTracer.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/CoreTracer.java
@@ -22,7 +22,6 @@
 import datadog.communication.ddagent.SharedCommunicationObjects;
 import datadog.communication.monitor.Monitoring;
 import datadog.communication.monitor.Recording;
-import datadog.context.propagation.InferredProxyPropagator;
 import datadog.context.propagation.Propagators;
 import datadog.trace.api.ClassloaderConfigurationOverrides;
 import datadog.trace.api.Config;
@@ -90,6 +89,7 @@
 import datadog.trace.core.monitor.TracerHealthMetrics;
 import datadog.trace.core.propagation.ExtractedContext;
 import datadog.trace.core.propagation.HttpCodec;
+import datadog.trace.core.propagation.InferredProxyPropagator;
 import datadog.trace.core.propagation.PropagationTags;
 import datadog.trace.core.propagation.TracingPropagator;
 import datadog.trace.core.propagation.XRayPropagator;
diff --git a/components/context/src/main/java/datadog/context/propagation/InferredProxyPropagator.java b/dd-trace-core/src/main/java/datadog/trace/core/propagation/InferredProxyPropagator.java
similarity index 91%
rename from components/context/src/main/java/datadog/context/propagation/InferredProxyPropagator.java
rename to dd-trace-core/src/main/java/datadog/trace/core/propagation/InferredProxyPropagator.java
index 69e5a0e896e..d30fb53b95b 100644
--- a/components/context/src/main/java/datadog/context/propagation/InferredProxyPropagator.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/propagation/InferredProxyPropagator.java
@@ -1,7 +1,10 @@
-package datadog.context.propagation;
+package datadog.trace.core.propagation;
 
 import datadog.context.Context;
-import datadog.context.InferredProxyContext;
+import datadog.context.propagation.CarrierSetter;
+import datadog.context.propagation.CarrierVisitor;
+import datadog.context.propagation.Propagator;
+import datadog.trace.bootstrap.instrumentation.api.InferredProxyContext;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.function.BiConsumer;
diff --git a/components/context/src/test/java/datadog/context/InferredProxyHandlingTest.java b/dd-trace-core/src/test/groovy/datadog/trace/core/propagation/InferredProxyHandlingTest.java
similarity index 98%
rename from components/context/src/test/java/datadog/context/InferredProxyHandlingTest.java
rename to dd-trace-core/src/test/groovy/datadog/trace/core/propagation/InferredProxyHandlingTest.java
index 53ddf5cb12a..bef5c070eef 100644
--- a/components/context/src/test/java/datadog/context/InferredProxyHandlingTest.java
+++ b/dd-trace-core/src/test/groovy/datadog/trace/core/propagation/InferredProxyHandlingTest.java
@@ -1,12 +1,13 @@
-package datadog.context;
+package datadog.trace.core.propagation;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
+import datadog.context.Context;
 import datadog.context.propagation.CarrierVisitor;
-import datadog.context.propagation.InferredProxyPropagator;
+import datadog.trace.bootstrap.instrumentation.api.InferredProxyContext;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
@@ -105,7 +106,7 @@ class PropagatorTests { // Kept non-static
 
     @ParameterizedTest(name = "{0}")
     @MethodSource(
-        "datadog.context.InferredProxyHandlingTest#validHeadersProviderForPropagator") // Fully
+        "datadog.trace.core.propagation.InferredProxyHandlingTest#validHeadersProviderForPropagator") // Fully
     // qualified
     // name
     @DisplayName("Should extract InferredProxyContext when valid headers are present")
@@ -141,7 +142,7 @@ void testSuccessfulExtraction(
 
     @ParameterizedTest(name = "{0}")
     @MethodSource(
-        "datadog.context.InferredProxyHandlingTest#invalidOrMissingHeadersProviderForPropagator") // Fully qualified name
+        "datadog.trace.core.propagation.InferredProxyHandlingTest#invalidOrMissingHeadersProviderForPropagator") // Fully qualified name
     @DisplayName("Should create InferredProxyContext even if some critical headers are missing")
     void testExtractionWithMissingCriticalHeaders(String description, Map<String, String> headers) {
       Context rootContext = Context.root();
diff --git a/components/context/src/main/java/datadog/context/InferredProxyContext.java b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/InferredProxyContext.java
similarity index 89%
rename from components/context/src/main/java/datadog/context/InferredProxyContext.java
rename to internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/InferredProxyContext.java
index 51eecc4cc02..b004376c3ea 100644
--- a/components/context/src/main/java/datadog/context/InferredProxyContext.java
+++ b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/InferredProxyContext.java
@@ -1,5 +1,8 @@
-package datadog.context;
+package datadog.trace.bootstrap.instrumentation.api;
 
+import datadog.context.Context;
+import datadog.context.ContextKey;
+import datadog.context.ImplicitContextKeyed;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;