diff --git a/bsc/intel-compiler/wrapper2021.nix b/bsc/intel-compiler/wrapper2021.nix
index 6802fa2..17ccdf8 100644
--- a/bsc/intel-compiler/wrapper2021.nix
+++ b/bsc/intel-compiler/wrapper2021.nix
@@ -14,6 +14,8 @@ in wrapCCWith rec {
     echo "-B${gcc.cc}/lib/gcc/${targetConfig}/${gcc.version}" >> $out/nix-support/cc-cflags
     echo "-isystem ${iccUnwrapped}/include" >> $out/nix-support/cc-cflags
     echo "-isystem ${iccUnwrapped}/include/icc" >> $out/nix-support/cc-cflags
+    echo "-isystem ${gcc.cc}/include/c++/${gcc.version}" >> $out/nix-support/cc-cflags
+    echo "-isystem ${gcc.cc}/include/c++/${gcc.version}/${targetConfig}" >> $out/nix-support/cc-cflags
 
     echo "-L${iccUnwrapped}/lib" >> $out/nix-support/cc-ldflags
     echo "-L${gcc.cc}/lib/gcc/${targetConfig}/${gcc.version}" >> $out/nix-support/cc-ldflags
diff --git a/overlay.nix b/overlay.nix
index 4d7a302..e12cbff 100644
--- a/overlay.nix
+++ b/overlay.nix
@@ -48,7 +48,7 @@ let
 
     icc2021 = appendPasstru (callPackage ./bsc/intel-compiler/wrapper2021.nix {
       iccUnwrapped = bsc.icc2021Unwrapped;
-    }) { CC = "icc"; CXX = "icpc"; };
+    }) { CC = "icx"; CXX = "icpx"; };
 
     icc = bsc.icc2020;