diff --git a/ompi/mca/common/sm/.windows b/ompi/mca/common/sm/.windows
index d3d471108a..8abdbb4df4 100644
--- a/ompi/mca/common/sm/.windows
+++ b/ompi/mca/common/sm/.windows
@@ -1,6 +1,8 @@
 #
 # Copyright (c) 2008      High Performance Computing Center Stuttgart, 
 #                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2011      Los Alamos National Security, LLC.
+#                         All rights reserved.
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -9,4 +11,3 @@
 #
 
 # Specific to this module
-exclude_list=common_sm_mmap.c;common_sm_mmap.h;common_sm_sysv.c;common_sm_sysv.h;common_sm_posix.c;common_sm_posix.h
diff --git a/ompi/mca/common/sm/common_sm.h b/ompi/mca/common/sm/common_sm.h
index 1b37ab28e5..5bef9796e9 100644
--- a/ompi/mca/common/sm/common_sm.h
+++ b/ompi/mca/common/sm/common_sm.h
@@ -68,10 +68,6 @@ typedef struct mca_common_sm_module_t {
     unsigned char *module_data_addr;
     /* shared memory backing facility object that encapsulates shmem info */
     opal_shmem_ds_t shmem_ds;
-#if defined(__WINDOWS__)
-    /* handle to the object */
-    HANDLE hMappedObject;
-#endif  /* defined(__WINDOWS__) */
 } mca_common_sm_module_t;
 
 OBJ_CLASS_DECLARATION(mca_common_sm_module_t);
diff --git a/opal/mca/shmem/mmap/shmem_mmap_module.c b/opal/mca/shmem/mmap/shmem_mmap_module.c
index 0058901d1e..0e96e0ada9 100644
--- a/opal/mca/shmem/mmap/shmem_mmap_module.c
+++ b/opal/mca/shmem/mmap/shmem_mmap_module.c
@@ -281,7 +281,8 @@ segment_create(opal_shmem_ds_t *ds_buf,
         else {
             opal_output(0, "shmem: mmap: WARNING: could not relocate "
                         "backing store to \"%s\" (%s).  Cannot continue with "
-                        "shmem mmap.\n", opal_shmem_mmap_backing_file_base_dir, strerror(err));
+                        "shmem mmap.\n", opal_shmem_mmap_backing_file_base_dir,
+                        strerror(err));
             return OPAL_ERROR;
         }
     }