--- code/trunk/pcregrep.c	2007/03/29 09:13:21	136
+++ code/trunk/pcregrep.c	2007/03/29 13:56:00	137
@@ -50,9 +50,11 @@
 
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <unistd.h>
+#ifdef HAVE_UNISTD_H
+#  include <unistd.h>
+#endif
 
-#include "pcre.h"
+#include <pcre.h>
 
 #define FALSE 0
 #define TRUE 1
@@ -463,7 +465,7 @@
 
 
 
-#if ! HAVE_STRERROR
+#ifndef HAVE_STRERROR
 /*************************************************
 *     Provide strerror() for non-ANSI libraries  *
 *************************************************/