diff --git a/src/mca/rmgr/base/rmgr_base_context.c b/src/mca/rmgr/base/rmgr_base_context.c
index a2d214990b..840f249fc7 100644
--- a/src/mca/rmgr/base/rmgr_base_context.c
+++ b/src/mca/rmgr/base/rmgr_base_context.c
@@ -15,7 +15,9 @@
  */
 #include "ompi_config.h"
 #include <errno.h>
+#ifndef WIN32
 #include <unistd.h>
+#endif
 #include <string.h>
 
 #include "include/constants.h"
diff --git a/src/mca/rmgr/base/rmgr_base_pack.c b/src/mca/rmgr/base/rmgr_base_pack.c
index e950594dd6..eafa3dd1de 100644
--- a/src/mca/rmgr/base/rmgr_base_pack.c
+++ b/src/mca/rmgr/base/rmgr_base_pack.c
@@ -13,7 +13,9 @@
  */
 #include "ompi_config.h"
 #include <errno.h>
+#ifndef WIN32
 #include <unistd.h>
+#endif
 #include <string.h>
 
 #include "include/constants.h"
diff --git a/src/mca/rmgr/base/rmgr_base_unpack.c b/src/mca/rmgr/base/rmgr_base_unpack.c
index 89dae1459f..2e6a77f06e 100644
--- a/src/mca/rmgr/base/rmgr_base_unpack.c
+++ b/src/mca/rmgr/base/rmgr_base_unpack.c
@@ -13,7 +13,9 @@
  */
 #include "ompi_config.h"
 #include <errno.h>
+#ifndef WIN32
 #include <unistd.h>
+#endif
 #include <string.h>
 
 #include "include/constants.h"
diff --git a/src/win32/generated_include/rmgr_static-components.h b/src/win32/generated_include/rmgr_static-components.h
new file mode 100644
index 0000000000..e6e714b0a8
--- /dev/null
+++ b/src/win32/generated_include/rmgr_static-components.h
@@ -0,0 +1,10 @@
+/*
+ * $HEADER$
+ */
+
+
+
+const mca_base_component_t *mca_rmgr_base_static_components[] = {
+
+  NULL
+};
diff --git a/src/win32/generated_include/rml_static-components.h b/src/win32/generated_include/rml_static-components.h
new file mode 100644
index 0000000000..5b9547ed3d
--- /dev/null
+++ b/src/win32/generated_include/rml_static-components.h
@@ -0,0 +1,10 @@
+/*
+ * $HEADER$
+ */
+
+
+
+const mca_base_component_t *mca_rml_base_static_components[] = {
+
+  NULL
+};
diff --git a/src/win_makefile b/src/win_makefile
index dd58811af6..7458c529f2 100644
--- a/src/win_makefile
+++ b/src/win_makefile
@@ -55,6 +55,8 @@ C_SUBDIRS =  \
         mca/io/base \
         mca/iof/base \
 		  mca/errmgr/base \
+		  mca/rml/base \
+		  mca/rmgr/base \
         mca/mpool/base \
         mca/ns/base \
         mca/oob/base \
@@ -122,6 +124,8 @@ STATIC_LIBS = \
         gpr \
         topo\
 		  errmgr \
+		  rml \
+		  rmgr \
         ptl\
         oob\
         pml\