--- ./tools/omfile.c.orig
+++ ./tools/omfile.c
@@ -47,10 +47,7 @@
 #include <ctype.h>
 #include <libgen.h>
 #include <unistd.h>
-#include <sys/file.h>
-#ifdef OS_SOLARIS
-#	include <fcntl.h>
-#endif
+#include <fcntl.h>
 #ifdef HAVE_ATOMIC_BUILTINS
 #	include <pthread.h>
 #endif
--- ./tools/pidfile.c.orig
+++ ./tools/pidfile.c
@@ -36,9 +36,7 @@
 #include <string.h>
 #include <errno.h>
 #include <signal.h>
-#ifdef __sun
 #include <fcntl.h>
-#endif
 
 #include "srUtils.h"