From 2c083d3224ab0c4169f5dfef11a35b47909d9b5a Mon Sep 17 00:00:00 2001
From: Vipul Rahane <vipul.rahane@juul.com>
Date: Fri, 17 May 2024 15:16:19 -0700
Subject: [PATCH] Revert "builder: Add private includes only to specific
 packages"

This reverts commit 0ce1291b2aee1f3b05f1b742b5384750920ec6e0.
---
 newt/builder/build.go        | 4 ----
 newt/builder/buildpackage.go | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/newt/builder/build.go b/newt/builder/build.go
index 287ef0b22..b611df3af 100644
--- a/newt/builder/build.go
+++ b/newt/builder/build.go
@@ -322,10 +322,6 @@ func (b *Builder) collectCompileEntriesBpkg(bpkg *BuildPackage) (
 		return nil, err
 	}
 
-	var privateIncCi toolchain.CompilerInfo
-	privateIncCi.Includes = bpkg.privateIncludeDirs(b)
-	c.AddInfo(&privateIncCi)
-
 	srcDirs := []string{}
 
 	if len(bpkg.SourceDirectories) > 0 {
diff --git a/newt/builder/buildpackage.go b/newt/builder/buildpackage.go
index 9513bceff..7bcd835d8 100644
--- a/newt/builder/buildpackage.go
+++ b/newt/builder/buildpackage.go
@@ -243,7 +243,7 @@ func (bpkg *BuildPackage) CompilerInfo(
 		return nil, err
 	}
 
-	ci.Includes = append(ci.Includes, includePaths...)
+	ci.Includes = append(bpkg.privateIncludeDirs(b), includePaths...)
 	bpkg.ci = ci
 
 	return bpkg.ci, nil