diff --git a/cc/config/global.go b/cc/config/global.go
index d17a7d154..5b49bc3e9 100644
--- a/cc/config/global.go
+++ b/cc/config/global.go
@@ -93,11 +93,10 @@ func init() {
 	// Everything in these lists is a crime against abstraction and dependency tracking.
 	// Do not add anything to this list.
 	pctx.PrefixedPathsForOptionalSourceVariable("CommonGlobalIncludes", "-I",
-		[]string{
-			"system/core/include",
-		})
+		[]string{})
 	pctx.PrefixedPathsForOptionalSourceVariable("CommonGlobalSystemIncludes", "-isystem ",
 		[]string{
+			"system/core/include",
 			"system/media/audio/include",
 			"hardware/libhardware/include",
 			"hardware/libhardware_legacy/include",