diff --git a/ompi/mca/btl/gm/btl_gm.h b/ompi/mca/btl/gm/btl_gm.h
index d3353edfcc..acbd1f0021 100644
--- a/ompi/mca/btl/gm/btl_gm.h
+++ b/ompi/mca/btl/gm/btl_gm.h
@@ -75,9 +75,7 @@ struct mca_btl_gm_component_t {
 }; 
 typedef struct mca_btl_gm_component_t mca_btl_gm_component_t;
 
-extern mca_btl_gm_component_t mca_btl_gm_component;
-
-
+OMPI_MODULE_DECLSPEC extern mca_btl_gm_component_t mca_btl_gm_component;
 
 /**
  * BTL Module Interface
diff --git a/ompi/mca/btl/mvapi/btl_mvapi.h b/ompi/mca/btl/mvapi/btl_mvapi.h
index 5bec9c84ac..40ce6daae0 100644
--- a/ompi/mca/btl/mvapi/btl_mvapi.h
+++ b/ompi/mca/btl/mvapi/btl_mvapi.h
@@ -129,7 +129,7 @@ struct mca_btl_mvapi_component_t {
     uint32_t max_eager_rdma;
 }; typedef struct mca_btl_mvapi_component_t mca_btl_mvapi_component_t;
 
-extern mca_btl_mvapi_component_t mca_btl_mvapi_component;
+OMPI_MODULE_DECLSPEC extern mca_btl_mvapi_component_t mca_btl_mvapi_component;
 
 typedef mca_btl_base_recv_reg_t mca_btl_mvapi_recv_reg_t; 
     
diff --git a/ompi/mca/btl/mx/btl_mx.h b/ompi/mca/btl/mx/btl_mx.h
index 9bdbac211c..0f455c718e 100644
--- a/ompi/mca/btl/mx/btl_mx.h
+++ b/ompi/mca/btl/mx/btl_mx.h
@@ -91,7 +91,7 @@ struct mca_btl_mx_component_t {
 }; 
 typedef struct mca_btl_mx_component_t mca_btl_mx_component_t;
 
-extern mca_btl_mx_component_t mca_btl_mx_component;
+OMPI_MODULE_DECLSPEC extern mca_btl_mx_component_t mca_btl_mx_component;
 
 /**
  * BTL Module Interface
diff --git a/ompi/mca/btl/openib/btl_openib.h b/ompi/mca/btl/openib/btl_openib.h
index 7759d665d6..c46896cfcc 100644
--- a/ompi/mca/btl/openib/btl_openib.h
+++ b/ompi/mca/btl/openib/btl_openib.h
@@ -135,7 +135,7 @@ struct mca_btl_openib_component_t {
     bool warn_no_hca_params_found;
 }; typedef struct mca_btl_openib_component_t mca_btl_openib_component_t;
 
-extern mca_btl_openib_component_t mca_btl_openib_component;
+OMPI_MODULE_DECLSPEC extern mca_btl_openib_component_t mca_btl_openib_component;
 
 typedef mca_btl_base_recv_reg_t mca_btl_openib_recv_reg_t; 
     
diff --git a/ompi/mca/btl/portals/btl_portals.h b/ompi/mca/btl/portals/btl_portals.h
index 766481b1d9..c8216f90ff 100644
--- a/ompi/mca/btl/portals/btl_portals.h
+++ b/ompi/mca/btl/portals/btl_portals.h
@@ -211,7 +211,7 @@ int mca_btl_portals_get(struct mca_btl_base_module_t* btl_base,
 /*
  * global structures
  */
-extern mca_btl_portals_component_t mca_btl_portals_component;
+OMPI_MODULE_DECLSPEC extern mca_btl_portals_component_t mca_btl_portals_component;
 extern mca_btl_portals_module_t mca_btl_portals_module;
 
 #endif
diff --git a/ompi/mca/btl/self/btl_self.h b/ompi/mca/btl/self/btl_self.h
index 3ee026fdfe..97795e8b0b 100644
--- a/ompi/mca/btl/self/btl_self.h
+++ b/ompi/mca/btl/self/btl_self.h
@@ -54,7 +54,7 @@ struct mca_btl_self_component_t {
     mca_btl_base_recv_reg_t self_reg[256];
 };
 typedef struct mca_btl_self_component_t mca_btl_self_component_t;
