diff --git a/src/bin/bash/builtins/fc.def b/src/bin/bash/builtins/fc.def
index c300066f77..8763914a3c 100644
--- a/src/bin/bash/builtins/fc.def
+++ b/src/bin/bash/builtins/fc.def
@@ -49,12 +49,12 @@ $END
 #include <config.h>
 
 #if defined (HISTORY)
-#ifndef _MINIX
+#if defined (HAVE_SYS_PARAM_H)
 #  include <sys/param.h>
 #endif
 #include "../bashtypes.h"
 #include "posixstat.h"
-#ifndef _MINIX
+#if defined (HAVE_SYS_FILE_H)
 #  include <sys/file.h>
 #endif
 
diff --git a/src/bin/bash/builtins/history.def b/src/bin/bash/builtins/history.def
index 7311705d34..b48c8d6c14 100644
--- a/src/bin/bash/builtins/history.def
+++ b/src/bin/bash/builtins/history.def
@@ -47,7 +47,7 @@ $END
 
 #if defined (HISTORY)
 #include "../bashtypes.h"
-#ifndef _MINIX
+#if defined (HAVE_SYS_FILE_H)
 #  include <sys/file.h>
 #endif
 #include "posixstat.h"
diff --git a/src/bin/bash/builtins/source.def b/src/bin/bash/builtins/source.def
index ffb23f07f1..4876284fbb 100644
--- a/src/bin/bash/builtins/source.def
+++ b/src/bin/bash/builtins/source.def
@@ -41,7 +41,7 @@ $END
 #include "../bashtypes.h"
 #include "posixstat.h"
 #include "filecntl.h"
-#ifndef _MINIX
+#if defined (HAVE_SYS_FILE_H) 
 #  include <sys/file.h>
 #endif
 #include <errno.h>
diff --git a/src/bin/bash/builtins/umask.def b/src/bin/bash/builtins/umask.def
index 19a0ac0d69..822f2b9134 100644
--- a/src/bin/bash/builtins/umask.def
+++ b/src/bin/bash/builtins/umask.def
@@ -37,7 +37,7 @@ $END
 
 #include "../bashtypes.h"
 #include "filecntl.h"
-#ifndef _MINIX
+#if defined (HAVE_SYS_FILE_H)
 #  include <sys/file.h>
 #endif
 
diff --git a/src/bin/bash/execute_cmd.c b/src/bin/bash/execute_cmd.c
index 2291c7af80..5d110f17ec 100644
--- a/src/bin/bash/execute_cmd.c
+++ b/src/bin/bash/execute_cmd.c
@@ -26,13 +26,13 @@
 #include <stdio.h>
 #include "chartypes.h"
 #include "bashtypes.h"
-#ifndef _MINIX
+#ifdef HAVE_SYS_FILE_H
 #  include <sys/file.h>
 #endif
 #include "filecntl.h"
 #include "posixstat.h"
 #include <signal.h>
-#ifndef _MINIX
+#ifdef HAVE_SYS_PARAM_H
 #  include <sys/param.h>
 #endif
 
diff --git a/src/bin/bash/findcmd.c b/src/bin/bash/findcmd.c
index 9c6670a408..f3431a1be1 100644
--- a/src/bin/bash/findcmd.c
+++ b/src/bin/bash/findcmd.c
@@ -24,7 +24,7 @@
 #include <stdio.h>
 #include "chartypes.h"
 #include "bashtypes.h"
-#ifndef _MINIX
+#ifdef HAVE_SYS_FILE_H
 #  include <sys/file.h>
 #endif
 #include "filecntl.h"
diff --git a/src/bin/bash/input.c b/src/bin/bash/input.c
index 3b5cf5f7bd..46e4ee1089 100644
--- a/src/bin/bash/input.c
+++ b/src/bin/bash/input.c
@@ -21,7 +21,7 @@
 #include "config.h"
 
 #include "bashtypes.h"
-#ifndef _MINIX
+#ifdef HAVE_SYS_FILE_H
 #  include <sys/file.h>
 #endif
 #include "filecntl.h"
