diff --git a/cc/linker.go b/cc/linker.go
index ae333563b..73fc4f0ee 100644
--- a/cc/linker.go
+++ b/cc/linker.go
@@ -322,7 +322,7 @@ func (linker *baseLinker) linkerDeps(ctx DepsContext, deps Deps) Deps {
 
 	if ctx.toolchain().Bionic() {
 		// libclang_rt.builtins has to be last on the command line
-		if !Bool(linker.Properties.No_libcrt) {
+		if !Bool(linker.Properties.No_libcrt) && !ctx.header() {
 			deps.LateStaticLibs = append(deps.LateStaticLibs, config.BuiltinsRuntimeLibrary(ctx.toolchain()))
 		}
 
diff --git a/cc/stl.go b/cc/stl.go
index 4f8865fd2..75921c6ff 100644
--- a/cc/stl.go
+++ b/cc/stl.go
@@ -62,6 +62,8 @@ func (stl *stl) begin(ctx BaseModuleContext) {
 		s := ""
 		if stl.Properties.Stl != nil {
 			s = *stl.Properties.Stl
+		} else if ctx.header() {
+			s = "none"
 		}
 		if ctx.useSdk() && ctx.Device() {
 			switch s {