diff --git a/.hgignore b/.hgignore
index 4615371e..6be2d677 100644
--- a/.hgignore
+++ b/.hgignore
@@ -18,7 +18,7 @@ Makefile(\.in)?$
 ^moo/moopython/plugins/(pyproject/project-plugin|python|terminal)\.ini$
 ^moo/moopython/pygtk/(moo(app|edit|term|utils)?-mod\.h|moo(app|edit|term|utils)-pygtk\.c)$
 ^moo/mooterm/termhelper_res\.rc$
-^moo/mooutils/(moomarshals\.[ch]|stock-moo\.h)$
+^moo/mooutils/(moomarshals\.[ch]|stock-(moo|medit)\.h)$
 ^moo/mooapp/smclient/(README|egg-session-end\.c|eggdesktopfile\.[ch]|eggsmclient-libgnomeui\.[ch]|eggsmclient-osx\.c|gedit\.diff|smclient\.patch)$
 ^moo/mooutils/xdgmime/.cvsignore$
 ^moo/mooutils/xdgmime/CVS
@@ -34,3 +34,5 @@ Makefile(\.in)?$
 ^ppc-configure
 /CVS/
 ^winbuild/.*\.(aps|ncb|suo)$
+^winbuild/mingwds$
+^winbuild/devcpp$
diff --git a/moo/mooutils/mooutils-win32.c b/moo/mooutils/mooutils-win32.c
index 715ba340..e531b4b4 100644
--- a/moo/mooutils/mooutils-win32.c
+++ b/moo/mooutils/mooutils-win32.c
@@ -252,7 +252,7 @@ _moo_win32_lame_parse_cmd_line (const char  *cmd_line,
         tmp[0] = g_strdup ("cmd.exe");
         tmp[1] = g_strdup ("/c");
         memcpy (tmp + 2, argv, (len + 1) * sizeof (*tmp));
-        g_strfreev (argv);
+        g_free (argv);
         argv = tmp;
     }
 
@@ -261,7 +261,8 @@ _moo_win32_lame_parse_cmd_line (const char  *cmd_line,
 }
 
 
-#ifndef __MINGW32__
+#if !defined(__MINGW32__) || \
+    (__MINGW32_MAJOR_VERSION == 3 && __MINGW32_MINOR_VERSION <= 7)
 int
 _moo_win32_gettimeofday (struct timeval *tp,
                          G_GNUC_UNUSED gpointer tzp)