Index: build/win32/libx264.vcproj
===================================================================
--- build/win32/libx264.vcproj	(revision 656)
+++ build/win32/libx264.vcproj	(working copy)
@@ -1056,34 +1056,6 @@
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\..\common\i386\dct-c.c">
-					<FileConfiguration
-						Name="Release|Win32">
-						<Tool
-							Name="VCCLCompilerTool"
-							Optimization="2"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|Win32">
-						<Tool
-							Name="VCCLCompilerTool"
-							Optimization="0"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-							BasicRuntimeChecks="3"/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release64|Win32">
-						<Tool
-							Name="VCCLCompilerTool"
-							Optimization="2"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""/>
-					</FileConfiguration>
-				</File>
-				<File
 					RelativePath="..\..\common\i386\dct.h">
 				</File>
 				<File
Index: common/frame.c
===================================================================
--- common/frame.c	(revision 656)
+++ common/frame.c	(working copy)
@@ -23,7 +23,9 @@
 
 #include <stdio.h>
 #include <string.h>
+#ifndef _MSC_VER
 #include <unistd.h>
+#endif
 
 #include "common.h"
 
Index: encoder/analyse.c
===================================================================
--- encoder/analyse.c	(revision 656)
+++ encoder/analyse.c	(working copy)
@@ -26,7 +26,9 @@
 #include <string.h>
 #include <math.h>
 #include <limits.h>
+#ifndef _MSC_VER
 #include <unistd.h>
+#endif
 
 #include "common/common.h"
 #include "macroblock.h"
Index: extras/getopt.c
===================================================================
--- extras/getopt.c	(revision 656)
+++ extras/getopt.c	(working copy)
@@ -199,11 +199,15 @@
 # define my_index	strchr
 #else
 
-# if HAVE_STRING_H
-#  include <string.h>
-# else
-#  include <strings.h>
-# endif
+# if HAVE_STRING_H
+#  include <string.h>
+# else
+#  ifdef _MSC_VER
+#   include <string.h>
+#  else
+#   include <strings.h>
+#  endif
+# endif
 
 /* Avoid depending on library functions or files
    whose names are inconsistent.  */
@@ -980,6 +984,16 @@
 			   0);
 }
 
+#ifdef _MSC_VER
+
+int
+getopt_long (argc, argv, optstring, long_options, opt_index)
+{
+  return _getopt_internal (argc, argv, optstring, long_options, opt_index, 0);
+}
+
+#endif
+
 #endif	/* Not ELIDE_CODE.  */
 
 #ifdef TEST