diff --git a/configure.ac b/configure.ac
index 8519c33dd5..87df4dde01 100644
--- a/configure.ac
+++ b/configure.ac
@@ -832,15 +832,13 @@ AC_DEFINE_UNQUOTED([OPAL_ALIGN_WORD_SIZE_INTEGERS], [$results],
 
 OMPI_CONFIG_THREADS
 CFLAGS="$CFLAGS $THREAD_CFLAGS"
+CPPFLAGS="$CPPFLAGS $THREAD_CPPFLAGS"
 m4_ifdef([project_ompi],
          [CXXFLAGS="$CXXFLAGS $THREAD_CXXFLAGS"
-          CPPFLAGS="$CPPFLAGS $THREAD_CPPFLAGS"
           CXXCPPFLAGS="$CXXCPPFLAGS $THREAD_CXXCPPFLAGS"])
 LDFLAGS="$LDFLAGS $THREAD_LDFLAGS"
 LIBS="$LIBS $THREAD_LIBS"
 
-
-WRAPPER_EXTRA_CPPFLAGS="$WRAPPER_EXTRA_CPPFLAGS $THREAD_CPPFLAGS"
 WRAPPER_EXTRA_CFLAGS="$WRAPPER_EXTRA_CFLAGS $THREAD_CFLAGS"
 m4_ifdef([project_ompi],
          [WRAPPER_EXTRA_CXXFLAGS="$WRAPPER_EXTRA_CXXFLAGS $THREAD_CXXFLAGS"