diff --git a/src/bin/bash/jobs.c b/src/bin/bash/jobs.c
index 2bcb3ac9ef..fd8b748572 100644
--- a/src/bin/bash/jobs.c
+++ b/src/bin/bash/jobs.c
@@ -39,7 +39,9 @@
 #  include <sys/resource.h>
 #endif /* !_POSIX_VERSION && HAVE_SYS_RESOURCE_H && HAVE_WAIT3 && !RLIMTYPE */
 
-#include <sys/file.h>
+#ifdef HAVE_SYS_FILE_H
+#  include <sys/file.h>
+#endif
 #include "filecntl.h"
 #include <sys/ioctl.h>
 #include <sys/param.h>
diff --git a/src/bin/bash/lib/readline/histfile.c b/src/bin/bash/lib/readline/histfile.c
index 284110c85b..a799659e6e 100644
--- a/src/bin/bash/lib/readline/histfile.c
+++ b/src/bin/bash/lib/readline/histfile.c
@@ -32,7 +32,7 @@
 #include <stdio.h>
 
 #include <sys/types.h>
-#ifndef _MINIX
+#if defined (HAVE_SYS_FILE_H)
 #  include <sys/file.h>
 #endif
 #include "posixstat.h"
diff --git a/src/bin/bash/lib/sh/netconn.c b/src/bin/bash/lib/sh/netconn.c
index f412cb029b..8e1b9a714e 100644
--- a/src/bin/bash/lib/sh/netconn.c
+++ b/src/bin/bash/lib/sh/netconn.c
@@ -22,7 +22,7 @@
 #include <config.h>
 
 #include <bashtypes.h>
-#ifndef _MINIX
+#if defined (SYS_FILE_H)
 #  include <sys/file.h>
 #endif
 #include <posixstat.h>
diff --git a/src/bin/bash/make_cmd.c b/src/bin/bash/make_cmd.c
index 1362e798d3..586db46459 100644
--- a/src/bin/bash/make_cmd.c
+++ b/src/bin/bash/make_cmd.c
@@ -23,7 +23,7 @@ Foundation, 59 Temple Place, Suite 330, Boston, MA 02111 USA. */
 
 #include <stdio.h>
 #include "bashtypes.h"
-#ifndef _MINIX
+#ifdef HAVE_SYS_FILE_H
 #  include <sys/file.h>
 #endif
 #include "filecntl.h"
diff --git a/src/bin/bash/redir.c b/src/bin/bash/redir.c
index e4200110a7..2b6b745ead 100644
--- a/src/bin/bash/redir.c
+++ b/src/bin/bash/redir.c
@@ -25,7 +25,7 @@
 
 #include <stdio.h>
 #include "bashtypes.h"
-#ifndef _MINIX
+#ifdef HAVE_SYS_FILE_H
 #  include <sys/file.h>
 #endif
 #include "filecntl.h"
diff --git a/src/bin/bash/shell.c b/src/bin/bash/shell.c
index a4298e7cc6..b4036fa033 100644
--- a/src/bin/bash/shell.c
+++ b/src/bin/bash/shell.c
@@ -27,7 +27,7 @@
 #include "config.h"
 
 #include "bashtypes.h"
-#ifndef _MINIX
+#ifdef HAVE_SYS_FILE_H
 #  include <sys/file.h>
 #endif
 #include "posixstat.h"
diff --git a/src/bin/bash/test.c b/src/bin/bash/test.c
index 449c5d3b59..b0d4de819e 100644
--- a/src/bin/bash/test.c
+++ b/src/bin/bash/test.c
@@ -45,9 +45,9 @@
 extern int errno;
 #endif /* !errno */
 
-#if !defined (_POSIX_VERSION)
+#ifdef HAVE_SYS_FILE_H
 #  include <sys/file.h>
-#endif /* !_POSIX_VERSION */
+#endif
 #include "posixstat.h"
 #include "filecntl.h"