diff --git a/src/win32/Stella.vcproj b/src/win32/Stella.vcproj
index 6f130651c..5b66e0bdf 100755
--- a/src/win32/Stella.vcproj
+++ b/src/win32/Stella.vcproj
@@ -909,6 +909,10 @@
 					RelativePath="..\gui\Menu.cxx"
 					>
 				</File>
+				<File
+					RelativePath="..\gui\MessageBox.cxx"
+					>
+				</File>
 				<File
 					RelativePath="..\gui\OptionsDialog.cxx"
 					>
@@ -1703,6 +1707,10 @@
 					RelativePath="..\gui\Menu.hxx"
 					>
 				</File>
+				<File
+					RelativePath="..\gui\MessageBox.hxx"
+					>
+				</File>
 				<File
 					RelativePath="..\gui\OptionsDialog.hxx"
 					>
diff --git a/src/zlib/zconf.h b/src/zlib/zconf.h
index b23438744..b88d43e7a 100644
--- a/src/zlib/zconf.h
+++ b/src/zlib/zconf.h
@@ -356,7 +356,7 @@ typedef uLong FAR uLongf;
    typedef Byte       *voidp;
 #endif
 
-#if 1    /* was set to #if 1 by ./configure */
+#if !(defined(WINDOWS) || defined(WIN32))    /* was set to #if 1 by ./configure, disabled by SA - 2010-08-01 */
 #  define Z_HAVE_UNISTD_H
 #endif