diff --git a/opal/include/CMakeLists.txt b/opal/include/CMakeLists.txt
index c28dc295c4..0b2f6da49a 100644
--- a/opal/include/CMakeLists.txt
+++ b/opal/include/CMakeLists.txt
@@ -18,7 +18,7 @@ FILE(READ ${OpenMPI_SOURCE_DIR}/ompi/include/mpi.h.in MPI_H_IN)
 STRING(REGEX REPLACE "#undef ([-_a-zA-Z0-9]+)[ ]*\n" "#cmakedefine \\1 \${\\1}\n" MPI_H_OUT "${MPI_H_IN}")
 STRING(REPLACE "#cmakedefine OMPI_HAVE_FORTRAN_" "#define OMPI_HAVE_FORTRAN_"  MPI_H_OUT "${MPI_H_OUT}")
 STRING(REPLACE "{OMPI_PROVIDE_MPI_FILE_INTERFACE}"
- "{OMPI_PROVIDE_MPI_FILE_INTERFACE_VAL}" MPI_H_OUT "${MPI_H_OUT}")
+ "{OMPI_PROVIDE_MPI_FILE_INTERFACE}" MPI_H_OUT "${MPI_H_OUT}")
 STRING(REPLACE "\${OMPI_WANT_CXX_BINDINGS}" "1" MPI_H_OUT "${MPI_H_OUT}")
 STRING(REPLACE "\${OMPI_WANT_FORTRAN_BINDINGS}" "1" MPI_H_OUT "${MPI_H_OUT}")
 STRING(REPLACE "\${OMPI_WANT_F90_BINDINGS}" "1" MPI_H_OUT "${MPI_H_OUT}")
diff --git a/opal/runtime/opal_info_support.h b/opal/runtime/opal_info_support.h
index 1afe62ddf7..7a35ecd779 100644
--- a/opal/runtime/opal_info_support.h
+++ b/opal/runtime/opal_info_support.h
@@ -22,21 +22,21 @@
 
 BEGIN_C_DECLS
 
-extern const char *opal_info_path_prefix;
+OPAL_DECLSPEC extern const char *opal_info_path_prefix;
 
-extern const char *opal_info_type_all;
-extern const char *opal_info_type_opal;
-extern const char *opal_info_component_all;
+OPAL_DECLSPEC extern const char *opal_info_type_all;
+OPAL_DECLSPEC extern const char *opal_info_type_opal;
+OPAL_DECLSPEC extern const char *opal_info_component_all;
 extern const char *opal_info_param_all;
 
-extern const char *opal_info_ver_full;
+OPAL_DECLSPEC extern const char *opal_info_ver_full;
 extern const char *opal_info_ver_major;
 extern const char *opal_info_ver_minor;
 extern const char *opal_info_ver_release;
 extern const char *opal_info_ver_greek;
 extern const char *opal_info_ver_repo;
 
-extern const char *opal_info_ver_all;
+OPAL_DECLSPEC extern const char *opal_info_ver_all;
 extern const char *opal_info_ver_mca;
 extern const char *opal_info_ver_type;
 extern const char *opal_info_ver_component;
diff --git a/orte/runtime/orte_info_support.h b/orte/runtime/orte_info_support.h
index abe93155fd..78b7344b5a 100644
--- a/orte/runtime/orte_info_support.h
+++ b/orte/runtime/orte_info_support.h
@@ -27,7 +27,9 @@
 
 #include "opal/class/opal_pointer_array.h"
 
-extern const char *orte_info_type_orte;
+BEGIN_C_DECLS
+
+OPAL_DECLSPEC extern const char *orte_info_type_orte;
 
 ORTE_DECLSPEC void orte_info_register_types(opal_pointer_array_t *mca_types);
 
@@ -38,4 +40,6 @@ ORTE_DECLSPEC void orte_info_close_components(void);
 
 ORTE_DECLSPEC void orte_info_show_orte_version(const char *scope);
 
+END_C_DECLS
+
 #endif