diff --git a/config/ompi_ext.m4 b/config/ompi_ext.m4
index c04f13c92b..26b422038d 100644
--- a/config/ompi_ext.m4
+++ b/config/ompi_ext.m4
@@ -137,6 +137,7 @@ EOF
     outfile_real=ompi/mpiext/static-components.h
     outfile=$outfile_real.new
     rm -f $outfile $outfile.struct $outfile.extern
+    $MKDIR_P ompi/mpiext
     touch $outfile.struct $outfile.extern
 
     m4_foreach(extension, [ompi_mpiext_list],
diff --git a/ompi/mpiext/mpiext.h b/ompi/mpiext/mpiext.h
index 63dce9f0b0..6a93563c79 100644
--- a/ompi/mpiext/mpiext.h
+++ b/ompi/mpiext/mpiext.h
@@ -5,6 +5,8 @@
 extern "C" {
 #endif
 
+#include "ompi_config.h"
+
 OMPI_DECLSPEC int ompi_mpiext_init(void);
 OMPI_DECLSPEC int ompi_mpiext_fini(void);