diff --git a/src/ChangeLog b/src/ChangeLog
index 915b94ef9..3c2cf1dd2 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,9 @@
 2002-01-21  Pavel Roskin  <proski@gnu.org>
 
+	* main.c: Include "drive.h", not <drive.h>, do it after panel.h.
+	Use _OS_NT as the condition for including drive.h.
+	* screen.c: Use _OS_NT as the condition for including drive.h.
+
 	* global.h [_OS_NT]: Include io.h, direct.h and windows.h.
 	Don't redefine struct timeval.
 
diff --git a/src/main.c b/src/main.c
index c3cd891cf..2c46c2558 100644
--- a/src/main.c
+++ b/src/main.c
@@ -42,10 +42,6 @@
 #include <fcntl.h>	/* For O_RDWR */
 #include <signal.h>
 
-#ifdef NEEDS_DRIVE_H
-#    include <drive.h>
-#endif
-
 /* Program include files */
 #include "global.h"
 #include "tty.h"
@@ -85,6 +81,10 @@
 #include "chmod.h"
 #include "chown.h"
 
+#ifdef _OS_NT
+#    include "drive.h"
+#endif
+
 #include "../vfs/vfs.h"
 
 #ifdef	HAVE_CHARSET
diff --git a/src/screen.c b/src/screen.c
index 6df499251..6587a77aa 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -45,8 +45,9 @@
 #include "profile.h"
 #include "widget.h"
 #include "../vfs/vfs.h"
-#ifdef NEEDS_DRIVE_H
-# include "drive.h"
+
+#ifdef _OS_NT
+#  include "drive.h"
 #endif
 
 #define ELEMENTS(arr) ( sizeof(arr) / sizeof((arr)[0]) )