diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4
index 7f761195533..d9839ec61ef 100644
--- a/libstdc++-v3/acinclude.m4
+++ b/libstdc++-v3/acinclude.m4
@@ -196,7 +196,7 @@ AC_DEFUN(GLIBCPP_CHECK_COMPILER_FEATURES, [
   # Check for pragma system_header.
   AC_MSG_CHECKING([for g++ that supports pragma system_header])
   CXXFLAGS='-Wunknown-pragmas -Werror'
-  AC_TRY_COMPILE([#pragma system_header], [int foo;
+  AC_TRY_COMPILE([#pragma GCC system_header], [int foo;
   ], [ac_newpragma=yes], [ac_newpragma=no])
   if test "$ac_test_CXXFLAGS" = set; then
     CXXFLAGS="$ac_save_CXXFLAGS"
@@ -1514,7 +1514,7 @@ dnl Then, if any (well almost any) other make is called, and GNU make also
 dnl exists, then the other make wraps the GNU make.
 dnl
 dnl @author John Darrington <j.darrington@elvis.murdoch.edu.au>
-dnl @version $Id: acinclude.m4,v 1.42 2000/07/17 18:17:33 pme Exp $
+dnl @version $Id: acinclude.m4,v 1.43 2000/07/19 00:57:37 bkoz Exp $
 dnl
 dnl #### Changes for libstdc++-v3:  reformatting and linewrapping; prepending
 dnl #### GLIBCPP_ to the macro name; adding the :-make fallback in the
diff --git a/libstdc++-v3/aclocal.m4 b/libstdc++-v3/aclocal.m4
index 8fa8468bd0c..d65ade9d60a 100644
--- a/libstdc++-v3/aclocal.m4
+++ b/libstdc++-v3/aclocal.m4
@@ -208,7 +208,7 @@ AC_DEFUN(GLIBCPP_CHECK_COMPILER_FEATURES, [
   # Check for pragma system_header.
   AC_MSG_CHECKING([for g++ that supports pragma system_header])
   CXXFLAGS='-Wunknown-pragmas -Werror'
-  AC_TRY_COMPILE([#pragma system_header], [int foo;
+  AC_TRY_COMPILE([#pragma GCC system_header], [int foo;
   ], [ac_newpragma=yes], [ac_newpragma=no])
   if test "$ac_test_CXXFLAGS" = set; then
     CXXFLAGS="$ac_save_CXXFLAGS"
@@ -1526,7 +1526,7 @@ dnl Then, if any (well almost any) other make is called, and GNU make also
 dnl exists, then the other make wraps the GNU make.
 dnl
 dnl @author John Darrington <j.darrington@elvis.murdoch.edu.au>
-dnl @version $Id: acinclude.m4,v 1.42 2000/07/17 18:17:33 pme Exp $
+dnl @version $Id: acinclude.m4,v 1.43 2000/07/19 00:57:37 bkoz Exp $
 dnl
 dnl #### Changes for libstdc++-v3:  reformatting and linewrapping; prepending
 dnl #### GLIBCPP_ to the macro name; adding the :-make fallback in the
diff --git a/libstdc++-v3/bits/std_cassert.h b/libstdc++-v3/bits/std_cassert.h
index 1b99dd1a7fa..5d9d18445f9 100644
--- a/libstdc++-v3/bits/std_cassert.h
+++ b/libstdc++-v3/bits/std_cassert.h
@@ -35,5 +35,5 @@
 
 // No include guards on this header...
 
-# pragma system_header
+# pragma GCC system_header
 # include_next <assert.h>
diff --git a/libstdc++-v3/bits/std_cctype.h b/libstdc++-v3/bits/std_cctype.h
index 57377a45ead..1c1e69c6c5d 100644
--- a/libstdc++-v3/bits/std_cctype.h
+++ b/libstdc++-v3/bits/std_cctype.h
@@ -39,7 +39,7 @@
 #define __NO_CTYPE 1
 #endif
 
-# pragma system_header
+# pragma GCC system_header
 # include_next <ctype.h>
 
 // Sequester the C non-inline implementations in the _C_Swamp::
diff --git a/libstdc++-v3/bits/std_cerrno.h b/libstdc++-v3/bits/std_cerrno.h
index 328bdb2e6d0..abd28d560d8 100644
--- a/libstdc++-v3/bits/std_cerrno.h
+++ b/libstdc++-v3/bits/std_cerrno.h
@@ -35,6 +35,6 @@
 
 #ifndef _CPP_CERRNO
 #define _CPP_CERRNO 1
-# pragma system_header
+# pragma GCC system_header
 # include_next <errno.h>
 #endif
diff --git a/libstdc++-v3/bits/std_cfloat.h b/libstdc++-v3/bits/std_cfloat.h
index 0fc561f8c11..8a317fcb490 100644
--- a/libstdc++-v3/bits/std_cfloat.h
+++ b/libstdc++-v3/bits/std_cfloat.h
@@ -35,7 +35,7 @@
 
 #ifndef _CPP_CFLOAT
 #define _CPP_CFLOAT 1
-# pragma system_header
+# pragma GCC system_header
 # include_next <float.h>
 
 #if 0
diff --git a/libstdc++-v3/bits/std_climits.h b/libstdc++-v3/bits/std_climits.h
index 8de77597181..ddd6bd8b40f 100644
--- a/libstdc++-v3/bits/std_climits.h
+++ b/libstdc++-v3/bits/std_climits.h
@@ -35,7 +35,7 @@
 
 #ifndef _CPP_CLIMITS
 #define _CPP_CLIMITS	1
-# pragma system_header
+# pragma GCC system_header
 # include_next <limits.h>
 #endif
 
diff --git a/libstdc++-v3/bits/std_clocale.h b/libstdc++-v3/bits/std_clocale.h
index 0f0be821e6f..a8a44b8571a 100644
--- a/libstdc++-v3/bits/std_clocale.h
+++ b/libstdc++-v3/bits/std_clocale.h
@@ -35,7 +35,7 @@
 
 #ifndef _CPP_CLOCALE
 #define _CPP_CLOCALE     1
-# pragma system_header
+# pragma GCC system_header
 # include_next <locale.h>
 #endif
 
diff --git a/libstdc++-v3/bits/std_cmath.h b/libstdc++-v3/bits/std_cmath.h
index c0f3a0affc2..c25afa6c552 100644
--- a/libstdc++-v3/bits/std_cmath.h
+++ b/libstdc++-v3/bits/std_cmath.h
@@ -35,7 +35,7 @@
 
 #ifndef _CPP_CMATH
 #define _CPP_CMATH 1
-# pragma system_header
+# pragma GCC system_header
 # include_next <math.h>
 # include_next <stdlib.h>
 
diff --git a/libstdc++-v3/bits/std_csetjmp.h b/libstdc++-v3/bits/std_csetjmp.h
index d35fc01190d..fc5b339036a 100644
--- a/libstdc++-v3/bits/std_csetjmp.h
+++ b/libstdc++-v3/bits/std_csetjmp.h
@@ -35,6 +35,6 @@
 
 #ifndef _CPP_CSETJMP
 #define _CPP_CSETJMP 1
-# pragma system_header
+# pragma GCC system_header
 # include_next <setjmp.h>
 #endif
diff --git a/libstdc++-v3/bits/std_csignal.h b/libstdc++-v3/bits/std_csignal.h
index ad10e1bebd8..34c03eb3df1 100644
--- a/libstdc++-v3/bits/std_csignal.h
+++ b/libstdc++-v3/bits/std_csignal.h
@@ -35,6 +35,6 @@
 
 #ifndef _CPP_CSIGNAL
 #define _CPP_CSIGNAL 1
-# pragma system_header
+# pragma GCC system_header
 # include_next <signal.h>
 #endif
diff --git a/libstdc++-v3/bits/std_cstdarg.h b/libstdc++-v3/bits/std_cstdarg.h
index 48fddf8b7b1..f7f4235a290 100644
--- a/libstdc++-v3/bits/std_cstdarg.h
+++ b/libstdc++-v3/bits/std_cstdarg.h
@@ -35,6 +35,6 @@
 
 #ifndef _CPP_CSTDARG
 #define _CPP_CSTDARG 1
-# pragma system_header
+# pragma GCC system_header
 # include_next <stdarg.h>
 #endif
diff --git a/libstdc++-v3/bits/std_cstddef.h b/libstdc++-v3/bits/std_cstddef.h
index 46f2518541c..5557c759571 100644
--- a/libstdc++-v3/bits/std_cstddef.h
+++ b/libstdc++-v3/bits/std_cstddef.h
@@ -35,6 +35,6 @@
 
 #ifndef _CPP_CSTDDEF
 #define _CPP_CSTDDEF 1
-# pragma system_header
+# pragma GCC system_header
 # include_next <stddef.h>
 #endif
diff --git a/libstdc++-v3/bits/std_cstdio.h b/libstdc++-v3/bits/std_cstdio.h
index 567a96a0447..919a03ca4c7 100644
--- a/libstdc++-v3/bits/std_cstdio.h
+++ b/libstdc++-v3/bits/std_cstdio.h
@@ -35,7 +35,7 @@
 
 #ifndef _CPP_CSTDIO
 #define _CPP_CSTDIO 1
-# pragma system_header
+# pragma GCC system_header
 # include_next <stdio.h>
 
 #ifndef SEEK_CUR
diff --git a/libstdc++-v3/bits/std_cstdlib.h b/libstdc++-v3/bits/std_cstdlib.h
index c8420e01870..ee5435739ad 100644
--- a/libstdc++-v3/bits/std_cstdlib.h
+++ b/libstdc++-v3/bits/std_cstdlib.h
@@ -41,7 +41,7 @@
 #define __USE_ISOC9X 1
 #endif
 
-# pragma system_header
+# pragma GCC system_header
 # include_next <stdlib.h>
 
 #endif // _CPP_CSTDLIB
diff --git a/libstdc++-v3/bits/std_cstring.h b/libstdc++-v3/bits/std_cstring.h
index 3393de093c0..06bcdda6535 100644
--- a/libstdc++-v3/bits/std_cstring.h
+++ b/libstdc++-v3/bits/std_cstring.h
@@ -39,6 +39,6 @@
 // We must not see the optimized string functions GNU libc defines.
 #  define __NO_STRING_INLINES
 # endif
-# pragma system_header
+# pragma GCC system_header
 # include_next <string.h>
 #endif
diff --git a/libstdc++-v3/bits/std_ctime.h b/libstdc++-v3/bits/std_ctime.h
index bce2d91353c..b30b318f595 100644
--- a/libstdc++-v3/bits/std_ctime.h
+++ b/libstdc++-v3/bits/std_ctime.h
@@ -35,6 +35,6 @@
 
 #ifndef _CPP_CTIME
 #define _CPP_CTIME 1
-# pragma system_header
+# pragma GCC system_header
 # include_next <time.h>
 #endif
diff --git a/libstdc++-v3/bits/std_cwchar.h b/libstdc++-v3/bits/std_cwchar.h
index 43470aed5d7..77349f9d318 100644
--- a/libstdc++-v3/bits/std_cwchar.h
+++ b/libstdc++-v3/bits/std_cwchar.h
@@ -39,7 +39,7 @@
 #include <bits/c++config.h>
 
 #if _GLIBCPP_USE_WCHAR_T
- # pragma system_header
+ # pragma GCC system_header
  # include_next <wchar.h>
 #else
 # ifdef __cplusplus
diff --git a/libstdc++-v3/bits/std_cwctype.h b/libstdc++-v3/bits/std_cwctype.h
index a74606284ed..c67f2ba9720 100644
--- a/libstdc++-v3/bits/std_cwctype.h
+++ b/libstdc++-v3/bits/std_cwctype.h
@@ -34,7 +34,7 @@
 #ifndef _CPP_CWCTYPE
 #define _CPP_CWCTYPE 1
 
-# pragma system_header
+# pragma GCC system_header
 # include_next <wctype.h>
 
 // Sequester the C non-inline implementations in the _C_Swamp::
diff --git a/libstdc++-v3/bits/std_exception.h b/libstdc++-v3/bits/std_exception.h
index 4e8ea118857..0735601891f 100644
--- a/libstdc++-v3/bits/std_exception.h
+++ b/libstdc++-v3/bits/std_exception.h
@@ -30,7 +30,7 @@
 #define _CPP_EXCEPTION 1
 
 #ifdef __GNUG__
-#pragma system_header
+#pragma GCC system_header
 #include_next <exception>
 #else
 
diff --git a/libstdc++-v3/bits/std_new.h b/libstdc++-v3/bits/std_new.h
index ec500e62559..2e019a9562d 100644
--- a/libstdc++-v3/bits/std_new.h
+++ b/libstdc++-v3/bits/std_new.h
@@ -32,7 +32,7 @@
 #include <bits/c++config.h>
 
 #ifdef __GNUG__
-# pragma system_header
+# pragma GCC system_header
 # include_next <new>
 #else
 
diff --git a/libstdc++-v3/bits/std_typeinfo.h b/libstdc++-v3/bits/std_typeinfo.h
index 6c1655e66b6..b0590121631 100644
--- a/libstdc++-v3/bits/std_typeinfo.h
+++ b/libstdc++-v3/bits/std_typeinfo.h
@@ -34,7 +34,7 @@
 #include <bits/std_exception.h>
 
 #ifdef __GNUG__
-# pragma system_header
+# pragma GCC system_header
 # include_next <typeinfo>
 #else
 
diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
index 8337eecbe9c..d58e4147519 100755
--- a/libstdc++-v3/configure
+++ b/libstdc++-v3/configure
@@ -2839,7 +2839,7 @@ echo "configure:2838: checking for g++ that supports pragma system_header" >&5
   cat > conftest.$ac_ext <<EOF
 #line 2841 "configure"
 #include "confdefs.h"
-#pragma system_header
+#pragma GCC system_header
 int main() {
 int foo;
   
diff --git a/libstdc++-v3/shadow/bits/std_cassert.h b/libstdc++-v3/shadow/bits/std_cassert.h
index b20c45fd5ef..2aa347e06af 100644
--- a/libstdc++-v3/shadow/bits/std_cassert.h
+++ b/libstdc++-v3/shadow/bits/std_cassert.h
@@ -37,7 +37,7 @@
 //   defines a global used in other headers, we are sunk.
 
 extern "C" {
-# pragma system_header
+# pragma GCC system_header
 # include_next <assert.h>
 }
 
diff --git a/libstdc++-v3/shadow/bits/std_cctype.h b/libstdc++-v3/shadow/bits/std_cctype.h
index 5c4dc615cc3..c3ef572ca92 100644
--- a/libstdc++-v3/shadow/bits/std_cctype.h
+++ b/libstdc++-v3/shadow/bits/std_cctype.h
@@ -36,7 +36,7 @@
   namespace _C_legacy {
     extern "C" {
 #     define _IN_C_LEGACY_
-#     pragma system_header
+#     pragma GCC system_header
 #     include_next <ctype.h>
     }
 
diff --git a/libstdc++-v3/shadow/bits/std_cerrno.h b/libstdc++-v3/shadow/bits/std_cerrno.h
index d019a2a01b5..36a6833f993 100644
--- a/libstdc++-v3/shadow/bits/std_cerrno.h
+++ b/libstdc++-v3/shadow/bits/std_cerrno.h
@@ -37,7 +37,7 @@
   namespace _C_legacy {
     extern "C" {
 #     define _IN_C_LEGACY_
-#     pragma system_header
+#     pragma GCC system_header
 #     include_next <errno.h>
     }
 
diff --git a/libstdc++-v3/shadow/bits/std_cfloat.h b/libstdc++-v3/shadow/bits/std_cfloat.h
index 44f24625c02..7e6b74f74d8 100644
--- a/libstdc++-v3/shadow/bits/std_cfloat.h
+++ b/libstdc++-v3/shadow/bits/std_cfloat.h
@@ -44,7 +44,7 @@
   namespace _C_legacy {
     extern "C" {
 #     define _IN_C_LEGACY_
-#     pragma system_header
+#     pragma GCC system_header
 #     include_next <float.h>
     }
 
diff --git a/libstdc++-v3/shadow/bits/std_climits.h b/libstdc++-v3/shadow/bits/std_climits.h
index e98c7566f98..3989444e038 100644
--- a/libstdc++-v3/shadow/bits/std_climits.h
+++ b/libstdc++-v3/shadow/bits/std_climits.h
@@ -37,7 +37,7 @@
   namespace _C_legacy {
     extern "C" {
 #     define _IN_C_LEGACY_
-#     pragma system_header
+#     pragma GCC system_header
 #     include_next <limits.h>
     }
     namespace _C_shadow { }
diff --git a/libstdc++-v3/shadow/bits/std_clocale.h b/libstdc++-v3/shadow/bits/std_clocale.h
index 120c8f22f8e..33697ab1efa 100644
--- a/libstdc++-v3/shadow/bits/std_clocale.h
+++ b/libstdc++-v3/shadow/bits/std_clocale.h
@@ -39,7 +39,7 @@
   namespace _C_legacy {
     extern "C" {
 #     define _IN_C_LEGACY_
-#     pragma system_header
+#     pragma GCC system_header
 #     include_next <locale.h>
     }
 
diff --git a/libstdc++-v3/shadow/bits/std_cmath.h b/libstdc++-v3/shadow/bits/std_cmath.h
index 5bed259918e..9ffcde5524e 100644
--- a/libstdc++-v3/shadow/bits/std_cmath.h
+++ b/libstdc++-v3/shadow/bits/std_cmath.h
@@ -39,7 +39,7 @@
   namespace _C_legacy {
     extern "C" {
 #     define _IN_C_LEGACY_
-#     pragma system_header
+#     pragma GCC system_header
 #     include_next <math.h>
     }
     inline double _CPP_HUGE_VAL_capture()        { return HUGE_VAL; }
diff --git a/libstdc++-v3/shadow/bits/std_csetjmp.h b/libstdc++-v3/shadow/bits/std_csetjmp.h
index d506d0f5900..f7a21eec075 100644
--- a/libstdc++-v3/shadow/bits/std_csetjmp.h
+++ b/libstdc++-v3/shadow/bits/std_csetjmp.h
@@ -37,7 +37,7 @@
   namespace _C_legacy {
     extern "C" {
 #     define _IN_C_LEGACY_
-#     pragma system_header
+#     pragma GCC system_header
 #     include_next <setjmp.h>
     }
     typedef jmp_buf   _CPP_jmp_buf_capture;
diff --git a/libstdc++-v3/shadow/bits/std_csignal.h b/libstdc++-v3/shadow/bits/std_csignal.h
index 0a640597675..8c2a9c308f7 100644
--- a/libstdc++-v3/shadow/bits/std_csignal.h
+++ b/libstdc++-v3/shadow/bits/std_csignal.h
@@ -37,7 +37,7 @@
   namespace _C_legacy {
     extern "C" {
 #     define _IN_C_LEGACY_
-#     pragma system_header
+#     pragma GCC system_header
 #     include_next <signal.h>
       typedef void (*_CPP_CSIGFUN_capture)(int);  // a C function pointer
       typedef sig_atomic_t _CPP_sig_atomic_t_capture; 
diff --git a/libstdc++-v3/shadow/bits/std_cstdarg.h b/libstdc++-v3/shadow/bits/std_cstdarg.h
index 9b59ba9c08c..2bf95257104 100644
--- a/libstdc++-v3/shadow/bits/std_cstdarg.h
+++ b/libstdc++-v3/shadow/bits/std_cstdarg.h
@@ -37,7 +37,7 @@
   namespace _C_legacy {
     extern "C" {
 #     define _IN_C_LEGACY_
-#     pragma system_header
+#     pragma GCC system_header
 #     include_next <stdarg.h>
     }
     typedef va_list   _CPP_va_list_capture;
diff --git a/libstdc++-v3/shadow/bits/std_cstddef.h b/libstdc++-v3/shadow/bits/std_cstddef.h
index d146d0dfede..0326590a0b2 100644
--- a/libstdc++-v3/shadow/bits/std_cstddef.h
+++ b/libstdc++-v3/shadow/bits/std_cstddef.h
@@ -37,7 +37,7 @@
   namespace _C_legacy {
     extern "C" {
 #     define _IN_C_LEGACY_
-#     pragma system_header
+#     pragma GCC system_header
 #     include_next <stddef.h>
     }
     typedef ptrdiff_t _CPP_ptrdiff_t_capture; 
diff --git a/libstdc++-v3/shadow/bits/std_cstdio.h b/libstdc++-v3/shadow/bits/std_cstdio.h
index 36cb3fd981b..4dce4f18d22 100644
--- a/libstdc++-v3/shadow/bits/std_cstdio.h
+++ b/libstdc++-v3/shadow/bits/std_cstdio.h
@@ -47,7 +47,7 @@
   namespace _C_legacy {
     extern "C" {
 #     define _IN_C_LEGACY_
-#     pragma system_header
+#     pragma GCC system_header
 #     include_next <stdio.h>
     }
     // size_t handled in <cstddef>
diff --git a/libstdc++-v3/shadow/bits/std_cstdlib.h b/libstdc++-v3/shadow/bits/std_cstdlib.h
index 438d4456125..1fc86b991c6 100644
--- a/libstdc++-v3/shadow/bits/std_cstdlib.h
+++ b/libstdc++-v3/shadow/bits/std_cstdlib.h
@@ -43,7 +43,7 @@
 namespace _C_legacy {
   extern "C" {
 #     define _IN_C_LEGACY_
-#     pragma system_header
+#     pragma GCC system_header
 #     include_next <stdlib.h>
       typedef int (*_C_cmp_fun_ptr)(const void*, const void*);  // C fn ptr
     }
diff --git a/libstdc++-v3/shadow/bits/std_cstring.h b/libstdc++-v3/shadow/bits/std_cstring.h
index 441afeca94a..a1fe8f40f5e 100644
--- a/libstdc++-v3/shadow/bits/std_cstring.h
+++ b/libstdc++-v3/shadow/bits/std_cstring.h
@@ -43,7 +43,7 @@
   namespace _C_legacy {
     extern "C" {
 #     define _IN_C_LEGACY_
-#     pragma system_header
+#     pragma GCC system_header
 #     include_next <string.h>
     }
 
diff --git a/libstdc++-v3/shadow/bits/std_ctime.h b/libstdc++-v3/shadow/bits/std_ctime.h
index 429fcf832eb..3b075f2356d 100644
--- a/libstdc++-v3/shadow/bits/std_ctime.h
+++ b/libstdc++-v3/shadow/bits/std_ctime.h
@@ -39,7 +39,7 @@
   namespace _C_legacy {
     extern "C" {
 #     define _IN_C_LEGACY_
-#     pragma system_header
+#     pragma GCC system_header
 #     include_next <time.h>
     }
     inline clock_t _CPP_CLOCKS_PER_SEC_capture() 
diff --git a/libstdc++-v3/shadow/bits/std_cwchar.h b/libstdc++-v3/shadow/bits/std_cwchar.h
index d4700ecf003..e466aece9e7 100644
--- a/libstdc++-v3/shadow/bits/std_cwchar.h
+++ b/libstdc++-v3/shadow/bits/std_cwchar.h
@@ -43,7 +43,7 @@
   namespace _C_legacy {
     extern "C" {
 #     define _IN_C_LEGACY_
-#     pragma system_header
+#     pragma GCC system_header
 #     include_next <wchar.h>
     }
     // NULL, size_t handled in <cstddef>
diff --git a/libstdc++-v3/shadow/bits/std_cwctype.h b/libstdc++-v3/shadow/bits/std_cwctype.h
index 5fb6cdf76f1..ddacdf40b32 100644
--- a/libstdc++-v3/shadow/bits/std_cwctype.h
+++ b/libstdc++-v3/shadow/bits/std_cwctype.h
@@ -41,7 +41,7 @@
   namespace _C_legacy {
     extern "C" {
 #     define _IN_C_LEGACY_
-#     pragma system_header
+#     pragma GCC system_header
 #     include_next <wctype.h>
     }
     typedef wctype_t _CPP_wctype_t_capture;
diff --git a/libstdc++-v3/shadow/bits/wrap_libio.h b/libstdc++-v3/shadow/bits/wrap_libio.h
index 4a34cefc11e..a196844deb3 100644
--- a/libstdc++-v3/shadow/bits/wrap_libio.h
+++ b/libstdc++-v3/shadow/bits/wrap_libio.h
@@ -39,7 +39,7 @@
   namespace _C_legacy {
     extern "C" {
 #     define _IN_C_LEGACY_
-#     pragma system_header
+#     pragma GCC system_header
 #     include_next <libio.h>
     }
 
diff --git a/libstdc++-v3/shadow/bits/wrap_unistd.h b/libstdc++-v3/shadow/bits/wrap_unistd.h
index 80d8d654162..4ff8f36589f 100644
--- a/libstdc++-v3/shadow/bits/wrap_unistd.h
+++ b/libstdc++-v3/shadow/bits/wrap_unistd.h
@@ -39,7 +39,7 @@
   namespace _C_legacy {
     extern "C" {
 #     define _IN_C_LEGACY_
-#     pragma system_header
+#     pragma GCC system_header
 #     include_next <unistd.h>
     }
 
diff --git a/libstdc++-v3/shadow/sys/cdefs.h b/libstdc++-v3/shadow/sys/cdefs.h
index 32e325563c1..dd7c303556d 100644
--- a/libstdc++-v3/shadow/sys/cdefs.h
+++ b/libstdc++-v3/shadow/sys/cdefs.h
@@ -31,7 +31,7 @@
 #ifndef _CPP_SYS_CDEFS_H
 # define _CPP_SYS_CDEFS_H
 
-# pragma system_header
+# pragma GCC system_header
 # include_next <sys/cdefs.h>
 
 // glibc-2 hackery.  Other systems likely require other hacks.