diff --git a/buildSrc/src/main/groovy/MuzzlePlugin.groovy b/buildSrc/src/main/groovy/MuzzlePlugin.groovy
index ad324377ff..fa6eb79fec 100644
--- a/buildSrc/src/main/groovy/MuzzlePlugin.groovy
+++ b/buildSrc/src/main/groovy/MuzzlePlugin.groovy
@@ -51,6 +51,7 @@ class MuzzlePlugin implements Plugin<Project> {
     def compileMuzzle = project.task('compileMuzzle') {
       dependsOn(':javaagent-bootstrap:classes')
       dependsOn(':javaagent-tooling:classes')
+      dependsOn(':javaagent-extension-api:classes')
       dependsOn(project.tasks.classes)
     }
 
diff --git a/gradle/instrumentation.gradle b/gradle/instrumentation.gradle
index 0e539fd5dd..188ffa9156 100644
--- a/gradle/instrumentation.gradle
+++ b/gradle/instrumentation.gradle
@@ -46,6 +46,11 @@ afterEvaluate {
       exclude group: 'io.opentelemetry', module: 'opentelemetry-sdk'
       exclude group: 'io.opentelemetry', module: 'opentelemetry-sdk-metrics'
     }
+    compileOnly(project(':javaagent-tooling')) {
+      // OpenTelemetry SDK is not needed for compilation
+      exclude group: 'io.opentelemetry', module: 'opentelemetry-sdk'
+      exclude group: 'io.opentelemetry', module: 'opentelemetry-sdk-metrics'
+    }
     compileOnly deps.bytebuddy
     annotationProcessor deps.autoservice
     compileOnly deps.autoservice
diff --git a/instrumentation/external-annotations/javaagent-unit-tests/external-annotations-javaagent-unittests.gradle b/instrumentation/external-annotations/javaagent-unit-tests/external-annotations-javaagent-unittests.gradle
index 07f975090d..c4035195e6 100644
--- a/instrumentation/external-annotations/javaagent-unit-tests/external-annotations-javaagent-unittests.gradle
+++ b/instrumentation/external-annotations/javaagent-unit-tests/external-annotations-javaagent-unittests.gradle
@@ -3,6 +3,7 @@ apply from: "$rootDir/gradle/java.gradle"
 dependencies {
   testImplementation project(':instrumentation-api')
   testImplementation project(':javaagent-extension-api')
+  testImplementation project(':javaagent-tooling')
   testImplementation deps.bytebuddy
   testImplementation project(':instrumentation:external-annotations:javaagent')
 }
diff --git a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-cxf-3.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/CxfJaxRsInvokerInstrumentation.java b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-cxf-3.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/CxfJaxRsInvokerInstrumentation.java
index 017eda69b1..050d0d2c8b 100644
--- a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-cxf-3.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/CxfJaxRsInvokerInstrumentation.java
+++ b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-cxf-3.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/CxfJaxRsInvokerInstrumentation.java
@@ -11,7 +11,7 @@ import static net.bytebuddy.matcher.ElementMatchers.takesArgument;
 
 import io.opentelemetry.context.Context;
 import io.opentelemetry.context.Scope;
-import io.opentelemetry.javaagent.tooling.TypeInstrumentation;
+import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
 import java.util.Map;
 import net.bytebuddy.asm.Advice;
 import net.bytebuddy.description.method.MethodDescription;
diff --git a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-jersey-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/JerseyResourceMethodDispatcherInstrumentation.java b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-jersey-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/JerseyResourceMethodDispatcherInstrumentation.java
index dc181e3c4c..9a83aa09da 100644
--- a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-jersey-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/JerseyResourceMethodDispatcherInstrumentation.java
+++ b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-jersey-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/JerseyResourceMethodDispatcherInstrumentation.java
@@ -9,7 +9,7 @@ import static java.util.Collections.singletonMap;
 import static net.bytebuddy.matcher.ElementMatchers.named;
 import static net.bytebuddy.matcher.ElementMatchers.takesArgument;
 
-import io.opentelemetry.javaagent.tooling.TypeInstrumentation;
+import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
 import java.util.Map;
 import javax.ws.rs.core.Request;
 import net.bytebuddy.asm.Advice;
diff --git a/javaagent-extension-api/javaagent-extension-api.gradle b/javaagent-extension-api/javaagent-extension-api.gradle
index 556fea436d..a5cf139615 100644
--- a/javaagent-extension-api/javaagent-extension-api.gradle
+++ b/javaagent-extension-api/javaagent-extension-api.gradle
@@ -27,4 +27,6 @@ dependencies {
   implementation project(":javaagent-api")
   // TODO: ideally this module should not depend on bootstrap, bootstrap should be an internal component
   implementation project(":javaagent-bootstrap")
+
+  instrumentationMuzzle sourceSets.main.output
 }
\ No newline at end of file
diff --git a/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/muzzle/matcher/MuzzleGradlePluginUtil.java b/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/muzzle/matcher/MuzzleGradlePluginUtil.java
index 6ebd0a4a20..fb5a7be511 100644
--- a/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/muzzle/matcher/MuzzleGradlePluginUtil.java
+++ b/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/muzzle/matcher/MuzzleGradlePluginUtil.java
@@ -82,7 +82,7 @@ public final class MuzzleGradlePluginUtil {
 
       validatedModulesCount++;
     }
-    // run helper injector on all instrumenters
+    // run helper injector on all instrumentation modules
     if (assertPass) {
       for (InstrumentationModule instrumentationModule :
           ServiceLoader.load(InstrumentationModule.class, agentClassLoader)) {