diff --git a/src/mca/coll/basic/coll_basic_component.c b/src/mca/coll/basic/coll_basic_component.c
index f9861b1c9a..62cffc10d7 100644
--- a/src/mca/coll/basic/coll_basic_component.c
+++ b/src/mca/coll/basic/coll_basic_component.c
@@ -27,7 +27,6 @@ const char *mca_coll_basic_component_version_string =
  * and pointers to our public functions in it
  */
 
-OMPI_EXPORT
 const mca_coll_base_component_1_0_0_t mca_coll_basic_component = {
 
   /* First, the mca_component_t struct containing meta information
diff --git a/src/mca/coll/sm/coll_sm_component.c b/src/mca/coll/sm/coll_sm_component.c
index 4465fde24d..5134a4c169 100644
--- a/src/mca/coll/sm/coll_sm_component.c
+++ b/src/mca/coll/sm/coll_sm_component.c
@@ -27,7 +27,6 @@ const char *mca_coll_sm_component_version_string =
  * and pointers to our public functions in it
  */
 
-OMPI_EXPORT
 const mca_coll_base_component_1_0_0_t mca_coll_sm_component = {
 
   /* First, the mca_component_t struct containing meta information
diff --git a/src/mca/gpr/proxy/gpr_proxy_component.c b/src/mca/gpr/proxy/gpr_proxy_component.c
index 54ad65232e..203fae84c3 100644
--- a/src/mca/gpr/proxy/gpr_proxy_component.c
+++ b/src/mca/gpr/proxy/gpr_proxy_component.c
@@ -29,7 +29,6 @@
 /*
  * Struct of function pointers that need to be initialized
  */
-OMPI_EXPORT
 mca_gpr_base_component_t mca_gpr_proxy_component = {
     {
 	MCA_GPR_BASE_VERSION_1_0_0,
diff --git a/src/mca/gpr/replica/gpr_replica_component.c b/src/mca/gpr/replica/gpr_replica_component.c
index f860ec15a0..9751d558eb 100644
--- a/src/mca/gpr/replica/gpr_replica_component.c
+++ b/src/mca/gpr/replica/gpr_replica_component.c
@@ -34,7 +34,6 @@
 /*
  * Struct of function pointers that need to be initialized
  */
-OMPI_EXPORT
 mca_gpr_base_component_t mca_gpr_replica_component = {
     {
 	MCA_GPR_BASE_VERSION_1_0_0,
diff --git a/src/mca/io/romio/src/io_romio_component.c b/src/mca/io/romio/src/io_romio_component.c
index 5cdab1ddbc..00bef0a08c 100644
--- a/src/mca/io/romio/src/io_romio_component.c
+++ b/src/mca/io/romio/src/io_romio_component.c
@@ -26,7 +26,6 @@ static int delete_select(char *filename, struct ompi_info_t *info,
                          struct mca_io_base_delete_t *private_data);
 
 
-OMPI_EXPORT
 mca_io_base_component_1_0_0_t mca_io_romio_component = {
     /* First, the mca_base_component_t struct containing meta information
        about the component itself */
diff --git a/src/mca/llm/hostfile/src/llm_hostfile_component.c b/src/mca/llm/hostfile/src/llm_hostfile_component.c
index bde7b73d8d..73fe619842 100644
--- a/src/mca/llm/hostfile/src/llm_hostfile_component.c
+++ b/src/mca/llm/hostfile/src/llm_hostfile_component.c
@@ -17,7 +17,6 @@
  * Instantiate the public struct with all of our public information
  * and pointers to our public functions in it
  */
-OMPI_EXPORT
 const mca_llm_base_component_1_0_0_t mca_llm_hostfile_component = {
 
   /* First, the mca_module_t struct containing meta information
diff --git a/src/mca/mpool/sm/mpool_sm_component.c b/src/mca/mpool/sm/mpool_sm_component.c
index 379a6c0388..cf3a3e1083 100644
--- a/src/mca/mpool/sm/mpool_sm_component.c
+++ b/src/mca/mpool/sm/mpool_sm_component.c
@@ -18,7 +18,6 @@ static int mca_mpool_sm_open(void);
 static mca_mpool_base_module_t* mca_mpool_sm_init(bool *allow_multi_user_threads);
 
 
-OMPI_EXPORT
 mca_mpool_sm_component_t mca_mpool_sm_component = {
     {
       /* First, the mca_base_component_t struct containing meta
diff --git a/src/mca/ns/proxy/src/ns_proxy_component.c b/src/mca/ns/proxy/src/ns_proxy_component.c
index e55423b1e1..42d5add1e3 100644
--- a/src/mca/ns/proxy/src/ns_proxy_component.c
+++ b/src/mca/ns/proxy/src/ns_proxy_component.c
@@ -29,7 +29,6 @@
 /*
  * Struct of function pointers that need to be initialized
  */
-OMPI_EXPORT
 mca_ns_base_component_t mca_ns_proxy_component = {
   {
     MCA_NS_BASE_VERSION_1_0_0,
diff --git a/src/mca/ns/replica/src/ns_replica_component.c b/src/mca/ns/replica/src/ns_replica_component.c
index 309d01141d..7d24f03979 100644
--- a/src/mca/ns/replica/src/ns_replica_component.c
+++ b/src/mca/ns/replica/src/ns_replica_component.c
@@ -31,7 +31,6 @@
 /*
  * Struct of function pointers that need to be initialized
  */
-OMPI_EXPORT
 mca_ns_base_component_t mca_ns_replica_component = {
   {
     MCA_NS_BASE_VERSION_1_0_0,
diff --git a/src/mca/oob/cofs/src/oob_cofs_component.c b/src/mca/oob/cofs/src/oob_cofs_component.c
index b32e091b42..97980f068c 100644
--- a/src/mca/oob/cofs/src/oob_cofs_component.c
+++ b/src/mca/oob/cofs/src/oob_cofs_component.c
@@ -23,7 +23,6 @@
 /*
  * Struct of function pointers and all that to let us be initialized
  */
-OMPI_EXPORT
 mca_oob_base_component_1_0_0_t mca_oob_cofs_component = {
   {
     MCA_OOB_BASE_VERSION_1_0_0,
diff --git a/src/mca/pcm/bproc/src/pcm_bproc_component.c b/src/mca/pcm/bproc/src/pcm_bproc_component.c
index 30ed9ff468..a1b3527ce1 100644
--- a/src/mca/pcm/bproc/src/pcm_bproc_component.c
+++ b/src/mca/pcm/bproc/src/pcm_bproc_component.c
@@ -24,7 +24,6 @@
 /*
  * Struct of function pointers and all that to let us be initialized
  */
-OMPI_EXPORT
 mca_pcm_base_component_1_0_0_t mca_pcm_bproc_component = {
   {
     MCA_PCM_BASE_VERSION_1_0_0,
diff --git a/src/mca/pcm/ompid/pcm_ompid_component.c b/src/mca/pcm/ompid/pcm_ompid_component.c
index 03a9033e84..27f70b69f2 100644
--- a/src/mca/pcm/ompid/pcm_ompid_component.c
+++ b/src/mca/pcm/ompid/pcm_ompid_component.c
@@ -23,7 +23,6 @@
 /*
  * Struct of function pointers and all that to let us be initialized
  */
-OMPI_EXPORT
 mca_pcm_base_component_1_0_0_t mca_pcm_ompid_component = {
   {
     MCA_PCM_BASE_VERSION_1_0_0,
diff --git a/src/mca/pcm/rms/src/pcm_rms_component.c b/src/mca/pcm/rms/src/pcm_rms_component.c
index 54a956309a..568e126ad1 100644
--- a/src/mca/pcm/rms/src/pcm_rms_component.c
+++ b/src/mca/pcm/rms/src/pcm_rms_component.c
@@ -31,7 +31,6 @@ extern char **environ;
 /*
  * Struct of function pointers and all that to let us be initialized
  */
-OMPI_EXPORT
 mca_pcm_base_component_1_0_0_t mca_pcm_rms_component = {
   {
     MCA_PCM_BASE_VERSION_1_0_0,
diff --git a/src/mca/pcm/rsh/pcm_rsh_component.c b/src/mca/pcm/rsh/pcm_rsh_component.c
index a4686b7c70..f7f5dfe659 100644
--- a/src/mca/pcm/rsh/pcm_rsh_component.c
+++ b/src/mca/pcm/rsh/pcm_rsh_component.c
@@ -27,7 +27,6 @@
 /*
  * Struct of function pointers and all that to let us be initialized
  */
-OMPI_EXPORT
 mca_pcm_base_component_1_0_0_t mca_pcm_rsh_component = {
   {
     MCA_PCM_BASE_VERSION_1_0_0,
diff --git a/src/mca/pcm/wmi/src/pcm_wmi_component.c b/src/mca/pcm/wmi/src/pcm_wmi_component.c
index 71f8030177..726a3a3aca 100644
--- a/src/mca/pcm/wmi/src/pcm_wmi_component.c
+++ b/src/mca/pcm/wmi/src/pcm_wmi_component.c
@@ -24,7 +24,6 @@
 /*
  * Struct of function pointers and all that to let us be initialized
  */
-OMPI_EXPORT
 mca_pcm_base_component_1_0_0_t mca_pcm_wmi_component = {
   {
     MCA_PCM_BASE_VERSION_1_0_0,
diff --git a/src/mca/pcmclient/env/pcmclient_env_component.c b/src/mca/pcmclient/env/pcmclient_env_component.c
index cc91f3bc6d..86739fe812 100644
--- a/src/mca/pcmclient/env/pcmclient_env_component.c
+++ b/src/mca/pcmclient/env/pcmclient_env_component.c
@@ -22,7 +22,6 @@
 /*
  * Struct of function pointers and all that to let us be initialized
  */
-OMPI_EXPORT
 mca_pcmclient_base_component_1_0_0_t mca_pcmclient_env_component = {
   {
     MCA_PCMCLIENT_BASE_VERSION_1_0_0,
diff --git a/src/mca/pcmclient/rms/pcmclient_rms_component.c b/src/mca/pcmclient/rms/pcmclient_rms_component.c
index 53092e82e2..e7ed87917a 100644
--- a/src/mca/pcmclient/rms/pcmclient_rms_component.c
+++ b/src/mca/pcmclient/rms/pcmclient_rms_component.c
@@ -22,7 +22,6 @@
 /*
  * Struct of function pointers and all that to let us be initialized
  */
-OMPI_EXPORT
 mca_pcmclient_base_component_1_0_0_t mca_pcmclient_rms_component = {
   {
     MCA_PCMCLIENT_BASE_VERSION_1_0_0,
diff --git a/src/mca/pcmclient/seed/pcmclient_seed_component.c b/src/mca/pcmclient/seed/pcmclient_seed_component.c
index 078437a278..2d5a24a4e8 100644
--- a/src/mca/pcmclient/seed/pcmclient_seed_component.c
+++ b/src/mca/pcmclient/seed/pcmclient_seed_component.c
@@ -22,7 +22,6 @@
 /*
  * Struct of function pointers and all that to let us be initialized
  */
-OMPI_EXPORT
 mca_pcmclient_base_component_1_0_0_t mca_pcmclient_seed_component = {
   {
     MCA_PCMCLIENT_BASE_VERSION_1_0_0,
diff --git a/src/mca/pcmclient/singleton/pcmclient_singleton_component.c b/src/mca/pcmclient/singleton/pcmclient_singleton_component.c
index 620897c6b3..ca24e1321e 100644
--- a/src/mca/pcmclient/singleton/pcmclient_singleton_component.c
+++ b/src/mca/pcmclient/singleton/pcmclient_singleton_component.c
@@ -22,7 +22,6 @@
 /*
  * Struct of function pointers and all that to let us be initialized
  */
-OMPI_EXPORT
 mca_pcmclient_base_component_1_0_0_t mca_pcmclient_singleton_component = {
   {
     MCA_PCMCLIENT_BASE_VERSION_1_0_0,
diff --git a/src/mca/pml/teg/src/pml_teg_component.c b/src/mca/pml/teg/src/pml_teg_component.c
index 7d0cecd82b..f94b19c692 100644
--- a/src/mca/pml/teg/src/pml_teg_component.c
+++ b/src/mca/pml/teg/src/pml_teg_component.c
@@ -16,7 +16,6 @@
 #include "pml_teg_proc.h"
 
 
-OMPI_EXPORT
 mca_pml_base_component_1_0_0_t mca_pml_teg_component = {
 
     /* First, the mca_base_component_t struct containing meta
diff --git a/src/mca/ptl/elan/src/ptl_elan_component.c b/src/mca/ptl/elan/src/ptl_elan_component.c
index a605aee429..ffa8b1596b 100644
--- a/src/mca/ptl/elan/src/ptl_elan_component.c
+++ b/src/mca/ptl/elan/src/ptl_elan_component.c
@@ -28,7 +28,6 @@
 
 extern ompi_proc_t *ompi_proc_local_proc;
 
-OMPI_EXPORT
 mca_ptl_elan_component_t mca_ptl_elan_component = {
     {
         /* Base module information about itself */
diff --git a/src/mca/ptl/gm/src/ptl_gm_component.c b/src/mca/ptl/gm/src/ptl_gm_component.c
index c3308fbb66..540e1801dc 100644
--- a/src/mca/ptl/gm/src/ptl_gm_component.c
+++ b/src/mca/ptl/gm/src/ptl_gm_component.c
@@ -26,7 +26,6 @@
 #include "ptl_gm_req.h"
 #include "ptl_gm_priv.h"
 
-OMPI_EXPORT
 mca_ptl_gm_component_t mca_ptl_gm_component = {
     {
         /* First, the mca_base_component_t struct containing meta information
diff --git a/src/mca/ptl/ib/src/ptl_ib_component.c b/src/mca/ptl/ib/src/ptl_ib_component.c
index 98ad83b384..d419f8c73c 100644
--- a/src/mca/ptl/ib/src/ptl_ib_component.c
+++ b/src/mca/ptl/ib/src/ptl_ib_component.c
@@ -19,7 +19,6 @@
 #include "ptl_ib_priv.h"
 
 
-OMPI_EXPORT
 mca_ptl_ib_component_t mca_ptl_ib_component = {
     {
         /* First, the mca_base_component_t struct containing meta information
diff --git a/src/mca/ptl/prof/ptl_prof_component.c b/src/mca/ptl/prof/ptl_prof_component.c
index 6cb58067fe..5ef562c877 100644
--- a/src/mca/ptl/prof/ptl_prof_component.c
+++ b/src/mca/ptl/prof/ptl_prof_component.c
@@ -31,7 +31,6 @@ static struct mca_ptl_base_module_t** ptl_prof_component_init_fn(
        bool *allow_multi_user_threads, bool *have_hidden_threads );
 static int ptl_prof_component_control_fn( int param, void* value, size_t size );
 
-OMPI_EXPORT
 mca_ptl_prof_module_1_0_0_t mca_ptl_prof_component = {
     {
         /* First, the mca_base_module_t struct containing meta information
diff --git a/src/mca/ptl/self/ptl_self_component.c b/src/mca/ptl/self/ptl_self_component.c
index 845805a445..8c577cde99 100644
--- a/src/mca/ptl/self/ptl_self_component.c
+++ b/src/mca/ptl/self/ptl_self_component.c
@@ -24,7 +24,6 @@
 #include "mca/base/mca_base_module_exchange.h"
 #include "ptl_self.h"
 
-OMPI_EXPORT
 mca_ptl_self_component_t mca_ptl_self_component = {
     {
         /* First, the mca_base_component_t struct containing meta information
diff --git a/src/mca/ptl/sm/src/ptl_sm_component.c b/src/mca/ptl/sm/src/ptl_sm_component.c
index d943ebd58e..d87a4a63e6 100644
--- a/src/mca/ptl/sm/src/ptl_sm_component.c
+++ b/src/mca/ptl/sm/src/ptl_sm_component.c
@@ -41,7 +41,6 @@ static int mca_ptl_sm_component_exchange(void);
  * Shared Memory (SM) component instance. 
  */
 
-OMPI_EXPORT
 mca_ptl_sm_component_t mca_ptl_sm_component = {
     {  /* super is being filled in */
         /* First, the mca_base_component_t struct containing meta information
diff --git a/src/mca/ptl/tcp/src/ptl_tcp_component.c b/src/mca/ptl/tcp/src/ptl_tcp_component.c
index fdf4df09da..fa78df5f13 100644
--- a/src/mca/ptl/tcp/src/ptl_tcp_component.c
+++ b/src/mca/ptl/tcp/src/ptl_tcp_component.c
@@ -29,7 +29,6 @@
 #include "ptl_tcp_sendreq.h"
 
 
-OMPI_EXPORT
 mca_ptl_tcp_component_t mca_ptl_tcp_component = {
     {
       /* First, the mca_base_module_t struct containing meta
diff --git a/src/mca/svc/exec/svc_exec_component.c b/src/mca/svc/exec/svc_exec_component.c
index 0c4ff0471a..d922dc0aba 100644
--- a/src/mca/svc/exec/svc_exec_component.c
+++ b/src/mca/svc/exec/svc_exec_component.c
@@ -1,7 +1,6 @@
 #include "svc_exec.h"
 
 
-OMPI_EXPORT
 mca_svc_exec_component_t mca_svc_exec_component = {
     {
       /* First, the mca_base_module_t struct containing meta
diff --git a/src/mca/svc/sched/svc_sched_component.c b/src/mca/svc/sched/svc_sched_component.c
index 64fbbae5ed..788e5f6217 100644
--- a/src/mca/svc/sched/svc_sched_component.c
+++ b/src/mca/svc/sched/svc_sched_component.c
@@ -2,7 +2,6 @@
 #include "util/proc_info.h"
 
 
-OMPI_EXPORT
 mca_svc_sched_component_t mca_svc_sched_component = {
     {
       /* First, the mca_base_module_t struct containing meta
diff --git a/src/mca/svc/stdio/svc_stdio_component.c b/src/mca/svc/stdio/svc_stdio_component.c
index 60bd2850b2..c7ec8983c4 100644
--- a/src/mca/svc/stdio/svc_stdio_component.c
+++ b/src/mca/svc/stdio/svc_stdio_component.c
@@ -1,7 +1,6 @@
 #include "svc_stdio.h"
 
 
-OMPI_EXPORT
 mca_svc_base_component_t mca_svc_stdio_component = {
       /* First, the mca_base_module_t struct containing meta
          information about the module itself */
diff --git a/src/mca/topo/unity/src/topo_unity_component.c b/src/mca/topo/unity/src/topo_unity_component.c
index b02bbe2632..eed147f420 100644
--- a/src/mca/topo/unity/src/topo_unity_component.c
+++ b/src/mca/topo/unity/src/topo_unity_component.c
@@ -29,7 +29,6 @@ const char *mca_topo_unity_component_version_string =
  * and finalize() are called during creation/destruction of a comm
  * *******************************************************************
  */
-OMPI_EXPORT
 const mca_topo_base_component_1_0_0_t mca_topo_unity_component = 
 {
     {
diff --git a/src/mpi/c/abort.c b/src/mpi/c/abort.c
index deec8de3c9..33008b9f17 100644
--- a/src/mpi/c/abort.c
+++ b/src/mpi/c/abort.c
@@ -27,7 +27,6 @@
 static const char FUNC_NAME[] = "MPI_Abort";
 
 
-OMPI_EXPORT
 int MPI_Abort(MPI_Comm comm, int errorcode) 
 {
     mca_ns_base_jobid_t jobid;
diff --git a/src/mpi/c/accumulate.c b/src/mpi/c/accumulate.c
index 3c02795483..6fb3fea4bc 100644
--- a/src/mpi/c/accumulate.c
+++ b/src/mpi/c/accumulate.c
@@ -20,7 +20,6 @@
 static const char FUNC_NAME[] = "MPI_Accumlate";
 
 
-OMPI_EXPORT
 int MPI_Accumulate(void *origin_addr, int origin_count, MPI_Datatype origin_datatype,
                    int target_rank, MPI_Aint target_disp, int target_count,
                    MPI_Datatype target_datatype, MPI_Op op, MPI_Win win) 
diff --git a/src/mpi/c/add_error_class.c b/src/mpi/c/add_error_class.c
index c53a8bd5ee..f3b6221cba 100644
--- a/src/mpi/c/add_error_class.c
+++ b/src/mpi/c/add_error_class.c
@@ -20,7 +20,6 @@
 static const char FUNC_NAME[] = "MPI_Add_error_class";
 
 
-OMPI_EXPORT
 int MPI_Add_error_class(int *errorclass) 
 {
     int class;
diff --git a/src/mpi/c/add_error_code.c b/src/mpi/c/add_error_code.c
index e995a7296f..aa32b16d70 100644
--- a/src/mpi/c/add_error_code.c
+++ b/src/mpi/c/add_error_code.c
@@ -21,7 +21,6 @@
 static const char FUNC_NAME[] = "MPI_Add_error_code";
 
 
-OMPI_EXPORT
 int MPI_Add_error_code(int errorclass, int *errorcode)
 {
     int code;
diff --git a/src/mpi/c/add_error_string.c b/src/mpi/c/add_error_string.c
index 9065714350..356d933df7 100644
--- a/src/mpi/c/add_error_string.c
+++ b/src/mpi/c/add_error_string.c
@@ -21,7 +21,6 @@
 static const char FUNC_NAME[] = "MPI_Add_error_code";
 
 
-OMPI_EXPORT
 int MPI_Add_error_string(int errorcode, char *string)
 {
     int rc;
diff --git a/src/mpi/c/address.c b/src/mpi/c/address.c
index 8624c00f88..b6e815f452 100644
--- a/src/mpi/c/address.c
+++ b/src/mpi/c/address.c
@@ -21,7 +21,6 @@
 static const char FUNC_NAME[] = "MPI_Address";
 
 
-OMPI_EXPORT
 int MPI_Address(void *location, MPI_Aint *address)
 {
     if( MPI_PARAM_CHECK ) {
diff --git a/src/mpi/c/allgather.c b/src/mpi/c/allgather.c
index 927080dc12..a33d215f57 100644
--- a/src/mpi/c/allgather.c
+++ b/src/mpi/c/allgather.c
@@ -21,7 +21,6 @@
 static const char FUNC_NAME[] = "MPI_Allgather";
 
 
-OMPI_EXPORT
 int MPI_Allgather(void *sendbuf, int sendcount, MPI_Datatype sendtype, 
 		  void *recvbuf, int recvcount, MPI_Datatype recvtype,
 		  MPI_Comm comm) 
diff --git a/src/mpi/c/allgatherv.c b/src/mpi/c/allgatherv.c
index 09f8cd49f6..58f2e6e072 100644
--- a/src/mpi/c/allgatherv.c
+++ b/src/mpi/c/allgatherv.c
@@ -21,7 +21,6 @@
 static const char FUNC_NAME[] = "MPI_Allgatherv";
 
 
-OMPI_EXPORT
 int MPI_Allgatherv(void *sendbuf, int sendcount, MPI_Datatype sendtype,
                    void *recvbuf, int *recvcounts,
                    int *displs, MPI_Datatype recvtype, MPI_Comm comm) 
diff --git a/src/mpi/c/alloc_mem.c b/src/mpi/c/alloc_mem.c
index 97ce946714..0d33e4f541 100644
--- a/src/mpi/c/alloc_mem.c
+++ b/src/mpi/c/alloc_mem.c
@@ -23,7 +23,6 @@
 static const char FUNC_NAME[] = "MPI_Alloc_mem";
 
 
-OMPI_EXPORT
 int MPI_Alloc_mem(MPI_Aint size, MPI_Info info, void *baseptr)
 {
   if (MPI_PARAM_CHECK) {
diff --git a/src/mpi/c/allreduce.c b/src/mpi/c/allreduce.c
index dec0dd03dc..f810db09f1 100644
--- a/src/mpi/c/allreduce.c
+++ b/src/mpi/c/allreduce.c
@@ -22,7 +22,6 @@
 static const char FUNC_NAME[] = "MPI_Allreduce";
 
 
-OMPI_EXPORT
 int MPI_Allreduce(void *sendbuf, void *recvbuf, int count,
                   MPI_Datatype datatype, MPI_Op op, MPI_Comm comm) 
 {
diff --git a/src/mpi/c/alltoall.c b/src/mpi/c/alltoall.c
index 5baecc2623..5324261f1d 100644
--- a/src/mpi/c/alltoall.c
+++ b/src/mpi/c/alltoall.c
@@ -21,7 +21,6 @@
 static const char FUNC_NAME[] = "MPI_Alltoall";
 
 
-OMPI_EXPORT
 int MPI_Alltoall(void *sendbuf, int sendcount, MPI_Datatype sendtype,
 		 void *recvbuf, int recvcount, MPI_Datatype recvtype, 
                  MPI_Comm comm) 
diff --git a/src/mpi/c/alltoallv.c b/src/mpi/c/alltoallv.c
index 8029cb9060..495861fde0 100644
--- a/src/mpi/c/alltoallv.c
+++ b/src/mpi/c/alltoallv.c
@@ -21,7 +21,6 @@
 static const char FUNC_NAME[] = "MPI_Alltoallv";
 
 
-OMPI_EXPORT
 int MPI_Alltoallv(void *sendbuf, int *sendcounts, int *sdispls,
                   MPI_Datatype sendtype, 
                   void *recvbuf, int *recvcounts, int *rdispls, 
diff --git a/src/mpi/c/alltoallw.c b/src/mpi/c/alltoallw.c
index 379c93f519..6dde1f9313 100644
--- a/src/mpi/c/alltoallw.c
+++ b/src/mpi/c/alltoallw.c
@@ -21,7 +21,6 @@
 static const char FUNC_NAME[] = "MPI_Alltoallw";
 
 
-OMPI_EXPORT
 int MPI_Alltoallw(void *sendbuf, int *sendcounts, int *sdispls, 
                   MPI_Datatype *sendtypes,
                   void *recvbuf, int *recvcounts, int *rdispls, 
diff --git a/src/mpi/c/attr_delete.c b/src/mpi/c/attr_delete.c
index 78edb408ab..370c295ea9 100644
--- a/src/mpi/c/attr_delete.c
+++ b/src/mpi/c/attr_delete.c
@@ -20,7 +20,6 @@
 static const char FUNC_NAME[] = "MPI_Attr_delete";
 
 
-OMPI_EXPORT
 int MPI_Attr_delete(MPI_Comm comm, int keyval)
 {
     int ret;
diff --git a/src/mpi/c/attr_fn.c b/src/mpi/c/attr_fn.c
index fab3c7f41f..ef24d93c47 100644
--- a/src/mpi/c/attr_fn.c
+++ b/src/mpi/c/attr_fn.c
@@ -34,7 +34,6 @@
  *   MPI_WIN_DUP_FN -> OMPI_C_MPI_WIN_DUP_FN
  */
 
-OMPI_EXPORT
 int OMPI_C_MPI_TYPE_NULL_DELETE_FN( MPI_Datatype datatype, int type_keyval,
                                     void* attribute_val_out,
                                     void* flag )
@@ -43,7 +42,6 @@ int OMPI_C_MPI_TYPE_NULL_DELETE_FN( MPI_Datatype datatype, int type_keyval,
    return MPI_SUCCESS;
 }
 
-OMPI_EXPORT
 int OMPI_C_MPI_TYPE_NULL_COPY_FN( MPI_Datatype datatype, int type_keyval, 
                                   void* extra_state,
                                   void* attribute_val_in, 
@@ -54,7 +52,6 @@ int OMPI_C_MPI_TYPE_NULL_COPY_FN( MPI_Datatype datatype, int type_keyval,
    return MPI_SUCCESS;
 }
 
-OMPI_EXPORT
 int OMPI_C_MPI_TYPE_DUP_FN( MPI_Datatype datatype, int type_keyval, 
                             void* extra_state,
                             void* attribute_val_in, void* attribute_val_out,
@@ -65,7 +62,6 @@ int OMPI_C_MPI_TYPE_DUP_FN( MPI_Datatype datatype, int type_keyval,
    return MPI_SUCCESS;
 }
 
-OMPI_EXPORT
 int OMPI_C_MPI_WIN_NULL_DELETE_FN( MPI_Win window, int win_keyval,
                                    void* attribute_val_out,
                                    void* flag )
@@ -73,7 +69,6 @@ int OMPI_C_MPI_WIN_NULL_DELETE_FN( MPI_Win window, int win_keyval,
    return MPI_SUCCESS;
 }
 
-OMPI_EXPORT
 int OMPI_C_MPI_WIN_NULL_COPY_FN( MPI_Win window, int win_keyval, 
                                  void* extra_state,
                                  void* attribute_val_in,
@@ -83,7 +78,6 @@ int OMPI_C_MPI_WIN_NULL_COPY_FN( MPI_Win window, int win_keyval,
    return MPI_SUCCESS;
 }
 
-OMPI_EXPORT
 int OMPI_C_MPI_WIN_DUP_FN( MPI_Win window, int win_keyval, void* extra_state,
                            void* attribute_val_in, void* attribute_val_out,
                            int* flag )
@@ -93,7 +87,6 @@ int OMPI_C_MPI_WIN_DUP_FN( MPI_Win window, int win_keyval, void* extra_state,
    return MPI_SUCCESS;
 }
 
-OMPI_EXPORT
 int OMPI_C_MPI_COMM_NULL_DELETE_FN( MPI_Comm comm, int comm_keyval,
                                     void* attribute_val_out,
                                     void* flag )
@@ -101,7 +94,6 @@ int OMPI_C_MPI_COMM_NULL_DELETE_FN( MPI_Comm comm, int comm_keyval,
    return MPI_SUCCESS;
 }
 
-OMPI_EXPORT
 int OMPI_C_MPI_COMM_NULL_COPY_FN( MPI_Comm comm, int comm_keyval, 
                                   void* extra_state,
                                   void* attribute_val_in,
@@ -111,7 +103,6 @@ int OMPI_C_MPI_COMM_NULL_COPY_FN( MPI_Comm comm, int comm_keyval,
    return MPI_SUCCESS;
 }
 
-OMPI_EXPORT
 int OMPI_C_MPI_COMM_DUP_FN( MPI_Comm comm, int comm_keyval, void* extra_state,
                      void* attribute_val_in, void* attribute_val_out,
                      int* flag )
@@ -121,7 +112,6 @@ int OMPI_C_MPI_COMM_DUP_FN( MPI_Comm comm, int comm_keyval, void* extra_state,
    return MPI_SUCCESS;
 }
 
-OMPI_EXPORT
 int OMPI_C_MPI_NULL_DELETE_FN( MPI_Comm comm, int comm_keyval,
                                void* attribute_val_out,
                                void* flag )
@@ -129,7 +119,6 @@ int OMPI_C_MPI_NULL_DELETE_FN( MPI_Comm comm, int comm_keyval,
    return MPI_SUCCESS;
 }
 
-OMPI_EXPORT
 int OMPI_C_MPI_NULL_COPY_FN( MPI_Comm comm, int comm_keyval, void* extra_state,
                              void* attribute_val_in, void* attribute_val_out,
                              int* flag )
@@ -138,7 +127,6 @@ int OMPI_C_MPI_NULL_COPY_FN( MPI_Comm comm, int comm_keyval, void* extra_state,
    return MPI_SUCCESS;
 }
 
-OMPI_EXPORT
 int OMPI_C_MPI_DUP_FN( MPI_Comm comm, int comm_keyval, void* extra_state,
                        void* attribute_val_in, void* attribute_val_out,
                        int* flag )
diff --git a/src/mpi/c/attr_get.c b/src/mpi/c/attr_get.c
index cbf37c05d4..59886e9d38 100644
--- a/src/mpi/c/attr_get.c
+++ b/src/mpi/c/attr_get.c
@@ -19,7 +19,6 @@
 
 static const char FUNC_NAME[] = "MPI_Attr_get";
 
-OMPI_EXPORT
 int MPI_Attr_get(MPI_Comm comm, int keyval, void *attribute_val, int *flag)
 {
     int ret;
diff --git a/src/mpi/c/attr_put.c b/src/mpi/c/attr_put.c
index 6b080e0c3a..b531faef06 100644
--- a/src/mpi/c/attr_put.c
+++ b/src/mpi/c/attr_put.c
@@ -19,7 +19,6 @@
 
 static const char FUNC_NAME[] = "MPI_Attr_put";
 
-OMPI_EXPORT
 int MPI_Attr_put(MPI_Comm comm, int keyval, void *attribute_val) 
 {
     int ret;
diff --git a/src/mpi/c/barrier.c b/src/mpi/c/barrier.c
index 20c910b7e3..ccf6e8c93e 100644
--- a/src/mpi/c/barrier.c
+++ b/src/mpi/c/barrier.c
@@ -21,7 +21,6 @@
 static const char FUNC_NAME[] = "MPI_Barrier";
 
 
-OMPI_EXPORT
 int MPI_Barrier(MPI_Comm comm) 
 {
   int err = MPI_SUCCESS;
diff --git a/src/mpi/c/bcast.c b/src/mpi/c/bcast.c
index 7caa58c3cd..59ee8ffd26 100644
--- a/src/mpi/c/bcast.c
+++ b/src/mpi/c/bcast.c
@@ -20,7 +20,6 @@
 static const char FUNC_NAME[] = "MPI_Bcast";
 
 
-OMPI_EXPORT
 int MPI_Bcast(void *buffer, int count, MPI_Datatype datatype,
               int root, MPI_Comm comm)
 {
diff --git a/src/mpi/c/bsend.c b/src/mpi/c/bsend.c
index ecbf372a0f..b1a9d79f50 100644
--- a/src/mpi/c/bsend.c
+++ b/src/mpi/c/bsend.c
@@ -21,7 +21,6 @@
 static const char FUNC_NAME[] = "MPI_Bsend";
 
 
-OMPI_EXPORT
 int MPI_Bsend(void *buf, int count, MPI_Datatype type, int dest, int tag, MPI_Comm comm) 
 {
     int rc, index;
diff --git a/src/mpi/c/bsend_init.c b/src/mpi/c/bsend_init.c
index 0b6f780030..dfa3d71ed8 100644
--- a/src/mpi/c/bsend_init.c
+++ b/src/mpi/c/bsend_init.c
@@ -20,7 +20,6 @@
 static const char FUNC_NAME[] = "MPI_Bsend_init";
 
 
-OMPI_EXPORT
 int MPI_Bsend_init(void *buf, int count, MPI_Datatype type,
                    int dest, int tag, MPI_Comm comm, MPI_Request *request) 
 {
diff --git a/src/mpi/c/buffer_attach.c b/src/mpi/c/buffer_attach.c
index d1e431989b..5f58c4ae02 100644
--- a/src/mpi/c/buffer_attach.c
+++ b/src/mpi/c/buffer_attach.c
@@ -23,7 +23,6 @@
 static const char FUNC_NAME[] = "MPI_Buffer_attach";
 
 
-OMPI_EXPORT
 int MPI_Buffer_attach(void *buffer, int size) 
 {
   if (MPI_PARAM_CHECK) {
diff --git a/src/mpi/c/buffer_detach.c b/src/mpi/c/buffer_detach.c
index 2b78ec12ab..fbf27e9e6a 100644
--- a/src/mpi/c/buffer_detach.c
+++ b/src/mpi/c/buffer_detach.c
@@ -20,7 +20,6 @@
 static const char FUNC_NAME[] = "MPI_Buffer_detach";
 
 
-OMPI_EXPORT
 int MPI_Buffer_detach(void *buffer, int *size) 
 {
   if (MPI_PARAM_CHECK) {
diff --git a/src/mpi/c/cancel.c b/src/mpi/c/cancel.c
index 7a679a8100..a6412539eb 100644
--- a/src/mpi/c/cancel.c
+++ b/src/mpi/c/cancel.c
@@ -21,7 +21,6 @@
 static const char FUNC_NAME[] = "MPI_Cancel";
 
 
-OMPI_EXPORT
 int MPI_Cancel(MPI_Request *request) 
 {
     int rc;
diff --git a/src/mpi/c/cart_coords.c b/src/mpi/c/cart_coords.c
index bc55881f96..30740dc737 100644
--- a/src/mpi/c/cart_coords.c
+++ b/src/mpi/c/cart_coords.c
@@ -22,7 +22,6 @@
 static const char FUNC_NAME[] = "MPI_Cart_coords";
 
 
-OMPI_EXPORT
 int MPI_Cart_coords(MPI_Comm comm, int rank, int maxdims, int *coords) 
 {
     int err;
diff --git a/src/mpi/c/cart_create.c b/src/mpi/c/cart_create.c
index 1679251728..31d728fb29 100644
--- a/src/mpi/c/cart_create.c
+++ b/src/mpi/c/cart_create.c
@@ -21,7 +21,6 @@
 static const char FUNC_NAME[] = "MPI_Cart_create";
 
 
-OMPI_EXPORT
 int MPI_Cart_create(MPI_Comm old_comm, int ndims, int *dims,
                     int *periods, int reorder, MPI_Comm *comm_cart) {
 
diff --git a/src/mpi/c/cart_get.c b/src/mpi/c/cart_get.c
index ba2bdf2336..b75fa8387d 100644
--- a/src/mpi/c/cart_get.c
+++ b/src/mpi/c/cart_get.c
@@ -21,7 +21,6 @@
 static const char FUNC_NAME[] = "MPI_Cart_get";
 
 
-OMPI_EXPORT
 int MPI_Cart_get(MPI_Comm comm, int maxdims, int *dims,
                  int *periods, int *coords) 
 {
diff --git a/src/mpi/c/cart_map.c b/src/mpi/c/cart_map.c
index 0bac39630b..4cf23e7d52 100644
--- a/src/mpi/c/cart_map.c
+++ b/src/mpi/c/cart_map.c
@@ -21,7 +21,6 @@
 static const char FUNC_NAME[] = "MPI_Cart_map";
 
 
-OMPI_EXPORT
 int MPI_Cart_map(MPI_Comm comm, int ndims, int *dims,
                 int *periods, int *newrank) 
 {
diff --git a/src/mpi/c/cart_rank.c b/src/mpi/c/cart_rank.c
index aa2848beea..ad66e29033 100644
--- a/src/mpi/c/cart_rank.c
+++ b/src/mpi/c/cart_rank.c
@@ -21,7 +21,6 @@
 static const char FUNC_NAME[] = "MPI_Cart_rank";
 
 
-OMPI_EXPORT
 int MPI_Cart_rank(MPI_Comm comm, int *coords, int *rank) 
 {
     int err;
diff --git a/src/mpi/c/cart_shift.c b/src/mpi/c/cart_shift.c
index c8d65dd3bd..da542d0901 100644
--- a/src/mpi/c/cart_shift.c
+++ b/src/mpi/c/cart_shift.c
@@ -21,7 +21,6 @@
 static const char FUNC_NAME[] = "MPI_Cart_shift";
 
 
-OMPI_EXPORT
 int MPI_Cart_shift(MPI_Comm comm, int direction, int disp,
                    int *rank_source, int *rank_dest) 
 {
diff --git a/src/mpi/c/cart_sub.c b/src/mpi/c/cart_sub.c
index 50a91a6a42..519a9fbb6d 100644
--- a/src/mpi/c/cart_sub.c
+++ b/src/mpi/c/cart_sub.c
@@ -21,7 +21,6 @@
 static const char FUNC_NAME[] = "MPI_Cart_sub";
 
 
-OMPI_EXPORT
 int MPI_Cart_sub(MPI_Comm comm, int *remain_dims, MPI_Comm *new_comm) 
 {
     int err;
diff --git a/src/mpi/c/cartdim_get.c b/src/mpi/c/cartdim_get.c
index c737ff1a30..11192bd958 100644
--- a/src/mpi/c/cartdim_get.c
+++ b/src/mpi/c/cartdim_get.c
@@ -21,7 +21,6 @@
 static const char FUNC_NAME[] = "MPI_Cartdim_get";
 
 
-OMPI_EXPORT
 int MPI_Cartdim_get(MPI_Comm comm, int *ndims) 
 {
     mca_topo_base_module_cartdim_get_fn_t func;
diff --git a/src/mpi/c/close_port.c b/src/mpi/c/close_port.c
index 7d3739f4bb..6a91746fe2 100644
--- a/src/mpi/c/close_port.c
+++ b/src/mpi/c/close_port.c
@@ -19,7 +19,6 @@
 static const char FUNC_NAME[] = "MPI_Close_port";
 
 
-OMPI_EXPORT
 int MPI_Close_port(char *port_name) 
 {
     if ( MPI_PARAM_CHECK ) {
diff --git a/src/mpi/c/comm_accept.c b/src/mpi/c/comm_accept.c
index 03472539c5..b364ab26e8 100644
--- a/src/mpi/c/comm_accept.c
+++ b/src/mpi/c/comm_accept.c
@@ -20,7 +20,6 @@
 static const char FUNC_NAME[] = "MPI_Comm_accept";
 
 
-OMPI_EXPORT
 int MPI_Comm_accept(char *port_name, MPI_Info info, int root,
                     MPI_Comm comm, MPI_Comm *newcomm) 
 {
diff --git a/src/mpi/c/comm_c2f.c b/src/mpi/c/comm_c2f.c
index 29dd90d745..cc7bac02de 100644
--- a/src/mpi/c/comm_c2f.c
+++ b/src/mpi/c/comm_c2f.c
@@ -20,7 +20,6 @@
 static const char FUNC_NAME[] = "MPI_Comm_c2f";
 
 
-OMPI_EXPORT
 MPI_Fint MPI_Comm_c2f(MPI_Comm comm) 
 {
     ompi_communicator_t *cptr=(ompi_communicator_t *)comm;
diff --git a/src/mpi/c/comm_call_errhandler.c b/src/mpi/c/comm_call_errhandler.c
index abf845ea55..d60947511a 100644
--- a/src/mpi/c/comm_call_errhandler.c
+++ b/src/mpi/c/comm_call_errhandler.c
@@ -21,7 +21,6 @@
 static const char FUNC_NAME[] = "MPI_Comm_call_errhandler";
 
 
-OMPI_EXPORT
 int MPI_Comm_call_errhandler(MPI_Comm comm, int errorcode)
 {
   /* Error checking */
diff --git a/src/mpi/c/comm_compare.c b/src/mpi/c/comm_compare.c
index 988d21bfa3..d9906b0edb 100644
--- a/src/mpi/c/comm_compare.c
+++ b/src/mpi/c/comm_compare.c
@@ -19,7 +19,6 @@
 static const char FUNC_NAME[] = "MPI_Comm_compare";
 
 
-OMPI_EXPORT
 int MPI_Comm_compare(MPI_Comm comm1, MPI_Comm comm2, int *result) {
 
     /* local variables */
diff --git a/src/mpi/c/comm_connect.c b/src/mpi/c/comm_connect.c
index 0c7b890ede..1f8447b37c 100644
--- a/src/mpi/c/comm_connect.c
+++ b/src/mpi/c/comm_connect.c
@@ -21,7 +21,6 @@
 static const char FUNC_NAME[] = "MPI_Comm_connect";
 
 
-OMPI_EXPORT
 int MPI_Comm_connect(char *port_name, MPI_Info info, int root,
                      MPI_Comm comm, MPI_Comm *newcomm) 
 {
diff --git a/src/mpi/c/comm_create.c b/src/mpi/c/comm_create.c
index b83255341d..1ca70cd744 100644
--- a/src/mpi/c/comm_create.c
+++ b/src/mpi/c/comm_create.c
@@ -19,7 +19,6 @@
 static const char FUNC_NAME[] = "MPI_Comm_create";
 
 
-OMPI_EXPORT
 int MPI_Comm_create(MPI_Comm comm, MPI_Group group, MPI_Comm *newcomm) {
     
     int rc;
diff --git a/src/mpi/c/comm_create_errhandler.c b/src/mpi/c/comm_create_errhandler.c
index 039bd00ea7..890eb28f11 100644
--- a/src/mpi/c/comm_create_errhandler.c
+++ b/src/mpi/c/comm_create_errhandler.c
@@ -21,7 +21,6 @@
 static const char FUNC_NAME[] = "MPI_Comm_create_errhandler";
 
 
-OMPI_EXPORT
 int MPI_Comm_create_errhandler(MPI_Comm_errhandler_fn *function,
                                MPI_Errhandler *errhandler) 
 {
diff --git a/src/mpi/c/comm_create_keyval.c b/src/mpi/c/comm_create_keyval.c
index 9c6716384a..2c02ff9f86 100644
--- a/src/mpi/c/comm_create_keyval.c
+++ b/src/mpi/c/comm_create_keyval.c
@@ -19,7 +19,6 @@
 static const char FUNC_NAME[] = "MPI_Comm_create_keyval";
 
 
-OMPI_EXPORT
 int MPI_Comm_create_keyval(MPI_Comm_copy_attr_function *comm_copy_attr_fn,
                            MPI_Comm_delete_attr_function *comm_delete_attr_fn,
 			   int *comm_keyval, void *extra_state)
diff --git a/src/mpi/c/comm_delete_attr.c b/src/mpi/c/comm_delete_attr.c
index bd7761af6b..b22664c11f 100644
--- a/src/mpi/c/comm_delete_attr.c
+++ b/src/mpi/c/comm_delete_attr.c
@@ -19,7 +19,6 @@
 static const char FUNC_NAME[] = "MPI_Comm_delete_attr";
 
 
-OMPI_EXPORT
 int MPI_Comm_delete_attr(MPI_Comm comm, int comm_keyval) 
 {
     int ret;
diff --git a/src/mpi/c/comm_disconnect.c b/src/mpi/c/comm_disconnect.c
index ca4a6b03e9..067a0ab387 100644
--- a/src/mpi/c/comm_disconnect.c
+++ b/src/mpi/c/comm_disconnect.c
@@ -19,7 +19,6 @@
 static const char FUNC_NAME[] = "MPI_Comm_disconnect";
 
 
-OMPI_EXPORT
 int MPI_Comm_disconnect(MPI_Comm *comm) 
 {
 
diff --git a/src/mpi/c/comm_dup.c b/src/mpi/c/comm_dup.c
index 206ea26c80..4ce4e7c501 100644
--- a/src/mpi/c/comm_dup.c
+++ b/src/mpi/c/comm_dup.c
@@ -19,7 +19,6 @@
 static const char FUNC_NAME[] = "MPI_Comm_dup";
 
 
-OMPI_EXPORT
 int MPI_Comm_dup(MPI_Comm comm, MPI_Comm *newcomm) 
 {
     /* local variables */
diff --git a/src/mpi/c/comm_f2c.c b/src/mpi/c/comm_f2c.c
index 60a7fa31c2..3d6ea80511 100644
--- a/src/mpi/c/comm_f2c.c
+++ b/src/mpi/c/comm_f2c.c
@@ -20,7 +20,6 @@
 static const char FUNC_NAME[] = "MPI_Comm_f2c";
 
 
-OMPI_EXPORT
 MPI_Comm MPI_Comm_f2c(MPI_Fint comm) 
 {
     size_t o_index= (size_t) comm;
diff --git a/src/mpi/c/comm_free.c b/src/mpi/c/comm_free.c
index 1ce8e47bf4..1f614084b7 100644
--- a/src/mpi/c/comm_free.c
+++ b/src/mpi/c/comm_free.c
@@ -19,7 +19,6 @@
 static const char FUNC_NAME[] = "MPI_Comm_free";
 
 
-OMPI_EXPORT
 int MPI_Comm_free(MPI_Comm *comm) {
     
     if ( MPI_PARAM_CHECK ) {
diff --git a/src/mpi/c/comm_free_keyval.c b/src/mpi/c/comm_free_keyval.c
index 9263441544..dbbbbc9d67 100644
--- a/src/mpi/c/comm_free_keyval.c
+++ b/src/mpi/c/comm_free_keyval.c
@@ -19,7 +19,6 @@
 static const char FUNC_NAME[] = "MPI_Comm_free_keyval";
 
 
-OMPI_EXPORT
 int MPI_Comm_free_keyval(int *comm_keyval) 
 {
     int ret;
diff --git a/src/mpi/c/comm_get_attr.c b/src/mpi/c/comm_get_attr.c
index af5dc3e053..bd398bc635 100644
--- a/src/mpi/c/comm_get_attr.c
+++ b/src/mpi/c/comm_get_attr.c
@@ -19,7 +19,6 @@
 static const char FUNC_NAME[] = "MPI_Comm_get_attr";
 
 
-OMPI_EXPORT
 int MPI_Comm_get_attr(MPI_Comm comm, int comm_keyval,
                       void *attribute_val, int *flag)
 {
diff --git a/src/mpi/c/comm_get_errhandler.c b/src/mpi/c/comm_get_errhandler.c
index 93aa05e438..fa3c1a85f0 100644
--- a/src/mpi/c/comm_get_errhandler.c
+++ b/src/mpi/c/comm_get_errhandler.c
@@ -21,7 +21,6 @@
 static const char FUNC_NAME[] = "MPI_Comm_get_errhandler";
 
 
-OMPI_EXPORT
 int MPI_Comm_get_errhandler(MPI_Comm comm, MPI_Errhandler *errhandler)
 {
   /* Error checking */
diff --git a/src/mpi/c/comm_get_name.c b/src/mpi/c/comm_get_name.c
index a23d51dd44..d286502cb0 100644
--- a/src/mpi/c/comm_get_name.c
+++ b/src/mpi/c/comm_get_name.c
@@ -24,7 +24,6 @@
 static const char FUNC_NAME[] = "MPI_Comm_get_name";
 
 
-OMPI_EXPORT
 int MPI_Comm_get_name(MPI_Comm comm, char *name, int *length)  
 {
 
diff --git a/src/mpi/c/comm_get_parent.c b/src/mpi/c/comm_get_parent.c
index 4cf9c35ab1..37fadc6e39 100644
--- a/src/mpi/c/comm_get_parent.c
+++ b/src/mpi/c/comm_get_parent.c
@@ -19,7 +19,6 @@
 static const char FUNC_NAME[] = "MPI_Comm_get_parent";
 
 
-OMPI_EXPORT
 int MPI_Comm_get_parent(MPI_Comm *parent) 
 {
 
diff --git a/src/mpi/c/comm_group.c b/src/mpi/c/comm_group.c
index d48c8a91ca..3305a3952f 100644
--- a/src/mpi/c/comm_group.c
+++ b/src/mpi/c/comm_group.c
@@ -19,7 +19,6 @@
 static const char FUNC_NAME[] = "MPI_Comm_group";
 
 
-OMPI_EXPORT
 int MPI_Comm_group(MPI_Comm comm, MPI_Group *group) {
 
     int rc;
diff --git a/src/mpi/c/comm_join.c b/src/mpi/c/comm_join.c
index 82e8f99ce6..0fdb4d55e9 100644
--- a/src/mpi/c/comm_join.c
+++ b/src/mpi/c/comm_join.c
@@ -28,7 +28,6 @@ static const char FUNC_NAME[] = "MPI_Comm_join";
 static int ompi_socket_send (int fd, char *buf, int len );
 static int ompi_socket_recv (int fd, char *buf, int len );
 
-OMPI_EXPORT
 int MPI_Comm_join(int fd, MPI_Comm *intercomm) 
 {
     int rc, tag=OMPI_COMM_JOIN_TAG;
diff --git a/src/mpi/c/comm_rank.c b/src/mpi/c/comm_rank.c
index 94a88311f8..6cd88b0113 100644
--- a/src/mpi/c/comm_rank.c
+++ b/src/mpi/c/comm_rank.c
@@ -19,7 +19,6 @@
 static const char FUNC_NAME[] = "MPI_Comm_rank";
 
 
-OMPI_EXPORT
 int MPI_Comm_rank(MPI_Comm comm, int *rank) 
 {
     if ( MPI_PARAM_CHECK ) {
diff --git a/src/mpi/c/comm_remote_group.c b/src/mpi/c/comm_remote_group.c
index 6c30289ecc..0867e805b1 100644
--- a/src/mpi/c/comm_remote_group.c
+++ b/src/mpi/c/comm_remote_group.c
@@ -21,7 +21,6 @@
 static const char FUNC_NAME[] = "MPI_Comm_remote_group";
 
 
-OMPI_EXPORT
 int MPI_Comm_remote_group(MPI_Comm comm, MPI_Group *group) 
 {
 
diff --git a/src/mpi/c/comm_remote_size.c b/src/mpi/c/comm_remote_size.c
index b694bbe103..b7b7dfbd23 100644
--- a/src/mpi/c/comm_remote_size.c
+++ b/src/mpi/c/comm_remote_size.c
@@ -20,7 +20,6 @@
 static const char FUNC_NAME[] = "MPI_Comm_remote_size";
 
 
-OMPI_EXPORT
 int MPI_Comm_remote_size(MPI_Comm comm, int *size) {
 
     if ( MPI_PARAM_CHECK ) {
diff --git a/src/mpi/c/comm_set_attr.c b/src/mpi/c/comm_set_attr.c
index 1a45b9e2da..cbc87b3809 100644
--- a/src/mpi/c/comm_set_attr.c
+++ b/src/mpi/c/comm_set_attr.c
@@ -19,7 +19,6 @@
 static const char FUNC_NAME[] = "MPI_Comm_set_attr";
 
 
-OMPI_EXPORT
 int MPI_Comm_set_attr(MPI_Comm comm, int comm_keyval, void *attribute_val) 
 {
     int ret;
diff --git a/src/mpi/c/comm_set_errhandler.c b/src/mpi/c/comm_set_errhandler.c
index bdad6d86a8..4fc68639f0 100644
--- a/src/mpi/c/comm_set_errhandler.c
+++ b/src/mpi/c/comm_set_errhandler.c
@@ -20,7 +20,6 @@
 static const char FUNC_NAME[] = "MPI_Comm_set_errhandler";
 
 
-OMPI_EXPORT
 int MPI_Comm_set_errhandler(MPI_Comm comm, MPI_Errhandler errhandler) 
 {
   /* Error checking */
diff --git a/src/mpi/c/comm_set_name.c b/src/mpi/c/comm_set_name.c
index 23cf68747f..6a7e071c66 100644
--- a/src/mpi/c/comm_set_name.c
+++ b/src/mpi/c/comm_set_name.c
@@ -23,7 +23,6 @@
 static const char FUNC_NAME[] = "MPI_Comm_set_name";
 
 
-OMPI_EXPORT
 int MPI_Comm_set_name(MPI_Comm comm, char *name) 
 {
     int rc;
diff --git a/src/mpi/c/comm_size.c b/src/mpi/c/comm_size.c
index b8670bfa6d..1c3efe1e96 100644
--- a/src/mpi/c/comm_size.c
+++ b/src/mpi/c/comm_size.c
@@ -19,7 +19,6 @@
 static const char FUNC_NAME[] = "MPI_comm_size";
 
 
-OMPI_EXPORT
 int MPI_Comm_size(MPI_Comm comm, int *size) {
 
     if ( MPI_PARAM_CHECK ) {
diff --git a/src/mpi/c/comm_spawn.c b/src/mpi/c/comm_spawn.c
index eeb94054e6..2e015d0f07 100644
--- a/src/mpi/c/comm_spawn.c
+++ b/src/mpi/c/comm_spawn.c
@@ -21,7 +21,6 @@
 static const char FUNC_NAME[] = "MPI_Comm_spawn";
 
 
-OMPI_EXPORT
 int MPI_Comm_spawn(char *command, char **argv, int maxprocs, MPI_Info info,
                     int root, MPI_Comm comm, MPI_Comm *intercomm,
                     int *array_of_errcodes) 
diff --git a/src/mpi/c/comm_spawn_multiple.c b/src/mpi/c/comm_spawn_multiple.c
index f749c52969..c33d8448ab 100644
--- a/src/mpi/c/comm_spawn_multiple.c
+++ b/src/mpi/c/comm_spawn_multiple.c
@@ -20,7 +20,6 @@
 static const char FUNC_NAME[] = "MPI_Comm_spawn_multiple";
 
 
-OMPI_EXPORT
 int MPI_Comm_spawn_multiple(int count, char **array_of_commands, char ***array_of_argv,
                             int *array_of_maxprocs, MPI_Info *array_of_info,
                             int root, MPI_Comm comm, MPI_Comm *intercomm,
diff --git a/src/mpi/c/comm_split.c b/src/mpi/c/comm_split.c
index be067dd3c5..8a1c09b3d7 100644
--- a/src/mpi/c/comm_split.c
+++ b/src/mpi/c/comm_split.c
@@ -19,7 +19,6 @@
 static const char FUNC_NAME[] = "MPI_Comm_split";
 
 
-OMPI_EXPORT
 int MPI_Comm_split(MPI_Comm comm, int color, int key, MPI_Comm *newcomm) {
 
     int rc;
diff --git a/src/mpi/c/comm_test_inter.c b/src/mpi/c/comm_test_inter.c
index 46f8d1f268..8f6ab8ef7a 100644
--- a/src/mpi/c/comm_test_inter.c
+++ b/src/mpi/c/comm_test_inter.c
@@ -19,7 +19,6 @@
 static const char FUNC_NAME[] = "MPI_Comm_test_inter";
 
 
-OMPI_EXPORT
 int MPI_Comm_test_inter(MPI_Comm comm, int *flag) {
 
     if ( MPI_PARAM_CHECK ) {
diff --git a/src/mpi/c/dims_create.c b/src/mpi/c/dims_create.c
index 3cd1a13c21..af9bf8f35a 100644
--- a/src/mpi/c/dims_create.c
+++ b/src/mpi/c/dims_create.c
@@ -29,7 +29,6 @@ static int getprimes(int num, int *pnprime, int **pprimes);
  * This is a utility function, no need to have anything in the lower
  * layer for this at all
  */ 
-OMPI_EXPORT
 int MPI_Dims_create(int nnodes, int ndims, int *dims) 
 {
     int i;
diff --git a/src/mpi/c/errhandler_c2f.c b/src/mpi/c/errhandler_c2f.c
index 6bf8095386..deb4bc4d4f 100644
--- a/src/mpi/c/errhandler_c2f.c
+++ b/src/mpi/c/errhandler_c2f.c
@@ -20,7 +20,6 @@
 static const char FUNC_NAME[] = "MPI_Errhandler_c2f";
 
 
-OMPI_EXPORT
 MPI_Fint MPI_Errhandler_c2f(MPI_Errhandler errhandler)
 {
   /* Error checking */
diff --git a/src/mpi/c/errhandler_create.c b/src/mpi/c/errhandler_create.c
index fcb974e5fb..eaf940d9c9 100644
--- a/src/mpi/c/errhandler_create.c
+++ b/src/mpi/c/errhandler_create.c
@@ -16,7 +16,6 @@
 #endif
 
 
-OMPI_EXPORT
 int MPI_Errhandler_create(MPI_Handler_function *function,
                           MPI_Errhandler *errhandler)
 {
diff --git a/src/mpi/c/errhandler_f2c.c b/src/mpi/c/errhandler_f2c.c
index 6011777ce4..4ce7dce54f 100644
--- a/src/mpi/c/errhandler_f2c.c
+++ b/src/mpi/c/errhandler_f2c.c
@@ -20,7 +20,6 @@
 static const char FUNC_NAME[] = "MPI_Errhandler_f2c";
 
 
-OMPI_EXPORT
 MPI_Errhandler MPI_Errhandler_f2c(MPI_Fint errhandler_f)
 {
     size_t eh_index = (size_t) errhandler_f;
diff --git a/src/mpi/c/errhandler_free.c b/src/mpi/c/errhandler_free.c
index 527dce5a70..c80e723064 100644
--- a/src/mpi/c/errhandler_free.c
+++ b/src/mpi/c/errhandler_free.c
@@ -20,7 +20,6 @@
 static const char FUNC_NAME[] = "MPI_Errhandler_free";
 
 
-OMPI_EXPORT
 int MPI_Errhandler_free(MPI_Errhandler *errhandler)
 {
   /* Error checking */
diff --git a/src/mpi/c/errhandler_get.c b/src/mpi/c/errhandler_get.c
index 30a02440f5..d98cd686c9 100644
--- a/src/mpi/c/errhandler_get.c
+++ b/src/mpi/c/errhandler_get.c
@@ -20,7 +20,6 @@
 static const char FUNC_NAME[] = "MPI_Errhandler_get";
 
 
-OMPI_EXPORT
 int MPI_Errhandler_get(MPI_Comm comm, MPI_Errhandler *errhandler) 
 {
   if (MPI_PARAM_CHECK) {
diff --git a/src/mpi/c/errhandler_set.c b/src/mpi/c/errhandler_set.c
index 75bfb6ab20..976ca3c279 100644
--- a/src/mpi/c/errhandler_set.c
+++ b/src/mpi/c/errhandler_set.c
@@ -20,7 +20,6 @@
 static const char FUNC_NAME[] = "MPI_Errhandler_set";
 
 
-OMPI_EXPORT
 int MPI_Errhandler_set(MPI_Comm comm, MPI_Errhandler errhandler)
 {
   if (MPI_PARAM_CHECK) {
diff --git a/src/mpi/c/error_class.c b/src/mpi/c/error_class.c
index 37da435d68..5c4f2e505a 100644
--- a/src/mpi/c/error_class.c
+++ b/src/mpi/c/error_class.c
@@ -20,7 +20,6 @@
 static const char FUNC_NAME[] = "MPI_Error_class";
 
 
-OMPI_EXPORT
 int MPI_Error_class(int errorcode, int *errorclass) 
 {
     if ( MPI_PARAM_CHECK ) {
diff --git a/src/mpi/c/error_string.c b/src/mpi/c/error_string.c
index e8a1770eae..b238981ce4 100644
--- a/src/mpi/c/error_string.c
+++ b/src/mpi/c/error_string.c
@@ -21,7 +21,6 @@
 static const char FUNC_NAME[] = "MPI_Error_string";
 
 
-OMPI_EXPORT
 int MPI_Error_string(int errorcode, char *string, int *resultlen) 
 {
     char *tmpstring;
diff --git a/src/mpi/c/exscan.c b/src/mpi/c/exscan.c
index 3da30966b0..e6d69a554b 100644
--- a/src/mpi/c/exscan.c
+++ b/src/mpi/c/exscan.c
@@ -22,7 +22,6 @@
 static const char FUNC_NAME[] = "MPI_Exscan";
 
 
-OMPI_EXPORT
 int MPI_Exscan(void *sendbuf, void *recvbuf, int count,
                MPI_Datatype datatype, MPI_Op op, MPI_Comm comm) 
 {
diff --git a/src/mpi/c/file_c2f.c b/src/mpi/c/file_c2f.c
index 62389711da..a981332920 100644
--- a/src/mpi/c/file_c2f.c
+++ b/src/mpi/c/file_c2f.c
@@ -21,7 +21,6 @@
 static const char FUNC_NAME[] = "MPI_File_c2f";
 
 
-OMPI_EXPORT
 MPI_Fint MPI_File_c2f(MPI_File file)
 {
     if (MPI_PARAM_CHECK) {
diff --git a/src/mpi/c/file_call_errhandler.c b/src/mpi/c/file_call_errhandler.c
index 0748564e4c..76c2dd93f6 100644
--- a/src/mpi/c/file_call_errhandler.c
+++ b/src/mpi/c/file_call_errhandler.c
@@ -21,7 +21,6 @@
 static const char FUNC_NAME[] = "MPI_File_call_errhandler";
 
 
-OMPI_EXPORT
 int MPI_File_call_errhandler(MPI_File fh, int errorcode) 
 {
   /* Error checking */
diff --git a/src/mpi/c/file_close.c b/src/mpi/c/file_close.c
index be297236e5..ce43352c2e 100644
--- a/src/mpi/c/file_close.c
+++ b/src/mpi/c/file_close.c
@@ -21,7 +21,6 @@
 static const char FUNC_NAME[] = "MPI_File_close";
 
 
-OMPI_EXPORT
 int MPI_File_close(MPI_File *fh) 
 {
     int rc;
diff --git a/src/mpi/c/file_create_errhandler.c b/src/mpi/c/file_create_errhandler.c
index 5a0d665b6a..d7b0e75b78 100644
--- a/src/mpi/c/file_create_errhandler.c
+++ b/src/mpi/c/file_create_errhandler.c
@@ -21,7 +21,6 @@
 static const char FUNC_NAME[] = "MPI_File_create_errhandler";
 
 
-OMPI_EXPORT
 int MPI_File_create_errhandler(MPI_File_errhandler_fn *function,
 		                        MPI_Errhandler *errhandler) {
   int err = MPI_SUCCESS;
diff --git a/src/mpi/c/file_delete.c b/src/mpi/c/file_delete.c
index 8b4a5b64b3..8bca43a708 100644
--- a/src/mpi/c/file_delete.c
+++ b/src/mpi/c/file_delete.c
@@ -23,7 +23,6 @@
 static const char FUNC_NAME[] = "MPI_File_delete";
 
 
-OMPI_EXPORT
 int MPI_File_delete(char *filename, MPI_Info info) 
 {
     int rc;
diff --git a/src/mpi/c/file_f2c.c b/src/mpi/c/file_f2c.c
index d3e3bdab64..b107afb87c 100644
--- a/src/mpi/c/file_f2c.c
+++ b/src/mpi/c/file_f2c.c
@@ -21,7 +21,6 @@
 static const char FUNC_NAME[] = "MPI_File_f2c";
 
 
-OMPI_EXPORT
 MPI_File MPI_File_f2c(MPI_Fint file_f) 
 {
     size_t file_index = (size_t) file_f;
diff --git a/src/mpi/c/file_get_amode.c b/src/mpi/c/file_get_amode.c
index ace65a06a0..d1fb665506 100644
--- a/src/mpi/c/file_get_amode.c
+++ b/src/mpi/c/file_get_amode.c
@@ -21,7 +21,6 @@
 static const char FUNC_NAME[] = "MPI_File_get_amode";
 
 
-OMPI_EXPORT
 int MPI_File_get_amode(MPI_File fh, int *amode)
 {
     int rc;
diff --git a/src/mpi/c/file_get_atomicity.c b/src/mpi/c/file_get_atomicity.c
index f45d8cb504..dea7b4a72a 100644
--- a/src/mpi/c/file_get_atomicity.c
+++ b/src/mpi/c/file_get_atomicity.c
@@ -22,7 +22,6 @@
 static const char FUNC_NAME[] = "MPI_File_get_atomicity";
 
 
-OMPI_EXPORT
 int MPI_File_get_atomicity(MPI_File fh, int *flag)
 {
     int rc;
diff --git a/src/mpi/c/file_get_byte_offset.c b/src/mpi/c/file_get_byte_offset.c
index 3cadcfd30a..151d87334d 100644
--- a/src/mpi/c/file_get_byte_offset.c
+++ b/src/mpi/c/file_get_byte_offset.c
@@ -22,7 +22,6 @@
 static const char FUNC_NAME[] = "MPI_File_get_byte_offset";
 
 
-OMPI_EXPORT
 int MPI_File_get_byte_offset(MPI_File fh, MPI_Offset offset,
                              MPI_Offset *disp)
 {
diff --git a/src/mpi/c/file_get_errhandler.c b/src/mpi/c/file_get_errhandler.c
index a806d3489d..8297d9a605 100644
--- a/src/mpi/c/file_get_errhandler.c
+++ b/src/mpi/c/file_get_errhandler.c
@@ -21,7 +21,6 @@
 static const char FUNC_NAME[] = "MPI_File_get_errhandler";
 
 
-OMPI_EXPORT
 int MPI_File_get_errhandler( MPI_File file, MPI_Errhandler *errhandler) 
 {
   /* Error checking */
diff --git a/src/mpi/c/file_get_group.c b/src/mpi/c/file_get_group.c
index fcde0e9497..0808efd995 100644
--- a/src/mpi/c/file_get_group.c
+++ b/src/mpi/c/file_get_group.c
@@ -21,7 +21,6 @@
 static const char FUNC_NAME[] = "MPI_File_get_group";
 
 
-OMPI_EXPORT
 int MPI_File_get_group(MPI_File fh, MPI_Group *group)
 {
     int rc;
diff --git a/src/mpi/c/file_get_info.c b/src/mpi/c/file_get_info.c
index 5bd4742a53..bff23cb866 100644
--- a/src/mpi/c/file_get_info.c
+++ b/src/mpi/c/file_get_info.c
@@ -21,7 +21,6 @@
 static const char FUNC_NAME[] = "MPI_File_get_info";
 
 
-OMPI_EXPORT
 int MPI_File_get_info(MPI_File fh, MPI_Info *info_used)
 {
     int rc;
diff --git a/src/mpi/c/file_get_position.c b/src/mpi/c/file_get_position.c
index b6e2d0521a..3bcc5bd009 100644
--- a/src/mpi/c/file_get_position.c
+++ b/src/mpi/c/file_get_position.c
@@ -21,7 +21,6 @@
 static const char FUNC_NAME[] = "MPI_File_get_position";
 
 
-OMPI_EXPORT
 int MPI_File_get_position(MPI_File fh, MPI_Offset *offset)
 {
     int rc;
diff --git a/src/mpi/c/file_get_position_shared.c b/src/mpi/c/file_get_position_shared.c
index 467fc9ae6c..118b597c9a 100644
--- a/src/mpi/c/file_get_position_shared.c
+++ b/src/mpi/c/file_get_position_shared.c
@@ -21,7 +21,6 @@
 static const char FUNC_NAME[] = "MPI_File_get_position_shared";
 
 
-OMPI_EXPORT
 int MPI_File_get_position_shared(MPI_File fh, MPI_Offset *offset)
 {
     int rc;
diff --git a/src/mpi/c/file_get_size.c b/src/mpi/c/file_get_size.c
index fdffa9a411..7fa8c85f69 100644
--- a/src/mpi/c/file_get_size.c
+++ b/src/mpi/c/file_get_size.c
@@ -21,7 +21,6 @@
 static const char FUNC_NAME[] = "MPI_File_get_size";
 
 
-OMPI_EXPORT
 int MPI_File_get_size(MPI_File fh, MPI_Offset *size)
 {
     int rc;
diff --git a/src/mpi/c/file_get_type_extent.c b/src/mpi/c/file_get_type_extent.c
index 66d7484ea0..b75dd07316 100644
--- a/src/mpi/c/file_get_type_extent.c
+++ b/src/mpi/c/file_get_type_extent.c
@@ -21,7 +21,6 @@
 static const char FUNC_NAME[] = "MPI_File_get_type_extent";
 
 
-OMPI_EXPORT
 int MPI_File_get_type_extent(MPI_File fh, MPI_Datatype datatype,
                              MPI_Aint *extent)
 {
diff --git a/src/mpi/c/file_get_view.c b/src/mpi/c/file_get_view.c
index 9d90adbda6..479afd49e6 100644
--- a/src/mpi/c/file_get_view.c
+++ b/src/mpi/c/file_get_view.c
@@ -21,7 +21,6 @@
 static const char FUNC_NAME[] = "MPI_File_get_view";
 
 
-OMPI_EXPORT
 int MPI_File_get_view(MPI_File fh, MPI_Offset *disp,
                       MPI_Datatype *etype,
                       MPI_Datatype *filetype, char *datarep)
diff --git a/src/mpi/c/file_iread.c b/src/mpi/c/file_iread.c
index 57f2908458..94cbdd94be 100644
--- a/src/mpi/c/file_iread.c
+++ b/src/mpi/c/file_iread.c
@@ -23,7 +23,6 @@
 static const char FUNC_NAME[] = "MPI_File_iread";
 
 
-OMPI_EXPORT
 int MPI_File_iread(MPI_File fh, void *buf, int count, 
                    MPI_Datatype datatype, MPI_Request *request)
 {
diff --git a/src/mpi/c/file_iread_at.c b/src/mpi/c/file_iread_at.c
index 97f91950f8..ded61b5841 100644
--- a/src/mpi/c/file_iread_at.c
+++ b/src/mpi/c/file_iread_at.c
@@ -23,7 +23,6 @@
 static const char FUNC_NAME[] = "MPI_File_iread_at";
 
 
-OMPI_EXPORT
 int MPI_File_iread_at(MPI_File fh, MPI_Offset offset, void *buf,
                       int count, MPI_Datatype datatype, MPI_Request *request)
 {
diff --git a/src/mpi/c/file_iread_shared.c b/src/mpi/c/file_iread_shared.c
index 7acec639c4..53a623e30a 100644
--- a/src/mpi/c/file_iread_shared.c
+++ b/src/mpi/c/file_iread_shared.c
@@ -23,7 +23,6 @@
 static const char FUNC_NAME[] = "MPI_File_iread_shared";
 
 
-OMPI_EXPORT
 int MPI_File_iread_shared(MPI_File fh, void *buf, int count,
                           MPI_Datatype datatype, MPI_Request *request)
 {
diff --git a/src/mpi/c/file_iwrite.c b/src/mpi/c/file_iwrite.c
index 7fde48b978..730777e281 100644
--- a/src/mpi/c/file_iwrite.c
+++ b/src/mpi/c/file_iwrite.c
@@ -23,7 +23,6 @@
 static const char FUNC_NAME[] = "MPI_File_iwrite";
 
 
-OMPI_EXPORT
 int MPI_File_iwrite(MPI_File fh, void *buf, int count, MPI_Datatype
                     datatype, MPI_Request *request)
 {
diff --git a/src/mpi/c/file_iwrite_at.c b/src/mpi/c/file_iwrite_at.c
index affe16d0cd..66e62c9e91 100644
--- a/src/mpi/c/file_iwrite_at.c
+++ b/src/mpi/c/file_iwrite_at.c
@@ -23,7 +23,6 @@
 static const char FUNC_NAME[] = "MPI_File_iwrite_at";
 
 
-OMPI_EXPORT
 int MPI_File_iwrite_at(MPI_File fh, MPI_Offset offset, void *buf,
                        int count, MPI_Datatype datatype, 
                        MPI_Request *request)
diff --git a/src/mpi/c/file_iwrite_shared.c b/src/mpi/c/file_iwrite_shared.c
index 69c3a29097..63d7da05a1 100644
--- a/src/mpi/c/file_iwrite_shared.c
+++ b/src/mpi/c/file_iwrite_shared.c
@@ -23,7 +23,6 @@
 static const char FUNC_NAME[] = "MPI_File_iwrite_shared";
 
 
-OMPI_EXPORT
 int MPI_File_iwrite_shared(MPI_File fh, void *buf, int count,
                            MPI_Datatype datatype, MPI_Request *request)
 {
diff --git a/src/mpi/c/file_open.c b/src/mpi/c/file_open.c
index 7106d711d2..44d9fa9215 100644
--- a/src/mpi/c/file_open.c
+++ b/src/mpi/c/file_open.c
@@ -22,7 +22,6 @@
 static const char FUNC_NAME[] = "MPI_File_open";
 
 
-OMPI_EXPORT
 int MPI_File_open(MPI_Comm comm, char *filename, int amode,
                   MPI_Info info, MPI_File *fh)
 {
diff --git a/src/mpi/c/file_preallocate.c b/src/mpi/c/file_preallocate.c
index 9e76cd4658..cfd80a82d1 100644
--- a/src/mpi/c/file_preallocate.c
+++ b/src/mpi/c/file_preallocate.c
@@ -21,7 +21,6 @@
 static const char FUNC_NAME[] = "MPI_File_preallocate";
 
 
-OMPI_EXPORT
 int MPI_File_preallocate(MPI_File fh, MPI_Offset size)
 {
     int rc;
diff --git a/src/mpi/c/file_read.c b/src/mpi/c/file_read.c
index 4167eef91b..07b6a23b14 100644
--- a/src/mpi/c/file_read.c
+++ b/src/mpi/c/file_read.c
@@ -22,7 +22,6 @@
 static const char FUNC_NAME[] = "MPI_File_read";
 
 
-OMPI_EXPORT
 int MPI_File_read(MPI_File fh, void *buf, int count, 
                   MPI_Datatype datatype, MPI_Status *status)
 {
diff --git a/src/mpi/c/file_read_all.c b/src/mpi/c/file_read_all.c
index b5638509c9..9394fa9530 100644
--- a/src/mpi/c/file_read_all.c
+++ b/src/mpi/c/file_read_all.c
@@ -22,7 +22,6 @@
 static const char FUNC_NAME[] = "MPI_File_read_all";
 
 
-OMPI_EXPORT
 int MPI_File_read_all(MPI_File fh, void *buf, int count, MPI_Datatype
                       datatype, MPI_Status *status)
 {
diff --git a/src/mpi/c/file_read_all_begin.c b/src/mpi/c/file_read_all_begin.c
index 7893950801..9204ddb18e 100644
--- a/src/mpi/c/file_read_all_begin.c
+++ b/src/mpi/c/file_read_all_begin.c
@@ -22,7 +22,6 @@
 static const char FUNC_NAME[] = "MPI_File_read_all_begin";
 
 
-OMPI_EXPORT
 int MPI_File_read_all_begin(MPI_File fh, void *buf, int count,
                             MPI_Datatype datatype) 
 {
diff --git a/src/mpi/c/file_read_all_end.c b/src/mpi/c/file_read_all_end.c
index a117352d2f..d96ddcb5a8 100644
--- a/src/mpi/c/file_read_all_end.c
+++ b/src/mpi/c/file_read_all_end.c
@@ -21,7 +21,6 @@
 static const char FUNC_NAME[] = "MPI_File_read_all_end";
 
 
-OMPI_EXPORT
 int MPI_File_read_all_end(MPI_File fh, void *buf, MPI_Status *status)
 {
     int rc;
diff --git a/src/mpi/c/file_read_at.c b/src/mpi/c/file_read_at.c
index 5b177ea263..34a731e94e 100644
--- a/src/mpi/c/file_read_at.c
+++ b/src/mpi/c/file_read_at.c
@@ -22,7 +22,6 @@
 static const char FUNC_NAME[] = "MPI_File_read_at";
 
 
-OMPI_EXPORT
 int MPI_File_read_at(MPI_File fh, MPI_Offset offset, void *buf,
                      int count, MPI_Datatype datatype, MPI_Status *status)
 {
diff --git a/src/mpi/c/file_read_at_all.c b/src/mpi/c/file_read_at_all.c
index be99bb7624..fa3ece84c6 100644
--- a/src/mpi/c/file_read_at_all.c
+++ b/src/mpi/c/file_read_at_all.c
@@ -22,7 +22,6 @@
 static const char FUNC_NAME[] = "MPI_File_read_at_all";
 
 
-OMPI_EXPORT
 int MPI_File_read_at_all(MPI_File fh, MPI_Offset offset, void *buf,
                          int count, MPI_Datatype datatype, 
                          MPI_Status *status)
diff --git a/src/mpi/c/file_read_at_all_begin.c b/src/mpi/c/file_read_at_all_begin.c
index 5724808ea0..9f05ce4bd4 100644
--- a/src/mpi/c/file_read_at_all_begin.c
+++ b/src/mpi/c/file_read_at_all_begin.c
@@ -22,7 +22,6 @@
 static const char FUNC_NAME[] = "MPI_File_read_at_all_begin";
 
 
-OMPI_EXPORT
 int MPI_File_read_at_all_begin(MPI_File fh, MPI_Offset offset, void *buf,
                                int count, MPI_Datatype datatype)
 {
diff --git a/src/mpi/c/file_read_at_all_end.c b/src/mpi/c/file_read_at_all_end.c
index 312500cc59..ffdd59e93a 100644
--- a/src/mpi/c/file_read_at_all_end.c
+++ b/src/mpi/c/file_read_at_all_end.c
@@ -21,7 +21,6 @@
 static const char FUNC_NAME[] = "MPI_File_read_at_all_end";
 
 
-OMPI_EXPORT
 int MPI_File_read_at_all_end(MPI_File fh, void *buf, MPI_Status *status)
 {
     int rc;
diff --git a/src/mpi/c/file_read_ordered.c b/src/mpi/c/file_read_ordered.c
index 1dfe14f5d8..f9e1ab1fbb 100644
--- a/src/mpi/c/file_read_ordered.c
+++ b/src/mpi/c/file_read_ordered.c
@@ -22,7 +22,6 @@
 static const char FUNC_NAME[] = "MPI_File_read_ordered";
 
 
-OMPI_EXPORT
 int MPI_File_read_ordered(MPI_File fh, void *buf, int count,
                           MPI_Datatype datatype, MPI_Status *status)
 {
diff --git a/src/mpi/c/file_read_ordered_begin.c b/src/mpi/c/file_read_ordered_begin.c
index 1301f4eb91..c6df49e0f1 100644
--- a/src/mpi/c/file_read_ordered_begin.c
+++ b/src/mpi/c/file_read_ordered_begin.c
@@ -22,7 +22,6 @@
 static const char FUNC_NAME[] = "MPI_File_read_ordered_begin";
 
 
-OMPI_EXPORT
 int MPI_File_read_ordered_begin(MPI_File fh, void *buf, int count,
                                 MPI_Datatype datatype)
 {
diff --git a/src/mpi/c/file_read_ordered_end.c b/src/mpi/c/file_read_ordered_end.c
index 82ed8de819..219e65034c 100644
--- a/src/mpi/c/file_read_ordered_end.c
+++ b/src/mpi/c/file_read_ordered_end.c
@@ -21,7 +21,6 @@
 static const char FUNC_NAME[] = "MPI_File_read_ordered_end";
 
 
-OMPI_EXPORT
 int MPI_File_read_ordered_end(MPI_File fh, void *buf, MPI_Status *status)
 {
     int rc;
diff --git a/src/mpi/c/file_read_shared.c b/src/mpi/c/file_read_shared.c
index fba64d16ec..15fd1b27d4 100644
--- a/src/mpi/c/file_read_shared.c
+++ b/src/mpi/c/file_read_shared.c
@@ -22,7 +22,6 @@
 static const char FUNC_NAME[] = "MPI_File_read_shared";
 
 
-OMPI_EXPORT
 int MPI_File_read_shared(MPI_File fh, void *buf, int count,
                          MPI_Datatype datatype, MPI_Status *status)
 {
diff --git a/src/mpi/c/file_seek.c b/src/mpi/c/file_seek.c
index 5e3fdce8df..bf3a4e3a01 100644
--- a/src/mpi/c/file_seek.c
+++ b/src/mpi/c/file_seek.c
@@ -21,7 +21,6 @@
 static const char FUNC_NAME[] = "MPI_File_seek";
 
 
-OMPI_EXPORT
 int MPI_File_seek(MPI_File fh, MPI_Offset offset, int whence) 
 {
     int rc;
diff --git a/src/mpi/c/file_seek_shared.c b/src/mpi/c/file_seek_shared.c
index 0adc558178..1abe33cd33 100644
--- a/src/mpi/c/file_seek_shared.c
+++ b/src/mpi/c/file_seek_shared.c
@@ -21,7 +21,6 @@
 static const char FUNC_NAME[] = "MPI_File_seek_shared";
 
 
-OMPI_EXPORT
 int MPI_File_seek_shared(MPI_File fh, MPI_Offset offset, int whence)
 {
     int rc;
diff --git a/src/mpi/c/file_set_atomicity.c b/src/mpi/c/file_set_atomicity.c
index 3e788629e4..c0d2d27d09 100644
--- a/src/mpi/c/file_set_atomicity.c
+++ b/src/mpi/c/file_set_atomicity.c
@@ -21,7 +21,6 @@
 static const char FUNC_NAME[] = "MPI_File_set_atomicity";
 
 
-OMPI_EXPORT
 int MPI_File_set_atomicity(MPI_File fh, int flag)
 {
     int rc;
diff --git a/src/mpi/c/file_set_errhandler.c b/src/mpi/c/file_set_errhandler.c
index 59863a507a..3742e07ae4 100644
--- a/src/mpi/c/file_set_errhandler.c
+++ b/src/mpi/c/file_set_errhandler.c
@@ -21,7 +21,6 @@
 static const char FUNC_NAME[] = "MPI_File_set_errhandler";
 
 
-OMPI_EXPORT
 int MPI_File_set_errhandler( MPI_File file, MPI_Errhandler errhandler) 
 {
     /* Error checking */
diff --git a/src/mpi/c/file_set_info.c b/src/mpi/c/file_set_info.c
index db4471288d..8a1860a23e 100644
--- a/src/mpi/c/file_set_info.c
+++ b/src/mpi/c/file_set_info.c
@@ -22,7 +22,6 @@
 static const char FUNC_NAME[] = "MPI_File_set_info";
 
 
-OMPI_EXPORT
 int MPI_File_set_info(MPI_File fh, MPI_Info info)
 {
     int rc;
diff --git a/src/mpi/c/file_set_size.c b/src/mpi/c/file_set_size.c
index bb7926829e..2ff4af098b 100644
--- a/src/mpi/c/file_set_size.c
+++ b/src/mpi/c/file_set_size.c
@@ -21,7 +21,6 @@
 static const char FUNC_NAME[] = "MPI_File_set_size";
 
 
-OMPI_EXPORT
 int MPI_File_set_size(MPI_File fh, MPI_Offset size)
 {
     int rc;
diff --git a/src/mpi/c/file_set_view.c b/src/mpi/c/file_set_view.c
index a3669dd20f..2f5b10d1d2 100644
--- a/src/mpi/c/file_set_view.c
+++ b/src/mpi/c/file_set_view.c
@@ -22,7 +22,6 @@
 static const char FUNC_NAME[] = "MPI_File_set_view";
 
 
-OMPI_EXPORT
 int MPI_File_set_view(MPI_File fh, MPI_Offset disp, MPI_Datatype etype,
                       MPI_Datatype filetype, char *datarep, MPI_Info info)
 {
diff --git a/src/mpi/c/file_sync.c b/src/mpi/c/file_sync.c
index 5b3f3ea9de..07622705c2 100644
--- a/src/mpi/c/file_sync.c
+++ b/src/mpi/c/file_sync.c
@@ -21,7 +21,6 @@
 static const char FUNC_NAME[] = "MPI_File_sync";
 
 
-OMPI_EXPORT
 int MPI_File_sync(MPI_File fh)
 {
     int rc;
diff --git a/src/mpi/c/file_write.c b/src/mpi/c/file_write.c
index 6693224a51..43d200102c 100644
--- a/src/mpi/c/file_write.c
+++ b/src/mpi/c/file_write.c
@@ -22,7 +22,6 @@
 static const char FUNC_NAME[] = "MPI_File_write";
 
 
-OMPI_EXPORT
 int MPI_File_write(MPI_File fh, void *buf, int count, 
                    MPI_Datatype datatype, MPI_Status *status)
 {
diff --git a/src/mpi/c/file_write_all.c b/src/mpi/c/file_write_all.c
index 6aa6cb999c..d2799514c3 100644
--- a/src/mpi/c/file_write_all.c
+++ b/src/mpi/c/file_write_all.c
@@ -22,7 +22,6 @@
 static const char FUNC_NAME[] = "MPI_File_write_all";
 
 
-OMPI_EXPORT
 int MPI_File_write_all(MPI_File fh, void *buf, int count, MPI_Datatype
                        datatype, MPI_Status *status)
 {
diff --git a/src/mpi/c/file_write_all_begin.c b/src/mpi/c/file_write_all_begin.c
index 84215996f7..c776411fe4 100644
--- a/src/mpi/c/file_write_all_begin.c
+++ b/src/mpi/c/file_write_all_begin.c
@@ -22,7 +22,6 @@
 static const char FUNC_NAME[] = "MPI_File_write_all_begin";
 
 
-OMPI_EXPORT
 int MPI_File_write_all_begin(MPI_File fh, void *buf, int count,
                              MPI_Datatype datatype)
 {
diff --git a/src/mpi/c/file_write_all_end.c b/src/mpi/c/file_write_all_end.c
index f7ee2917c7..db04dbaaca 100644
--- a/src/mpi/c/file_write_all_end.c
+++ b/src/mpi/c/file_write_all_end.c
@@ -21,7 +21,6 @@
 static const char FUNC_NAME[] = "MPI_File_write_all_end";
 
 
-OMPI_EXPORT
 int MPI_File_write_all_end(MPI_File fh, void *buf, MPI_Status *status)
 {
     int rc;
diff --git a/src/mpi/c/file_write_at.c b/src/mpi/c/file_write_at.c
index 099057142d..ce59e696c8 100644
--- a/src/mpi/c/file_write_at.c
+++ b/src/mpi/c/file_write_at.c
@@ -22,7 +22,6 @@
 static const char FUNC_NAME[] = "MPI_File_write_at";
 
 
-OMPI_EXPORT
 int MPI_File_write_at(MPI_File fh, MPI_Offset offset, void *buf,
                       int count, MPI_Datatype datatype, 
                       MPI_Status *status)
diff --git a/src/mpi/c/file_write_at_all.c b/src/mpi/c/file_write_at_all.c
index f1649d711f..f249e2d19e 100644
--- a/src/mpi/c/file_write_at_all.c
+++ b/src/mpi/c/file_write_at_all.c
@@ -22,7 +22,6 @@
 static const char FUNC_NAME[] = "MPI_File_write_at_all";
 
 
-OMPI_EXPORT
 int MPI_File_write_at_all(MPI_File fh, MPI_Offset offset, void *buf,
                           int count, MPI_Datatype datatype, 
                           MPI_Status *status)
diff --git a/src/mpi/c/file_write_at_all_begin.c b/src/mpi/c/file_write_at_all_begin.c
index 9145efce23..56bed4a82e 100644
--- a/src/mpi/c/file_write_at_all_begin.c
+++ b/src/mpi/c/file_write_at_all_begin.c
@@ -22,7 +22,6 @@
 static const char FUNC_NAME[] = "MPI_File_write_at_all_begin";
 
 
-OMPI_EXPORT
 int MPI_File_write_at_all_begin(MPI_File fh, MPI_Offset offset, void *buf,
                                 int count, MPI_Datatype datatype)
 {
diff --git a/src/mpi/c/file_write_at_all_end.c b/src/mpi/c/file_write_at_all_end.c
index 211ee8a41f..9d0e32a9b6 100644
--- a/src/mpi/c/file_write_at_all_end.c
+++ b/src/mpi/c/file_write_at_all_end.c
@@ -21,7 +21,6 @@
 static const char FUNC_NAME[] = "MPI_File_write_at_all_end";
 
 
-OMPI_EXPORT
 int MPI_File_write_at_all_end(MPI_File fh, void *buf, MPI_Status *status)
 {
     int rc;
diff --git a/src/mpi/c/file_write_ordered.c b/src/mpi/c/file_write_ordered.c
index 9ad3a79c74..2a54c758a3 100644
--- a/src/mpi/c/file_write_ordered.c
+++ b/src/mpi/c/file_write_ordered.c
@@ -22,7 +22,6 @@
 static const char FUNC_NAME[] = "MPI_File_write_ordered";
 
 
-OMPI_EXPORT
 int MPI_File_write_ordered(MPI_File fh, void *buf, int count,
                            MPI_Datatype datatype, MPI_Status *status)
 {
diff --git a/src/mpi/c/file_write_ordered_begin.c b/src/mpi/c/file_write_ordered_begin.c
index 1353ae04f9..9ab6e8a387 100644
--- a/src/mpi/c/file_write_ordered_begin.c
+++ b/src/mpi/c/file_write_ordered_begin.c
@@ -22,7 +22,6 @@
 static const char FUNC_NAME[] = "MPI_File_write_ordered_begin";
 
 
-OMPI_EXPORT
 int MPI_File_write_ordered_begin(MPI_File fh, void *buf, int count,
                                  MPI_Datatype datatype)
 {
diff --git a/src/mpi/c/file_write_ordered_end.c b/src/mpi/c/file_write_ordered_end.c
index 85841a1d73..7a28a3d083 100644
--- a/src/mpi/c/file_write_ordered_end.c
+++ b/src/mpi/c/file_write_ordered_end.c
@@ -21,7 +21,6 @@
 static const char FUNC_NAME[] = "MPI_File_write_ordered_end";
 
 
-OMPI_EXPORT
 int MPI_File_write_ordered_end(MPI_File fh, void *buf, MPI_Status *status)
 {
     int rc;
diff --git a/src/mpi/c/file_write_shared.c b/src/mpi/c/file_write_shared.c
index 8a88fb4548..28f3931242 100644
--- a/src/mpi/c/file_write_shared.c
+++ b/src/mpi/c/file_write_shared.c
@@ -22,7 +22,6 @@
 static const char FUNC_NAME[] = "MPI_File_write_shared";
 
 
-OMPI_EXPORT
 int MPI_File_write_shared(MPI_File fh, void *buf, int count,
                           MPI_Datatype datatype, MPI_Status *status)
 {
diff --git a/src/mpi/c/finalize.c b/src/mpi/c/finalize.c
index 5bb18174dc..b4db2c9f8d 100644
--- a/src/mpi/c/finalize.c
+++ b/src/mpi/c/finalize.c
@@ -20,7 +20,6 @@
 static const char FUNC_NAME[] = "MPI_Finalize";
 
 
-OMPI_EXPORT
 int MPI_Finalize(void)
 {
   if (MPI_PARAM_CHECK) {
diff --git a/src/mpi/c/finalized.c b/src/mpi/c/finalized.c
index 081678556f..b6d8d3f982 100644
--- a/src/mpi/c/finalized.c
+++ b/src/mpi/c/finalized.c
@@ -20,7 +20,6 @@
 static const char FUNC_NAME[] = "MPI_Finalized";
 
 
-OMPI_EXPORT
 int MPI_Finalized(int *flag) 
 {
     MPI_Comm null = NULL;
diff --git a/src/mpi/c/free_mem.c b/src/mpi/c/free_mem.c
index 71b63e468b..5c76a72b75 100644
--- a/src/mpi/c/free_mem.c
+++ b/src/mpi/c/free_mem.c
@@ -22,7 +22,6 @@
 static const char FUNC_NAME[] = "MPI_Free_mem";
 
 
-OMPI_EXPORT
 int MPI_Free_mem(void *baseptr)
 {
   if (NULL == baseptr) {
diff --git a/src/mpi/c/gather.c b/src/mpi/c/gather.c
index 798c6382fe..0bda1e0250 100644
--- a/src/mpi/c/gather.c
+++ b/src/mpi/c/gather.c
@@ -20,7 +20,6 @@
 static const char FUNC_NAME[] = "MPI_Gather";
 
 
-OMPI_EXPORT
 int MPI_Gather(void *sendbuf, int sendcount, MPI_Datatype sendtype,
                void *recvbuf, int recvcount, MPI_Datatype recvtype,
                int root, MPI_Comm comm) 
diff --git a/src/mpi/c/gatherv.c b/src/mpi/c/gatherv.c
index 362f66eb71..0db2a8a6fb 100644
--- a/src/mpi/c/gatherv.c
+++ b/src/mpi/c/gatherv.c
@@ -21,7 +21,6 @@
 static const char FUNC_NAME[] = "MPI_Gatherv";
 
 
-OMPI_EXPORT
 int MPI_Gatherv(void *sendbuf, int sendcount, MPI_Datatype sendtype,
                 void *recvbuf, int *recvcounts, int *displs,
                 MPI_Datatype recvtype, int root, MPI_Comm comm) 
diff --git a/src/mpi/c/get.c b/src/mpi/c/get.c
index 0b750948ed..37f5072950 100644
--- a/src/mpi/c/get.c
+++ b/src/mpi/c/get.c
@@ -20,7 +20,6 @@
 static const char FUNC_NAME[] = "MPI_Get";
 
 
-OMPI_EXPORT
 int MPI_Get(void *origin_addr, int origin_count,
             MPI_Datatype origin_datatype, int target_rank,
             MPI_Aint target_disp, int target_count,
diff --git a/src/mpi/c/get_address.c b/src/mpi/c/get_address.c
index a8222927cb..f160b9b8e3 100644
--- a/src/mpi/c/get_address.c
+++ b/src/mpi/c/get_address.c
@@ -19,7 +19,6 @@
 static const char FUNC_NAME[] = "MPI_Get_address";
 
 
-OMPI_EXPORT
 int MPI_Get_address(void *location, MPI_Aint *address)
 {
     if( MPI_PARAM_CHECK ) {
diff --git a/src/mpi/c/get_count.c b/src/mpi/c/get_count.c
index ca78e921ca..100e3709c8 100644
--- a/src/mpi/c/get_count.c
+++ b/src/mpi/c/get_count.c
@@ -20,7 +20,6 @@
 static const char FUNC_NAME[] = "MPI_Get_count";
 
 
-OMPI_EXPORT
 int MPI_Get_count(MPI_Status *status, MPI_Datatype datatype, int *count) 
 {
    int size;
diff --git a/src/mpi/c/get_elements.c b/src/mpi/c/get_elements.c
index 29361fb1ce..ca2de02d4b 100644
--- a/src/mpi/c/get_elements.c
+++ b/src/mpi/c/get_elements.c
@@ -20,7 +20,6 @@
 static const char FUNC_NAME[] = "MPI_Get_elements";
 
 
-OMPI_EXPORT
 int MPI_Get_elements(MPI_Status *status, MPI_Datatype datatype, int *count) 
 {
    int size, i;
diff --git a/src/mpi/c/get_processor_name.c b/src/mpi/c/get_processor_name.c
index 4f8c1fe7ae..0edaea500f 100644
--- a/src/mpi/c/get_processor_name.c
+++ b/src/mpi/c/get_processor_name.c
@@ -22,7 +22,6 @@
 static const char FUNC_NAME[] = "MPI_Get_processor_name";
 
 
-OMPI_EXPORT
 int MPI_Get_processor_name(char *name, int *resultlen) 
 {
     char tmp[MPI_MAX_PROCESSOR_NAME];
diff --git a/src/mpi/c/get_version.c b/src/mpi/c/get_version.c
index 8a457fa59f..f9fa4e90e6 100644
--- a/src/mpi/c/get_version.c
+++ b/src/mpi/c/get_version.c
@@ -20,7 +20,6 @@
 static const char FUNC_NAME[] = "MPI_Get_version";
 
 
-OMPI_EXPORT
 int MPI_Get_version(int *version, int *subversion) 
 {
   if (MPI_PARAM_CHECK) {
diff --git a/src/mpi/c/graph_create.c b/src/mpi/c/graph_create.c
index 28590a4b7e..34960ac3a0 100644
--- a/src/mpi/c/graph_create.c
+++ b/src/mpi/c/graph_create.c
@@ -21,7 +21,6 @@
 static const char FUNC_NAME[] = "MPI_Graph_create";
 
 
-OMPI_EXPORT
 int MPI_Graph_create(MPI_Comm old_comm, int nnodes, int *index,
                      int *edges, int reorder, MPI_Comm *comm_graph) 
 {
diff --git a/src/mpi/c/graph_get.c b/src/mpi/c/graph_get.c
index 643e8143dd..45dae397aa 100644
--- a/src/mpi/c/graph_get.c
+++ b/src/mpi/c/graph_get.c
@@ -21,7 +21,6 @@
 static const char FUNC_NAME[] = "MPI_Graph_get";
 
 
-OMPI_EXPORT
 int MPI_Graph_get(MPI_Comm comm, int maxindex, int maxedges,
                   int *index, int *edges) 
 {
diff --git a/src/mpi/c/graph_map.c b/src/mpi/c/graph_map.c
index a31d4545d8..7c1355894b 100644
--- a/src/mpi/c/graph_map.c
+++ b/src/mpi/c/graph_map.c
@@ -21,7 +21,6 @@
 static const char FUNC_NAME[] = "MPI_Graph_map";
 
 
-OMPI_EXPORT
 int MPI_Graph_map(MPI_Comm comm, int nnodes, int *index, int *edges,
                   int *newrank) 
 {
diff --git a/src/mpi/c/graph_neighbors.c b/src/mpi/c/graph_neighbors.c
index dba92a14f9..2f7482790b 100644
--- a/src/mpi/c/graph_neighbors.c
+++ b/src/mpi/c/graph_neighbors.c
@@ -21,7 +21,6 @@
 static const char FUNC_NAME[] = "MPI_Graph_neighbors";
 
 
-OMPI_EXPORT
 int MPI_Graph_neighbors(MPI_Comm comm, int rank, int maxneighbors,
                         int *neighbors) 
 {
diff --git a/src/mpi/c/graph_neighbors_count.c b/src/mpi/c/graph_neighbors_count.c
index 973b362961..0016c59a5a 100644
--- a/src/mpi/c/graph_neighbors_count.c
+++ b/src/mpi/c/graph_neighbors_count.c
@@ -21,7 +21,6 @@
 static const char FUNC_NAME[] = "MPI_Graph_neighbors_count";
 
 
-OMPI_EXPORT
 int MPI_Graph_neighbors_count(MPI_Comm comm, int rank, int *nneighbors) 
 {
     int err;
diff --git a/src/mpi/c/graphdims_get.c b/src/mpi/c/graphdims_get.c
index 39ef5bf470..647ba52ee6 100644
--- a/src/mpi/c/graphdims_get.c
+++ b/src/mpi/c/graphdims_get.c
@@ -21,7 +21,6 @@
 static const char FUNC_NAME[] = "MPI_Graphdims_get";
 
 
-OMPI_EXPORT
 int MPI_Graphdims_get(MPI_Comm comm, int *nnodes, int *nedges) 
 {
     int err;
diff --git a/src/mpi/c/grequest_complete.c b/src/mpi/c/grequest_complete.c
index ffd11eee94..2c62bdd5b1 100644
--- a/src/mpi/c/grequest_complete.c
+++ b/src/mpi/c/grequest_complete.c
@@ -20,7 +20,6 @@
 static const char FUNC_NAME[] = "MPI_Grequest_complete";
 
 
-OMPI_EXPORT
 int MPI_Grequest_complete(MPI_Request request) 
 {
   if (MPI_PARAM_CHECK) {
diff --git a/src/mpi/c/grequest_start.c b/src/mpi/c/grequest_start.c
index 384e9226d9..acc9e62a60 100644
--- a/src/mpi/c/grequest_start.c
+++ b/src/mpi/c/grequest_start.c
@@ -20,7 +20,6 @@
 static const char FUNC_NAME[] = "MPI_Grequest_start";
 
 
-OMPI_EXPORT
 int MPI_Grequest_start(MPI_Grequest_query_function *query_fn,
                        MPI_Grequest_free_function *free_fn,
                        MPI_Grequest_cancel_function *cancel_fn,
diff --git a/src/mpi/c/group_c2f.c b/src/mpi/c/group_c2f.c
index 06c08cf0f0..367e0945e0 100644
--- a/src/mpi/c/group_c2f.c
+++ b/src/mpi/c/group_c2f.c
@@ -21,7 +21,6 @@
 static const char FUNC_NAME[] = "MPI_Group_c2f";
 
 
-OMPI_EXPORT
 MPI_Fint MPI_Group_c2f(MPI_Group group) {
 
     /* local variables */
diff --git a/src/mpi/c/group_compare.c b/src/mpi/c/group_compare.c
index 6d74d44057..d8b5ec4713 100644
--- a/src/mpi/c/group_compare.c
+++ b/src/mpi/c/group_compare.c
@@ -21,7 +21,6 @@
 static const char FUNC_NAME[] = "MPI_Group_compare";
 
 
-OMPI_EXPORT
 int MPI_Group_compare(MPI_Group group1, MPI_Group group2, int *result) {
 
     /* local variables */
diff --git a/src/mpi/c/group_difference.c b/src/mpi/c/group_difference.c
index 6a2e7be1a6..dcecad3f6c 100644
--- a/src/mpi/c/group_difference.c
+++ b/src/mpi/c/group_difference.c
@@ -21,7 +21,6 @@
 static const char FUNC_NAME[] = "MPI_Group_difference";
 
 
-OMPI_EXPORT
 int MPI_Group_difference(MPI_Group group1, MPI_Group group2,
                          MPI_Group *new_group) {
 
diff --git a/src/mpi/c/group_excl.c b/src/mpi/c/group_excl.c
index be6dd56d60..605cc1aa2d 100644
--- a/src/mpi/c/group_excl.c
+++ b/src/mpi/c/group_excl.c
@@ -21,7 +21,6 @@
 static const char FUNC_NAME[] = "MPI_Group_excl";
 
 
-OMPI_EXPORT
 int MPI_Group_excl(MPI_Group group, int n, int *ranks,
                    MPI_Group *new_group) {
 
diff --git a/src/mpi/c/group_f2c.c b/src/mpi/c/group_f2c.c
index 80f5c6a2ff..91d8aacc6f 100644
--- a/src/mpi/c/group_f2c.c
+++ b/src/mpi/c/group_f2c.c
@@ -20,7 +20,6 @@
 static const char FUNC_NAME[] = "MPI_Group_f2c";
 
 
-OMPI_EXPORT
 MPI_Group MPI_Group_f2c(MPI_Fint group_f)
 {
     /* local variables */
diff --git a/src/mpi/c/group_free.c b/src/mpi/c/group_free.c
index 20d0ace9eb..6c88b5dd12 100644
--- a/src/mpi/c/group_free.c
+++ b/src/mpi/c/group_free.c
@@ -21,7 +21,6 @@
 static const char FUNC_NAME[] = "MPI_Group_free";
 
 
-OMPI_EXPORT
 int MPI_Group_free(MPI_Group *group)
 {
     ompi_group_t *l_group;
diff --git a/src/mpi/c/group_incl.c b/src/mpi/c/group_incl.c
index 79ba71abd8..3cf9d7defa 100644
--- a/src/mpi/c/group_incl.c
+++ b/src/mpi/c/group_incl.c
@@ -21,7 +21,6 @@
 static const char FUNC_NAME[] = "MPI_Group_incl";
 
 
-OMPI_EXPORT
 int MPI_Group_incl(MPI_Group group, int n, int *ranks, MPI_Group *new_group) 
 {
     /* local variables */
diff --git a/src/mpi/c/group_intersection.c b/src/mpi/c/group_intersection.c
index ba85cad15c..403587a63b 100644
--- a/src/mpi/c/group_intersection.c
+++ b/src/mpi/c/group_intersection.c
@@ -21,7 +21,6 @@
 static const char FUNC_NAME[] = "MPI_Group_intersection";
 
 
-OMPI_EXPORT
 int MPI_Group_intersection(MPI_Group group1, MPI_Group group2,
         MPI_Group *new_group) 
 {
diff --git a/src/mpi/c/group_range_excl.c b/src/mpi/c/group_range_excl.c
index b06f5c8c9a..3e7a67dfa8 100644
--- a/src/mpi/c/group_range_excl.c
+++ b/src/mpi/c/group_range_excl.c
@@ -21,7 +21,6 @@
 static const char FUNC_NAME[] = "MPI_Group_range_excl";
 
 
-OMPI_EXPORT
 int MPI_Group_range_excl(MPI_Group group, int n_triplets, int ranges[][3],
                          MPI_Group *new_group) 
 {
diff --git a/src/mpi/c/group_range_incl.c b/src/mpi/c/group_range_incl.c
index a000cb888b..3c235cea99 100644
--- a/src/mpi/c/group_range_incl.c
+++ b/src/mpi/c/group_range_incl.c
@@ -21,7 +21,6 @@
 static const char FUNC_NAME[] = "MPI_Group_range_incl";
 
 
-OMPI_EXPORT
 int MPI_Group_range_incl(MPI_Group group, int n_triplets, int ranges[][3],
                          MPI_Group *new_group) 
 {
diff --git a/src/mpi/c/group_rank.c b/src/mpi/c/group_rank.c
index 7538abb534..4cf75cea24 100644
--- a/src/mpi/c/group_rank.c
+++ b/src/mpi/c/group_rank.c
@@ -21,7 +21,6 @@
 static const char FUNC_NAME[] = "MPI_Group_rank";
 
 
-OMPI_EXPORT
 int MPI_Group_rank(MPI_Group group, int *rank) 
 {
     /* error checking */
diff --git a/src/mpi/c/group_size.c b/src/mpi/c/group_size.c
index a4b79cd2d0..d4fc7226a1 100644
--- a/src/mpi/c/group_size.c
+++ b/src/mpi/c/group_size.c
@@ -21,7 +21,6 @@
 static const char FUNC_NAME[] = "MPI_Group_size";
 
 
-OMPI_EXPORT
 int MPI_Group_size(MPI_Group group, int *size) 
 {
     /* error checking */
diff --git a/src/mpi/c/group_translate_ranks.c b/src/mpi/c/group_translate_ranks.c
index 3e67a4d46e..5116d6467f 100644
--- a/src/mpi/c/group_translate_ranks.c
+++ b/src/mpi/c/group_translate_ranks.c
@@ -21,7 +21,6 @@
 static const char FUNC_NAME[] = "MPI_Group_translate_ranks";
 
 
-OMPI_EXPORT
 int MPI_Group_translate_ranks(MPI_Group group1, int n_ranks, int *ranks1,
                               MPI_Group group2, int *ranks2) 
 {
diff --git a/src/mpi/c/group_union.c b/src/mpi/c/group_union.c
index bb6eb68068..d14d986fba 100644
--- a/src/mpi/c/group_union.c
+++ b/src/mpi/c/group_union.c
@@ -21,7 +21,6 @@
 static const char FUNC_NAME[] = "MPI_Group_union";
 
 
-OMPI_EXPORT
 int MPI_Group_union(MPI_Group group1, MPI_Group group2, MPI_Group *new_group) 
 {
     /* local variables */
diff --git a/src/mpi/c/ibsend.c b/src/mpi/c/ibsend.c
index d5896d0492..d628346977 100644
--- a/src/mpi/c/ibsend.c
+++ b/src/mpi/c/ibsend.c
@@ -21,7 +21,6 @@
 static const char FUNC_NAME[] = "MPI_Ibsend";
 
 
-OMPI_EXPORT
 int MPI_Ibsend(void *buf, int count, MPI_Datatype type, int dest,
 		       int tag, MPI_Comm comm, MPI_Request *request) 
 {
diff --git a/src/mpi/c/info_c2f.c b/src/mpi/c/info_c2f.c
index fb6064a371..0a36d4b0ba 100644
--- a/src/mpi/c/info_c2f.c
+++ b/src/mpi/c/info_c2f.c
@@ -31,7 +31,6 @@ static const char FUNC_NAME[] = "MPI_Info_c2f";
  * If info is a valid C handle, the MPI_Info_c2f returns a valid 
  * fortran handle to the same MPI_INFO object.
  */
-OMPI_EXPORT
 MPI_Fint MPI_Info_c2f(MPI_Info info) 
 {
     /* check the arguments */
diff --git a/src/mpi/c/info_create.c b/src/mpi/c/info_create.c
index 8324e78e3d..24c85714ca 100644
--- a/src/mpi/c/info_create.c
+++ b/src/mpi/c/info_create.c
@@ -33,7 +33,6 @@ static const char FUNC_NAME[] = "MPI_Info_create";
  * When an MPI_Info object is not being used, it should be freed using
  * MPI_Info_free
  */
-OMPI_EXPORT
 int MPI_Info_create(MPI_Info *info) 
 {
     if (MPI_PARAM_CHECK) {
diff --git a/src/mpi/c/info_delete.c b/src/mpi/c/info_delete.c
index 9f90ac4f98..665c226f7b 100644
--- a/src/mpi/c/info_delete.c
+++ b/src/mpi/c/info_delete.c
@@ -35,7 +35,6 @@ static const char FUNC_NAME[] = "MPI_Info_delete";
  * @retval MPI_ERR_INFO
  * @retval MPI_ERR_INFO_KEYY
  */
-OMPI_EXPORT
 int MPI_Info_delete(MPI_Info info, char *key) {
     int key_length;
     int err;
diff --git a/src/mpi/c/info_dup.c b/src/mpi/c/info_dup.c
index 4e7d271b76..12222a23b1 100644
--- a/src/mpi/c/info_dup.c
+++ b/src/mpi/c/info_dup.c
@@ -37,7 +37,6 @@ static const char FUNC_NAME[] = "MPI_Info_dup";
  *   When an info object is no longer being used, it should be freed with
  *   'MPI_Info_free'.
  */
-OMPI_EXPORT
 int MPI_Info_dup(MPI_Info info, MPI_Info *newinfo) {
     int err;
     /**
diff --git a/src/mpi/c/info_f2c.c b/src/mpi/c/info_f2c.c
index d120dd9f7f..5e31d8d23e 100644
--- a/src/mpi/c/info_f2c.c
+++ b/src/mpi/c/info_f2c.c
@@ -28,7 +28,6 @@ static const char FUNC_NAME[] = "MPI_Info_f2c";
  * @param info Integer handle to an MPI_INFO object
  * @retval C handle corresponding to MPI_INFO object
  */
-OMPI_EXPORT
 MPI_Info MPI_Info_f2c(MPI_Fint info) 
 {
     size_t info_index = (size_t) info;
diff --git a/src/mpi/c/info_free.c b/src/mpi/c/info_free.c
index 6b0328f53a..79889eb000 100644
--- a/src/mpi/c/info_free.c
+++ b/src/mpi/c/info_free.c
@@ -32,7 +32,6 @@ static const char FUNC_NAME[] = "MPI_Info_free";
  *
  *   Upon successful completion, 'info' will be set to 'MPI_INFO_NULL'.
  */
-OMPI_EXPORT
 int MPI_Info_free(MPI_Info *info) 
 {
     int err;
diff --git a/src/mpi/c/info_get.c b/src/mpi/c/info_get.c
index 09f2560fe4..2aab8625bb 100644
--- a/src/mpi/c/info_get.c
+++ b/src/mpi/c/info_get.c
@@ -43,7 +43,6 @@ static const char FUNC_NAME[] = "MPI_Info_get";
  *   In C and C++, 'valuelen' should be one less than the allocated space
  *   to allow for for the null terminator.
  */
-OMPI_EXPORT
 int MPI_Info_get(MPI_Info info, char *key, int valuelen,
                  char *value, int *flag) 
 {
diff --git a/src/mpi/c/info_get_nkeys.c b/src/mpi/c/info_get_nkeys.c
index e66a1ffaf7..0f59f44046 100644
--- a/src/mpi/c/info_get_nkeys.c
+++ b/src/mpi/c/info_get_nkeys.c
@@ -36,7 +36,6 @@ static const char FUNC_NAME[] = "MPI_Info_get_nkeys";
  * This function returns the number of elements in the list 
  * containing the key-value pairs
  */
-OMPI_EXPORT
 int MPI_Info_get_nkeys(MPI_Info info, int *nkeys) 
 {
     int err;
diff --git a/src/mpi/c/info_get_nthkey.c b/src/mpi/c/info_get_nthkey.c
index 0bd4037891..dade04f386 100644
--- a/src/mpi/c/info_get_nthkey.c
+++ b/src/mpi/c/info_get_nthkey.c
@@ -35,7 +35,6 @@ static const char FUNC_NAME[] = "MPI_Info_get_nthkey";
  *   @retval MPI_ERR_INFO
  *   @retval MPI_ERR_INFO_KEY
  */
-OMPI_EXPORT
 int MPI_Info_get_nthkey(MPI_Info info, int n, char *key) 
 {
     int nkeys;
diff --git a/src/mpi/c/info_get_valuelen.c b/src/mpi/c/info_get_valuelen.c
index 470987e839..6dd913952e 100644
--- a/src/mpi/c/info_get_valuelen.c
+++ b/src/mpi/c/info_get_valuelen.c
@@ -42,7 +42,6 @@ static const char FUNC_NAME[] = "MPI_Info_get_valuelen";
  *   character.  If the 'key' is not found on 'info', 'valuelen' is left 
  *   alone.
  */
-OMPI_EXPORT
 int MPI_Info_get_valuelen(MPI_Info info, char *key, int *valuelen,
                           int *flag) 
 {
diff --git a/src/mpi/c/info_set.c b/src/mpi/c/info_set.c
index cc6fa9296a..90d51f7bab 100644
--- a/src/mpi/c/info_set.c
+++ b/src/mpi/c/info_set.c
@@ -45,7 +45,6 @@ static const char FUNC_NAME[] = "MPI_Info_set";
  *   key or value is greater than the allowed maxima, MPI_ERR_INFO_KEY
  *   and MPI_ERR_INFO_VALUE are raised
  */
-OMPI_EXPORT
 int MPI_Info_set(MPI_Info info, char *key, char *value) 
 {
     int err;
diff --git a/src/mpi/c/init.c b/src/mpi/c/init.c
index 5d6d979a92..06ee220079 100644
--- a/src/mpi/c/init.c
+++ b/src/mpi/c/init.c
@@ -23,7 +23,6 @@
 static const char FUNC_NAME[] = "MPI_Init";
 
 
-OMPI_EXPORT
 int MPI_Init(int *argc, char ***argv)
 {
   int err;
diff --git a/src/mpi/c/init_thread.c b/src/mpi/c/init_thread.c
index 5c2d1c8926..f83b72706c 100644
--- a/src/mpi/c/init_thread.c
+++ b/src/mpi/c/init_thread.c
@@ -21,7 +21,6 @@
 static const char FUNC_NAME[] = "MPI_Init_thread";
 
 
-OMPI_EXPORT
 int MPI_Init_thread(int *argc, char ***argv, int required,
                     int *provided) 
 {
diff --git a/src/mpi/c/initialized.c b/src/mpi/c/initialized.c
index a8ed0824e6..3ffde4baff 100644
--- a/src/mpi/c/initialized.c
+++ b/src/mpi/c/initialized.c
@@ -20,7 +20,6 @@
 static const char FUNC_NAME[] = "MPI_Initialized";
 
 
-OMPI_EXPORT
 int MPI_Initialized(int *flag) 
 {
     MPI_Comm null = NULL;
diff --git a/src/mpi/c/intercomm_create.c b/src/mpi/c/intercomm_create.c
index b5ee1845fe..eb285448fd 100644
--- a/src/mpi/c/intercomm_create.c
+++ b/src/mpi/c/intercomm_create.c
@@ -21,7 +21,6 @@
 static const char FUNC_NAME[] = "MPI_Intercomm_create";
 
 
-OMPI_EXPORT
 int MPI_Intercomm_create(MPI_Comm local_comm, int local_leader,
                          MPI_Comm bridge_comm, int remote_leader,
                          int tag, MPI_Comm *newintercomm) 
diff --git a/src/mpi/c/intercomm_merge.c b/src/mpi/c/intercomm_merge.c
index 29fa4ab6bd..7bf2c75138 100644
--- a/src/mpi/c/intercomm_merge.c
+++ b/src/mpi/c/intercomm_merge.c
@@ -21,7 +21,6 @@
 static const char FUNC_NAME[] = "MPI_Intercomm_merge";
 
 
-OMPI_EXPORT
 int MPI_Intercomm_merge(MPI_Comm intercomm, int high,
                         MPI_Comm *newcomm) 
 {
diff --git a/src/mpi/c/iprobe.c b/src/mpi/c/iprobe.c
index d0d0a08c38..4ae189197f 100644
--- a/src/mpi/c/iprobe.c
+++ b/src/mpi/c/iprobe.c
@@ -20,7 +20,6 @@
 static const char FUNC_NAME[] = "MPI_Iprobe";
 
 
-OMPI_EXPORT
 int MPI_Iprobe(int source, int tag, MPI_Comm comm, int *flag, MPI_Status *status) 
 {
     int rc;
diff --git a/src/mpi/c/irecv.c b/src/mpi/c/irecv.c
index 32c8863f94..1a2a0f86b4 100644
--- a/src/mpi/c/irecv.c
+++ b/src/mpi/c/irecv.c
@@ -20,7 +20,6 @@
 static const char FUNC_NAME[] = "MPI_Irecv";
 
 
-OMPI_EXPORT
 int MPI_Irecv(void *buf, int count, MPI_Datatype type, int source,
               int tag, MPI_Comm comm, MPI_Request *request) 
 {
diff --git a/src/mpi/c/irsend.c b/src/mpi/c/irsend.c
index d8827aa99c..f30f738855 100644
--- a/src/mpi/c/irsend.c
+++ b/src/mpi/c/irsend.c
@@ -20,7 +20,6 @@
 static const char FUNC_NAME[] = "MPI_Irsend";
 
 
-OMPI_EXPORT
 int MPI_Irsend(void *buf, int count, MPI_Datatype type, int dest,
                int tag, MPI_Comm comm, MPI_Request *request) 
 {
diff --git a/src/mpi/c/is_thread_main.c b/src/mpi/c/is_thread_main.c
index 22835bd974..7841f846d4 100644
--- a/src/mpi/c/is_thread_main.c
+++ b/src/mpi/c/is_thread_main.c
@@ -20,7 +20,6 @@
 static const char FUNC_NAME[] = "MPI_Is_thread_main";
 
 
-OMPI_EXPORT
 int MPI_Is_thread_main(int *flag) 
 {
   if (MPI_PARAM_CHECK) {
diff --git a/src/mpi/c/isend.c b/src/mpi/c/isend.c
index 31218d4550..bcfa88098f 100644
--- a/src/mpi/c/isend.c
+++ b/src/mpi/c/isend.c
@@ -20,7 +20,6 @@
 static const char FUNC_NAME[] = "MPI_Isend";
 
 
-OMPI_EXPORT
 int MPI_Isend(void *buf, int count, MPI_Datatype type, int dest,
                int tag, MPI_Comm comm, MPI_Request *request) 
 {
diff --git a/src/mpi/c/issend.c b/src/mpi/c/issend.c
index 59d2f606df..c72a07660b 100644
--- a/src/mpi/c/issend.c
+++ b/src/mpi/c/issend.c
@@ -21,7 +21,6 @@
 static const char FUNC_NAME[] = "MPI_Issend";
 
 
-OMPI_EXPORT
 int MPI_Issend(void *buf, int count, MPI_Datatype type, int dest,
                int tag, MPI_Comm comm, MPI_Request *request) 
 {
diff --git a/src/mpi/c/keyval_create.c b/src/mpi/c/keyval_create.c
index 6a0d0228e8..56056e29df 100644
--- a/src/mpi/c/keyval_create.c
+++ b/src/mpi/c/keyval_create.c
@@ -19,7 +19,6 @@
 static const char FUNC_NAME[] = "MPI_Keyval_create";
 
 
-OMPI_EXPORT
 int MPI_Keyval_create(MPI_Copy_function *copy_attr_fn,
                       MPI_Delete_function *delete_attr_fn,
                       int *keyval, void *extra_state) 
diff --git a/src/mpi/c/keyval_free.c b/src/mpi/c/keyval_free.c
index 54379f4a7d..90c017f45c 100644
--- a/src/mpi/c/keyval_free.c
+++ b/src/mpi/c/keyval_free.c
@@ -19,7 +19,6 @@
 static const char FUNC_NAME[] = "MPI_Keyval_free";
 
 
-OMPI_EXPORT
 int MPI_Keyval_free(int *keyval) 
 {
     int ret;
diff --git a/src/mpi/c/lookup_name.c b/src/mpi/c/lookup_name.c
index 1ffdb5ed86..ae76ebaf39 100644
--- a/src/mpi/c/lookup_name.c
+++ b/src/mpi/c/lookup_name.c
@@ -20,7 +20,6 @@
 static const char FUNC_NAME[] = "MPI_Lookup_name";
 
 
-OMPI_EXPORT
 int MPI_Lookup_name(char *service_name, MPI_Info info, char *port_name) 
 {
     char *tmp;
diff --git a/src/mpi/c/op_c2f.c b/src/mpi/c/op_c2f.c
index 645b047a3b..d2c37c1754 100644
--- a/src/mpi/c/op_c2f.c
+++ b/src/mpi/c/op_c2f.c
@@ -21,7 +21,6 @@
 static const char FUNC_NAME[] = "MPI_Op_c2f";
 
 
-OMPI_EXPORT
 MPI_Fint MPI_Op_c2f(MPI_Op op) 
 {
   /* Error checking */
diff --git a/src/mpi/c/op_create.c b/src/mpi/c/op_create.c
index de98668177..6df02cb900 100644
--- a/src/mpi/c/op_create.c
+++ b/src/mpi/c/op_create.c
@@ -21,7 +21,6 @@
 static const char FUNC_NAME[] = "MPI_Op_create";
 
 
-OMPI_EXPORT
 int MPI_Op_create(MPI_User_function *function, int commute,
                   MPI_Op *op) 
 {
diff --git a/src/mpi/c/op_f2c.c b/src/mpi/c/op_f2c.c
index d02ff21ec0..6bd61ad533 100644
--- a/src/mpi/c/op_f2c.c
+++ b/src/mpi/c/op_f2c.c
@@ -21,7 +21,6 @@
 static const char FUNC_NAME[] = "MPI_Op_f2c";
 
 
-OMPI_EXPORT
 MPI_Op MPI_Op_f2c(MPI_Fint op_f)
 {
     size_t op_index = (size_t) op_f;
diff --git a/src/mpi/c/op_free.c b/src/mpi/c/op_free.c
index d8406e4807..5718291f71 100644
--- a/src/mpi/c/op_free.c
+++ b/src/mpi/c/op_free.c
@@ -21,7 +21,6 @@
 static const char FUNC_NAME[] = "MPI_Op_free";
 
 
-OMPI_EXPORT
 int MPI_Op_free(MPI_Op *op) 
 {
   /* Error checking */
diff --git a/src/mpi/c/open_port.c b/src/mpi/c/open_port.c
index 17ed6e5c62..50c2ca97a6 100644
--- a/src/mpi/c/open_port.c
+++ b/src/mpi/c/open_port.c
@@ -22,7 +22,6 @@
 static const char FUNC_NAME[] = "MPI_Open_port";
 
 
-OMPI_EXPORT
 int MPI_Open_port(MPI_Info info, char *port_name) 
 {
     int rc;
diff --git a/src/mpi/c/pack.c b/src/mpi/c/pack.c
index d538c7c110..577dc1a69a 100644
--- a/src/mpi/c/pack.c
+++ b/src/mpi/c/pack.c
@@ -24,7 +24,6 @@
 static const char FUNC_NAME[] = "MPI_Pack";
 
 
-OMPI_EXPORT
 int MPI_Pack(void *inbuf, int incount, MPI_Datatype datatype,
              void *outbuf, int outsize, int *position, MPI_Comm comm)
 {
diff --git a/src/mpi/c/pack_external.c b/src/mpi/c/pack_external.c
index 6bd3af9309..206cbcc9f0 100644
--- a/src/mpi/c/pack_external.c
+++ b/src/mpi/c/pack_external.c
@@ -20,7 +20,6 @@
 static const char FUNC_NAME[] = "MPI_Pack_external";
 
 
-OMPI_EXPORT
 int MPI_Pack_external(char *datarep, void *inbuf, int incount,
                       MPI_Datatype datatype, void *outbuf,
                       MPI_Aint outsize, MPI_Aint *position) 
diff --git a/src/mpi/c/pack_external_size.c b/src/mpi/c/pack_external_size.c
index fbac447901..20c2da965d 100644
--- a/src/mpi/c/pack_external_size.c
+++ b/src/mpi/c/pack_external_size.c
@@ -20,7 +20,6 @@
 static const char FUNC_NAME[] = "MPI_Pack_external_size";
 
 
-OMPI_EXPORT
 int MPI_Pack_external_size(char *datarep, int incount,
                            MPI_Datatype datatype, MPI_Aint *size) 
 {
diff --git a/src/mpi/c/pack_size.c b/src/mpi/c/pack_size.c
index 728bb0f10a..98253cab9b 100644
--- a/src/mpi/c/pack_size.c
+++ b/src/mpi/c/pack_size.c
@@ -21,7 +21,6 @@
 
 static const char FUNC_NAME[] = "MPI_Pack_size";
 
-OMPI_EXPORT
 int MPI_Pack_size(int incount, MPI_Datatype datatype, MPI_Comm comm,
                   int *size) 
 {
diff --git a/src/mpi/c/pcontrol.c b/src/mpi/c/pcontrol.c
index 1d47d4177c..45b49ee849 100644
--- a/src/mpi/c/pcontrol.c
+++ b/src/mpi/c/pcontrol.c
@@ -20,7 +20,6 @@
 static const char FUNC_NAME[] = "MPI_Pcontrol";
 
 
-OMPI_EXPORT
 int MPI_Pcontrol(const int level, ...) 
 {
   if (MPI_PARAM_CHECK) {
diff --git a/src/mpi/c/probe.c b/src/mpi/c/probe.c
index e8273e4e33..da4be8f618 100644
--- a/src/mpi/c/probe.c
+++ b/src/mpi/c/probe.c
@@ -19,7 +19,6 @@
 static const char FUNC_NAME[] = "MPI_Probe";
 
 
-OMPI_EXPORT
 int MPI_Probe(int source, int tag, MPI_Comm comm, MPI_Status *status) 
 {
     int rc;
diff --git a/src/mpi/c/publish_name.c b/src/mpi/c/publish_name.c
index db11c71ad6..ea832b691c 100644
--- a/src/mpi/c/publish_name.c
+++ b/src/mpi/c/publish_name.c
@@ -20,7 +20,6 @@
 static const char FUNC_NAME[] = "MPI_Publish_name";
 
 
-OMPI_EXPORT
 int MPI_Publish_name(char *service_name, MPI_Info info,
                      char *port_name) 
 {
diff --git a/src/mpi/c/put.c b/src/mpi/c/put.c
index b039a65c9c..fbaf31e93a 100644
--- a/src/mpi/c/put.c
+++ b/src/mpi/c/put.c
@@ -20,7 +20,6 @@
 static const char FUNC_NAME[] = "MPI_Put";
 
 
-OMPI_EXPORT
 int MPI_Put(void *origin_addr, int origin_count, MPI_Datatype origin_datatype,
             int target_rank, MPI_Aint target_disp, int target_count,
             MPI_Datatype target_datatype, MPI_Win win) 
diff --git a/src/mpi/c/query_thread.c b/src/mpi/c/query_thread.c
index 2a7ef59707..9603202e2b 100644
--- a/src/mpi/c/query_thread.c
+++ b/src/mpi/c/query_thread.c
@@ -20,7 +20,6 @@
 static const char FUNC_NAME[] = "MPI_Query_thread";
 
 
-OMPI_EXPORT
 int MPI_Query_thread(int *provided) 
 {
   if (MPI_PARAM_CHECK) {
diff --git a/src/mpi/c/recv.c b/src/mpi/c/recv.c
index 28ca43e863..caf24040c5 100644
--- a/src/mpi/c/recv.c
+++ b/src/mpi/c/recv.c
@@ -20,7 +20,6 @@
 static const char FUNC_NAME[] = "MPI_Recv";
 
 
-OMPI_EXPORT
 int MPI_Recv(void *buf, int count, MPI_Datatype type, int source,
              int tag, MPI_Comm comm, MPI_Status *status) 
 {
diff --git a/src/mpi/c/recv_init.c b/src/mpi/c/recv_init.c
index 181f5c3ea7..19e66ee30d 100644
--- a/src/mpi/c/recv_init.c
+++ b/src/mpi/c/recv_init.c
@@ -20,7 +20,6 @@
 static const char FUNC_NAME[] = "MPI_Recv_init";
 
 
-OMPI_EXPORT
 int MPI_Recv_init(void *buf, int count, MPI_Datatype type, int source,
                   int tag, MPI_Comm comm, MPI_Request *request) 
 {
diff --git a/src/mpi/c/reduce.c b/src/mpi/c/reduce.c
index 3fd2b971d5..aae86ebfec 100644
--- a/src/mpi/c/reduce.c
+++ b/src/mpi/c/reduce.c
@@ -22,7 +22,6 @@
 static const char FUNC_NAME[] = "MPI_Reduce";
 
 
-OMPI_EXPORT
 int MPI_Reduce(void *sendbuf, void *recvbuf, int count,
                MPI_Datatype datatype, MPI_Op op, int root, MPI_Comm comm) 
 {
diff --git a/src/mpi/c/reduce_scatter.c b/src/mpi/c/reduce_scatter.c
index 6d4f391216..ef124a4013 100644
--- a/src/mpi/c/reduce_scatter.c
+++ b/src/mpi/c/reduce_scatter.c
@@ -22,7 +22,6 @@
 static const char FUNC_NAME[] = "MPI_Reduce_scatter";
 
 
-OMPI_EXPORT
 int MPI_Reduce_scatter(void *sendbuf, void *recvbuf, int *recvcounts,
                        MPI_Datatype datatype, MPI_Op op, MPI_Comm comm) 
 {
diff --git a/src/mpi/c/register_datarep.c b/src/mpi/c/register_datarep.c
index 43a9367a57..ef7a38bf63 100644
--- a/src/mpi/c/register_datarep.c
+++ b/src/mpi/c/register_datarep.c
@@ -20,7 +20,6 @@
 static const char FUNC_NAME[] = "MPI_Register_datarep";
 
 
-OMPI_EXPORT
 int MPI_Register_datarep(char *datarep,
                        MPI_Datarep_conversion_function *read_conversion_fn,
                        MPI_Datarep_conversion_function *write_conversion_fn,
diff --git a/src/mpi/c/request_c2f.c b/src/mpi/c/request_c2f.c
index befba12575..115bdd1bce 100644
--- a/src/mpi/c/request_c2f.c
+++ b/src/mpi/c/request_c2f.c
@@ -21,7 +21,6 @@
 static const char FUNC_NAME[] = "MPI_Request_f2c";
 
 
-OMPI_EXPORT
 MPI_Fint MPI_Request_c2f(MPI_Request request) 
 {
     /* local variables */
diff --git a/src/mpi/c/request_f2c.c b/src/mpi/c/request_f2c.c
index 5e7385a0af..718b21583f 100644
--- a/src/mpi/c/request_f2c.c
+++ b/src/mpi/c/request_f2c.c
@@ -21,7 +21,6 @@
 static const char FUNC_NAME[] = "MPI_Request_f2c";
 
 
-OMPI_EXPORT
 MPI_Request MPI_Request_f2c(MPI_Fint request) 
 {
     size_t request_index;
diff --git a/src/mpi/c/request_free.c b/src/mpi/c/request_free.c
index fe5ee00cdb..74b31599e2 100644
--- a/src/mpi/c/request_free.c
+++ b/src/mpi/c/request_free.c
@@ -20,7 +20,6 @@
 static const char FUNC_NAME[] = "MPI_Request_free";
 
 
-OMPI_EXPORT
 int MPI_Request_free(MPI_Request *request) 
 {
     int rc;
diff --git a/src/mpi/c/request_get_status.c b/src/mpi/c/request_get_status.c
index 498ec4d335..c48c89e479 100644
--- a/src/mpi/c/request_get_status.c
+++ b/src/mpi/c/request_get_status.c
@@ -20,7 +20,6 @@
 static const char FUNC_NAME[] = "MPI_Request_get_status";
 
 
-OMPI_EXPORT
 int MPI_Request_get_status(MPI_Request request, int *flag,
                            MPI_Status *status) 
 {
diff --git a/src/mpi/c/rsend.c b/src/mpi/c/rsend.c
index 23b18edbc3..361fda8562 100644
--- a/src/mpi/c/rsend.c
+++ b/src/mpi/c/rsend.c
@@ -20,7 +20,6 @@
 static const char FUNC_NAME[] = "MPI_Rsend";
 
 
-OMPI_EXPORT
 int MPI_Rsend(void *buf, int count, MPI_Datatype type, int dest, int tag, MPI_Comm comm) 
 {
     int rc;
diff --git a/src/mpi/c/rsend_init.c b/src/mpi/c/rsend_init.c
index 9d528e9361..87735aab2f 100644
--- a/src/mpi/c/rsend_init.c
+++ b/src/mpi/c/rsend_init.c
@@ -20,7 +20,6 @@
 static const char FUNC_NAME[] = "MPI_Rsend_init";
 
 
-OMPI_EXPORT
 int MPI_Rsend_init(void *buf, int count, MPI_Datatype type,
                    int dest, int tag, MPI_Comm comm,
                    MPI_Request *request) 
diff --git a/src/mpi/c/scan.c b/src/mpi/c/scan.c
index c80119e77b..d1fe73361c 100644
--- a/src/mpi/c/scan.c
+++ b/src/mpi/c/scan.c
@@ -22,7 +22,6 @@
 static const char FUNC_NAME[] = "MPI_Scan";
 
 
-OMPI_EXPORT
 int MPI_Scan(void *sendbuf, void *recvbuf, int count,
              MPI_Datatype datatype, MPI_Op op, MPI_Comm comm) 
 {
diff --git a/src/mpi/c/scatter.c b/src/mpi/c/scatter.c
index 2be34c8fd9..c5f69a9f2d 100644
--- a/src/mpi/c/scatter.c
+++ b/src/mpi/c/scatter.c
@@ -21,7 +21,6 @@
 static const char FUNC_NAME[] = "MPI_Scatter";
 
 
-OMPI_EXPORT
 int MPI_Scatter(void *sendbuf, int sendcount, MPI_Datatype sendtype,
                 void *recvbuf, int recvcount, MPI_Datatype recvtype,
                 int root, MPI_Comm comm) 
diff --git a/src/mpi/c/scatterv.c b/src/mpi/c/scatterv.c
index d4e83e369a..dad40dbe2a 100644
--- a/src/mpi/c/scatterv.c
+++ b/src/mpi/c/scatterv.c
@@ -21,7 +21,6 @@
 static const char FUNC_NAME[] = "MPI_Scatterv";
 
 
-OMPI_EXPORT
 int MPI_Scatterv(void *sendbuf, int *sendcounts, int *displs,
                  MPI_Datatype sendtype, void *recvbuf, int recvcount,
                  MPI_Datatype recvtype, int root, MPI_Comm comm) 
diff --git a/src/mpi/c/send.c b/src/mpi/c/send.c
index 1f0806b6e1..cd26dc902a 100644
--- a/src/mpi/c/send.c
+++ b/src/mpi/c/send.c
@@ -20,7 +20,6 @@
 static const char FUNC_NAME[] = "MPI_Send";
 
 
-OMPI_EXPORT
 int MPI_Send(void *buf, int count, MPI_Datatype type, int dest,
              int tag, MPI_Comm comm) 
 {
diff --git a/src/mpi/c/send_init.c b/src/mpi/c/send_init.c
index 39c25d818c..a45b9375d5 100644
--- a/src/mpi/c/send_init.c
+++ b/src/mpi/c/send_init.c
@@ -20,7 +20,6 @@
 static const char FUNC_NAME[] = "MPI_Send_init";
 
 
-OMPI_EXPORT
 int MPI_Send_init(void *buf, int count, MPI_Datatype type,
                   int dest, int tag, MPI_Comm comm,
                   MPI_Request *request) 
diff --git a/src/mpi/c/sendrecv.c b/src/mpi/c/sendrecv.c
index 1b64105e53..4a49e2e930 100644
--- a/src/mpi/c/sendrecv.c
+++ b/src/mpi/c/sendrecv.c
@@ -20,7 +20,6 @@
 static const char FUNC_NAME[] = "MPI_Sendrecv";
 
 
-OMPI_EXPORT
 int MPI_Sendrecv(void *sendbuf, int sendcount, MPI_Datatype recvtype,
                  int dest, int sendtag, void *recvbuf, int recvcount,
                  MPI_Datatype sendtype, int source, int recvtag,
diff --git a/src/mpi/c/sendrecv_replace.c b/src/mpi/c/sendrecv_replace.c
index b9d551dc60..c12b84f980 100644
--- a/src/mpi/c/sendrecv_replace.c
+++ b/src/mpi/c/sendrecv_replace.c
@@ -20,7 +20,6 @@
 static const char FUNC_NAME[] = "MPI_Sendrecv_replace";
 
 
-OMPI_EXPORT
 int MPI_Sendrecv_replace(void * buf, int count, MPI_Datatype datatype,
                          int dest, int sendtag, int source, int recvtag,
                          MPI_Comm comm, MPI_Status *status) 
diff --git a/src/mpi/c/ssend.c b/src/mpi/c/ssend.c
index 346ae5bc96..233bb2999b 100644
--- a/src/mpi/c/ssend.c
+++ b/src/mpi/c/ssend.c
@@ -20,7 +20,6 @@
 static const char FUNC_NAME[] = "MPI_Ssend";
 
 
-OMPI_EXPORT
 int MPI_Ssend(void *buf, int count, MPI_Datatype type, int dest, int tag, MPI_Comm comm) 
 {
     int rc;
diff --git a/src/mpi/c/ssend_init.c b/src/mpi/c/ssend_init.c
index 7297821256..89becb0ab1 100644
--- a/src/mpi/c/ssend_init.c
+++ b/src/mpi/c/ssend_init.c
@@ -20,7 +20,6 @@
 static const char FUNC_NAME[] = "MPI_Ssend_init";
 
 
-OMPI_EXPORT
 int MPI_Ssend_init(void *buf, int count, MPI_Datatype type,
                    int dest, int tag, MPI_Comm comm,
                    MPI_Request *request) 
diff --git a/src/mpi/c/start.c b/src/mpi/c/start.c
index 6393e0baf4..5c956490dd 100644
--- a/src/mpi/c/start.c
+++ b/src/mpi/c/start.c
@@ -20,7 +20,6 @@
 static const char FUNC_NAME[] = "MPI_Start";
 
 
-OMPI_EXPORT
 int MPI_Start(MPI_Request *request) 
 {
     if ( MPI_PARAM_CHECK ) {
diff --git a/src/mpi/c/startall.c b/src/mpi/c/startall.c
index 9daec5e90d..80ae583cfe 100644
--- a/src/mpi/c/startall.c
+++ b/src/mpi/c/startall.c
@@ -20,7 +20,6 @@
 static const char FUNC_NAME[] = "MPI_Startall";
 
 
-OMPI_EXPORT
 int MPI_Startall(int count, MPI_Request *requests) 
 {
     if ( MPI_PARAM_CHECK ) {
diff --git a/src/mpi/c/status_c2f.c b/src/mpi/c/status_c2f.c
index 109a75046e..5970056e44 100644
--- a/src/mpi/c/status_c2f.c
+++ b/src/mpi/c/status_c2f.c
@@ -20,7 +20,6 @@
 static const char FUNC_NAME[] = "MPI_Status_c2f";
 
 
-OMPI_EXPORT
 int MPI_Status_c2f(MPI_Status *c_status, MPI_Fint *f_status) 
 {
   if (MPI_PARAM_CHECK) {
diff --git a/src/mpi/c/status_f2c.c b/src/mpi/c/status_f2c.c
index 34f63b2988..ada9ca36fe 100644
--- a/src/mpi/c/status_f2c.c
+++ b/src/mpi/c/status_f2c.c
@@ -20,7 +20,6 @@
 static const char FUNC_NAME[] = "MPI_Status_f2c";
 
 
-OMPI_EXPORT
 int MPI_Status_f2c(MPI_Fint *f_status, MPI_Status *c_status) 
 {
   if (MPI_PARAM_CHECK) {
diff --git a/src/mpi/c/status_set_cancelled.c b/src/mpi/c/status_set_cancelled.c
index f764362972..30cf9c71bb 100644
--- a/src/mpi/c/status_set_cancelled.c
+++ b/src/mpi/c/status_set_cancelled.c
@@ -20,7 +20,6 @@
 static const char FUNC_NAME[] = "MPI_Status_set_cancelled";
 
 
-OMPI_EXPORT
 int MPI_Status_set_cancelled(MPI_Status *status, int flag) 
 {
   if (MPI_PARAM_CHECK) {
diff --git a/src/mpi/c/status_set_elements.c b/src/mpi/c/status_set_elements.c
index d2601842a0..2d5850190a 100644
--- a/src/mpi/c/status_set_elements.c
+++ b/src/mpi/c/status_set_elements.c
@@ -20,7 +20,6 @@
 static const char FUNC_NAME[] = "MPI_Status_set_elements";
 
 
-OMPI_EXPORT
 int MPI_Status_set_elements(MPI_Status *status, MPI_Datatype datatype,
                             int count) 
 {
diff --git a/src/mpi/c/test.c b/src/mpi/c/test.c
index d378df987a..a3b510e0a6 100644
--- a/src/mpi/c/test.c
+++ b/src/mpi/c/test.c
@@ -20,7 +20,6 @@
 static const char FUNC_NAME[] = "MPI_Test";
 
 
-OMPI_EXPORT
 int MPI_Test(MPI_Request *request, int *completed, MPI_Status *status) 
 {
     int rc, index;
diff --git a/src/mpi/c/test_cancelled.c b/src/mpi/c/test_cancelled.c
index c5b096ef70..444c9a2e77 100644
--- a/src/mpi/c/test_cancelled.c
+++ b/src/mpi/c/test_cancelled.c
@@ -20,7 +20,6 @@
 static const char FUNC_NAME[] = "MPI_Test_cancelled";
 
 
-OMPI_EXPORT
 int MPI_Test_cancelled(MPI_Status *status, int *flag) 
 {
   if (MPI_PARAM_CHECK) {
diff --git a/src/mpi/c/testall.c b/src/mpi/c/testall.c
index 365b9b6574..db6bdd0f72 100644
--- a/src/mpi/c/testall.c
+++ b/src/mpi/c/testall.c
@@ -21,7 +21,6 @@
 static const char FUNC_NAME[] = "MPI_Testall";
 
 
-OMPI_EXPORT
 int MPI_Testall(int count, MPI_Request requests[], int *flag,
                 MPI_Status statuses[]) 
 {
diff --git a/src/mpi/c/testany.c b/src/mpi/c/testany.c
index 46b1ff7fa2..30f8a4711c 100644
--- a/src/mpi/c/testany.c
+++ b/src/mpi/c/testany.c
@@ -19,7 +19,6 @@
 static const char FUNC_NAME[] = "MPI_Testany";
 
 
-OMPI_EXPORT
 int MPI_Testany(int count, MPI_Request requests[], int *index, int *completed, MPI_Status *status) 
 {
     int rc;
diff --git a/src/mpi/c/testsome.c b/src/mpi/c/testsome.c
index 7fce8c98fb..9acee8e0c4 100644
--- a/src/mpi/c/testsome.c
+++ b/src/mpi/c/testsome.c
@@ -19,7 +19,6 @@
 static const char FUNC_NAME[] = "MPI_Testsome";
 
 
-OMPI_EXPORT
 int MPI_Testsome(int incount, MPI_Request requests[],
                  int *outcount, int indices[],
                  MPI_Status statuses[]) 
diff --git a/src/mpi/c/topo_test.c b/src/mpi/c/topo_test.c
index 576bcfa05d..ad4165a84e 100644
--- a/src/mpi/c/topo_test.c
+++ b/src/mpi/c/topo_test.c
@@ -19,7 +19,6 @@
 static const char FUNC_NAME[] = "MPI_Topo_test";
 
 
-OMPI_EXPORT
 int MPI_Topo_test(MPI_Comm comm, int *status) 
 {
     if ( MPI_PARAM_CHECK ) {
diff --git a/src/mpi/c/type_c2f.c b/src/mpi/c/type_c2f.c
index bc7fe1e06d..3d491d182a 100644
--- a/src/mpi/c/type_c2f.c
+++ b/src/mpi/c/type_c2f.c
@@ -21,7 +21,6 @@
 static const char FUNC_NAME[] = "MPI_Type_c2f";
 
 
-OMPI_EXPORT
 MPI_Fint MPI_Type_c2f(MPI_Datatype datatype)
 {
   if (MPI_PARAM_CHECK) {
diff --git a/src/mpi/c/type_commit.c b/src/mpi/c/type_commit.c
index 88602f9dce..a0db978e99 100644
--- a/src/mpi/c/type_commit.c
+++ b/src/mpi/c/type_commit.c
@@ -21,7 +21,6 @@
 static const char FUNC_NAME[] = "MPI_Type_commit";
 
 
-OMPI_EXPORT
 int MPI_Type_commit(MPI_Datatype *type)
 {
   int rc;
diff --git a/src/mpi/c/type_contiguous.c b/src/mpi/c/type_contiguous.c
index 9e2044113f..2df8063c9d 100644
--- a/src/mpi/c/type_contiguous.c
+++ b/src/mpi/c/type_contiguous.c
@@ -21,7 +21,6 @@
 static const char FUNC_NAME[] = "MPI_Type_contiguous";
 
 
-OMPI_EXPORT
 int MPI_Type_contiguous(int count,
                         MPI_Datatype oldtype,
                         MPI_Datatype *newtype)
diff --git a/src/mpi/c/type_create_darray.c b/src/mpi/c/type_create_darray.c
index c26b055175..5ec048d9e9 100644
--- a/src/mpi/c/type_create_darray.c
+++ b/src/mpi/c/type_create_darray.c
@@ -20,7 +20,6 @@
 static const char FUNC_NAME[] = "MPI_Type_create_darray";
 
 
-OMPI_EXPORT
 int MPI_Type_create_darray(int size,
                            int rank,
                            int ndims,
diff --git a/src/mpi/c/type_create_f90_complex.c b/src/mpi/c/type_create_f90_complex.c
index 8ad038d4f6..05b6437114 100644
--- a/src/mpi/c/type_create_f90_complex.c
+++ b/src/mpi/c/type_create_f90_complex.c
@@ -20,7 +20,6 @@
 static const char FUNC_NAME[] = "MPI_Type_create_f90_complex";
 
 
-OMPI_EXPORT
 int MPI_Type_create_f90_complex(int p, int r, MPI_Datatype *newtype)
 {
   if (MPI_PARAM_CHECK) {
diff --git a/src/mpi/c/type_create_f90_integer.c b/src/mpi/c/type_create_f90_integer.c
index 6c14048127..c220a720f8 100644
--- a/src/mpi/c/type_create_f90_integer.c
+++ b/src/mpi/c/type_create_f90_integer.c
@@ -20,7 +20,6 @@
 static const char FUNC_NAME[] = "MPI_Type_create_f90_integer";
 
 
-OMPI_EXPORT
 int MPI_Type_create_f90_integer(int r, MPI_Datatype *newtype)
 
 {
diff --git a/src/mpi/c/type_create_f90_real.c b/src/mpi/c/type_create_f90_real.c
index 59d811152d..1894b101f6 100644
--- a/src/mpi/c/type_create_f90_real.c
+++ b/src/mpi/c/type_create_f90_real.c
@@ -20,7 +20,6 @@
 static const char FUNC_NAME[] = "MPI_Type_create_f90_real";
 
 
-OMPI_EXPORT
 int MPI_Type_create_f90_real(int p, int r, MPI_Datatype *newtype)
 
 {
diff --git a/src/mpi/c/type_create_hindexed.c b/src/mpi/c/type_create_hindexed.c
index ee211e8bda..465a4240cb 100644
--- a/src/mpi/c/type_create_hindexed.c
+++ b/src/mpi/c/type_create_hindexed.c
@@ -21,7 +21,6 @@
 static const char FUNC_NAME[] = "MPI_Type_create_hindexed";
 
 
-OMPI_EXPORT
 int MPI_Type_create_hindexed(int count,
                              int array_of_blocklengths[],
                              MPI_Aint array_of_displacements[],
diff --git a/src/mpi/c/type_create_hvector.c b/src/mpi/c/type_create_hvector.c
index 415934ef8c..e519ff83c3 100644
--- a/src/mpi/c/type_create_hvector.c
+++ b/src/mpi/c/type_create_hvector.c
@@ -21,7 +21,6 @@
 static const char FUNC_NAME[] = "MPI_Type_create_hvector";
 
 
-OMPI_EXPORT
 int MPI_Type_create_hvector(int count,
                             int blocklength,
                             MPI_Aint stride,
diff --git a/src/mpi/c/type_create_indexed_block.c b/src/mpi/c/type_create_indexed_block.c
index ae7043ce05..fe4cd89453 100644
--- a/src/mpi/c/type_create_indexed_block.c
+++ b/src/mpi/c/type_create_indexed_block.c
@@ -21,7 +21,6 @@
 static const char FUNC_NAME[] = "MPI_Type_create_indexed_block";
 
 
-OMPI_EXPORT
 int MPI_Type_create_indexed_block(int count,
                                   int blocklength, 
                                   int array_of_displacements[],
diff --git a/src/mpi/c/type_create_keyval.c b/src/mpi/c/type_create_keyval.c
index 07b6070b2d..53828804b2 100644
--- a/src/mpi/c/type_create_keyval.c
+++ b/src/mpi/c/type_create_keyval.c
@@ -19,7 +19,6 @@
 static const char FUNC_NAME[] = "MPI_Type_create_keyval";
 
 
-OMPI_EXPORT
 int MPI_Type_create_keyval(MPI_Type_copy_attr_function *type_copy_attr_fn,
                            MPI_Type_delete_attr_function *type_delete_attr_fn,
                            int *type_keyval,
diff --git a/src/mpi/c/type_create_resized.c b/src/mpi/c/type_create_resized.c
index 7e6fa46b13..ba94b03346 100644
--- a/src/mpi/c/type_create_resized.c
+++ b/src/mpi/c/type_create_resized.c
@@ -21,7 +21,6 @@
 static const char FUNC_NAME[] = "MPI_Type_create_resized";
 
 
-OMPI_EXPORT
 int MPI_Type_create_resized(MPI_Datatype oldtype,
                             MPI_Aint lb,
                             MPI_Aint extent,
diff --git a/src/mpi/c/type_create_struct.c b/src/mpi/c/type_create_struct.c
index a17c8389ec..0005117903 100644
--- a/src/mpi/c/type_create_struct.c
+++ b/src/mpi/c/type_create_struct.c
@@ -21,7 +21,6 @@
 static const char FUNC_NAME[] = "MPI_Type_create_struct";
 
 
-OMPI_EXPORT
 int MPI_Type_create_struct(int count,
                            int array_of_blocklengths[],
                            MPI_Aint array_of_displacements[],
diff --git a/src/mpi/c/type_create_subarray.c b/src/mpi/c/type_create_subarray.c
index c40dd2232b..ea2ed16334 100644
--- a/src/mpi/c/type_create_subarray.c
+++ b/src/mpi/c/type_create_subarray.c
@@ -20,7 +20,6 @@
 static const char FUNC_NAME[] = "MPI_Type_create_subarray";
 
 
-OMPI_EXPORT
 int MPI_Type_create_subarray(int ndims,
                              int size_array[],
                              int subsize_array[],
diff --git a/src/mpi/c/type_delete_attr.c b/src/mpi/c/type_delete_attr.c
index 109dc78861..fb037a895b 100644
--- a/src/mpi/c/type_delete_attr.c
+++ b/src/mpi/c/type_delete_attr.c
@@ -19,7 +19,6 @@
 static const char FUNC_NAME[] = "MPI_Type_delete_attr";
 
 
-OMPI_EXPORT
 int MPI_Type_delete_attr (MPI_Datatype type, int type_keyval)
 {
    int ret;
diff --git a/src/mpi/c/type_dup.c b/src/mpi/c/type_dup.c
index bc35abad3e..4086449f5a 100644
--- a/src/mpi/c/type_dup.c
+++ b/src/mpi/c/type_dup.c
@@ -21,7 +21,6 @@
 static const char FUNC_NAME[] = "MPI_Type_dup";
 
 
-OMPI_EXPORT
 int MPI_Type_dup (MPI_Datatype type,
                   MPI_Datatype *newtype)
 {
diff --git a/src/mpi/c/type_extent.c b/src/mpi/c/type_extent.c
index 3db69753fa..aa4f10c360 100644
--- a/src/mpi/c/type_extent.c
+++ b/src/mpi/c/type_extent.c
@@ -20,7 +20,6 @@
 static const char FUNC_NAME[] = "MPI_Type_extent";
 
 
-OMPI_EXPORT
 int MPI_Type_extent(MPI_Datatype type, MPI_Aint *extent)
 {
   int rc;
diff --git a/src/mpi/c/type_f2c.c b/src/mpi/c/type_f2c.c
index 7889b55156..65093f8ac4 100644
--- a/src/mpi/c/type_f2c.c
+++ b/src/mpi/c/type_f2c.c
@@ -21,7 +21,6 @@
 static const char FUNC_NAME[] = "MPI_Type_f2c";
 
 
-OMPI_EXPORT
 MPI_Datatype MPI_Type_f2c(MPI_Fint datatype)
 {
     size_t datatype_index = (size_t) datatype;
diff --git a/src/mpi/c/type_free.c b/src/mpi/c/type_free.c
index f45d687509..a3b7080435 100644
--- a/src/mpi/c/type_free.c
+++ b/src/mpi/c/type_free.c
@@ -21,7 +21,6 @@
 static const char FUNC_NAME[] = "MPI_Type_free";
 
 
-OMPI_EXPORT
 int MPI_Type_free(MPI_Datatype *type)
 {
    int rc;
diff --git a/src/mpi/c/type_free_keyval.c b/src/mpi/c/type_free_keyval.c
index 75960c82af..c3c7f16918 100644
--- a/src/mpi/c/type_free_keyval.c
+++ b/src/mpi/c/type_free_keyval.c
@@ -19,7 +19,6 @@
 static const char FUNC_NAME[] = "MPI_Type_free_keyval";
 
 
-OMPI_EXPORT
 int MPI_Type_free_keyval(int *type_keyval)
 {
     int ret;
diff --git a/src/mpi/c/type_get_attr.c b/src/mpi/c/type_get_attr.c
index 7a16ff5d6b..55e100a9a6 100644
--- a/src/mpi/c/type_get_attr.c
+++ b/src/mpi/c/type_get_attr.c
@@ -19,7 +19,6 @@
 static const char FUNC_NAME[] = "MPI_Type_get_attr";
 
 
-OMPI_EXPORT
 int MPI_Type_get_attr (MPI_Datatype type,
                        int type_keyval,
                        void *attribute_val,
diff --git a/src/mpi/c/type_get_contents.c b/src/mpi/c/type_get_contents.c
index f803178fb3..35d54ecf86 100644
--- a/src/mpi/c/type_get_contents.c
+++ b/src/mpi/c/type_get_contents.c
@@ -21,7 +21,6 @@
 static const char FUNC_NAME[] = "MPI_Type_get_contents";
 
 
-OMPI_EXPORT
 int MPI_Type_get_contents(MPI_Datatype mtype,
                           int max_integers,
                           int max_addresses,
diff --git a/src/mpi/c/type_get_envelope.c b/src/mpi/c/type_get_envelope.c
index b571a95724..5e395cf1e6 100644
--- a/src/mpi/c/type_get_envelope.c
+++ b/src/mpi/c/type_get_envelope.c
@@ -21,7 +21,6 @@
 static const char FUNC_NAME[] = "MPI_Type_get_envelope";
 
 
-OMPI_EXPORT
 int MPI_Type_get_envelope(MPI_Datatype type,
                           int *num_integers,
                           int *num_addresses,
diff --git a/src/mpi/c/type_get_extent.c b/src/mpi/c/type_get_extent.c
index 0854c20426..3ac7ba9dc5 100644
--- a/src/mpi/c/type_get_extent.c
+++ b/src/mpi/c/type_get_extent.c
@@ -21,7 +21,6 @@
 static const char FUNC_NAME[] = "MPI_Type_get_extent";
 
 
-OMPI_EXPORT
 int MPI_Type_get_extent(MPI_Datatype type, MPI_Aint *lb, MPI_Aint *extent)
 {
   int rc;
diff --git a/src/mpi/c/type_get_name.c b/src/mpi/c/type_get_name.c
index 52552dd448..7621e38e83 100644
--- a/src/mpi/c/type_get_name.c
+++ b/src/mpi/c/type_get_name.c
@@ -23,7 +23,6 @@
 static const char FUNC_NAME[] = "MPI_Type_get_name";
 
 
-OMPI_EXPORT
 int MPI_Type_get_name(MPI_Datatype type, char *type_name, int *resultlen)
 {
    if ( MPI_PARAM_CHECK ) {
diff --git a/src/mpi/c/type_get_true_extent.c b/src/mpi/c/type_get_true_extent.c
index 193c9911f5..349bcb6f7a 100644
--- a/src/mpi/c/type_get_true_extent.c
+++ b/src/mpi/c/type_get_true_extent.c
@@ -21,7 +21,6 @@
 static const char FUNC_NAME[] = "MPI_Type_get_true_extent";
 
 
-OMPI_EXPORT
 int MPI_Type_get_true_extent(MPI_Datatype datatype,
                              MPI_Aint *true_lb, 
                              MPI_Aint *true_extent)
diff --git a/src/mpi/c/type_hindexed.c b/src/mpi/c/type_hindexed.c
index 2c76be0cca..0c8d2a301b 100644
--- a/src/mpi/c/type_hindexed.c
+++ b/src/mpi/c/type_hindexed.c
@@ -20,7 +20,6 @@
 static const char FUNC_NAME[] = "MPI_Type_hindexed";
 
 
-OMPI_EXPORT
 int MPI_Type_hindexed(int count,
                       int array_of_blocklengths[],
                       MPI_Aint array_of_displacements[],
diff --git a/src/mpi/c/type_hvector.c b/src/mpi/c/type_hvector.c
index 8b61ba9a04..1ac0e19dbe 100644
--- a/src/mpi/c/type_hvector.c
+++ b/src/mpi/c/type_hvector.c
@@ -20,7 +20,6 @@
 static const char FUNC_NAME[] = "MPI_Type_hvector";
 
 
-OMPI_EXPORT
 int MPI_Type_hvector(int count,
                      int blocklength,
                      MPI_Aint stride,
diff --git a/src/mpi/c/type_indexed.c b/src/mpi/c/type_indexed.c
index 21b216a0a9..4c562f991f 100644
--- a/src/mpi/c/type_indexed.c
+++ b/src/mpi/c/type_indexed.c
@@ -20,7 +20,6 @@
 
 static const char FUNC_NAME[] = "MPI_Type_indexed";
 
-OMPI_EXPORT
 int MPI_Type_indexed(int count,
                      int array_of_blocklengths[],
                      int array_of_displacements[],
diff --git a/src/mpi/c/type_lb.c b/src/mpi/c/type_lb.c
index 4978d9d72b..b0ee52f397 100644
--- a/src/mpi/c/type_lb.c
+++ b/src/mpi/c/type_lb.c
@@ -21,7 +21,6 @@
 static const char FUNC_NAME[] = "MPI_Type_lb";
 
 
-OMPI_EXPORT
 int MPI_Type_lb(MPI_Datatype type, MPI_Aint *lb)
 {
   int rc;
diff --git a/src/mpi/c/type_match_size.c b/src/mpi/c/type_match_size.c
index 1da9d0884e..2fd3cd5fef 100644
--- a/src/mpi/c/type_match_size.c
+++ b/src/mpi/c/type_match_size.c
@@ -21,7 +21,6 @@
 static const char FUNC_NAME[] = "MPI_Type_match_size";
 
 
-OMPI_EXPORT
 int MPI_Type_match_size(int typeclass, int size, MPI_Datatype *type)
 {
   if (MPI_PARAM_CHECK) {
diff --git a/src/mpi/c/type_set_attr.c b/src/mpi/c/type_set_attr.c
index 0a07ec2c4a..44c94ef1ca 100644
--- a/src/mpi/c/type_set_attr.c
+++ b/src/mpi/c/type_set_attr.c
@@ -19,7 +19,6 @@
 static const char FUNC_NAME[] = "MPI_Type_set_attr";
 
 
-OMPI_EXPORT
 int MPI_Type_set_attr (MPI_Datatype type,
                        int type_keyval,
                        void *attribute_val)
diff --git a/src/mpi/c/type_set_name.c b/src/mpi/c/type_set_name.c
index b2f1de1194..2f866cc6d7 100644
--- a/src/mpi/c/type_set_name.c
+++ b/src/mpi/c/type_set_name.c
@@ -23,7 +23,6 @@
 static const char FUNC_NAME[] = "MPI_Type_set_name";
 
 
-OMPI_EXPORT
 int MPI_Type_set_name (MPI_Datatype type, char *type_name)
 {
   int length;
diff --git a/src/mpi/c/type_size.c b/src/mpi/c/type_size.c
index 688b597aa4..f3d9d97a24 100644
--- a/src/mpi/c/type_size.c
+++ b/src/mpi/c/type_size.c
@@ -21,7 +21,6 @@
 static const char FUNC_NAME[] = "MPI_Type_size";
 
 
-OMPI_EXPORT
 int MPI_Type_size(MPI_Datatype type, int *size)
 {
   if (MPI_PARAM_CHECK) {
diff --git a/src/mpi/c/type_struct.c b/src/mpi/c/type_struct.c
index 40192b566d..7ac01841ee 100644
--- a/src/mpi/c/type_struct.c
+++ b/src/mpi/c/type_struct.c
@@ -20,7 +20,6 @@
 static const char FUNC_NAME[] = "MPI_Type_struct";
 
 
-OMPI_EXPORT
 int MPI_Type_struct(int count,
                     int array_of_blocklengths[],
                     MPI_Aint array_of_displacements[],
diff --git a/src/mpi/c/type_ub.c b/src/mpi/c/type_ub.c
index b05ad145b4..85e1f73377 100644
--- a/src/mpi/c/type_ub.c
+++ b/src/mpi/c/type_ub.c
@@ -21,7 +21,6 @@
 static const char FUNC_NAME[] = "MPI_Type_ub";
 
 
-OMPI_EXPORT
 int MPI_Type_ub(MPI_Datatype mtype, MPI_Aint *ub)
 {
   MPI_Aint lb;
diff --git a/src/mpi/c/type_vector.c b/src/mpi/c/type_vector.c
index 1f9ae37c05..123a1d2665 100644
--- a/src/mpi/c/type_vector.c
+++ b/src/mpi/c/type_vector.c
@@ -20,7 +20,6 @@
 
 static const char FUNC_NAME[] = "MPI_Type_vector";
 
-OMPI_EXPORT
 int MPI_Type_vector(int count,
                     int blocklength,
                     int stride,
diff --git a/src/mpi/c/unpack.c b/src/mpi/c/unpack.c
index fc304ce01d..7f9754183c 100644
--- a/src/mpi/c/unpack.c
+++ b/src/mpi/c/unpack.c
@@ -22,7 +22,6 @@
 static const char FUNC_NAME[] = "MPI_Unpack";
 
 
-OMPI_EXPORT
 int MPI_Unpack(void *inbuf, int insize, int *position,
                void *outbuf, int outcount, MPI_Datatype datatype,
                MPI_Comm comm) 
diff --git a/src/mpi/c/unpack_external.c b/src/mpi/c/unpack_external.c
index f7b6b5cd3f..29ff2580ee 100644
--- a/src/mpi/c/unpack_external.c
+++ b/src/mpi/c/unpack_external.c
@@ -20,7 +20,6 @@
 static const char FUNC_NAME[] = "MPI_Unpack_external ";
 
 
-OMPI_EXPORT
 int MPI_Unpack_external (char *datarep, void *inbuf, MPI_Aint insize,
                          MPI_Aint *position, void *outbuf, int outcount,
                          MPI_Datatype datatype) 
diff --git a/src/mpi/c/unpublish_name.c b/src/mpi/c/unpublish_name.c
index f3ee30abb7..d0284bfee4 100644
--- a/src/mpi/c/unpublish_name.c
+++ b/src/mpi/c/unpublish_name.c
@@ -21,7 +21,6 @@
 static const char FUNC_NAME[] = "MPI_Unpublish_name";
 
 
-OMPI_EXPORT
 int MPI_Unpublish_name(char *service_name, MPI_Info info,
                        char *port_name) 
 {
diff --git a/src/mpi/c/wait.c b/src/mpi/c/wait.c
index 2c8b7e1f5f..7ed609a717 100644
--- a/src/mpi/c/wait.c
+++ b/src/mpi/c/wait.c
@@ -19,7 +19,6 @@
 static const char FUNC_NAME[] = "MPI_Wait";
 
 
-OMPI_EXPORT
 int MPI_Wait(MPI_Request *request, MPI_Status *status) 
 {
     int index, rc;
diff --git a/src/mpi/c/waitall.c b/src/mpi/c/waitall.c
index 7cdfa4e9b9..70b5d2bd14 100644
--- a/src/mpi/c/waitall.c
+++ b/src/mpi/c/waitall.c
@@ -19,7 +19,6 @@
 static const char FUNC_NAME[] = "MPI_Waitall";
 
 
-OMPI_EXPORT
 int MPI_Waitall(int count, MPI_Request *requests, MPI_Status *statuses) 
 {
     int rc;
diff --git a/src/mpi/c/waitany.c b/src/mpi/c/waitany.c
index 493412c0a6..dcf4aade48 100644
--- a/src/mpi/c/waitany.c
+++ b/src/mpi/c/waitany.c
@@ -19,7 +19,6 @@
 static const char FUNC_NAME[] = "MPI_Waitany";
 
 
-OMPI_EXPORT
 int MPI_Waitany(int count, MPI_Request *requests, int *index, MPI_Status *status) 
 {
     int rc;
diff --git a/src/mpi/c/waitsome.c b/src/mpi/c/waitsome.c
index 8ba7d48217..d3394b36cf 100644
--- a/src/mpi/c/waitsome.c
+++ b/src/mpi/c/waitsome.c
@@ -20,7 +20,6 @@
 static const char FUNC_NAME[] = "MPI_Waitsome";
 
 
-OMPI_EXPORT
 int MPI_Waitsome(int incount, MPI_Request *requests,
                  int *outcount, int *indices,
                  MPI_Status *statuses) 
diff --git a/src/mpi/c/win_c2f.c b/src/mpi/c/win_c2f.c
index b37529cf7e..d9f3073a52 100644
--- a/src/mpi/c/win_c2f.c
+++ b/src/mpi/c/win_c2f.c
@@ -20,7 +20,6 @@
 static const char FUNC_NAME[] = "MPI_Win_c2f";
 
 
-OMPI_EXPORT
 MPI_Fint MPI_Win_c2f(MPI_Win win) 
 {
   if (MPI_PARAM_CHECK) {
diff --git a/src/mpi/c/win_call_errhandler.c b/src/mpi/c/win_call_errhandler.c
index eb532bf6ad..337879df9b 100644
--- a/src/mpi/c/win_call_errhandler.c
+++ b/src/mpi/c/win_call_errhandler.c
@@ -21,7 +21,6 @@
 static const char FUNC_NAME[] = "MPI_Win_call_errhandler";
 
 
-OMPI_EXPORT
 int MPI_Win_call_errhandler(MPI_Win win, int errorcode) 
 {
   /* Error checking */
diff --git a/src/mpi/c/win_complete.c b/src/mpi/c/win_complete.c
index 20fdc94464..552ccd427d 100644
--- a/src/mpi/c/win_complete.c
+++ b/src/mpi/c/win_complete.c
@@ -20,7 +20,6 @@
 static const char FUNC_NAME[] = "MPI_Win_complete";
 
 
-OMPI_EXPORT
 int MPI_Win_complete(MPI_Win win) 
 {
   if (MPI_PARAM_CHECK) {
diff --git a/src/mpi/c/win_create.c b/src/mpi/c/win_create.c
index 5f42ae0571..5d7eb0b1f9 100644
--- a/src/mpi/c/win_create.c
+++ b/src/mpi/c/win_create.c
@@ -21,7 +21,6 @@
 static const char FUNC_NAME[] = "MPI_Win_create";
 
 
-OMPI_EXPORT
 int MPI_Win_create(void *base, MPI_Aint size, int disp_unit,
                    MPI_Info info, MPI_Comm comm, MPI_Win *win) 
 {
diff --git a/src/mpi/c/win_create_errhandler.c b/src/mpi/c/win_create_errhandler.c
index e563f75aea..9ca7189280 100644
--- a/src/mpi/c/win_create_errhandler.c
+++ b/src/mpi/c/win_create_errhandler.c
@@ -21,7 +21,6 @@
 static const char FUNC_NAME[] = "MPI_Win_create_errhandler";
 
 
-OMPI_EXPORT
 int MPI_Win_create_errhandler(MPI_Win_errhandler_fn *function,
                               MPI_Errhandler *errhandler) 
 {
diff --git a/src/mpi/c/win_create_keyval.c b/src/mpi/c/win_create_keyval.c
index 15407923b6..309fa99ce5 100644
--- a/src/mpi/c/win_create_keyval.c
+++ b/src/mpi/c/win_create_keyval.c
@@ -19,7 +19,6 @@
 static const char FUNC_NAME[] = "MPI_Win_create_keyval";
 
 
-OMPI_EXPORT
 int MPI_Win_create_keyval(MPI_Win_copy_attr_function *win_copy_attr_fn,
                           MPI_Win_delete_attr_function *win_delete_attr_fn,
                           int *win_keyval, void *extra_state) 
diff --git a/src/mpi/c/win_delete_attr.c b/src/mpi/c/win_delete_attr.c
index 49f0f5e03a..7e75d186e8 100644
--- a/src/mpi/c/win_delete_attr.c
+++ b/src/mpi/c/win_delete_attr.c
@@ -19,7 +19,6 @@
 static const char FUNC_NAME[] = "MPI_Win_delete_attr";
 
 
-OMPI_EXPORT
 int MPI_Win_delete_attr(MPI_Win win, int win_keyval) 
 {
     int ret; 
diff --git a/src/mpi/c/win_f2c.c b/src/mpi/c/win_f2c.c
index f8267cded4..4dc2af3c80 100644
--- a/src/mpi/c/win_f2c.c
+++ b/src/mpi/c/win_f2c.c
@@ -20,7 +20,6 @@
 static const char FUNC_NAME[] = "MPI_Win_f2c";
 
 
-OMPI_EXPORT
 MPI_Win MPI_Win_f2c(MPI_Fint win) 
 {
   if (MPI_PARAM_CHECK) {
diff --git a/src/mpi/c/win_fence.c b/src/mpi/c/win_fence.c
index 8553fef54a..9971c487dc 100644
--- a/src/mpi/c/win_fence.c
+++ b/src/mpi/c/win_fence.c
@@ -20,7 +20,6 @@
 static const char FUNC_NAME[] = "MPI_Win_fence";
 
 
-OMPI_EXPORT
 int MPI_Win_fence(int assert, MPI_Win win) 
 {
   if (MPI_PARAM_CHECK) {
diff --git a/src/mpi/c/win_free.c b/src/mpi/c/win_free.c
index 396ca0fee9..e6cc51c710 100644
--- a/src/mpi/c/win_free.c
+++ b/src/mpi/c/win_free.c
@@ -20,7 +20,6 @@
 static const char FUNC_NAME[] = "MPI_Win_free";
 
 
-OMPI_EXPORT
 int MPI_Win_free(MPI_Win *win) 
 {
   if (MPI_PARAM_CHECK) {
diff --git a/src/mpi/c/win_free_keyval.c b/src/mpi/c/win_free_keyval.c
index e4a921963f..6b7a47c63d 100644
--- a/src/mpi/c/win_free_keyval.c
+++ b/src/mpi/c/win_free_keyval.c
@@ -19,7 +19,6 @@
 static const char FUNC_NAME[] = "MPI_Win_free_keyval";
 
 
-OMPI_EXPORT
 int MPI_Win_free_keyval(int *win_keyval) 
 {
     int ret;
diff --git a/src/mpi/c/win_get_attr.c b/src/mpi/c/win_get_attr.c
index ec36dfd152..226f79233f 100644
--- a/src/mpi/c/win_get_attr.c
+++ b/src/mpi/c/win_get_attr.c
@@ -19,7 +19,6 @@
 static const char FUNC_NAME[] = "MPI_Win_get_attr";
 
 
-OMPI_EXPORT
 int MPI_Win_get_attr(MPI_Win win, int win_keyval,
                      void *attribute_val, int *flag) 
 {
diff --git a/src/mpi/c/win_get_errhandler.c b/src/mpi/c/win_get_errhandler.c
index 761a452565..a4d8a73203 100644
--- a/src/mpi/c/win_get_errhandler.c
+++ b/src/mpi/c/win_get_errhandler.c
@@ -23,7 +23,6 @@
 static const char FUNC_NAME[] = "MPI_Win_get_errhandler";
 
 
-OMPI_EXPORT
 int MPI_Win_get_errhandler(MPI_Win win, MPI_Errhandler *errhandler) 
 {
   /* Error checking */
diff --git a/src/mpi/c/win_get_group.c b/src/mpi/c/win_get_group.c
index 9bb0ef510e..cf70ff840f 100644
--- a/src/mpi/c/win_get_group.c
+++ b/src/mpi/c/win_get_group.c
@@ -20,7 +20,6 @@
 static const char FUNC_NAME[] = "MPI_Win_get_group";
 
 
-OMPI_EXPORT
 int MPI_Win_get_group(MPI_Win win, MPI_Group *group) 
 {
   if (MPI_PARAM_CHECK) {
diff --git a/src/mpi/c/win_get_name.c b/src/mpi/c/win_get_name.c
index be8cd3b406..26018c8f38 100644
--- a/src/mpi/c/win_get_name.c
+++ b/src/mpi/c/win_get_name.c
@@ -20,7 +20,6 @@
 static const char FUNC_NAME[] = "MPI_Win_get_name";
 
 
-OMPI_EXPORT
 int MPI_Win_get_name(MPI_Win win, char *win_name, int *resultlen) 
 {
   if (MPI_PARAM_CHECK) {
diff --git a/src/mpi/c/win_lock.c b/src/mpi/c/win_lock.c
index c5ed1bfdd0..58fe059819 100644
--- a/src/mpi/c/win_lock.c
+++ b/src/mpi/c/win_lock.c
@@ -20,7 +20,6 @@
 static const char FUNC_NAME[] = "MPI_Win_lock";
 
 
-OMPI_EXPORT
 int MPI_Win_lock(int lock_type, int rank, int assert, MPI_Win win) 
 {
   if (MPI_PARAM_CHECK) {
diff --git a/src/mpi/c/win_post.c b/src/mpi/c/win_post.c
index 999d5fb7b8..e287f92258 100644
--- a/src/mpi/c/win_post.c
+++ b/src/mpi/c/win_post.c
@@ -20,7 +20,6 @@
 static const char FUNC_NAME[] = "MPI_Win_post";
 
 
-OMPI_EXPORT
 int MPI_Win_post(MPI_Group group, int assert, MPI_Win win) 
 {
   if (MPI_PARAM_CHECK) {
diff --git a/src/mpi/c/win_set_attr.c b/src/mpi/c/win_set_attr.c
index f79cb6bbfd..8257d9135a 100644
--- a/src/mpi/c/win_set_attr.c
+++ b/src/mpi/c/win_set_attr.c
@@ -21,7 +21,6 @@
 static const char FUNC_NAME[] = "MPI_Win_set_attr";
 
 
-OMPI_EXPORT
 int MPI_Win_set_attr(MPI_Win win, int win_keyval, void *attribute_val) 
 {
     int ret;
diff --git a/src/mpi/c/win_set_errhandler.c b/src/mpi/c/win_set_errhandler.c
index f10e22ce8b..7238232c7f 100644
--- a/src/mpi/c/win_set_errhandler.c
+++ b/src/mpi/c/win_set_errhandler.c
@@ -23,7 +23,6 @@
 static const char FUNC_NAME[] = "MPI_Win_set_errhandler";
 
 
-OMPI_EXPORT
 int MPI_Win_set_errhandler(MPI_Win win, MPI_Errhandler errhandler) 
 {
   if (MPI_PARAM_CHECK) {
diff --git a/src/mpi/c/win_set_name.c b/src/mpi/c/win_set_name.c
index 069583a259..7bd5516f0c 100644
--- a/src/mpi/c/win_set_name.c
+++ b/src/mpi/c/win_set_name.c
@@ -20,7 +20,6 @@
 static const char FUNC_NAME[] = "MPI_Win_set_name";
 
 
-OMPI_EXPORT
 int MPI_Win_set_name(MPI_Win win, char *win_name) 
 {
   if (MPI_PARAM_CHECK) {
diff --git a/src/mpi/c/win_start.c b/src/mpi/c/win_start.c
index 4bbc24f97b..75a86c5584 100644
--- a/src/mpi/c/win_start.c
+++ b/src/mpi/c/win_start.c
@@ -20,7 +20,6 @@
 static const char FUNC_NAME[] = "MPI_Win_start";
 
 
-OMPI_EXPORT
 int MPI_Win_start(MPI_Group group, int assert, MPI_Win win) 
 {
   if (MPI_PARAM_CHECK) {
diff --git a/src/mpi/c/win_test.c b/src/mpi/c/win_test.c
index 545f2e7a26..986c29a0e0 100644
--- a/src/mpi/c/win_test.c
+++ b/src/mpi/c/win_test.c
@@ -20,7 +20,6 @@
 static const char FUNC_NAME[] = "MPI_Win_test";
 
 
-OMPI_EXPORT
 int MPI_Win_test(MPI_Win win, int *flag) 
 {
   if (MPI_PARAM_CHECK) {
diff --git a/src/mpi/c/win_unlock.c b/src/mpi/c/win_unlock.c
index a8676c6751..72be179124 100644
--- a/src/mpi/c/win_unlock.c
+++ b/src/mpi/c/win_unlock.c
@@ -20,7 +20,6 @@
 static const char FUNC_NAME[] = "MPI_Win_unlock";
 
 
-OMPI_EXPORT
 int MPI_Win_unlock(int rank, MPI_Win win) 
 {
   if (MPI_PARAM_CHECK) {
diff --git a/src/mpi/c/win_wait.c b/src/mpi/c/win_wait.c
index 4f237f0a7a..ca1e3d1a08 100644
--- a/src/mpi/c/win_wait.c
+++ b/src/mpi/c/win_wait.c
@@ -20,7 +20,6 @@
 static const char FUNC_NAME[] = "MPI_Win_wait";
 
 
-OMPI_EXPORT
 int MPI_Win_wait(MPI_Win win) 
 {
   if (MPI_PARAM_CHECK) {
diff --git a/src/mpi/c/wtick.c b/src/mpi/c/wtick.c
index 31c1c09d25..14bd554955 100644
--- a/src/mpi/c/wtick.c
+++ b/src/mpi/c/wtick.c
@@ -16,7 +16,6 @@
 #endif
 
 
-OMPI_EXPORT
 double MPI_Wtick(void) 
 {
     return (double)0.000001;
diff --git a/src/mpi/c/wtime.c b/src/mpi/c/wtime.c
index 3603b99410..f5901aa345 100644
--- a/src/mpi/c/wtime.c
+++ b/src/mpi/c/wtime.c
@@ -17,7 +17,6 @@
 #endif
 
 
-OMPI_EXPORT
 double MPI_Wtime(void) 
 {
     struct timeval tv;
diff --git a/src/mpi/f77/abort_f.c b/src/mpi/f77/abort_f.c
index cfddb4583c..9dcd6cd8ae 100644
--- a/src/mpi/f77/abort_f.c
+++ b/src/mpi/f77/abort_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_ABORT,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT 
 void mpi_abort_f(MPI_Fint *comm, MPI_Fint *errorcode, MPI_Fint *ierr)
 {
     MPI_Comm c_comm = MPI_Comm_f2c(*comm);
diff --git a/src/mpi/f77/accumulate_f.c b/src/mpi/f77/accumulate_f.c
index 407a161867..0a04e0c54c 100644
--- a/src/mpi/f77/accumulate_f.c
+++ b/src/mpi/f77/accumulate_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_ACCUMULATE,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_accumulate_f(char *origin_addr, MPI_Fint *origin_count,
 		      MPI_Fint *origin_datatype, MPI_Fint *target_rank,
 		      MPI_Fint *target_disp, MPI_Fint *target_count,
diff --git a/src/mpi/f77/add_error_class_f.c b/src/mpi/f77/add_error_class_f.c
index b82adfce6b..c8b4c1cd2f 100644
--- a/src/mpi/f77/add_error_class_f.c
+++ b/src/mpi/f77/add_error_class_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_ADD_ERROR_CLASS,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_add_error_class_f(MPI_Fint *errorclass, MPI_Fint *ierr)
 {
     OMPI_SINGLE_NAME_DECL(errorclass);
diff --git a/src/mpi/f77/add_error_code_f.c b/src/mpi/f77/add_error_code_f.c
index 11bb59c169..9840d5edf2 100644
--- a/src/mpi/f77/add_error_code_f.c
+++ b/src/mpi/f77/add_error_code_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_ADD_ERROR_CODE,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_add_error_code_f(MPI_Fint *errorclass, MPI_Fint *errorcode, MPI_Fint *ierr)
 {
     OMPI_SINGLE_NAME_DECL(errorcode);
diff --git a/src/mpi/f77/add_error_string_f.c b/src/mpi/f77/add_error_string_f.c
index e3d80a3064..f1b642033c 100644
--- a/src/mpi/f77/add_error_string_f.c
+++ b/src/mpi/f77/add_error_string_f.c
@@ -50,7 +50,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_ADD_ERROR_STRING,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_add_error_string_f(MPI_Fint *errorcode, char *string,  
 			    MPI_Fint *ierr, int len)
 {
diff --git a/src/mpi/f77/address_f.c b/src/mpi/f77/address_f.c
index a7b24a3410..f1eb750e28 100644
--- a/src/mpi/f77/address_f.c
+++ b/src/mpi/f77/address_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_ADDRESS,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_address_f(char *location, MPI_Fint *address, MPI_Fint *ierr)
 {
     MPI_Aint addr;
diff --git a/src/mpi/f77/allgather_f.c b/src/mpi/f77/allgather_f.c
index 81525a5b9b..3a433d457a 100644
--- a/src/mpi/f77/allgather_f.c
+++ b/src/mpi/f77/allgather_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_ALLGATHER,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_allgather_f(char *sendbuf, MPI_Fint *sendcount, MPI_Fint *sendtype,
 		     char *recvbuf, MPI_Fint *recvcount, MPI_Fint *recvtype,
 		     MPI_Fint *comm, MPI_Fint *ierr)
diff --git a/src/mpi/f77/allgatherv_f.c b/src/mpi/f77/allgatherv_f.c
index 59808b7563..eaa1019f3f 100644
--- a/src/mpi/f77/allgatherv_f.c
+++ b/src/mpi/f77/allgatherv_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_ALLGATHERV,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_allgatherv_f(char *sendbuf, MPI_Fint *sendcount, MPI_Fint *sendtype,
 		      char *recvbuf, MPI_Fint *recvcounts, MPI_Fint *displs,
 		      MPI_Fint *recvtype, MPI_Fint *comm, MPI_Fint *ierr)
diff --git a/src/mpi/f77/alloc_mem_f.c b/src/mpi/f77/alloc_mem_f.c
index 92d3372589..9a8be8726f 100644
--- a/src/mpi/f77/alloc_mem_f.c
+++ b/src/mpi/f77/alloc_mem_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_ALLOC_MEM,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_alloc_mem_f(MPI_Fint *size, MPI_Fint *info, char *baseptr, MPI_Fint *ierr)
 {
     MPI_Info c_info = MPI_Info_f2c(*info);
diff --git a/src/mpi/f77/allreduce_f.c b/src/mpi/f77/allreduce_f.c
index 23e7ff30db..090af74ad3 100644
--- a/src/mpi/f77/allreduce_f.c
+++ b/src/mpi/f77/allreduce_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_ALLREDUCE,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_allreduce_f(char *sendbuf, char *recvbuf, MPI_Fint *count,
 		     MPI_Fint *datatype, MPI_Fint *op, MPI_Fint *comm,
 		     MPI_Fint *ierr)
diff --git a/src/mpi/f77/alltoall_f.c b/src/mpi/f77/alltoall_f.c
index 4cf8bdc798..c9596e95c8 100644
--- a/src/mpi/f77/alltoall_f.c
+++ b/src/mpi/f77/alltoall_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_ALLTOALL,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_alltoall_f(char *sendbuf, MPI_Fint *sendcount, MPI_Fint *sendtype,
 		    char *recvbuf, MPI_Fint *recvcount, MPI_Fint *recvtype,
 		    MPI_Fint *comm, MPI_Fint *ierr)
diff --git a/src/mpi/f77/alltoallv_f.c b/src/mpi/f77/alltoallv_f.c
index 04cd2664b6..1815a95b4b 100644
--- a/src/mpi/f77/alltoallv_f.c
+++ b/src/mpi/f77/alltoallv_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_ALLTOALLV,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_alltoallv_f(char *sendbuf, MPI_Fint *sendcounts, MPI_Fint *sdispls,
 		     MPI_Fint *sendtype, char *recvbuf, MPI_Fint *recvcounts,
 		     MPI_Fint *rdispls, MPI_Fint *recvtype, 
diff --git a/src/mpi/f77/alltoallw_f.c b/src/mpi/f77/alltoallw_f.c
index 3854b72edf..61a866ea84 100644
--- a/src/mpi/f77/alltoallw_f.c
+++ b/src/mpi/f77/alltoallw_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_ALLTOALLW,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_alltoallw_f(char *sendbuf, MPI_Fint *sendcounts,
 		     MPI_Fint *sdispls, MPI_Fint *sendtypes, 
 		     char *recvbuf, MPI_Fint *recvcounts,
diff --git a/src/mpi/f77/attr_delete_f.c b/src/mpi/f77/attr_delete_f.c
index caead6721c..14e6180062 100644
--- a/src/mpi/f77/attr_delete_f.c
+++ b/src/mpi/f77/attr_delete_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_ATTR_DELETE,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_attr_delete_f(MPI_Fint *comm, MPI_Fint *keyval, MPI_Fint *ierr)
 {
     MPI_Comm c_comm;
diff --git a/src/mpi/f77/attr_fn_f.c b/src/mpi/f77/attr_fn_f.c
index 877d53ec54..555e3a3905 100644
--- a/src/mpi/f77/attr_fn_f.c
+++ b/src/mpi/f77/attr_fn_f.c
@@ -171,7 +171,6 @@ OMPI_GENERATE_F77_BINDINGS( MPI_WIN_DUP_FN,
  *
  * The reason why is discussed in a lengthy comment in mpi.h.
  */
-OMPI_EXPORT
 void mpi_type_null_delete_fn_f( MPI_Fint* type, int* type_keyval,
                                 void* attribute_val_out, int* flag, int* ierr )
 {
@@ -181,7 +180,6 @@ void mpi_type_null_delete_fn_f( MPI_Fint* type, int* type_keyval,
                                            attribute_val_out, flag );
 }
 
-OMPI_EXPORT
 void mpi_type_null_copy_fn_f( MPI_Fint* type, int* type_keyval, void* extra_state,
                               void* attribute_val_in, void* attribute_val_out, int* flag, int* ierr )
 {
@@ -192,7 +190,6 @@ void mpi_type_null_copy_fn_f( MPI_Fint* type, int* type_keyval, void* extra_stat
                                          flag );
 }
 
-OMPI_EXPORT
 void mpi_type_dup_fn_f( MPI_Fint* type, int* type_keyval, void* extra_state,
                         void* attribute_val_in, void* attribute_val_out, int* flag, int* ierr )
 {
@@ -202,7 +199,6 @@ void mpi_type_dup_fn_f( MPI_Fint* type, int* type_keyval, void* extra_state,
                                    attribute_val_in, attribute_val_out, flag );
 }
 
-OMPI_EXPORT
 void mpi_comm_null_delete_fn_f( MPI_Fint* comm, int* comm_keyval,
                                 void* attribute_val_out, int* flag, int* ierr )
 {
@@ -212,7 +208,6 @@ void mpi_comm_null_delete_fn_f( MPI_Fint* comm, int* comm_keyval,
                                            attribute_val_out, flag );
 }
 
-OMPI_EXPORT
 void mpi_comm_null_copy_fn_f( MPI_Fint* comm, int* comm_keyval, void* extra_state,
                               void* attribute_val_in, void* attribute_val_out, int* flag, int* ierr )
 {
@@ -223,7 +218,6 @@ void mpi_comm_null_copy_fn_f( MPI_Fint* comm, int* comm_keyval, void* extra_stat
                                          flag );
 }
 
-OMPI_EXPORT
 void mpi_comm_dup_fn_f( MPI_Fint* comm, int* comm_keyval, void* extra_state,
                         void* attribute_val_in, void* attribute_val_out, int* flag, int* ierr )
 {
@@ -233,7 +227,6 @@ void mpi_comm_dup_fn_f( MPI_Fint* comm, int* comm_keyval, void* extra_state,
                                    attribute_val_in, attribute_val_out, flag );
 }
 
-OMPI_EXPORT
 void mpi_null_delete_fn_f( MPI_Fint* comm, int* comm_keyval,
                            void* attribute_val_out, int* flag, int* ierr )
 {
@@ -243,7 +236,6 @@ void mpi_null_delete_fn_f( MPI_Fint* comm, int* comm_keyval,
                                       attribute_val_out, flag );
 }
 
-OMPI_EXPORT
 void mpi_null_copy_fn_f( MPI_Fint* comm, int* comm_keyval, void* extra_state,
                          void* attribute_val_in, void* attribute_val_out, int* flag, int* ierr )
 {
@@ -254,7 +246,6 @@ void mpi_null_copy_fn_f( MPI_Fint* comm, int* comm_keyval, void* extra_state,
                                     flag );
 }
 
-OMPI_EXPORT
 void mpi_dup_fn_f( MPI_Fint* comm, int* comm_keyval, void* extra_state,
                    void* attribute_val_in, void* attribute_val_out, int* flag, int* ierr )
 {
@@ -264,7 +255,6 @@ void mpi_dup_fn_f( MPI_Fint* comm, int* comm_keyval, void* extra_state,
                               attribute_val_in, attribute_val_out, flag );
 }
 
-OMPI_EXPORT
 void mpi_win_null_delete_fn_f( MPI_Fint* window, int* win_keyval,
                                void* attribute_val_out, int* flag, int* ierr )
 {
@@ -274,7 +264,6 @@ void mpi_win_null_delete_fn_f( MPI_Fint* window, int* win_keyval,
                                           attribute_val_out, flag );
 }
 
-OMPI_EXPORT
 void mpi_win_null_copy_fn_f( MPI_Fint* window, int* win_keyval, void* extra_state,
                              void* attribute_val_in, void* attribute_val_out, int* flag, int* ierr )
 {
@@ -285,7 +274,6 @@ void mpi_win_null_copy_fn_f( MPI_Fint* window, int* win_keyval, void* extra_stat
                                         flag );
 }
 
-OMPI_EXPORT
 void mpi_win_dup_fn_f( MPI_Fint* window, int* win_keyval, void* extra_state,
                        void* attribute_val_in, void* attribute_val_out, int* flag, int* ierr )
 {
diff --git a/src/mpi/f77/attr_get_f.c b/src/mpi/f77/attr_get_f.c
index 691188759d..9cf1e393af 100644
--- a/src/mpi/f77/attr_get_f.c
+++ b/src/mpi/f77/attr_get_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_ATTR_GET,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_attr_get_f(MPI_Fint *comm, MPI_Fint *keyval,
 		    MPI_Fint *attribute_val, MPI_Fint *flag, MPI_Fint *ierr)
 {
diff --git a/src/mpi/f77/attr_put_f.c b/src/mpi/f77/attr_put_f.c
index 9e312ddf99..57af778ccd 100644
--- a/src/mpi/f77/attr_put_f.c
+++ b/src/mpi/f77/attr_put_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_ATTR_PUT,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_attr_put_f(MPI_Fint *comm, MPI_Fint *keyval, MPI_Fint *attribute_val, 
 		    MPI_Fint *ierr)
 {
diff --git a/src/mpi/f77/barrier_f.c b/src/mpi/f77/barrier_f.c
index 2ecae19bb9..faa80f1d0c 100644
--- a/src/mpi/f77/barrier_f.c
+++ b/src/mpi/f77/barrier_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_BARRIER,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_barrier_f(MPI_Fint *comm, MPI_Fint *ierr)
 {
     MPI_Comm c_comm;
diff --git a/src/mpi/f77/bcast_f.c b/src/mpi/f77/bcast_f.c
index 4b7500e3cd..a561aca263 100644
--- a/src/mpi/f77/bcast_f.c
+++ b/src/mpi/f77/bcast_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_BCAST,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_bcast_f(char *buffer, MPI_Fint *count, MPI_Fint *datatype, 
 		 MPI_Fint *root, MPI_Fint *comm, MPI_Fint *ierr)
 {
diff --git a/src/mpi/f77/bsend_f.c b/src/mpi/f77/bsend_f.c
index 7c0d55c155..847a87bfba 100644
--- a/src/mpi/f77/bsend_f.c
+++ b/src/mpi/f77/bsend_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_BSEND,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_bsend_f(char *buf, MPI_Fint *count, MPI_Fint *datatype, MPI_Fint *dest, MPI_Fint *tag, MPI_Fint *comm, MPI_Fint *ierr)
 {
     MPI_Comm c_comm;
diff --git a/src/mpi/f77/bsend_init_f.c b/src/mpi/f77/bsend_init_f.c
index 40e43baf54..b16c4fa7fa 100644
--- a/src/mpi/f77/bsend_init_f.c
+++ b/src/mpi/f77/bsend_init_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_BSEND_INIT,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_bsend_init_f(char *buf, MPI_Fint *count, MPI_Fint *datatype, MPI_Fint *dest, MPI_Fint *tag, MPI_Fint *comm, MPI_Fint *request, MPI_Fint *ierr)
 {
     MPI_Datatype c_type = MPI_Type_f2c(*datatype);
diff --git a/src/mpi/f77/buffer_attach_f.c b/src/mpi/f77/buffer_attach_f.c
index 315357d0fd..5bed3d4611 100644
--- a/src/mpi/f77/buffer_attach_f.c
+++ b/src/mpi/f77/buffer_attach_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_BUFFER_ATTACH,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_buffer_attach_f(char *buffer, MPI_Fint *size, MPI_Fint *ierr)
 {
   *ierr = OMPI_INT_2_FINT(MPI_Buffer_attach(buffer, 
diff --git a/src/mpi/f77/buffer_detach_f.c b/src/mpi/f77/buffer_detach_f.c
index b0265f90f9..a7057a049c 100644
--- a/src/mpi/f77/buffer_detach_f.c
+++ b/src/mpi/f77/buffer_detach_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_BUFFER_DETACH,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_buffer_detach_f(char *buffer, MPI_Fint *size, MPI_Fint *ierr)
 {
     OMPI_SINGLE_NAME_DECL(size);
diff --git a/src/mpi/f77/cancel_f.c b/src/mpi/f77/cancel_f.c
index 7cee9c52f3..6fb2946f81 100644
--- a/src/mpi/f77/cancel_f.c
+++ b/src/mpi/f77/cancel_f.c
@@ -45,7 +45,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_CANCEL,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_cancel_f(MPI_Fint *request, MPI_Fint *ierr)
 {
     MPI_Request c_req = MPI_Request_f2c(*request);
diff --git a/src/mpi/f77/cart_coords_f.c b/src/mpi/f77/cart_coords_f.c
index d76dc5271b..8c2af287ce 100644
--- a/src/mpi/f77/cart_coords_f.c
+++ b/src/mpi/f77/cart_coords_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_CART_COORDS,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_cart_coords_f(MPI_Fint *comm, MPI_Fint *rank, MPI_Fint *maxdims,
 		       MPI_Fint *coords, MPI_Fint *ierr)
 {
diff --git a/src/mpi/f77/cart_create_f.c b/src/mpi/f77/cart_create_f.c
index a3807f3e06..40f243500e 100644
--- a/src/mpi/f77/cart_create_f.c
+++ b/src/mpi/f77/cart_create_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_CART_CREATE,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_cart_create_f(MPI_Fint *old_comm, MPI_Fint *ndims, MPI_Fint *dims,
 		       MPI_Fint *periods, MPI_Fint *reorder,
 		       MPI_Fint *comm_cart, MPI_Fint *ierr)
diff --git a/src/mpi/f77/cart_get_f.c b/src/mpi/f77/cart_get_f.c
index c4f6606574..3a5df15917 100644
--- a/src/mpi/f77/cart_get_f.c
+++ b/src/mpi/f77/cart_get_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_CART_GET,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_cart_get_f(MPI_Fint *comm, MPI_Fint *maxdims, MPI_Fint *dims,
 		    MPI_Fint *periods, MPI_Fint *coords, MPI_Fint *ierr)
 {
diff --git a/src/mpi/f77/cart_map_f.c b/src/mpi/f77/cart_map_f.c
index 71e3a57f1c..a23b09d73e 100644
--- a/src/mpi/f77/cart_map_f.c
+++ b/src/mpi/f77/cart_map_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_CART_MAP,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_cart_map_f(MPI_Fint *comm, MPI_Fint *ndims, MPI_Fint *dims,
 		    MPI_Fint *periods, MPI_Fint *newrank, MPI_Fint *ierr)
 {
diff --git a/src/mpi/f77/cart_rank_f.c b/src/mpi/f77/cart_rank_f.c
index 4a742ce755..4327576c7d 100644
--- a/src/mpi/f77/cart_rank_f.c
+++ b/src/mpi/f77/cart_rank_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_CART_RANK,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_cart_rank_f(MPI_Fint *comm, MPI_Fint *coords, MPI_Fint *rank, 
 		     MPI_Fint *ierr)
 {
diff --git a/src/mpi/f77/cart_shift_f.c b/src/mpi/f77/cart_shift_f.c
index 467a8fdf0c..6b160d7506 100644
--- a/src/mpi/f77/cart_shift_f.c
+++ b/src/mpi/f77/cart_shift_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_CART_SHIFT,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_cart_shift_f(MPI_Fint *comm, MPI_Fint *direction, MPI_Fint *disp,
 		      MPI_Fint *rank_source, MPI_Fint *rank_dest, 
 		      MPI_Fint *ierr)
diff --git a/src/mpi/f77/cart_sub_f.c b/src/mpi/f77/cart_sub_f.c
index f4a6d0f4e1..df802064ee 100644
--- a/src/mpi/f77/cart_sub_f.c
+++ b/src/mpi/f77/cart_sub_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_CART_SUB,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_cart_sub_f(MPI_Fint *comm, MPI_Fint *remain_dims,
 		    MPI_Fint *new_comm, MPI_Fint *ierr)
 {
diff --git a/src/mpi/f77/cartdim_get_f.c b/src/mpi/f77/cartdim_get_f.c
index 3db25a88aa..6b358dfbe2 100644
--- a/src/mpi/f77/cartdim_get_f.c
+++ b/src/mpi/f77/cartdim_get_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_CARTDIM_GET,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_cartdim_get_f(MPI_Fint *comm, MPI_Fint *ndims, MPI_Fint *ierr)
 {
     MPI_Comm c_comm;
diff --git a/src/mpi/f77/close_port_f.c b/src/mpi/f77/close_port_f.c
index a57690d43d..dbce8e0d00 100644
--- a/src/mpi/f77/close_port_f.c
+++ b/src/mpi/f77/close_port_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_CLOSE_PORT,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_close_port_f(char *port_name, MPI_Fint *ierr)
 {
     *ierr = OMPI_INT_2_FINT(MPI_Close_port(port_name));
diff --git a/src/mpi/f77/comm_accept_f.c b/src/mpi/f77/comm_accept_f.c
index 1144a66fc7..ecfe83de18 100644
--- a/src/mpi/f77/comm_accept_f.c
+++ b/src/mpi/f77/comm_accept_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_COMM_ACCEPT,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_comm_accept_f(char *port_name, MPI_Fint *info, MPI_Fint *root, 
 		       MPI_Fint *comm, MPI_Fint *newcomm, MPI_Fint *ierr)
 {
diff --git a/src/mpi/f77/comm_call_errhandler_f.c b/src/mpi/f77/comm_call_errhandler_f.c
index e7584dcb1f..7c8d77b6da 100644
--- a/src/mpi/f77/comm_call_errhandler_f.c
+++ b/src/mpi/f77/comm_call_errhandler_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_COMM_CALL_ERRHANDLER,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_comm_call_errhandler_f(MPI_Fint *comm, MPI_Fint *errorcode, 
 				MPI_Fint *ierr)
 {
diff --git a/src/mpi/f77/comm_compare_f.c b/src/mpi/f77/comm_compare_f.c
index ecd6cf120c..ac3a64c5ce 100644
--- a/src/mpi/f77/comm_compare_f.c
+++ b/src/mpi/f77/comm_compare_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_COMM_COMPARE,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_comm_compare_f(MPI_Fint *comm1, MPI_Fint *comm2, MPI_Fint *result, MPI_Fint *ierr)
 {
     MPI_Comm c_comm1 = MPI_Comm_f2c(*comm1);
diff --git a/src/mpi/f77/comm_connect_f.c b/src/mpi/f77/comm_connect_f.c
index 86fc93e54d..e5e2751905 100644
--- a/src/mpi/f77/comm_connect_f.c
+++ b/src/mpi/f77/comm_connect_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_COMM_CONNECT,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_comm_connect_f(char *port_name, MPI_Fint *info,
 			MPI_Fint *root, MPI_Fint *comm,
 			MPI_Fint *newcomm, MPI_Fint *ierr)
diff --git a/src/mpi/f77/comm_create_errhandler_f.c b/src/mpi/f77/comm_create_errhandler_f.c
index 0d3582be77..34d6c0e414 100644
--- a/src/mpi/f77/comm_create_errhandler_f.c
+++ b/src/mpi/f77/comm_create_errhandler_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_COMM_CREATE_ERRHANDLER,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_comm_create_errhandler_f(MPI_Fint *function,
 				  MPI_Fint *errhandler, MPI_Fint *ierr)
 {
diff --git a/src/mpi/f77/comm_create_f.c b/src/mpi/f77/comm_create_f.c
index 36bd9561f5..8b9e806523 100644
--- a/src/mpi/f77/comm_create_f.c
+++ b/src/mpi/f77/comm_create_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_COMM_CREATE,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_comm_create_f(MPI_Fint *comm, MPI_Fint *group, MPI_Fint *newcomm, MPI_Fint *ierr)
 {
     MPI_Comm c_newcomm;
diff --git a/src/mpi/f77/comm_create_keyval_f.c b/src/mpi/f77/comm_create_keyval_f.c
index 3f78fda811..a7952ac621 100644
--- a/src/mpi/f77/comm_create_keyval_f.c
+++ b/src/mpi/f77/comm_create_keyval_f.c
@@ -49,7 +49,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_COMM_CREATE_KEYVAL,
 
      static const char FUNC_NAME[] = "MPI_Comm_create_keyval_f";
 
-OMPI_EXPORT
 void mpi_comm_create_keyval_f(MPI_Fint *comm_copy_attr_fn,
 			      MPI_Fint *comm_delete_attr_fn,
 			      MPI_Fint *comm_keyval,
diff --git a/src/mpi/f77/comm_delete_attr_f.c b/src/mpi/f77/comm_delete_attr_f.c
index cbf385d6f3..46a0a0f1c6 100644
--- a/src/mpi/f77/comm_delete_attr_f.c
+++ b/src/mpi/f77/comm_delete_attr_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_COMM_DELETE_ATTR,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_comm_delete_attr_f(MPI_Fint *comm, MPI_Fint *comm_keyval,
 			    MPI_Fint *ierr)
 {
diff --git a/src/mpi/f77/comm_disconnect_f.c b/src/mpi/f77/comm_disconnect_f.c
index 07cf7b1cfe..79caf6f20a 100644
--- a/src/mpi/f77/comm_disconnect_f.c
+++ b/src/mpi/f77/comm_disconnect_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_COMM_DISCONNECT,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_comm_disconnect_f(MPI_Fint *comm, MPI_Fint *ierr)
 {
     MPI_Comm c_comm;
diff --git a/src/mpi/f77/comm_dup_f.c b/src/mpi/f77/comm_dup_f.c
index caaf6c7548..b17fcac1bd 100644
--- a/src/mpi/f77/comm_dup_f.c
+++ b/src/mpi/f77/comm_dup_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_COMM_DUP,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_comm_dup_f(MPI_Fint *comm, MPI_Fint *newcomm, MPI_Fint *ierr)
 {
     MPI_Comm c_newcomm;
diff --git a/src/mpi/f77/comm_free_f.c b/src/mpi/f77/comm_free_f.c
index 60a324bc7d..e878436c3d 100644
--- a/src/mpi/f77/comm_free_f.c
+++ b/src/mpi/f77/comm_free_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_COMM_FREE,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_comm_free_f(MPI_Fint *comm, MPI_Fint *ierr)
 {
     MPI_Comm c_comm = MPI_Comm_f2c(*comm);
diff --git a/src/mpi/f77/comm_free_keyval_f.c b/src/mpi/f77/comm_free_keyval_f.c
index 89aad549ef..a2a9dd6e53 100644
--- a/src/mpi/f77/comm_free_keyval_f.c
+++ b/src/mpi/f77/comm_free_keyval_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_COMM_FREE_KEYVAL,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_comm_free_keyval_f(MPI_Fint *comm_keyval, MPI_Fint *ierr)
 {
     OMPI_SINGLE_NAME_DECL(comm_keyval);
diff --git a/src/mpi/f77/comm_get_attr_f.c b/src/mpi/f77/comm_get_attr_f.c
index 494d70823e..91c154d044 100644
--- a/src/mpi/f77/comm_get_attr_f.c
+++ b/src/mpi/f77/comm_get_attr_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_COMM_GET_ATTR,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_comm_get_attr_f(MPI_Fint *comm, MPI_Fint *comm_keyval,
                          MPI_Aint *attribute_val, MPI_Fint *flag, MPI_Fint *ierr)
 {
diff --git a/src/mpi/f77/comm_get_errhandler_f.c b/src/mpi/f77/comm_get_errhandler_f.c
index 2e7f1bafea..9211a45a18 100644
--- a/src/mpi/f77/comm_get_errhandler_f.c
+++ b/src/mpi/f77/comm_get_errhandler_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_COMM_GET_ERRHANDLER,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_comm_get_errhandler_f(MPI_Fint *comm, MPI_Fint *errhandler, 
 			       MPI_Fint *ierr)
 {
diff --git a/src/mpi/f77/comm_get_name_f.c b/src/mpi/f77/comm_get_name_f.c
index 959b4a0d0c..8402203828 100644
--- a/src/mpi/f77/comm_get_name_f.c
+++ b/src/mpi/f77/comm_get_name_f.c
@@ -50,7 +50,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_COMM_GET_NAME,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_comm_get_name_f(MPI_Fint *comm, char *comm_name,
 			 MPI_Fint *resultlen, MPI_Fint *ierr,
                          int name_len)
diff --git a/src/mpi/f77/comm_get_parent_f.c b/src/mpi/f77/comm_get_parent_f.c
index 9b5f137481..0a34aa5cb0 100644
--- a/src/mpi/f77/comm_get_parent_f.c
+++ b/src/mpi/f77/comm_get_parent_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_COMM_GET_PARENT,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_comm_get_parent_f(MPI_Fint *parent, MPI_Fint *ierr)
 {
     MPI_Comm c_parent;
diff --git a/src/mpi/f77/comm_group_f.c b/src/mpi/f77/comm_group_f.c
index 5732275e6c..3e8d63f7bb 100644
--- a/src/mpi/f77/comm_group_f.c
+++ b/src/mpi/f77/comm_group_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_COMM_GROUP,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_comm_group_f(MPI_Fint *comm, MPI_Fint *group, MPI_Fint *ierr)
 {
     MPI_Group c_group;
diff --git a/src/mpi/f77/comm_join_f.c b/src/mpi/f77/comm_join_f.c
index e60c7fe707..d9d0db43b9 100644
--- a/src/mpi/f77/comm_join_f.c
+++ b/src/mpi/f77/comm_join_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_COMM_JOIN,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_comm_join_f(MPI_Fint *fd, MPI_Fint *intercomm, MPI_Fint *ierr)
 {
     MPI_Comm c_intercomm;
diff --git a/src/mpi/f77/comm_rank_f.c b/src/mpi/f77/comm_rank_f.c
index 8f7158eb7b..13af6d4fed 100644
--- a/src/mpi/f77/comm_rank_f.c
+++ b/src/mpi/f77/comm_rank_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_COMM_RANK,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_comm_rank_f(MPI_Fint *comm, MPI_Fint *rank, MPI_Fint *ierr)
 {
     MPI_Comm c_comm = MPI_Comm_f2c( *comm );
diff --git a/src/mpi/f77/comm_remote_group_f.c b/src/mpi/f77/comm_remote_group_f.c
index 19b2d0859e..4514405a00 100644
--- a/src/mpi/f77/comm_remote_group_f.c
+++ b/src/mpi/f77/comm_remote_group_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_COMM_REMOTE_GROUP,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_comm_remote_group_f(MPI_Fint *comm, MPI_Fint *group, MPI_Fint *ierr)
 {
     MPI_Group c_group;
diff --git a/src/mpi/f77/comm_remote_size_f.c b/src/mpi/f77/comm_remote_size_f.c
index 0b61108d2d..20a12b2cc6 100644
--- a/src/mpi/f77/comm_remote_size_f.c
+++ b/src/mpi/f77/comm_remote_size_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_COMM_REMOTE_SIZE,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_comm_remote_size_f(MPI_Fint *comm, MPI_Fint *size, MPI_Fint *ierr)
 {
     MPI_Comm c_comm = MPI_Comm_f2c ( *comm );
diff --git a/src/mpi/f77/comm_set_attr_f.c b/src/mpi/f77/comm_set_attr_f.c
index 17100654b5..796b0f9ba9 100644
--- a/src/mpi/f77/comm_set_attr_f.c
+++ b/src/mpi/f77/comm_set_attr_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_COMM_SET_ATTR,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_comm_set_attr_f(MPI_Fint *comm, MPI_Fint *comm_keyval,
 			 MPI_Aint *attribute_val, MPI_Fint *ierr)
 {
diff --git a/src/mpi/f77/comm_set_errhandler_f.c b/src/mpi/f77/comm_set_errhandler_f.c
index ec95f9511d..91f043c26a 100644
--- a/src/mpi/f77/comm_set_errhandler_f.c
+++ b/src/mpi/f77/comm_set_errhandler_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_COMM_SET_ERRHANDLER,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_comm_set_errhandler_f(MPI_Fint *comm, MPI_Fint *errhandler,
 			       MPI_Fint *ierr)
 {
diff --git a/src/mpi/f77/comm_set_name_f.c b/src/mpi/f77/comm_set_name_f.c
index c204936646..fa70a04e89 100644
--- a/src/mpi/f77/comm_set_name_f.c
+++ b/src/mpi/f77/comm_set_name_f.c
@@ -50,7 +50,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_COMM_SET_NAME,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_comm_set_name_f(MPI_Fint *comm, char *comm_name, MPI_Fint *ierr, 
                          int name_len)
 {
diff --git a/src/mpi/f77/comm_size_f.c b/src/mpi/f77/comm_size_f.c
index 6a58db3eb0..e7ca60907e 100644
--- a/src/mpi/f77/comm_size_f.c
+++ b/src/mpi/f77/comm_size_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_COMM_SIZE,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_comm_size_f(MPI_Fint *comm, MPI_Fint *size, MPI_Fint *ierr)
 {
     MPI_Comm c_comm = MPI_Comm_f2c( *comm );
diff --git a/src/mpi/f77/comm_spawn_f.c b/src/mpi/f77/comm_spawn_f.c
index 1245b607e4..ccbdc3f393 100644
--- a/src/mpi/f77/comm_spawn_f.c
+++ b/src/mpi/f77/comm_spawn_f.c
@@ -49,7 +49,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_COMM_SPAWN,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_comm_spawn_f(char *command, char *argv, MPI_Fint *maxprocs, 
 		      MPI_Fint *info, MPI_Fint *root, MPI_Fint *comm, 
 		      MPI_Fint *intercomm, MPI_Fint *array_of_errcodes,
diff --git a/src/mpi/f77/comm_spawn_multiple_f.c b/src/mpi/f77/comm_spawn_multiple_f.c
index c07808fa4f..548ac5e6b5 100644
--- a/src/mpi/f77/comm_spawn_multiple_f.c
+++ b/src/mpi/f77/comm_spawn_multiple_f.c
@@ -50,7 +50,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_COMM_SPAWN_MULTIPLE,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_comm_spawn_multiple_f(MPI_Fint *count, char *array_commands,
 			       char *array_argv,
 			       MPI_Fint *array_maxprocs,
diff --git a/src/mpi/f77/comm_split_f.c b/src/mpi/f77/comm_split_f.c
index 27470346d2..6b0275b0bc 100644
--- a/src/mpi/f77/comm_split_f.c
+++ b/src/mpi/f77/comm_split_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_COMM_SPLIT,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_comm_split_f(MPI_Fint *comm, MPI_Fint *color, MPI_Fint *key,
 		      MPI_Fint *newcomm, MPI_Fint *ierr)
 {
diff --git a/src/mpi/f77/comm_test_inter_f.c b/src/mpi/f77/comm_test_inter_f.c
index 7f14e28ce5..1fb0dd27e2 100644
--- a/src/mpi/f77/comm_test_inter_f.c
+++ b/src/mpi/f77/comm_test_inter_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_COMM_TEST_INTER,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_comm_test_inter_f(MPI_Fint *comm, MPI_Fint *flag, MPI_Fint *ierr)
 {
     MPI_Comm c_comm = MPI_Comm_f2c (*comm);
diff --git a/src/mpi/f77/dims_create_f.c b/src/mpi/f77/dims_create_f.c
index f5d4102fad..db3bed7f24 100644
--- a/src/mpi/f77/dims_create_f.c
+++ b/src/mpi/f77/dims_create_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_DIMS_CREATE,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_dims_create_f(MPI_Fint *nnodes, MPI_Fint *ndims, 
 		       MPI_Fint *dims, MPI_Fint *ierr)
 {
diff --git a/src/mpi/f77/errhandler_create_f.c b/src/mpi/f77/errhandler_create_f.c
index 5a441892d3..7a4e71371a 100644
--- a/src/mpi/f77/errhandler_create_f.c
+++ b/src/mpi/f77/errhandler_create_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_ERRHANDLER_CREATE,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_errhandler_create_f(MPI_Fint *function, 
 			     MPI_Fint *errhandler, MPI_Fint *ierr)
 {
diff --git a/src/mpi/f77/errhandler_free_f.c b/src/mpi/f77/errhandler_free_f.c
index 414efe2994..67371729bb 100644
--- a/src/mpi/f77/errhandler_free_f.c
+++ b/src/mpi/f77/errhandler_free_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_ERRHANDLER_FREE,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_errhandler_free_f(MPI_Fint *errhandler, MPI_Fint *ierr)
 {
     MPI_Errhandler c_errhandler;
diff --git a/src/mpi/f77/errhandler_get_f.c b/src/mpi/f77/errhandler_get_f.c
index bdf5ae08fd..d4a36af69b 100644
--- a/src/mpi/f77/errhandler_get_f.c
+++ b/src/mpi/f77/errhandler_get_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_ERRHANDLER_GET,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_errhandler_get_f(MPI_Fint *comm, MPI_Fint *errhandler, MPI_Fint *ierr)
 {
     MPI_Comm c_comm;
diff --git a/src/mpi/f77/errhandler_set_f.c b/src/mpi/f77/errhandler_set_f.c
index 2a3112e6e5..b804ed31c6 100644
--- a/src/mpi/f77/errhandler_set_f.c
+++ b/src/mpi/f77/errhandler_set_f.c
@@ -47,7 +47,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_ERRHANDLER_SET,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_errhandler_set_f(MPI_Fint *comm, MPI_Fint *errhandler, MPI_Fint *ierr)
 {
     MPI_Comm c_comm;
diff --git a/src/mpi/f77/error_class_f.c b/src/mpi/f77/error_class_f.c
index be81077bf3..e0e06f6682 100644
--- a/src/mpi/f77/error_class_f.c
+++ b/src/mpi/f77/error_class_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_ERROR_CLASS,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_error_class_f(MPI_Fint *errorcode, MPI_Fint *errorclass, 
 		       MPI_Fint *ierr)
 {
diff --git a/src/mpi/f77/error_string_f.c b/src/mpi/f77/error_string_f.c
index f9493dca6d..e73861b9e2 100644
--- a/src/mpi/f77/error_string_f.c
+++ b/src/mpi/f77/error_string_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_ERROR_STRING,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_error_string_f(MPI_Fint *errorcode, char *string,
 			MPI_Fint *resultlen, MPI_Fint *ierr)
 {
diff --git a/src/mpi/f77/exscan_f.c b/src/mpi/f77/exscan_f.c
index d9455320f9..efe88a1a5f 100644
--- a/src/mpi/f77/exscan_f.c
+++ b/src/mpi/f77/exscan_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_EXSCAN,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_exscan_f(char *sendbuf, char *recvbuf, MPI_Fint *count,
 		  MPI_Fint *datatype, MPI_Fint *op, MPI_Fint *comm,
 		  MPI_Fint *ierr)
diff --git a/src/mpi/f77/file_call_errhandler_f.c b/src/mpi/f77/file_call_errhandler_f.c
index 950117b33e..f94f490b18 100644
--- a/src/mpi/f77/file_call_errhandler_f.c
+++ b/src/mpi/f77/file_call_errhandler_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_CALL_ERRHANDLER,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_file_call_errhandler_f(MPI_Fint *fh, MPI_Fint *errorcode,
 				MPI_Fint *ierr)
 {
diff --git a/src/mpi/f77/file_close_f.c b/src/mpi/f77/file_close_f.c
index 4202caa348..3ab28671c9 100644
--- a/src/mpi/f77/file_close_f.c
+++ b/src/mpi/f77/file_close_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_CLOSE,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_file_close_f(MPI_Fint *fh, MPI_Fint *ierr)
 {
     MPI_File c_fh;
diff --git a/src/mpi/f77/file_create_errhandler_f.c b/src/mpi/f77/file_create_errhandler_f.c
index 1b77f6bb1f..e44d93caf4 100644
--- a/src/mpi/f77/file_create_errhandler_f.c
+++ b/src/mpi/f77/file_create_errhandler_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_CREATE_ERRHANDLER,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_file_create_errhandler_f(MPI_Fint *function, 
 				  MPI_Fint *errhandler, MPI_Fint *ierr)
 {
diff --git a/src/mpi/f77/file_delete_f.c b/src/mpi/f77/file_delete_f.c
index 57214de375..eeecd68f75 100644
--- a/src/mpi/f77/file_delete_f.c
+++ b/src/mpi/f77/file_delete_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_DELETE,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_file_delete_f(char *filename, MPI_Fint *info, MPI_Fint *ierr)
 {
     MPI_Info c_info;
diff --git a/src/mpi/f77/file_get_amode_f.c b/src/mpi/f77/file_get_amode_f.c
index 2028cf6efa..55b811226d 100644
--- a/src/mpi/f77/file_get_amode_f.c
+++ b/src/mpi/f77/file_get_amode_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_GET_AMODE,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_file_get_amode_f(MPI_Fint *fh, MPI_Fint *amode, MPI_Fint *ierr)
 {
     MPI_File c_fh;
diff --git a/src/mpi/f77/file_get_atomicity_f.c b/src/mpi/f77/file_get_atomicity_f.c
index e0c653f97b..3740e3431a 100644
--- a/src/mpi/f77/file_get_atomicity_f.c
+++ b/src/mpi/f77/file_get_atomicity_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_GET_ATOMICITY,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_file_get_atomicity_f(MPI_Fint *fh, MPI_Fint *flag, MPI_Fint *ierr)
 {
     MPI_File c_fh;
diff --git a/src/mpi/f77/file_get_byte_offset_f.c b/src/mpi/f77/file_get_byte_offset_f.c
index 9907fea710..6c45db5d10 100644
--- a/src/mpi/f77/file_get_byte_offset_f.c
+++ b/src/mpi/f77/file_get_byte_offset_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_GET_BYTE_OFFSET,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_file_get_byte_offset_f(MPI_Fint *fh, MPI_Fint *offset,
 				MPI_Fint *disp, MPI_Fint *ierr)
 {
diff --git a/src/mpi/f77/file_get_errhandler_f.c b/src/mpi/f77/file_get_errhandler_f.c
index eada45901e..19e9670ab8 100644
--- a/src/mpi/f77/file_get_errhandler_f.c
+++ b/src/mpi/f77/file_get_errhandler_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_GET_ERRHANDLER,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_file_get_errhandler_f(MPI_Fint *fh, MPI_Fint *errhandler, MPI_Fint *ierr)
 {
     MPI_File c_fh;
diff --git a/src/mpi/f77/file_get_group_f.c b/src/mpi/f77/file_get_group_f.c
index 58f12c9e7a..4d94b719a8 100644
--- a/src/mpi/f77/file_get_group_f.c
+++ b/src/mpi/f77/file_get_group_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_GET_GROUP,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_file_get_group_f(MPI_Fint *fh, MPI_Fint *group, MPI_Fint *ierr)
 {
     MPI_File c_fh = MPI_File_f2c(*fh);
diff --git a/src/mpi/f77/file_get_info_f.c b/src/mpi/f77/file_get_info_f.c
index e6ad7b2a19..904dff9002 100644
--- a/src/mpi/f77/file_get_info_f.c
+++ b/src/mpi/f77/file_get_info_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_GET_INFO,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_file_get_info_f(MPI_Fint *fh, MPI_Fint *info_used, MPI_Fint *ierr)
 {
     MPI_File c_fh = MPI_File_f2c(*fh);
diff --git a/src/mpi/f77/file_get_position_f.c b/src/mpi/f77/file_get_position_f.c
index 67fbfade33..4c9c5d76a5 100644
--- a/src/mpi/f77/file_get_position_f.c
+++ b/src/mpi/f77/file_get_position_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_GET_POSITION,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_file_get_position_f(MPI_Fint *fh, MPI_Fint *offset, MPI_Fint *ierr)
 {
     MPI_File c_fh = MPI_File_f2c(*fh);
diff --git a/src/mpi/f77/file_get_position_shared_f.c b/src/mpi/f77/file_get_position_shared_f.c
index 329c935b9e..8f70ac9a64 100644
--- a/src/mpi/f77/file_get_position_shared_f.c
+++ b/src/mpi/f77/file_get_position_shared_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_GET_POSITION_SHARED,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_file_get_position_shared_f(MPI_Fint *fh, MPI_Fint *offset,
 				    MPI_Fint *ierr)
 {
diff --git a/src/mpi/f77/file_get_size_f.c b/src/mpi/f77/file_get_size_f.c
index 6e00855004..30bc5676c2 100644
--- a/src/mpi/f77/file_get_size_f.c
+++ b/src/mpi/f77/file_get_size_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_GET_SIZE,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_file_get_size_f(MPI_Fint *fh, MPI_Fint *size, MPI_Fint *ierr)
 {
     MPI_File c_fh = MPI_File_f2c(*fh);
diff --git a/src/mpi/f77/file_get_type_extent_f.c b/src/mpi/f77/file_get_type_extent_f.c
index 3457646664..0fe2ece387 100644
--- a/src/mpi/f77/file_get_type_extent_f.c
+++ b/src/mpi/f77/file_get_type_extent_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_GET_TYPE_EXTENT,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_file_get_type_extent_f(MPI_Fint *fh, MPI_Fint *datatype,
 				MPI_Fint *extent, MPI_Fint *ierr)
 {
diff --git a/src/mpi/f77/file_get_view_f.c b/src/mpi/f77/file_get_view_f.c
index c39e08c1db..1de4cee3d3 100644
--- a/src/mpi/f77/file_get_view_f.c
+++ b/src/mpi/f77/file_get_view_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_GET_VIEW,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_file_get_view_f(MPI_Fint *fh, MPI_Fint *disp, 
 			 MPI_Fint *etype, MPI_Fint *filetype, 
 			 char *datarep, MPI_Fint *ierr)
diff --git a/src/mpi/f77/file_iread_at_f.c b/src/mpi/f77/file_iread_at_f.c
index 346c4f641f..10c23e3e76 100644
--- a/src/mpi/f77/file_iread_at_f.c
+++ b/src/mpi/f77/file_iread_at_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_IREAD_AT,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_file_iread_at_f(MPI_Fint *fh, MPI_Fint *offset,
 			 char *buf, MPI_Fint *count, 
 			 MPI_Fint *datatype, MPI_Fint *request, MPI_Fint *ierr)
diff --git a/src/mpi/f77/file_iread_f.c b/src/mpi/f77/file_iread_f.c
index 98ba608194..403a1a6779 100644
--- a/src/mpi/f77/file_iread_f.c
+++ b/src/mpi/f77/file_iread_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_IREAD,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_file_iread_f(MPI_Fint *fh, char *buf, MPI_Fint *count,
 		      MPI_Fint *datatype, MPI_Fint *request, MPI_Fint *ierr)
 {
diff --git a/src/mpi/f77/file_iread_shared_f.c b/src/mpi/f77/file_iread_shared_f.c
index b161189dba..7b9a46a443 100644
--- a/src/mpi/f77/file_iread_shared_f.c
+++ b/src/mpi/f77/file_iread_shared_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_IREAD_SHARED,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_file_iread_shared_f(MPI_Fint *fh, char *buf, MPI_Fint *count,
 			     MPI_Fint *datatype, MPI_Fint *request,
 			     MPI_Fint *ierr)
diff --git a/src/mpi/f77/file_iwrite_at_f.c b/src/mpi/f77/file_iwrite_at_f.c
index 4ebcc21a25..020360dc7f 100644
--- a/src/mpi/f77/file_iwrite_at_f.c
+++ b/src/mpi/f77/file_iwrite_at_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_IWRITE_AT,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_file_iwrite_at_f(MPI_Fint *fh, MPI_Fint *offset, char *buf,
 			  MPI_Fint *count, MPI_Fint *datatype,
 			  MPI_Fint *request, MPI_Fint *ierr)
diff --git a/src/mpi/f77/file_iwrite_f.c b/src/mpi/f77/file_iwrite_f.c
index 3943f28d26..7714735672 100644
--- a/src/mpi/f77/file_iwrite_f.c
+++ b/src/mpi/f77/file_iwrite_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_IWRITE,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_file_iwrite_f(MPI_Fint *fh, char *buf, MPI_Fint *count, MPI_Fint *datatype, MPI_Fint *request, MPI_Fint *ierr)
 {
     MPI_File c_fh = MPI_File_f2c(*fh);
diff --git a/src/mpi/f77/file_iwrite_shared_f.c b/src/mpi/f77/file_iwrite_shared_f.c
index b09b4f0015..890b894c12 100644
--- a/src/mpi/f77/file_iwrite_shared_f.c
+++ b/src/mpi/f77/file_iwrite_shared_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_IWRITE_SHARED,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_file_iwrite_shared_f(MPI_Fint *fh, char *buf, MPI_Fint *count,
 			      MPI_Fint *datatype, MPI_Fint *request,
 			      MPI_Fint *ierr)
diff --git a/src/mpi/f77/file_open_f.c b/src/mpi/f77/file_open_f.c
index 6a2554e9f5..dbd863dde2 100644
--- a/src/mpi/f77/file_open_f.c
+++ b/src/mpi/f77/file_open_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_OPEN,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_file_open_f(MPI_Fint *comm, char *filename, MPI_Fint *amode,
 		     MPI_Fint *info, MPI_Fint *fh, MPI_Fint *ierr)
 {
diff --git a/src/mpi/f77/file_preallocate_f.c b/src/mpi/f77/file_preallocate_f.c
index 8d33b3d70d..3b23568a8e 100644
--- a/src/mpi/f77/file_preallocate_f.c
+++ b/src/mpi/f77/file_preallocate_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_PREALLOCATE,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_file_preallocate_f(MPI_Fint *fh, MPI_Fint *size, MPI_Fint *ierr)
 {
     MPI_File c_fh = MPI_File_f2c(*fh);
diff --git a/src/mpi/f77/file_read_all_begin_f.c b/src/mpi/f77/file_read_all_begin_f.c
index 70922dd1d1..189513674b 100644
--- a/src/mpi/f77/file_read_all_begin_f.c
+++ b/src/mpi/f77/file_read_all_begin_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_READ_ALL_BEGIN,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_file_read_all_begin_f(MPI_Fint *fh, char *buf,
 			       MPI_Fint *count, MPI_Fint *datatype,
 			       MPI_Fint *ierr)
diff --git a/src/mpi/f77/file_read_all_end_f.c b/src/mpi/f77/file_read_all_end_f.c
index a0d28cb696..2aac3c6f7c 100644
--- a/src/mpi/f77/file_read_all_end_f.c
+++ b/src/mpi/f77/file_read_all_end_f.c
@@ -49,7 +49,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_READ_ALL_END,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_file_read_all_end_f(MPI_Fint *fh, char *buf, MPI_Fint *status,
 			     MPI_Fint *ierr)
 {
diff --git a/src/mpi/f77/file_read_all_f.c b/src/mpi/f77/file_read_all_f.c
index d067be4db8..4dbacb279e 100644
--- a/src/mpi/f77/file_read_all_f.c
+++ b/src/mpi/f77/file_read_all_f.c
@@ -49,7 +49,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_READ_ALL,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_file_read_all_f(MPI_Fint *fh, char *buf, MPI_Fint *count,
 			 MPI_Fint *datatype, MPI_Fint *status, MPI_Fint *ierr)
 {
diff --git a/src/mpi/f77/file_read_at_all_begin_f.c b/src/mpi/f77/file_read_at_all_begin_f.c
index 06561a3f0e..feb32ad790 100644
--- a/src/mpi/f77/file_read_at_all_begin_f.c
+++ b/src/mpi/f77/file_read_at_all_begin_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_READ_AT_ALL_BEGIN,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_file_read_at_all_begin_f(MPI_Fint *fh, MPI_Fint *offset,
 				  char *buf, MPI_Fint *count,
 				  MPI_Fint *datatype, MPI_Fint *ierr)
diff --git a/src/mpi/f77/file_read_at_all_end_f.c b/src/mpi/f77/file_read_at_all_end_f.c
index ebd2e85817..49a313df8b 100644
--- a/src/mpi/f77/file_read_at_all_end_f.c
+++ b/src/mpi/f77/file_read_at_all_end_f.c
@@ -49,7 +49,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_READ_AT_ALL_END,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_file_read_at_all_end_f(MPI_Fint *fh, char *buf, 
 				MPI_Fint *status, MPI_Fint *ierr)
 {
diff --git a/src/mpi/f77/file_read_at_all_f.c b/src/mpi/f77/file_read_at_all_f.c
index 0e9168192a..b35c596e66 100644
--- a/src/mpi/f77/file_read_at_all_f.c
+++ b/src/mpi/f77/file_read_at_all_f.c
@@ -49,7 +49,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_READ_AT_ALL,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_file_read_at_all_f(MPI_Fint *fh, MPI_Fint *offset,
 			    char *buf, MPI_Fint *count, 
 			    MPI_Fint *datatype, MPI_Fint *status,
diff --git a/src/mpi/f77/file_read_at_f.c b/src/mpi/f77/file_read_at_f.c
index a9b7eb8232..3171871309 100644
--- a/src/mpi/f77/file_read_at_f.c
+++ b/src/mpi/f77/file_read_at_f.c
@@ -49,7 +49,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_READ_AT,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_file_read_at_f(MPI_Fint *fh, MPI_Fint *offset, char *buf, 
 			MPI_Fint *count, MPI_Fint *datatype,
 			MPI_Fint *status, MPI_Fint *ierr)
diff --git a/src/mpi/f77/file_read_f.c b/src/mpi/f77/file_read_f.c
index c81c9f885c..9af8f4b94d 100644
--- a/src/mpi/f77/file_read_f.c
+++ b/src/mpi/f77/file_read_f.c
@@ -49,7 +49,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_READ,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_file_read_f(MPI_Fint *fh, char *buf, MPI_Fint *count,
 		     MPI_Fint *datatype, MPI_Fint *status, MPI_Fint *ierr)
 {
diff --git a/src/mpi/f77/file_read_ordered_begin_f.c b/src/mpi/f77/file_read_ordered_begin_f.c
index c75c0447c3..e445213757 100644
--- a/src/mpi/f77/file_read_ordered_begin_f.c
+++ b/src/mpi/f77/file_read_ordered_begin_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_READ_ORDERED_BEGIN,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_file_read_ordered_begin_f(MPI_Fint *fh, char *buf, MPI_Fint *count, 
 				   MPI_Fint *datatype, MPI_Fint *ierr)
 {
diff --git a/src/mpi/f77/file_read_ordered_end_f.c b/src/mpi/f77/file_read_ordered_end_f.c
index ac33e2c046..0769acb68a 100644
--- a/src/mpi/f77/file_read_ordered_end_f.c
+++ b/src/mpi/f77/file_read_ordered_end_f.c
@@ -49,7 +49,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_READ_ORDERED_END,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_file_read_ordered_end_f(MPI_Fint *fh, char *buf,
 				 MPI_Fint *status, MPI_Fint *ierr)
 {
diff --git a/src/mpi/f77/file_read_ordered_f.c b/src/mpi/f77/file_read_ordered_f.c
index cf64871d5a..f9d66e96c5 100644
--- a/src/mpi/f77/file_read_ordered_f.c
+++ b/src/mpi/f77/file_read_ordered_f.c
@@ -49,7 +49,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_READ_ORDERED,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_file_read_ordered_f(MPI_Fint *fh, char *buf, MPI_Fint *count,
 			     MPI_Fint *datatype, MPI_Fint *status, 
 			     MPI_Fint *ierr)
diff --git a/src/mpi/f77/file_read_shared_f.c b/src/mpi/f77/file_read_shared_f.c
index ccf2699a9c..6643fc8902 100644
--- a/src/mpi/f77/file_read_shared_f.c
+++ b/src/mpi/f77/file_read_shared_f.c
@@ -49,7 +49,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_READ_SHARED,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_file_read_shared_f(MPI_Fint *fh, char *buf, MPI_Fint *count,
 			    MPI_Fint *datatype, MPI_Fint *status, 
 			    MPI_Fint *ierr)
diff --git a/src/mpi/f77/file_seek_f.c b/src/mpi/f77/file_seek_f.c
index 992586ba5a..1fb543f023 100644
--- a/src/mpi/f77/file_seek_f.c
+++ b/src/mpi/f77/file_seek_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_SEEK,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_file_seek_f(MPI_Fint *fh, MPI_Fint *offset, 
 		     MPI_Fint *whence, MPI_Fint *ierr)
 {
diff --git a/src/mpi/f77/file_seek_shared_f.c b/src/mpi/f77/file_seek_shared_f.c
index 72a1512564..f57d539505 100644
--- a/src/mpi/f77/file_seek_shared_f.c
+++ b/src/mpi/f77/file_seek_shared_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_SEEK_SHARED,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_file_seek_shared_f(MPI_Fint *fh, MPI_Fint *offset, 
 			    MPI_Fint *whence, MPI_Fint *ierr)
 {    
diff --git a/src/mpi/f77/file_set_atomicity_f.c b/src/mpi/f77/file_set_atomicity_f.c
index 8d4c658a6e..ae41cb1000 100644
--- a/src/mpi/f77/file_set_atomicity_f.c
+++ b/src/mpi/f77/file_set_atomicity_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_SET_ATOMICITY,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_file_set_atomicity_f(MPI_Fint *fh, MPI_Fint *flag, MPI_Fint *ierr)
 {
     MPI_File c_fh = MPI_File_f2c(*fh);
diff --git a/src/mpi/f77/file_set_errhandler_f.c b/src/mpi/f77/file_set_errhandler_f.c
index 05d4eb8cf6..44bb902656 100644
--- a/src/mpi/f77/file_set_errhandler_f.c
+++ b/src/mpi/f77/file_set_errhandler_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_SET_ERRHANDLER,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_file_set_errhandler_f(MPI_Fint *fh, MPI_Fint *errhandler,
 			       MPI_Fint *ierr)
 {
diff --git a/src/mpi/f77/file_set_info_f.c b/src/mpi/f77/file_set_info_f.c
index 4544ddc66c..3e10896a0b 100644
--- a/src/mpi/f77/file_set_info_f.c
+++ b/src/mpi/f77/file_set_info_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_SET_INFO,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_file_set_info_f(MPI_Fint *fh, MPI_Fint *info, MPI_Fint *ierr)
 {
     MPI_File c_fh = MPI_File_f2c(*fh);
diff --git a/src/mpi/f77/file_set_size_f.c b/src/mpi/f77/file_set_size_f.c
index ae82a1f68c..34139b3de0 100644
--- a/src/mpi/f77/file_set_size_f.c
+++ b/src/mpi/f77/file_set_size_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_SET_SIZE,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_file_set_size_f(MPI_Fint *fh, MPI_Fint *size, MPI_Fint *ierr)
 {
     MPI_File c_fh = MPI_File_f2c(*fh);
diff --git a/src/mpi/f77/file_set_view_f.c b/src/mpi/f77/file_set_view_f.c
index 4f2a3d9700..c289717575 100644
--- a/src/mpi/f77/file_set_view_f.c
+++ b/src/mpi/f77/file_set_view_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_SET_VIEW,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_file_set_view_f(MPI_Fint *fh, MPI_Fint *disp,
 			 MPI_Fint *etype, MPI_Fint *filetype,
 			 char *datarep, MPI_Fint *info, MPI_Fint *ierr)
diff --git a/src/mpi/f77/file_sync_f.c b/src/mpi/f77/file_sync_f.c
index 0058b683b8..a34531e3f4 100644
--- a/src/mpi/f77/file_sync_f.c
+++ b/src/mpi/f77/file_sync_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_SYNC,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_file_sync_f(MPI_Fint *fh, MPI_Fint *ierr)
 {
     MPI_File c_fh = MPI_File_f2c(*fh);
diff --git a/src/mpi/f77/file_write_all_begin_f.c b/src/mpi/f77/file_write_all_begin_f.c
index e00febc8e8..44ff5e6101 100644
--- a/src/mpi/f77/file_write_all_begin_f.c
+++ b/src/mpi/f77/file_write_all_begin_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_WRITE_ALL_BEGIN,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_file_write_all_begin_f(MPI_Fint *fh, char *buf, 
 				MPI_Fint *count, MPI_Fint *datatype,
 				MPI_Fint *ierr)
diff --git a/src/mpi/f77/file_write_all_end_f.c b/src/mpi/f77/file_write_all_end_f.c
index 73d0173e63..a664f554a9 100644
--- a/src/mpi/f77/file_write_all_end_f.c
+++ b/src/mpi/f77/file_write_all_end_f.c
@@ -49,7 +49,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_WRITE_ALL_END,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_file_write_all_end_f(MPI_Fint *fh, char *buf, MPI_Fint *status,
 			      MPI_Fint *ierr)
 {
diff --git a/src/mpi/f77/file_write_all_f.c b/src/mpi/f77/file_write_all_f.c
index 13da2e34b5..653aa68eaf 100644
--- a/src/mpi/f77/file_write_all_f.c
+++ b/src/mpi/f77/file_write_all_f.c
@@ -49,7 +49,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_WRITE_ALL,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_file_write_all_f(MPI_Fint *fh, char *buf, MPI_Fint *count,
 			  MPI_Fint *datatype, MPI_Fint *status, MPI_Fint *ierr)
 {
diff --git a/src/mpi/f77/file_write_at_all_begin_f.c b/src/mpi/f77/file_write_at_all_begin_f.c
index e9a921ccd0..d4c1e3c301 100644
--- a/src/mpi/f77/file_write_at_all_begin_f.c
+++ b/src/mpi/f77/file_write_at_all_begin_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_WRITE_AT_ALL_BEGIN,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_file_write_at_all_begin_f(MPI_Fint *fh, MPI_Fint *offset, 
 				   char *buf, MPI_Fint *count,
 				   MPI_Fint *datatype, MPI_Fint *ierr)
diff --git a/src/mpi/f77/file_write_at_all_end_f.c b/src/mpi/f77/file_write_at_all_end_f.c
index de5449843b..ea0d48b36c 100644
--- a/src/mpi/f77/file_write_at_all_end_f.c
+++ b/src/mpi/f77/file_write_at_all_end_f.c
@@ -49,7 +49,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_WRITE_AT_ALL_END,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_file_write_at_all_end_f(MPI_Fint *fh, char *buf,
 				 MPI_Fint *status, MPI_Fint *ierr)
 {
diff --git a/src/mpi/f77/file_write_at_all_f.c b/src/mpi/f77/file_write_at_all_f.c
index 1296f2ea9e..cabd270891 100644
--- a/src/mpi/f77/file_write_at_all_f.c
+++ b/src/mpi/f77/file_write_at_all_f.c
@@ -49,7 +49,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_WRITE_AT_ALL,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_file_write_at_all_f(MPI_Fint *fh, MPI_Fint *offset,
 			     char *buf, MPI_Fint *count,
 			     MPI_Fint *datatype, MPI_Fint *status,
diff --git a/src/mpi/f77/file_write_at_f.c b/src/mpi/f77/file_write_at_f.c
index 02f11bdb68..66723356b3 100644
--- a/src/mpi/f77/file_write_at_f.c
+++ b/src/mpi/f77/file_write_at_f.c
@@ -49,7 +49,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_WRITE_AT,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_file_write_at_f(MPI_Fint *fh, MPI_Fint *offset,
 			 char *buf, MPI_Fint *count, 
 			 MPI_Fint *datatype, MPI_Fint *status, MPI_Fint *ierr)
diff --git a/src/mpi/f77/file_write_f.c b/src/mpi/f77/file_write_f.c
index 266aac3e7c..b46826a43f 100644
--- a/src/mpi/f77/file_write_f.c
+++ b/src/mpi/f77/file_write_f.c
@@ -49,7 +49,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_WRITE,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_file_write_f(MPI_Fint *fh, char *buf, MPI_Fint *count,
 		      MPI_Fint *datatype, MPI_Fint *status, MPI_Fint *ierr)
 {
diff --git a/src/mpi/f77/file_write_ordered_begin_f.c b/src/mpi/f77/file_write_ordered_begin_f.c
index 8ffac6f7fb..b4e9a4b7ea 100644
--- a/src/mpi/f77/file_write_ordered_begin_f.c
+++ b/src/mpi/f77/file_write_ordered_begin_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_WRITE_ORDERED_BEGIN,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_file_write_ordered_begin_f(MPI_Fint *fh, char *buf, 
 				    MPI_Fint *count, MPI_Fint *datatype, 
 				    MPI_Fint *ierr)
diff --git a/src/mpi/f77/file_write_ordered_end_f.c b/src/mpi/f77/file_write_ordered_end_f.c
index 4c6a6c9736..9bd645a5ed 100644
--- a/src/mpi/f77/file_write_ordered_end_f.c
+++ b/src/mpi/f77/file_write_ordered_end_f.c
@@ -49,7 +49,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_WRITE_ORDERED_END,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_file_write_ordered_end_f(MPI_Fint *fh, char *buf,
 				  MPI_Fint *status, MPI_Fint *ierr)
 {
diff --git a/src/mpi/f77/file_write_ordered_f.c b/src/mpi/f77/file_write_ordered_f.c
index d4ef206b80..c02561df1e 100644
--- a/src/mpi/f77/file_write_ordered_f.c
+++ b/src/mpi/f77/file_write_ordered_f.c
@@ -49,7 +49,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_WRITE_ORDERED,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_file_write_ordered_f(MPI_Fint *fh, char *buf, MPI_Fint *count,
 			      MPI_Fint *datatype, MPI_Fint *status,
 			      MPI_Fint *ierr)
diff --git a/src/mpi/f77/file_write_shared_f.c b/src/mpi/f77/file_write_shared_f.c
index 97f2fdd188..34a7441196 100644
--- a/src/mpi/f77/file_write_shared_f.c
+++ b/src/mpi/f77/file_write_shared_f.c
@@ -49,7 +49,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_WRITE_SHARED,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_file_write_shared_f(MPI_Fint *fh, char *buf, MPI_Fint *count,
 			     MPI_Fint *datatype, MPI_Fint *status,
 			     MPI_Fint *ierr)
diff --git a/src/mpi/f77/finalize_f.c b/src/mpi/f77/finalize_f.c
index 13cee4df22..81e85bfe4b 100644
--- a/src/mpi/f77/finalize_f.c
+++ b/src/mpi/f77/finalize_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FINALIZE,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_finalize_f(MPI_Fint *ierr)
 {
     *ierr = OMPI_INT_2_FINT(MPI_Finalize());
diff --git a/src/mpi/f77/finalized_f.c b/src/mpi/f77/finalized_f.c
index ceb9ce0b02..37552cf864 100644
--- a/src/mpi/f77/finalized_f.c
+++ b/src/mpi/f77/finalized_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FINALIZED,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_finalized_f(MPI_Fint *flag, MPI_Fint *ierr)
 {
     OMPI_SINGLE_NAME_DECL(flag);
diff --git a/src/mpi/f77/free_mem_f.c b/src/mpi/f77/free_mem_f.c
index 71d5420d26..0165a6a737 100644
--- a/src/mpi/f77/free_mem_f.c
+++ b/src/mpi/f77/free_mem_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FREE_MEM,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_free_mem_f(char *base, MPI_Fint *ierr)
 {
     *ierr = OMPI_INT_2_FINT(MPI_Free_mem(base));
diff --git a/src/mpi/f77/gather_f.c b/src/mpi/f77/gather_f.c
index a8e70cbc37..89f3b91ecd 100644
--- a/src/mpi/f77/gather_f.c
+++ b/src/mpi/f77/gather_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_GATHER,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_gather_f(char *sendbuf, MPI_Fint *sendcount, MPI_Fint *sendtype,
 		  char *recvbuf, MPI_Fint *recvcount, MPI_Fint *recvtype, 
 		  MPI_Fint *root, MPI_Fint *comm, MPI_Fint *ierr)
diff --git a/src/mpi/f77/gatherv_f.c b/src/mpi/f77/gatherv_f.c
index 39a21b8372..de7d8ff40f 100644
--- a/src/mpi/f77/gatherv_f.c
+++ b/src/mpi/f77/gatherv_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_GATHERV,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_gatherv_f(char *sendbuf, MPI_Fint *sendcount, MPI_Fint *sendtype,
 		   char *recvbuf, MPI_Fint *recvcounts, MPI_Fint *displs,
 		   MPI_Fint *recvtype, MPI_Fint *root, MPI_Fint *comm,
diff --git a/src/mpi/f77/get_address_f.c b/src/mpi/f77/get_address_f.c
index 964e7513e3..4872129fbc 100644
--- a/src/mpi/f77/get_address_f.c
+++ b/src/mpi/f77/get_address_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_GET_ADDRESS,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_get_address_f(char *location, MPI_Fint *address, MPI_Fint *ierr)
 {
     MPI_Aint c_address;
diff --git a/src/mpi/f77/get_count_f.c b/src/mpi/f77/get_count_f.c
index 9f197cde1c..272467dbd9 100644
--- a/src/mpi/f77/get_count_f.c
+++ b/src/mpi/f77/get_count_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_GET_COUNT,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_get_count_f(MPI_Fint *status, MPI_Fint *datatype, MPI_Fint *count, MPI_Fint *ierr)
 {
     MPI_Datatype c_type = MPI_Type_f2c(*datatype);
diff --git a/src/mpi/f77/get_elements_f.c b/src/mpi/f77/get_elements_f.c
index 81d1bd488c..c237a5732b 100644
--- a/src/mpi/f77/get_elements_f.c
+++ b/src/mpi/f77/get_elements_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_GET_ELEMENTS,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_get_elements_f(MPI_Fint *status, MPI_Fint *datatype, MPI_Fint *count, MPI_Fint *ierr)
 {
     MPI_Datatype c_type = MPI_Type_f2c(*datatype);
diff --git a/src/mpi/f77/get_f.c b/src/mpi/f77/get_f.c
index 68080f3d57..5a5e2c9da0 100644
--- a/src/mpi/f77/get_f.c
+++ b/src/mpi/f77/get_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_GET,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_get_f(char *origin_addr, MPI_Fint *origin_count,
 	       MPI_Fint *origin_datatype, MPI_Fint *target_rank,
 	       MPI_Fint *target_disp, MPI_Fint *target_count,
diff --git a/src/mpi/f77/get_processor_name_f.c b/src/mpi/f77/get_processor_name_f.c
index 721d2b9aa6..69115d9b08 100644
--- a/src/mpi/f77/get_processor_name_f.c
+++ b/src/mpi/f77/get_processor_name_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_GET_PROCESSOR_NAME,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_get_processor_name_f(char *name, MPI_Fint *resultlen, MPI_Fint *ierr)
 {
     OMPI_SINGLE_NAME_DECL(resultlen);
diff --git a/src/mpi/f77/get_version_f.c b/src/mpi/f77/get_version_f.c
index 4e4e15ebaf..1f161289c1 100644
--- a/src/mpi/f77/get_version_f.c
+++ b/src/mpi/f77/get_version_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_GET_VERSION,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_get_version_f(MPI_Fint *version, MPI_Fint *subversion, MPI_Fint *ierr)
 {
     OMPI_SINGLE_NAME_DECL(version);
diff --git a/src/mpi/f77/graph_create_f.c b/src/mpi/f77/graph_create_f.c
index b215789617..8a065f947e 100644
--- a/src/mpi/f77/graph_create_f.c
+++ b/src/mpi/f77/graph_create_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_GRAPH_CREATE,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_graph_create_f(MPI_Fint *comm_old, MPI_Fint *nnodes,
 			MPI_Fint *index, MPI_Fint *edges,
 			MPI_Fint *reorder, MPI_Fint *comm_graph,
diff --git a/src/mpi/f77/graph_get_f.c b/src/mpi/f77/graph_get_f.c
index fc37e3ea31..c7c89894d5 100644
--- a/src/mpi/f77/graph_get_f.c
+++ b/src/mpi/f77/graph_get_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_GRAPH_GET,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_graph_get_f(MPI_Fint *comm, MPI_Fint *maxindex, 
 		     MPI_Fint *maxedges, MPI_Fint *index, 
 		     MPI_Fint *edges, MPI_Fint *ierr)
diff --git a/src/mpi/f77/graph_map_f.c b/src/mpi/f77/graph_map_f.c
index 9b216db9b9..c15ad6b912 100644
--- a/src/mpi/f77/graph_map_f.c
+++ b/src/mpi/f77/graph_map_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_GRAPH_MAP,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_graph_map_f(MPI_Fint *comm, MPI_Fint *nnodes, MPI_Fint *index,
 		     MPI_Fint *edges, MPI_Fint *nrank, MPI_Fint *ierr)
 {
diff --git a/src/mpi/f77/graph_neighbors_count_f.c b/src/mpi/f77/graph_neighbors_count_f.c
index 5b11d6dfcf..820a462e8f 100644
--- a/src/mpi/f77/graph_neighbors_count_f.c
+++ b/src/mpi/f77/graph_neighbors_count_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_GRAPH_NEIGHBORS_COUNT,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_graph_neighbors_count_f(MPI_Fint *comm, MPI_Fint *rank,
 				 MPI_Fint *nneighbors, MPI_Fint *ierr)
 {
diff --git a/src/mpi/f77/graph_neighbors_f.c b/src/mpi/f77/graph_neighbors_f.c
index c50b9fd2a1..1863bb9934 100644
--- a/src/mpi/f77/graph_neighbors_f.c
+++ b/src/mpi/f77/graph_neighbors_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_GRAPH_NEIGHBORS,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_graph_neighbors_f(MPI_Fint *comm, MPI_Fint *rank,
 			   MPI_Fint *maxneighbors, MPI_Fint *neighbors, 
 			   MPI_Fint *ierr)
diff --git a/src/mpi/f77/graphdims_get_f.c b/src/mpi/f77/graphdims_get_f.c
index 3e939194af..8321817fb3 100644
--- a/src/mpi/f77/graphdims_get_f.c
+++ b/src/mpi/f77/graphdims_get_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_GRAPHDIMS_GET,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_graphdims_get_f(MPI_Fint *comm, MPI_Fint *nnodes,
 			 MPI_Fint *nedges, MPI_Fint *ierr)
 {
diff --git a/src/mpi/f77/grequest_complete_f.c b/src/mpi/f77/grequest_complete_f.c
index 5ec05a78ff..fa30643fa8 100644
--- a/src/mpi/f77/grequest_complete_f.c
+++ b/src/mpi/f77/grequest_complete_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_GREQUEST_COMPLETE,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_grequest_complete_f(MPI_Fint *request, MPI_Fint *ierr)
 {
     MPI_Request c_req = MPI_Request_f2c(*request);
diff --git a/src/mpi/f77/grequest_start_f.c b/src/mpi/f77/grequest_start_f.c
index bd8e6bd037..86d97741b7 100644
--- a/src/mpi/f77/grequest_start_f.c
+++ b/src/mpi/f77/grequest_start_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_GREQUEST_START,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_grequest_start_f(MPI_Fint *query_fn, MPI_Fint *free_fn,
 			  MPI_Fint *cancel_fn, char *extra_state,
 			  MPI_Fint *request, MPI_Fint *ierr)
diff --git a/src/mpi/f77/group_compare_f.c b/src/mpi/f77/group_compare_f.c
index 5ba952cb7a..26a1c6b009 100644
--- a/src/mpi/f77/group_compare_f.c
+++ b/src/mpi/f77/group_compare_f.c
@@ -49,7 +49,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_GROUP_COMPARE,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_group_compare_f(MPI_Fint *group1, MPI_Fint *group2,
                          MPI_Fint *result, MPI_Fint *ierr)
 {
diff --git a/src/mpi/f77/group_difference_f.c b/src/mpi/f77/group_difference_f.c
index 88eaed123d..d2cc840208 100644
--- a/src/mpi/f77/group_difference_f.c
+++ b/src/mpi/f77/group_difference_f.c
@@ -47,7 +47,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_GROUP_DIFFERENCE,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_group_difference_f(MPI_Fint *group1, MPI_Fint *group2, MPI_Fint *newgroup, MPI_Fint *ierr)
 {
   ompi_group_t *c_group1, *c_group2, *c_newgroup;
diff --git a/src/mpi/f77/group_excl_f.c b/src/mpi/f77/group_excl_f.c
index 2de5fa5b01..ca3c9e640f 100644
--- a/src/mpi/f77/group_excl_f.c
+++ b/src/mpi/f77/group_excl_f.c
@@ -47,7 +47,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_GROUP_EXCL,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_group_excl_f(MPI_Fint *group, MPI_Fint *n,
 		      MPI_Fint *ranks, MPI_Fint *newgroup, 
 		      MPI_Fint *ierr)
diff --git a/src/mpi/f77/group_free_f.c b/src/mpi/f77/group_free_f.c
index 22e449d28a..537b0728ba 100644
--- a/src/mpi/f77/group_free_f.c
+++ b/src/mpi/f77/group_free_f.c
@@ -47,7 +47,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_GROUP_FREE,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_group_free_f(MPI_Fint *group, MPI_Fint *ierr)
 {
   ompi_group_t *c_group;
diff --git a/src/mpi/f77/group_incl_f.c b/src/mpi/f77/group_incl_f.c
index 347398c13a..caac3d5d60 100644
--- a/src/mpi/f77/group_incl_f.c
+++ b/src/mpi/f77/group_incl_f.c
@@ -47,7 +47,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_GROUP_INCL,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_group_incl_f(MPI_Fint *group, MPI_Fint *n, MPI_Fint *ranks, MPI_Fint *newgroup, MPI_Fint *ierr)
 {
     /* local variables */
diff --git a/src/mpi/f77/group_intersection_f.c b/src/mpi/f77/group_intersection_f.c
index 02858c18c6..1e98d34e31 100644
--- a/src/mpi/f77/group_intersection_f.c
+++ b/src/mpi/f77/group_intersection_f.c
@@ -47,7 +47,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_GROUP_INTERSECTION,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_group_intersection_f(MPI_Fint *group1, MPI_Fint *group2, MPI_Fint *newgroup, MPI_Fint *ierr)
 {
   ompi_group_t *c_group1, *c_group2, *c_newgroup;
diff --git a/src/mpi/f77/group_range_excl_f.c b/src/mpi/f77/group_range_excl_f.c
index 27d930a4c9..a01f43666a 100644
--- a/src/mpi/f77/group_range_excl_f.c
+++ b/src/mpi/f77/group_range_excl_f.c
@@ -47,7 +47,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_GROUP_RANGE_EXCL,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_group_range_excl_f(MPI_Fint *group, MPI_Fint *n, MPI_Fint ranges[][3], MPI_Fint *newgroup, MPI_Fint *ierr)
 {
   ompi_group_t *c_group, *c_newgroup;
diff --git a/src/mpi/f77/group_range_incl_f.c b/src/mpi/f77/group_range_incl_f.c
index 5212b4f633..34e48bd65f 100644
--- a/src/mpi/f77/group_range_incl_f.c
+++ b/src/mpi/f77/group_range_incl_f.c
@@ -47,7 +47,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_GROUP_RANGE_INCL,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_group_range_incl_f(MPI_Fint *group, MPI_Fint *n, MPI_Fint ranges[][3], MPI_Fint *newgroup, MPI_Fint *ierr)
 {
   ompi_group_t *c_group, *c_newgroup;
diff --git a/src/mpi/f77/group_rank_f.c b/src/mpi/f77/group_rank_f.c
index c73a7dc54e..af2e57fbe1 100644
--- a/src/mpi/f77/group_rank_f.c
+++ b/src/mpi/f77/group_rank_f.c
@@ -47,7 +47,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_GROUP_RANK,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_group_rank_f(MPI_Fint *group, MPI_Fint *rank, MPI_Fint *ierr)
 {
   ompi_group_t *c_group;
diff --git a/src/mpi/f77/group_size_f.c b/src/mpi/f77/group_size_f.c
index 48c9382f47..65056d635b 100644
--- a/src/mpi/f77/group_size_f.c
+++ b/src/mpi/f77/group_size_f.c
@@ -47,7 +47,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_GROUP_SIZE,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_group_size_f(MPI_Fint *group, MPI_Fint *size, MPI_Fint *ierr)
 {
   ompi_group_t *c_group;
diff --git a/src/mpi/f77/group_translate_ranks_f.c b/src/mpi/f77/group_translate_ranks_f.c
index 1692153ad3..24c7bb40c6 100644
--- a/src/mpi/f77/group_translate_ranks_f.c
+++ b/src/mpi/f77/group_translate_ranks_f.c
@@ -47,7 +47,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_GROUP_TRANSLATE_RANKS,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_group_translate_ranks_f(MPI_Fint *group1, MPI_Fint *n, 
 				  MPI_Fint *ranks1, MPI_Fint *group2,
 				  MPI_Fint *ranks2, MPI_Fint *ierr)
diff --git a/src/mpi/f77/group_union_f.c b/src/mpi/f77/group_union_f.c
index 88d991b423..736c5b0e03 100644
--- a/src/mpi/f77/group_union_f.c
+++ b/src/mpi/f77/group_union_f.c
@@ -47,7 +47,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_GROUP_UNION,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_group_union_f(MPI_Fint *group1, MPI_Fint *group2, MPI_Fint *newgroup, MPI_Fint *ierr)
 {
   ompi_group_t *c_group1, *c_group2, *c_newgroup;
diff --git a/src/mpi/f77/ibsend_f.c b/src/mpi/f77/ibsend_f.c
index 284b741fd2..d57ebad109 100644
--- a/src/mpi/f77/ibsend_f.c
+++ b/src/mpi/f77/ibsend_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_IBSEND,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_ibsend_f(char *buf, MPI_Fint *count, MPI_Fint *datatype,
 		  MPI_Fint *dest, MPI_Fint *tag, MPI_Fint *comm, 
 		  MPI_Fint *request, MPI_Fint *ierr)
diff --git a/src/mpi/f77/info_create_f.c b/src/mpi/f77/info_create_f.c
index e6095774ec..554c08fc04 100644
--- a/src/mpi/f77/info_create_f.c
+++ b/src/mpi/f77/info_create_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_INFO_CREATE,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_info_create_f(MPI_Fint *info, MPI_Fint *ierr)
 {
     MPI_Info c_info;
diff --git a/src/mpi/f77/info_delete_f.c b/src/mpi/f77/info_delete_f.c
index ea01f9c7bc..11e33bb5f8 100644
--- a/src/mpi/f77/info_delete_f.c
+++ b/src/mpi/f77/info_delete_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_INFO_DELETE,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_info_delete_f(MPI_Fint *info, char *key, MPI_Fint *ierr)
 {
     MPI_Info c_info;
diff --git a/src/mpi/f77/info_dup_f.c b/src/mpi/f77/info_dup_f.c
index ae6dc1b50b..3107e51413 100644
--- a/src/mpi/f77/info_dup_f.c
+++ b/src/mpi/f77/info_dup_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_INFO_DUP,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_info_dup_f(MPI_Fint *info, MPI_Fint *newinfo, MPI_Fint *ierr)
 {
     MPI_Info c_info, c_new_info;
diff --git a/src/mpi/f77/info_free_f.c b/src/mpi/f77/info_free_f.c
index 6652a27a0e..55513ffb36 100644
--- a/src/mpi/f77/info_free_f.c
+++ b/src/mpi/f77/info_free_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_INFO_FREE,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_info_free_f(MPI_Fint *info, MPI_Fint *ierr)
 {
     MPI_Info c_info;
diff --git a/src/mpi/f77/info_get_f.c b/src/mpi/f77/info_get_f.c
index c9f9023476..50486537b8 100644
--- a/src/mpi/f77/info_get_f.c
+++ b/src/mpi/f77/info_get_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_INFO_GET,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_info_get_f(MPI_Fint *info, char *key, MPI_Fint *valuelen,
 		    char *value, MPI_Fint *flag, MPI_Fint *ierr)
 {
diff --git a/src/mpi/f77/info_get_nkeys_f.c b/src/mpi/f77/info_get_nkeys_f.c
index 7ecd977c80..9e303c5d0b 100644
--- a/src/mpi/f77/info_get_nkeys_f.c
+++ b/src/mpi/f77/info_get_nkeys_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_INFO_GET_NKEYS,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_info_get_nkeys_f(MPI_Fint *info, MPI_Fint *nkeys, MPI_Fint *ierr)
 {
     MPI_Info c_info;
diff --git a/src/mpi/f77/info_get_nthkey_f.c b/src/mpi/f77/info_get_nthkey_f.c
index dafae8c074..828a2679f9 100644
--- a/src/mpi/f77/info_get_nthkey_f.c
+++ b/src/mpi/f77/info_get_nthkey_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_INFO_GET_NTHKEY,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_info_get_nthkey_f(MPI_Fint *info, MPI_Fint *n, char *key,
 			   MPI_Fint *ierr)
 {
diff --git a/src/mpi/f77/info_get_valuelen_f.c b/src/mpi/f77/info_get_valuelen_f.c
index 68d0b02b7c..1bfa392278 100644
--- a/src/mpi/f77/info_get_valuelen_f.c
+++ b/src/mpi/f77/info_get_valuelen_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_INFO_GET_VALUELEN,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_info_get_valuelen_f(MPI_Fint *info, char *key,
 			     MPI_Fint *valuelen, MPI_Fint *flag,
 			     MPI_Fint *ierr)
diff --git a/src/mpi/f77/info_set_f.c b/src/mpi/f77/info_set_f.c
index 45ba8d564c..0f7d07b457 100644
--- a/src/mpi/f77/info_set_f.c
+++ b/src/mpi/f77/info_set_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_INFO_SET,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_info_set_f(MPI_Fint *info, char *key, char *value, MPI_Fint *ierr)
 {
     MPI_Info c_info;
diff --git a/src/mpi/f77/init_f.c b/src/mpi/f77/init_f.c
index 3e8756d01a..a0356baacc 100644
--- a/src/mpi/f77/init_f.c
+++ b/src/mpi/f77/init_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_INIT,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_init_f( MPI_Fint *ierr )
 {
     int argc = 0;
diff --git a/src/mpi/f77/init_thread_f.c b/src/mpi/f77/init_thread_f.c
index a0adb16080..8a32137c40 100644
--- a/src/mpi/f77/init_thread_f.c
+++ b/src/mpi/f77/init_thread_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_INIT_THREAD,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_init_thread_f( MPI_Fint *required, MPI_Fint *provided, MPI_Fint *ierr )
 {
     int argc = 0;
diff --git a/src/mpi/f77/initialized_f.c b/src/mpi/f77/initialized_f.c
index 9dd94f89d4..262ba0fb6f 100644
--- a/src/mpi/f77/initialized_f.c
+++ b/src/mpi/f77/initialized_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_INITIALIZED,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_initialized_f(MPI_Fint *flag, MPI_Fint *ierr)
 {
     OMPI_SINGLE_NAME_DECL(flag);
diff --git a/src/mpi/f77/intercomm_create_f.c b/src/mpi/f77/intercomm_create_f.c
index 624206625a..7604b13f6b 100644
--- a/src/mpi/f77/intercomm_create_f.c
+++ b/src/mpi/f77/intercomm_create_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_INTERCOMM_CREATE,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_intercomm_create_f(MPI_Fint *local_comm, MPI_Fint *local_leader,
 			    MPI_Fint *bridge_comm, 
                             MPI_Fint *remote_leader, MPI_Fint *tag,
diff --git a/src/mpi/f77/intercomm_merge_f.c b/src/mpi/f77/intercomm_merge_f.c
index 00a9b33901..75823b5ab1 100644
--- a/src/mpi/f77/intercomm_merge_f.c
+++ b/src/mpi/f77/intercomm_merge_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_INTERCOMM_MERGE,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_intercomm_merge_f(MPI_Fint *intercomm, MPI_Fint *high,
 			   MPI_Fint *newintracomm, 
                            MPI_Fint *ierr)
diff --git a/src/mpi/f77/iprobe_f.c b/src/mpi/f77/iprobe_f.c
index 24062f98d8..c616715935 100644
--- a/src/mpi/f77/iprobe_f.c
+++ b/src/mpi/f77/iprobe_f.c
@@ -49,7 +49,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_IPROBE,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_iprobe_f(MPI_Fint *source, MPI_Fint *tag, MPI_Fint *comm,
 		  MPI_Fint *flag, MPI_Fint *status, MPI_Fint *ierr)
 {
diff --git a/src/mpi/f77/irecv_f.c b/src/mpi/f77/irecv_f.c
index beb39f748c..e86ef28ab9 100644
--- a/src/mpi/f77/irecv_f.c
+++ b/src/mpi/f77/irecv_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_IRECV,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_irecv_f(char *buf, MPI_Fint *count, MPI_Fint *datatype,
 		 MPI_Fint *source, MPI_Fint *tag, MPI_Fint *comm,
 		 MPI_Fint *request, MPI_Fint *ierr)
diff --git a/src/mpi/f77/irsend_f.c b/src/mpi/f77/irsend_f.c
index 85a3600034..cc70ebb2df 100644
--- a/src/mpi/f77/irsend_f.c
+++ b/src/mpi/f77/irsend_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_IRSEND,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_irsend_f(char *buf, MPI_Fint *count, MPI_Fint *datatype, MPI_Fint *dest, MPI_Fint *tag, MPI_Fint *comm, MPI_Fint *request, MPI_Fint *ierr)
 {
     MPI_Datatype c_type = MPI_Type_f2c(*datatype);
diff --git a/src/mpi/f77/is_thread_main_f.c b/src/mpi/f77/is_thread_main_f.c
index 9cc638c0aa..b888b2e518 100644
--- a/src/mpi/f77/is_thread_main_f.c
+++ b/src/mpi/f77/is_thread_main_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_IS_THREAD_MAIN,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_is_thread_main_f(MPI_Fint *flag, MPI_Fint *ierr)
 {
     OMPI_SINGLE_NAME_DECL(flag);
diff --git a/src/mpi/f77/isend_f.c b/src/mpi/f77/isend_f.c
index dd90e0441f..6ca5989f2c 100644
--- a/src/mpi/f77/isend_f.c
+++ b/src/mpi/f77/isend_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_ISEND,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_isend_f(char *buf, MPI_Fint *count, MPI_Fint *datatype, MPI_Fint *dest, MPI_Fint *tag, MPI_Fint *comm, MPI_Fint *request, MPI_Fint *ierr)
 {
     MPI_Datatype c_type = MPI_Type_f2c(*datatype);
diff --git a/src/mpi/f77/issend_f.c b/src/mpi/f77/issend_f.c
index 1d3b6a26f4..ae89f00fe5 100644
--- a/src/mpi/f77/issend_f.c
+++ b/src/mpi/f77/issend_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_ISSEND,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_issend_f(char *buf, MPI_Fint *count, MPI_Fint *datatype, MPI_Fint *dest, MPI_Fint *tag, MPI_Fint *comm, MPI_Fint *request, MPI_Fint *ierr)
 {
     MPI_Datatype c_type = MPI_Type_f2c(*datatype);
diff --git a/src/mpi/f77/keyval_create_f.c b/src/mpi/f77/keyval_create_f.c
index 75f3afa1eb..4565ae3c52 100644
--- a/src/mpi/f77/keyval_create_f.c
+++ b/src/mpi/f77/keyval_create_f.c
@@ -49,7 +49,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_KEYVAL_CREATE,
 
 static const char FUNC_NAME[] = "MPI_keyval_create_f";
 
-OMPI_EXPORT
 void mpi_keyval_create_f(MPI_Fint *copy_attr_fn, MPI_Fint *delete_attr_fn,
 			 MPI_Fint *keyval, char *extra_state, MPI_Fint *ierr)
 {
diff --git a/src/mpi/f77/keyval_free_f.c b/src/mpi/f77/keyval_free_f.c
index 2aa59f00eb..4d791220e3 100644
--- a/src/mpi/f77/keyval_free_f.c
+++ b/src/mpi/f77/keyval_free_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_KEYVAL_FREE,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_keyval_free_f(MPI_Fint *keyval, MPI_Fint *ierr)
 {
     OMPI_SINGLE_NAME_DECL(keyval);
diff --git a/src/mpi/f77/lookup_name_f.c b/src/mpi/f77/lookup_name_f.c
index 0f21dab091..f5887151ca 100644
--- a/src/mpi/f77/lookup_name_f.c
+++ b/src/mpi/f77/lookup_name_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_LOOKUP_NAME,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_lookup_name_f(char *service_name, MPI_Fint *info,
 		       char *port_name, MPI_Fint *ierr)
 {
diff --git a/src/mpi/f77/op_create_f.c b/src/mpi/f77/op_create_f.c
index a8421e0d80..4a9062bcab 100644
--- a/src/mpi/f77/op_create_f.c
+++ b/src/mpi/f77/op_create_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_OP_CREATE,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_op_create_f(MPI_Fint *function, MPI_Fint *commute,
 		     MPI_Fint *op, MPI_Fint *ierr)
 {
diff --git a/src/mpi/f77/op_free_f.c b/src/mpi/f77/op_free_f.c
index ba277fda09..d5e153810a 100644
--- a/src/mpi/f77/op_free_f.c
+++ b/src/mpi/f77/op_free_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_OP_FREE,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_op_free_f(MPI_Fint *op, MPI_Fint *ierr)
 {
     MPI_Op c_op;
diff --git a/src/mpi/f77/open_port_f.c b/src/mpi/f77/open_port_f.c
index 9c1d9c1b7d..c8859dd977 100644
--- a/src/mpi/f77/open_port_f.c
+++ b/src/mpi/f77/open_port_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_OPEN_PORT,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_open_port_f(MPI_Fint *info, char *port_name, MPI_Fint *ierr)
 {
     MPI_Info c_info;
diff --git a/src/mpi/f77/pack_external_f.c b/src/mpi/f77/pack_external_f.c
index 6ee8d69a10..7053f8dd6b 100644
--- a/src/mpi/f77/pack_external_f.c
+++ b/src/mpi/f77/pack_external_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_PACK_EXTERNAL,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_pack_external_f(char *datarep, char *inbuf, MPI_Fint *incount,
 			 MPI_Fint *datatype, char *outbuf, 
 			 MPI_Fint *outsize, MPI_Fint *position,
diff --git a/src/mpi/f77/pack_external_size_f.c b/src/mpi/f77/pack_external_size_f.c
index da999d0f12..1af6d7588a 100644
--- a/src/mpi/f77/pack_external_size_f.c
+++ b/src/mpi/f77/pack_external_size_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_PACK_EXTERNAL_SIZE,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_pack_external_size_f(char *datarep, MPI_Fint *incount,
 			      MPI_Fint *datatype, MPI_Fint *size,
 			      MPI_Fint *ierr)
diff --git a/src/mpi/f77/pack_f.c b/src/mpi/f77/pack_f.c
index 5c02d0bffd..3010d53f98 100644
--- a/src/mpi/f77/pack_f.c
+++ b/src/mpi/f77/pack_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_PACK,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_pack_f(char *inbuf, MPI_Fint *incount, MPI_Fint *datatype,
 		char *outbuf, MPI_Fint *outsize, MPI_Fint *position, 
 		MPI_Fint *comm, MPI_Fint *ierr)
diff --git a/src/mpi/f77/pack_size_f.c b/src/mpi/f77/pack_size_f.c
index aa1c7800c1..6a2b5f1808 100644
--- a/src/mpi/f77/pack_size_f.c
+++ b/src/mpi/f77/pack_size_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_PACK_SIZE,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_pack_size_f(MPI_Fint *incount, MPI_Fint *datatype, 
 		     MPI_Fint *comm, MPI_Fint *size, MPI_Fint *ierr)
 {
diff --git a/src/mpi/f77/pcontrol_f.c b/src/mpi/f77/pcontrol_f.c
index dc3bba3d07..dfc820ed93 100644
--- a/src/mpi/f77/pcontrol_f.c
+++ b/src/mpi/f77/pcontrol_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_PCONTROL,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_pcontrol_f(MPI_Fint *level)
 {
     MPI_Pcontrol(OMPI_FINT_2_INT(*level));
diff --git a/src/mpi/f77/probe_f.c b/src/mpi/f77/probe_f.c
index 5b951aeb20..631cb217a5 100644
--- a/src/mpi/f77/probe_f.c
+++ b/src/mpi/f77/probe_f.c
@@ -49,7 +49,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_PROBE,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_probe_f(MPI_Fint *source, MPI_Fint *tag, MPI_Fint *comm, MPI_Fint *status, MPI_Fint *ierr)
 {   
     MPI_Status *c_status;
diff --git a/src/mpi/f77/publish_name_f.c b/src/mpi/f77/publish_name_f.c
index 3e4dada583..96d8e9c90b 100644
--- a/src/mpi/f77/publish_name_f.c
+++ b/src/mpi/f77/publish_name_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_PUBLISH_NAME,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_publish_name_f(char *service_name, MPI_Fint *info,
 			char *port_name, MPI_Fint *ierr)
 {
diff --git a/src/mpi/f77/put_f.c b/src/mpi/f77/put_f.c
index 2aaeff73ce..7cf650d573 100644
--- a/src/mpi/f77/put_f.c
+++ b/src/mpi/f77/put_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_PUT,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_put_f(char *origin_addr, MPI_Fint *origin_count,
 	       MPI_Fint *origin_datatype, MPI_Fint *target_rank,
 	       MPI_Fint *target_disp, MPI_Fint *target_count,
diff --git a/src/mpi/f77/query_thread_f.c b/src/mpi/f77/query_thread_f.c
index 9a65245af0..3cd4335d7a 100644
--- a/src/mpi/f77/query_thread_f.c
+++ b/src/mpi/f77/query_thread_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_QUERY_THREAD,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_query_thread_f(MPI_Fint *provided, MPI_Fint *ierr)
 {
     OMPI_SINGLE_NAME_DECL(provided);
diff --git a/src/mpi/f77/recv_f.c b/src/mpi/f77/recv_f.c
index e44ac51c97..0b63e097cc 100644
--- a/src/mpi/f77/recv_f.c
+++ b/src/mpi/f77/recv_f.c
@@ -49,7 +49,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_RECV,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_recv_f(char *buf, MPI_Fint *count, MPI_Fint *datatype, 
                 MPI_Fint *source, MPI_Fint *tag, MPI_Fint *comm, 
                 MPI_Fint *status, MPI_Fint *ierr)
diff --git a/src/mpi/f77/recv_init_f.c b/src/mpi/f77/recv_init_f.c
index 9958ef45fc..096e58d627 100644
--- a/src/mpi/f77/recv_init_f.c
+++ b/src/mpi/f77/recv_init_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_RECV_INIT,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_recv_init_f(char *buf, MPI_Fint *count, MPI_Fint *datatype, 
 		     MPI_Fint *source, MPI_Fint *tag, MPI_Fint *comm,
 		     MPI_Fint *request, MPI_Fint *ierr)
diff --git a/src/mpi/f77/reduce_f.c b/src/mpi/f77/reduce_f.c
index c99ed50ea4..66a0bff76c 100644
--- a/src/mpi/f77/reduce_f.c
+++ b/src/mpi/f77/reduce_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_REDUCE,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_reduce_f(char *sendbuf, char *recvbuf, MPI_Fint *count,
 		  MPI_Fint *datatype, MPI_Fint *op, 
 		  MPI_Fint *root, MPI_Fint *comm, MPI_Fint *ierr)
diff --git a/src/mpi/f77/reduce_scatter_f.c b/src/mpi/f77/reduce_scatter_f.c
index 75dffa73a1..bb3f4e96f1 100644
--- a/src/mpi/f77/reduce_scatter_f.c
+++ b/src/mpi/f77/reduce_scatter_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_REDUCE_SCATTER,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_reduce_scatter_f(char *sendbuf, char *recvbuf, 
 			  MPI_Fint *recvcounts, MPI_Fint *datatype,
 			  MPI_Fint *op, MPI_Fint *comm, MPI_Fint *ierr)
diff --git a/src/mpi/f77/register_datarep_f.c b/src/mpi/f77/register_datarep_f.c
index c0a71d0a44..67e3f51e94 100644
--- a/src/mpi/f77/register_datarep_f.c
+++ b/src/mpi/f77/register_datarep_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_REGISTER_DATAREP,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_register_datarep_f(char *datarep, MPI_Fint *read_conversion_fn,
 			    MPI_Fint *write_conversion_fn,
 			    MPI_Fint *dtype_file_extent_fn, char *extra_state,
diff --git a/src/mpi/f77/request_free_f.c b/src/mpi/f77/request_free_f.c
index 7758cffa5c..0fa4e7b056 100644
--- a/src/mpi/f77/request_free_f.c
+++ b/src/mpi/f77/request_free_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_REQUEST_FREE,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_request_free_f(MPI_Fint *request, MPI_Fint *ierr)
 {
     MPI_Request c_req = MPI_Request_f2c( *request ); 
diff --git a/src/mpi/f77/request_get_status_f.c b/src/mpi/f77/request_get_status_f.c
index 34ee242fa3..289821e925 100644
--- a/src/mpi/f77/request_get_status_f.c
+++ b/src/mpi/f77/request_get_status_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_REQUEST_GET_STATUS,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_request_get_status_f(MPI_Fint *request, MPI_Fint *flag,
 			      MPI_Fint *status, MPI_Fint *ierr)
 {
diff --git a/src/mpi/f77/rsend_f.c b/src/mpi/f77/rsend_f.c
index 6443f714ff..e6e91c1c02 100644
--- a/src/mpi/f77/rsend_f.c
+++ b/src/mpi/f77/rsend_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_RSEND,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_rsend_f(char *ibuf, MPI_Fint *count, MPI_Fint *datatype,
 		 MPI_Fint *dest, MPI_Fint *tag, MPI_Fint *comm, MPI_Fint *ierr)
 {
diff --git a/src/mpi/f77/rsend_init_f.c b/src/mpi/f77/rsend_init_f.c
index 804b823485..fcc7f7b343 100644
--- a/src/mpi/f77/rsend_init_f.c
+++ b/src/mpi/f77/rsend_init_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_RSEND_INIT,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_rsend_init_f(char *buf, MPI_Fint *count, 
 		      MPI_Fint *datatype, MPI_Fint *dest,
 		      MPI_Fint *tag, MPI_Fint *comm,
diff --git a/src/mpi/f77/scan_f.c b/src/mpi/f77/scan_f.c
index 13a029f658..d4c5eacd00 100644
--- a/src/mpi/f77/scan_f.c
+++ b/src/mpi/f77/scan_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_SCAN,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_scan_f(char *sendbuf, char *recvbuf, MPI_Fint *count,
 		MPI_Fint *datatype, MPI_Fint *op, MPI_Fint *comm,
 		MPI_Fint *ierr)
diff --git a/src/mpi/f77/scatter_f.c b/src/mpi/f77/scatter_f.c
index 0264ab5c25..dcf4775948 100644
--- a/src/mpi/f77/scatter_f.c
+++ b/src/mpi/f77/scatter_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_SCATTER,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_scatter_f(char *sendbuf, MPI_Fint *sendcount, 
 		   MPI_Fint *sendtype, char *recvbuf,
 		   MPI_Fint *recvcount, MPI_Fint *recvtype,
diff --git a/src/mpi/f77/scatterv_f.c b/src/mpi/f77/scatterv_f.c
index 160b9ae233..b277feb709 100644
--- a/src/mpi/f77/scatterv_f.c
+++ b/src/mpi/f77/scatterv_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_SCATTERV,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_scatterv_f(char *sendbuf, MPI_Fint *sendcounts,
 		    MPI_Fint *displs, MPI_Fint *sendtype,
 		    char *recvbuf, MPI_Fint *recvcount, 
diff --git a/src/mpi/f77/send_f.c b/src/mpi/f77/send_f.c
index 13c1ba668d..f661e80271 100644
--- a/src/mpi/f77/send_f.c
+++ b/src/mpi/f77/send_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_SEND,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_send_f(char *buf, MPI_Fint *count, MPI_Fint *datatype, 
                 MPI_Fint *dest, MPI_Fint *tag, MPI_Fint *comm, MPI_Fint *ierr)
 {
diff --git a/src/mpi/f77/send_init_f.c b/src/mpi/f77/send_init_f.c
index f8260ee6f7..6cd15b9c7f 100644
--- a/src/mpi/f77/send_init_f.c
+++ b/src/mpi/f77/send_init_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_SEND_INIT,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_send_init_f(char *buf, MPI_Fint *count, MPI_Fint *datatype,
 		     MPI_Fint *dest, MPI_Fint *tag, MPI_Fint *comm,
 		     MPI_Fint *request, MPI_Fint *ierr)
diff --git a/src/mpi/f77/sendrecv_f.c b/src/mpi/f77/sendrecv_f.c
index 3dac405cdd..23f41775ff 100644
--- a/src/mpi/f77/sendrecv_f.c
+++ b/src/mpi/f77/sendrecv_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_SENDRECV,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_sendrecv_f(char *sendbuf, MPI_Fint *sendcount, MPI_Fint *sendtype,
 		    MPI_Fint *dest, MPI_Fint *sendtag, char *recvbuf,
 		    MPI_Fint *recvcount, MPI_Fint *recvtype,
diff --git a/src/mpi/f77/sendrecv_replace_f.c b/src/mpi/f77/sendrecv_replace_f.c
index 29f5dd29b2..dd6d4c3e4c 100644
--- a/src/mpi/f77/sendrecv_replace_f.c
+++ b/src/mpi/f77/sendrecv_replace_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_SENDRECV_REPLACE,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_sendrecv_replace_f(char *buf, MPI_Fint *count, MPI_Fint *datatype,
 			    MPI_Fint *dest, MPI_Fint *sendtag,
 			    MPI_Fint *source, MPI_Fint *recvtag,
diff --git a/src/mpi/f77/ssend_f.c b/src/mpi/f77/ssend_f.c
index a469224b98..f7542070e9 100644
--- a/src/mpi/f77/ssend_f.c
+++ b/src/mpi/f77/ssend_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_SSEND,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_ssend_f(char *buf, MPI_Fint *count, MPI_Fint *datatype, 
 		 MPI_Fint *dest, MPI_Fint *tag,
 		 MPI_Fint *comm, MPI_Fint *ierr)
diff --git a/src/mpi/f77/ssend_init_f.c b/src/mpi/f77/ssend_init_f.c
index 767d23717a..4298485893 100644
--- a/src/mpi/f77/ssend_init_f.c
+++ b/src/mpi/f77/ssend_init_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_SSEND_INIT,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_ssend_init_f(char *buf, MPI_Fint *count, MPI_Fint *datatype,
 		      MPI_Fint *dest, MPI_Fint *tag, 
 		      MPI_Fint *comm, MPI_Fint *request, MPI_Fint *ierr)
diff --git a/src/mpi/f77/start_f.c b/src/mpi/f77/start_f.c
index 083e84b702..29fdcee93f 100644
--- a/src/mpi/f77/start_f.c
+++ b/src/mpi/f77/start_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_START,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_start_f(MPI_Fint *request, MPI_Fint *ierr)
 {
     MPI_Request c_req = MPI_Request_f2c(*request);
diff --git a/src/mpi/f77/startall_f.c b/src/mpi/f77/startall_f.c
index 5b0c48114a..85275e0ac2 100644
--- a/src/mpi/f77/startall_f.c
+++ b/src/mpi/f77/startall_f.c
@@ -52,7 +52,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_STARTALL,
 static const char FUNC_NAME[] = "MPI_STARTALL";
 
 
-OMPI_EXPORT
 void mpi_startall_f(MPI_Fint *count, MPI_Fint *array_of_requests, 
 		    MPI_Fint *ierr)
 {
diff --git a/src/mpi/f77/status_set_cancelled_f.c b/src/mpi/f77/status_set_cancelled_f.c
index db3c306716..cf0613ba44 100644
--- a/src/mpi/f77/status_set_cancelled_f.c
+++ b/src/mpi/f77/status_set_cancelled_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_STATUS_SET_CANCELLED,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_status_set_cancelled_f(MPI_Fint *status, MPI_Fint *flag, MPI_Fint *ierr)
 {
     MPI_Status c_status;
diff --git a/src/mpi/f77/status_set_elements_f.c b/src/mpi/f77/status_set_elements_f.c
index aea7a01ea8..60a3d524f7 100644
--- a/src/mpi/f77/status_set_elements_f.c
+++ b/src/mpi/f77/status_set_elements_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_STATUS_SET_ELEMENTS,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_status_set_elements_f(MPI_Fint *status, MPI_Fint *datatype, 
 			       MPI_Fint *count, MPI_Fint *ierr)
 {
diff --git a/src/mpi/f77/test_cancelled_f.c b/src/mpi/f77/test_cancelled_f.c
index 96199e2acf..01e297547e 100644
--- a/src/mpi/f77/test_cancelled_f.c
+++ b/src/mpi/f77/test_cancelled_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_TEST_CANCELLED,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_test_cancelled_f(MPI_Fint *status, MPI_Fint *flag, MPI_Fint *ierr)
 {
     MPI_Status c_status;
diff --git a/src/mpi/f77/test_f.c b/src/mpi/f77/test_f.c
index 4c155f5da8..41f9a7610a 100644
--- a/src/mpi/f77/test_f.c
+++ b/src/mpi/f77/test_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_TEST,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_test_f(MPI_Fint *request, MPI_Fint *flag,
 		MPI_Fint *status, MPI_Fint *ierr)
 {
diff --git a/src/mpi/f77/testall_f.c b/src/mpi/f77/testall_f.c
index c1e0221ffb..60d8907e0d 100644
--- a/src/mpi/f77/testall_f.c
+++ b/src/mpi/f77/testall_f.c
@@ -52,7 +52,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_TESTALL,
 static const char FUNC_NAME[] = "MPI_TESTALL";
 
 
-OMPI_EXPORT
 void mpi_testall_f(MPI_Fint *count, MPI_Fint *array_of_requests, MPI_Fint *flag, MPI_Fint *array_of_statuses, MPI_Fint *ierr)
 {
     MPI_Request *c_req;
diff --git a/src/mpi/f77/testany_f.c b/src/mpi/f77/testany_f.c
index bd4db90c6a..f6ee59af99 100644
--- a/src/mpi/f77/testany_f.c
+++ b/src/mpi/f77/testany_f.c
@@ -52,7 +52,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_TESTANY,
 static const char FUNC_NAME[] = "MPI_TESTANY";
 
 
-OMPI_EXPORT
 void mpi_testany_f(MPI_Fint *count, MPI_Fint *array_of_requests, MPI_Fint *index, MPI_Fint *flag, MPI_Fint *status, MPI_Fint *ierr)
 {
     MPI_Request *c_req;
diff --git a/src/mpi/f77/testsome_f.c b/src/mpi/f77/testsome_f.c
index 8ea0bdab45..a71f231289 100644
--- a/src/mpi/f77/testsome_f.c
+++ b/src/mpi/f77/testsome_f.c
@@ -52,7 +52,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_TESTSOME,
 static const char FUNC_NAME[] = "MPI_TESTSOME";
 
 
-OMPI_EXPORT
 void mpi_testsome_f(MPI_Fint *incount, MPI_Fint *array_of_requests, 
 		    MPI_Fint *outcount, MPI_Fint *array_of_indices,
 		    MPI_Fint *array_of_statuses, MPI_Fint *ierr)
diff --git a/src/mpi/f77/topo_test_f.c b/src/mpi/f77/topo_test_f.c
index 0c3e896aaa..79cb80ec05 100644
--- a/src/mpi/f77/topo_test_f.c
+++ b/src/mpi/f77/topo_test_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_TOPO_TEST,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_topo_test_f(MPI_Fint *comm, MPI_Fint *status, MPI_Fint *ierr)
 {
     MPI_Comm c_comm;
diff --git a/src/mpi/f77/type_commit_f.c b/src/mpi/f77/type_commit_f.c
index beaff0a2e9..607c01a116 100644
--- a/src/mpi/f77/type_commit_f.c
+++ b/src/mpi/f77/type_commit_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_TYPE_COMMIT,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_type_commit_f(MPI_Fint *type, MPI_Fint *ierr)
 {
     MPI_Datatype c_type = MPI_Type_f2c(*type);
diff --git a/src/mpi/f77/type_contiguous_f.c b/src/mpi/f77/type_contiguous_f.c
index cb19d913ef..e65b542e7b 100644
--- a/src/mpi/f77/type_contiguous_f.c
+++ b/src/mpi/f77/type_contiguous_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_TYPE_CONTIGUOUS,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_type_contiguous_f(MPI_Fint *count, MPI_Fint *oldtype,
 			   MPI_Fint *newtype, MPI_Fint *ierr)
 {
diff --git a/src/mpi/f77/type_create_darray_f.c b/src/mpi/f77/type_create_darray_f.c
index 775a4a2597..5dff4a4901 100644
--- a/src/mpi/f77/type_create_darray_f.c
+++ b/src/mpi/f77/type_create_darray_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_TYPE_CREATE_DARRAY,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_type_create_darray_f(MPI_Fint *size, MPI_Fint *rank,
 			      MPI_Fint *ndims, MPI_Fint *gsize_array, 
 			      MPI_Fint *distrib_array, MPI_Fint *darg_array,
diff --git a/src/mpi/f77/type_create_f90_complex_f.c b/src/mpi/f77/type_create_f90_complex_f.c
index 88b429b5c1..73b0e967a3 100644
--- a/src/mpi/f77/type_create_f90_complex_f.c
+++ b/src/mpi/f77/type_create_f90_complex_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_TYPE_CREATE_F90_COMPLEX,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_type_create_f90_complex_f(MPI_Fint *p, MPI_Fint *r,
 				   MPI_Fint *newtype, MPI_Fint *ierr)
 {
diff --git a/src/mpi/f77/type_create_f90_integer_f.c b/src/mpi/f77/type_create_f90_integer_f.c
index 78388af4c2..e1efc609a6 100644
--- a/src/mpi/f77/type_create_f90_integer_f.c
+++ b/src/mpi/f77/type_create_f90_integer_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_TYPE_CREATE_F90_INTEGER,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_type_create_f90_integer_f(MPI_Fint *r, MPI_Fint *newtype,
 				   MPI_Fint *ierr)
 {
diff --git a/src/mpi/f77/type_create_f90_real_f.c b/src/mpi/f77/type_create_f90_real_f.c
index 8f14704a05..b48e895351 100644
--- a/src/mpi/f77/type_create_f90_real_f.c
+++ b/src/mpi/f77/type_create_f90_real_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_TYPE_CREATE_F90_REAL,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_type_create_f90_real_f(MPI_Fint *p, MPI_Fint *r,
 				MPI_Fint *newtype, MPI_Fint *ierr)
 {
diff --git a/src/mpi/f77/type_create_hindexed_f.c b/src/mpi/f77/type_create_hindexed_f.c
index 7170d8e893..99a74bba3e 100644
--- a/src/mpi/f77/type_create_hindexed_f.c
+++ b/src/mpi/f77/type_create_hindexed_f.c
@@ -52,7 +52,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_TYPE_CREATE_HINDEXED,
 static const char FUNC_NAME[] = "MPI_TYPE_CREATE_HINDEXED";
 
 
-OMPI_EXPORT
 void mpi_type_create_hindexed_f(MPI_Fint *count,
 				MPI_Fint *array_of_blocklengths,
 				MPI_Fint *array_of_displacements, 
diff --git a/src/mpi/f77/type_create_hvector_f.c b/src/mpi/f77/type_create_hvector_f.c
index 88b2545d93..436af44fb5 100644
--- a/src/mpi/f77/type_create_hvector_f.c
+++ b/src/mpi/f77/type_create_hvector_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_TYPE_CREATE_HVECTOR,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_type_create_hvector_f(MPI_Fint *count, MPI_Fint *blocklength,
 			       MPI_Fint *stride, MPI_Fint *oldtype,
 			       MPI_Fint *newtype, MPI_Fint *ierr)
diff --git a/src/mpi/f77/type_create_indexed_block_f.c b/src/mpi/f77/type_create_indexed_block_f.c
index ca89dfce05..a1181bc30e 100644
--- a/src/mpi/f77/type_create_indexed_block_f.c
+++ b/src/mpi/f77/type_create_indexed_block_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_TYPE_CREATE_INDEXED_BLOCK,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_type_create_indexed_block_f(MPI_Fint *count, MPI_Fint *blocklength,
 				     MPI_Fint *array_of_displacements, 
 				     MPI_Fint *oldtype, MPI_Fint *newtype,
diff --git a/src/mpi/f77/type_create_keyval_f.c b/src/mpi/f77/type_create_keyval_f.c
index f8437eae00..093505f92a 100644
--- a/src/mpi/f77/type_create_keyval_f.c
+++ b/src/mpi/f77/type_create_keyval_f.c
@@ -49,7 +49,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_TYPE_CREATE_KEYVAL,
 
 static char FUNC_NAME[] = "MPI_Type_create_keyval_f";
 
-OMPI_EXPORT
 void mpi_type_create_keyval_f(MPI_Fint *type_copy_attr_fn, MPI_Fint *type_delete_attr_fn, MPI_Fint *type_keyval, char *extra_state, MPI_Fint *ierr)
 {
     int ret, c_err;
diff --git a/src/mpi/f77/type_create_resized_f.c b/src/mpi/f77/type_create_resized_f.c
index e439fbc4ca..5b6c04cdff 100644
--- a/src/mpi/f77/type_create_resized_f.c
+++ b/src/mpi/f77/type_create_resized_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_TYPE_CREATE_RESIZED,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_type_create_resized_f(MPI_Fint *oldtype, MPI_Fint *lb,
 			       MPI_Fint *extent, MPI_Fint *newtype, 
 			       MPI_Fint *ierr)
diff --git a/src/mpi/f77/type_create_struct_f.c b/src/mpi/f77/type_create_struct_f.c
index 3f2c0257d0..97d39350ae 100644
--- a/src/mpi/f77/type_create_struct_f.c
+++ b/src/mpi/f77/type_create_struct_f.c
@@ -52,7 +52,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_TYPE_CREATE_STRUCT,
 static const char FUNC_NAME[] = "MPI_TYPE_CREATE_STRUCT";
 
 
-OMPI_EXPORT
 void mpi_type_create_struct_f(MPI_Fint *count, 
 			      MPI_Fint *array_of_block_lengths,
 			      MPI_Fint *array_of_displacements, 
diff --git a/src/mpi/f77/type_create_subarray_f.c b/src/mpi/f77/type_create_subarray_f.c
index a33c6c6f6a..c63c993f9a 100644
--- a/src/mpi/f77/type_create_subarray_f.c
+++ b/src/mpi/f77/type_create_subarray_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_TYPE_CREATE_SUBARRAY,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_type_create_subarray_f(MPI_Fint *ndims, MPI_Fint *size_array,
 				MPI_Fint *subsize_array, 
 				MPI_Fint *start_array, MPI_Fint *order,
diff --git a/src/mpi/f77/type_delete_attr_f.c b/src/mpi/f77/type_delete_attr_f.c
index 693f064efd..9de949cc3f 100644
--- a/src/mpi/f77/type_delete_attr_f.c
+++ b/src/mpi/f77/type_delete_attr_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_TYPE_DELETE_ATTR,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_type_delete_attr_f(MPI_Fint *type, MPI_Fint *type_keyval,
 			    MPI_Fint *ierr)
 {
diff --git a/src/mpi/f77/type_dup_f.c b/src/mpi/f77/type_dup_f.c
index 50c2d4f8b1..bff2eaaabc 100644
--- a/src/mpi/f77/type_dup_f.c
+++ b/src/mpi/f77/type_dup_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_TYPE_DUP,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_type_dup_f(MPI_Fint *type, MPI_Fint *newtype, MPI_Fint *ierr)
 {
     MPI_Datatype c_type = MPI_Type_f2c(*type);
diff --git a/src/mpi/f77/type_extent_f.c b/src/mpi/f77/type_extent_f.c
index ff8305e4d4..8856047bcd 100644
--- a/src/mpi/f77/type_extent_f.c
+++ b/src/mpi/f77/type_extent_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_TYPE_EXTENT,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_type_extent_f(MPI_Fint *type, MPI_Fint *extent, MPI_Fint *ierr)
 {
     MPI_Datatype c_type = MPI_Type_f2c(*type);
diff --git a/src/mpi/f77/type_free_f.c b/src/mpi/f77/type_free_f.c
index ddc24262d4..afe006407f 100644
--- a/src/mpi/f77/type_free_f.c
+++ b/src/mpi/f77/type_free_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_TYPE_FREE,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_type_free_f(MPI_Fint *type, MPI_Fint *ierr)
 {
     MPI_Datatype c_type;
diff --git a/src/mpi/f77/type_free_keyval_f.c b/src/mpi/f77/type_free_keyval_f.c
index d2766b0215..566c705812 100644
--- a/src/mpi/f77/type_free_keyval_f.c
+++ b/src/mpi/f77/type_free_keyval_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_TYPE_FREE_KEYVAL,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_type_free_keyval_f(MPI_Fint *type_keyval, MPI_Fint *ierr)
 {
     OMPI_SINGLE_NAME_DECL(type_keyval);
diff --git a/src/mpi/f77/type_get_attr_f.c b/src/mpi/f77/type_get_attr_f.c
index a372e922cb..4a3670d7a7 100644
--- a/src/mpi/f77/type_get_attr_f.c
+++ b/src/mpi/f77/type_get_attr_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_TYPE_GET_ATTR,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_type_get_attr_f(MPI_Fint *type, MPI_Fint *type_keyval,
 			 MPI_Aint *attribute_val, MPI_Fint *flag, MPI_Fint *ierr)
 {
diff --git a/src/mpi/f77/type_get_contents_f.c b/src/mpi/f77/type_get_contents_f.c
index 130c0a2b62..87aa31eaf4 100644
--- a/src/mpi/f77/type_get_contents_f.c
+++ b/src/mpi/f77/type_get_contents_f.c
@@ -52,7 +52,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_TYPE_GET_CONTENTS,
 static const char FUNC_NAME[] = "MPI_TYPE_GET_CONTENTS";
 
 
-OMPI_EXPORT
 void mpi_type_get_contents_f(MPI_Fint *mtype, MPI_Fint *max_integers,
 			     MPI_Fint *max_addresses, MPI_Fint *max_datatypes,
 			     MPI_Fint *array_of_integers, 
diff --git a/src/mpi/f77/type_get_envelope_f.c b/src/mpi/f77/type_get_envelope_f.c
index e56d44696e..4beef2c95a 100644
--- a/src/mpi/f77/type_get_envelope_f.c
+++ b/src/mpi/f77/type_get_envelope_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_TYPE_GET_ENVELOPE,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_type_get_envelope_f(MPI_Fint *type, MPI_Fint *num_integers,
 			     MPI_Fint *num_addresses, 
 			     MPI_Fint *num_datatypes, MPI_Fint *combiner,
diff --git a/src/mpi/f77/type_get_extent_f.c b/src/mpi/f77/type_get_extent_f.c
index 5bb23d7284..52958657d8 100644
--- a/src/mpi/f77/type_get_extent_f.c
+++ b/src/mpi/f77/type_get_extent_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_TYPE_GET_EXTENT,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_type_get_extent_f(MPI_Fint *type, MPI_Fint *lb,
 			   MPI_Fint *extent, MPI_Fint *ierr)
 {
diff --git a/src/mpi/f77/type_get_name_f.c b/src/mpi/f77/type_get_name_f.c
index 8ac9f6673b..e1cbcb97f5 100644
--- a/src/mpi/f77/type_get_name_f.c
+++ b/src/mpi/f77/type_get_name_f.c
@@ -49,7 +49,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_TYPE_GET_NAME,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_type_get_name_f(MPI_Fint *type, char *type_name, MPI_Fint *resultlen, MPI_Fint *ierr)
 {
     int err, c_len;
diff --git a/src/mpi/f77/type_get_true_extent_f.c b/src/mpi/f77/type_get_true_extent_f.c
index 096b578928..5eab9dbccf 100644
--- a/src/mpi/f77/type_get_true_extent_f.c
+++ b/src/mpi/f77/type_get_true_extent_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_TYPE_GET_TRUE_EXTENT,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_type_get_true_extent_f(MPI_Fint *datatype, MPI_Fint *true_lb, MPI_Fint *true_extent, MPI_Fint *ierr)
 {
     MPI_Datatype c_type = MPI_Type_f2c(*datatype);
diff --git a/src/mpi/f77/type_hindexed_f.c b/src/mpi/f77/type_hindexed_f.c
index 658abbea3a..ba84c71810 100644
--- a/src/mpi/f77/type_hindexed_f.c
+++ b/src/mpi/f77/type_hindexed_f.c
@@ -52,7 +52,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_TYPE_HINDEXED,
 static const char FUNC_NAME[] = "MPI_TYPE_HINDEXED";
 
 
-OMPI_EXPORT
 void mpi_type_hindexed_f(MPI_Fint *count, MPI_Fint *array_of_blocklengths, 
 			 MPI_Fint *array_of_displacements, 
 			 MPI_Fint *oldtype, MPI_Fint *newtype, MPI_Fint *ierr)
diff --git a/src/mpi/f77/type_hvector_f.c b/src/mpi/f77/type_hvector_f.c
index 73b732e1fb..3136f39f44 100644
--- a/src/mpi/f77/type_hvector_f.c
+++ b/src/mpi/f77/type_hvector_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_TYPE_HVECTOR,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_type_hvector_f(MPI_Fint *count, MPI_Fint *blocklength, 
 			MPI_Fint *stride, MPI_Fint *oldtype, 
 			MPI_Fint *newtype, MPI_Fint *ierr)
diff --git a/src/mpi/f77/type_indexed_f.c b/src/mpi/f77/type_indexed_f.c
index e82eee442c..c19903f945 100644
--- a/src/mpi/f77/type_indexed_f.c
+++ b/src/mpi/f77/type_indexed_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_TYPE_INDEXED,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_type_indexed_f(MPI_Fint *count, MPI_Fint *array_of_blocklengths,
 			MPI_Fint *array_of_displacements, MPI_Fint *oldtype,
 			MPI_Fint *newtype, MPI_Fint *ierr)
diff --git a/src/mpi/f77/type_lb_f.c b/src/mpi/f77/type_lb_f.c
index 5bd1308506..f0a9ac88a0 100644
--- a/src/mpi/f77/type_lb_f.c
+++ b/src/mpi/f77/type_lb_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_TYPE_LB,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_type_lb_f(MPI_Fint *type, MPI_Fint *lb, MPI_Fint *ierr)
 {
     MPI_Datatype c_type = MPI_Type_f2c(*type);
diff --git a/src/mpi/f77/type_match_size_f.c b/src/mpi/f77/type_match_size_f.c
index 0264de1a83..106b8a69ea 100644
--- a/src/mpi/f77/type_match_size_f.c
+++ b/src/mpi/f77/type_match_size_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_TYPE_MATCH_SIZE,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_type_match_size_f(MPI_Fint *typeclass, MPI_Fint *size, MPI_Fint *type, MPI_Fint *ierr)
 {
     MPI_Datatype c_type;
diff --git a/src/mpi/f77/type_set_attr_f.c b/src/mpi/f77/type_set_attr_f.c
index 53460f8661..5292c3eb06 100644
--- a/src/mpi/f77/type_set_attr_f.c
+++ b/src/mpi/f77/type_set_attr_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_TYPE_SET_ATTR,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_type_set_attr_f(MPI_Fint *type, MPI_Fint *type_keyval, MPI_Aint *attr_val, MPI_Fint *ierr)
 {
     MPI_Datatype c_type = MPI_Type_f2c( *type );
diff --git a/src/mpi/f77/type_set_name_f.c b/src/mpi/f77/type_set_name_f.c
index cde1ad7c0b..560cf65678 100644
--- a/src/mpi/f77/type_set_name_f.c
+++ b/src/mpi/f77/type_set_name_f.c
@@ -50,7 +50,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_TYPE_SET_NAME,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_type_set_name_f(MPI_Fint *type, char *type_name, MPI_Fint *ierr,
 			 int name_len)
 {
diff --git a/src/mpi/f77/type_size_f.c b/src/mpi/f77/type_size_f.c
index fdbf495174..ab624c8bb8 100644
--- a/src/mpi/f77/type_size_f.c
+++ b/src/mpi/f77/type_size_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_TYPE_SIZE,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_type_size_f(MPI_Fint *type, MPI_Fint *size, MPI_Fint *ierr)
 {
     MPI_Datatype c_type = MPI_Type_f2c(*type);
diff --git a/src/mpi/f77/type_struct_f.c b/src/mpi/f77/type_struct_f.c
index ec2eb46613..15c19dae74 100644
--- a/src/mpi/f77/type_struct_f.c
+++ b/src/mpi/f77/type_struct_f.c
@@ -52,7 +52,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_TYPE_STRUCT,
 static const char FUNC_NAME[] = "MPI_TYPE_STRUCT";
 
 
-OMPI_EXPORT
 void mpi_type_struct_f(MPI_Fint *count, MPI_Fint *array_of_blocklengths,
 		       MPI_Fint *array_of_displacements, 
 		       MPI_Fint *array_of_types, MPI_Fint *newtype,
diff --git a/src/mpi/f77/type_ub_f.c b/src/mpi/f77/type_ub_f.c
index 1e78d86586..9f87dcf78d 100644
--- a/src/mpi/f77/type_ub_f.c
+++ b/src/mpi/f77/type_ub_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_TYPE_UB,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_type_ub_f(MPI_Fint *mtype, MPI_Fint *ub, MPI_Fint *ierr)
 {
     MPI_Datatype c_mtype = MPI_Type_f2c(*mtype);
diff --git a/src/mpi/f77/type_vector_f.c b/src/mpi/f77/type_vector_f.c
index daa32bc29e..13862a6bd1 100644
--- a/src/mpi/f77/type_vector_f.c
+++ b/src/mpi/f77/type_vector_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_TYPE_VECTOR,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_type_vector_f(MPI_Fint *count, MPI_Fint *blocklength,
 		       MPI_Fint *stride, MPI_Fint *oldtype,
 		       MPI_Fint *newtype, MPI_Fint *ierr)
diff --git a/src/mpi/f77/unpack_external_f.c b/src/mpi/f77/unpack_external_f.c
index 94afe61581..faffcef114 100644
--- a/src/mpi/f77/unpack_external_f.c
+++ b/src/mpi/f77/unpack_external_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_UNPACK_EXTERNAL,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_unpack_external_f (char *datarep, char *inbuf, MPI_Fint *insize,
 			    MPI_Fint *position, char *outbuf, 
 			    MPI_Fint *outcount, MPI_Fint *datatype,
diff --git a/src/mpi/f77/unpack_f.c b/src/mpi/f77/unpack_f.c
index e8a98b4a95..9061376c35 100644
--- a/src/mpi/f77/unpack_f.c
+++ b/src/mpi/f77/unpack_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_UNPACK,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_unpack_f(char *inbuf, MPI_Fint *insize, MPI_Fint *position,
 		  char *outbuf, MPI_Fint *outcount, MPI_Fint *datatype,
 		  MPI_Fint *comm, MPI_Fint *ierr)
diff --git a/src/mpi/f77/unpublish_name_f.c b/src/mpi/f77/unpublish_name_f.c
index 5f34c12628..f91a7e5adb 100644
--- a/src/mpi/f77/unpublish_name_f.c
+++ b/src/mpi/f77/unpublish_name_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_UNPUBLISH_NAME,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_unpublish_name_f(char *service_name, MPI_Fint *info,
 			  char *port_name, MPI_Fint *ierr)
 {
diff --git a/src/mpi/f77/wait_f.c b/src/mpi/f77/wait_f.c
index 0d9b35fb54..83bf11e72d 100644
--- a/src/mpi/f77/wait_f.c
+++ b/src/mpi/f77/wait_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_WAIT,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_wait_f(MPI_Fint *request, MPI_Fint *status, MPI_Fint *ierr)
 {
     MPI_Request c_req = MPI_Request_f2c(*request);
diff --git a/src/mpi/f77/waitall_f.c b/src/mpi/f77/waitall_f.c
index 18f51dda23..13e7bf2ba4 100644
--- a/src/mpi/f77/waitall_f.c
+++ b/src/mpi/f77/waitall_f.c
@@ -52,7 +52,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_WAITALL,
 static const char FUNC_NAME[] = "MPI_WAITALL";
 
 
-OMPI_EXPORT
 void mpi_waitall_f(MPI_Fint *count, MPI_Fint *array_of_requests,
 		   MPI_Fint *array_of_statuses, MPI_Fint *ierr)
 {
diff --git a/src/mpi/f77/waitany_f.c b/src/mpi/f77/waitany_f.c
index 3240a4ce61..0552480a04 100644
--- a/src/mpi/f77/waitany_f.c
+++ b/src/mpi/f77/waitany_f.c
@@ -52,7 +52,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_WAITANY,
 static const char FUNC_NAME[] = "MPI_WAITANY";
 
 
-OMPI_EXPORT
 void mpi_waitany_f(MPI_Fint *count, MPI_Fint *array_of_requests,
 		   MPI_Fint *index, MPI_Fint *status, MPI_Fint *ierr)
 {
diff --git a/src/mpi/f77/waitsome_f.c b/src/mpi/f77/waitsome_f.c
index 0374e44709..a45ca09750 100644
--- a/src/mpi/f77/waitsome_f.c
+++ b/src/mpi/f77/waitsome_f.c
@@ -52,7 +52,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_WAITSOME,
 static const char FUNC_NAME[] = "MPI_WAITSOME";
 
 
-OMPI_EXPORT
 void mpi_waitsome_f(MPI_Fint *incount, MPI_Fint *array_of_requests,
 		    MPI_Fint *outcount, MPI_Fint *array_of_indices,
 		    MPI_Fint *array_of_statuses, MPI_Fint *ierr)
diff --git a/src/mpi/f77/win_call_errhandler_f.c b/src/mpi/f77/win_call_errhandler_f.c
index 02a60d8b43..fde5572a46 100644
--- a/src/mpi/f77/win_call_errhandler_f.c
+++ b/src/mpi/f77/win_call_errhandler_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_WIN_CALL_ERRHANDLER,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_win_call_errhandler_f(MPI_Fint *win, MPI_Fint *errorcode,
 			       MPI_Fint *ierr)
 {
diff --git a/src/mpi/f77/win_complete_f.c b/src/mpi/f77/win_complete_f.c
index 1b1d24b84d..9cd853c463 100644
--- a/src/mpi/f77/win_complete_f.c
+++ b/src/mpi/f77/win_complete_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_WIN_COMPLETE,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_win_complete_f(MPI_Fint *win, MPI_Fint *ierr)
 {
     MPI_Win c_win;
diff --git a/src/mpi/f77/win_create_errhandler_f.c b/src/mpi/f77/win_create_errhandler_f.c
index 26517cd2f9..449d4997d5 100644
--- a/src/mpi/f77/win_create_errhandler_f.c
+++ b/src/mpi/f77/win_create_errhandler_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_WIN_CREATE_ERRHANDLER,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_win_create_errhandler_f(MPI_Fint *f, 
 				 MPI_Fint *errhandler, MPI_Fint *ierr)
 {
diff --git a/src/mpi/f77/win_create_f.c b/src/mpi/f77/win_create_f.c
index 310f7cc225..70680afd67 100644
--- a/src/mpi/f77/win_create_f.c
+++ b/src/mpi/f77/win_create_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_WIN_CREATE,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_win_create_f(char *base, MPI_Fint *size, MPI_Fint *disp_unit,
 		      MPI_Fint *info, MPI_Fint *comm, MPI_Fint *win,
 		      MPI_Fint *ierr)
diff --git a/src/mpi/f77/win_create_keyval_f.c b/src/mpi/f77/win_create_keyval_f.c
index be9b01ade4..c2ca455a50 100644
--- a/src/mpi/f77/win_create_keyval_f.c
+++ b/src/mpi/f77/win_create_keyval_f.c
@@ -49,7 +49,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_WIN_CREATE_KEYVAL,
 
 static char FUNC_NAME[] = "MPI_Win_create_keyval";
 
-OMPI_EXPORT
 void mpi_win_create_keyval_f(MPI_Fint *win_copy_attr_fn, MPI_Fint *win_delete_attr_fn, MPI_Fint *win_keyval, char *extra_state, MPI_Fint *ierr)
 {
     int ret, c_err;
diff --git a/src/mpi/f77/win_delete_attr_f.c b/src/mpi/f77/win_delete_attr_f.c
index a3f2465618..71bcfda807 100644
--- a/src/mpi/f77/win_delete_attr_f.c
+++ b/src/mpi/f77/win_delete_attr_f.c
@@ -48,7 +48,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_WIN_DELETE_ATTR,
 #endif
 static const char FUNC_NAME[] = "MPI_Win_delete_attr_f";
 
-OMPI_EXPORT
 void mpi_win_delete_attr_f(MPI_Fint *win, MPI_Fint *win_keyval, MPI_Fint *ierr)
 {
     MPI_Win c_win = MPI_Win_f2c( *win );
diff --git a/src/mpi/f77/win_fence_f.c b/src/mpi/f77/win_fence_f.c
index de58ba5c2c..dc396fc41a 100644
--- a/src/mpi/f77/win_fence_f.c
+++ b/src/mpi/f77/win_fence_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_WIN_FENCE,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_win_fence_f(MPI_Fint *assert, MPI_Fint *win, MPI_Fint *ierr)
 {
     MPI_Win c_win = MPI_Win_f2c(*win);
diff --git a/src/mpi/f77/win_free_f.c b/src/mpi/f77/win_free_f.c
index 9f106d1161..002c04be7b 100644
--- a/src/mpi/f77/win_free_f.c
+++ b/src/mpi/f77/win_free_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_WIN_FREE,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_win_free_f(MPI_Fint *win, MPI_Fint *ierr)
 {
     MPI_Win c_win = MPI_Win_f2c(*win);
diff --git a/src/mpi/f77/win_free_keyval_f.c b/src/mpi/f77/win_free_keyval_f.c
index c15692c9c7..c722caa8de 100644
--- a/src/mpi/f77/win_free_keyval_f.c
+++ b/src/mpi/f77/win_free_keyval_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_WIN_FREE_KEYVAL,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_win_free_keyval_f(MPI_Fint *win_keyval, MPI_Fint *ierr)
 {
     OMPI_SINGLE_NAME_DECL(win_keyval);
diff --git a/src/mpi/f77/win_get_attr_f.c b/src/mpi/f77/win_get_attr_f.c
index f130904bd4..c73bf82410 100644
--- a/src/mpi/f77/win_get_attr_f.c
+++ b/src/mpi/f77/win_get_attr_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_WIN_GET_ATTR,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_win_get_attr_f(MPI_Fint *win, MPI_Fint *win_keyval,
 			MPI_Aint *attribute_val, MPI_Fint *flag, MPI_Fint *ierr)
 {
diff --git a/src/mpi/f77/win_get_errhandler_f.c b/src/mpi/f77/win_get_errhandler_f.c
index 8f19621c80..3e7e31a91a 100644
--- a/src/mpi/f77/win_get_errhandler_f.c
+++ b/src/mpi/f77/win_get_errhandler_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_WIN_GET_ERRHANDLER,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_win_get_errhandler_f(MPI_Fint *win, MPI_Fint *errhandler, 
 			      MPI_Fint *ierr)
 {
diff --git a/src/mpi/f77/win_get_group_f.c b/src/mpi/f77/win_get_group_f.c
index 1222340fc7..9f46d08084 100644
--- a/src/mpi/f77/win_get_group_f.c
+++ b/src/mpi/f77/win_get_group_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_WIN_GET_GROUP,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_win_get_group_f(MPI_Fint *win, MPI_Fint *group, MPI_Fint *ierr)
 {
     MPI_Group c_grp;
diff --git a/src/mpi/f77/win_get_name_f.c b/src/mpi/f77/win_get_name_f.c
index 5d1bbc9217..4d65812140 100644
--- a/src/mpi/f77/win_get_name_f.c
+++ b/src/mpi/f77/win_get_name_f.c
@@ -50,7 +50,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_WIN_GET_NAME,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_win_get_name_f(MPI_Fint *win, char *win_name,
 			MPI_Fint *resultlen, MPI_Fint *ierr)
 {
diff --git a/src/mpi/f77/win_lock_f.c b/src/mpi/f77/win_lock_f.c
index a2b8ed18d4..fce052b0fd 100644
--- a/src/mpi/f77/win_lock_f.c
+++ b/src/mpi/f77/win_lock_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_WIN_LOCK,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_win_lock_f(MPI_Fint *lock_type, MPI_Fint *rank,
 		    MPI_Fint *assert, MPI_Fint *win, MPI_Fint *ierr)
 {
diff --git a/src/mpi/f77/win_post_f.c b/src/mpi/f77/win_post_f.c
index 4a0952961c..a1dbdbfa52 100644
--- a/src/mpi/f77/win_post_f.c
+++ b/src/mpi/f77/win_post_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_WIN_POST,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_win_post_f(MPI_Fint *group, MPI_Fint *assert,
 		    MPI_Fint *win, MPI_Fint *ierr)
 {
diff --git a/src/mpi/f77/win_set_attr_f.c b/src/mpi/f77/win_set_attr_f.c
index eda861a054..3994672165 100644
--- a/src/mpi/f77/win_set_attr_f.c
+++ b/src/mpi/f77/win_set_attr_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_WIN_SET_ATTR,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_win_set_attr_f(MPI_Fint *win, MPI_Fint *win_keyval,
 			MPI_Aint *attribute_val, MPI_Fint *ierr)
 {
diff --git a/src/mpi/f77/win_set_errhandler_f.c b/src/mpi/f77/win_set_errhandler_f.c
index 8220767739..8f47169c82 100644
--- a/src/mpi/f77/win_set_errhandler_f.c
+++ b/src/mpi/f77/win_set_errhandler_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_WIN_SET_ERRHANDLER,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_win_set_errhandler_f(MPI_Fint *win, MPI_Fint *errhandler,
 			      MPI_Fint *ierr)
 {
diff --git a/src/mpi/f77/win_set_name_f.c b/src/mpi/f77/win_set_name_f.c
index 81896bac72..f77e63e0f6 100644
--- a/src/mpi/f77/win_set_name_f.c
+++ b/src/mpi/f77/win_set_name_f.c
@@ -51,7 +51,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_WIN_SET_NAME,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_win_set_name_f(MPI_Fint *win, char *win_name, MPI_Fint *ierr,
 			int name_len)
 {
diff --git a/src/mpi/f77/win_start_f.c b/src/mpi/f77/win_start_f.c
index ad62fd2be3..eab336ae46 100644
--- a/src/mpi/f77/win_start_f.c
+++ b/src/mpi/f77/win_start_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_WIN_START,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_win_start_f(MPI_Fint *group, MPI_Fint *assert,
 		     MPI_Fint *win, MPI_Fint *ierr)
 {
diff --git a/src/mpi/f77/win_test_f.c b/src/mpi/f77/win_test_f.c
index d55e1e5a5b..a8f821bf22 100644
--- a/src/mpi/f77/win_test_f.c
+++ b/src/mpi/f77/win_test_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_WIN_TEST,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_win_test_f(MPI_Fint *win, MPI_Fint *flag, MPI_Fint *ierr)
 {
     MPI_Win c_win = MPI_Win_f2c(*win);
diff --git a/src/mpi/f77/win_unlock_f.c b/src/mpi/f77/win_unlock_f.c
index ba610612a0..251e6467e7 100644
--- a/src/mpi/f77/win_unlock_f.c
+++ b/src/mpi/f77/win_unlock_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_WIN_UNLOCK,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_win_unlock_f(MPI_Fint *rank, MPI_Fint *win, MPI_Fint *ierr)
 {
     MPI_Win c_win = MPI_Win_f2c(*win);
diff --git a/src/mpi/f77/win_wait_f.c b/src/mpi/f77/win_wait_f.c
index 800976487a..a8edad904d 100644
--- a/src/mpi/f77/win_wait_f.c
+++ b/src/mpi/f77/win_wait_f.c
@@ -46,7 +46,6 @@ OMPI_GENERATE_F77_BINDINGS (MPI_WIN_WAIT,
 #include "mpi/f77/profile/defines.h"
 #endif
 
-OMPI_EXPORT
 void mpi_win_wait_f(MPI_Fint *win, MPI_Fint *ierr)
 {
     MPI_Win c_win = MPI_Win_f2c(*win);
diff --git a/src/mpi/f77/wtick_f.c b/src/mpi/f77/wtick_f.c
index 3ca4ee00a7..435ddbb334 100644
--- a/src/mpi/f77/wtick_f.c
+++ b/src/mpi/f77/wtick_f.c
@@ -20,29 +20,24 @@
 
 #else
 
-    OMPI_EXPORT
     double mpi_wtick(void) {
         return MPI_Wtick();
     }
 
-    OMPI_EXPORT
     double mpi_wtick_(void) {
         return MPI_Wtick();
     }
 
-    OMPI_EXPORT
     double mpi_wtick__(void) {
         return MPI_Wtick();
     }
 
-    OMPI_EXPORT
     double MPI_WTICK(void) {
         return MPI_Wtick();
     }
 
 #endif
 
-OMPI_EXPORT
 double mpi_wtick_f(void)
 {
     return MPI_Wtick();
diff --git a/src/mpi/f77/wtime_f.c b/src/mpi/f77/wtime_f.c
index b10081c667..6f453599b9 100644
--- a/src/mpi/f77/wtime_f.c
+++ b/src/mpi/f77/wtime_f.c
@@ -20,29 +20,24 @@
 
 #else
 
-    OMPI_EXPORT
     double mpi_wtime(void) {
         return MPI_Wtime();
     }
 
-    OMPI_EXPORT
     double mpi_wtime_(void) {
         return MPI_Wtime();
     }
 
-    OMPI_EXPORT
     double mpi_wtime__(void) {
         return MPI_Wtime();
     }
 
-    OMPI_EXPORT
     double MPI_WTIME(void) {
         return MPI_Wtime();
     }
 
 #endif
 
-OMPI_EXPORT
 double mpi_wtime_f(void)
 {
     return MPI_Wtime();