diff --git a/cc/ndk_sysroot.go b/cc/ndk_sysroot.go
index 47dda27..2e4e395 100644
--- a/cc/ndk_sysroot.go
+++ b/cc/ndk_sysroot.go
@@ -90,6 +90,10 @@
 	installPaths := []string{}
 	licensePaths := []string{}
 	ctx.VisitAllModules(func(module blueprint.Module) {
+		if m, ok := module.(android.Module); ok && !m.Enabled() {
+			return
+		}
+
 		if m, ok := module.(*headerModule); ok {
 			installPaths = append(installPaths, m.installPaths...)
 			licensePaths = append(licensePaths, m.licensePath.String())
diff --git a/cc/rs.go b/cc/rs.go
index fda2469..a001f89 100644
--- a/cc/rs.go
+++ b/cc/rs.go
@@ -108,7 +108,10 @@
 	flags.rsFlags = append(flags.rsFlags, includeDirsToFlags(rootRsIncludeDirs))
 
 	flags.GlobalFlags = append(flags.GlobalFlags,
-		"-I"+android.PathForModuleGen(ctx, "rs").String())
+		"-I"+android.PathForModuleGen(ctx, "rs").String(),
+		"-Iframeworks/rs",
+		"-Iframeworks/rs/cpp",
+	)
 
 	return flags
 }