diff --git a/ompi/CMakeLists.txt b/ompi/CMakeLists.txt
index 0de4342b77..a0f6ac323e 100644
--- a/ompi/CMakeLists.txt
+++ b/ompi/CMakeLists.txt
@@ -126,7 +126,7 @@ SET_TARGET_PROPERTIES(libmpi PROPERTIES COMPILE_FLAGS
 IF (BUILD_SHARED_LIBS)
   SET_TARGET_PROPERTIES(libmpi PROPERTIES 
     COMPILE_FLAGS "${OMPI_C_DEF_PRE}_USRDLL ${OMPI_C_DEF_PRE}HAVE_CONFIG_H
-                   ${OMPI_C_DEF_PRE}OMPI_EXPORTS ${OMPI_CXX_LAN_FLAG}")
+                   ${OMPI_C_DEF_PRE}OMPI_EXPORTS ${OMPI_C_DEF_PRE}ORTE_IMPORTS ${OMPI_CXX_LAN_FLAG}")
   TARGET_LINK_LIBRARIES (libmpi libopen-rte Ws2_32.lib shlwapi.lib)
 ELSE (BUILD_SHARED_LIBS)
   SET_TARGET_PROPERTIES(libmpi PROPERTIES COMPILE_FLAGS "${OMPI_C_DEF_PRE}_LIB")
diff --git a/ompi/debuggers/debuggers.h b/ompi/debuggers/debuggers.h
index 4d6383d713..28273a63e9 100644
--- a/ompi/debuggers/debuggers.h
+++ b/ompi/debuggers/debuggers.h
@@ -27,6 +27,7 @@
 #define OMPI_DEBUGGERS_H
 
 #include "ompi_config.h"
+#include "orte/mca/debugger/base/base.h"
 
 BEGIN_C_DECLS
 
@@ -43,7 +44,7 @@ BEGIN_C_DECLS
     /**
      * Breakpoint function for parallel debuggers.
      */
-    extern void *MPIR_Breakpoint(void);
+    ORTE_DECLSPEC extern void *MPIR_Breakpoint(void);
 
 END_C_DECLS
 
diff --git a/ompi/debuggers/ompi_debuggers.c b/ompi/debuggers/ompi_debuggers.c
index db2051523c..4b2949960b 100644
--- a/ompi/debuggers/ompi_debuggers.c
+++ b/ompi/debuggers/ompi_debuggers.c
@@ -126,8 +126,8 @@ OMPI_DECLSPEC opal_datatype_t* opal_datatype_t_type_force_inclusion = NULL;
 OMPI_DECLSPEC ompi_datatype_t* ompi_datatype_t_type_force_inclusion = NULL;
 
 OMPI_DECLSPEC volatile int MPIR_debug_gate = 0;
-extern volatile int MPIR_being_debugged;
-extern volatile int MPIR_debug_state;
+ORTE_DECLSPEC extern volatile int MPIR_being_debugged;
+ORTE_DECLSPEC extern volatile int MPIR_debug_state;
 OMPI_DECLSPEC char *MPIR_debug_abort_string = "";
 
 /* Check for a file in few direct ways for portability */
diff --git a/orte/CMakeLists.txt b/orte/CMakeLists.txt
index 1d9f895ac9..2e2d5dea87 100644
--- a/orte/CMakeLists.txt
+++ b/orte/CMakeLists.txt
@@ -37,10 +37,6 @@ FOREACH(ORTE_SUBDIR ${ORTE_SUBDIRS})
 
 ENDFOREACH(ORTE_SUBDIR ${ORTE_SUBDIRS})
 
-#add orterun debugger files into source list
-SET (ORTERUN_DEBUGGER_FILES ${PROJECT_SOURCE_DIR}/tools/orterun/debuggers.c ${PROJECT_SOURCE_DIR}/tools/orterun/debuggers.h)
-SET (ORTE_SOURCE_FILES ${ORTE_SOURCE_FILES} ${ORTERUN_DEBUGGER_FILES})
-SOURCE_GROUP(debuggers FILES ${ORTERUN_DEBUGGER_FILES})
 
 #only generate if it's not a tarball
 IF(NOT EXISTS ${PROJECT_SOURCE_DIR}/util/hostfile/hostfile_lex.c)
diff --git a/orte/mca/debugger/mpir/.windows b/orte/mca/debugger/mpir/.windows
new file mode 100755
index 0000000000..07efcb4832
--- /dev/null
+++ b/orte/mca/debugger/mpir/.windows
@@ -0,0 +1,12 @@
+#
+# Copyright (c) 2008-2010 High Performance Computing Center Stuttgart, 
+#                         University of Stuttgart.  All rights reserved.
+# $COPYRIGHT$
+# 
+# Additional copyrights may follow
+# 
+# $HEADER$
+#
+
+# Specific to this module
+mca_link_libraries=libopen-rte Ws2_32.lib