diff --git a/ompi/datatype/dt_copy.c b/ompi/datatype/dt_copy.c
index 257e65428e..70426ef024 100644
--- a/ompi/datatype/dt_copy.c
+++ b/ompi/datatype/dt_copy.c
@@ -18,6 +18,7 @@
  */
 
 #include "ompi_config.h"
+#include "opal/prefetch.h"
 #include "ompi/datatype/datatype.h"
 #include "ompi/datatype/convertor.h"
 #include "ompi/datatype/datatype_internal.h"
@@ -206,7 +207,7 @@ int32_t ompi_ddt_copy_content_same_ddt( const ompi_datatype_t* datatype, int32_t
     pElem = &(description[pos_desc]);
 
     while( 1 ) {
-        while( pElem->elem.common.flags & DT_FLAG_DATA ) {
+        while( OPAL_LIKELY(pElem->elem.common.flags & DT_FLAG_DATA) ) {
             /* now here we have a basic datatype */
             COPY_PREDEFINED_DATATYPE( pElem, datatype, source_base, count, count_desc,
                                       source, destination, iov_len_local );
diff --git a/ompi/include/ompi_config.h.in b/ompi/include/ompi_config.h.in
index a82a6b5b19..1ad5ca6bdf 100644
--- a/ompi/include/ompi_config.h.in
+++ b/ompi/include/ompi_config.h.in
@@ -3,7 +3,7 @@
  * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
  *                         University Research and Technology
  *                         Corporation.  All rights reserved.
- * Copyright (c) 2004-2005 The University of Tennessee and The University
+ * Copyright (c) 2004-2006 The University of Tennessee and The University
  *                         of Tennessee Research Foundation.  All rights
  *                         reserved.
  * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
@@ -78,4 +78,26 @@ typedef struct {
 } ompi_fortran_double_complex_t;
 #endif
 
+#if defined(__WINDOWS__)
+
+#  if defined(_USRDLL)    /* building shared libraries (.DLL) */
+#    if defined(OMPI_EXPORTS)
+#      define OMPI_DECLSPEC __declspec(dllexport)
+#    else
+#      define OMPI_DECLSPEC __declspec(dllimport)
+#    endif
+#    if defined(OMPI_MODULE_EXPORTS)
+#      define OMPI_MODULE_DECLSPEC __declspec(dllexport)
+#    else
+#      define OMPI_MODULE_DECLSPEC __declspec(dllimport)
+#    endif
+#  else          /* building static library */
+#    define OMPI_DECLSPEC
+#    define OMPI_MODULE_DECLSPEC
+#  endif
+#else
+#define OMPI_DECLSPEC
+#define OMPI_MODULE_DECLSPEC
+#endif  /* defined(__WINDOWS__) */
+
 #endif
diff --git a/ompi/mca/allocator/basic/allocator_basic.h b/ompi/mca/allocator/basic/allocator_basic.h
index 879c6af6bb..4aa967e5a0 100644
--- a/ompi/mca/allocator/basic/allocator_basic.h
+++ b/ompi/mca/allocator/basic/allocator_basic.h
@@ -156,7 +156,7 @@ mca_allocator_base_module_t* mca_allocator_basic_component_init(
     int mca_allocator_basic_finalize(
         mca_allocator_base_module_t * mem);
 
-OMPI_COMP_EXPORT extern mca_allocator_base_component_t mca_allocator_basic_component;
+OMPI_DECLSPEC extern mca_allocator_base_component_t mca_allocator_basic_component;
 
 #if defined(c_plusplus) || defined(__cplusplus)
 }
diff --git a/ompi/mca/allocator/bucket/allocator_bucket_alloc.h b/ompi/mca/allocator/bucket/allocator_bucket_alloc.h
index 8da0614ea8..4956238eec 100644
--- a/ompi/mca/allocator/bucket/allocator_bucket_alloc.h
+++ b/ompi/mca/allocator/bucket/allocator_bucket_alloc.h
@@ -207,7 +207,7 @@ typedef struct mca_allocator_bucket_t mca_allocator_bucket_t;
    */
     int mca_allocator_bucket_finalize(mca_allocator_base_module_t * mem);
 
-OMPI_COMP_EXPORT extern mca_allocator_base_component_t mca_allocator_bucket_component;
+OMPI_DECLSPEC extern mca_allocator_base_component_t mca_allocator_bucket_component;
 
 #if defined(c_plusplus) || defined(__cplusplus)
 }
diff --git a/ompi/mca/bml/bml.h b/ompi/mca/bml/bml.h
index 4a398a92d4..2a343d171a 100644
--- a/ompi/mca/bml/bml.h
+++ b/ompi/mca/bml/bml.h
@@ -242,6 +242,8 @@ struct mca_bml_base_endpoint_t {
     size_t                   btl_rdma_align;    /**< max of min rdma size for available rmda btls */
     mca_bml_base_btl_array_t btl_eager;         /**< array of btls to use for first fragments */
     mca_bml_base_btl_array_t btl_send;          /**< array of btls to use for remaining fragments */
+    size_t                   bml_max_send_length;
+    size_t                   bml_max_rdma_length;
     mca_bml_base_btl_array_t btl_rdma;          /**< array of btls that support (prefer) rdma */
     uint32_t btl_flags_or;                      /**< the bitwise OR of the btl flags */
     uint32_t btl_flags_and;                     /**< the bitwise AND of the btl flags */
@@ -249,7 +251,7 @@ struct mca_bml_base_endpoint_t {
 typedef struct mca_bml_base_endpoint_t mca_bml_base_endpoint_t;
                               
     
-OMPI_COMP_EXPORT OBJ_CLASS_DECLARATION(mca_bml_base_endpoint_t);
+OMPI_DECLSPEC OBJ_CLASS_DECLARATION(mca_bml_base_endpoint_t);
 
 static inline void mca_bml_base_alloc(mca_bml_base_btl_t* bml_btl, mca_btl_base_descriptor_t** des, size_t size) { 
     *des = bml_btl->btl_alloc(bml_btl->btl, size);
diff --git a/ompi/mca/bml/r2/bml_r2.c b/ompi/mca/bml/r2/bml_r2.c
index 3fefba45f2..3012d92d71 100644
--- a/ompi/mca/bml/r2/bml_r2.c
+++ b/ompi/mca/bml/r2/bml_r2.c
@@ -372,23 +372,28 @@ int mca_bml_r2_add_procs(
         /* (1) determine the total bandwidth available across all btls
          *     note that we need to do this here, as we may already have btls configured
          * (2) determine the highest priority ranking for latency
+         * (3) compute the maximum amount of bytes that can be send without any
+         *     weighting. Once the left over is smaller than this number we will
+         *     start using the weight to compute the correct amount.
          */
         n_size = mca_bml_base_btl_array_get_size(&bml_endpoint->btl_send); 
+        bml_endpoint->bml_max_send_length = 0;
+        bml_endpoint->bml_max_rdma_length = 0;
         for(n_index = 0; n_index < n_size; n_index++) {
             mca_bml_base_btl_t* bml_btl = 
                 mca_bml_base_btl_array_get_index(&bml_endpoint->btl_send, n_index);
             mca_btl_base_module_t* btl = bml_btl->btl;
-            total_bandwidth += bml_btl->btl->btl_bandwidth; 
+            total_bandwidth += bml_btl->btl->btl_bandwidth;
             if(btl->btl_latency < latency) {
                 latency = btl->btl_latency;
             }
+            bml_endpoint->bml_max_send_length += bml_btl->btl->btl_bandwidth;
         }
         
         /* (1) set the weight of each btl as a percentage of overall bandwidth
          * (2) copy all btl instances at the highest priority ranking into the
          *     list of btls used for first fragments
          */
-
         for(n_index = 0; n_index < n_size; n_index++) {
             mca_bml_base_btl_t* bml_btl = 
                 mca_bml_base_btl_array_get_index(&bml_endpoint->btl_send, n_index);
diff --git a/ompi/mca/coll/basic/coll_basic.h b/ompi/mca/coll/basic/coll_basic.h
index e082ddde55..e05bd291d7 100644
--- a/ompi/mca/coll/basic/coll_basic.h
+++ b/ompi/mca/coll/basic/coll_basic.h
@@ -35,10 +35,10 @@ extern "C"
 
     /* Globally exported variables */
 
-    OMPI_COMP_EXPORT extern const mca_coll_base_component_1_0_0_t
+    OMPI_DECLSPEC extern const mca_coll_base_component_1_0_0_t
         mca_coll_basic_component;
-    OMPI_COMP_EXPORT extern int mca_coll_basic_priority;
-    OMPI_COMP_EXPORT extern int mca_coll_basic_crossover;
+    OMPI_DECLSPEC extern int mca_coll_basic_priority;
+    OMPI_DECLSPEC extern int mca_coll_basic_crossover;
 
     /* API functions */
 
diff --git a/ompi/mca/coll/self/coll_self.h b/ompi/mca/coll/self/coll_self.h
index c5f848500d..fc0065ecbf 100644
--- a/ompi/mca/coll/self/coll_self.h
+++ b/ompi/mca/coll/self/coll_self.h
@@ -35,8 +35,8 @@ extern "C" {
  * Globally exported variable
  */
 
-OMPI_COMP_EXPORT extern const mca_coll_base_component_1_0_0_t mca_coll_self_component;
-OMPI_COMP_EXPORT extern int mca_coll_self_priority_param;
+OMPI_DECLSPEC extern const mca_coll_base_component_1_0_0_t mca_coll_self_component;
+OMPI_DECLSPEC extern int mca_coll_self_priority_param;
 
 
 /*
diff --git a/ompi/mca/coll/tuned/coll_tuned.h b/ompi/mca/coll/tuned/coll_tuned.h
index 0cb1fb736c..b7742c1aba 100644
--- a/ompi/mca/coll/tuned/coll_tuned.h
+++ b/ompi/mca/coll/tuned/coll_tuned.h
@@ -67,22 +67,22 @@ extern "C" {
  * Globally exported variable
  */
 
-/* OMPI_COMP_EXPORT extern const mca_coll_base_component_1_0_0_t mca_coll_tuned_component; */
+/* OMPI_DECLSPEC extern const mca_coll_base_component_1_0_0_t mca_coll_tuned_component; */
 
 /* these are the same across all modules and are loaded at component query time */
-OMPI_COMP_EXPORT extern int   ompi_coll_tuned_stream;
-OMPI_COMP_EXPORT extern int   ompi_coll_tuned_priority;
-OMPI_COMP_EXPORT extern int   ompi_coll_tuned_preallocate_memory_comm_size_limit;
-OMPI_COMP_EXPORT extern int   ompi_coll_tuned_use_dynamic_rules;
-OMPI_COMP_EXPORT extern char* ompi_coll_tuned_dynamic_rules_filename;
-OMPI_COMP_EXPORT extern int   ompi_coll_tuned_init_tree_fanout;
-OMPI_COMP_EXPORT extern int   ompi_coll_tuned_init_chain_fanout;
+OMPI_DECLSPEC extern int   ompi_coll_tuned_stream;
+OMPI_DECLSPEC extern int   ompi_coll_tuned_priority;
+OMPI_DECLSPEC extern int   ompi_coll_tuned_preallocate_memory_comm_size_limit;
+OMPI_DECLSPEC extern int   ompi_coll_tuned_use_dynamic_rules;
+OMPI_DECLSPEC extern char* ompi_coll_tuned_dynamic_rules_filename;
+OMPI_DECLSPEC extern int   ompi_coll_tuned_init_tree_fanout;
+OMPI_DECLSPEC extern int   ompi_coll_tuned_init_chain_fanout;
 
 /* forced algorithm choices */
 /* the indices to the MCA params so that modules can look them up at open / comm create time  */
-OMPI_COMP_EXPORT extern coll_tuned_force_algorithm_mca_param_indices_t ompi_coll_tuned_forced_params[COLLCOUNT];
+OMPI_DECLSPEC extern coll_tuned_force_algorithm_mca_param_indices_t ompi_coll_tuned_forced_params[COLLCOUNT];
 /* the actual max algorithm values (readonly), loaded at component open */
-OMPI_COMP_EXPORT extern int ompi_coll_tuned_forced_max_algorithms[COLLCOUNT];
+OMPI_DECLSPEC extern int ompi_coll_tuned_forced_max_algorithms[COLLCOUNT];
 
 
 
diff --git a/ompi/mca/mpool/gm/mpool_gm.h b/ompi/mca/mpool/gm/mpool_gm.h
index 1921eabc61..a22d64955b 100644
--- a/ompi/mca/mpool/gm/mpool_gm.h
+++ b/ompi/mca/mpool/gm/mpool_gm.h
@@ -43,7 +43,7 @@ struct mca_mpool_gm_component_t {
 
 typedef struct mca_mpool_gm_component_t mca_mpool_gm_component_t;
 
-OMPI_COMP_EXPORT extern mca_mpool_gm_component_t mca_mpool_gm_component;
+OMPI_DECLSPEC extern mca_mpool_gm_component_t mca_mpool_gm_component;
 
 
 
diff --git a/ompi/mca/mpool/mvapi/mpool_mvapi.h b/ompi/mca/mpool/mvapi/mpool_mvapi.h
index 17356887fe..443c7b6dad 100644
--- a/ompi/mca/mpool/mvapi/mpool_mvapi.h
+++ b/ompi/mca/mpool/mvapi/mpool_mvapi.h
@@ -40,7 +40,7 @@ struct mca_mpool_mvapi_component_t {
 
 typedef struct mca_mpool_mvapi_component_t mca_mpool_mvapi_component_t;
 
-OMPI_COMP_EXPORT extern mca_mpool_mvapi_component_t mca_mpool_mvapi_component;
+OMPI_DECLSPEC extern mca_mpool_mvapi_component_t mca_mpool_mvapi_component;
 
 
 
diff --git a/ompi/mca/mpool/openib/mpool_openib.h b/ompi/mca/mpool/openib/mpool_openib.h
index 6d4a7e0a84..cbb4dc9a5c 100644
--- a/ompi/mca/mpool/openib/mpool_openib.h
+++ b/ompi/mca/mpool/openib/mpool_openib.h
@@ -48,7 +48,7 @@ struct mca_mpool_openib_component_t {
 
 typedef struct mca_mpool_openib_component_t mca_mpool_openib_component_t;
 
-OMPI_COMP_EXPORT extern mca_mpool_openib_component_t mca_mpool_openib_component;
+OMPI_DECLSPEC extern mca_mpool_openib_component_t mca_mpool_openib_component;
 
 
 
diff --git a/ompi/mca/mpool/sm/mpool_sm.h b/ompi/mca/mpool/sm/mpool_sm.h
index 69aeddd6f7..95793816eb 100644
--- a/ompi/mca/mpool/sm/mpool_sm.h
+++ b/ompi/mca/mpool/sm/mpool_sm.h
@@ -39,8 +39,8 @@ struct mca_mpool_sm_component_t {
 };
 typedef struct mca_mpool_sm_component_t mca_mpool_sm_component_t;
 
-OMPI_COMP_EXPORT extern mca_mpool_sm_component_t mca_mpool_sm_component;
-/*  OMPI_COMP_EXPORT extern mca_mpool_base_module_t mca_mpool_sm_module; */
+OMPI_DECLSPEC extern mca_mpool_sm_component_t mca_mpool_sm_component;
+/*  OMPI_DECLSPEC extern mca_mpool_base_module_t mca_mpool_sm_module; */
 
 
 
diff --git a/ompi/mca/mpool/udapl/mpool_udapl.h b/ompi/mca/mpool/udapl/mpool_udapl.h
index 62631f3ea8..a3dab39917 100644
--- a/ompi/mca/mpool/udapl/mpool_udapl.h
+++ b/ompi/mca/mpool/udapl/mpool_udapl.h
@@ -36,7 +36,7 @@ struct mca_mpool_udapl_component_t {
     char* rcache_name; 
 };
 typedef struct mca_mpool_udapl_component_t mca_mpool_udapl_component_t;
-OMPI_COMP_EXPORT extern mca_mpool_udapl_component_t mca_mpool_udapl_component;
+OMPI_DECLSPEC extern mca_mpool_udapl_component_t mca_mpool_udapl_component;
 
 
 struct mca_mpool_base_resources_t {
diff --git a/ompi/mca/pml/cm/pml_cm_proc.h b/ompi/mca/pml/cm/pml_cm_proc.h
index 27f59cfdcf..e55a6f9db1 100644
--- a/ompi/mca/pml/cm/pml_cm_proc.h
+++ b/ompi/mca/pml/cm/pml_cm_proc.h
@@ -30,7 +30,7 @@ struct mca_pml_cm_proc_t {
     mca_pml_proc_t base;
 };
 typedef struct mca_pml_cm_proc_t mca_pml_cm_proc_t;
-OMPI_COMP_EXPORT extern opal_class_t mca_pml_cm_proc_t_class; 
+OMPI_DECLSPEC extern opal_class_t mca_pml_cm_proc_t_class; 
 
 #if defined(c_plusplus) || defined(__cplusplus)
 }
diff --git a/ompi/mca/pml/dr/pml_dr_component.h b/ompi/mca/pml/dr/pml_dr_component.h
index 6f647f6c92..871ca44461 100644
--- a/ompi/mca/pml/dr/pml_dr_component.h
+++ b/ompi/mca/pml/dr/pml_dr_component.h
@@ -24,6 +24,6 @@
  * PML module functions.
  */
 
-OMPI_COMP_EXPORT extern mca_pml_base_component_1_0_0_t mca_pml_dr_component;
+OMPI_DECLSPEC extern mca_pml_base_component_1_0_0_t mca_pml_dr_component;
 
 #endif
diff --git a/ompi/mca/pml/dr/pml_dr_proc.h b/ompi/mca/pml/dr/pml_dr_proc.h
index 3a4bae29b5..8c81a1bf56 100644
--- a/ompi/mca/pml/dr/pml_dr_proc.h
+++ b/ompi/mca/pml/dr/pml_dr_proc.h
@@ -37,7 +37,7 @@ struct mca_pml_dr_proc_t {
     mca_pml_proc_t base; 
 };
 typedef struct mca_pml_dr_proc_t mca_pml_dr_proc_t;
-    OMPI_COMP_EXPORT extern opal_class_t mca_pml_dr_proc_t_class; 
+    OMPI_DECLSPEC extern opal_class_t mca_pml_dr_proc_t_class; 
 
 
 #if defined(c_plusplus) || defined(__cplusplus)
diff --git a/ompi/mca/pml/ob1/pml_ob1_component.h b/ompi/mca/pml/ob1/pml_ob1_component.h
index 4731e958ed..ab31e3738c 100644
--- a/ompi/mca/pml/ob1/pml_ob1_component.h
+++ b/ompi/mca/pml/ob1/pml_ob1_component.h
@@ -24,6 +24,6 @@
  * PML module functions.
  */
 
-OMPI_COMP_EXPORT extern mca_pml_base_component_1_0_0_t mca_pml_ob1_component;
+OMPI_DECLSPEC extern mca_pml_base_component_1_0_0_t mca_pml_ob1_component;
 
 #endif
diff --git a/ompi/mca/pml/ob1/pml_ob1_proc.h b/ompi/mca/pml/ob1/pml_ob1_proc.h
index 61ab6201b7..73d239d316 100644
--- a/ompi/mca/pml/ob1/pml_ob1_proc.h
+++ b/ompi/mca/pml/ob1/pml_ob1_proc.h
@@ -37,7 +37,7 @@ struct mca_pml_ob1_proc_t {
     mca_pml_proc_t base; 
 };
 typedef struct mca_pml_ob1_proc_t mca_pml_ob1_proc_t;
-OMPI_COMP_EXPORT extern opal_class_t mca_pml_ob1_proc_t_class; 
+OMPI_DECLSPEC extern opal_class_t mca_pml_ob1_proc_t_class; 
 
 #if defined(c_plusplus) || defined(__cplusplus)
 }
diff --git a/ompi/mca/pml/ob1/pml_ob1_recvreq.c b/ompi/mca/pml/ob1/pml_ob1_recvreq.c
index 285e657040..6705497f80 100644
--- a/ompi/mca/pml/ob1/pml_ob1_recvreq.c
+++ b/ompi/mca/pml/ob1/pml_ob1_recvreq.c
@@ -790,7 +790,7 @@ int mca_pml_ob1_recv_request_schedule_exclusive(
             }
 
             /* run progress as the prepare (pinning) can take some time */
-            /* mca_pml_ob1_progress(); */
+            mca_bml.bml_progress();
         }
     } while(OPAL_THREAD_ADD32(&recvreq->req_lock,-1) > 0);
 
diff --git a/ompi/mca/rcache/rb/rcache_rb.h b/ompi/mca/rcache/rb/rcache_rb.h
index 6db1003099..b1cb72e508 100644
--- a/ompi/mca/rcache/rb/rcache_rb.h
+++ b/ompi/mca/rcache/rb/rcache_rb.h
@@ -44,7 +44,7 @@ struct mca_rcache_rb_component_t {
     mca_rcache_base_component_t super; 
 }; typedef struct mca_rcache_rb_component_t mca_rcache_rb_component_t; 
 
-OMPI_COMP_EXPORT extern mca_rcache_rb_component_t mca_rcache_rb_component;
+OMPI_DECLSPEC extern mca_rcache_rb_component_t mca_rcache_rb_component;
 
 
 
diff --git a/ompi/mca/rcache/vma/rcache_vma.h b/ompi/mca/rcache/vma/rcache_vma.h
index 228aa5fba9..7b89626562 100644
--- a/ompi/mca/rcache/vma/rcache_vma.h
+++ b/ompi/mca/rcache/vma/rcache_vma.h
@@ -49,7 +49,7 @@ struct mca_rcache_vma_component_t {
     size_t reg_max_mru_size;
 }; typedef struct mca_rcache_vma_component_t mca_rcache_vma_component_t; 
 
-OMPI_COMP_EXPORT extern mca_rcache_vma_component_t mca_rcache_vma_component;
+OMPI_DECLSPEC extern mca_rcache_vma_component_t mca_rcache_vma_component;
 
 
 
diff --git a/ompi/mca/topo/unity/topo_unity_component.c b/ompi/mca/topo/unity/topo_unity_component.c
index ce4f457fb0..cda71a5495 100644
--- a/ompi/mca/topo/unity/topo_unity_component.c
+++ b/ompi/mca/topo/unity/topo_unity_component.c
@@ -43,7 +43,7 @@ const char *mca_topo_unity_component_version_string =
  * and finalize() are called during creation/destruction of a comm
  * *******************************************************************
  */
-OMPI_COMP_EXPORT mca_topo_base_component_1_0_0_t mca_topo_unity_component = 
+mca_topo_base_component_1_0_0_t mca_topo_unity_component = 
 {
     {
         MCA_TOPO_BASE_VERSION_1_0_0, /* version number */
diff --git a/opal/class/opal_atomic_lifo.h b/opal/class/opal_atomic_lifo.h
index 1bfcfe941d..bc153e8956 100644
--- a/opal/class/opal_atomic_lifo.h
+++ b/opal/class/opal_atomic_lifo.h
@@ -41,7 +41,7 @@ struct opal_atomic_lifo_t
 
 typedef struct opal_atomic_lifo_t opal_atomic_lifo_t;
 
-OMPI_DECLSPEC OBJ_CLASS_DECLARATION(opal_atomic_lifo_t);
+OPAL_DECLSPEC OBJ_CLASS_DECLARATION(opal_atomic_lifo_t);
 
 /* The ghost pointer will never change. The head will change via an atomic
  * compare-and-swap. On most architectures the reading of a pointer is an
diff --git a/opal/class/opal_free_list.h b/opal/class/opal_free_list.h
index be21408516..d960865207 100644
--- a/opal/class/opal_free_list.h
+++ b/opal/class/opal_free_list.h
@@ -64,7 +64,7 @@ OBJ_CLASS_DECLARATION(opal_free_list_item_t);
  * @param num_elements_per_alloc   Number of elements to grow by per allocation.
  */
  
-OMPI_DECLSPEC int opal_free_list_init(
+OPAL_DECLSPEC int opal_free_list_init(
     opal_free_list_t *free_list, 
     size_t element_size,
     opal_class_t* element_class,
@@ -72,7 +72,7 @@ OMPI_DECLSPEC int opal_free_list_init(
     int max_elements_to_alloc,
     int num_elements_per_alloc);
 
-OMPI_DECLSPEC int opal_free_list_grow(opal_free_list_t* flist, size_t num_elements);
+OPAL_DECLSPEC int opal_free_list_grow(opal_free_list_t* flist, size_t num_elements);
     
 /**
  * Attemp to obtain an item from a free list. 
diff --git a/opal/class/opal_hash_table.h b/opal/class/opal_hash_table.h
index 576da6448e..b9afc8c510 100644
--- a/opal/class/opal_hash_table.h
+++ b/opal/class/opal_hash_table.h
@@ -35,7 +35,7 @@
 extern "C" {
 #endif
 
-OMPI_DECLSPEC extern opal_class_t opal_hash_table_t_class;
+OPAL_DECLSPEC extern opal_class_t opal_hash_table_t_class;
                            
 
 struct opal_hash_table_t
@@ -62,7 +62,7 @@ typedef struct opal_hash_table_t opal_hash_table_t;
  *
  */
 
-OMPI_DECLSPEC int opal_hash_table_init(opal_hash_table_t* ht, size_t table_size);
+OPAL_DECLSPEC int opal_hash_table_init(opal_hash_table_t* ht, size_t table_size);
 
 
 /**
@@ -86,7 +86,7 @@ static inline size_t opal_hash_table_get_size(opal_hash_table_t *ht)
  *
  */
 
-OMPI_DECLSPEC int opal_hash_table_remove_all(opal_hash_table_t *ht);
+OPAL_DECLSPEC int opal_hash_table_remove_all(opal_hash_table_t *ht);
 
 /**
  *  Retrieve value via uint32_t key.
@@ -101,7 +101,7 @@ OMPI_DECLSPEC int opal_hash_table_remove_all(opal_hash_table_t *ht);
  *
  */
 
-OMPI_DECLSPEC int opal_hash_table_get_value_uint32(opal_hash_table_t* table, uint32_t key, 
+OPAL_DECLSPEC int opal_hash_table_get_value_uint32(opal_hash_table_t* table, uint32_t key, 
 						   void** ptr);
 
 /**
@@ -114,7 +114,7 @@ OMPI_DECLSPEC int opal_hash_table_get_value_uint32(opal_hash_table_t* table, uin
  *
  */
 
-OMPI_DECLSPEC int opal_hash_table_set_value_uint32(opal_hash_table_t* table, uint32_t key, void* value);
+OPAL_DECLSPEC int opal_hash_table_set_value_uint32(opal_hash_table_t* table, uint32_t key, void* value);
 
 /**
  *  Remove value based on uint32_t key.
@@ -125,7 +125,7 @@ OMPI_DECLSPEC int opal_hash_table_set_value_uint32(opal_hash_table_t* table, uin
  *
  */
 
-OMPI_DECLSPEC int opal_hash_table_remove_value_uint32(opal_hash_table_t* table, uint32_t key);
+OPAL_DECLSPEC int opal_hash_table_remove_value_uint32(opal_hash_table_t* table, uint32_t key);
 
 /**
  *  Retrieve value via uint64_t key.
@@ -140,7 +140,7 @@ OMPI_DECLSPEC int opal_hash_table_remove_value_uint32(opal_hash_table_t* table,
  *
  */
 
-OMPI_DECLSPEC int opal_hash_table_get_value_uint64(opal_hash_table_t *table, uint64_t key,
+OPAL_DECLSPEC int opal_hash_table_get_value_uint64(opal_hash_table_t *table, uint64_t key,
 						   void **ptr);
 
 /**
@@ -153,7 +153,7 @@ OMPI_DECLSPEC int opal_hash_table_get_value_uint64(opal_hash_table_t *table, uin
  *
  */
 
-OMPI_DECLSPEC int opal_hash_table_set_value_uint64(opal_hash_table_t *table, uint64_t key, void* value);
+OPAL_DECLSPEC int opal_hash_table_set_value_uint64(opal_hash_table_t *table, uint64_t key, void* value);
 
 /**
  *  Remove value based on uint64_t key.
@@ -164,7 +164,7 @@ OMPI_DECLSPEC int opal_hash_table_set_value_uint64(opal_hash_table_t *table, uin
  *
  */
 
-OMPI_DECLSPEC int opal_hash_table_remove_value_uint64(opal_hash_table_t *table, uint64_t key);
+OPAL_DECLSPEC int opal_hash_table_remove_value_uint64(opal_hash_table_t *table, uint64_t key);
 
 /**
  *  Retrieve value via arbitrary length binary key.
@@ -179,7 +179,7 @@ OMPI_DECLSPEC int opal_hash_table_remove_value_uint64(opal_hash_table_t *table,
  *
  */
 
-OMPI_DECLSPEC int opal_hash_table_get_value_ptr(opal_hash_table_t *table, const void* key, 
+OPAL_DECLSPEC int opal_hash_table_get_value_ptr(opal_hash_table_t *table, const void* key, 
 						size_t keylen, void **ptr);
 
 /**
@@ -192,7 +192,7 @@ OMPI_DECLSPEC int opal_hash_table_get_value_ptr(opal_hash_table_t *table, const
  *
  */
 
-OMPI_DECLSPEC int opal_hash_table_set_value_ptr(opal_hash_table_t *table, const void* key, size_t keylen, void* value);
+OPAL_DECLSPEC int opal_hash_table_set_value_ptr(opal_hash_table_t *table, const void* key, size_t keylen, void* value);
 
 /**
  *  Remove value based on arbitrary length binary key.
@@ -203,7 +203,7 @@ OMPI_DECLSPEC int opal_hash_table_set_value_ptr(opal_hash_table_t *table, const
  *
  */
 
-OMPI_DECLSPEC int opal_hash_table_remove_value_ptr(opal_hash_table_t *table, const void* key, size_t keylen);
+OPAL_DECLSPEC int opal_hash_table_remove_value_ptr(opal_hash_table_t *table, const void* key, size_t keylen);
 
 
 /** The following functions are only for allowing iterating through
@@ -228,7 +228,7 @@ OMPI_DECLSPEC int opal_hash_table_remove_value_ptr(opal_hash_table_t *table, con
  *
  */
 
-OMPI_DECLSPEC int opal_hash_table_get_first_key_uint32(opal_hash_table_t *table, uint32_t *key,
+OPAL_DECLSPEC int opal_hash_table_get_first_key_uint32(opal_hash_table_t *table, uint32_t *key,
 					void **value, void **node);
 
 
@@ -246,7 +246,7 @@ OMPI_DECLSPEC int opal_hash_table_get_first_key_uint32(opal_hash_table_t *table,
  *
  */
 
-OMPI_DECLSPEC int opal_hash_table_get_next_key_uint32(opal_hash_table_t *table, uint32_t *key,
+OPAL_DECLSPEC int opal_hash_table_get_next_key_uint32(opal_hash_table_t *table, uint32_t *key,
 				       void **value, void *in_node,
 				       void **out_node);
 
@@ -264,7 +264,7 @@ OMPI_DECLSPEC int opal_hash_table_get_next_key_uint32(opal_hash_table_t *table,
  *
  */
 
-OMPI_DECLSPEC int opal_hash_table_get_first_key_uint64(opal_hash_table_t *table, uint64_t *key,
+OPAL_DECLSPEC int opal_hash_table_get_first_key_uint64(opal_hash_table_t *table, uint64_t *key,
 				       void **value, void **node);
 
 
@@ -282,7 +282,7 @@ OMPI_DECLSPEC int opal_hash_table_get_first_key_uint64(opal_hash_table_t *table,
  *
  */
     
-OMPI_DECLSPEC int opal_hash_table_get_next_key_uint64(opal_hash_table_t *table, uint64_t *key,
+OPAL_DECLSPEC int opal_hash_table_get_next_key_uint64(opal_hash_table_t *table, uint64_t *key,
 				       void **value, void *in_node,
 				       void **out_node);
 
diff --git a/opal/class/opal_list.h b/opal/class/opal_list.h
index 415549a548..65145ea2a3 100644
--- a/opal/class/opal_list.h
+++ b/opal/class/opal_list.h
@@ -80,13 +80,13 @@ extern "C" {
  *
  * The class for the list container.
  */
-OMPI_DECLSPEC OBJ_CLASS_DECLARATION(opal_list_t);
+OPAL_DECLSPEC OBJ_CLASS_DECLARATION(opal_list_t);
 /**
  * \internal
  *
  * Base class for items that are put in list (opal_list_t) containers.
  */
-OMPI_DECLSPEC OBJ_CLASS_DECLARATION(opal_list_item_t);
+OPAL_DECLSPEC OBJ_CLASS_DECLARATION(opal_list_item_t);
 
 
 /**
diff --git a/opal/class/opal_object.h b/opal/class/opal_object.h
index f40883132e..9d306bfdb7 100644
--- a/opal/class/opal_object.h
+++ b/opal/class/opal_object.h
@@ -333,7 +333,7 @@ do {                                                            \
 } while (0)
 
 BEGIN_C_DECLS
-OMPI_DECLSPEC OBJ_CLASS_DECLARATION(opal_object_t);
+OPAL_DECLSPEC OBJ_CLASS_DECLARATION(opal_object_t);
 
 
 /* declarations *******************************************************/
@@ -346,7 +346,7 @@ OMPI_DECLSPEC OBJ_CLASS_DECLARATION(opal_object_t);
  *
  * @param class    Pointer to class descriptor
  */
-OMPI_DECLSPEC void opal_class_initialize(opal_class_t *);
+OPAL_DECLSPEC void opal_class_initialize(opal_class_t *);
 
 /**
  * Shut down the class system and release all memory
@@ -357,7 +357,7 @@ OMPI_DECLSPEC void opal_class_initialize(opal_class_t *);
  * tools like valgrind and purify don't report still-reachable memory
  * upon process termination.
  */
-OMPI_DECLSPEC int opal_class_finalize(void);
+OPAL_DECLSPEC int opal_class_finalize(void);
 
 END_C_DECLS
 /**
diff --git a/opal/class/opal_value_array.h b/opal/class/opal_value_array.h
index 421328fccd..84eb29e37c 100644
--- a/opal/class/opal_value_array.h
+++ b/opal/class/opal_value_array.h
@@ -39,7 +39,7 @@
 extern "C" {
 #endif
 
-OMPI_DECLSPEC extern opal_class_t opal_value_array_t_class;
+OPAL_DECLSPEC extern opal_class_t opal_value_array_t_class;
 
 
 struct opal_value_array_t
diff --git a/opal/event/event.c b/opal/event/event.c
index 8b62ffa692..a4f5f54432 100644
--- a/opal/event/event.c
+++ b/opal/event/event.c
@@ -155,7 +155,7 @@ static int	timeout_next(struct event_base *, struct timeval *);
 static void	timeout_process(struct event_base *);
 static void	timeout_correct(struct event_base *, struct timeval *);
 
-OMPI_DECLSPEC opal_mutex_t opal_event_lock;
+OPAL_DECLSPEC opal_mutex_t opal_event_lock;
 static int  opal_event_inited = 0;
 static bool opal_event_enabled = false;
 #if OMPI_ENABLE_PROGRESS_THREADS
diff --git a/opal/event/event.h b/opal/event/event.h
index eeb086bc43..ae1066f5a4 100644
--- a/opal/event/event.h
+++ b/opal/event/event.h
@@ -154,15 +154,15 @@ struct opal_eventop {
 
 #define OPAL_TIMEOUT_DEFAULT	{1, 0}
 
-OMPI_DECLSPEC int opal_event_init(void);
-OMPI_DECLSPEC int opal_event_dispatch(void);
-OMPI_DECLSPEC int opal_event_base_dispatch(struct event_base *);
+OPAL_DECLSPEC int opal_event_init(void);
+OPAL_DECLSPEC int opal_event_dispatch(void);
+OPAL_DECLSPEC int opal_event_base_dispatch(struct event_base *);
 
-OMPI_DECLSPEC int opal_event_fini(void);
-OMPI_DECLSPEC int opal_event_enable(void);
-OMPI_DECLSPEC int opal_event_disable(void);
-OMPI_DECLSPEC bool opal_event_progress_thread(void);
-OMPI_DECLSPEC int opal_event_restart(void);
+OPAL_DECLSPEC int opal_event_fini(void);
+OPAL_DECLSPEC int opal_event_enable(void);
+OPAL_DECLSPEC int opal_event_disable(void);
+OPAL_DECLSPEC bool opal_event_progress_thread(void);
+OPAL_DECLSPEC int opal_event_restart(void);
 
 #define _EVENT_LOG_DEBUG 0
 #define _EVENT_LOG_MSG   1
@@ -178,7 +178,7 @@ int opal_event_base_set(struct event_base *, struct opal_event *);
 #define OPAL_EVLOOP_NONBLOCK	0x02
 #define OPAL_EVLOOP_ONELOOP     0x04
 
-OMPI_DECLSPEC int opal_event_loop(int);
+OPAL_DECLSPEC int opal_event_loop(int);
 int opal_event_base_loop(struct event_base *, int);
 int opal_event_loopexit(struct timeval *);	/* Causes the loop to exit */
 int event_base_loopexit(struct event_base *, struct timeval *);
@@ -203,11 +203,11 @@ int event_base_loopexit(struct event_base *, struct timeval *);
 #define opal_signal_initialized(ev)	((ev)->ev_flags & OPAL_EVLIST_INIT)
 
 /* for internal use only */
-OMPI_DECLSPEC int   opal_event_add_i(struct opal_event *, struct timeval *);
-OMPI_DECLSPEC int   opal_event_del_i(struct opal_event *);
-OMPI_DECLSPEC void  opal_event_active_i(struct opal_event*, int, short);
-OMPI_DECLSPEC extern opal_mutex_t opal_event_lock;
-OMPI_DECLSPEC extern int opal_evsignal_restart(void);
+OPAL_DECLSPEC int   opal_event_add_i(struct opal_event *, struct timeval *);
+OPAL_DECLSPEC int   opal_event_del_i(struct opal_event *);
+OPAL_DECLSPEC void  opal_event_active_i(struct opal_event*, int, short);
+OPAL_DECLSPEC extern opal_mutex_t opal_event_lock;
+OPAL_DECLSPEC extern int opal_evsignal_restart(void);
 
 extern struct event_base *current_base;
 
diff --git a/opal/include/opal_config_bottom.h b/opal/include/opal_config_bottom.h
index 34150ff62a..3afeceedd8 100644
--- a/opal/include/opal_config_bottom.h
+++ b/opal/include/opal_config_bottom.h
@@ -28,48 +28,10 @@
 #error "opal_config_bottom.h should only be included from opal_config.h"
 #endif
 
-/*
- * OMPI_BUILDING and OMPI_BUILDING_WIN_DSO define how ompi_config.h
- * handles configuring all of Open MPI's "compatibility" code.  Both
- * constants will always be defined by the end of ompi_config.h.
- *
- * OMPI_BUILDING affects how much compatibility code is included by
- * ompi_config.h.  It will always be 1 or 0.  The user can set the
- * value before including either mpi.h or ompi_config.h and it will be
- * respected.  If ompi_config.h is included before mpi.h, it will
- * default to 1.  If mpi.h is included before ompi_config.h, it will
- * default to 0.
- *
- * If OMPI_BUILDING is 1, ompi_config.h will:
- *   - everything that happens with OMPI_BUILDING set to 0
- *   - include a bunch of header files (stdint.h, stdtypes.h, etc.)
- *   - potentially override malloc, free, etc. for memory debugging
- *   - provide C bool type
- *   - set ompi_building code to import all OMPI interfaces (windows)
- *
- * If OMPI_BUILDING is 0, ompi_config.h will:
- *   - set configuration #defines
- *   - define the fortran complex types
- *   - set the ompi_building code to export all the interfaces
- *     (unless OMPI_BUILDING_WIN_DSO is set to 1) (windows)
- *
- * If OMPI_BUILDING_WIN_DSO is 1, ompi_config.h will:
- *   - configure the OMPI_DECLSPEC defines to assume we are building a
- *     dynamic shared object for a component on Windows.  This will set
- *     all the import/export flags appropriately.
- *
- * If OMPI_BUILDING_WIN_DSO is 0 (or unset), ompi_config.h will:
- *   - configure the OMPI_DECLSPEC defines to assume we are not building
- *     a DSO component for Windows .
- */
 #ifndef OMPI_BUILDING
 #define OMPI_BUILDING 1
 #endif
 
-#ifndef OMPI_BUILDING_WIN_DSO
-#define OMPI_BUILDING_WIN_DSO 0
-#endif
-
 /***********************************************************************
  *
  * code that should be in ompi_config_bottom.h regardless of build
@@ -93,30 +55,28 @@
 
 #if defined(__WINDOWS__)
 
-#  if OMPI_BUILDING_WIN_DSO
-     /* building a component - need to import libmpi and export our
-        struct */
-#    define OMPI_COMP_EXPORT __declspec(dllexport)
-#    define OMPI_DECLSPEC __declspec(dllimport)
-#  else
-#    if OMPI_BUILDING
-       /* building libmpi (or something in libmpi) - need to export libmpi
-          interface */
-#      define OMPI_COMP_EXPORT
-#      define OMPI_DECLSPEC __declspec(dllexport)
+#  if defined(_USRDLL)    /* building shared libraries (.DLL) */
+#    if defined(OPAL_EXPORTS)
+#      define OPAL_DECLSPEC __declspec(dllexport)
 #    else
-       /* building something using libmpi - export the libmpi interface */
-#      define OMPI_COMP_EXPORT
-#      define OMPI_DECLSPEC __declspec(dllimport)
+#      define OPAL_DECLSPEC __declspec(dllimport)
 #    endif
+#    if defined(OPAL_MODULE_EXPORTS)
+#      define OPAL_MODULE_DECLSPEC __declspec(dllexport)
+#    else
+#      define OPAL_MODULE_DECLSPEC __declspec(dllimport)
+#    endif
+#  else          /* building static library */
+#    define OPAL_DECLSPEC
+#    define OPAL_MODULE_DECLSPEC
 #  endif
 #  if OMPI_BUILDING
 #    include "opal/win32/win_compat.h"
-#  endif
+#  endif  /* OMPI_BUILDING */
 #else
-   /* On Unix - get rid of the defines */ 
-#  define OMPI_COMP_EXPORT
-#  define OMPI_DECLSPEC
+   /* On Unix - this define is plain useless */
+#  define OPAL_DECLSPEC
+#  define OPAL_MODULE_DECLSPEC
 #endif
 
 /***********************************************************************
diff --git a/opal/mca/backtrace/base/base.h b/opal/mca/backtrace/base/base.h
index 0c185517b7..86fbb1bfa1 100644
--- a/opal/mca/backtrace/base/base.h
+++ b/opal/mca/backtrace/base/base.h
@@ -53,7 +53,7 @@ extern "C" {
      * functions -- it is not considered a public interface member --
      * and is only mentioned here for completeness.
      */
-    OMPI_DECLSPEC int opal_backtrace_base_open(void);
+    OPAL_DECLSPEC int opal_backtrace_base_open(void);
     
 
     /**
@@ -67,7 +67,7 @@ extern "C" {
      *
      * It must be the last function invoked on the backtrace MCA framework.
      */
-    OMPI_DECLSPEC int opal_backtrace_base_close(void);
+    OPAL_DECLSPEC int opal_backtrace_base_close(void);
 
     extern opal_list_t opal_backtrace_base_components_opened;
     
diff --git a/opal/mca/base/base.h b/opal/mca/base/base.h
index 0f92b04577..9d1b487d47 100644
--- a/opal/mca/base/base.h
+++ b/opal/mca/base/base.h
@@ -61,7 +61,7 @@ OBJ_CLASS_DECLARATION(mca_base_component_priority_list_item_t);
 /*
  * Public variables
  */
-OMPI_DECLSPEC extern int mca_base_param_component_path;
+OPAL_DECLSPEC extern int mca_base_param_component_path;
 
 
 /*
@@ -82,7 +82,7 @@ OMPI_DECLSPEC extern int mca_base_param_component_path;
    * invoked during ompi_mpi_init() and specifically invoked in the
    * special case of the laminfo command.
    */
-OMPI_DECLSPEC   int mca_base_open(void);
+OPAL_DECLSPEC   int mca_base_open(void);
 
   /**
    * Last function called in the MCA
@@ -97,41 +97,41 @@ OMPI_DECLSPEC   int mca_base_open(void);
    * during ompi_mpi_finalize() and specifically invoked during the
    * special case of the laminfo command.
    */
-OMPI_DECLSPEC  int mca_base_close(void);
+OPAL_DECLSPEC  int mca_base_close(void);
 
   /* mca_base_cmd_line.c */
 
-OMPI_DECLSPEC  int mca_base_cmd_line_setup(opal_cmd_line_t *cmd);
-OMPI_DECLSPEC  int mca_base_cmd_line_process_args(opal_cmd_line_t *cmd,
+OPAL_DECLSPEC  int mca_base_cmd_line_setup(opal_cmd_line_t *cmd);
+OPAL_DECLSPEC  int mca_base_cmd_line_process_args(opal_cmd_line_t *cmd,
                                                   char ***app_env,
                                                   char ***global_env);
 
   /* mca_base_component_compare.c */
   
-OMPI_DECLSPEC  int mca_base_component_compare_priority(mca_base_component_priority_list_item_t *a,
+OPAL_DECLSPEC  int mca_base_component_compare_priority(mca_base_component_priority_list_item_t *a,
                                        mca_base_component_priority_list_item_t *b);
-OMPI_DECLSPEC  int mca_base_component_compare(const mca_base_component_t *a,
+OPAL_DECLSPEC  int mca_base_component_compare(const mca_base_component_t *a,
                               const mca_base_component_t *b);
   int mca_base_component_compatible(const mca_base_component_t *a,
                               const mca_base_component_t *b);
 
   /* mca_base_component_find.c */
 
-OMPI_DECLSPEC  int mca_base_component_find(const char *directory, const char *type,
+OPAL_DECLSPEC  int mca_base_component_find(const char *directory, const char *type,
                            const mca_base_component_t *static_components[],
                            opal_list_t *found_components,
                            bool open_dso_components);
 
   /* mca_base_components_open.c */
 
-OMPI_DECLSPEC  int mca_base_components_open(const char *type_name, int output_id,
+OPAL_DECLSPEC  int mca_base_components_open(const char *type_name, int output_id,
                             const mca_base_component_t **static_components,
                             opal_list_t *components_available,
                             bool open_dso_components);
 
   /* mca_base_components_close.c */
   
-OMPI_DECLSPEC  int mca_base_components_close(int output_id, opal_list_t *components_available, 
+OPAL_DECLSPEC  int mca_base_components_close(int output_id, opal_list_t *components_available, 
                              const mca_base_component_t *skip);
 
 #if 0
diff --git a/opal/mca/base/mca_base_component_repository.h b/opal/mca/base/mca_base_component_repository.h
index 2b01b7e0e2..682154e930 100644
--- a/opal/mca/base/mca_base_component_repository.h
+++ b/opal/mca/base/mca_base_component_repository.h
@@ -25,7 +25,7 @@
 extern "C" {
 #endif
 
-    OMPI_DECLSPEC int mca_base_component_repository_init(void);
+    OPAL_DECLSPEC int mca_base_component_repository_init(void);
 
 /* This file provide the external interface to our base component
  * module.  Most of the components that depend on it, will use the
@@ -64,18 +64,18 @@ extern "C" {
     typedef void *lt_dlhandle;
 #endif
 
-    OMPI_DECLSPEC int mca_base_component_repository_retain(char *type, 
+    OPAL_DECLSPEC int mca_base_component_repository_retain(char *type, 
                               lt_dlhandle component_handle, 
                               const mca_base_component_t *component_struct);
 
-    OMPI_DECLSPEC int mca_base_component_repository_retain_component(const char *type, 
+    OPAL_DECLSPEC int mca_base_component_repository_retain_component(const char *type, 
                               const char *name);
-    OMPI_DECLSPEC int mca_base_component_repository_link(const char *src_type, 
+    OPAL_DECLSPEC int mca_base_component_repository_link(const char *src_type, 
                               const char *src_name,
                               const char *depend_type,
                               const char *depend_name);
-    OMPI_DECLSPEC void mca_base_component_repository_release(const mca_base_component_t *component);
-    OMPI_DECLSPEC void mca_base_component_repository_finalize(void);
+    OPAL_DECLSPEC void mca_base_component_repository_release(const mca_base_component_t *component);
+    OPAL_DECLSPEC void mca_base_component_repository_finalize(void);
     
 #if defined(c_plusplus) || defined(__cplusplus)
 }
diff --git a/opal/mca/base/mca_base_msgbuf.h b/opal/mca/base/mca_base_msgbuf.h
index 5b09024671..d00705109e 100644
--- a/opal/mca/base/mca_base_msgbuf.h
+++ b/opal/mca/base/mca_base_msgbuf.h
@@ -75,7 +75,7 @@ typedef struct mca_base_msgbuffer_s* mca_base_msgbuf_t;
  * unlimited buffer. 
  *
  * Giving a req size just makes it more memory efficient. */
-OMPI_DECLSPEC mca_base_msgbuf_t mca_base_msgbuf_new (size_t reqsize);
+OPAL_DECLSPEC mca_base_msgbuf_t mca_base_msgbuf_new (size_t reqsize);
 
 /* make a copy of an existing buffer 
  * 
@@ -86,7 +86,7 @@ OMPI_DECLSPEC mca_base_msgbuf_t mca_base_msgbuf_new (size_t reqsize);
  *
  * this is usefull for the registry and is needed as unpack is 
  * destructive */
-OMPI_DECLSPEC int  mca_base_msgbuf_copy (mca_base_msgbuf_t* copybufid, mca_base_msgbuf_t orgbufid);
+OPAL_DECLSPEC int  mca_base_msgbuf_copy (mca_base_msgbuf_t* copybufid, mca_base_msgbuf_t orgbufid);
 
 /* set a buffer to a block of memory so that you do not pack/memory copy
  *
@@ -99,7 +99,7 @@ OMPI_DECLSPEC int  mca_base_msgbuf_copy (mca_base_msgbuf_t* copybufid, mca_base_
  * to pack a buffer but do a send from memory directly 
  * a free on this special buffer just frees its structure not the memory 
  */
-OMPI_DECLSPEC mca_base_msgbuf_t mca_base_msgbuf_construct (void* ptr, size_t datasize);
+OPAL_DECLSPEC mca_base_msgbuf_t mca_base_msgbuf_construct (void* ptr, size_t datasize);
 
 /* explicit free of a buffer when not auto freeing them 
  * 
@@ -110,7 +110,7 @@ OMPI_DECLSPEC mca_base_msgbuf_t mca_base_msgbuf_construct (void* ptr, size_t dat
  * This routine resets the handle the user passing inso that they can only 
  * free it once
  */
-OMPI_DECLSPEC int mca_base_msgbuf_free (mca_base_msgbuf_t* bufid);
+OPAL_DECLSPEC int mca_base_msgbuf_free (mca_base_msgbuf_t* bufid);
 
 /* pack and non-string typed data 
  *
@@ -124,7 +124,7 @@ OMPI_DECLSPEC int mca_base_msgbuf_free (mca_base_msgbuf_t* bufid);
  * If the buffer fills up, it will automatically resize unless allocated
  * with fixed buffer size.
  */
-OMPI_DECLSPEC int  mca_base_msgbuf_pack (mca_base_msgbuf_t bufid, void* ptr, size_t num_items, mca_base_msgbuf_data_t datatype);
+OPAL_DECLSPEC int  mca_base_msgbuf_pack (mca_base_msgbuf_t bufid, void* ptr, size_t num_items, mca_base_msgbuf_data_t datatype);
 
 
 /* unpack non-string typed data 
@@ -141,7 +141,7 @@ OMPI_DECLSPEC int  mca_base_msgbuf_pack (mca_base_msgbuf_t bufid, void* ptr, siz
  * request, the routine will unpack what it can and then return an error.
  * The user is responsible for unpacking a message correctly.
  */
-OMPI_DECLSPEC int  mca_base_msgbuf_unpack (mca_base_msgbuf_t bufid, void* ptr, size_t num_items, mca_base_msgbuf_data_t datatype);
+OPAL_DECLSPEC int  mca_base_msgbuf_unpack (mca_base_msgbuf_t bufid, void* ptr, size_t num_items, mca_base_msgbuf_data_t datatype);
 
 /* pack a NULL terminated string 
  *
@@ -153,7 +153,7 @@ OMPI_DECLSPEC int  mca_base_msgbuf_unpack (mca_base_msgbuf_t bufid, void* ptr, s
  * If the buffer fills up, it will automatically resize unless allocated
  * with a fixed buffer size.
  */
-OMPI_DECLSPEC int  mca_base_msgbuf_pack_string (mca_base_msgbuf_t bufid, char* strptr);
+OPAL_DECLSPEC int  mca_base_msgbuf_pack_string (mca_base_msgbuf_t bufid, char* strptr);
 
 /* unpack a NULL terminated string 
  *
@@ -167,7 +167,7 @@ OMPI_DECLSPEC int  mca_base_msgbuf_pack_string (mca_base_msgbuf_t bufid, char* s
  * then the routine truncates the string but always NULL terminates it.
  *
  */
-OMPI_DECLSPEC int  mca_base_msgbuf_unpack_string (mca_base_msgbuf_t bufid, char* strptr, size_t maxlen);
+OPAL_DECLSPEC int  mca_base_msgbuf_unpack_string (mca_base_msgbuf_t bufid, char* strptr, size_t maxlen);
 
 
 /* constants */
diff --git a/opal/mca/base/mca_base_param.c b/opal/mca/base/mca_base_param.c
index c3546fc73c..ba2fb147a9 100644
--- a/opal/mca/base/mca_base_param.c
+++ b/opal/mca/base/mca_base_param.c
@@ -540,7 +540,6 @@ char *mca_base_param_environ_variable(const char *type,
 /*
  * Find the index for an MCA parameter based on its names.
  */
-OMPI_DECLSPEC
 int mca_base_param_find(const char *type_name, const char *component_name, 
                         const char *param_name) 
 {
diff --git a/opal/mca/base/mca_base_param.h b/opal/mca/base/mca_base_param.h
index 65aa220e17..bbd6ba9ac2 100644
--- a/opal/mca/base/mca_base_param.h
+++ b/opal/mca/base/mca_base_param.h
@@ -133,7 +133,7 @@ extern "C" {
      * invoked internally (by mca_base_open()) and is only documented
      * here for completeness.
      */
-    OMPI_DECLSPEC int mca_base_param_init(void);
+    OPAL_DECLSPEC int mca_base_param_init(void);
 
     /**
      * Register an integer MCA parameter.
@@ -187,7 +187,7 @@ extern "C" {
      * complete, the parameter system will look up the current value
      * of the parameter and return it in {current_value}.
      */
-    OMPI_DECLSPEC int mca_base_param_reg_int(const mca_base_component_t *component,
+    OPAL_DECLSPEC int mca_base_param_reg_int(const mca_base_component_t *component,
                                              const char *param_name, 
                                              const char *help_msg,
                                              bool internal,
@@ -238,7 +238,7 @@ extern "C" {
      * NULL (because it is not specified in this registration
      * function, and is therefore registered with a NULL value).
      */
-    OMPI_DECLSPEC int mca_base_param_reg_int_name(const char *type,
+    OPAL_DECLSPEC int mca_base_param_reg_int_name(const char *type,
                                                   const char *param_name, 
                                                   const char *help_msg,
                                                   bool internal,
@@ -279,7 +279,7 @@ extern "C" {
      * string default value (which is \em not allowed to be NULL).
      * See mca_base_param_reg_int() for all other details.
      */
-    OMPI_DECLSPEC int mca_base_param_reg_string(const mca_base_component_t *component,
+    OPAL_DECLSPEC int mca_base_param_reg_string(const mca_base_component_t *component,
                                                 const char *param_name,
                                                 const char *help_msg,
                                                 bool internal,
@@ -335,7 +335,7 @@ extern "C" {
      * NULL (because it is not specified in this registration
      * function, and is therefore registered with a NULL value).
      */
-    OMPI_DECLSPEC int mca_base_param_reg_string_name(const char *type,
+    OPAL_DECLSPEC int mca_base_param_reg_string_name(const char *type,
                                                      const char *param_name,
                                                      const char *help_msg,
                                                      bool internal,
@@ -366,7 +366,7 @@ extern "C" {
      * versions will cross reference and attempt to find parameter
      * values on attributes.
      */
-    OMPI_DECLSPEC int mca_base_param_kv_associate(int index, int keyval);
+    OPAL_DECLSPEC int mca_base_param_kv_associate(int index, int keyval);
 
     /**
      * Look up an integer MCA parameter.
@@ -384,7 +384,7 @@ extern "C" {
      * The value of a specific MCA parameter can be looked up using the
      * return value from mca_base_param_register_int().
      */
-    OMPI_DECLSPEC int mca_base_param_lookup_int(int index, int *value);
+    OPAL_DECLSPEC int mca_base_param_lookup_int(int index, int *value);
     
     /**
      * Look up an integer MCA parameter, to include looking in
@@ -406,7 +406,7 @@ extern "C" {
      * value.  The function mca_base_param_kv_associate() must have been
      * called first to associate a keyval with the index.
      */
-    OMPI_DECLSPEC int mca_base_param_kv_lookup_int(int index,
+    OPAL_DECLSPEC int mca_base_param_kv_lookup_int(int index,
                                                    struct opal_hash_table_t *attrs, 
                                                    int *value);
     
@@ -433,7 +433,7 @@ extern "C" {
      * The value of a specific MCA parameter can be looked up using the
      * return value from mca_base_param_register_string().
      */
-    OMPI_DECLSPEC int mca_base_param_lookup_string(int index, char **value);
+    OPAL_DECLSPEC int mca_base_param_lookup_string(int index, char **value);
 
     /**
      * Look up a string MCA parameter, to include looking in attributes.
@@ -454,7 +454,7 @@ extern "C" {
      * parameter value.  The function mca_base_param_kv_associate() must
      * have been called first to associate a keyval with the index.
      */
-    OMPI_DECLSPEC int mca_base_param_kv_lookup_string(int index, 
+    OPAL_DECLSPEC int mca_base_param_kv_lookup_string(int index, 
                                                       struct opal_hash_table_t *attrs, 
                                                       char **value);
 
@@ -476,7 +476,7 @@ extern "C" {
      * This function may be invoked multiple times; each time, the
      * last "set" value is replaced with the newest value.
      */
-    OMPI_DECLSPEC int mca_base_param_set_int(int index, int value);
+    OPAL_DECLSPEC int mca_base_param_set_int(int index, int value);
 
     /**
      * Sets an "override" value for an string MCA parameter.
@@ -500,7 +500,7 @@ extern "C" {
      * last "set" value is replaced with the newest value (the old
      * value is discarded).
      */
-    OMPI_DECLSPEC int mca_base_param_set_string(int index, char *value);
+    OPAL_DECLSPEC int mca_base_param_set_string(int index, char *value);
 
     /**
      * Unset a parameter that was previously set by
@@ -514,7 +514,7 @@ extern "C" {
      * Resets previous value that was set (if any) on the given MCA
      * parameter.
      */
-    OMPI_DECLSPEC int mca_base_param_unset(int index);
+    OPAL_DECLSPEC int mca_base_param_unset(int index);
 
     /**
      * Get the string name corresponding to the MCA parameter
@@ -529,7 +529,7 @@ extern "C" {
      * The string that is returned is owned by the caller; if
      * appropriate, it must be eventually freed by the caller.
      */
-    OMPI_DECLSPEC char *mca_base_param_env_var(const char *param_name);
+    OPAL_DECLSPEC char *mca_base_param_env_var(const char *param_name);
 
     /**
      * Find the index for an MCA parameter based on its names.
@@ -550,7 +550,7 @@ extern "C" {
      * can be used with mca_base_param_lookup_int() and
      * mca_base_param_lookup_string().
      */
-    OMPI_DECLSPEC int mca_base_param_find(const char *type, 
+    OPAL_DECLSPEC int mca_base_param_find(const char *type, 
                                           const char *component, 
                                           const char *param);
 
@@ -573,7 +573,7 @@ extern "C" {
      * MPI_INIT (at least, they're not displayed by default), thus
      * keeping them away from prying user eyes.
      */
-    OMPI_DECLSPEC int mca_base_param_set_internal(int index, bool internal);
+    OPAL_DECLSPEC int mca_base_param_set_internal(int index, bool internal);
 
     /**
      * Obtain a list of all the MCA parameters currently defined as
@@ -599,7 +599,7 @@ extern "C" {
      * mca_base_param_dump_release() when finished with the returned
      * info list to release all associated memory.
      */
-    OMPI_DECLSPEC int mca_base_param_dump(opal_list_t **info, bool internal);
+    OPAL_DECLSPEC int mca_base_param_dump(opal_list_t **info, bool internal);
 
     /**
      * Obtain a list of all the MCA parameters currently defined as
@@ -619,7 +619,7 @@ extern "C" {
      * its output is in terms of an argv-style array of key=value
      * strings, suitable for using in an environment.
      */
-    OMPI_DECLSPEC int mca_base_param_build_env(char ***env, int *num_env,
+    OPAL_DECLSPEC int mca_base_param_build_env(char ***env, int *num_env,
                                                bool internal);
 
     /**
@@ -639,7 +639,7 @@ extern "C" {
      * the caller is finished with the info list, invoke this
      * function and all memory associated with the list will be freed.
      */
-    OMPI_DECLSPEC int mca_base_param_dump_release(opal_list_t *info);
+    OPAL_DECLSPEC int mca_base_param_dump_release(opal_list_t *info);
 
     /**
      * Shut down the MCA parameter system (normally only invoked by the
@@ -655,7 +655,7 @@ extern "C" {
      * when the process is shutting down (e.g., during MPI_FINALIZE).  It
      * is only documented here for completeness.
      */
-    OMPI_DECLSPEC int mca_base_param_finalize(void);
+    OPAL_DECLSPEC int mca_base_param_finalize(void);
 
     /***************************************************************
      * Deprecated interface
@@ -707,7 +707,7 @@ extern "C" {
      * returned, but the default value will be changed to reflect the
      * last registration.
      */
-    OMPI_DECLSPEC int mca_base_param_register_int(const char *type_name, 
+    OPAL_DECLSPEC int mca_base_param_register_int(const char *type_name, 
                                                   const char *component_name,
                                                   const char *param_name, 
                                                   const char *mca_param_name,
@@ -744,7 +744,7 @@ extern "C" {
      * associated string default value (which is \em not allowed to be NULL).
      * See mca_base_param_register_int() for all other details.
      */
-    OMPI_DECLSPEC int mca_base_param_register_string(const char *type_name, 
+    OPAL_DECLSPEC int mca_base_param_register_string(const char *type_name, 
                                                      const char *component_name,
                                                      const char *param_name, 
                                                      const char *mca_param_name,
@@ -770,7 +770,7 @@ extern "C" {
      * The string that is returned is owned by the caller; if
      * appropriate, it must be eventually freed by the caller.
      */
-    OMPI_DECLSPEC char *mca_base_param_environ_variable(const char *type,
+    OPAL_DECLSPEC char *mca_base_param_environ_variable(const char *type,
                                                         const char *comp,
                                                         const char *param);
 
diff --git a/opal/mca/base/mca_base_param_internal.h b/opal/mca/base/mca_base_param_internal.h
index f359900a38..a7953261a4 100644
--- a/opal/mca/base/mca_base_param_internal.h
+++ b/opal/mca/base/mca_base_param_internal.h
@@ -149,7 +149,7 @@ OBJ_CLASS_DECLARATION(mca_base_param_file_value_t);
  *
  * Global list of params and values read in from MCA parameter files
  */
-OMPI_DECLSPEC extern opal_list_t mca_base_param_file_values;
+OPAL_DECLSPEC extern opal_list_t mca_base_param_file_values;
 
 
 #if defined(c_plusplus) || defined(__cplusplus)
diff --git a/opal/mca/maffinity/base/base.h b/opal/mca/maffinity/base/base.h
index 91991edf81..cb34cf07a5 100644
--- a/opal/mca/maffinity/base/base.h
+++ b/opal/mca/maffinity/base/base.h
@@ -50,7 +50,7 @@ extern "C" {
      * functions -- it is not considered a public interface member --
      * and is only mentioned here for completeness.
      */
-    OMPI_DECLSPEC int opal_maffinity_base_open(void);
+    OPAL_DECLSPEC int opal_maffinity_base_open(void);
     
     /**
      * Select an available component.
@@ -83,7 +83,7 @@ extern "C" {
      * selected.  If no component was selected, subsequent invocation
      * of the maffinity wrapper functions will return an error.
      */
-    OMPI_DECLSPEC int opal_maffinity_base_select(void);
+    OPAL_DECLSPEC int opal_maffinity_base_select(void);
 
     /**
      * Set memory affinity.
@@ -105,7 +105,7 @@ extern "C" {
      * opal_maffinity_base_select() was never invoked, OPAL_NOT_FOUND
      * is returned.
      */
-    OMPI_DECLSPEC int opal_maffinity_base_set(opal_maffinity_base_segment_t *segments, size_t num_segments);
+    OPAL_DECLSPEC int opal_maffinity_base_set(opal_maffinity_base_segment_t *segments, size_t num_segments);
 
     /**
      * Shut down the maffinity MCA framework.
@@ -118,7 +118,7 @@ extern "C" {
      * It must be the last function invoked on the maffinity MCA
      * framework.
      */
-    OMPI_DECLSPEC int opal_maffinity_base_close(void);
+    OPAL_DECLSPEC int opal_maffinity_base_close(void);
     
 #if defined(c_plusplus) || defined(__cplusplus)
 }
diff --git a/opal/mca/maffinity/base/internal.h b/opal/mca/maffinity/base/internal.h
index 5656804bc6..a7c35e9ebc 100644
--- a/opal/mca/maffinity/base/internal.h
+++ b/opal/mca/maffinity/base/internal.h
@@ -40,35 +40,35 @@ extern "C" {
      * Indication of whether a component was successfully selected or
      * not
      */
-    OMPI_DECLSPEC extern bool opal_maffinity_base_selected;
+    OPAL_DECLSPEC extern bool opal_maffinity_base_selected;
 
     /**
      * Global component struct for the selected component
      */
-    OMPI_DECLSPEC extern const opal_maffinity_base_component_1_0_0_t 
+    OPAL_DECLSPEC extern const opal_maffinity_base_component_1_0_0_t 
         *opal_maffinity_base_component;
     /**
      * Global module struct for the selected module
      */
-    OMPI_DECLSPEC extern const opal_maffinity_base_module_1_0_0_t 
+    OPAL_DECLSPEC extern const opal_maffinity_base_module_1_0_0_t 
         *opal_maffinity_base_module;
 
     /**
      * Indicator as to whether the list of opened maffinity components
      * is valid or not.
      */
-    OMPI_DECLSPEC extern bool opal_maffinity_base_components_opened_valid;
+    OPAL_DECLSPEC extern bool opal_maffinity_base_components_opened_valid;
     /**
      * List of all opened components; created when the maffinity
      * framework is initialized and destroyed when we reduce the list
      * to all available maffinity components.
      */
-    OMPI_DECLSPEC extern opal_list_t opal_maffinity_base_components_opened;
+    OPAL_DECLSPEC extern opal_list_t opal_maffinity_base_components_opened;
 
     /**
      * Debugging output stream
      */
-    OMPI_DECLSPEC extern int opal_maffinity_base_output;
+    OPAL_DECLSPEC extern int opal_maffinity_base_output;
 
 #if defined(c_plusplus) || defined(__cplusplus)
 }
diff --git a/opal/mca/maffinity/first_use/maffinity_first_use.h b/opal/mca/maffinity/first_use/maffinity_first_use.h
index 4e26af2c7d..33a6c1f0fb 100644
--- a/opal/mca/maffinity/first_use/maffinity_first_use.h
+++ b/opal/mca/maffinity/first_use/maffinity_first_use.h
@@ -39,7 +39,7 @@ extern "C" {
     /**
      * Globally exported variable
      */
-    OMPI_COMP_EXPORT extern const opal_maffinity_base_component_1_0_0_t
+    OPAL_DECLSPEC extern const opal_maffinity_base_component_1_0_0_t
         mca_maffinity_first_use_component;
 
 
diff --git a/opal/mca/maffinity/libnuma/maffinity_libnuma.h b/opal/mca/maffinity/libnuma/maffinity_libnuma.h
index bf9f79be05..05fc1cd971 100644
--- a/opal/mca/maffinity/libnuma/maffinity_libnuma.h
+++ b/opal/mca/maffinity/libnuma/maffinity_libnuma.h
@@ -39,7 +39,7 @@ extern "C" {
     /**
      * Globally exported variable
      */
-    OMPI_COMP_EXPORT extern const opal_maffinity_base_component_1_0_0_t
+    OPAL_DECLSPEC extern const opal_maffinity_base_component_1_0_0_t
         mca_maffinity_libnuma_component;
 
 
diff --git a/opal/mca/memcpy/base/base.h b/opal/mca/memcpy/base/base.h
index 8b3585f794..8aa416c9fe 100644
--- a/opal/mca/memcpy/base/base.h
+++ b/opal/mca/memcpy/base/base.h
@@ -46,7 +46,7 @@ extern "C" {
      * functions -- it is not considered a public interface member --
      * and is only mentioned here for completeness.
      */
-    OMPI_DECLSPEC int opal_memcpy_base_open(void);
+    OPAL_DECLSPEC int opal_memcpy_base_open(void);
     
 
     /**
@@ -60,7 +60,7 @@ extern "C" {
      *
      * It must be the last function invoked on the memcpy MCA framework.
      */
-    OMPI_DECLSPEC int opal_memcpy_base_close(void);
+    OPAL_DECLSPEC int opal_memcpy_base_close(void);
 
     extern opal_list_t opal_memcpy_base_components_opened;
     
diff --git a/opal/mca/memory/base/base.h b/opal/mca/memory/base/base.h
index 9e99c6fea4..1284037bff 100644
--- a/opal/mca/memory/base/base.h
+++ b/opal/mca/memory/base/base.h
@@ -53,7 +53,7 @@ extern "C" {
      * functions -- it is not considered a public interface member --
      * and is only mentioned here for completeness.
      */
-    OMPI_DECLSPEC int opal_memory_base_open(void);
+    OPAL_DECLSPEC int opal_memory_base_open(void);
     
 
     /**
@@ -67,7 +67,7 @@ extern "C" {
      *
      * It must be the last function invoked on the memory MCA framework.
      */
-    OMPI_DECLSPEC int opal_memory_base_close(void);
+    OPAL_DECLSPEC int opal_memory_base_close(void);
 
     extern opal_list_t opal_memory_base_components_opened;
     
diff --git a/opal/mca/paffinity/base/base.h b/opal/mca/paffinity/base/base.h
index 0efff5780f..66e9ff6dfe 100644
--- a/opal/mca/paffinity/base/base.h
+++ b/opal/mca/paffinity/base/base.h
@@ -52,7 +52,7 @@ extern "C" {
      * functions -- it is not considered a public interface member --
      * and is only mentioned here for completeness.
      */
-    OMPI_DECLSPEC int opal_paffinity_base_open(void);
+    OPAL_DECLSPEC int opal_paffinity_base_open(void);
     
     /**
      * Select an available component.
@@ -85,7 +85,7 @@ extern "C" {
      * selected.  If no component was selected, subsequent invocation
      * of the paffinity wrapper functions will return an error.
      */
-    OMPI_DECLSPEC int opal_paffinity_base_select(void);
+    OPAL_DECLSPEC int opal_paffinity_base_select(void);
 
     /**
      * Get the available number of processors
@@ -104,7 +104,7 @@ extern "C" {
      * opal_paffinity_base_select() was never invoked, OPAL_NOT_FOUND
      * is returned and num_procs is set to -1.
      */
-    OMPI_DECLSPEC int opal_paffinity_base_get_num_processors(int *num_procs);
+    OPAL_DECLSPEC int opal_paffinity_base_get_num_processors(int *num_procs);
 
     /**
      * Set this process' affinity.
@@ -121,7 +121,7 @@ extern "C" {
      * opal_paffinity_base_select() was never invoked, OPAL_NOT_FOUND
      * is returned.
      */
-    OMPI_DECLSPEC int opal_paffinity_base_set(int id);
+    OPAL_DECLSPEC int opal_paffinity_base_set(int id);
 
     /**
      * Get this process' affinity.
@@ -139,7 +139,7 @@ extern "C" {
      * opal_paffinity_base_select() was never invoked, OPAL_NOT_FOUND
      * is returned and id is set to -1.
      */
-    OMPI_DECLSPEC int opal_paffinity_base_get(int *id);
+    OPAL_DECLSPEC int opal_paffinity_base_get(int *id);
 
     /**
      * Shut down the paffinity MCA framework.
@@ -152,7 +152,7 @@ extern "C" {
      * It must be the last function invoked on the paffinity MCA
      * framework.
      */
-    OMPI_DECLSPEC int opal_paffinity_base_close(void);
+    OPAL_DECLSPEC int opal_paffinity_base_close(void);
     
 #if defined(c_plusplus) || defined(__cplusplus)
 }
diff --git a/opal/mca/paffinity/base/internal.h b/opal/mca/paffinity/base/internal.h
index 38dd93ed62..6e6f3aa445 100644
--- a/opal/mca/paffinity/base/internal.h
+++ b/opal/mca/paffinity/base/internal.h
@@ -39,35 +39,35 @@ extern "C" {
      * Indication of whether a component was successfully selected or
      * not
      */
-    OMPI_DECLSPEC extern bool opal_paffinity_base_selected;
+    OPAL_DECLSPEC extern bool opal_paffinity_base_selected;
 
     /**
      * Global component struct for the selected component
      */
-    OMPI_DECLSPEC extern const opal_paffinity_base_component_1_0_0_t 
+    OPAL_DECLSPEC extern const opal_paffinity_base_component_1_0_0_t 
         *opal_paffinity_base_component;
     /**
      * Global module struct for the selected module
      */
-    OMPI_DECLSPEC extern const opal_paffinity_base_module_1_0_0_t 
+    OPAL_DECLSPEC extern const opal_paffinity_base_module_1_0_0_t 
         *opal_paffinity_base_module;
 
     /**
      * Indicator as to whether the list of opened paffinity components
      * is valid or not.
      */
-    OMPI_DECLSPEC extern bool opal_paffinity_base_components_opened_valid;
+    OPAL_DECLSPEC extern bool opal_paffinity_base_components_opened_valid;
     /**
      * List of all opened components; created when the paffinity
      * framework is initialized and destroyed when we reduce the list
      * to all available paffinity components.
      */
-    OMPI_DECLSPEC extern opal_list_t opal_paffinity_base_components_opened;
+    OPAL_DECLSPEC extern opal_list_t opal_paffinity_base_components_opened;
 
     /**
      * Debugging output stream
      */
-    OMPI_DECLSPEC extern int opal_paffinity_base_output;
+    OPAL_DECLSPEC extern int opal_paffinity_base_output;
 
 #if defined(c_plusplus) || defined(__cplusplus)
 }
diff --git a/opal/mca/paffinity/linux/paffinity_linux.h b/opal/mca/paffinity/linux/paffinity_linux.h
index dc40b92ea0..e8d7b64bfc 100644
--- a/opal/mca/paffinity/linux/paffinity_linux.h
+++ b/opal/mca/paffinity/linux/paffinity_linux.h
@@ -93,7 +93,7 @@ extern "C" {
     /**
      * Globally exported variable
      */
-    OMPI_COMP_EXPORT extern const opal_paffinity_base_component_1_0_0_t
+    OPAL_DECLSPEC extern const opal_paffinity_base_component_1_0_0_t
         mca_paffinity_linux_component;
 
 
diff --git a/opal/mca/paffinity/solaris/paffinity_solaris.h b/opal/mca/paffinity/solaris/paffinity_solaris.h
index 197391c43e..c14acc605e 100644
--- a/opal/mca/paffinity/solaris/paffinity_solaris.h
+++ b/opal/mca/paffinity/solaris/paffinity_solaris.h
@@ -32,7 +32,7 @@ extern "C" {
      * Globally exported variable
      */
 
-    OMPI_COMP_EXPORT extern const opal_paffinity_base_component_1_0_0_t
+    OPAL_DECLSPEC extern const opal_paffinity_base_component_1_0_0_t
         mca_paffinity_solaris_component;
 
 
diff --git a/opal/mca/paffinity/windows/paffinity_windows.h b/opal/mca/paffinity/windows/paffinity_windows.h
index 0df141741b..47637be694 100644
--- a/opal/mca/paffinity/windows/paffinity_windows.h
+++ b/opal/mca/paffinity/windows/paffinity_windows.h
@@ -52,7 +52,7 @@ extern "C" {
     /**
      * Globally exported variable
      */
-    OMPI_COMP_EXPORT extern const opal_paffinity_base_component_1_0_0_t
+    OPAL_DECLSPEC extern const opal_paffinity_base_component_1_0_0_t
         mca_paffinity_windows_component;
 
 
diff --git a/opal/mca/timer/base/base.h b/opal/mca/timer/base/base.h
index ef73d9f724..24866dd745 100644
--- a/opal/mca/timer/base/base.h
+++ b/opal/mca/timer/base/base.h
@@ -53,7 +53,7 @@ extern "C" {
      * functions -- it is not considered a public interface member --
      * and is only mentioned here for completeness.
      */
-    OMPI_DECLSPEC int opal_timer_base_open(void);
+    OPAL_DECLSPEC int opal_timer_base_open(void);
     
 
     /**
@@ -67,7 +67,7 @@ extern "C" {
      *
      * It must be the last function invoked on the timer MCA framework.
      */
-    OMPI_DECLSPEC int opal_timer_base_close(void);
+    OPAL_DECLSPEC int opal_timer_base_close(void);
 
     extern opal_list_t opal_timer_base_components_opened;
     
diff --git a/opal/mca/timer/windows/timer_windows.h b/opal/mca/timer/windows/timer_windows.h
index b6d8d1d596..3226cc6c75 100644
--- a/opal/mca/timer/windows/timer_windows.h
+++ b/opal/mca/timer/windows/timer_windows.h
@@ -23,7 +23,7 @@
 
 #include <opal/sys/timer.h>
 
-OMPI_DECLSPEC opal_timer_t opal_timer_windows_freq;
+OPAL_DECLSPEC opal_timer_t opal_timer_windows_freq;
 
 static inline opal_timer_t
 opal_timer_base_get_cycles(void)
diff --git a/opal/mca/timer/windows/timer_windows_component.c b/opal/mca/timer/windows/timer_windows_component.c
index 030fd8664b..ea94853933 100644
--- a/opal/mca/timer/windows/timer_windows_component.c
+++ b/opal/mca/timer/windows/timer_windows_component.c
@@ -26,7 +26,7 @@ opal_timer_t opal_timer_windows_freq;
 
 static int opal_timer_windows_open(void);
 
-OMPI_DECLSPEC const
+const
 opal_timer_base_component_1_0_0_t mca_timer_windows_component = {
     /* First, the mca_component_t struct containing meta information
        about the component itself */
diff --git a/opal/runtime/opal.h b/opal/runtime/opal.h
index a79261dcff..5643fa1b01 100644
--- a/opal/runtime/opal.h
+++ b/opal/runtime/opal.h
@@ -34,7 +34,7 @@ extern "C" {
  * \note If this function is called, opal_init_util() should *not* be
  * called.
  */
-OMPI_DECLSPEC int opal_init(void);
+OPAL_DECLSPEC int opal_init(void);
 
 /**
  * Finalize the OPAL layer, including the MCA system. 
@@ -45,7 +45,7 @@ OMPI_DECLSPEC int opal_init(void);
  * \note If this function is called, opal_finalize_util() should *not*
  * be called.
  */
-OMPI_DECLSPEC int opal_finalize(void);
+OPAL_DECLSPEC int opal_finalize(void);
 
 /**
  * Initialize the OPAL layer, excluding the MCA system.
@@ -56,7 +56,7 @@ OMPI_DECLSPEC int opal_finalize(void);
  * \note If this function is called, opal_init() should *not*
  * be called.
  */
-OMPI_DECLSPEC int opal_init_util(void);
+OPAL_DECLSPEC int opal_init_util(void);
 
 /**
  * Finalize the OPAL layer, excluding the MCA system. 
@@ -67,12 +67,12 @@ OMPI_DECLSPEC int opal_init_util(void);
  * \note If this function is called, opal_finalize() should *not*
  * be called.
  */
-OMPI_DECLSPEC int opal_finalize_util(void);
+OPAL_DECLSPEC int opal_finalize_util(void);
 
 /**
  * Internal function.  Do not call.
  */
-OMPI_DECLSPEC int opal_register_params(void);
+OPAL_DECLSPEC int opal_register_params(void);
 
 #if defined(c_plusplus) || defined(__cplusplus)
 }
diff --git a/opal/runtime/opal_progress.h b/opal/runtime/opal_progress.h
index 7052372ff1..e16edabc62 100644
--- a/opal/runtime/opal_progress.h
+++ b/opal/runtime/opal_progress.h
@@ -37,7 +37,7 @@ extern "C" {
  * functions.  At this point, any function in the progress engine
  * interface may be called.
  */
-OMPI_DECLSPEC extern int opal_progress_init(void);
+OPAL_DECLSPEC extern int opal_progress_init(void);
 
 /**
  * Configure the progress engine for executing MPI applications
@@ -48,7 +48,7 @@ OMPI_DECLSPEC extern int opal_progress_init(void);
  * \note opal_progress_init() must be called before calling
  * this function.  Failure to do so is an error.
  */
-OMPI_DECLSPEC extern int opal_progress_mpi_init(void);
+OPAL_DECLSPEC extern int opal_progress_mpi_init(void);
 
 /** 
  * Turn on optimizations for MPI progress
@@ -58,7 +58,7 @@ OMPI_DECLSPEC extern int opal_progress_mpi_init(void);
  * active use and possibly disabling the sched_yield call when the
  * progress engine is idle 
  */
-OMPI_DECLSPEC extern int opal_progress_mpi_enable(void);
+OPAL_DECLSPEC extern int opal_progress_mpi_enable(void);
 
 /**
  * Turn off all optimizations enabled by opal_progress_mpi_enable().
@@ -67,7 +67,7 @@ OMPI_DECLSPEC extern int opal_progress_mpi_enable(void);
  * opal_progress_mpi_enable().  The event library resumes constant
  * ticking and the progress engine yields the CPU when idle.
  */
-OMPI_DECLSPEC extern int opal_progress_mpi_disable(void);
+OPAL_DECLSPEC extern int opal_progress_mpi_disable(void);
 
 /** 
  * Shut down the progress engine
@@ -76,41 +76,41 @@ OMPI_DECLSPEC extern int opal_progress_mpi_disable(void);
  * registered callbacks and freeing all resources.  After finalize
  * returns, no calls into the progress interface are allowed.
  */
-OMPI_DECLSPEC extern int opal_progress_finalize(void);
+OPAL_DECLSPEC extern int opal_progress_finalize(void);
 
 /**
  * Control how the event library is called
  */
-OMPI_DECLSPEC extern void opal_progress_events(int);
+OPAL_DECLSPEC extern void opal_progress_events(int);
 
 /**
  * Progress all pending events
  */
-OMPI_DECLSPEC extern void opal_progress(void);
+OPAL_DECLSPEC extern void opal_progress(void);
 
 typedef int (*opal_progress_callback_t)(void);
 
 /**
  * Register an event to be progressed
  */
-OMPI_DECLSPEC int opal_progress_register(opal_progress_callback_t cb);
+OPAL_DECLSPEC int opal_progress_register(opal_progress_callback_t cb);
 
 
 /**
  * Unregister previously registered event
  */
-OMPI_DECLSPEC int opal_progress_unregister(opal_progress_callback_t cb);
+OPAL_DECLSPEC int opal_progress_unregister(opal_progress_callback_t cb);
 
 
 /**
  * Increase count of MPI users of the event library
  */   
-OMPI_DECLSPEC int opal_progress_event_increment(void);
+OPAL_DECLSPEC int opal_progress_event_increment(void);
 
 /**
  * Decrease count of MPI users of the event library
  */   
-OMPI_DECLSPEC int opal_progress_event_decrement(void);
+OPAL_DECLSPEC int opal_progress_event_decrement(void);
 
 
 /**
diff --git a/opal/threads/condition.h b/opal/threads/condition.h
index 4dcb39c4c2..b56eff514f 100644
--- a/opal/threads/condition.h
+++ b/opal/threads/condition.h
@@ -52,7 +52,7 @@ struct opal_condition_t {
 };
 typedef struct opal_condition_t opal_condition_t;
 
-OMPI_DECLSPEC OBJ_CLASS_DECLARATION(opal_condition_t);
+OPAL_DECLSPEC OBJ_CLASS_DECLARATION(opal_condition_t);
 
 
 static inline int opal_condition_wait(opal_condition_t *c, opal_mutex_t *m)
diff --git a/opal/threads/mutex.h b/opal/threads/mutex.h
index 1d8f60a893..8150a2c617 100644
--- a/opal/threads/mutex.h
+++ b/opal/threads/mutex.h
@@ -21,9 +21,11 @@
 
 #include "opal_config.h"
 #include "opal/sys/atomic.h"
+
 #if defined(c_plusplus) || defined(__cplusplus)
 extern "C" {
 #endif
+
 /**
  * @file:
  *
@@ -34,7 +36,7 @@ extern "C" {
 /*
  * declaring this here so that CL does not complain
  */ 
-OMPI_DECLSPEC extern bool opal_uses_threads;
+OPAL_DECLSPEC extern bool opal_uses_threads;
 
 /**
  * Opaque mutex object
diff --git a/opal/threads/mutex_unix.h b/opal/threads/mutex_unix.h
index de1be8be1c..1fcd9f1f46 100644
--- a/opal/threads/mutex_unix.h
+++ b/opal/threads/mutex_unix.h
@@ -60,9 +60,7 @@ struct opal_mutex_t {
     opal_atomic_lock_t m_lock_atomic;
 };
 
-OMPI_DECLSPEC OBJ_CLASS_DECLARATION(opal_mutex_t);
-
-
+OPAL_DECLSPEC OBJ_CLASS_DECLARATION(opal_mutex_t);
 
 /************************************************************************
  *
diff --git a/opal/threads/mutex_windows.h b/opal/threads/mutex_windows.h
index fef056cab3..e50683065c 100644
--- a/opal/threads/mutex_windows.h
+++ b/opal/threads/mutex_windows.h
@@ -40,7 +40,7 @@ struct opal_mutex_t {
     volatile LONG m_lock;
 };
 
-OMPI_DECLSPEC OBJ_CLASS_DECLARATION(opal_mutex_t);
+OPAL_DECLSPEC OBJ_CLASS_DECLARATION(opal_mutex_t);
 
 
 static inline int opal_mutex_trylock(opal_mutex_t *m)
diff --git a/opal/threads/threads.h b/opal/threads/threads.h
index 0d705b9e99..6c71ebbc72 100644
--- a/opal/threads/threads.h
+++ b/opal/threads/threads.h
@@ -50,14 +50,13 @@ struct opal_thread_t {
 
 typedef struct opal_thread_t opal_thread_t;
 
-
-OMPI_DECLSPEC OBJ_CLASS_DECLARATION(opal_thread_t);
-
+OPAL_DECLSPEC OBJ_CLASS_DECLARATION(opal_thread_t);
 
 int  opal_thread_start(opal_thread_t *);
 int  opal_thread_join(opal_thread_t *, void **thread_return);
 bool opal_thread_self_compare(opal_thread_t*);
 opal_thread_t *opal_thread_get_self(void);
+
 #if defined(c_plusplus) || defined(__cplusplus)
 }
 #endif
diff --git a/opal/util/argv.h b/opal/util/argv.h
index 810821c58f..64de06cf90 100644
--- a/opal/util/argv.h
+++ b/opal/util/argv.h
@@ -63,7 +63,7 @@ extern "C" {
    * value into the argv array; there is no need to keep the original
    * string (i.e., the arg parameter) after invoking this function.
    */
-OMPI_DECLSPEC  int opal_argv_append(int *argc, char ***argv, const char *arg);
+OPAL_DECLSPEC  int opal_argv_append(int *argc, char ***argv, const char *arg);
 
   /**
    * Append to an argv-style array, but ignore the size of the array.
@@ -80,7 +80,7 @@ OMPI_DECLSPEC  int opal_argv_append(int *argc, char ***argv, const char *arg);
    * argv-style arrays that do not have integers that are actively
    * maintaing their sizes.
    */
-OMPI_DECLSPEC  int opal_argv_append_nosize(char ***argv, const char *arg);
+OPAL_DECLSPEC  int opal_argv_append_nosize(char ***argv, const char *arg);
 
   /**
    * Free a NULL-terminated argv array.
@@ -95,7 +95,7 @@ OMPI_DECLSPEC  int opal_argv_append_nosize(char ***argv, const char *arg);
    * not safe to invoke this function with a non-NULL-terminated argv
    * array.
    */
-OMPI_DECLSPEC  void opal_argv_free(char **argv);
+OPAL_DECLSPEC  void opal_argv_free(char **argv);
   
   /**
    * Split a string into a NULL-terminated argv array.
@@ -111,7 +111,7 @@ OMPI_DECLSPEC  void opal_argv_free(char **argv);
    * argument (i.e., it can be freed after calling this function
    * without invalidating the output argv).
    */
-OMPI_DECLSPEC  char **opal_argv_split(const char *src_string, int delimiter);
+OPAL_DECLSPEC  char **opal_argv_split(const char *src_string, int delimiter);
 
   /**
    * Return the length of a NULL-terminated argv array.
@@ -123,7 +123,7 @@ OMPI_DECLSPEC  char **opal_argv_split(const char *src_string, int delimiter);
    *
    * The argv array must be NULL-terminated.
    */
-OMPI_DECLSPEC  int opal_argv_count(char **argv);
+OPAL_DECLSPEC  int opal_argv_count(char **argv);
 
   /**
    * Join all the elements of an argv array into a single
@@ -141,7 +141,7 @@ OMPI_DECLSPEC  int opal_argv_count(char **argv);
    *
    * It is the callers responsibility to free the returned string.
    */
-OMPI_DECLSPEC  char *opal_argv_join(char **argv, int delimiter);
+OPAL_DECLSPEC  char *opal_argv_join(char **argv, int delimiter);
 
   /**
    * Return the number of bytes consumed by an argv array.
@@ -152,7 +152,7 @@ OMPI_DECLSPEC  char *opal_argv_join(char **argv, int delimiter);
    * array.  This includes the number of bytes used by each of the
    * strings as well as the pointers used in the argv array.
    */
-OMPI_DECLSPEC  size_t opal_argv_len(char **argv);
+OPAL_DECLSPEC  size_t opal_argv_len(char **argv);
 
   /**
    * Copy a NULL-terminated argv array.
@@ -166,7 +166,7 @@ OMPI_DECLSPEC  size_t opal_argv_len(char **argv);
    * Specifically, the output argv will be an array of the same length
    * as the input argv, and strcmp(argv_in[i], argv_out[i]) will be 0.
    */
-OMPI_DECLSPEC  char **opal_argv_copy(char **argv);
+OPAL_DECLSPEC  char **opal_argv_copy(char **argv);
 
     /**
      * Delete one or more tokens from the middle of an argv.
@@ -193,7 +193,7 @@ OMPI_DECLSPEC  char **opal_argv_copy(char **argv);
      * free()ed (it is assumed that the argv "owns" the memory that
      * the pointer points to).
      */
-OMPI_DECLSPEC  int opal_argv_delete(int *argc, char ***argv, 
+OPAL_DECLSPEC  int opal_argv_delete(int *argc, char ***argv, 
                                     int start, int num_to_delete);
 
     /**
@@ -217,7 +217,7 @@ OMPI_DECLSPEC  int opal_argv_delete(int *argc, char ***argv,
      * source points to are strdup'ed into the new locations in
      * target).
      */
-OMPI_DECLSPEC  int opal_argv_insert(char ***target, int start, char **source);
+OPAL_DECLSPEC  int opal_argv_insert(char ***target, int start, char **source);
 #if defined(c_plusplus) || defined(__cplusplus)
 }
 #endif
diff --git a/opal/util/cmd_line.h b/opal/util/cmd_line.h
index e66f52f064..1231d2a7dd 100644
--- a/opal/util/cmd_line.h
+++ b/opal/util/cmd_line.h
@@ -238,7 +238,7 @@ extern "C" {
      * destructor for opal_cmd_line_t handles will free all memory
      * associated with the handle.
      */
-    OMPI_DECLSPEC OBJ_CLASS_DECLARATION(opal_cmd_line_t);
+    OPAL_DECLSPEC OBJ_CLASS_DECLARATION(opal_cmd_line_t);
 
     /**
      * Make a command line handle from a table of initializers.
@@ -274,7 +274,7 @@ extern "C" {
      * };
      * \endcode
      */
-    OMPI_DECLSPEC int opal_cmd_line_create(opal_cmd_line_t *cmd,
+    OPAL_DECLSPEC int opal_cmd_line_create(opal_cmd_line_t *cmd,
                                            opal_cmd_line_init_t *table);
 
     /**
@@ -287,7 +287,7 @@ extern "C" {
      * opal_cmd_line_make_opt3(cmd, short_name, NULL, long_name,
      * num_params, desc).
      */
-    OMPI_DECLSPEC int opal_cmd_line_make_opt(opal_cmd_line_t *cmd,
+    OPAL_DECLSPEC int opal_cmd_line_make_opt(opal_cmd_line_t *cmd,
                                              char short_name, 
                                              const char *long_name,
                                              int num_params, 
@@ -321,7 +321,7 @@ extern "C" {
      * used to generate the output from opal_cmd_line_get_usage_msg().
      *
      */
-    OMPI_DECLSPEC int opal_cmd_line_make_opt3(opal_cmd_line_t *cmd, 
+    OPAL_DECLSPEC int opal_cmd_line_make_opt3(opal_cmd_line_t *cmd, 
                                               char short_name, 
                                               const char *sd_name,
                                               const char *long_name, 
@@ -379,7 +379,7 @@ extern "C" {
      * Invoking this function multiple times on different sets of argv
      * tokens is safe, but will erase any previous parsing results.
      */
-    OMPI_DECLSPEC int opal_cmd_line_parse(opal_cmd_line_t *cmd, 
+    OPAL_DECLSPEC int opal_cmd_line_parse(opal_cmd_line_t *cmd, 
                                           bool ignore_unknown,
                                           int argc, char **argv);
 
@@ -404,7 +404,7 @@ extern "C" {
      *
      * The returned string must be freed by the caller.
      */
-    OMPI_DECLSPEC char *opal_cmd_line_get_usage_msg(opal_cmd_line_t *cmd);
+    OPAL_DECLSPEC char *opal_cmd_line_get_usage_msg(opal_cmd_line_t *cmd);
 
     /**
      * Test if a given option was taken on the parsed command line.
@@ -425,7 +425,7 @@ extern "C" {
      * (either by its short or long name) during token parsing.
      * Otherwise, it will return false.
      */
-    OMPI_DECLSPEC bool opal_cmd_line_is_taken(opal_cmd_line_t *cmd, 
+    OPAL_DECLSPEC bool opal_cmd_line_is_taken(opal_cmd_line_t *cmd, 
                                               const char *opt);
 
     /**
@@ -439,7 +439,7 @@ extern "C" {
      * Arguments are added to the handle via the opal_cmd_line_parse()
      * function.
      */
-    OMPI_DECLSPEC int opal_cmd_line_get_argc(opal_cmd_line_t *cmd);
+    OPAL_DECLSPEC int opal_cmd_line_get_argc(opal_cmd_line_t *cmd);
 
     /**
      * Return a string argument parsed on a OPAL command line handle.
@@ -458,7 +458,7 @@ extern "C" {
      * What is returned is a pointer to the actual string that is on
      * the handle; it should not be modified or freed.
      */
-    OMPI_DECLSPEC char *opal_cmd_line_get_argv(opal_cmd_line_t *cmd, 
+    OPAL_DECLSPEC char *opal_cmd_line_get_argv(opal_cmd_line_t *cmd, 
                                                int index);
 
     /**
@@ -481,7 +481,7 @@ extern "C" {
      * either the option was not specified as part of the OPAL command line
      * handle, or opal_cmd_line_parse() was not invoked on this handle.
      */
-    OMPI_DECLSPEC int opal_cmd_line_get_ninsts(opal_cmd_line_t *cmd, 
+    OPAL_DECLSPEC int opal_cmd_line_get_ninsts(opal_cmd_line_t *cmd, 
                                                const char *opt);
 
     /**
@@ -511,7 +511,7 @@ extern "C" {
      * The returned string should \em not be modified or freed by the
      * caller.
      */
-    OMPI_DECLSPEC char *opal_cmd_line_get_param(opal_cmd_line_t *cmd, 
+    OPAL_DECLSPEC char *opal_cmd_line_get_param(opal_cmd_line_t *cmd, 
                                                 const char *opt, 
                                                 int instance_num,
                                                 int param_num);
@@ -543,7 +543,7 @@ extern "C" {
      * of the tail parameters, and must be freed (likely with a call
      * to opal_argv_free()) by the caller.
      */
-    OMPI_DECLSPEC int opal_cmd_line_get_tail(opal_cmd_line_t *cmd, int *tailc, 
+    OPAL_DECLSPEC int opal_cmd_line_get_tail(opal_cmd_line_t *cmd, int *tailc, 
                                              char ***tailv);
 
 #if defined(c_plusplus) || defined(__cplusplus)
diff --git a/opal/util/daemon_init.h b/opal/util/daemon_init.h
index 0a3365d11f..7c44178c81 100644
--- a/opal/util/daemon_init.h
+++ b/opal/util/daemon_init.h
@@ -33,6 +33,6 @@
  * @retval OPAL_SUCCESS Indicates that the conversion was successful
  * @retval OPAL_ERROR Indicates that the conversion was not successful - a fork could not be completed.
  */
-OMPI_DECLSPEC int opal_daemon_init(char *working_dir);
+OPAL_DECLSPEC int opal_daemon_init(char *working_dir);
 
 #endif /* OPAL_DAEMON_INIT_H */
diff --git a/opal/util/error.h b/opal/util/error.h
index 2dd3b26d10..c79a6b5d75 100644
--- a/opal/util/error.h
+++ b/opal/util/error.h
@@ -31,7 +31,7 @@
  * If errnum is OPAL_ERR_IN_ERRNO, the system perror is called with
  * the argument \c msg.
  */
-OMPI_DECLSPEC void opal_perror(int errnum, const char *msg);
+OPAL_DECLSPEC void opal_perror(int errnum, const char *msg);
 
 /**
  * Return string for given error message
@@ -47,7 +47,7 @@ OMPI_DECLSPEC void opal_perror(int errnum, const char *msg);
  * If the errnum is not a known value, the returned value may be
  * overwritten by subsequent calls to opal_strerror.
  */
-OMPI_DECLSPEC const char *opal_strerror(int errnum);
+OPAL_DECLSPEC const char *opal_strerror(int errnum);
 
 /**
  * Return string for given error message
@@ -58,7 +58,7 @@ OMPI_DECLSPEC const char *opal_strerror(int errnum);
  * if an unknown value for \c errnum is passed, the returned buffer
  * will not be overwritten by subsequent calls to opal_strerror_r().
  */
-OMPI_DECLSPEC int opal_strerror_r(int errnum, char *strerrbuf, size_t buflen);
+OPAL_DECLSPEC int opal_strerror_r(int errnum, char *strerrbuf, size_t buflen);
 
 
 typedef const char * (*opal_err2str_fn_t)(int errnum);
@@ -74,7 +74,7 @@ typedef const char * (*opal_err2str_fn_t)(int errnum);
  * \note A maximum of 5 converters can be registered.  The 6th
  * converter registration attempt will return OPAL_ERR_OUT_OF_RESOURCE
  */
-OMPI_DECLSPEC int opal_error_register(const char *project,
+OPAL_DECLSPEC int opal_error_register(const char *project,
                                       int err_base, int err_max,
                                       opal_err2str_fn_t converter);
 
diff --git a/opal/util/few.h b/opal/util/few.h
index 3ff5346c7a..572a16584d 100644
--- a/opal/util/few.h
+++ b/opal/util/few.h
@@ -53,7 +53,7 @@ extern "C" {
  *          safe in a multi-threaded environment in which a handler
  *          for \c SIGCHLD has been registered.
  */
-OMPI_DECLSPEC int opal_few(char *argv[], int *status);
+OPAL_DECLSPEC int opal_few(char *argv[], int *status);
 
 #if defined(c_plusplus) || defined(__cplusplus)
 }
diff --git a/opal/util/if.h b/opal/util/if.h
index 5bc873c8a9..be014d112d 100644
--- a/opal/util/if.h
+++ b/opal/util/if.h
@@ -38,7 +38,7 @@ extern "C" {
  *  @param if_addr (OUT)  Interface address buffer
  *  @param size    (IN)   Interface address buffer size
  */
-OMPI_DECLSPEC int opal_ifnametoaddr(const char* if_name, 
+OPAL_DECLSPEC int opal_ifnametoaddr(const char* if_name, 
                                     struct sockaddr* if_addr, int size);
 
 /**
@@ -48,7 +48,7 @@ OMPI_DECLSPEC int opal_ifnametoaddr(const char* if_name,
  *  @param if_name (OUT)  Interface name buffer
  *  @param size    (IN)   Interface name buffer size
  */
-OMPI_DECLSPEC int opal_ifaddrtoname(const char* if_addr, 
+OPAL_DECLSPEC int opal_ifaddrtoname(const char* if_addr, 
                                     char* if_name, int size);
 
 /**
@@ -57,17 +57,17 @@ OMPI_DECLSPEC int opal_ifaddrtoname(const char* if_addr,
  *  @param if_name (IN)  Interface name
  *  @return              Interface index
  */
-OMPI_DECLSPEC int opal_ifnametoindex(const char* if_name);
+OPAL_DECLSPEC int opal_ifnametoindex(const char* if_name);
 
 /**
  *  Returns the number of available interfaces.
  */
-OMPI_DECLSPEC int opal_ifcount(void);
+OPAL_DECLSPEC int opal_ifcount(void);
 
 /**
  *  Returns the index of the first available interface.
  */
-OMPI_DECLSPEC int opal_ifbegin(void); 
+OPAL_DECLSPEC int opal_ifbegin(void); 
 
 /**
  *  Lookup the current position in the interface list by
@@ -76,7 +76,7 @@ OMPI_DECLSPEC int opal_ifbegin(void);
  *  @param if_index   Returns the next available index from the 
  *                    current position.
  */
-OMPI_DECLSPEC int opal_ifnext(int if_index);
+OPAL_DECLSPEC int opal_ifnext(int if_index);
 
 /**
  *  Lookup an interface by index and return its name.
@@ -85,7 +85,7 @@ OMPI_DECLSPEC int opal_ifnext(int if_index);
  *  @param if_name (OUT)  Interface name buffer
  *  @param size (IN)      Interface name buffer size
  */
-OMPI_DECLSPEC int opal_ifindextoname(int if_index, char* if_name, int);
+OPAL_DECLSPEC int opal_ifindextoname(int if_index, char* if_name, int);
 
 /**
  *  Lookup an interface by index and return its primary address .
@@ -94,7 +94,7 @@ OMPI_DECLSPEC int opal_ifindextoname(int if_index, char* if_name, int);
  *  @param if_name (OUT)  Interface address buffer
  *  @param size (IN)      Interface address buffer size
  */
-OMPI_DECLSPEC int opal_ifindextoaddr(int if_index, struct sockaddr*, int);
+OPAL_DECLSPEC int opal_ifindextoaddr(int if_index, struct sockaddr*, int);
 
 /**
  *  Lookup an interface by index and return its network mask.
@@ -103,7 +103,7 @@ OMPI_DECLSPEC int opal_ifindextoaddr(int if_index, struct sockaddr*, int);
  *  @param if_name (OUT)  Interface address buffer
  *  @param size (IN)      Interface address buffer size
  */
-OMPI_DECLSPEC int opal_ifindextomask(int if_index, struct sockaddr*, int);
+OPAL_DECLSPEC int opal_ifindextomask(int if_index, struct sockaddr*, int);
 
 /**
  * Determine if given hostname / IP address is a local address
@@ -111,7 +111,7 @@ OMPI_DECLSPEC int opal_ifindextomask(int if_index, struct sockaddr*, int);
  * @param hostname (IN)    Hostname (or stringified IP address)
  * @return                 true if \c hostname is local, false otherwise
  */
-OMPI_DECLSPEC bool opal_ifislocal(char *hostname);
+OPAL_DECLSPEC bool opal_ifislocal(char *hostname);
 
 /**
  * Determine if given IP address is in the localhost range
@@ -124,7 +124,7 @@ OMPI_DECLSPEC bool opal_ifislocal(char *hostname);
  * @return                 true if \c addr is a localhost address,
  *                         false otherwise.
  */
-OMPI_DECLSPEC bool opal_ifislocalhost(struct sockaddr *addr);
+OPAL_DECLSPEC bool opal_ifislocalhost(struct sockaddr *addr);
 
 /**
  * Finalize the functions to release malloc'd data
@@ -133,7 +133,7 @@ OMPI_DECLSPEC bool opal_ifislocalhost(struct sockaddr *addr);
  * @return OPAL_SUCCESS if no problems encountered
  * @return OPAL_ERROR if data could not be released
  */
-OMPI_DECLSPEC int opal_iffinalize(void);
+OPAL_DECLSPEC int opal_iffinalize(void);
 
 #if defined(c_plusplus) || defined(__cplusplus)
 }
diff --git a/opal/util/keyval_parse.h b/opal/util/keyval_parse.h
index 67e9fa53a9..27149e64a9 100644
--- a/opal/util/keyval_parse.h
+++ b/opal/util/keyval_parse.h
@@ -43,12 +43,12 @@ typedef void (*opal_keyval_parse_fn_t)(const char *key, const char *value);
  * called exactly once.  In a multithreaded context, calls to
  * opal_util_keyval_parse() will serialize multiple calls.
  */
-OMPI_DECLSPEC int opal_util_keyval_parse(const char *filename, 
+OPAL_DECLSPEC int opal_util_keyval_parse(const char *filename, 
                                          opal_keyval_parse_fn_t callback);
 
-OMPI_DECLSPEC int opal_util_keyval_parse_init(void);
+OPAL_DECLSPEC int opal_util_keyval_parse_init(void);
 
-OMPI_DECLSPEC int opal_util_keyval_parse_finalize(void);
+OPAL_DECLSPEC int opal_util_keyval_parse_finalize(void);
 
 #if defined(c_plusplus) || defined(__cplusplus)
 }
diff --git a/opal/util/malloc.h b/opal/util/malloc.h
index 18ef3ce1c1..cdefbfe9ef 100644
--- a/opal/util/malloc.h
+++ b/opal/util/malloc.h
@@ -82,7 +82,7 @@ void opal_malloc_finalize(void);
    * This function is only used when --enable-mem-debug was specified to
    * configure (or by default if you're building in a SVN checkout).
    */
-OMPI_DECLSPEC void *opal_malloc(size_t size, const char *file, int line);
+OPAL_DECLSPEC void *opal_malloc(size_t size, const char *file, int line);
 
   /**
    * \internal
@@ -98,7 +98,7 @@ OMPI_DECLSPEC void *opal_malloc(size_t size, const char *file, int line);
    * This function is only used when --enable-mem-debug was specified to
    * configure (or by default if you're building in a SVN checkout).
    */
-OMPI_DECLSPEC void *opal_calloc(size_t nmembers, size_t size, const char *file, int line);
+OPAL_DECLSPEC void *opal_calloc(size_t nmembers, size_t size, const char *file, int line);
 
   /**
    * \internal
@@ -114,7 +114,7 @@ OMPI_DECLSPEC void *opal_calloc(size_t nmembers, size_t size, const char *file,
    * This function is only used when --enable-mem-debug was specified to
    * configure (or by default if you're building in a SVN checkout).
    */
-OMPI_DECLSPEC void *opal_realloc(void *ptr, size_t size, const char *file, int line);
+OPAL_DECLSPEC void *opal_realloc(void *ptr, size_t size, const char *file, int line);
 
   /**
    * \internal
@@ -130,10 +130,10 @@ OMPI_DECLSPEC void *opal_realloc(void *ptr, size_t size, const char *file, int l
    * to configure (or by default if you're building in a SVN
    * checkout).
    */
-OMPI_DECLSPEC void opal_free(void *addr, const char *file, int line);
+OPAL_DECLSPEC void opal_free(void *addr, const char *file, int line);
 
-OMPI_DECLSPEC extern int opal_malloc_debug_level;
-OMPI_DECLSPEC extern int opal_malloc_output;
+OPAL_DECLSPEC extern int opal_malloc_debug_level;
+OPAL_DECLSPEC extern int opal_malloc_output;
 
 static inline void opal_malloc_debug(int level);
 
diff --git a/opal/util/numtostr.h b/opal/util/numtostr.h
index c4124aa3de..303e1ca601 100644
--- a/opal/util/numtostr.h
+++ b/opal/util/numtostr.h
@@ -30,7 +30,7 @@
  *  @param num (IN)      Input number
  *  @return              String containing number (NULL on failure)
  */
-OMPI_DECLSPEC char* opal_ltostr(long num);
+OPAL_DECLSPEC char* opal_ltostr(long num);
 
 
 /**
@@ -40,6 +40,6 @@ OMPI_DECLSPEC char* opal_ltostr(long num);
  * @param num (IN)       Input number
  * @return               String containing number (NULL on failure)
  */
-OMPI_DECLSPEC char* opal_dtostr(double num);
+OPAL_DECLSPEC char* opal_dtostr(double num);
 
 #endif /* OMPI_NUMTOSTR_UTIL */
diff --git a/opal/util/opal_environ.h b/opal/util/opal_environ.h
index f23571745a..91f7b145ff 100644
--- a/opal/util/opal_environ.h
+++ b/opal/util/opal_environ.h
@@ -53,7 +53,7 @@ extern "C" {
      * one of the two is NULL, the other list is simply copied to the
      * output.  If both are NULL, NULL is returned.
      */
-    OMPI_DECLSPEC char **opal_environ_merge(char **minor, char **major);
+    OPAL_DECLSPEC char **opal_environ_merge(char **minor, char **major);
 
     /**
      * Portable version of setenv(3), allowing editing of any
@@ -101,7 +101,7 @@ extern "C" {
      *   opal_setenv("foo", "bar", true, &my_env);
      * \endcode
      */
-    OMPI_DECLSPEC int opal_setenv(const char *name, const char *value,
+    OPAL_DECLSPEC int opal_setenv(const char *name, const char *value,
                                   bool overwrite, char ***env);
 
     /**
@@ -118,12 +118,12 @@ extern "C" {
      * If \em name is found in \em env, the string corresponding to
      * that entry is freed and its entry is eliminated from the array.
      */
-    OMPI_DECLSPEC int opal_unsetenv(const char *name, char ***env);
+    OPAL_DECLSPEC int opal_unsetenv(const char *name, char ***env);
 
     /**
      * So that others don't have to declare it
      */
-    OMPI_DECLSPEC extern char **opal_environ;
+    OPAL_DECLSPEC extern char **opal_environ;
 
 #if defined(c_plusplus) || defined(__cplusplus)
 }
diff --git a/opal/util/os_dirpath.h b/opal/util/os_dirpath.h
index c27a09c880..830af65b0d 100644
--- a/opal/util/os_dirpath.h
+++ b/opal/util/os_dirpath.h
@@ -59,7 +59,7 @@
  * specified access permissions.
  */
 
-OMPI_DECLSPEC int opal_os_dirpath_create(const char *path, const mode_t mode);
+OPAL_DECLSPEC int opal_os_dirpath_create(const char *path, const mode_t mode);
 
 /**
  * Check to see if a directory is empty
@@ -69,7 +69,7 @@ OMPI_DECLSPEC int opal_os_dirpath_create(const char *path, const mode_t mode);
  * @retval true If the directory is empty
  * @retval false If the directory is not empty
  */
-OMPI_DECLSPEC bool opal_os_dirpath_is_empty(const char *path);
+OPAL_DECLSPEC bool opal_os_dirpath_is_empty(const char *path);
 
 /**
  * Check access to the directory
@@ -82,7 +82,7 @@ OMPI_DECLSPEC bool opal_os_dirpath_is_empty(const char *path);
  * @retval OPAL_ERR_NOT_FOUND If directory does not exist
  * @retval OPAL_ERROR   If directory exists, and permissions do not match
  */
-OMPI_DECLSPEC int opal_os_dirpath_access(const char *path, const mode_t mode );
+OPAL_DECLSPEC int opal_os_dirpath_access(const char *path, const mode_t mode );
 
 /**
  * Callback for opal_os_dirpath_destroy(). Call for every file/directory before
@@ -111,7 +111,7 @@ typedef bool (*opal_os_dirpath_destroy_callback_fn_t)(const char *root, const ch
  * @retval OPAL_ERROR If the directory cannnot be removed, accessed properly, or contains
  *                    directories that could not be removed..
  */
-OMPI_DECLSPEC int opal_os_dirpath_destroy(const char *path, 
+OPAL_DECLSPEC int opal_os_dirpath_destroy(const char *path, 
                                           bool recursive, 
                                           opal_os_dirpath_destroy_callback_fn_t cbfunc);
 
diff --git a/opal/util/os_path.h b/opal/util/os_path.h
index b2a428ddfd..c55bd5fa19 100644
--- a/opal/util/os_path.h
+++ b/opal/util/os_path.h
@@ -61,6 +61,6 @@
  * appropriate to the local operating system. The path_name string has been malloc'd
  * and therefore the user is responsible for free'ing the field.
 */
-OMPI_DECLSPEC char *opal_os_path(bool relative, ...);
+OPAL_DECLSPEC char *opal_os_path(bool relative, ...);
 
 #endif /* OPAL_OS_PATH_H */
diff --git a/opal/util/output.h b/opal/util/output.h
index a9c4841a11..e39c00f7bd 100644
--- a/opal/util/output.h
+++ b/opal/util/output.h
@@ -230,7 +230,7 @@ struct opal_output_stream_t {
      * By definition, the default verbose stream has a handle ID of 0,
      * and has a verbose level of 0.
      */
-    OMPI_DECLSPEC bool opal_output_init(void);
+    OPAL_DECLSPEC bool opal_output_init(void);
     
     /**
      * Shut down the output stream system.
@@ -238,7 +238,7 @@ struct opal_output_stream_t {
      * Shut down the output stream system, including the default verbose
      * stream.
      */
-    OMPI_DECLSPEC void opal_output_finalize(void);
+    OPAL_DECLSPEC void opal_output_finalize(void);
 
     /**
      * Opens an output stream.
@@ -262,7 +262,7 @@ struct opal_output_stream_t {
      * when open_open() / opal_output() is directed to send output to a
      * file but the process session directory does not yet exist.
      */
-    OMPI_DECLSPEC int opal_output_open(opal_output_stream_t *lds);
+    OPAL_DECLSPEC int opal_output_open(opal_output_stream_t *lds);
 
     /**
      * Re-opens / redirects an output stream.
@@ -276,7 +276,7 @@ struct opal_output_stream_t {
      * passed is invalid, this call is effectively the same as opening a
      * new stream with a specific stream handle.
      */
-    OMPI_DECLSPEC int opal_output_reopen(int output_id, opal_output_stream_t *lds);
+    OPAL_DECLSPEC int opal_output_reopen(int output_id, opal_output_stream_t *lds);
     
     /**
      * Enables and disables output streams.
@@ -295,7 +295,7 @@ struct opal_output_stream_t {
      * to the stream via OPAL_OUTPUT() or opal_output() until the output
      * is re-enabled.
      */
-    OMPI_DECLSPEC bool opal_output_switch(int output_id, bool enable);
+    OPAL_DECLSPEC bool opal_output_switch(int output_id, bool enable);
 
     /**
      * \internal
@@ -306,7 +306,7 @@ struct opal_output_stream_t {
      * typically only invoked after a restart (i.e., in a new process)
      * where output streams need to be re-initialized.
      */
-    OMPI_DECLSPEC void opal_output_reopen_all(void);
+    OPAL_DECLSPEC void opal_output_reopen_all(void);
 
     /**
      * Close an output stream.
@@ -318,7 +318,7 @@ struct opal_output_stream_t {
      * re-used; it is possible that after a stream is closed, if another
      * stream is opened, it will get the same handle value.
      */
-    OMPI_DECLSPEC void opal_output_close(int output_id);
+    OPAL_DECLSPEC void opal_output_close(int output_id);
 
     /**
      * Main function to send output to a stream.
@@ -345,7 +345,7 @@ struct opal_output_stream_t {
      * created, opal_output() will automatically create the file and
      * writing to it.
      */
-    OMPI_DECLSPEC void opal_output(int output_id, const char *format, ...);
+    OPAL_DECLSPEC void opal_output(int output_id, const char *format, ...);
     
     /**
      * Send output to a stream only if the passed verbosity level is
@@ -375,7 +375,7 @@ struct opal_output_stream_t {
      *
      * @see opal_output_set_verbosity()
      */
-    OMPI_DECLSPEC void opal_output_verbose(int verbose_level, int output_id, 
+    OPAL_DECLSPEC void opal_output_verbose(int verbose_level, int output_id, 
                                            const char *format, ...);
     
     /**
@@ -387,7 +387,7 @@ struct opal_output_stream_t {
      * This function sets the verbosity level on a given stream.  It
      * will be used for all future invocations of opal_output_verbose().
      */
-    OMPI_DECLSPEC void opal_output_set_verbosity(int output_id, int level);
+    OPAL_DECLSPEC void opal_output_set_verbosity(int output_id, int level);
 
     /**
      * Set characteristics for output files.
@@ -429,7 +429,7 @@ struct opal_output_stream_t {
      * this function affects both new streams \em and any stream that
      * was previously opened but had not yet output anything.
      */
-    OMPI_DECLSPEC void opal_output_set_output_file_info(const char *dir,
+    OPAL_DECLSPEC void opal_output_set_output_file_info(const char *dir,
                                                         const char *prefix,
                                                         char **olddir,
                                                         char **oldprefix);
diff --git a/opal/util/path.h b/opal/util/path.h
index 9a090f26b7..e0c111859b 100644
--- a/opal/util/path.h
+++ b/opal/util/path.h
@@ -46,7 +46,7 @@ extern "C" {
      *
      * The caller is responsible for freeing the returned string.
      */
-    OMPI_DECLSPEC char *opal_path_find(char *fname, char **pathv, int mode,
+    OPAL_DECLSPEC char *opal_path_find(char *fname, char **pathv, int mode,
                                        char **envv);
 
     /**
@@ -67,7 +67,7 @@ extern "C" {
      *
      * The caller is responsible for freeing the returned string.
      */
-    OMPI_DECLSPEC char *opal_path_findv(char *fname, int mode, 
+    OPAL_DECLSPEC char *opal_path_findv(char *fname, int mode, 
                                         char **envv, char *wrkdir);
 
 #if defined(c_plusplus) || defined(__cplusplus)
diff --git a/opal/util/pow2.h b/opal/util/pow2.h
index c7d643dd15..8042aea8e8 100644
--- a/opal/util/pow2.h
+++ b/opal/util/pow2.h
@@ -28,6 +28,6 @@
  *  @returnvalue power of 2 integer same or greater than the input
  *               parameter.
  */
-OMPI_DECLSPEC int opal_round_up_to_nearest_pow2(int input_integer);
+OPAL_DECLSPEC int opal_round_up_to_nearest_pow2(int input_integer);
 
 #endif /* OPAL_POW2_H */
diff --git a/opal/util/printf.h b/opal/util/printf.h
index fd4053192f..4103950467 100644
--- a/opal/util/printf.h
+++ b/opal/util/printf.h
@@ -54,7 +54,7 @@ extern "C" {
  *
  * THIS IS A PORTABILITY FEATURE: USE snprintf() in CODE.
  */
-OMPI_DECLSPEC int  opal_snprintf(char *str, size_t size, const char *fmt, ...);
+OPAL_DECLSPEC int  opal_snprintf(char *str, size_t size, const char *fmt, ...);
 
 
 /**
@@ -79,7 +79,7 @@ OMPI_DECLSPEC int  opal_snprintf(char *str, size_t size, const char *fmt, ...);
  *
  * THIS IS A PORTABILITY FEATURE: USE vsnprintf() in CODE.
  */
-OMPI_DECLSPEC int  opal_vsnprintf(char *str, size_t size, const char *fmt, va_list ap);
+OPAL_DECLSPEC int  opal_vsnprintf(char *str, size_t size, const char *fmt, va_list ap);
 
 /**
  * Allocates and writes to a string under the control of a format
@@ -100,7 +100,7 @@ OMPI_DECLSPEC int  opal_vsnprintf(char *str, size_t size, const char *fmt, va_li
  *
  * THIS IS A PORTABILITY FEATURE: USE asprintf() in CODE.
  */
-OMPI_DECLSPEC int  opal_asprintf(char **ptr, const char *fmt, ...);
+OPAL_DECLSPEC int  opal_asprintf(char **ptr, const char *fmt, ...);
 
 
 /**
@@ -124,7 +124,7 @@ OMPI_DECLSPEC int  opal_asprintf(char **ptr, const char *fmt, ...);
  *
  * THIS IS A PORTABILITY FEATURE: USE vasprintf() in CODE.
  */
-OMPI_DECLSPEC int  opal_vasprintf(char **ptr, const char *fmt, va_list ap);
+OPAL_DECLSPEC int  opal_vasprintf(char **ptr, const char *fmt, va_list ap);
 
 
 #if defined(c_plusplus) || defined(__cplusplus)
diff --git a/opal/util/show_help.h b/opal/util/show_help.h
index 92496c164a..b9f037684f 100644
--- a/opal/util/show_help.h
+++ b/opal/util/show_help.h
@@ -113,7 +113,7 @@ extern "C" {
      * based on the topic, and displays it.  If want_error_header is
      * true, a header and footer of asterisks are also displayed.
      */
-OMPI_DECLSPEC int opal_show_help(const char *filename, const char *topic, 
+OPAL_DECLSPEC int opal_show_help(const char *filename, const char *topic, 
                        bool want_error_header, ...);
 
     /**
@@ -125,7 +125,7 @@ OMPI_DECLSPEC int opal_show_help(const char *filename, const char *topic,
      * flex parser since we may not hit the <<EOF>> rule and call this
      * function automatically.
      */
-OMPI_DECLSPEC int opal_show_help_finish_parsing(void);
+OPAL_DECLSPEC int opal_show_help_finish_parsing(void);
 #if defined(c_plusplus) || defined(__cplusplus)
 }
 #endif
diff --git a/opal/util/stacktrace.h b/opal/util/stacktrace.h
index 17fcd5f1c7..c9d1b0ec94 100644
--- a/opal/util/stacktrace.h
+++ b/opal/util/stacktrace.h
@@ -37,6 +37,6 @@
  *    is not a valid signal-number
  *               
  */
-OMPI_DECLSPEC int opal_util_register_stackhandlers (void);
+OPAL_DECLSPEC int opal_util_register_stackhandlers (void);
 
 #endif /* OMPI_STACKTRACE_H */
diff --git a/opal/util/strncpy.h b/opal/util/strncpy.h
index ac47be789e..bf9b98bdd4 100644
--- a/opal/util/strncpy.h
+++ b/opal/util/strncpy.h
@@ -33,6 +33,6 @@
 #define strncpy opal_strncpy
 
 
-OMPI_DECLSPEC char *opal_strncpy(char *dest, const char *src, size_t len);
+OPAL_DECLSPEC char *opal_strncpy(char *dest, const char *src, size_t len);
 
 #endif /* OPAL_STRNCPY_H */
diff --git a/opal/util/trace.h b/opal/util/trace.h
index 578f2962fb..92e6e45a23 100644
--- a/opal/util/trace.h
+++ b/opal/util/trace.h
@@ -62,8 +62,8 @@ extern "C" {
 
 extern int opal_trace_handle;
 
-OMPI_DECLSPEC void opal_trace_init(void);
-OMPI_DECLSPEC void opal_trace_finalize(void);
+OPAL_DECLSPEC void opal_trace_init(void);
+OPAL_DECLSPEC void opal_trace_finalize(void);
 
 #if defined(c_plusplus) || defined(__cplusplus)
 }
diff --git a/opal/win32/ompi_process.h b/opal/win32/ompi_process.h
index ceaa55aa2a..ab9274fe68 100644
--- a/opal/win32/ompi_process.h
+++ b/opal/win32/ompi_process.h
@@ -28,9 +28,9 @@ extern "C"
 {
 #endif
 
-OMPI_DECLSPEC pid_t waitpid (pid_t pid, int *status, int options) ;
+OPAL_DECLSPEC pid_t waitpid (pid_t pid, int *status, int options) ;
 
-OMPI_DECLSPEC int kill(pid_t pid, int sig) ;
+OPAL_DECLSPEC int kill(pid_t pid, int sig) ;
 
 #if defined(c_plusplus) || defined (__cplusplus)
 }
diff --git a/opal/win32/ompi_time.c b/opal/win32/ompi_time.c
index 6ef1535872..99027c974a 100644
--- a/opal/win32/ompi_time.c
+++ b/opal/win32/ompi_time.c
@@ -23,7 +23,7 @@
 
 #define EPOCHFILETIME (116444736000000000LL)
 
-OMPI_DECLSPEC int
+OPAL_DECLSPEC int
 gettimeofday(struct timeval *tv, struct timezone *tz)
 {
     
diff --git a/opal/win32/ompi_time.h b/opal/win32/ompi_time.h
index d550e20fda..796d74f1f8 100644
--- a/opal/win32/ompi_time.h
+++ b/opal/win32/ompi_time.h
@@ -176,7 +176,7 @@ extern "C"
 {
 #endif
 
-OMPI_DECLSPEC int gettimeofday (struct timeval *tv, struct timezone *tz);
+OPAL_DECLSPEC int gettimeofday (struct timeval *tv, struct timezone *tz);
 
 #if defined(c_plusplus) || defined (__cplusplus)
 }
diff --git a/opal/win32/ompi_uio.c b/opal/win32/ompi_uio.c
index 256c0b1d4c..cad0ace47e 100644
--- a/opal/win32/ompi_uio.c
+++ b/opal/win32/ompi_uio.c
@@ -26,7 +26,7 @@
  of code to handle the windows error flags 
  */
 
-OMPI_DECLSPEC int
+OPAL_DECLSPEC int
 writev( int fd, struct iovec * iov, int cnt )
 {
    int err;
@@ -41,7 +41,7 @@ writev( int fd, struct iovec * iov, int cnt )
 } 
 
 
-OMPI_DECLSPEC int
+OPAL_DECLSPEC int
 readv( int fd, struct iovec * iov, int cnt )
 {
    int err;
diff --git a/opal/win32/ompi_uio.h b/opal/win32/ompi_uio.h
index 527198eb4a..0eddc8d2b1 100644
--- a/opal/win32/ompi_uio.h
+++ b/opal/win32/ompi_uio.h
@@ -40,7 +40,7 @@ extern "C" {
    buffers  are  used  in  the  order specified.  Operates just like write
    except that data is taken from iov instead of a contiguous buffer.
  */
-OMPI_DECLSPEC int writev (int fd, struct iovec *iov, int cnt);
+OPAL_DECLSPEC int writev (int fd, struct iovec *iov, int cnt);
 
 /* 
    readv  reads  data  from file descriptor fd, and puts the result in the
@@ -49,7 +49,7 @@ OMPI_DECLSPEC int writev (int fd, struct iovec *iov, int cnt);
    like read except that data is put in iov  instead  of  a  contiguous
    buffer.
  */
-OMPI_DECLSPEC int readv (int fd, struct iovec *iov, int cnt);
+OPAL_DECLSPEC int readv (int fd, struct iovec *iov, int cnt);
 
 #if defined(c_plusplus) || defined (__cplusplus)
 }
diff --git a/opal/win32/ompi_utsname.c b/opal/win32/ompi_utsname.c
index 8e58e17418..622093485c 100644
--- a/opal/win32/ompi_utsname.c
+++ b/opal/win32/ompi_utsname.c
@@ -29,7 +29,7 @@
     5. machine: GetSystemInfo
 */
     
-OMPI_DECLSPEC int
+OPAL_DECLSPEC int
 uname( struct utsname *un )
 {
 
diff --git a/opal/win32/ompi_utsname.h b/opal/win32/ompi_utsname.h
index f75ec3db1e..cec3076d12 100644
--- a/opal/win32/ompi_utsname.h
+++ b/opal/win32/ompi_utsname.h
@@ -39,7 +39,7 @@ struct utsname {
 #if defined(c_plusplus) || defined(__cplusplus)
 extern "C" {
 #endif
-    OMPI_DECLSPEC int uname(struct utsname *un);
+    OPAL_DECLSPEC int uname(struct utsname *un);
 #if defined(c_plusplus) || defined(__cplusplus)
 }
 #endif
diff --git a/orte/class/orte_bitmap.h b/orte/class/orte_bitmap.h
index 7a1567d9da..e932d6e437 100644
--- a/orte/class/orte_bitmap.h
+++ b/orte/class/orte_bitmap.h
@@ -59,7 +59,7 @@ struct orte_bitmap_t {
 
 typedef struct orte_bitmap_t orte_bitmap_t;
 
-OMPI_DECLSPEC OBJ_CLASS_DECLARATION(orte_bitmap_t);
+ORTE_DECLSPEC OBJ_CLASS_DECLARATION(orte_bitmap_t);
 
 
 /**
@@ -73,7 +73,7 @@ OMPI_DECLSPEC OBJ_CLASS_DECLARATION(orte_bitmap_t);
  * @return ORTE error code or success
  *
  */
-OMPI_DECLSPEC int orte_bitmap_resize(orte_bitmap_t *bm, orte_std_cntr_t bit);
+ORTE_DECLSPEC int orte_bitmap_resize(orte_bitmap_t *bm, orte_std_cntr_t bit);
 
 
 /**
@@ -86,7 +86,7 @@ OMPI_DECLSPEC int orte_bitmap_resize(orte_bitmap_t *bm, orte_std_cntr_t bit);
  * @return OMPI error code or success
  *
  */
-OMPI_DECLSPEC int orte_bitmap_set_bit(orte_bitmap_t *bm, orte_std_cntr_t bit);
+ORTE_DECLSPEC int orte_bitmap_set_bit(orte_bitmap_t *bm, orte_std_cntr_t bit);
 
 
 /**
@@ -98,7 +98,7 @@ OMPI_DECLSPEC int orte_bitmap_set_bit(orte_bitmap_t *bm, orte_std_cntr_t bit);
  * @return ORTE error code if the bit is out of range, else success
  *
  */
-OMPI_DECLSPEC int orte_bitmap_clear_bit(orte_bitmap_t *bm, orte_std_cntr_t bit);
+ORTE_DECLSPEC int orte_bitmap_clear_bit(orte_bitmap_t *bm, orte_std_cntr_t bit);
 
 
 /**
@@ -111,7 +111,7 @@ OMPI_DECLSPEC int orte_bitmap_clear_bit(orte_bitmap_t *bm, orte_std_cntr_t bit);
   *         0 if the bit is not set
   *
   */
-OMPI_DECLSPEC int orte_bitmap_is_set_bit(orte_bitmap_t *bm, orte_std_cntr_t bit);
+ORTE_DECLSPEC int orte_bitmap_is_set_bit(orte_bitmap_t *bm, orte_std_cntr_t bit);
 
 
 /**
@@ -122,7 +122,7 @@ OMPI_DECLSPEC int orte_bitmap_is_set_bit(orte_bitmap_t *bm, orte_std_cntr_t bit)
 
  * @return err        ORTE_SUCCESS on success
  */
-OMPI_DECLSPEC int orte_bitmap_find_and_set_first_unset_bit(orte_bitmap_t *bm,
+ORTE_DECLSPEC int orte_bitmap_find_and_set_first_unset_bit(orte_bitmap_t *bm,
                                                            orte_std_cntr_t *position);
 
 
@@ -133,7 +133,7 @@ OMPI_DECLSPEC int orte_bitmap_find_and_set_first_unset_bit(orte_bitmap_t *bm,
  * @return ORTE error code if bm is NULL
  *
  */
-OMPI_DECLSPEC int orte_bitmap_clear_all_bits(orte_bitmap_t *bm);
+ORTE_DECLSPEC int orte_bitmap_clear_all_bits(orte_bitmap_t *bm);
 
 
 /**
@@ -142,7 +142,7 @@ OMPI_DECLSPEC int orte_bitmap_clear_all_bits(orte_bitmap_t *bm);
  * @return ORTE error code if bm is NULL
  *
  */
-OMPI_DECLSPEC int orte_bitmap_set_all_bits(orte_bitmap_t *bm);
+ORTE_DECLSPEC int orte_bitmap_set_all_bits(orte_bitmap_t *bm);
 
 
 /**
diff --git a/orte/class/orte_pointer_array.h b/orte/class/orte_pointer_array.h
index af97777d16..56c5f78a08 100644
--- a/orte/class/orte_pointer_array.h
+++ b/orte/class/orte_pointer_array.h
@@ -69,7 +69,7 @@ typedef struct orte_pointer_array_t orte_pointer_array_t;
 /**
  * Class declaration
  */
-OMPI_DECLSPEC OBJ_CLASS_DECLARATION(orte_pointer_array_t);
+ORTE_DECLSPEC OBJ_CLASS_DECLARATION(orte_pointer_array_t);
 
 
 /**
@@ -84,7 +84,7 @@ OMPI_DECLSPEC OBJ_CLASS_DECLARATION(orte_pointer_array_t);
  * @retval ORTE_ERROR(s) Appropriate error code
  * 
  */
-OMPI_DECLSPEC int orte_pointer_array_init(orte_pointer_array_t **array,
+ORTE_DECLSPEC int orte_pointer_array_init(orte_pointer_array_t **array,
                                     orte_std_cntr_t initial_allocation,
                                     orte_std_cntr_t max_size, orte_std_cntr_t block_size);
                                     
@@ -97,7 +97,7 @@ OMPI_DECLSPEC int orte_pointer_array_init(orte_pointer_array_t **array,
  * @param (OUT) Index of inserted array element.
  * @return Return value less than zero indicates an error.
  */
-OMPI_DECLSPEC int orte_pointer_array_add(orte_std_cntr_t *index, orte_pointer_array_t *array, void *ptr);
+ORTE_DECLSPEC int orte_pointer_array_add(orte_std_cntr_t *index, orte_pointer_array_t *array, void *ptr);
 
 /**
  * Set the value of an element in array
@@ -109,7 +109,7 @@ OMPI_DECLSPEC int orte_pointer_array_add(orte_std_cntr_t *index, orte_pointer_ar
  *
  * @return Error code.  (-1) indicates an error.
  */
-OMPI_DECLSPEC int orte_pointer_array_set_item(orte_pointer_array_t *array, 
+ORTE_DECLSPEC int orte_pointer_array_set_item(orte_pointer_array_t *array, 
                                 orte_std_cntr_t index, void *value);
 
 /**
@@ -158,7 +158,7 @@ static inline orte_std_cntr_t orte_pointer_array_get_size(orte_pointer_array_t *
  * Simple function to set the size of the array in order to
  * hide the member field from external users.
  */
-OMPI_DECLSPEC int orte_pointer_array_set_size(orte_pointer_array_t *array, orte_std_cntr_t size);
+ORTE_DECLSPEC int orte_pointer_array_set_size(orte_pointer_array_t *array, orte_std_cntr_t size);
 
 
 /**
@@ -220,7 +220,7 @@ static inline void orte_pointer_array_free_clear(orte_pointer_array_t *array)
  * In contrary to array_set, this function does not allow to overwrite 
  * a value, unless the previous value is NULL ( equiv. to free ).
  */
-OMPI_DECLSPEC bool orte_pointer_array_test_and_set_item (orte_pointer_array_t *table, 
+ORTE_DECLSPEC bool orte_pointer_array_test_and_set_item (orte_pointer_array_t *table, 
                                           orte_std_cntr_t index,
                                           void *value);
 #if defined(c_plusplus) || defined(__cplusplus)
diff --git a/orte/class/orte_proc_table.h b/orte/class/orte_proc_table.h
index 14cb4bf3d0..4e825984de 100644
--- a/orte/class/orte_proc_table.h
+++ b/orte/class/orte_proc_table.h
@@ -42,7 +42,7 @@ extern "C" {
  *
  */
 
-OMPI_DECLSPEC void *orte_hash_table_get_proc(
+ORTE_DECLSPEC void *orte_hash_table_get_proc(
     opal_hash_table_t* table, 
     const orte_process_name_t* key);
 
@@ -56,7 +56,7 @@ OMPI_DECLSPEC void *orte_hash_table_get_proc(
  *
  */
 
-OMPI_DECLSPEC int orte_hash_table_set_proc(
+ORTE_DECLSPEC int orte_hash_table_set_proc(
     opal_hash_table_t* table, 
     const orte_process_name_t*, 
     void* value);
@@ -70,7 +70,7 @@ OMPI_DECLSPEC int orte_hash_table_set_proc(
  *
  */
 
-OMPI_DECLSPEC int orte_hash_table_remove_proc(
+ORTE_DECLSPEC int orte_hash_table_remove_proc(
     opal_hash_table_t* table, 
     const orte_process_name_t* key);
 
diff --git a/orte/class/orte_value_array.h b/orte/class/orte_value_array.h
index 1771e0b724..fdb7da1b2e 100644
--- a/orte/class/orte_value_array.h
+++ b/orte/class/orte_value_array.h
@@ -39,7 +39,7 @@
 extern "C" {
 #endif
 
-OMPI_DECLSPEC extern opal_class_t orte_value_array_t_class;
+ORTE_DECLSPEC extern opal_class_t orte_value_array_t_class;
 
 
 struct orte_value_array_t
@@ -129,7 +129,7 @@ static inline orte_std_cntr_t orte_value_array_get_size(orte_value_array_t* arra
  *  return the new size.
  */
 
-OMPI_DECLSPEC int orte_value_array_set_size(orte_value_array_t* array, orte_std_cntr_t size);
+ORTE_DECLSPEC int orte_value_array_set_size(orte_value_array_t* array, orte_std_cntr_t size);
 
 
 /** 
diff --git a/orte/dss/dss.h b/orte/dss/dss.h
index 18d15abc74..a6e21900c8 100644
--- a/orte/dss/dss.h
+++ b/orte/dss/dss.h
@@ -338,12 +338,12 @@ typedef int (*orte_dss_load_fn_t)(orte_buffer_t *buffer,
  * structure gets loaded, so we provide an "open" call that is
  * executed as part of the program startup.
  */
-OMPI_DECLSPEC int orte_dss_open(void);
+ORTE_DECLSPEC int orte_dss_open(void);
 
 /**
  * DSS finalize function
  */
-OMPI_DECLSPEC int orte_dss_close(void);
+ORTE_DECLSPEC int orte_dss_close(void);
 
 
 /**
@@ -592,7 +592,7 @@ struct orte_dss_t {
 };
 typedef struct orte_dss_t orte_dss_t;
 
-OMPI_DECLSPEC extern orte_dss_t orte_dss;  /* holds dss function pointers */
+ORTE_DECLSPEC extern orte_dss_t orte_dss;  /* holds dss function pointers */
 
 #if defined(c_plusplus) || defined(__cplusplus)
 }
diff --git a/orte/dss/dss_open_close.c b/orte/dss/dss_open_close.c
index 1302054ce3..ad06d5a7fc 100644
--- a/orte/dss/dss_open_close.c
+++ b/orte/dss/dss_open_close.c
@@ -39,7 +39,7 @@ orte_pointer_array_t *orte_dss_types;
 orte_data_type_t orte_dss_num_reg_types;
 orte_dss_buffer_type_t default_buf_type;
 
-OMPI_DECLSPEC orte_dss_t orte_dss = {
+orte_dss_t orte_dss = {
     orte_dss_set,
     orte_dss_get,
     orte_dss_arith,
diff --git a/orte/dss/dss_types.h b/orte/dss/dss_types.h
index c50c5e4172..b2b57eafa1 100644
--- a/orte/dss/dss_types.h
+++ b/orte/dss/dss_types.h
@@ -100,7 +100,7 @@ typedef uint8_t orte_dss_buffer_type_t;
     typedef struct orte_buffer_t orte_buffer_t;
 
     /** formalize the declaration */
-    OMPI_DECLSPEC OBJ_CLASS_DECLARATION (orte_buffer_t);
+    ORTE_DECLSPEC OBJ_CLASS_DECLARATION (orte_buffer_t);
 
 #if defined(c_plusplus) || defined(__cplusplus)
 }
diff --git a/orte/include/orte_config.h.in b/orte/include/orte_config.h.in
index 7aa2da8e53..220df93feb 100644
--- a/orte/include/orte_config.h.in
+++ b/orte/include/orte_config.h.in
@@ -3,7 +3,7 @@
  * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
  *                         University Research and Technology
  *                         Corporation.  All rights reserved.
- * Copyright (c) 2004-2005 The University of Tennessee and The University
+ * Copyright (c) 2004-2006 The University of Tennessee and The University
  *                         of Tennessee Research Foundation.  All rights
  *                         reserved.
  * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
@@ -23,6 +23,27 @@
 #define ORTE_CONFIG_H_
 
 #include "opal_config.h"
-#define ORTE_DECLSPEC OMPI_DECLSPEC
+
+#if defined(__WINDOWS__)
+
+#  if defined(_USRDLL)    /* building shared libraries (.DLL) */
+#    if defined(ORTE_EXPORTS)
+#      define ORTE_DECLSPEC __declspec(dllexport)
+#    else
+#      define ORTE_DECLSPEC __declspec(dllimport)
+#    endif
+#    if defined(ORTE_MODULE_EXPORTS)
+#      define ORTE_MODULE_DECLSPEC __declspec(dllexport)
+#    else
+#      define ORTE_MODULE_DECLSPEC __declspec(dllimport)
+#    endif
+#  else          /* building static library */
+#    define ORTE_DECLSPEC
+#    define ORTE_MODULE_DECLSPEC
+#  endif
+#else
+#define ORTE_DECLSPEC
+#define ORTE_MODULE_DECLSPEC
+#endif  /* defined(__WINDOWS__) */
 
 #endif
diff --git a/orte/mca/errmgr/base/base.h b/orte/mca/errmgr/base/base.h
index 0c2a7a6bb2..422cdb741c 100644
--- a/orte/mca/errmgr/base/base.h
+++ b/orte/mca/errmgr/base/base.h
@@ -47,36 +47,36 @@ extern "C" {
 /*
  * function definitions
  */
-OMPI_DECLSPEC    int orte_errmgr_base_open(void);
-OMPI_DECLSPEC    int orte_errmgr_base_select(bool *allow_multi_user_threads,
+ORTE_DECLSPEC    int orte_errmgr_base_open(void);
+ORTE_DECLSPEC    int orte_errmgr_base_select(bool *allow_multi_user_threads,
 			                                bool *have_hidden_threads);
-OMPI_DECLSPEC    int orte_errmgr_base_close(void);
+ORTE_DECLSPEC    int orte_errmgr_base_close(void);
 
     /*
      * Base functions that are common to all implementations - can be overridden
      */
 
-OMPI_DECLSPEC    void orte_errmgr_base_log(int error_code, char *filename, int line);
+ORTE_DECLSPEC    void orte_errmgr_base_log(int error_code, char *filename, int line);
 
-OMPI_DECLSPEC    void orte_errmgr_base_proc_aborted(orte_process_name_t *proc);
+ORTE_DECLSPEC    void orte_errmgr_base_proc_aborted(orte_process_name_t *proc);
 
-OMPI_DECLSPEC    void orte_errmgr_base_incomplete_start(orte_jobid_t job);
+ORTE_DECLSPEC    void orte_errmgr_base_incomplete_start(orte_jobid_t job);
 
-OMPI_DECLSPEC    void orte_errmgr_base_error_detected(int error_code);
+ORTE_DECLSPEC    void orte_errmgr_base_error_detected(int error_code);
 
-OMPI_DECLSPEC    int orte_errmgr_base_register_job(orte_jobid_t job);
+ORTE_DECLSPEC    int orte_errmgr_base_register_job(orte_jobid_t job);
 
-OMPI_DECLSPEC    void orte_errmgr_base_abort(void);
+ORTE_DECLSPEC    void orte_errmgr_base_abort(void);
 
 /*
  * globals that might be needed
  */
 
-OMPI_DECLSPEC extern int orte_errmgr_base_output;
-OMPI_DECLSPEC extern bool orte_errmgr_base_selected;
-OMPI_DECLSPEC extern bool orte_errmgr_initialized;
-OMPI_DECLSPEC extern opal_list_t orte_errmgr_base_components_available;
-OMPI_DECLSPEC extern mca_errmgr_base_component_t orte_errmgr_base_selected_component;
+ORTE_DECLSPEC extern int orte_errmgr_base_output;
+ORTE_DECLSPEC extern bool orte_errmgr_base_selected;
+ORTE_DECLSPEC extern bool orte_errmgr_initialized;
+ORTE_DECLSPEC extern opal_list_t orte_errmgr_base_components_available;
+ORTE_DECLSPEC extern mca_errmgr_base_component_t orte_errmgr_base_selected_component;
 
 /*
  * external API functions will be documented in the mca/errmgr/errmgr.h file
diff --git a/orte/mca/errmgr/errmgr.h b/orte/mca/errmgr/errmgr.h
index 4a3a2a0387..3207683537 100644
--- a/orte/mca/errmgr/errmgr.h
+++ b/orte/mca/errmgr/errmgr.h
@@ -173,7 +173,7 @@ typedef mca_errmgr_base_component_1_0_0_t mca_errmgr_base_component_t;
 
 /* Global structure for accessing error manager functions
  */
-OMPI_DECLSPEC extern orte_errmgr_base_module_t orte_errmgr;  /* holds selected module's function pointers */
+ORTE_DECLSPEC extern orte_errmgr_base_module_t orte_errmgr;  /* holds selected module's function pointers */
 
 #if defined(c_plusplus) || defined(__cplusplus)
 }
diff --git a/orte/mca/gpr/base/base.h b/orte/mca/gpr/base/base.h
index 24745f1009..062f64dee9 100644
--- a/orte/mca/gpr/base/base.h
+++ b/orte/mca/gpr/base/base.h
@@ -116,9 +116,9 @@ extern "C" {
 typedef uint8_t orte_gpr_cmd_flag_t;
 #define ORTE_GPR_CMD_T ORTE_UINT8
 
-   OMPI_DECLSPEC int orte_gpr_base_open(void);
-   OMPI_DECLSPEC int orte_gpr_base_select(void);
-   OMPI_DECLSPEC int orte_gpr_base_close(void);
+   ORTE_DECLSPEC int orte_gpr_base_open(void);
+   ORTE_DECLSPEC int orte_gpr_base_select(void);
+   ORTE_DECLSPEC int orte_gpr_base_close(void);
 
 int orte_gpr_base_create_value(orte_gpr_value_t **value,
                                orte_gpr_addr_mode_t addr_mode,
@@ -131,17 +131,17 @@ int orte_gpr_base_create_keyval(orte_gpr_keyval_t **keyval,
                                 orte_data_type_t type,
                                 void *data);
                                                  
-   OMPI_DECLSPEC int orte_gpr_base_put_1(orte_gpr_addr_mode_t addr_mode,
+   ORTE_DECLSPEC int orte_gpr_base_put_1(orte_gpr_addr_mode_t addr_mode,
                                char *segment, char **tokens,
                                char *key, orte_data_value_t *value);
 
 
-   OMPI_DECLSPEC int orte_gpr_base_put_N(orte_gpr_addr_mode_t addr_mode,
+   ORTE_DECLSPEC int orte_gpr_base_put_N(orte_gpr_addr_mode_t addr_mode,
                                char *segment, char **tokens,
                                orte_std_cntr_t n, char **keys,
                                orte_data_value_t **data_values);
 
-   OMPI_DECLSPEC int orte_gpr_base_subscribe_1(orte_gpr_subscription_id_t *id,
+   ORTE_DECLSPEC int orte_gpr_base_subscribe_1(orte_gpr_subscription_id_t *id,
                                      char *trig_name,
                                      char *sub_name,
                                      orte_gpr_notify_action_t action,
@@ -153,7 +153,7 @@ int orte_gpr_base_create_keyval(orte_gpr_keyval_t **keyval,
                                      void *user_tag);
 
 
-   OMPI_DECLSPEC int orte_gpr_base_subscribe_N(orte_gpr_subscription_id_t *id,
+   ORTE_DECLSPEC int orte_gpr_base_subscribe_N(orte_gpr_subscription_id_t *id,
                                      char *trig_name,
                                      char *sub_name,
                                      orte_gpr_notify_action_t action,
@@ -166,7 +166,7 @@ int orte_gpr_base_create_keyval(orte_gpr_keyval_t **keyval,
                                      void *user_tag);
 
 
-   OMPI_DECLSPEC int orte_gpr_base_define_trigger(orte_gpr_trigger_id_t *id,
+   ORTE_DECLSPEC int orte_gpr_base_define_trigger(orte_gpr_trigger_id_t *id,
                                         char *trig_name,
                                         orte_gpr_trigger_action_t action,
                                         orte_gpr_addr_mode_t addr_mode,
@@ -177,7 +177,7 @@ int orte_gpr_base_create_keyval(orte_gpr_keyval_t **keyval,
                                         orte_gpr_trigger_cb_fn_t cbfunc,
                                         void *user_tag);
 
-   OMPI_DECLSPEC int orte_gpr_base_define_trigger_level(orte_gpr_trigger_id_t *id,
+   ORTE_DECLSPEC int orte_gpr_base_define_trigger_level(orte_gpr_trigger_id_t *id,
                                         char *trig_name,
                                         orte_gpr_trigger_action_t action,
                                         orte_gpr_addr_mode_t addr_mode,
@@ -190,86 +190,86 @@ int orte_gpr_base_create_keyval(orte_gpr_keyval_t **keyval,
                                         void *user_tag);
 
     /* general usage functions */
-    OMPI_DECLSPEC int orte_gpr_base_pack_delete_segment(orte_buffer_t *cmd,
+    ORTE_DECLSPEC int orte_gpr_base_pack_delete_segment(orte_buffer_t *cmd,
                                                         char *segment);
-    OMPI_DECLSPEC int orte_gpr_base_unpack_delete_segment(orte_buffer_t *buffer, int *ret);
+    ORTE_DECLSPEC int orte_gpr_base_unpack_delete_segment(orte_buffer_t *buffer, int *ret);
 
-    OMPI_DECLSPEC int orte_gpr_base_pack_delete_entries(orte_buffer_t *buffer,
+    ORTE_DECLSPEC int orte_gpr_base_pack_delete_entries(orte_buffer_t *buffer,
                     orte_gpr_addr_mode_t mode,
                     char *segment, char **tokens, char **keys);
-    OMPI_DECLSPEC int orte_gpr_base_unpack_delete_entries(orte_buffer_t *buffer, int *ret);
+    ORTE_DECLSPEC int orte_gpr_base_unpack_delete_entries(orte_buffer_t *buffer, int *ret);
 
-    OMPI_DECLSPEC int orte_gpr_base_pack_index(orte_buffer_t *cmd, char *segment);
-    OMPI_DECLSPEC int orte_gpr_base_unpack_index(orte_buffer_t *cmd, int *ret, orte_std_cntr_t *cnt,
+    ORTE_DECLSPEC int orte_gpr_base_pack_index(orte_buffer_t *cmd, char *segment);
+    ORTE_DECLSPEC int orte_gpr_base_unpack_index(orte_buffer_t *cmd, int *ret, orte_std_cntr_t *cnt,
                                                  char ***index);
 
-    OMPI_DECLSPEC int orte_gpr_base_pack_subscribe(orte_buffer_t *cmd,
+    ORTE_DECLSPEC int orte_gpr_base_pack_subscribe(orte_buffer_t *cmd,
                     orte_std_cntr_t num_subs,
                     orte_gpr_subscription_t **subscriptions,
                     orte_std_cntr_t num_trigs, orte_gpr_trigger_t **trig);
-    OMPI_DECLSPEC int orte_gpr_base_unpack_subscribe(orte_buffer_t *buffer, int *ret);
+    ORTE_DECLSPEC int orte_gpr_base_unpack_subscribe(orte_buffer_t *buffer, int *ret);
 
-    OMPI_DECLSPEC int orte_gpr_base_pack_unsubscribe(orte_buffer_t *cmd,
+    ORTE_DECLSPEC int orte_gpr_base_pack_unsubscribe(orte_buffer_t *cmd,
                       orte_gpr_subscription_id_t id);
-    OMPI_DECLSPEC int orte_gpr_base_unpack_unsubscribe(orte_buffer_t *buffer, int *ret);
+    ORTE_DECLSPEC int orte_gpr_base_unpack_unsubscribe(orte_buffer_t *buffer, int *ret);
 
-    OMPI_DECLSPEC int orte_gpr_base_pack_cancel_trigger(orte_buffer_t *cmd,
+    ORTE_DECLSPEC int orte_gpr_base_pack_cancel_trigger(orte_buffer_t *cmd,
                      orte_gpr_trigger_id_t id);
-    OMPI_DECLSPEC int orte_gpr_base_unpack_cancel_trigger(orte_buffer_t *buffer, int *ret);
+    ORTE_DECLSPEC int orte_gpr_base_unpack_cancel_trigger(orte_buffer_t *buffer, int *ret);
 
-    OMPI_DECLSPEC int orte_gpr_base_pack_put(orte_buffer_t *cmd,
+    ORTE_DECLSPEC int orte_gpr_base_pack_put(orte_buffer_t *cmd,
                                              orte_std_cntr_t cnt, orte_gpr_value_t **values);
-    OMPI_DECLSPEC int orte_gpr_base_unpack_put(orte_buffer_t *buffer, int *ret);
+    ORTE_DECLSPEC int orte_gpr_base_unpack_put(orte_buffer_t *buffer, int *ret);
 
-    OMPI_DECLSPEC int orte_gpr_base_pack_get(orte_buffer_t *cmd,
+    ORTE_DECLSPEC int orte_gpr_base_pack_get(orte_buffer_t *cmd,
                   orte_gpr_addr_mode_t mode,
                   char *segment, char **tokens, char **keys);
-    OMPI_DECLSPEC int orte_gpr_base_pack_get_conditional(orte_buffer_t *cmd,
+    ORTE_DECLSPEC int orte_gpr_base_pack_get_conditional(orte_buffer_t *cmd,
                     orte_gpr_addr_mode_t mode,
                     char *segment, char **tokens, char **keys,
                     orte_std_cntr_t num_conditions, orte_gpr_keyval_t **conditions);
 
-    OMPI_DECLSPEC int orte_gpr_base_unpack_get(orte_buffer_t *buffer, int *ret,
+    ORTE_DECLSPEC int orte_gpr_base_unpack_get(orte_buffer_t *buffer, int *ret,
                    orte_std_cntr_t *cnt, orte_gpr_value_t ***values);
 
-    OMPI_DECLSPEC int orte_gpr_base_pack_dump_all(orte_buffer_t *cmd);
-    OMPI_DECLSPEC int orte_gpr_base_pack_dump_segments(orte_buffer_t *cmd, char *segment);
-    OMPI_DECLSPEC int orte_gpr_base_pack_dump_triggers(orte_buffer_t *cmd,
+    ORTE_DECLSPEC int orte_gpr_base_pack_dump_all(orte_buffer_t *cmd);
+    ORTE_DECLSPEC int orte_gpr_base_pack_dump_segments(orte_buffer_t *cmd, char *segment);
+    ORTE_DECLSPEC int orte_gpr_base_pack_dump_triggers(orte_buffer_t *cmd,
                    orte_gpr_trigger_id_t start);
-    OMPI_DECLSPEC int orte_gpr_base_pack_dump_subscriptions(orte_buffer_t *cmd,
+    ORTE_DECLSPEC int orte_gpr_base_pack_dump_subscriptions(orte_buffer_t *cmd,
                    orte_gpr_subscription_id_t start);
-    OMPI_DECLSPEC int orte_gpr_base_pack_dump_a_trigger(orte_buffer_t *cmd,
+    ORTE_DECLSPEC int orte_gpr_base_pack_dump_a_trigger(orte_buffer_t *cmd,
                         char *name, orte_gpr_trigger_id_t id);
-    OMPI_DECLSPEC int orte_gpr_base_pack_dump_a_subscription(orte_buffer_t *cmd,
+    ORTE_DECLSPEC int orte_gpr_base_pack_dump_a_subscription(orte_buffer_t *cmd,
                         char *name,
                         orte_gpr_subscription_id_t id);
-    OMPI_DECLSPEC int orte_gpr_base_pack_dump_callbacks(orte_buffer_t *cmd);
+    ORTE_DECLSPEC int orte_gpr_base_pack_dump_callbacks(orte_buffer_t *cmd);
     
-    OMPI_DECLSPEC int orte_gpr_base_print_dump(orte_buffer_t *buffer);
+    ORTE_DECLSPEC int orte_gpr_base_print_dump(orte_buffer_t *buffer);
     
-    OMPI_DECLSPEC int orte_gpr_base_dump_keyval_value(orte_buffer_t *buffer,
+    ORTE_DECLSPEC int orte_gpr_base_dump_keyval_value(orte_buffer_t *buffer,
                         orte_gpr_keyval_t *iptr);
-    OMPI_DECLSPEC int orte_gpr_base_pack_dump_segment_size(orte_buffer_t *cmd, char *segment);
-    OMPI_DECLSPEC int orte_gpr_base_dump_notify_msg(orte_buffer_t *buffer,
+    ORTE_DECLSPEC int orte_gpr_base_pack_dump_segment_size(orte_buffer_t *cmd, char *segment);
+    ORTE_DECLSPEC int orte_gpr_base_dump_notify_msg(orte_buffer_t *buffer,
                         orte_gpr_notify_message_t *msg);
-    OMPI_DECLSPEC int orte_gpr_base_dump_notify_data(orte_buffer_t *buffer,
+    ORTE_DECLSPEC int orte_gpr_base_dump_notify_data(orte_buffer_t *buffer,
                         orte_gpr_notify_data_t *data);
-    OMPI_DECLSPEC int orte_gpr_base_dump_value(orte_buffer_t *buffer,
+    ORTE_DECLSPEC int orte_gpr_base_dump_value(orte_buffer_t *buffer,
                         orte_gpr_value_t *value);
 
-    OMPI_DECLSPEC int orte_gpr_base_pack_cleanup_job(orte_buffer_t *buffer,
+    ORTE_DECLSPEC int orte_gpr_base_pack_cleanup_job(orte_buffer_t *buffer,
                                                      orte_jobid_t jobid);
-    OMPI_DECLSPEC int orte_gpr_base_unpack_cleanup_job(orte_buffer_t *buffer, int *ret);
+    ORTE_DECLSPEC int orte_gpr_base_unpack_cleanup_job(orte_buffer_t *buffer, int *ret);
 
-    OMPI_DECLSPEC int orte_gpr_base_pack_cleanup_proc(orte_buffer_t *buffer,
+    ORTE_DECLSPEC int orte_gpr_base_pack_cleanup_proc(orte_buffer_t *buffer,
                                                       orte_process_name_t *proc);
-    OMPI_DECLSPEC int orte_gpr_base_unpack_cleanup_proc(orte_buffer_t *buffer, int *ret);
+    ORTE_DECLSPEC int orte_gpr_base_unpack_cleanup_proc(orte_buffer_t *buffer, int *ret);
 
-    OMPI_DECLSPEC int orte_gpr_base_pack_increment_value(orte_buffer_t *cmd, orte_gpr_value_t *value);
-    OMPI_DECLSPEC int orte_gpr_base_unpack_increment_value(orte_buffer_t *buffer, int *ret);
+    ORTE_DECLSPEC int orte_gpr_base_pack_increment_value(orte_buffer_t *cmd, orte_gpr_value_t *value);
+    ORTE_DECLSPEC int orte_gpr_base_unpack_increment_value(orte_buffer_t *buffer, int *ret);
 
-    OMPI_DECLSPEC int orte_gpr_base_pack_decrement_value(orte_buffer_t *cmd, orte_gpr_value_t *value);
-    OMPI_DECLSPEC int orte_gpr_base_unpack_decrement_value(orte_buffer_t *buffer, int *ret);
+    ORTE_DECLSPEC int orte_gpr_base_pack_decrement_value(orte_buffer_t *cmd, orte_gpr_value_t *value);
+    ORTE_DECLSPEC int orte_gpr_base_unpack_decrement_value(orte_buffer_t *buffer, int *ret);
 
 /* GPR DATA TYPE PACKING FUNCTIONS */
 int orte_gpr_base_pack_cmd(orte_buffer_t *buffer, void *src,
@@ -472,11 +472,11 @@ int orte_gpr_base_print_notify_msg(char **output, char *prefix, orte_gpr_notify_
 /*
  * globals that might be needed inside the gpr
  */
-OMPI_DECLSPEC extern int orte_gpr_base_output;
-OMPI_DECLSPEC extern size_t orte_gpr_array_max_size, orte_gpr_array_block_size;
-OMPI_DECLSPEC extern bool orte_gpr_base_selected;
-OMPI_DECLSPEC extern opal_list_t orte_gpr_base_components_available;
-OMPI_DECLSPEC extern mca_gpr_base_component_t orte_gpr_base_selected_component;
+ORTE_DECLSPEC extern int orte_gpr_base_output;
+ORTE_DECLSPEC extern size_t orte_gpr_array_max_size, orte_gpr_array_block_size;
+ORTE_DECLSPEC extern bool orte_gpr_base_selected;
+ORTE_DECLSPEC extern opal_list_t orte_gpr_base_components_available;
+ORTE_DECLSPEC extern mca_gpr_base_component_t orte_gpr_base_selected_component;
 
 #if defined(c_plusplus) || defined(__cplusplus)
 }
diff --git a/orte/mca/gpr/gpr.h b/orte/mca/gpr/gpr.h
index 36dcb37032..7c0223e13e 100644
--- a/orte/mca/gpr/gpr.h
+++ b/orte/mca/gpr/gpr.h
@@ -764,7 +764,7 @@ typedef mca_gpr_base_component_1_0_0_t mca_gpr_base_component_t;
 /*
  * global module that holds function pointers
  */
-OMPI_DECLSPEC extern orte_gpr_base_module_t orte_gpr; /* holds selected module's function pointers */
+ORTE_DECLSPEC extern orte_gpr_base_module_t orte_gpr; /* holds selected module's function pointers */
 
 #if defined(c_plusplus) || defined(__cplusplus)
 }
diff --git a/orte/mca/gpr/gpr_types.h b/orte/mca/gpr/gpr_types.h
index 3853d0c56b..218d8d6349 100644
--- a/orte/mca/gpr/gpr_types.h
+++ b/orte/mca/gpr/gpr_types.h
@@ -126,7 +126,7 @@ typedef struct {
     orte_data_value_t *value;           /* value */
 } orte_gpr_keyval_t;
 
-OMPI_DECLSPEC OBJ_CLASS_DECLARATION(orte_gpr_keyval_t);
+ORTE_DECLSPEC OBJ_CLASS_DECLARATION(orte_gpr_keyval_t);
 #define ORTE_GPR_KEYVAL_EMPTY {{OBJ_CLASS(orte_gpr_keyval_t),0}, NULL, NULL}
 
 
@@ -151,7 +151,7 @@ typedef struct {
     char **tokens;                          /**< List of tokens that described the container */
 } orte_gpr_value_t;
 
-OMPI_DECLSPEC OBJ_CLASS_DECLARATION(orte_gpr_value_t);
+ORTE_DECLSPEC OBJ_CLASS_DECLARATION(orte_gpr_value_t);
 #define ORTE_GPR_VALUE_EMPTY {{OBJ_CLASS(orte_gpr_value_t),0}, 0, NULL, 0, NULL, 0, NULL}
 
 /** Return structure for notification messages
@@ -168,7 +168,7 @@ typedef struct {
     orte_pointer_array_t *values;   /**< Array of value objects returned */
 } orte_gpr_notify_data_t;
 
-OMPI_DECLSPEC OBJ_CLASS_DECLARATION(orte_gpr_notify_data_t);
+ORTE_DECLSPEC OBJ_CLASS_DECLARATION(orte_gpr_notify_data_t);
 
 /** Return message for notify requests
  */
@@ -188,7 +188,7 @@ typedef struct {
     orte_pointer_array_t *data; /**< Contiguous array of pointers to data objects */
 } orte_gpr_notify_message_t;
 
-OMPI_DECLSPEC OBJ_CLASS_DECLARATION(orte_gpr_notify_message_t);
+ORTE_DECLSPEC OBJ_CLASS_DECLARATION(orte_gpr_notify_message_t);
 
 /** Notify callback function
  * notify_msg = message containing data provided by trigger
@@ -227,7 +227,7 @@ typedef struct {
     void *user_tag;                         /**< User-provided tag to be used in cbfunc */
 } orte_gpr_subscription_t;
 
-OMPI_DECLSPEC OBJ_CLASS_DECLARATION(orte_gpr_subscription_t);
+ORTE_DECLSPEC OBJ_CLASS_DECLARATION(orte_gpr_subscription_t);
 #define ORTE_GPR_SUBSCRIPTION_EMPTY {{OBJ_CLASS(orte_gpr_subscription_t),0}, NULL, ORTE_GPR_SUBSCRIPTION_ID_MAX, 0, 0, NULL, 0, NULL}
 
 /** Structure for registering triggers
@@ -248,7 +248,7 @@ typedef struct {
     void *user_tag;                         /**< User-provided tag to be used in cbfunc */
 } orte_gpr_trigger_t;
 
-OMPI_DECLSPEC OBJ_CLASS_DECLARATION(orte_gpr_trigger_t);
+ORTE_DECLSPEC OBJ_CLASS_DECLARATION(orte_gpr_trigger_t);
 #define ORTE_GPR_TRIGGER_EMPTY {{OBJ_CLASS(orte_gpr_trigger_t),0}, NULL, ORTE_GPR_TRIGGER_ID_MAX, 0, 0, NULL, 0, NULL}
 
 #if defined(c_plusplus) || defined(__cplusplus)
diff --git a/orte/mca/gpr/replica/gpr_replica_component.c b/orte/mca/gpr/replica/gpr_replica_component.c
index e8f57ad90a..2739e9411f 100644
--- a/orte/mca/gpr/replica/gpr_replica_component.c
+++ b/orte/mca/gpr/replica/gpr_replica_component.c
@@ -45,7 +45,7 @@
 /*
  * Struct of function pointers that need to be initialized
  */
-OMPI_COMP_EXPORT mca_gpr_base_component_t mca_gpr_replica_component = {
+mca_gpr_base_component_t mca_gpr_replica_component = {
     {
     MCA_GPR_BASE_VERSION_1_0_0,
 
diff --git a/orte/mca/iof/base/base.h b/orte/mca/iof/base/base.h
index f2dee16029..c0f2cb7e01 100644
--- a/orte/mca/iof/base/base.h
+++ b/orte/mca/iof/base/base.h
@@ -61,13 +61,13 @@ typedef struct orte_iof_base_t orte_iof_base_t;
 
 
 
-OMPI_DECLSPEC int orte_iof_base_open(void);
-OMPI_DECLSPEC int orte_iof_base_close(void);
-OMPI_DECLSPEC int orte_iof_base_select(void);
-OMPI_DECLSPEC int orte_iof_base_flush(void);
+ORTE_DECLSPEC int orte_iof_base_open(void);
+ORTE_DECLSPEC int orte_iof_base_close(void);
+ORTE_DECLSPEC int orte_iof_base_select(void);
+ORTE_DECLSPEC int orte_iof_base_flush(void);
 
 
-OMPI_DECLSPEC extern orte_iof_base_t orte_iof_base;
+ORTE_DECLSPEC extern orte_iof_base_t orte_iof_base;
 
 #if defined(c_plusplus) || defined(__cplusplus)
 }
diff --git a/orte/mca/iof/iof.h b/orte/mca/iof/iof.h
index 73e7077bc9..0f21875be2 100644
--- a/orte/mca/iof/iof.h
+++ b/orte/mca/iof/iof.h
@@ -184,7 +184,7 @@ struct orte_iof_base_module_1_0_0_t {
 
 typedef struct orte_iof_base_module_1_0_0_t orte_iof_base_module_1_0_0_t;
 typedef orte_iof_base_module_1_0_0_t orte_iof_base_module_t;
-OMPI_DECLSPEC extern orte_iof_base_module_t orte_iof;
+ORTE_DECLSPEC extern orte_iof_base_module_t orte_iof;
 
 /**
  *  IOF component descriptor. Contains component version information
diff --git a/orte/mca/iof/null/iof_null.h b/orte/mca/iof/null/iof_null.h
index d8be311ff8..6aa4b4aaf5 100644
--- a/orte/mca/iof/null/iof_null.h
+++ b/orte/mca/iof/null/iof_null.h
@@ -136,8 +136,8 @@ struct orte_iof_null_component_t {
 };
 typedef struct orte_iof_null_component_t orte_iof_null_component_t;
 
-OMPI_COMP_EXPORT extern orte_iof_null_component_t mca_iof_null_component;
-OMPI_COMP_EXPORT extern orte_iof_base_module_t orte_iof_null_module;
+ORTE_DECLSPEC extern orte_iof_null_component_t mca_iof_null_component;
+ORTE_DECLSPEC extern orte_iof_base_module_t orte_iof_null_module;
 
 
 #if defined(c_plusplus) || defined(__cplusplus)
diff --git a/orte/mca/iof/proxy/iof_proxy.h b/orte/mca/iof/proxy/iof_proxy.h
index 29c90010ec..71188f7ada 100644
--- a/orte/mca/iof/proxy/iof_proxy.h
+++ b/orte/mca/iof/proxy/iof_proxy.h
@@ -136,8 +136,8 @@ struct orte_iof_proxy_component_t {
 };
 typedef struct orte_iof_proxy_component_t orte_iof_proxy_component_t;
 
-OMPI_COMP_EXPORT extern orte_iof_proxy_component_t mca_iof_proxy_component;
-OMPI_COMP_EXPORT extern orte_iof_base_module_t orte_iof_proxy_module;
+ORTE_DECLSPEC extern orte_iof_proxy_component_t mca_iof_proxy_component;
+ORTE_DECLSPEC extern orte_iof_base_module_t orte_iof_proxy_module;
 
 
 #if defined(c_plusplus) || defined(__cplusplus)
diff --git a/orte/mca/ns/base/base.h b/orte/mca/ns/base/base.h
index cdc9b93c32..641e79a16a 100644
--- a/orte/mca/ns/base/base.h
+++ b/orte/mca/ns/base/base.h
@@ -78,124 +78,124 @@ typedef uint8_t orte_ns_cmd_bitmask_t;
 /*
  * function definitions
  */
-OMPI_DECLSPEC    int orte_ns_base_open(void);
-OMPI_DECLSPEC    int orte_ns_base_select(void);
-OMPI_DECLSPEC    int orte_ns_base_close(void);
+ORTE_DECLSPEC    int orte_ns_base_open(void);
+ORTE_DECLSPEC    int orte_ns_base_select(void);
+ORTE_DECLSPEC    int orte_ns_base_close(void);
 
     /*
      * Base functions that are common to all implementations - can be overridden
      */
 
-OMPI_DECLSPEC    int orte_ns_base_assign_cellid_to_process(orte_process_name_t* name);
+ORTE_DECLSPEC    int orte_ns_base_assign_cellid_to_process(orte_process_name_t* name);
 
-OMPI_DECLSPEC    int orte_ns_base_create_process_name(orte_process_name_t **name,
+ORTE_DECLSPEC    int orte_ns_base_create_process_name(orte_process_name_t **name,
                                   orte_cellid_t cell,
                                   orte_jobid_t job,
                                   orte_vpid_t vpid);
 
-OMPI_DECLSPEC    int orte_ns_base_copy_process_name(orte_process_name_t **dest,
+ORTE_DECLSPEC    int orte_ns_base_copy_process_name(orte_process_name_t **dest,
                                 orte_process_name_t* src);
 
-OMPI_DECLSPEC    int orte_ns_base_convert_string_to_process_name(orte_process_name_t **name,
+ORTE_DECLSPEC    int orte_ns_base_convert_string_to_process_name(orte_process_name_t **name,
                                              const char* name_string);
 
-OMPI_DECLSPEC    int orte_ns_base_get_proc_name_string(char **name_string,
+ORTE_DECLSPEC    int orte_ns_base_get_proc_name_string(char **name_string,
                                    const orte_process_name_t* name);
 
-OMPI_DECLSPEC    int orte_ns_base_get_vpid_string(char **vpid_string, const orte_process_name_t* name);
+ORTE_DECLSPEC    int orte_ns_base_get_vpid_string(char **vpid_string, const orte_process_name_t* name);
 
-OMPI_DECLSPEC    int orte_ns_base_convert_vpid_to_string(char **vpid_string, const orte_vpid_t vpid);
+ORTE_DECLSPEC    int orte_ns_base_convert_vpid_to_string(char **vpid_string, const orte_vpid_t vpid);
 
-OMPI_DECLSPEC    int orte_ns_base_convert_string_to_vpid(orte_vpid_t *vpid, const char* vpidstring);
+ORTE_DECLSPEC    int orte_ns_base_convert_string_to_vpid(orte_vpid_t *vpid, const char* vpidstring);
 
-OMPI_DECLSPEC    int orte_ns_base_get_jobid_string(char **jobid_string, const orte_process_name_t* name);
+ORTE_DECLSPEC    int orte_ns_base_get_jobid_string(char **jobid_string, const orte_process_name_t* name);
 
-OMPI_DECLSPEC    int orte_ns_base_convert_jobid_to_string(char **jobid_string, const orte_jobid_t jobid);
+ORTE_DECLSPEC    int orte_ns_base_convert_jobid_to_string(char **jobid_string, const orte_jobid_t jobid);
 
-OMPI_DECLSPEC    int orte_ns_base_convert_string_to_jobid(orte_jobid_t *jobid, const char* jobidstring);
+ORTE_DECLSPEC    int orte_ns_base_convert_string_to_jobid(orte_jobid_t *jobid, const char* jobidstring);
 
-OMPI_DECLSPEC    int orte_ns_base_get_cellid_string(char **cellid_string, const orte_process_name_t* name);
+ORTE_DECLSPEC    int orte_ns_base_get_cellid_string(char **cellid_string, const orte_process_name_t* name);
 
-OMPI_DECLSPEC    int orte_ns_base_convert_string_to_cellid(orte_cellid_t *cellid, const char *cellidstring);
+ORTE_DECLSPEC    int orte_ns_base_convert_string_to_cellid(orte_cellid_t *cellid, const char *cellidstring);
 
-OMPI_DECLSPEC    int orte_ns_base_convert_cellid_to_string(char **cellid_string, const orte_cellid_t cellid);
+ORTE_DECLSPEC    int orte_ns_base_convert_cellid_to_string(char **cellid_string, const orte_cellid_t cellid);
 
-OMPI_DECLSPEC    int orte_ns_base_get_vpid(orte_vpid_t *vpid, const orte_process_name_t* name);
+ORTE_DECLSPEC    int orte_ns_base_get_vpid(orte_vpid_t *vpid, const orte_process_name_t* name);
 
-OMPI_DECLSPEC    int orte_ns_base_get_jobid(orte_jobid_t *jobid, const orte_process_name_t* name);
+ORTE_DECLSPEC    int orte_ns_base_get_jobid(orte_jobid_t *jobid, const orte_process_name_t* name);
 
-OMPI_DECLSPEC    int orte_ns_base_get_cellid(orte_cellid_t *cellid, const orte_process_name_t* name);
+ORTE_DECLSPEC    int orte_ns_base_get_cellid(orte_cellid_t *cellid, const orte_process_name_t* name);
 
-OMPI_DECLSPEC    int orte_ns_base_compare(orte_ns_cmp_bitmask_t fields,
+ORTE_DECLSPEC    int orte_ns_base_compare(orte_ns_cmp_bitmask_t fields,
             const orte_process_name_t* name1,
             const orte_process_name_t* name2);
 
-OMPI_DECLSPEC    int orte_ns_base_free_name(orte_process_name_t **name);
+ORTE_DECLSPEC    int orte_ns_base_free_name(orte_process_name_t **name);
 
-OMPI_DECLSPEC    int orte_ns_base_print_dump(orte_buffer_t *buffer);
+ORTE_DECLSPEC    int orte_ns_base_print_dump(orte_buffer_t *buffer);
 
 
 /* not available functions */
-OMPI_DECLSPEC    int orte_ns_base_module_init_not_available(void);
+ORTE_DECLSPEC    int orte_ns_base_module_init_not_available(void);
 
-OMPI_DECLSPEC    int orte_ns_base_create_cellid_not_available(orte_cellid_t *cellid,
+ORTE_DECLSPEC    int orte_ns_base_create_cellid_not_available(orte_cellid_t *cellid,
                                     char *site, char *resource);
 
-OMPI_DECLSPEC    int orte_ns_base_get_cell_info_not_available(orte_cellid_t cellid,
+ORTE_DECLSPEC    int orte_ns_base_get_cell_info_not_available(orte_cellid_t cellid,
                                 char **site, char **resource);
 
-OMPI_DECLSPEC    int orte_ns_base_create_jobid_not_available(orte_jobid_t *jobid);
+ORTE_DECLSPEC    int orte_ns_base_create_jobid_not_available(orte_jobid_t *jobid);
 
-OMPI_DECLSPEC    int orte_ns_base_get_vpid_range_not_available(orte_jobid_t job,
+ORTE_DECLSPEC    int orte_ns_base_get_vpid_range_not_available(orte_jobid_t job,
                                                                orte_vpid_t range,
                                                                orte_vpid_t *startvpid);
 
-OMPI_DECLSPEC    int orte_ns_base_derive_vpid(orte_vpid_t *vpid,
+ORTE_DECLSPEC    int orte_ns_base_derive_vpid(orte_vpid_t *vpid,
                                              orte_vpid_t base_vpid,
                                              int offset);
 
-OMPI_DECLSPEC    int orte_ns_base_assign_rml_tag_not_available(orte_rml_tag_t *tag, char *name);
+ORTE_DECLSPEC    int orte_ns_base_assign_rml_tag_not_available(orte_rml_tag_t *tag, char *name);
 
-OMPI_DECLSPEC    int orte_ns_base_define_data_type_not_available(
+ORTE_DECLSPEC    int orte_ns_base_define_data_type_not_available(
                                   const char *name,
                                   orte_data_type_t *type);
 
-OMPI_DECLSPEC    int orte_ns_base_create_my_name_not_available(void);
+ORTE_DECLSPEC    int orte_ns_base_create_my_name_not_available(void);
 
-OMPI_DECLSPEC    int orte_ns_base_get_job_peers_not_available(orte_process_name_t **procs,
+ORTE_DECLSPEC    int orte_ns_base_get_job_peers_not_available(orte_process_name_t **procs,
                                   orte_std_cntr_t *num_procs, orte_jobid_t job);
 
-OMPI_DECLSPEC    int orte_ns_base_dump_cells_not_available(void);
-OMPI_DECLSPEC    int orte_ns_base_dump_jobs_not_available(void);
-OMPI_DECLSPEC    int orte_ns_base_dump_tags_not_available(void);
-OMPI_DECLSPEC    int orte_ns_base_dump_datatypes_not_available(void);
+ORTE_DECLSPEC    int orte_ns_base_dump_cells_not_available(void);
+ORTE_DECLSPEC    int orte_ns_base_dump_jobs_not_available(void);
+ORTE_DECLSPEC    int orte_ns_base_dump_tags_not_available(void);
+ORTE_DECLSPEC    int orte_ns_base_dump_datatypes_not_available(void);
 
 /* Base functions used everywhere */
-OMPI_DECLSPEC    int orte_ns_base_get_peers(orte_process_name_t **procs,
+ORTE_DECLSPEC    int orte_ns_base_get_peers(orte_process_name_t **procs,
                                   orte_std_cntr_t *num_procs, orte_std_cntr_t *self);
 
-OMPI_DECLSPEC    int orte_ns_base_pack_name(orte_buffer_t *buffer, void *src,
+ORTE_DECLSPEC    int orte_ns_base_pack_name(orte_buffer_t *buffer, void *src,
                        orte_std_cntr_t num_vals, orte_data_type_t type);
 
-OMPI_DECLSPEC    int orte_ns_base_pack_cellid(orte_buffer_t *buffer, void *src,
+ORTE_DECLSPEC    int orte_ns_base_pack_cellid(orte_buffer_t *buffer, void *src,
                        orte_std_cntr_t num_vals, orte_data_type_t type);
 
-OMPI_DECLSPEC    int orte_ns_base_pack_jobid(orte_buffer_t *buffer, void *src,
+ORTE_DECLSPEC    int orte_ns_base_pack_jobid(orte_buffer_t *buffer, void *src,
                        orte_std_cntr_t num_vals, orte_data_type_t type);
 
-OMPI_DECLSPEC    int orte_ns_base_pack_vpid(orte_buffer_t *buffer, void *src,
+ORTE_DECLSPEC    int orte_ns_base_pack_vpid(orte_buffer_t *buffer, void *src,
                        orte_std_cntr_t num_vals, orte_data_type_t type);
 
-OMPI_DECLSPEC    int orte_ns_base_unpack_name(orte_buffer_t *buffer, void *dest,
+ORTE_DECLSPEC    int orte_ns_base_unpack_name(orte_buffer_t *buffer, void *dest,
                        orte_std_cntr_t *num_vals, orte_data_type_t type);
 
-OMPI_DECLSPEC    int orte_ns_base_unpack_cellid(orte_buffer_t *buffer, void *dest,
+ORTE_DECLSPEC    int orte_ns_base_unpack_cellid(orte_buffer_t *buffer, void *dest,
                        orte_std_cntr_t *num_vals, orte_data_type_t type);
 
-OMPI_DECLSPEC    int orte_ns_base_unpack_jobid(orte_buffer_t *buffer, void *dest,
+ORTE_DECLSPEC    int orte_ns_base_unpack_jobid(orte_buffer_t *buffer, void *dest,
                        orte_std_cntr_t *num_vals, orte_data_type_t type);
 
-OMPI_DECLSPEC    int orte_ns_base_unpack_vpid(orte_buffer_t *buffer, void *dest,
+ORTE_DECLSPEC    int orte_ns_base_unpack_vpid(orte_buffer_t *buffer, void *dest,
                        orte_std_cntr_t *num_vals, orte_data_type_t type);
 
 /*
@@ -256,10 +256,10 @@ int orte_ns_base_print_name(char **output, char *prefix, orte_process_name_t *na
  * globals that might be needed
  */
 
-OMPI_DECLSPEC extern int mca_ns_base_output;
-OMPI_DECLSPEC extern bool mca_ns_base_selected;
-OMPI_DECLSPEC extern opal_list_t mca_ns_base_components_available;
-OMPI_DECLSPEC extern mca_ns_base_component_t mca_ns_base_selected_component;
+ORTE_DECLSPEC extern int mca_ns_base_output;
+ORTE_DECLSPEC extern bool mca_ns_base_selected;
+ORTE_DECLSPEC extern opal_list_t mca_ns_base_components_available;
+ORTE_DECLSPEC extern mca_ns_base_component_t mca_ns_base_selected_component;
 
 /*
  * external API functions will be documented in the mca/ns/ns.h file
diff --git a/orte/mca/ns/base/ns_base_open.c b/orte/mca/ns/base/ns_base_open.c
index a7322483d9..2fc4b32add 100644
--- a/orte/mca/ns/base/ns_base_open.c
+++ b/orte/mca/ns/base/ns_base_open.c
@@ -49,7 +49,7 @@ orte_process_name_t orte_name_all = {ORTE_CELLID_MAX, ORTE_JOBID_MAX, ORTE_VPID_
  * Global variables
  */
 int mca_ns_base_output = -1;
-OMPI_DECLSPEC mca_ns_base_module_t orte_ns = {
+mca_ns_base_module_t orte_ns = {
     /* init */
     orte_ns_base_module_init_not_available,
     /* cell functions */
diff --git a/orte/mca/ns/ns.h b/orte/mca/ns/ns.h
index 44144ddedc..db893efb27 100644
--- a/orte/mca/ns/ns.h
+++ b/orte/mca/ns/ns.h
@@ -700,7 +700,7 @@ typedef mca_ns_base_component_1_0_0_t mca_ns_base_component_t;
 
 /* Global structure for accessing name server functions
  */
-OMPI_DECLSPEC extern mca_ns_base_module_t orte_ns;  /* holds selected module's function pointers */
+ORTE_DECLSPEC extern mca_ns_base_module_t orte_ns;  /* holds selected module's function pointers */
 
 #if defined(c_plusplus) || defined(__cplusplus)
 }
diff --git a/orte/mca/ns/ns_types.h b/orte/mca/ns/ns_types.h
index fdce4ba90d..70e4733fcd 100644
--- a/orte/mca/ns/ns_types.h
+++ b/orte/mca/ns/ns_types.h
@@ -119,6 +119,6 @@ struct orte_name_services_namelist_t {
 };
 typedef struct orte_name_services_namelist_t orte_name_services_namelist_t;
 
-OMPI_DECLSPEC    OBJ_CLASS_DECLARATION(orte_name_services_namelist_t);
+ORTE_DECLSPEC    OBJ_CLASS_DECLARATION(orte_name_services_namelist_t);
 
 #endif
diff --git a/orte/mca/ns/proxy/src/ns_proxy_component.c b/orte/mca/ns/proxy/src/ns_proxy_component.c
index d1b6557efc..36808fe630 100644
--- a/orte/mca/ns/proxy/src/ns_proxy_component.c
+++ b/orte/mca/ns/proxy/src/ns_proxy_component.c
@@ -45,7 +45,7 @@
 /*
  * Struct of function pointers that need to be initialized
  */
-OMPI_COMP_EXPORT mca_ns_base_component_t mca_ns_proxy_component = {
+mca_ns_base_component_t mca_ns_proxy_component = {
   {
     MCA_NS_BASE_VERSION_1_0_0,
 
diff --git a/orte/mca/ns/replica/src/ns_replica_component.c b/orte/mca/ns/replica/src/ns_replica_component.c
index 54d00d6e8f..70f1321bfb 100644
--- a/orte/mca/ns/replica/src/ns_replica_component.c
+++ b/orte/mca/ns/replica/src/ns_replica_component.c
@@ -48,7 +48,7 @@
 /*
  * Struct of function pointers that need to be initialized
  */
-OMPI_COMP_EXPORT mca_ns_base_component_t mca_ns_replica_component = {
+mca_ns_base_component_t mca_ns_replica_component = {
   {
     MCA_NS_BASE_VERSION_1_0_0,
 
diff --git a/orte/mca/oob/base/base.h b/orte/mca/oob/base/base.h
index 7f860a0eef..93f16be821 100644
--- a/orte/mca/oob/base/base.h
+++ b/orte/mca/oob/base/base.h
@@ -47,8 +47,8 @@ extern "C" {
  * Well known address
  */
 
-OMPI_DECLSPEC extern orte_process_name_t mca_oob_name_any;
-OMPI_DECLSPEC extern orte_process_name_t mca_oob_name_seed;
+ORTE_DECLSPEC extern orte_process_name_t mca_oob_name_any;
+ORTE_DECLSPEC extern orte_process_name_t mca_oob_name_seed;
 
 /*
  * OOB API
@@ -84,7 +84,7 @@ OMPI_DECLSPEC extern orte_process_name_t mca_oob_name_seed;
 *  an OOB module prior to calling this routine.
 */
 
-OMPI_DECLSPEC char* mca_oob_get_contact_info(void);
+ORTE_DECLSPEC char* mca_oob_get_contact_info(void);
 
 /**
 *  Pre-populate the cache of contact information required by the OOB
@@ -96,7 +96,7 @@ OMPI_DECLSPEC char* mca_oob_get_contact_info(void);
 *
 */
 
-OMPI_DECLSPEC int mca_oob_set_contact_info(const char*);
+ORTE_DECLSPEC int mca_oob_set_contact_info(const char*);
 
 /**
  *  A routine to ping a given process name to determine if it is reachable.
@@ -109,7 +109,7 @@ OMPI_DECLSPEC int mca_oob_set_contact_info(const char*);
  *  an error status is returned.
  */
 
-OMPI_DECLSPEC int mca_oob_ping(const char*, struct timeval* tv);
+ORTE_DECLSPEC int mca_oob_ping(const char*, struct timeval* tv);
 
 /**
 *  Extract from the contact info the peer process identifier.
@@ -123,7 +123,7 @@ OMPI_DECLSPEC int mca_oob_ping(const char*, struct timeval* tv);
 *  the process name.
 */
 
-OMPI_DECLSPEC int mca_oob_parse_contact_info(const char* uri, orte_process_name_t* peer, char*** uris);
+ORTE_DECLSPEC int mca_oob_parse_contact_info(const char* uri, orte_process_name_t* peer, char*** uris);
 
 
 /**
@@ -134,7 +134,7 @@ OMPI_DECLSPEC int mca_oob_parse_contact_info(const char* uri, orte_process_name_
  *  must currently be set before calling mca_oob_base_init().
  */
 
-OMPI_DECLSPEC int mca_oob_set_contact_info(const char*);
+ORTE_DECLSPEC int mca_oob_set_contact_info(const char*);
 
 /**
 *  Similiar to unix writev(2).
@@ -156,7 +156,7 @@ OMPI_DECLSPEC int mca_oob_set_contact_info(const char*);
 *  address.
 */
 
-OMPI_DECLSPEC int mca_oob_send(
+ORTE_DECLSPEC int mca_oob_send(
     orte_process_name_t* peer,
     struct iovec *msg,
     int count,
@@ -172,7 +172,7 @@ OMPI_DECLSPEC int mca_oob_send(
 * @return            OMPI error code (<0) on error or number of bytes actually sent.
 */
 
-OMPI_DECLSPEC int mca_oob_send_packed(
+ORTE_DECLSPEC int mca_oob_send_packed(
     orte_process_name_t* peer,
     orte_buffer_t* buffer,
     int tag,
@@ -208,7 +208,7 @@ OMPI_DECLSPEC int mca_oob_send_packed(
 *
 */
 
-OMPI_DECLSPEC int mca_oob_recv(
+ORTE_DECLSPEC int mca_oob_recv(
     orte_process_name_t* peer,
     struct iovec *msg,
     int count,
@@ -230,7 +230,7 @@ OMPI_DECLSPEC int mca_oob_recv(
 *
 */
 
-OMPI_DECLSPEC int mca_oob_recv_packed (
+ORTE_DECLSPEC int mca_oob_recv_packed (
     orte_process_name_t* peer,
     orte_buffer_t *buf,
     int tag);
@@ -296,7 +296,7 @@ typedef void (*mca_oob_callback_packed_fn_t)(
 *
 */
 
-OMPI_DECLSPEC int mca_oob_send_nb(
+ORTE_DECLSPEC int mca_oob_send_nb(
     orte_process_name_t* peer,
     struct iovec* msg,
     int count,
@@ -322,7 +322,7 @@ OMPI_DECLSPEC int mca_oob_send_nb(
 *
 */
 
-OMPI_DECLSPEC int mca_oob_send_packed_nb(
+ORTE_DECLSPEC int mca_oob_send_packed_nb(
     orte_process_name_t* peer,
     orte_buffer_t* buffer,
     int tag,
@@ -346,7 +346,7 @@ OMPI_DECLSPEC int mca_oob_send_packed_nb(
 * that matches the call parameters.
 */
 
-OMPI_DECLSPEC int mca_oob_recv_nb(
+ORTE_DECLSPEC int mca_oob_recv_nb(
     orte_process_name_t* peer,
     struct iovec* msg,
     int count,
@@ -363,7 +363,7 @@ OMPI_DECLSPEC int mca_oob_recv_nb(
 * @return             OMPI error code (<0) on error or number of bytes actually received.
 */
 
-OMPI_DECLSPEC int mca_oob_recv_cancel(
+ORTE_DECLSPEC int mca_oob_recv_cancel(
     orte_process_name_t* peer,
     int tag);
 
@@ -383,7 +383,7 @@ OMPI_DECLSPEC int mca_oob_recv_cancel(
 * that matches the call parameters.
 */
 
-OMPI_DECLSPEC int mca_oob_recv_packed_nb(
+ORTE_DECLSPEC int mca_oob_recv_packed_nb(
     orte_process_name_t* peer,
     int tag,
     int flags,
@@ -402,7 +402,7 @@ OMPI_DECLSPEC int mca_oob_recv_packed_nb(
  *  continuing to forward data along the distribution tree.
  */
 
-OMPI_DECLSPEC int mca_oob_xcast(
+ORTE_DECLSPEC int mca_oob_xcast(
     orte_process_name_t* root,
     orte_process_name_t* peers,
     orte_std_cntr_t num_peers,
@@ -424,21 +424,21 @@ typedef int (*mca_oob_base_exception_fn_t)(const orte_process_name_t* peer, int
  *  Register a callback function on loss of a connection.
  */
 
-OMPI_DECLSPEC int mca_oob_add_exception_handler(
+ORTE_DECLSPEC int mca_oob_add_exception_handler(
     mca_oob_base_exception_fn_t cbfunc);
 
 /**
  * Remove a callback
  */
 
-OMPI_DECLSPEC int mca_oob_del_exception_handler(
+ORTE_DECLSPEC int mca_oob_del_exception_handler(
     mca_oob_base_exception_fn_t cbfunc);
 
 /**
  * Invoke exception handlers
  */
 
-OMPI_DECLSPEC void mca_oob_call_exception_handlers(
+ORTE_DECLSPEC void mca_oob_call_exception_handlers(
     orte_process_name_t* peer, int exception);
 
 #if defined(c_plusplus) || defined(__cplusplus)
diff --git a/orte/mca/oob/base/oob_base_except.c b/orte/mca/oob/base/oob_base_except.c
index 9ff7ec1a32..35a80ea334 100644
--- a/orte/mca/oob/base/oob_base_except.c
+++ b/orte/mca/oob/base/oob_base_except.c
@@ -36,7 +36,7 @@ OBJ_CLASS_INSTANCE(
  *  Register a callback function on loss of a connection.
  */
                                                                                                                  
-OMPI_DECLSPEC int mca_oob_add_exception_handler(
+int mca_oob_add_exception_handler(
     mca_oob_base_exception_fn_t cbfunc)
 {
     mca_oob_base_exception_handler_t *eh = OBJ_NEW(mca_oob_base_exception_handler_t);
@@ -49,7 +49,7 @@ OMPI_DECLSPEC int mca_oob_add_exception_handler(
  * Remove a callback
  */
                                                                                                                  
-OMPI_DECLSPEC int mca_oob_del_exception_handler(
+int mca_oob_del_exception_handler(
     mca_oob_base_exception_fn_t cbfunc)
 {
     opal_list_item_t* item;
@@ -70,7 +70,7 @@ OMPI_DECLSPEC int mca_oob_del_exception_handler(
  * Invoke exception handlers
  */
                                                                                                                  
-OMPI_DECLSPEC void mca_oob_call_exception_handlers(
+void mca_oob_call_exception_handlers(
     orte_process_name_t* peer, int exception)
 {
     opal_list_item_t* item;
diff --git a/orte/mca/oob/oob.h b/orte/mca/oob/oob.h
index 1aa0a8f64b..bd55e841c3 100644
--- a/orte/mca/oob/oob.h
+++ b/orte/mca/oob/oob.h
@@ -257,7 +257,7 @@ typedef mca_oob_base_component_1_0_0_t mca_oob_base_component_t;
  * to make things work
  */
 
-OMPI_DECLSPEC extern mca_oob_t mca_oob;
+ORTE_DECLSPEC extern mca_oob_t mca_oob;
 
 /**
  * associate a component and a module that belongs to it
@@ -299,21 +299,21 @@ OBJ_CLASS_DECLARATION(mca_oob_base_exception_handler_t);
 /*
  * Global functions for MCA overall collective open and close
  */
-OMPI_DECLSPEC int mca_oob_base_open(void);
-OMPI_DECLSPEC int mca_oob_base_init(void);
-OMPI_DECLSPEC int mca_oob_base_module_init(void);
-OMPI_DECLSPEC int mca_oob_base_close(void);
+ORTE_DECLSPEC int mca_oob_base_open(void);
+ORTE_DECLSPEC int mca_oob_base_init(void);
+ORTE_DECLSPEC int mca_oob_base_module_init(void);
+ORTE_DECLSPEC int mca_oob_base_close(void);
 
 
 /*
  * Global struct holding the selected module's function pointers
  */
-OMPI_DECLSPEC extern int mca_oob_base_output;
-OMPI_DECLSPEC extern char* mca_oob_base_include;
-OMPI_DECLSPEC extern char* mca_oob_base_exclude;
-OMPI_DECLSPEC extern opal_list_t mca_oob_base_components;
-OMPI_DECLSPEC extern opal_list_t mca_oob_base_modules;
-OMPI_DECLSPEC extern opal_list_t mca_oob_base_exception_handlers;
+ORTE_DECLSPEC extern int mca_oob_base_output;
+ORTE_DECLSPEC extern char* mca_oob_base_include;
+ORTE_DECLSPEC extern char* mca_oob_base_exclude;
+ORTE_DECLSPEC extern opal_list_t mca_oob_base_components;
+ORTE_DECLSPEC extern opal_list_t mca_oob_base_modules;
+ORTE_DECLSPEC extern opal_list_t mca_oob_base_exception_handlers;
 
 #if defined(c_plusplus) || defined(__cplusplus)
 }
diff --git a/orte/mca/oob/tcp/oob_tcp.h b/orte/mca/oob/tcp/oob_tcp.h
index f66baffc5e..d4ea570277 100644
--- a/orte/mca/oob/tcp/oob_tcp.h
+++ b/orte/mca/oob/tcp/oob_tcp.h
@@ -262,7 +262,7 @@ struct mca_oob_tcp_component_t {
  */
 typedef struct mca_oob_tcp_component_t mca_oob_tcp_component_t;
 
-OMPI_COMP_EXPORT extern mca_oob_tcp_component_t mca_oob_tcp_component;
+ORTE_DECLSPEC extern mca_oob_tcp_component_t mca_oob_tcp_component;
 
 
 #if defined(c_plusplus) || defined(__cplusplus)
diff --git a/orte/mca/pls/base/base.h b/orte/mca/pls/base/base.h
index 26c8d089b0..8906f5bc9f 100644
--- a/orte/mca/pls/base/base.h
+++ b/orte/mca/pls/base/base.h
@@ -53,7 +53,7 @@ extern "C" {
     /**
      * Global instance of pls-wide framework data
      */
-    OMPI_DECLSPEC extern orte_pls_base_t orte_pls_base;
+    ORTE_DECLSPEC extern orte_pls_base_t orte_pls_base;
 
     /**
      * pls component/module/priority tuple
@@ -71,7 +71,7 @@ extern "C" {
     /** Convenience typedef */
     typedef struct orte_pls_base_cmp_t orte_pls_base_cmp_t;
     /** Class declaration */
-    OMPI_DECLSPEC OBJ_CLASS_DECLARATION(orte_pls_base_cmp_t);
+    ORTE_DECLSPEC OBJ_CLASS_DECLARATION(orte_pls_base_cmp_t);
 
     /*
      * Global functions for MCA overall collective open and close
@@ -80,35 +80,35 @@ extern "C" {
     /**
      * Open the pls framework
      */
-    OMPI_DECLSPEC int orte_pls_base_open(void);
+    ORTE_DECLSPEC int orte_pls_base_open(void);
     /**
      * Select a pls module
      */
-    OMPI_DECLSPEC orte_pls_base_module_t *orte_pls_base_select(char *preferred);
+    ORTE_DECLSPEC orte_pls_base_module_t *orte_pls_base_select(char *preferred);
     /**
      * Close the pls framework
      */
-    OMPI_DECLSPEC int orte_pls_base_finalize(void);
-    OMPI_DECLSPEC int orte_pls_base_close(void);
+    ORTE_DECLSPEC int orte_pls_base_finalize(void);
+    ORTE_DECLSPEC int orte_pls_base_close(void);
     /**
      * Utility routine to get/set procesS pid
      */
-    OMPI_DECLSPEC int orte_pls_base_set_proc_pid(const orte_process_name_t*, pid_t);
-    OMPI_DECLSPEC int orte_pls_base_get_proc_pid(const orte_process_name_t*, pid_t*);
+    ORTE_DECLSPEC int orte_pls_base_set_proc_pid(const orte_process_name_t*, pid_t);
+    ORTE_DECLSPEC int orte_pls_base_get_proc_pid(const orte_process_name_t*, pid_t*);
     /**
      * Utility routine to retreive all process pids w/in a specified job.
      */
-    OMPI_DECLSPEC int orte_pls_base_get_proc_pids(orte_jobid_t jobid, pid_t** pids, orte_std_cntr_t* num_pids);
+    ORTE_DECLSPEC int orte_pls_base_get_proc_pids(orte_jobid_t jobid, pid_t** pids, orte_std_cntr_t* num_pids);
     /**
      * Utility routine to get/set daemon pid
      */
-    OMPI_DECLSPEC int orte_pls_base_set_node_pid(orte_cellid_t cellid, char* node_name, orte_jobid_t jobid, pid_t pid);
-    OMPI_DECLSPEC int orte_pls_base_get_node_pids(orte_jobid_t jobid, pid_t** pids, orte_std_cntr_t* num_pids);
+    ORTE_DECLSPEC int orte_pls_base_set_node_pid(orte_cellid_t cellid, char* node_name, orte_jobid_t jobid, pid_t pid);
+    ORTE_DECLSPEC int orte_pls_base_get_node_pids(orte_jobid_t jobid, pid_t** pids, orte_std_cntr_t* num_pids);
   
     /**
      * Utility routine to set progress engine schedule
      */
-    OMPI_DECLSPEC int orte_pls_base_set_progress_sched(int sched);
+    ORTE_DECLSPEC int orte_pls_base_set_progress_sched(int sched);
 
 
     /**
diff --git a/orte/mca/pls/slurm/pls_slurm.h b/orte/mca/pls/slurm/pls_slurm.h
index ae06fee411..e31ccb8ad2 100644
--- a/orte/mca/pls/slurm/pls_slurm.h
+++ b/orte/mca/pls/slurm/pls_slurm.h
@@ -41,9 +41,9 @@ extern "C" {
      * Globally exported variable
      */
     
-    OMPI_COMP_EXPORT extern orte_pls_slurm_component_t 
+    ORTE_DECLSPEC extern orte_pls_slurm_component_t 
         mca_pls_slurm_component;
-    OMPI_COMP_EXPORT extern orte_pls_base_module_1_0_0_t
+    ORTE_DECLSPEC extern orte_pls_base_module_1_0_0_t
         orte_pls_slurm_module;
 
 #if defined(c_plusplus) || defined(__cplusplus)
diff --git a/orte/mca/pls/tm/pls_tm.h b/orte/mca/pls/tm/pls_tm.h
index 2063062595..b06532a675 100644
--- a/orte/mca/pls/tm/pls_tm.h
+++ b/orte/mca/pls/tm/pls_tm.h
@@ -41,7 +41,7 @@ extern "C" {
     typedef struct orte_pls_tm_component_t orte_pls_tm_component_t;
 
     /* Globally exported variables */
-    OMPI_COMP_EXPORT extern orte_pls_tm_component_t mca_pls_tm_component;
+    ORTE_DECLSPEC extern orte_pls_tm_component_t mca_pls_tm_component;
     extern orte_pls_base_module_1_0_0_t orte_pls_tm_module;
 
 
diff --git a/orte/mca/ras/base/base.h b/orte/mca/ras/base/base.h
index 58c8104ba4..f6fb2cca44 100644
--- a/orte/mca/ras/base/base.h
+++ b/orte/mca/ras/base/base.h
@@ -88,7 +88,7 @@ typedef struct orte_ras_base_t {
 ORTE_DECLSPEC extern orte_ras_base_t orte_ras_base;
 
 /** Class declaration */
-OMPI_DECLSPEC OBJ_CLASS_DECLARATION(orte_ras_base_cmp_t);
+ORTE_DECLSPEC OBJ_CLASS_DECLARATION(orte_ras_base_cmp_t);
 
 
 /** Local data type functions */
diff --git a/orte/mca/ras/bjs/ras_bjs.h b/orte/mca/ras/bjs/ras_bjs.h
index 646f61883d..6dc1d2bf2a 100644
--- a/orte/mca/ras/bjs/ras_bjs.h
+++ b/orte/mca/ras/bjs/ras_bjs.h
@@ -40,8 +40,8 @@ struct orte_ras_bjs_component_t {
 };
 typedef struct orte_ras_bjs_component_t orte_ras_bjs_component_t;
 
-OMPI_COMP_EXPORT extern orte_ras_bjs_component_t mca_ras_bjs_component;
-OMPI_COMP_EXPORT extern orte_ras_base_module_t orte_ras_bjs_module;
+ORTE_DECLSPEC extern orte_ras_bjs_component_t mca_ras_bjs_component;
+ORTE_DECLSPEC extern orte_ras_base_module_t orte_ras_bjs_module;
 
 
 #if defined(c_plusplus) || defined(__cplusplus)
diff --git a/orte/mca/ras/dash_host/ras_dash_host.h b/orte/mca/ras/dash_host/ras_dash_host.h
index 8bdcfdabf4..b458ec3b48 100644
--- a/orte/mca/ras/dash_host/ras_dash_host.h
+++ b/orte/mca/ras/dash_host/ras_dash_host.h
@@ -45,7 +45,7 @@ extern "C" {
     /**
      * Component export structure
      */
-    OMPI_COMP_EXPORT extern orte_ras_dash_host_component_t mca_ras_dash_host_component;
+    ORTE_DECLSPEC extern orte_ras_dash_host_component_t mca_ras_dash_host_component;
     
     /**
      * Module init function
diff --git a/orte/mca/ras/gridengine/ras_gridengine.h b/orte/mca/ras/gridengine/ras_gridengine.h
index ec863dfa41..372d19d16a 100644
--- a/orte/mca/ras/gridengine/ras_gridengine.h
+++ b/orte/mca/ras/gridengine/ras_gridengine.h
@@ -43,8 +43,8 @@ struct orte_ras_gridengine_component_t {
 };
 typedef struct orte_ras_gridengine_component_t orte_ras_gridengine_component_t;
 
-OMPI_COMP_EXPORT extern orte_ras_gridengine_component_t mca_ras_gridengine_component;
-OMPI_COMP_EXPORT extern orte_ras_base_module_t orte_ras_gridengine_module;
+ORTE_DECLSPEC extern orte_ras_gridengine_component_t mca_ras_gridengine_component;
+ORTE_DECLSPEC extern orte_ras_base_module_t orte_ras_gridengine_module;
 
 
 #if defined(c_plusplus) || defined(__cplusplus)
diff --git a/orte/mca/ras/hostfile/ras_hostfile.h b/orte/mca/ras/hostfile/ras_hostfile.h
index 5d4fd774ce..9a5e9438d9 100644
--- a/orte/mca/ras/hostfile/ras_hostfile.h
+++ b/orte/mca/ras/hostfile/ras_hostfile.h
@@ -45,7 +45,7 @@ extern "C" {
     /**
      * Component export structure
      */
-    OMPI_COMP_EXPORT extern orte_ras_hostfile_component_t mca_ras_hostfile_component;
+    ORTE_DECLSPEC extern orte_ras_hostfile_component_t mca_ras_hostfile_component;
     
     /**
      * Module init function
diff --git a/orte/mca/ras/localhost/ras_localhost.h b/orte/mca/ras/localhost/ras_localhost.h
index c474e06d46..0b3c138074 100644
--- a/orte/mca/ras/localhost/ras_localhost.h
+++ b/orte/mca/ras/localhost/ras_localhost.h
@@ -45,7 +45,7 @@ extern "C" {
     /**
      * Component export structure
      */
-    OMPI_COMP_EXPORT extern orte_ras_localhost_component_t mca_ras_localhost_component;
+    ORTE_DECLSPEC extern orte_ras_localhost_component_t mca_ras_localhost_component;
     
     /**
      * Module init function
diff --git a/orte/mca/ras/lsf_bproc/ras_lsf_bproc.h b/orte/mca/ras/lsf_bproc/ras_lsf_bproc.h
index f9219ff723..631098c911 100644
--- a/orte/mca/ras/lsf_bproc/ras_lsf_bproc.h
+++ b/orte/mca/ras/lsf_bproc/ras_lsf_bproc.h
@@ -39,8 +39,8 @@ struct orte_ras_lsf_bproc_component_t {
 };
 typedef struct orte_ras_lsf_bproc_component_t orte_ras_lsf_bproc_component_t;
 
-OMPI_COMP_EXPORT extern orte_ras_lsf_bproc_component_t mca_ras_lsf_bproc_component;
-OMPI_COMP_EXPORT extern orte_ras_base_module_t orte_ras_lsf_bproc_module;
+ORTE_DECLSPEC extern orte_ras_lsf_bproc_component_t mca_ras_lsf_bproc_component;
+ORTE_DECLSPEC extern orte_ras_base_module_t orte_ras_lsf_bproc_module;
 
 
 #if defined(c_plusplus) || defined(__cplusplus)
diff --git a/orte/mca/ras/poe/ras_poe.h b/orte/mca/ras/poe/ras_poe.h
index 14db215aa3..ceee9bac44 100644
--- a/orte/mca/ras/poe/ras_poe.h
+++ b/orte/mca/ras/poe/ras_poe.h
@@ -39,8 +39,8 @@ struct orte_ras_poe_component_t {
 };
 typedef struct orte_ras_poe_component_t orte_ras_poe_component_t;
 
-OMPI_COMP_EXPORT extern orte_ras_poe_component_t mca_ras_poe_component;
-OMPI_COMP_EXPORT extern orte_ras_base_module_t orte_ras_poe_module;
+ORTE_DECLSPEC extern orte_ras_poe_component_t mca_ras_poe_component;
+ORTE_DECLSPEC extern orte_ras_base_module_t orte_ras_poe_module;
 
 
 #if defined(c_plusplus) || defined(__cplusplus)
diff --git a/orte/mca/ras/ras.h b/orte/mca/ras/ras.h
index 49ef0e6f42..0c99c0d77e 100644
--- a/orte/mca/ras/ras.h
+++ b/orte/mca/ras/ras.h
@@ -258,7 +258,7 @@ typedef orte_ras_base_component_1_0_0_t orte_ras_base_component_t;
 /*
  * global module that holds function pointers
  */
-OMPI_DECLSPEC extern orte_ras_base_module_t orte_ras;
+ORTE_DECLSPEC extern orte_ras_base_module_t orte_ras;
 
 #if defined(c_plusplus) || defined(__cplusplus)
 }
diff --git a/orte/mca/ras/slurm/ras_slurm.h b/orte/mca/ras/slurm/ras_slurm.h
index 0bbd74714d..f8e3c8ffd2 100644
--- a/orte/mca/ras/slurm/ras_slurm.h
+++ b/orte/mca/ras/slurm/ras_slurm.h
@@ -30,8 +30,8 @@
 extern "C" {
 #endif
 
-    OMPI_COMP_EXPORT extern orte_ras_base_component_1_0_0_t mca_ras_slurm_component;
-    OMPI_COMP_EXPORT extern orte_ras_base_module_t orte_ras_slurm_module;
+    ORTE_DECLSPEC extern orte_ras_base_component_1_0_0_t mca_ras_slurm_component;
+    ORTE_DECLSPEC extern orte_ras_base_module_t orte_ras_slurm_module;
 
 #if defined(c_plusplus) || defined(__cplusplus)
 }
diff --git a/orte/mca/ras/tm/ras_tm.h b/orte/mca/ras/tm/ras_tm.h
index 6e607532a1..8c798d1d43 100644
--- a/orte/mca/ras/tm/ras_tm.h
+++ b/orte/mca/ras/tm/ras_tm.h
@@ -30,8 +30,8 @@
 extern "C" {
 #endif
 
-    OMPI_COMP_EXPORT extern orte_ras_base_component_1_0_0_t mca_ras_tm_component;
-    OMPI_COMP_EXPORT extern orte_ras_base_module_t orte_ras_tm_module;
+    ORTE_DECLSPEC extern orte_ras_base_component_1_0_0_t mca_ras_tm_component;
+    ORTE_DECLSPEC extern orte_ras_base_module_t orte_ras_tm_module;
 
 #if defined(c_plusplus) || defined(__cplusplus)
 }
diff --git a/orte/mca/ras/xgrid/src/ras_xgrid.h b/orte/mca/ras/xgrid/src/ras_xgrid.h
index 8240b913e7..3162560b49 100644
--- a/orte/mca/ras/xgrid/src/ras_xgrid.h
+++ b/orte/mca/ras/xgrid/src/ras_xgrid.h
@@ -30,8 +30,8 @@
 extern "C" {
 #endif
 
-    OMPI_COMP_EXPORT extern orte_ras_base_component_1_0_0_t mca_ras_xgrid_component;
-    OMPI_COMP_EXPORT extern orte_ras_base_module_t orte_ras_xgrid_module;
+    ORTE_DECLSPEC extern orte_ras_base_component_1_0_0_t mca_ras_xgrid_component;
+    ORTE_DECLSPEC extern orte_ras_base_module_t orte_ras_xgrid_module;
 
 #if defined(c_plusplus) || defined(__cplusplus)
 }
diff --git a/orte/mca/rds/base/base.h b/orte/mca/rds/base/base.h
index 068784b8d5..a79f5320f0 100644
--- a/orte/mca/rds/base/base.h
+++ b/orte/mca/rds/base/base.h
@@ -48,17 +48,17 @@ struct orte_rds_base_selected_t {
     orte_rds_base_module_t* module;
 };
 typedef struct orte_rds_base_selected_t orte_rds_base_selected_t;
-OMPI_DECLSPEC OBJ_CLASS_DECLARATION(orte_rds_base_selected_t);
+ORTE_DECLSPEC OBJ_CLASS_DECLARATION(orte_rds_base_selected_t);
 
 
 /*
  * API function definitions
  */
-OMPI_DECLSPEC int orte_rds_base_open(void);
-OMPI_DECLSPEC int orte_rds_base_select(void);
-OMPI_DECLSPEC int orte_rds_base_finalize(void);
-OMPI_DECLSPEC int orte_rds_base_close(void);
-OMPI_DECLSPEC int orte_rds_base_query(void);
+ORTE_DECLSPEC int orte_rds_base_open(void);
+ORTE_DECLSPEC int orte_rds_base_select(void);
+ORTE_DECLSPEC int orte_rds_base_finalize(void);
+ORTE_DECLSPEC int orte_rds_base_close(void);
+ORTE_DECLSPEC int orte_rds_base_query(void);
 
 /*
  * globals that might be needed
@@ -70,7 +70,7 @@ typedef struct orte_rds_base_t {
     opal_list_t rds_selected;
 } orte_rds_base_t;
 
-OMPI_DECLSPEC extern orte_rds_base_t orte_rds_base;
+ORTE_DECLSPEC extern orte_rds_base_t orte_rds_base;
 
 /*
  * external API functions will be documented in the mca/ns/ns.h file
diff --git a/orte/mca/rds/hostfile/rds_hostfile.h b/orte/mca/rds/hostfile/rds_hostfile.h
index 395a0bb816..f9d9278219 100644
--- a/orte/mca/rds/hostfile/rds_hostfile.h
+++ b/orte/mca/rds/hostfile/rds_hostfile.h
@@ -43,8 +43,8 @@ struct orte_rds_hostfile_component_t {
 };
 typedef struct orte_rds_hostfile_component_t orte_rds_hostfile_component_t;
 
-OMPI_COMP_EXPORT extern orte_rds_hostfile_component_t mca_rds_hostfile_component;
-OMPI_COMP_EXPORT extern orte_rds_base_module_t orte_rds_hostfile_module;
+ORTE_DECLSPEC extern orte_rds_hostfile_component_t mca_rds_hostfile_component;
+ORTE_DECLSPEC extern orte_rds_base_module_t orte_rds_hostfile_module;
 
 
 #if defined(c_plusplus) || defined(__cplusplus)
diff --git a/orte/mca/rds/rds.h b/orte/mca/rds/rds.h
index be183b88fc..4ae215689b 100644
--- a/orte/mca/rds/rds.h
+++ b/orte/mca/rds/rds.h
@@ -204,7 +204,7 @@ typedef orte_rds_base_component_1_0_0_t orte_rds_base_component_t;
 /*
  * global module that holds function pointers
  */
-OMPI_DECLSPEC extern orte_rds_base_module_t orte_rds;
+ORTE_DECLSPEC extern orte_rds_base_module_t orte_rds;
 
 #if defined(c_plusplus) || defined(__cplusplus)
 }
diff --git a/orte/mca/rds/resfile/rds_resfile.h b/orte/mca/rds/resfile/rds_resfile.h
index bec8d49aeb..6d610b147f 100644
--- a/orte/mca/rds/resfile/rds_resfile.h
+++ b/orte/mca/rds/resfile/rds_resfile.h
@@ -72,8 +72,8 @@ struct orte_rds_resfile_component_t {
 };
 typedef struct orte_rds_resfile_component_t orte_rds_resfile_component_t;
 
-OMPI_COMP_EXPORT extern orte_rds_resfile_component_t mca_rds_resfile_component;
-OMPI_COMP_EXPORT extern orte_rds_base_module_t orte_rds_resfile_module;
+ORTE_DECLSPEC extern orte_rds_resfile_component_t mca_rds_resfile_component;
+ORTE_DECLSPEC extern orte_rds_base_module_t orte_rds_resfile_module;
 
 extern bool orte_rds_resfile_queried;
 
diff --git a/orte/mca/rmaps/base/base.h b/orte/mca/rmaps/base/base.h
index 447104ccd5..48f8b466ce 100644
--- a/orte/mca/rmaps/base/base.h
+++ b/orte/mca/rmaps/base/base.h
@@ -60,7 +60,7 @@ extern "C" {
     /**
      * Global instance of rmaps-wide framework data
      */
-    OMPI_DECLSPEC extern orte_rmaps_base_t orte_rmaps_base;
+    ORTE_DECLSPEC extern orte_rmaps_base_t orte_rmaps_base;
 
     /**
      * RMAPS component/module/priority tuple
@@ -78,33 +78,33 @@ extern "C" {
     /** Convenience typedef */
     typedef struct orte_rmaps_base_cmp_t orte_rmaps_base_cmp_t;
     /** Class declaration */
-    OMPI_DECLSPEC OBJ_CLASS_DECLARATION(orte_rmaps_base_cmp_t);
+    ORTE_DECLSPEC OBJ_CLASS_DECLARATION(orte_rmaps_base_cmp_t);
 
 
     /**
      * Open the rmaps framework
      */
-    OMPI_DECLSPEC int orte_rmaps_base_open(void);
+    ORTE_DECLSPEC int orte_rmaps_base_open(void);
 
     /**
      * Select an rmaps component / module
      */
-    OMPI_DECLSPEC orte_rmaps_base_module_t *orte_rmaps_base_select(char *preferred);
+    ORTE_DECLSPEC orte_rmaps_base_module_t *orte_rmaps_base_select(char *preferred);
 
     /**
      * Utility routines to get/set vpid mapping for the job
      */ 
                                                                       
-    OMPI_DECLSPEC int orte_rmaps_base_get_vpid_range(orte_jobid_t jobid, 
+    ORTE_DECLSPEC int orte_rmaps_base_get_vpid_range(orte_jobid_t jobid, 
         orte_vpid_t *start, orte_vpid_t *range);
-    OMPI_DECLSPEC int orte_rmaps_base_set_vpid_range(orte_jobid_t jobid, 
+    ORTE_DECLSPEC int orte_rmaps_base_set_vpid_range(orte_jobid_t jobid, 
         orte_vpid_t start, orte_vpid_t range);
 
     /**
      * Close down the rmaps framework
      */
-    OMPI_DECLSPEC int orte_rmaps_base_finalize(void);
-    OMPI_DECLSPEC int orte_rmaps_base_close(void);
+    ORTE_DECLSPEC int orte_rmaps_base_finalize(void);
+    ORTE_DECLSPEC int orte_rmaps_base_close(void);
 
 #if defined(c_plusplus) || defined(__cplusplus)
 }
diff --git a/orte/mca/rmaps/round_robin/rmaps_rr.h b/orte/mca/rmaps/round_robin/rmaps_rr.h
index c66bae8062..65a40a6c2e 100644
--- a/orte/mca/rmaps/round_robin/rmaps_rr.h
+++ b/orte/mca/rmaps/round_robin/rmaps_rr.h
@@ -40,8 +40,8 @@ struct orte_rmaps_round_robin_component_t {
 };
 typedef struct orte_rmaps_round_robin_component_t orte_rmaps_round_robin_component_t;
 
-OMPI_COMP_EXPORT extern orte_rmaps_round_robin_component_t mca_rmaps_round_robin_component;
-OMPI_COMP_EXPORT extern orte_rmaps_base_module_t orte_rmaps_round_robin_module;
+ORTE_DECLSPEC extern orte_rmaps_round_robin_component_t mca_rmaps_round_robin_component;
+ORTE_DECLSPEC extern orte_rmaps_base_module_t orte_rmaps_round_robin_module;
 
 
 #if defined(c_plusplus) || defined(__cplusplus)
diff --git a/orte/mca/rmgr/base/base.h b/orte/mca/rmgr/base/base.h
index 1b8c5d9651..a3e5665852 100644
--- a/orte/mca/rmgr/base/base.h
+++ b/orte/mca/rmgr/base/base.h
@@ -49,25 +49,25 @@ extern "C" {
 /*
  * function definitions
  */
-OMPI_DECLSPEC int orte_rmgr_base_open(void);
-OMPI_DECLSPEC int orte_rmgr_base_select(void);
-OMPI_DECLSPEC int orte_rmgr_base_close(void);
+ORTE_DECLSPEC int orte_rmgr_base_open(void);
+ORTE_DECLSPEC int orte_rmgr_base_select(void);
+ORTE_DECLSPEC int orte_rmgr_base_close(void);
 
-OMPI_DECLSPEC int orte_rmgr_base_get_app_context(
+ORTE_DECLSPEC int orte_rmgr_base_get_app_context(
     orte_jobid_t jobid,
     orte_app_context_t*** app_context,
     orte_std_cntr_t* num_context);
 
-OMPI_DECLSPEC int orte_rmgr_base_put_app_context(
+ORTE_DECLSPEC int orte_rmgr_base_put_app_context(
     orte_jobid_t jobid,
     orte_app_context_t** app_context,
     orte_std_cntr_t num_context);
 
-OMPI_DECLSPEC int orte_rmgr_base_get_job_slots(
+ORTE_DECLSPEC int orte_rmgr_base_get_job_slots(
     orte_jobid_t jobid,
     orte_std_cntr_t* num_slots);
 
-OMPI_DECLSPEC int orte_rmgr_base_set_job_slots(
+ORTE_DECLSPEC int orte_rmgr_base_set_job_slots(
     orte_jobid_t jobid,
     orte_std_cntr_t num_slots);
 
@@ -76,38 +76,38 @@ OMPI_DECLSPEC int orte_rmgr_base_set_job_slots(
  *  Pack/unpack
  */
 
-OMPI_DECLSPEC int orte_rmgr_base_pack_cmd(
+ORTE_DECLSPEC int orte_rmgr_base_pack_cmd(
     orte_buffer_t* buffer,
     orte_rmgr_cmd_t cmd,
     orte_jobid_t jobid);
 
-OMPI_DECLSPEC int orte_rmgr_base_pack_create_cmd(
+ORTE_DECLSPEC int orte_rmgr_base_pack_create_cmd(
     orte_buffer_t* buffer,
     orte_app_context_t** context,
     orte_std_cntr_t num_context);
 
-OMPI_DECLSPEC int orte_rmgr_base_pack_terminate_proc_cmd(
+ORTE_DECLSPEC int orte_rmgr_base_pack_terminate_proc_cmd(
     orte_buffer_t* buffer,
     const orte_process_name_t* name);
 
-OMPI_DECLSPEC int orte_rmgr_base_pack_signal_job_cmd(
+ORTE_DECLSPEC int orte_rmgr_base_pack_signal_job_cmd(
     orte_buffer_t* buffer,
     orte_jobid_t job,
     int32_t signal);
 
-OMPI_DECLSPEC int orte_rmgr_base_pack_signal_proc_cmd(
+ORTE_DECLSPEC int orte_rmgr_base_pack_signal_proc_cmd(
     orte_buffer_t* buffer,
     const orte_process_name_t* name,
     int32_t signal);
 
-OMPI_DECLSPEC int orte_rmgr_base_unpack_rsp(
+ORTE_DECLSPEC int orte_rmgr_base_unpack_rsp(
     orte_buffer_t* buffer);
 
-OMPI_DECLSPEC int orte_rmgr_base_unpack_create_rsp(
+ORTE_DECLSPEC int orte_rmgr_base_unpack_create_rsp(
     orte_buffer_t* buffer,
     orte_jobid_t*);
 
-OMPI_DECLSPEC int orte_rmgr_base_cmd_dispatch(
+ORTE_DECLSPEC int orte_rmgr_base_cmd_dispatch(
     orte_buffer_t* req,
     orte_buffer_t* rsp);
 
@@ -202,7 +202,7 @@ typedef struct orte_rmgr_base_t {
     opal_list_t rmgr_components;
 } orte_rmgr_base_t;
 
-OMPI_DECLSPEC extern orte_rmgr_base_t orte_rmgr_base;
+ORTE_DECLSPEC extern orte_rmgr_base_t orte_rmgr_base;
 
 #if defined(c_plusplus) || defined(__cplusplus)
 }
diff --git a/orte/mca/rmgr/cnos/rmgr_cnos.h b/orte/mca/rmgr/cnos/rmgr_cnos.h
index b8349ac4a3..7062de37c7 100644
--- a/orte/mca/rmgr/cnos/rmgr_cnos.h
+++ b/orte/mca/rmgr/cnos/rmgr_cnos.h
@@ -28,9 +28,9 @@ extern "C" {
 #endif
 
 /** Global URM component */
-OMPI_COMP_EXPORT extern orte_rmgr_base_component_t mca_rmgr_cnos_component;
+ORTE_DECLSPEC extern orte_rmgr_base_component_t mca_rmgr_cnos_component;
 /** Global URM module */
-OMPI_COMP_EXPORT extern orte_rmgr_base_module_t orte_rmgr_cnos_module;
+ORTE_DECLSPEC extern orte_rmgr_base_module_t orte_rmgr_cnos_module;
 
 #if defined(c_plusplus) || defined(__cplusplus)
 }
diff --git a/orte/mca/rmgr/proxy/rmgr_proxy.h b/orte/mca/rmgr/proxy/rmgr_proxy.h
index a4442e9399..51c553d514 100644
--- a/orte/mca/rmgr/proxy/rmgr_proxy.h
+++ b/orte/mca/rmgr/proxy/rmgr_proxy.h
@@ -39,9 +39,9 @@ struct orte_rmgr_proxy_component_t {
 typedef struct orte_rmgr_proxy_component_t orte_rmgr_proxy_component_t;
 
 /** Global URM component */
-OMPI_COMP_EXPORT extern orte_rmgr_proxy_component_t mca_rmgr_proxy_component;
+ORTE_DECLSPEC extern orte_rmgr_proxy_component_t mca_rmgr_proxy_component;
 /** Global URM module */
-OMPI_COMP_EXPORT extern orte_rmgr_base_module_t orte_rmgr_proxy_module;
+ORTE_DECLSPEC extern orte_rmgr_base_module_t orte_rmgr_proxy_module;
 
 #if defined(c_plusplus) || defined(__cplusplus)
 }
diff --git a/orte/mca/rmgr/rmgr.h b/orte/mca/rmgr/rmgr.h
index c53a496417..623914c27f 100644
--- a/orte/mca/rmgr/rmgr.h
+++ b/orte/mca/rmgr/rmgr.h
@@ -250,6 +250,6 @@ typedef orte_rmgr_base_component_1_0_0_t orte_rmgr_base_component_t;
 /**
  * Global structure for accessing RAS functions
  */
-OMPI_DECLSPEC extern orte_rmgr_base_module_t orte_rmgr;  /* holds selected module's function pointers */
+ORTE_DECLSPEC extern orte_rmgr_base_module_t orte_rmgr;  /* holds selected module's function pointers */
 
 #endif
diff --git a/orte/mca/rmgr/rmgr_types.h b/orte/mca/rmgr/rmgr_types.h
index 7619a6df68..aca8326819 100644
--- a/orte/mca/rmgr/rmgr_types.h
+++ b/orte/mca/rmgr/rmgr_types.h
@@ -72,7 +72,7 @@ typedef struct {
     char *map_data;
 } orte_app_context_map_t;
 
-OMPI_DECLSPEC OBJ_CLASS_DECLARATION(orte_app_context_map_t);
+ORTE_DECLSPEC OBJ_CLASS_DECLARATION(orte_app_context_map_t);
 
 
 /**
@@ -105,7 +105,7 @@ typedef struct {
     char *prefix_dir;
 } orte_app_context_t;
 
-OMPI_DECLSPEC OBJ_CLASS_DECLARATION(orte_app_context_t);
+ORTE_DECLSPEC OBJ_CLASS_DECLARATION(orte_app_context_t);
 
 #if defined(c_plusplus) || defined(__cplusplus)
 }
diff --git a/orte/mca/rmgr/urm/rmgr_urm.h b/orte/mca/rmgr/urm/rmgr_urm.h
index faea06c80e..2015e54f52 100644
--- a/orte/mca/rmgr/urm/rmgr_urm.h
+++ b/orte/mca/rmgr/urm/rmgr_urm.h
@@ -49,9 +49,9 @@ struct orte_rmgr_urm_component_t {
 typedef struct orte_rmgr_urm_component_t orte_rmgr_urm_component_t;
 
 /** Global URM component */
-OMPI_COMP_EXPORT extern orte_rmgr_urm_component_t mca_rmgr_urm_component;
+ORTE_DECLSPEC extern orte_rmgr_urm_component_t mca_rmgr_urm_component;
 /** Global URM module */
-OMPI_COMP_EXPORT extern orte_rmgr_base_module_t orte_rmgr_urm_module;
+ORTE_DECLSPEC extern orte_rmgr_base_module_t orte_rmgr_urm_module;
 
 #if defined(c_plusplus) || defined(__cplusplus)
 }
diff --git a/orte/mca/rml/base/base.h b/orte/mca/rml/base/base.h
index b497595c79..95eb7b5424 100644
--- a/orte/mca/rml/base/base.h
+++ b/orte/mca/rml/base/base.h
@@ -31,9 +31,9 @@ extern "C" {
  * Global functions for the RML
  */
 
-OMPI_DECLSPEC int orte_rml_base_open(void);
-OMPI_DECLSPEC int orte_rml_base_select(void);
-OMPI_DECLSPEC int orte_rml_base_close(void);
+ORTE_DECLSPEC int orte_rml_base_open(void);
+ORTE_DECLSPEC int orte_rml_base_select(void);
+ORTE_DECLSPEC int orte_rml_base_close(void);
 
 /*
  * Global struct holding the base parameters.
@@ -45,10 +45,10 @@ struct orte_rml_base_t {
 };
 typedef struct orte_rml_base_t orte_rml_base_t;
 
-OMPI_DECLSPEC extern orte_rml_base_t orte_rml_base;
-OMPI_DECLSPEC extern orte_rml_module_t orte_rml;
-OMPI_DECLSPEC extern orte_process_name_t orte_rml_name_any;
-OMPI_DECLSPEC extern orte_process_name_t orte_rml_name_seed;
+ORTE_DECLSPEC extern orte_rml_base_t orte_rml_base;
+ORTE_DECLSPEC extern orte_rml_module_t orte_rml;
+ORTE_DECLSPEC extern orte_process_name_t orte_rml_name_any;
+ORTE_DECLSPEC extern orte_process_name_t orte_rml_name_seed;
 
 #if defined(c_plusplus) || defined(__cplusplus)
 }
diff --git a/orte/mca/rml/cnos/rml_cnos.h b/orte/mca/rml/cnos/rml_cnos.h
index 28567c7538..d616059959 100644
--- a/orte/mca/rml/cnos/rml_cnos.h
+++ b/orte/mca/rml/cnos/rml_cnos.h
@@ -29,7 +29,7 @@ extern "C"
 {
 #endif
 
-  OMPI_COMP_EXPORT extern orte_rml_component_t mca_rml_cnos_component;
+  ORTE_DECLSPEC extern orte_rml_component_t mca_rml_cnos_component;
 
   int orte_rml_cnos_open(void);
   int orte_rml_cnos_close(void);
diff --git a/orte/mca/rml/oob/rml_oob.h b/orte/mca/rml/oob/rml_oob.h
index aa71b702c5..c52fd7afc4 100644
--- a/orte/mca/rml/oob/rml_oob.h
+++ b/orte/mca/rml/oob/rml_oob.h
@@ -26,8 +26,8 @@
 extern "C" {
 #endif
 
-OMPI_COMP_EXPORT extern orte_rml_component_t mca_rml_oob_component;
-OMPI_COMP_EXPORT extern orte_rml_module_t orte_rml_oob_module;
+ORTE_DECLSPEC extern orte_rml_component_t mca_rml_oob_component;
+ORTE_DECLSPEC extern orte_rml_module_t orte_rml_oob_module;
 
 #if defined(c_plusplus) || defined(__cplusplus)
 }
diff --git a/orte/mca/rml/rml.h b/orte/mca/rml/rml.h
index b5bc94706b..dfca8306fb 100644
--- a/orte/mca/rml/rml.h
+++ b/orte/mca/rml/rml.h
@@ -45,8 +45,8 @@ extern "C" {
  * Well known addresses
  */
 
-OMPI_DECLSPEC extern orte_process_name_t orte_rml_name_any;
-OMPI_DECLSPEC extern orte_process_name_t orte_rml_name_seed;
+ORTE_DECLSPEC extern orte_process_name_t orte_rml_name_any;
+ORTE_DECLSPEC extern orte_process_name_t orte_rml_name_seed;
 
 
 /*
@@ -433,7 +433,7 @@ typedef struct orte_rml_component_1_0_0_t orte_rml_component_t;
  * This is the RML instance that all functions are called through.
  */
 
-OMPI_DECLSPEC extern orte_rml_module_t orte_rml;
+ORTE_DECLSPEC extern orte_rml_module_t orte_rml;
 
 #if defined(c_plusplus) || defined(__cplusplus)
 }
diff --git a/orte/mca/schema/base/base.h b/orte/mca/schema/base/base.h
index edfc5ba129..9ed6442539 100644
--- a/orte/mca/schema/base/base.h
+++ b/orte/mca/schema/base/base.h
@@ -51,9 +51,9 @@
 extern "C" {
 #endif
 
-    OMPI_DECLSPEC int orte_schema_base_open(void);
-    OMPI_DECLSPEC int orte_schema_base_select(void);
-    OMPI_DECLSPEC int orte_schema_base_close(void);
+    ORTE_DECLSPEC int orte_schema_base_open(void);
+    ORTE_DECLSPEC int orte_schema_base_select(void);
+    ORTE_DECLSPEC int orte_schema_base_close(void);
 
     /* general usage functions */
 int orte_schema_base_get_proc_tokens(char ***tokens, orte_std_cntr_t* num_tokens, orte_process_name_t *proc);
diff --git a/orte/mca/schema/base/schema_base_open.c b/orte/mca/schema/base/schema_base_open.c
index fc0a545e7d..3af947f8be 100644
--- a/orte/mca/schema/base/schema_base_open.c
+++ b/orte/mca/schema/base/schema_base_open.c
@@ -38,7 +38,7 @@
  * globals
  */
 
-OMPI_DECLSPEC orte_schema_base_module_t orte_schema = {
+orte_schema_base_module_t orte_schema = {
     orte_schema_base_get_proc_tokens,
     orte_schema_base_get_node_tokens,
     orte_schema_base_get_job_tokens,
diff --git a/orte/mca/schema/schema.h b/orte/mca/schema/schema.h
index 1fd9f8bb5b..c676e98cac 100644
--- a/orte/mca/schema/schema.h
+++ b/orte/mca/schema/schema.h
@@ -131,7 +131,7 @@ typedef mca_schema_base_component_1_0_0_t mca_schema_base_component_t;
   /* schema v1.0 */ \
   "schema", 1, 0, 0
 
-OMPI_DECLSPEC extern orte_schema_base_module_t orte_schema;
+ORTE_DECLSPEC extern orte_schema_base_module_t orte_schema;
 
 #if defined(c_plusplus) || defined(__cplusplus)
 }
diff --git a/orte/mca/sds/base/base.h b/orte/mca/sds/base/base.h
index 6872aaffb1..6695f76ba5 100644
--- a/orte/mca/sds/base/base.h
+++ b/orte/mca/sds/base/base.h
@@ -38,46 +38,46 @@ extern "C" {
     /**
      * Open the sds framework
      */
-    OMPI_DECLSPEC int orte_sds_base_open(void);
+    ORTE_DECLSPEC int orte_sds_base_open(void);
 
     /**
      * Select a sds module
      */
-    OMPI_DECLSPEC int orte_sds_base_select(void);
+    ORTE_DECLSPEC int orte_sds_base_select(void);
 
     /**
      * Setup universe contact information
      */
-    OMPI_DECLSPEC int orte_sds_base_contact_universe(void);
+    ORTE_DECLSPEC int orte_sds_base_contact_universe(void);
 
     /**
      * Setup self and peer naming
      */
-    OMPI_DECLSPEC int orte_sds_base_set_name(void);
+    ORTE_DECLSPEC int orte_sds_base_set_name(void);
 
     /**
      * Close the sds framework
      */
-    OMPI_DECLSPEC int orte_sds_base_close(void);
+    ORTE_DECLSPEC int orte_sds_base_close(void);
 
     /*
      * Internal helper functions used by components
      */
-    OMPI_DECLSPEC int orte_sds_base_basic_contact_universe(void);
-    OMPI_DECLSPEC int orte_sds_base_seed_set_name(void);
+    ORTE_DECLSPEC int orte_sds_base_basic_contact_universe(void);
+    ORTE_DECLSPEC int orte_sds_base_seed_set_name(void);
 
     /*
      * Put functions
      */
-    OMPI_DECLSPEC int orte_ns_nds_env_put(const orte_process_name_t* proc, 
+    ORTE_DECLSPEC int orte_ns_nds_env_put(const orte_process_name_t* proc, 
                                           orte_vpid_t vpid_start,
                                           size_t num_procs,
                                           char ***environ);
-    OMPI_DECLSPEC int orte_ns_nds_pipe_put(const orte_process_name_t* proc, 
+    ORTE_DECLSPEC int orte_ns_nds_pipe_put(const orte_process_name_t* proc, 
                                            orte_vpid_t vpid_start, 
                                            size_t num_procs, 
                                            int fd);
-    OMPI_DECLSPEC int orte_ns_nds_bproc_put(orte_cellid_t cell, 
+    ORTE_DECLSPEC int orte_ns_nds_bproc_put(orte_cellid_t cell, 
                                             orte_jobid_t job,
                                             orte_vpid_t vpid_start, 
                                             orte_vpid_t global_vpid_start,
diff --git a/orte/mca/smr/base/base.h b/orte/mca/smr/base/base.h
index b6758e702e..f811dfe9e2 100644
--- a/orte/mca/smr/base/base.h
+++ b/orte/mca/smr/base/base.h
@@ -42,16 +42,16 @@
 extern "C" {
 #endif
 
-OMPI_DECLSPEC    int orte_smr_base_open(void);
-OMPI_DECLSPEC    int orte_smr_base_select(void);
-OMPI_DECLSPEC    int orte_smr_base_close(void);
+ORTE_DECLSPEC    int orte_smr_base_open(void);
+ORTE_DECLSPEC    int orte_smr_base_select(void);
+ORTE_DECLSPEC    int orte_smr_base_close(void);
 
 typedef struct orte_smr_base_t {
     int smr_output;
     opal_list_t smr_components;
 } orte_smr_base_t;
 
-OMPI_DECLSPEC extern orte_smr_base_t orte_smr_base;
+ORTE_DECLSPEC extern orte_smr_base_t orte_smr_base;
 
 
 /*
diff --git a/orte/mca/smr/base/smr_private.h b/orte/mca/smr/base/smr_private.h
index c9a315d8a3..5a68e9663b 100644
--- a/orte/mca/smr/base/smr_private.h
+++ b/orte/mca/smr/base/smr_private.h
@@ -149,8 +149,8 @@ void orte_smr_base_std_release(orte_data_value_t *value);
  * globals that might be needed within the framework
  */
 
-OMPI_DECLSPEC extern int orte_smr_base_output;
-OMPI_DECLSPEC extern bool orte_smr_base_selected;
+ORTE_DECLSPEC extern int orte_smr_base_output;
+ORTE_DECLSPEC extern bool orte_smr_base_selected;
 
 
 /*
diff --git a/orte/mca/smr/bproc/smr_bproc.h b/orte/mca/smr/bproc/smr_bproc.h
index 1ea3890464..8bd095c491 100644
--- a/orte/mca/smr/bproc/smr_bproc.h
+++ b/orte/mca/smr/bproc/smr_bproc.h
@@ -56,8 +56,8 @@ struct orte_smr_bproc_component_t {
 };
 typedef struct orte_smr_bproc_component_t orte_smr_bproc_component_t;
 
-OMPI_COMP_EXPORT extern orte_smr_base_module_t orte_smr_bproc_module;
-OMPI_COMP_EXPORT extern orte_smr_bproc_component_t mca_smr_bproc_component;
+ORTE_DECLSPEC extern orte_smr_base_module_t orte_smr_bproc_module;
+ORTE_DECLSPEC extern orte_smr_bproc_component_t mca_smr_bproc_component;
 
 #if defined(c_plusplus) || defined(__cplusplus)
 }
diff --git a/orte/mca/smr/smr.h b/orte/mca/smr/smr.h
index 6e4873f249..6ad298a35a 100644
--- a/orte/mca/smr/smr.h
+++ b/orte/mca/smr/smr.h
@@ -150,6 +150,6 @@ typedef orte_smr_base_component_1_3_0_t orte_smr_base_component_t;
   /* smr v1.3 */ \
   "smr", 1, 3, 0
 
-OMPI_DECLSPEC extern orte_smr_base_module_t orte_smr;  /* holds selected module's function pointers */
+ORTE_DECLSPEC extern orte_smr_base_module_t orte_smr;  /* holds selected module's function pointers */
 
 #endif /* ORTE_SMR_H */
diff --git a/orte/runtime/runtime.h b/orte/runtime/runtime.h
index 6ba0963bb2..7173980e70 100644
--- a/orte/runtime/runtime.h
+++ b/orte/runtime/runtime.h
@@ -71,7 +71,7 @@ extern "C" {
 
     /* globals used by RTE - instanced in orte_init.c */
 
-    OMPI_DECLSPEC extern int orte_debug_flag;
+    ORTE_DECLSPEC extern int orte_debug_flag;
 
     /**
      * Abort the current application with a pretty-print error message
@@ -80,7 +80,7 @@ extern "C" {
      * printing an error message if possible.  Error message should be
      * specified using the standard \code printf() format.
      */
-OMPI_DECLSPEC    int orte_abort(int status, char *fmt, ...);
+ORTE_DECLSPEC    int orte_abort(int status, char *fmt, ...);
 
 
     /**
@@ -95,10 +95,10 @@ OMPI_DECLSPEC    int orte_abort(int status, char *fmt, ...);
      * @param infrastructure Whether we are ORTE infrastructure or an ORTE 
      * application
      */
-OMPI_DECLSPEC    int orte_init(bool infrastructure);
-OMPI_DECLSPEC    int orte_system_init(bool infrastructure);
-OMPI_DECLSPEC    int orte_init_stage1(bool infrastructure);
-OMPI_DECLSPEC    int orte_init_stage2(void);
+ORTE_DECLSPEC    int orte_init(bool infrastructure);
+ORTE_DECLSPEC    int orte_system_init(bool infrastructure);
+ORTE_DECLSPEC    int orte_init_stage1(bool infrastructure);
+ORTE_DECLSPEC    int orte_init_stage2(void);
 
     /**
      * Initialize parameters for ORTE.
@@ -106,34 +106,34 @@ OMPI_DECLSPEC    int orte_init_stage2(void);
      * @retval ORTE_SUCCESS Upon success.
      * @retval ORTE_ERROR Upon failure.
      */
-OMPI_DECLSPEC    int orte_register_params(bool infrastructure);
+ORTE_DECLSPEC    int orte_register_params(bool infrastructure);
 
     /**
      * Re-init the Open run time environment.
      *
      * Restart selected components with a new process name.
      */
-OMPI_DECLSPEC    int orte_restart(orte_process_name_t* name, const char* uri);
+ORTE_DECLSPEC    int orte_restart(orte_process_name_t* name, const char* uri);
 
     /**
      * Finalize the Open run time environment. Any function calling \code
      * orte_init should call \code orte_finalize. 
      *
      */
-OMPI_DECLSPEC    int orte_finalize(void);
-OMPI_DECLSPEC    int orte_system_finalize(void);
+ORTE_DECLSPEC    int orte_finalize(void);
+ORTE_DECLSPEC    int orte_system_finalize(void);
 
     /*
      * Change state as processes complete registration/unregistration
      */
 
-OMPI_DECLSPEC    void orte_all_procs_registered(orte_gpr_notify_message_t* match, void* cbdata);
+ORTE_DECLSPEC    void orte_all_procs_registered(orte_gpr_notify_message_t* match, void* cbdata);
 
-OMPI_DECLSPEC    void orte_all_procs_unregistered(orte_gpr_notify_message_t* match, void* cbdata);
+ORTE_DECLSPEC    void orte_all_procs_unregistered(orte_gpr_notify_message_t* match, void* cbdata);
 
-OMPI_DECLSPEC	 int orte_monitor_procs_registered(void);
+ORTE_DECLSPEC	 int orte_monitor_procs_registered(void);
 
-OMPI_DECLSPEC    int orte_monitor_procs_unregistered(void);
+ORTE_DECLSPEC    int orte_monitor_procs_unregistered(void);
 
     /**
      * Obtain a listing of all the universes on the machine
@@ -144,7 +144,7 @@ OMPI_DECLSPEC    int orte_monitor_procs_unregistered(void);
      * @retval ORTE_SUCCESS Upon successful search.
      * @retval ORTE_ERROR Upon unsuccessful search.
      */
-    OMPI_DECLSPEC int orte_universe_search(opal_list_t *universe_list);
+    ORTE_DECLSPEC int orte_universe_search(opal_list_t *universe_list);
 
     /**
      * Check for universe existence
@@ -166,17 +166,17 @@ OMPI_DECLSPEC    int orte_monitor_procs_unregistered(void);
      * @retval OMPI_CONNECTION_REFUSED Universe found and contact made, but
      * universe refused to allow connection.
      */
-OMPI_DECLSPEC    int orte_universe_exists(orte_universe_t *univ);
+ORTE_DECLSPEC    int orte_universe_exists(orte_universe_t *univ);
 
     /**
      * Setup I/O forwarding.
      */
-OMPI_DECLSPEC   int ompi_rte_init_io(void);
+ORTE_DECLSPEC   int ompi_rte_init_io(void);
 
     /**
      * Establish a Head Node Process on a cluster's front end
      */
-OMPI_DECLSPEC   int orte_setup_hnp(char *target_cluster, char *headnode, char *username);
+ORTE_DECLSPEC   int orte_setup_hnp(char *target_cluster, char *headnode, char *username);
 
 #if defined(c_plusplus) || defined(__cplusplus)
 }
diff --git a/orte/util/proc_info.c b/orte/util/proc_info.c
index 9544376fc1..ed7a8043a2 100644
--- a/orte/util/proc_info.c
+++ b/orte/util/proc_info.c
@@ -33,7 +33,7 @@
 
 #include "orte/util/proc_info.h"
 
-OMPI_DECLSPEC orte_proc_info_t orte_process_info = {
+ORTE_DECLSPEC orte_proc_info_t orte_process_info = {
     /*  .my_name =              */   NULL,
     /*  .singleton =            */   false,
     /*  .vpid_start =           */   0,
diff --git a/orte/util/proc_info.h b/orte/util/proc_info.h
index b5a288c34e..6e589d90f1 100644
--- a/orte/util/proc_info.h
+++ b/orte/util/proc_info.h
@@ -90,7 +90,7 @@ typedef struct orte_proc_info_t orte_proc_info_t;
  * which will be initialized to \c false, but should be set to \c true
  * before calling \c orte_rte_info() if the caller is a seed daemon.
  */
-OMPI_DECLSPEC extern orte_proc_info_t orte_process_info;
+ORTE_DECLSPEC extern orte_proc_info_t orte_process_info;
 
 
 /**
@@ -107,9 +107,9 @@ OMPI_DECLSPEC extern orte_proc_info_t orte_process_info;
  * @retval OMPI_ERROR Failed to initialize one or more fields.
  */
 
-OMPI_DECLSPEC int orte_proc_info(void);
+ORTE_DECLSPEC int orte_proc_info(void);
 
-OMPI_DECLSPEC int orte_proc_info_finalize(void);
+ORTE_DECLSPEC int orte_proc_info_finalize(void);
 #if defined(c_plusplus) || defined(__cplusplus)
 }
 #endif
diff --git a/orte/util/session_dir.h b/orte/util/session_dir.h
index 5714a4327b..15fa64a464 100644
--- a/orte/util/session_dir.h
+++ b/orte/util/session_dir.h
@@ -126,14 +126,14 @@
  * @retval OMPI_ERROR The directory cannot be found (if create is
  *                "false") or created (if create is "true").
  */
-OMPI_DECLSPEC int orte_session_dir(bool create, char *prefix, char *user, char *hostid, 
+ORTE_DECLSPEC int orte_session_dir(bool create, char *prefix, char *user, char *hostid, 
                      char *batchid, char *universe, char *job, char *vpid);
 
 /*
  * Construct the session directory name from the input parameters.
  * This function does no checking that the directory exists, or can be used
  */
-OMPI_DECLSPEC int orte_session_dir_get_name(char **fulldirpath,
+ORTE_DECLSPEC int orte_session_dir_get_name(char **fulldirpath,
                                             char **prfx,
                                             char **frontend,
                                             char *usr, char *hostid,
@@ -155,7 +155,7 @@ OMPI_DECLSPEC int orte_session_dir_get_name(char **fulldirpath,
  * @retval OMPI_ERROR If something prevents the tree from being
  *                properly cleaned up.
  */
-OMPI_DECLSPEC int orte_session_dir_finalize(orte_process_name_t *proc);
+ORTE_DECLSPEC int orte_session_dir_finalize(orte_process_name_t *proc);
 
 /** The orte_session_dir_cleanup() function performs a cleanup of the
  * session directory tree when a job is aborted. It cleans up all
@@ -166,4 +166,4 @@ OMPI_DECLSPEC int orte_session_dir_finalize(orte_process_name_t *proc);
  * @retval OMPI_ERROR If something prevents the tree from being
  *                properly cleaned up.
  */
-OMPI_DECLSPEC int orte_session_dir_cleanup(orte_jobid_t jobid);
+ORTE_DECLSPEC int orte_session_dir_cleanup(orte_jobid_t jobid);
diff --git a/orte/util/sys_info.h b/orte/util/sys_info.h
index 89214a0a5a..4b2c612204 100644
--- a/orte/util/sys_info.h
+++ b/orte/util/sys_info.h
@@ -72,7 +72,7 @@ struct orte_sys_info_t {
 };
 typedef struct orte_sys_info_t orte_sys_info_t;
 
-OMPI_DECLSPEC extern orte_sys_info_t orte_system_info;
+ORTE_DECLSPEC extern orte_sys_info_t orte_system_info;
 
 
 /**
@@ -88,7 +88,7 @@ OMPI_DECLSPEC extern orte_sys_info_t orte_system_info;
  * @retval ORTE_SUCCESS If values are successfully determined.
  * @retval ORTE_ERROR If the system does not provide the requested information.
  */
-OMPI_DECLSPEC int orte_sys_info(void);
+ORTE_DECLSPEC int orte_sys_info(void);
 
 /*
  * \internal
@@ -100,7 +100,7 @@ OMPI_DECLSPEC int orte_sys_info(void);
  * @retval ORTE_SUCCESS If all values successfully released
  * @retval ORTE_ERROR If any problems occur
  */
-OMPI_DECLSPEC int orte_sys_info_finalize(void);
+ORTE_DECLSPEC int orte_sys_info_finalize(void);
 
 #if defined(c_plusplus) || defined(__cplusplus)
 }
diff --git a/orte/util/univ_info.h b/orte/util/univ_info.h
index 9c74054db7..f60d4a4c37 100644
--- a/orte/util/univ_info.h
+++ b/orte/util/univ_info.h
@@ -72,9 +72,9 @@ extern "C" {
     };
     typedef struct orte_universe_t orte_universe_t;
 
-    OMPI_DECLSPEC OBJ_CLASS_DECLARATION(orte_universe_t);
+    ORTE_DECLSPEC OBJ_CLASS_DECLARATION(orte_universe_t);
 
-OMPI_DECLSPEC extern orte_universe_t orte_universe_info;
+ORTE_DECLSPEC extern orte_universe_t orte_universe_info;
 
 
 /**
@@ -87,9 +87,9 @@ OMPI_DECLSPEC extern orte_universe_t orte_universe_info;
  * @retval ORTE_SUCCESS If values are successfully determined.
  * @retval ORTE_ERROR If the system does not provide the requested information.
  */
-OMPI_DECLSPEC int orte_univ_info(void);
+ORTE_DECLSPEC int orte_univ_info(void);
 
-OMPI_DECLSPEC int orte_univ_info_finalize(void);
+ORTE_DECLSPEC int orte_univ_info_finalize(void);
 
 #if defined(c_plusplus) || defined(__cplusplus)
 }
diff --git a/orte/util/universe_setup_file_io.h b/orte/util/universe_setup_file_io.h
index ff9d02f845..40f61817e3 100644
--- a/orte/util/universe_setup_file_io.h
+++ b/orte/util/universe_setup_file_io.h
@@ -26,8 +26,8 @@
 #include "orte_config.h"
 #include "orte/util/univ_info.h"
 
-OMPI_DECLSPEC int orte_write_universe_setup_file(char *filename, orte_universe_t *info);
+ORTE_DECLSPEC int orte_write_universe_setup_file(char *filename, orte_universe_t *info);
 
-OMPI_DECLSPEC int orte_read_universe_setup_file(char *filename, orte_universe_t *info);
+ORTE_DECLSPEC int orte_read_universe_setup_file(char *filename, orte_universe_t *info);
 
 #endif