diff --git a/tools/cpp/CROSSTOOL b/tools/cpp/CROSSTOOL
index 12d69ec..c7a846f 100644
--- a/tools/cpp/CROSSTOOL
+++ b/tools/cpp/CROSSTOOL
@@ -439,6 +439,16 @@
       }
     }
     flag_set {
+      action: "assemble"
+      action: "preprocess-assemble"
+      action: "c++-compile"
+      action: "c++-header-parsing"
+      action: "c++-header-preprocessing"
+      flag_group {
+        flag: "-fno-canonical-system-headers"
+      }
+    }
+    flag_set {
       action: "c++-compile"
       action: "c++-header-parsing"
       action: "c++-module-compile"
diff --git a/tools/cpp/static_crosstool.pb b/tools/cpp/static_crosstool.pb
index 778a70d..5599c15 100644
--- a/tools/cpp/static_crosstool.pb
+++ b/tools/cpp/static_crosstool.pb
@@ -384,6 +384,17 @@
     }
 
     flag_set {
+      action: "assemble"
+      action: "preprocess-assemble"
+      action: "c++-compile"
+      action: "c++-header-parsing"
+      action: "c++-header-preprocessing"
+      flag_group {
+        flag: "-fno-canonical-system-headers"
+      }
+    }
+
+    flag_set {
       action: "c++-compile"
       action: "c++-header-parsing"
       action: "c++-module-compile"