diff --git a/config/mca_configure.ac b/config/mca_configure.ac
index 7ddfa062cd..5ce71d8151 100644
--- a/config/mca_configure.ac
+++ b/config/mca_configure.ac
@@ -212,7 +212,9 @@ fi
 # purely aesthetic.
 #
 
-CPPFLAGS='-I$(top_ompi_srcdir)/src/include'" $CPPFLAGS"
+CPPFLAGS='-I$(top_ompi_srcdir)/src -I$(top_ompi_srcdir)/include -I$(top_ompi_builddir)/src'" $CPPFLAGS"
+CXXCPPFLAGS='-I$(top_ompi_srcdir)/src -I$(top_ompi_srcdir)/include -I$(top_ompi_builddir)/src'" $CXXCPPFLAGS"
+
 
 #
 # Delayed the substitution of these until now because they may have