diff --git a/ChangeLog b/ChangeLog
index 1ed1dbaf2c..d25480fd8b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,7 @@
-Wed Mar 11 13:16:58 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Wed Mar 11 13:22:41 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/win32.c (init_env): set TMPDIR if none of TMPDIR, TMP,
+	  TEMP is set.
 
 	* win32/win32.c (rb_w32_telldir, rb_w32_seekdir): should use long.
 
diff --git a/win32/win32.c b/win32/win32.c
index 39cc461ec9..54f612d38a 100644
--- a/win32/win32.c
+++ b/win32/win32.c
@@ -5001,58 +5001,3 @@ rb_w32_fsopen(const char *path, const char *mode, int shflags)
     return f;
 }
 #endif
-
-BOOL
-rb_w32_get_special_directory(int n, WCHAR *path)
-{
-    if (!get_special_folder(n, path))
-	return FALSE;
-    regulate_path(path);
-    return TRUE;
-}
-
-static VALUE
-w32_get_special_directory(VALUE self, VALUE num)
-{
-    VALUE str;
-    int n = NUM2INT(num);
-    WCHAR path[_MAX_PATH];
-
-    if (!rb_w32_get_special_directory(n, path)) {
-	rb_sys_fail(0);
-    }
-    str = rb_w32_conv_from_wchar(path, rb_filesystem_encoding());
-    OBJ_TAINT(str);
-    return str;
-}
-
-static VALUE
-w32_get_system_directory(VALUE self)
-{
-    VALUE str;
-    WCHAR path[_MAX_PATH];
-
-    if (!get_system_directory(path, numberof(path))) {
-	rb_sys_fail(0);
-    }
-    regulate_path(path);
-    str = rb_w32_conv_from_wchar(path, rb_filesystem_encoding());
-    OBJ_TAINT(str);
-    return str;
-}
-
-void
-Init_win32(void)
-{
-    VALUE mWin32 = rb_define_module("Win32");
-    VALUE dir = rb_define_module_under(mWin32, "Dir");
-    rb_define_module_function(dir, "special", w32_get_special_directory, 1);
-    rb_define_module_function(dir, "system", w32_get_system_directory, 0);
-    rb_define_const(dir, "LOCAL_APPDATA", UINT2NUM(CSIDL_LOCAL_APPDATA));
-    rb_define_const(dir, "COMMON_APPDATA", UINT2NUM(CSIDL_COMMON_APPDATA));
-    rb_define_const(dir, "WINDOWS", UINT2NUM(CSIDL_WINDOWS));
-    rb_define_const(dir, "SYSTEM", UINT2NUM(CSIDL_SYSTEM));
-    rb_define_const(dir, "PROFILE", UINT2NUM(CSIDL_PROFILE));
-    rb_define_const(dir, "PERSONAL", UINT2NUM(CSIDL_PERSONAL));
-    rb_define_const(mWin32, "Version", UINT2NUM(rb_w32_osver()));
-}