diff --git a/c/src/aclocal/prog-cxx.m4 b/c/src/aclocal/prog-cxx.m4
index 66c986c57d..e0ae7b468a 100644
--- a/c/src/aclocal/prog-cxx.m4
+++ b/c/src/aclocal/prog-cxx.m4
@@ -15,6 +15,12 @@ else
   CXXFLAGS=${CXXFLAGS-${CFLAGS}}
 fi
 
+CXXFLAGS=`echo ${CXXFLAGS} | sed \
+  -e s/-Wmissing-prototypes// \
+  -e s/-Wimplicit-function-declaration// \
+  -e s/-Wstrict-prototypes// \
+  -e s/-Wnested-externs//`
+
 RTEMS_CHECK_TOOL(CXX,g++)
 if test "$RTEMS_HAS_CPLUSPLUS" = "yes";
 then
diff --git a/testsuites/aclocal/prog-cxx.m4 b/testsuites/aclocal/prog-cxx.m4
index 91f2b7fbef..aac9c37f6c 100644
--- a/testsuites/aclocal/prog-cxx.m4
+++ b/testsuites/aclocal/prog-cxx.m4
@@ -15,6 +15,12 @@ else
   CXXFLAGS=${CXXFLAGS-${CFLAGS}}
 fi
 
+CXXFLAGS=`echo ${CXXFLAGS} | sed \
+  -e s/-Wmissing-prototypes// \
+  -e s/-Wimplicit-function-declaration// \
+  -e s/-Wstrict-prototypes// \
+  -e s/-Wnested-externs//`
+
 RTEMS_CHECK_TOOL(CXX,g++)
 if test "$RTEMS_HAS_CPLUSPLUS" = "yes";
 then