diff --git a/src/xv.c b/src/xv.c
index d32fb7d..af73a2e 100644
--- a/src/xv.c
+++ b/src/xv.c
@@ -6,7 +6,6 @@
 
 #define MAIN
 #define NEEDSTIME
-#define NEEDSDIR     /* for value of MAXPATHLEN */
 
 #include "xv.h"
 
diff --git a/src/xv.h b/src/xv.h
index a842b2a..508e061 100644
--- a/src/xv.h
+++ b/src/xv.h
@@ -293,31 +293,26 @@
 
 
 
-#ifdef NEEDSDIR
-#  ifdef VMS
-#    include <descrip.h>
-#    include <stat.h>
-#    include "dirent.h"
+#ifdef VMS
+#  include <descrip.h>
+#  include <stat.h>
+#  include "dirent.h"
+#else
+#  ifdef NODIRENT
+#    include <sys/dir.h>
 #  else
-#    ifdef NODIRENT
-#      include <sys/dir.h>
-#    else
-#      include <dirent.h>
-#    endif
-
-#    if defined(SVR4) || defined(SYSV)
-#      include <fcntl.h>
-#    endif
-
-#    include <sys/param.h>
-#    include <sys/stat.h>
-
-#    if defined(__convex__) && defined (__STDC__)
-#      define S_IFMT  _S_IFMT
-#      define S_IFDIR _S_IFDIR
-#      define S_IFCHR _S_IFCHR
-#      define S_IFBLK _S_IFBLK
-#    endif
+#    include <dirent.h>
+#  endif
+#  if defined(SVR4) || defined(SYSV)
+#    include <fcntl.h>
+#  endif
+#  include <sys/param.h>
+#  include <sys/stat.h>
+#  if defined(__convex__) && defined (__STDC__)
+#    define S_IFMT  _S_IFMT
+#    define S_IFDIR _S_IFDIR
+#    define S_IFCHR _S_IFCHR
+#    define S_IFBLK _S_IFBLK
 #  endif
 #endif
 
diff --git a/src/xvbrowse.c b/src/xvbrowse.c
index 61428fc..5284e18 100644
--- a/src/xvbrowse.c
+++ b/src/xvbrowse.c
@@ -17,7 +17,6 @@
 
 #include "copyright.h"
 
-#define NEEDSDIR
 #include "xv.h"
 #include <unistd.h>   /* access() */
 
diff --git a/src/xvcut.c b/src/xvcut.c
index fc83587..7212b46 100644
--- a/src/xvcut.c
+++ b/src/xvcut.c
@@ -47,7 +47,6 @@
  */
 
 
-#define  NEEDSDIR               /* for stat() */
 #include "copyright.h"
 #include "xv.h"
 
diff --git a/src/xvdir.c b/src/xvdir.c
index 4024527..4193a85 100644
--- a/src/xvdir.c
+++ b/src/xvdir.c
@@ -21,7 +21,6 @@
 #include "copyright.h"
 
 #define NEEDSTIME      /* for CheckPoll */
-#define NEEDSDIR
 #include "xv.h"
 
 #include "bits/d_load"
diff --git a/src/xvfits.c b/src/xvfits.c
index 05b04ae..0d958dc 100644
--- a/src/xvfits.c
+++ b/src/xvfits.c
@@ -14,7 +14,6 @@
  * provided "as is" without express or implied warranty.
  */
 
-#define  NEEDSDIR /* for S_IRUSR|S_IWUSR */
 #include "xv.h"
 
 #define NCARDS    (36)
diff --git a/src/xvimage.c b/src/xvimage.c
index bc08cfe..b8132c7 100644
--- a/src/xvimage.c
+++ b/src/xvimage.c
@@ -30,7 +30,6 @@
  */
 /* #define ENABLE_FIXPIX_SMOOTH */   /* GRR 19980607:  moved into xv.h */
 
-#define  NEEDSDIR             /* for S_IRUSR|S_IWUSR */
 #include "copyright.h"
 
 #include "xv.h"
diff --git a/src/xvmgcsfx.c b/src/xvmgcsfx.c
index 9809d19..c17f5f7 100644
--- a/src/xvmgcsfx.c
+++ b/src/xvmgcsfx.c
@@ -60,7 +60,6 @@
  *  同様に書き込み時にも問題が生じるかもしれない。
  */
 
-#define  NEEDSDIR               /* for stat() */
 #include "xv.h"
 
 
diff --git a/src/xvpds.c b/src/xvpds.c
index c81fe65..61b118d 100644
--- a/src/xvpds.c
+++ b/src/xvpds.c
@@ -101,7 +101,6 @@
  * This software is provided "as is" without any express or implied warranty.
  */
 
-#define  NEEDSDIR       /* for S_IRUSR|S_IWUSR */
 #include "xv.h"
 
 #ifdef HAVE_PDS
diff --git a/src/xvpic2.c b/src/xvpic2.c
index 7d9c489..690bea5 100644
--- a/src/xvpic2.c
+++ b/src/xvpic2.c
@@ -61,7 +61,6 @@
  */
 
 #define PIC2_IGNORE_UNUSED_FUNCTIONS
-#define NEEDSDIR
 
 #include "xv.h"
 #include <setjmp.h>
diff --git a/src/xvps.c b/src/xvps.c
index 265ec92..41ba197 100644
--- a/src/xvps.c
+++ b/src/xvps.c
@@ -13,7 +13,6 @@
 
 #include "copyright.h"
 
-#define NEEDSDIR
 #include "xv.h"
 
 #define PSWIDE 431
diff --git a/src/xvvd.c b/src/xvvd.c
index e6acb90..f468a19 100644
--- a/src/xvvd.c
+++ b/src/xvvd.c
@@ -4,8 +4,6 @@
  *          (virtual) directory.
  */
 
-#define NEEDSDIR
-
 #include "xv.h"
 
 #ifdef AUTO_EXPAND