diff --git a/ompi/attribute/attribute.h b/ompi/attribute/attribute.h
index cf27cf5bb2..9f0d0ad8b4 100644
--- a/ompi/attribute/attribute.h
+++ b/ompi/attribute/attribute.h
@@ -244,11 +244,11 @@ int ompi_attr_finalize(void);
  *
  */
 
-int ompi_attr_create_keyval(ompi_attribute_type_t type, 
-                            ompi_attribute_fn_ptr_union_t copy_attr_fn, 
-                            ompi_attribute_fn_ptr_union_t delete_attr_fn,
-                            int *key, void *extra_state, int flags,
-                            ompi_attribute_keyval_destructor_fn_t *destructor);
+OMPI_DECLSPEC int ompi_attr_create_keyval(ompi_attribute_type_t type, 
+                                          ompi_attribute_fn_ptr_union_t copy_attr_fn, 
+                                          ompi_attribute_fn_ptr_union_t delete_attr_fn,
+                                          int *key, void *extra_state, int flags,
+                                          ompi_attribute_keyval_destructor_fn_t *destructor);
 
 /**
  * Free an attribute keyval
@@ -329,10 +329,10 @@ int ompi_attr_set_c(ompi_attribute_type_t type, void *object,
  * So yes, this is more code, but it's clearer and less error-prone
  * (read: better) this way.
  */
-int ompi_attr_set_fortran_mpi1(ompi_attribute_type_t type, void *object, 
-                               opal_hash_table_t **attr_hash,
-                               int key, MPI_Fint attribute, 
-                               bool predefined, bool need_lock);
+OMPI_DECLSPEC int ompi_attr_set_fortran_mpi1(ompi_attribute_type_t type, void *object, 
+                                             opal_hash_table_t **attr_hash,
+                                             int key, MPI_Fint attribute, 
+                                             bool predefined, bool need_lock);
 
 /**
  * Set an attribute on the comm/win/datatype in a form valid for
@@ -367,10 +367,10 @@ int ompi_attr_set_fortran_mpi1(ompi_attribute_type_t type, void *object,
  * So yes, this is more code, but it's clearer and less error-prone
  * (read: better) this way.
  */
-int ompi_attr_set_fortran_mpi2(ompi_attribute_type_t type, void *object, 
-                               opal_hash_table_t **attr_hash,
-                               int key, MPI_Aint attribute, 
-                               bool predefined, bool need_lock);
+OMPI_DECLSPEC int ompi_attr_set_fortran_mpi2(ompi_attribute_type_t type, void *object, 
+                                             opal_hash_table_t **attr_hash,
+                                             int key, MPI_Aint attribute, 
+                                             bool predefined, bool need_lock);
 
 /**
  * Get an attribute on the comm/win/datatype in a form valid for C.
@@ -421,8 +421,8 @@ int ompi_attr_get_c(opal_hash_table_t *attr_hash, int key,
  * (read: better) this way.
  */
 
-int ompi_attr_get_fortran_mpi1(opal_hash_table_t *attr_hash, int key, 
-                               MPI_Fint *attribute, int *flag);
+    OMPI_DECLSPEC int ompi_attr_get_fortran_mpi1(opal_hash_table_t *attr_hash, int key, 
+                                                 MPI_Fint *attribute, int *flag);
 
 
 /**
@@ -448,8 +448,8 @@ int ompi_attr_get_fortran_mpi1(opal_hash_table_t *attr_hash, int key,
  * (read: better) this way.
  */
 
-int ompi_attr_get_fortran_mpi2(opal_hash_table_t *attr_hash, int key, 
-                               MPI_Aint *attribute, int *flag);
+OMPI_DECLSPEC int ompi_attr_get_fortran_mpi2(opal_hash_table_t *attr_hash, int key, 
+                                             MPI_Aint *attribute, int *flag);
 
 
 /**
diff --git a/ompi/errhandler/errhandler.h b/ompi/errhandler/errhandler.h
index 4e2dd47efb..7ad42c96b6 100644
--- a/ompi/errhandler/errhandler.h
+++ b/ompi/errhandler/errhandler.h
@@ -266,8 +266,8 @@ struct ompi_request_t;
    * If this function returns, it returns the err_code.  Note that it
    * may not return (e.g., for MPI_ERRORS_ARE_FATAL).
    */
