diff --git a/java/base.go b/java/base.go
index 5802099..cc55394 100644
--- a/java/base.go
+++ b/java/base.go
@@ -1108,13 +1108,23 @@
 		flags.kotlincClasspath = append(flags.kotlincClasspath, flags.bootClasspath...)
 		flags.kotlincClasspath = append(flags.kotlincClasspath, flags.classpath...)
 
-		if len(flags.processorPath) > 0 {
+		useTurbineApt := len(flags.processorPath) > 0
+		if useTurbineApt {
 			// Use kapt for annotation processing
-			kaptSrcJar := android.PathForModuleOut(ctx, "kapt", "kapt-sources.jar")
-			kaptResJar := android.PathForModuleOut(ctx, "kapt", "kapt-res.jar")
-			kotlinKapt(ctx, kaptSrcJar, kaptResJar, kotlinSrcFiles, kotlinCommonSrcFiles, srcJars, flags)
-			srcJars = append(srcJars, kaptSrcJar)
-			kotlinJars = append(kotlinJars, kaptResJar)
+			kotlinTurbineAptHeaderJar := android.PathForModuleOut(ctx, "turbine-apt", "stubs-header.jar")
+			kotlinTurbineAptSrcJar := android.PathForModuleOut(ctx, "turbine-apt", "anno-sources.jar")
+			kotlinTurbineAptResJar := android.PathForModuleOut(ctx, "turbine-apt", "anno-res.jar")
+			kotlinTurbineApt(ctx, kotlinTurbineAptHeaderJar, kotlinTurbineAptSrcJar, kotlinTurbineAptResJar,
+				kotlinSrcFiles, kotlinCommonSrcFiles, srcJars, flags)
+			srcJars = append(srcJars, kotlinTurbineAptSrcJar)
+			kotlinJars = append(kotlinJars, kotlinTurbineAptResJar)
+			// When annotation processors are enabled we've already created java stubs for
+			// kotlin files using kapt and compiled them in turbine-apt while running the
+			// annotation processors, reuse the result as the kotlin header jar for the javac
+			// action.  It can't be used as the header jar for downstream modules to compile
+			// against because it doesn't contain the kotlin-specific metadata that kotlinc
+			// needs.
+			flags.classpath = append(classpath{kotlinTurbineAptHeaderJar}, flags.classpath...)
 			// Disable annotation processing in javac, it's already been handled by kapt
 			flags.processorPath = nil
 			flags.processors = nil
@@ -1127,11 +1137,13 @@
 			return
 		}
 
-		// Make javac rule depend on the kotlinc rule
-		flags.classpath = append(classpath{kotlinHeaderJar}, flags.classpath...)
-
 		kotlinJars = append(kotlinJars, kotlinJar)
 		kotlinHeaderJars = append(kotlinHeaderJars, kotlinHeaderJar)
+		if !useTurbineApt {
+			// When annotation processors are not enabled use the kotlinc gen-jvm-abi plugin
+			// output as the header jar for javac in this module.
+			flags.classpath = append(classpath{kotlinHeaderJar}, flags.classpath...)
+		}
 
 		// Jar kotlin classes into the final jar after javac
 		if BoolDefault(j.properties.Static_kotlin_stdlib, true) {