diff --git a/ompi/mca/mtl/mx/mtl_mx.c b/ompi/mca/mtl/mx/mtl_mx.c
index 71db59efb9..f259e321f1 100644
--- a/ompi/mca/mtl/mx/mtl_mx.c
+++ b/ompi/mca/mtl/mx/mtl_mx.c
@@ -2,7 +2,7 @@
  * Copyright (c) 2004-2006 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-2007 The University of Tennessee and The University
  *                         of Tennessee Research Foundation.  All rights
  *                         reserved.
  * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
@@ -31,6 +31,17 @@
 #include "mtl_mx_endpoint.h"
 #include "mtl_mx_request.h"
 
+static int
+ompi_mtl_mx_add_procs(struct mca_mtl_base_module_t *mtl,
+                      size_t nprocs,
+                      struct ompi_proc_t** procs, 
+                      struct mca_mtl_base_endpoint_t **mtl_peer_data);
+static int
+ompi_mtl_mx_del_procs(struct mca_mtl_base_module_t *mtl,
+                      size_t nprocs,
+                      struct ompi_proc_t** procs, 
+                      struct mca_mtl_base_endpoint_t **mtl_peer_data);
+
 mca_mtl_mx_module_t ompi_mtl_mx = {
     {
         8191,        /* max cid - 2^13 - 1 */
diff --git a/ompi/mca/mtl/mx/mtl_mx.h b/ompi/mca/mtl/mx/mtl_mx.h
index 93341d1288..affbcc283a 100644
--- a/ompi/mca/mtl/mx/mtl_mx.h
+++ b/ompi/mca/mtl/mx/mtl_mx.h
@@ -2,7 +2,7 @@
  * Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana
  *                         University Research and Technology
  *                         Corporation.  All rights reserved.
- * Copyright (c) 2004-2006 The University of Tennessee and The University
+ * Copyright (c) 2004-2007 The University of Tennessee and The University
  *                         of Tennessee Research Foundation.  All rights
  *                         reserved.
  * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
@@ -32,18 +32,6 @@
 extern "C" {
 #endif
 
-
-/* MTL interface functions */
-extern int ompi_mtl_mx_add_procs(struct mca_mtl_base_module_t* mtl, 
-                          size_t nprocs,
-                          struct ompi_proc_t** procs, 
-                          struct mca_mtl_base_endpoint_t **mtl_peer_data);
-    
-extern int ompi_mtl_mx_del_procs(struct mca_mtl_base_module_t* mtl, 
-                                 size_t nprocs,
-                                 struct ompi_proc_t** procs, 
-                                 struct mca_mtl_base_endpoint_t **mtl_peer_data);
-
 int
 ompi_mtl_mx_send(struct mca_mtl_base_module_t* mtl, 
                  struct ompi_communicator_t* comm,
diff --git a/ompi/mca/mtl/mx/mtl_mx_types.h b/ompi/mca/mtl/mx/mtl_mx_types.h
index d488f4f8c0..f61e5557e4 100644
--- a/ompi/mca/mtl/mx/mtl_mx_types.h
+++ b/ompi/mca/mtl/mx/mtl_mx_types.h
@@ -2,7 +2,7 @@
  * Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana
  *                         University Research and Technology
  *                         Corporation.  All rights reserved.
- * Copyright (c) 2004-2006 The University of Tennessee and The University
+ * Copyright (c) 2004-2007 The University of Tennessee and The University
  *                         of Tennessee Research Foundation.  All rights
  *                         reserved.
  * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
@@ -58,7 +58,7 @@ struct mca_mtl_mx_component_t{
 };
 typedef struct mca_mtl_mx_component_t mca_mtl_mx_component_t;
 
-extern mca_mtl_mx_component_t mca_mtl_mx_component;
+OMPI_DECLSPEC mca_mtl_mx_component_t mca_mtl_mx_component;
     
 
 /* match/ignore bit manipulation
diff --git a/ompi/mca/mtl/portals/mtl_portals.h b/ompi/mca/mtl/portals/mtl_portals.h
index fa2c2bb7f4..4a09e38551 100644
--- a/ompi/mca/mtl/portals/mtl_portals.h
+++ b/ompi/mca/mtl/portals/mtl_portals.h
@@ -2,7 +2,7 @@
  * Copyright (c) 2004-2006 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-2007 The University of Tennessee and The University
  *                         of Tennessee Research Foundation.  All rights
  *                         reserved.
  * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
@@ -63,6 +63,8 @@ typedef struct mca_mtl_portals_module_t mca_mtl_portals_module_t;
 
 extern mca_mtl_portals_module_t ompi_mtl_portals;
 
+OMPI_DECLSPEC mca_mtl_base_component_1_0_0_t mca_mtl_portals_component;
+
 
 struct ompi_mtl_portals_event_t {
     struct ompi_free_list_item_t super;
diff --git a/ompi/mca/mtl/psm/mtl_psm_types.h b/ompi/mca/mtl/psm/mtl_psm_types.h
index 35e7eb37f3..6319c3c232 100644
--- a/ompi/mca/mtl/psm/mtl_psm_types.h
+++ b/ompi/mca/mtl/psm/mtl_psm_types.h
@@ -2,7 +2,7 @@
  * Copyright (c) 2004-2006 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-2007 The University of Tennessee and The University
  *                         of Tennessee Research Foundation.  All rights
  *                         reserved.
  * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
@@ -63,7 +63,7 @@ struct mca_mtl_psm_component_t {
 };
 typedef struct mca_mtl_psm_component_t mca_mtl_psm_component_t;
 
-extern mca_mtl_psm_component_t mca_mtl_psm_component;
+OMPI_DECLSPEC mca_mtl_psm_component_t mca_mtl_psm_component;
     
 #define PSM_MAKE_MQTAG(ctxt,rank,utag)		    \
         ( (((ctxt)&0xffffULL)<<48)| (((rank)&0xffffULL)<<32)| \