-  int ompi_errhandler_invoke(ompi_errhandler_t *errhandler, void *mpi_object, 
-			     int type, int err_code, const char *message);
+  OMPI_DECLSPEC int ompi_errhandler_invoke(ompi_errhandler_t *errhandler, void *mpi_object, 
+                                           int type, int err_code, const char *message);
 
 
   /**
diff --git a/ompi/errhandler/errhandler_predefined.h b/ompi/errhandler/errhandler_predefined.h
index d94fcf407d..5d7ac36e28 100644
--- a/ompi/errhandler/errhandler_predefined.h
+++ b/ompi/errhandler/errhandler_predefined.h
@@ -19,25 +19,26 @@
 #ifndef OMPI_ERRHANDLER_PREDEFINED_H
 #define OMPI_ERRHANDLER_PREDEFINED_H
 
+#include "ompi_config.h"
 
 /**
  * Handler function for MPI_ERRORS_ARE_FATAL
  */
-void ompi_mpi_errors_are_fatal_comm_handler(struct ompi_communicator_t **comm,
+OMPI_DECLSPEC void ompi_mpi_errors_are_fatal_comm_handler(struct ompi_communicator_t **comm,
 					    int *error_code, ...);
-void ompi_mpi_errors_are_fatal_file_handler(struct ompi_file_t **file,
+OMPI_DECLSPEC void ompi_mpi_errors_are_fatal_file_handler(struct ompi_file_t **file,
 					    int *error_code, ...);
-void ompi_mpi_errors_are_fatal_win_handler(struct ompi_win_t **win,
+OMPI_DECLSPEC void ompi_mpi_errors_are_fatal_win_handler(struct ompi_win_t **win,
 					    int *error_code, ...);
 
 /**
  * Handler function for MPI_ERRORS_RETURN
  */
-void ompi_mpi_errors_return_comm_handler(struct ompi_communicator_t **comm,
+OMPI_DECLSPEC void ompi_mpi_errors_return_comm_handler(struct ompi_communicator_t **comm,
                                    int *error_code, ...);
-void ompi_mpi_errors_return_file_handler(struct ompi_file_t **file,
+OMPI_DECLSPEC void ompi_mpi_errors_return_file_handler(struct ompi_file_t **file,
                                    int *error_code, ...);
-void ompi_mpi_errors_return_win_handler(struct ompi_win_t **win,
+OMPI_DECLSPEC void ompi_mpi_errors_return_win_handler(struct ompi_win_t **win,
                                    int *error_code, ...);
 
 
diff --git a/ompi/mpi/f77/strings.h b/ompi/mpi/f77/strings.h
index 802db7bce2..99ef21c875 100644
--- a/ompi/mpi/f77/strings.h
+++ b/ompi/mpi/f77/strings.h
@@ -19,6 +19,8 @@
 #ifndef OMPI_F77_STRINGS_H
 #define OMPI_F77_STRINGS_H
 
+#include "ompi_config.h"
+
 #if defined(c_plusplus) || defined(__cplusplus)
 extern "C" {
 #endif
@@ -38,7 +40,7 @@ extern "C" {
      * assign it to the cstr to return.  The caller is responsible for
      * eventually freeing the C string.
      */
-    int ompi_fortran_string_f2c(char *fstr, int len, char **cstr);
+    OMPI_DECLSPEC int ompi_fortran_string_f2c(char *fstr, int len, char **cstr);
 
     /**
      * Convert a C string to a fortran string.
@@ -54,7 +56,7 @@ extern "C" {
      * convert C strings to fortran strings.  It is assumed that the
      * fortran string is already allocated and has a length of len.
      */
-    int ompi_fortran_string_c2f(char *cstr, char *fstr, int len);
+    OMPI_DECLSPEC int ompi_fortran_string_c2f(char *cstr, char *fstr, int len);
 
     /**
      * Convert an array of Fortran strings to an argv-style array of C
@@ -73,7 +75,7 @@ extern "C" {
      * the caller's responsibility to invoke opal_argv_free() to free
      * it later (or equivalent).
      */
-    int ompi_fortran_argv_f2c(char *farray, int len, char ***cargv);
+    OMPI_DECLSPEC int ompi_fortran_argv_f2c(char *farray, int len, char ***cargv);
 
     /**
      * Convert an array of argvs to a C style array of argvs
@@ -89,8 +91,8 @@ extern "C" {
      * each content of argv array and call free to deallocate the argv
      * array itself
      */
-    int ompi_fortran_multiple_argvs_f2c(int count, char *array, int len,
-					char ****argv);
+    OMPI_DECLSPEC int ompi_fortran_multiple_argvs_f2c(int count, char *array, int len,
+                                                      char ****argv);
 
 #if defined(c_plusplus) || defined(__cplusplus)
 }