diff --git a/ChangeLog b/ChangeLog
index 942bc86140..cf40e8fb25 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Wed Sep 16 17:16:43 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_core.h (ENABLE_VM_OBJSPACE): enable per-VM object space on
+	  Windows by default, as rb_w32_sysinit() no longer depends on
+	  ruby_xmalloc.
+
 Wed Sep 16 15:08:17 2015  Akinori MUSHA  <knu@iDaemons.org>
 
 	* doc/syntax/literals.rdoc (Strings): [DOC] Revise the character
diff --git a/vm_core.h b/vm_core.h
index 735d3f48ea..8c44b2d018 100644
--- a/vm_core.h
+++ b/vm_core.h
@@ -49,19 +49,8 @@
 #endif
 
 #ifndef ENABLE_VM_OBJSPACE
-#ifdef _WIN32
-/*
- * TODO: object space independent st_table.
- * socklist needs st_table in rb_w32_sysinit(), before object space
- * initialization.
- * It is too early now to change st_hash_type, since it breaks binary
- * compatibility.
- */
-#define ENABLE_VM_OBJSPACE 0
-#else
 #define ENABLE_VM_OBJSPACE 1
 #endif
-#endif
 
 #include <setjmp.h>
 #include <signal.h>