-OMPI_DECLSPEC extern mca_btl_self_component_t mca_btl_self_component;
+OMPI_MODULE_DECLSPEC extern mca_btl_self_component_t mca_btl_self_component;
 
 /**
  * Register shared memory module parameters with the MCA framework
diff --git a/ompi/mca/btl/sm/btl_sm.h b/ompi/mca/btl/sm/btl_sm.h
index c287db096d..0b74d65ca3 100644
--- a/ompi/mca/btl/sm/btl_sm.h
+++ b/ompi/mca/btl/sm/btl_sm.h
@@ -142,7 +142,7 @@ struct mca_btl_sm_component_t {
 #endif
 };
 typedef struct mca_btl_sm_component_t mca_btl_sm_component_t;
-OMPI_DECLSPEC extern mca_btl_sm_component_t mca_btl_sm_component;
+OMPI_MODULE_DECLSPEC extern mca_btl_sm_component_t mca_btl_sm_component;
 
 /**
  * Register shared memory module parameters with the MCA framework
diff --git a/ompi/mca/btl/tcp/btl_tcp.h b/ompi/mca/btl/tcp/btl_tcp.h
index cba9100021..b3cfb1ad31 100644
--- a/ompi/mca/btl/tcp/btl_tcp.h
+++ b/ompi/mca/btl/tcp/btl_tcp.h
@@ -83,7 +83,7 @@ struct mca_btl_tcp_component_t {
 }; 
 typedef struct mca_btl_tcp_component_t mca_btl_tcp_component_t;
 
-OMPI_DECLSPEC extern mca_btl_tcp_component_t mca_btl_tcp_component;
+OMPI_MODULE_DECLSPEC extern mca_btl_tcp_component_t mca_btl_tcp_component;
 
 /**
  * BTL Module Interface
diff --git a/ompi/mca/btl/template/btl_template.h b/ompi/mca/btl/template/btl_template.h
index 592f43c7eb..91abf11e60 100644
--- a/ompi/mca/btl/template/btl_template.h
+++ b/ompi/mca/btl/template/btl_template.h
@@ -79,9 +79,7 @@ struct mca_btl_template_component_t {
 }; 
 typedef struct mca_btl_template_component_t mca_btl_template_component_t;
 
-extern mca_btl_template_component_t mca_btl_template_component;
-
-
+OMPI_MODULE_DECLSPEC extern mca_btl_template_component_t mca_btl_template_component;
 
 /**
  * BTL Module Interface
diff --git a/ompi/mca/btl/ud/btl_ud.h b/ompi/mca/btl/ud/btl_ud.h
index 2bf2f15f7b..8cf151a1de 100644
--- a/ompi/mca/btl/ud/btl_ud.h
+++ b/ompi/mca/btl/ud/btl_ud.h
@@ -108,7 +108,7 @@ struct mca_btl_ud_component_t {
 
 }; typedef struct mca_btl_ud_component_t mca_btl_ud_component_t;
 
-extern mca_btl_ud_component_t mca_btl_ud_component;
+OMPI_MODULE_DECLSPEC extern mca_btl_ud_component_t mca_btl_ud_component;
 
 typedef mca_btl_base_recv_reg_t mca_btl_ud_recv_reg_t;
 
diff --git a/ompi/mca/btl/udapl/btl_udapl.h b/ompi/mca/btl/udapl/btl_udapl.h
index 759f2184ea..38bae0d15a 100644
--- a/ompi/mca/btl/udapl/btl_udapl.h
+++ b/ompi/mca/btl/udapl/btl_udapl.h
@@ -74,7 +74,7 @@ struct mca_btl_udapl_component_t {
 }; 
 typedef struct mca_btl_udapl_component_t mca_btl_udapl_component_t;
 
-extern mca_btl_udapl_component_t mca_btl_udapl_component;
+OMPI_MODULE_DECLSPEC extern mca_btl_udapl_component_t mca_btl_udapl_component;