diff --git a/gio/giomodule-priv.c b/gio/giomodule-priv.c
index 41afa54a0..d4ddd3645 100644
--- a/gio/giomodule-priv.c
+++ b/gio/giomodule-priv.c
@@ -51,7 +51,8 @@ _g_io_module_extract_name (const char *filename)
 
   if (g_str_has_prefix (bname, "libgio"))
     prefix_len = 6;
-  else if (g_str_has_prefix (bname, "lib"))
+  /* DLLs built with MSVC generally do not have the 'lib' prefix */
+  else if (g_str_has_prefix (bname, "lib") || g_str_has_prefix (bname, "gio"))
     prefix_len = 3;
   else
     prefix_len = 0; /* use whole name (minus suffix) as plugin name */
diff --git a/gio/meson.build b/gio/meson.build
index d7f4f3f31..8f989bfe9 100644
--- a/gio/meson.build
+++ b/gio/meson.build
@@ -754,7 +754,7 @@ gioenumtypes_c = custom_target('gioenumtypes_c',
              '--template', files('gioenumtypes.c.template'),
              '@INPUT@', gnetworking_h])
 
-gioenumtypes_dep = declare_dependency(sources : [gioenumtypes_h])
+gioenumtypes_dep = declare_dependency(sources : [gioenumtypes_h, gobjectenumtypes_h])
 
 # inotify
 if glib_conf.has('HAVE_SYS_INOTIFY_H') and have_func_inotify_init1
diff --git a/gio/win32/meson.build b/gio/win32/meson.build
index c1841cb64..f0fc307ba 100644
--- a/gio/win32/meson.build
+++ b/gio/win32/meson.build
@@ -8,8 +8,8 @@ giowin32_sources = [
 ]
 
 giowin32_lib = static_library('giowin32',
-  sources : [giowin32_sources, gioenumtypes_h],
+  sources : [giowin32_sources],
   include_directories : [configinc, glibinc, gioinc, gmoduleinc],
-  dependencies : [libintl],
+  dependencies : [libintl, gioenumtypes_dep],
   pic : true,
   c_args : [ '-DG_DISABLE_DEPRECATED' ] + gio_c_args)