diff --git a/examples/cxx/examples.dsp b/examples/cxx/examples.dsp
index 81cc1a8b4..8cbe4ace7 100755
--- a/examples/cxx/examples.dsp
+++ b/examples/cxx/examples.dsp
@@ -46,7 +46,7 @@ RSC=rc.exe
 # ADD F90 /assume:underscore /compile_only /iface:nomixed_str_len_arg /iface:cref /math_library:fast /names:lowercase /nologo /warn:nofileopt /module:""
 # SUBTRACT F90 /threads
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /Ob2 /I "../../include" /I "../../Cantera/src" /I "../../Cantera/cxx/src" /I "../.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /O2 /Ob2 /I "../../include" /I "d:/dgg/ctcyg/include/cantera" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
 BSC32=bscmake.exe
diff --git a/tools/src/ck2ctml.dsp b/tools/src/ck2ctml.dsp
index bb63f853b..737e54532 100755
--- a/tools/src/ck2ctml.dsp
+++ b/tools/src/ck2ctml.dsp
@@ -43,10 +43,10 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE F90 /compile_only /nologo /warn:nofileopt
-# ADD F90 /assume:underscore /compile_only /iface:nomixed_str_len_arg /iface:cref /libs:static /math_library:fast /names:lowercase /nologo /warn:nofileopt /module:""
+# ADD F90 /assume:underscore /compile_only /iface:nomixed_str_len_arg /iface:cref /math_library:fast /names:lowercase /nologo /warn:nofileopt /module:""
 # SUBTRACT F90 /threads
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "../../include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /O2 /I "../../Cantera/src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
 BSC32=bscmake.exe
diff --git a/tools/testtools/csvdiff.cpp b/tools/testtools/csvdiff.cpp
index d4741acac..45cfdfe90 100644
--- a/tools/testtools/csvdiff.cpp
+++ b/tools/testtools/csvdiff.cpp
@@ -38,6 +38,10 @@
 #include <limits.h>
 #include <unistd.h>
 
+#ifndef CYGWIN
+#include <getopt.h>
+#endif
+
 #include "mdp_allo.h"
 #include "tok_input_util.h"