diff --git a/msvc/c/Makefile b/msvc/c/Makefile
index ce618d082..b452cd2e9 100755
--- a/msvc/c/Makefile
+++ b/msvc/c/Makefile
@@ -74,7 +74,7 @@ OBJS	= main.obj symbol.obj package.obj list.obj\
 	write_object.obj write_symbol.obj \
 	write_array.obj write_list.obj write_code.obj \
 	write_sse.obj print_unreadable.obj \
-	libraries.obj backtrace.obj \
+	libraries.obj backtrace.obj mmap.obj cdata.obj \
 	cos.obj sin.obj tan.obj atan.obj \
 	cosh.obj sinh.obj tanh.obj \
 	exp.obj expt.obj log.obj \
diff --git a/src/c/ffi/mmap.d b/src/c/ffi/mmap.d
index 127b306f9..e4555d3ce 100644
--- a/src/c/ffi/mmap.d
+++ b/src/c/ffi/mmap.d
@@ -77,7 +77,7 @@
 }
 #else
 {
-        cl_object vector;
+        cl_object output, vector;
         if (Null(filename)) {
                 output = si_make_vector(element_type, length, Cnil,
                                 Cnil, Cnil, Cnil);
@@ -90,13 +90,14 @@
                                            @':external-format', @':default',
                                            @':cstream', Ct);
                 if (Null(length))
-                        length = ecl_file_len(stream);
+                        length = ecl_file_length(stream);
                 output = si_make_vector(element_type, length, Cnil,
                                         Cnil, Cnil, Cnil);
-                si_read_sequence(2, output, stream);
+                cl_read_sequence(2, output, stream);
                 cl_close(1, stream);
         }
         @(return output)
+}
 #endif
 @)
 
@@ -106,7 +107,7 @@ si_mmap_array(cl_object map)
 #ifdef HAVE_SYS_MMAN_H
         @(return cl_car(map));
 #else
-        @(return map)
+        @(return map);
 #endif
 }