===================================================================
RCS file: /cvs/mandoc/read.c,v
retrieving revision 1.79
retrieving revision 1.81
diff -u -p -r1.79 -r1.81
--- mandoc/read.c	2014/08/06 15:09:05	1.79
+++ mandoc/read.c	2014/08/16 19:00:01	1.81
@@ -1,4 +1,4 @@
-/*	$Id: read.c,v 1.79 2014/08/06 15:09:05 schwarze Exp $ */
+/*	$Id: read.c,v 1.81 2014/08/16 19:00:01 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010-2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -16,13 +16,12 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
-#ifdef HAVE_MMAP
-# include <sys/stat.h>
-# include <sys/mman.h>
+#include <sys/types.h>
+#if HAVE_MMAP
+#include <sys/stat.h>
+#include <sys/mman.h>
 #endif
 
 #include <assert.h>
@@ -591,7 +590,7 @@ read_whole_file(struct mparse *curp, const char *file,
 	size_t		 off;
 	ssize_t		 ssz;
 
-#ifdef	HAVE_MMAP
+#if HAVE_MMAP
 	struct stat	 st;
 	if (-1 == fstat(fd, &st)) {
 		curp->file_status = MANDOCLEVEL_SYSERR;
@@ -764,7 +763,7 @@ mparse_readfd(struct mparse *curp, int fd, const char 
 
 	mparse_parse_buffer(curp, blk, file);
 
-#ifdef	HAVE_MMAP
+#if HAVE_MMAP
 	if (with_mmap)
 		munmap(blk.buf, blk.sz);
 	else