diff --git a/main.cc b/main.cc
index 7c2b790bc..8bd41bb10 100644
--- a/main.cc
+++ b/main.cc
@@ -19,7 +19,7 @@ const char COPYRIGHT[] =
  *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 #if !defined(WINNT) && !defined(macintosh)
-#ident "$Id: main.cc,v 1.46 2001/07/25 03:10:49 steve Exp $"
+#ident "$Id: main.cc,v 1.47 2001/07/30 02:44:05 steve Exp $"
 #endif
 
 # include "config.h"
@@ -64,6 +64,12 @@ extern "C" int optind;
 extern "C" const char*optarg;
 #endif
 
+#if defined(__CYGWIN32__) && !defined(HAVE_GETOPT_H)
+extern "C" int getopt(int argc, char*argv[], const char*fmt);
+extern "C" int optind;
+extern "C" const char*optarg;
+#endif
+
 const char VERSION[] = "$Name:  $ $State: Exp $";
 
 const char*target = "null";
@@ -448,6 +454,9 @@ int main(int argc, char*argv[])
 
 /*
  * $Log: main.cc,v $
+ * Revision 1.47  2001/07/30 02:44:05  steve
+ *  Cleanup defines and types for mingw compile.
+ *
  * Revision 1.46  2001/07/25 03:10:49  steve
  *  Create a config.h.in file to hold all the config
  *  junk, and support gcc 3.0. (Stephan Boettcher)
diff --git a/tgt-vvp/vvp.c b/tgt-vvp/vvp.c
index ad4616491..3eca34cc3 100644
--- a/tgt-vvp/vvp.c
+++ b/tgt-vvp/vvp.c
@@ -17,7 +17,7 @@
  *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 #if !defined(WINNT) && !defined(macintosh)
-#ident "$Id: vvp.c,v 1.10 2001/07/16 18:26:08 steve Exp $"
+#ident "$Id: vvp.c,v 1.11 2001/07/30 02:44:05 steve Exp $"
 #endif
 
 /*
@@ -33,11 +33,13 @@ FILE*vvp_out = 0;
 
 inline static void draw_execute_header(ivl_design_t des)
 {
+#if !defined(__MINGW32__)
       const char*cp = ivl_design_flag(des, "VVP_EXECUTABLE");
       if (cp) {
 	    fprintf(vvp_out, "#! %s\n", cp);
 	    fchmod(fileno(vvp_out), 0755);
       }
+#endif
 }
 
 inline static void draw_module_declarations(ivl_design_t des)
diff --git a/vvp/main.cc b/vvp/main.cc
index 4b5e94083..bc542158e 100644
--- a/vvp/main.cc
+++ b/vvp/main.cc
@@ -17,7 +17,7 @@
  *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 #if !defined(WINNT)
-#ident "$Id: main.cc,v 1.19 2001/07/26 03:13:51 steve Exp $"
+#ident "$Id: main.cc,v 1.20 2001/07/30 02:44:05 steve Exp $"
 #endif
 
 # include  "config.h"
@@ -37,6 +37,10 @@
 # include  <getopt.h>
 #endif
 
+#if defined(__MINGW32__)
+# include  <windows.h>
+#endif
+
 #if defined(__MINGW32__) && !defined(HAVE_GETOPT_H)
 extern "C" int getopt(int argc, char*argv[], const char*fmt);
 extern "C" int optind;
@@ -80,7 +84,7 @@ int main(int argc, char*argv[])
       bool debug_flag = false;
       bool verbose_flag = false;
       struct tms cycles[3];
-      char *logfile_name = 0x0;
+      const char *logfile_name = 0x0;
       FILE *logfile = 0x0;
 
 #ifdef __MINGW32__
@@ -218,6 +222,9 @@ int main(int argc, char*argv[])
 
 /*
  * $Log: main.cc,v $
+ * Revision 1.20  2001/07/30 02:44:05  steve
+ *  Cleanup defines and types for mingw compile.
+ *
  * Revision 1.19  2001/07/26 03:13:51  steve
  *  Make the -M flag add module search paths.
  *
diff --git a/vvp/vpi_modules.cc b/vvp/vpi_modules.cc
index 49e416d7a..75b478d00 100644
--- a/vvp/vpi_modules.cc
+++ b/vvp/vpi_modules.cc
@@ -17,7 +17,7 @@
  *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 #if !defined(WINNT)
-#ident "$Id: vpi_modules.cc,v 1.7 2001/07/28 03:29:42 steve Exp $"
+#ident "$Id: vpi_modules.cc,v 1.8 2001/07/30 02:44:05 steve Exp $"
 #endif
 
 # include  "config.h"
@@ -31,7 +31,7 @@ typedef void (*vlog_startup_routines_t)(void);
 typedef int (*vpi_register_sim_t)(p_vpi_thunk tp);
 
 
-char* vpip_module_path[64] = {
+const char* vpip_module_path[64] = {
       MODULE_DIR,
       0
 };
@@ -109,6 +109,9 @@ void vpip_load_module(const char*name)
 
 /*
  * $Log: vpi_modules.cc,v $
+ * Revision 1.8  2001/07/30 02:44:05  steve
+ *  Cleanup defines and types for mingw compile.
+ *
  * Revision 1.7  2001/07/28 03:29:42  steve
  *  If module name has a /, skip the path search.
  *
diff --git a/vvp/vpi_priv.h b/vvp/vpi_priv.h
index c1eeb0c07..90f2d9703 100644
--- a/vvp/vpi_priv.h
+++ b/vvp/vpi_priv.h
@@ -19,7 +19,7 @@
  *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 #if !defined(WINNT)
-#ident "$Id: vpi_priv.h,v 1.20 2001/07/26 03:13:51 steve Exp $"
+#ident "$Id: vpi_priv.h,v 1.21 2001/07/30 02:44:05 steve Exp $"
 #endif
 
 # include  "vpi_user.h"
@@ -220,7 +220,7 @@ vpiHandle vpip_make_vthr_vector(unsigned base, unsigned wid);
 extern void vpip_load_module(const char*name);
 
 # define VPIP_MODULE_PATH_MAX 64
-extern char* vpip_module_path[64];
+extern const char* vpip_module_path[64];
 extern unsigned vpip_module_path_cnt;
 
 /*
@@ -263,6 +263,9 @@ extern void vpip_set_time_precision(int pres);
 
 /*
  * $Log: vpi_priv.h,v $
+ * Revision 1.21  2001/07/30 02:44:05  steve
+ *  Cleanup defines and types for mingw compile.
+ *
  * Revision 1.20  2001/07/26 03:13:51  steve
  *  Make the -M flag add module search paths.
  *