*** ./html.c.ORIG	Wed Apr 13 00:58:58 2011
--- ./html.c	Wed Apr 13 00:59:14 2011
***************
*** 25,31 ****
--- 25,33 ----
  #include <ctype.h>
  #include <stdarg.h>
  #include <stdio.h>
+ #ifndef _AIX51
  #include <stdint.h>
+ #endif
  #include <stdlib.h>
  #include <string.h>
  #include <unistd.h>
*** ./mdoc_term.c.ORIG	Wed Apr 13 00:59:40 2011
--- ./mdoc_term.c	Wed Apr 13 00:59:53 2011
***************
*** 23,29 ****
--- 23,31 ----
  
  #include <assert.h>
  #include <ctype.h>
+ #ifndef _AIX51
  #include <stdint.h>
+ #endif
  #include <stdio.h>
  #include <stdlib.h>
  #include <string.h>
*** ./term.c.ORIG	Wed Apr 13 01:00:06 2011
--- ./term.c	Wed Apr 13 01:00:31 2011
***************
*** 23,29 ****
--- 23,31 ----
  
  #include <assert.h>
  #include <ctype.h>
+ #ifndef _AIX51
  #include <stdint.h>
+ #endif
  #include <stdio.h>
  #include <stdlib.h>
  #include <string.h>
*** ./term_ps.c.ORIG	Wed Apr 13 01:01:02 2011
--- ./term_ps.c	Wed Apr 13 01:01:15 2011
***************
*** 22,28 ****
--- 22,30 ----
  
  #include <assert.h>
  #include <stdarg.h>
+ #ifndef _AIX51
  #include <stdint.h>
+ #endif
  #include <stdio.h>
  #include <stdlib.h>
  #include <string.h>
*** ./main.c.ORIG	Wed Apr 13 01:02:25 2011
--- ./main.c	Wed Apr 13 01:02:36 2011
***************
*** 21,27 ****
--- 21,29 ----
  
  #include <assert.h>
  #include <stdio.h>
+ #ifndef _AIX51
  #include <stdint.h>
+ #endif
  #include <stdlib.h>
  #include <string.h>
  #include <unistd.h>
*** ./mandoc.h.ORIG	Wed Apr 13 01:03:18 2011
--- ./mandoc.h	Wed Apr 13 01:03:30 2011
***************
*** 295,301 ****
  struct	mdoc;
  struct	man;
  
- __BEGIN_DECLS
  
  void		  mparse_free(struct mparse *);
  void		  mparse_reset(struct mparse *);
--- 295,300 ----
***************
*** 310,315 ****
  void		 *mandoc_malloc(size_t);
  void		 *mandoc_realloc(void *, size_t);
  
- __END_DECLS
  
  #endif /*!MANDOC_H*/
--- 309,313 ----
*** ./libmandoc.h.ORIG	Wed Apr 13 01:04:26 2011
--- ./libmandoc.h	Wed Apr 13 01:04:37 2011
***************
*** 63,69 ****
  	struct reg	  regs[REG__MAX];
  };
  
- __BEGIN_DECLS
  
  struct	roff;
  struct	mdoc;
--- 63,68 ----
***************
*** 107,112 ****
  const struct tbl_span	*roff_span(const struct roff *);
  const struct eqn	*roff_eqn(const struct roff *);
  
- __END_DECLS
  
  #endif /*!LIBMANDOC_H*/
--- 106,110 ----
*** ./libroff.h.ORIG	Wed Apr 13 01:05:07 2011
--- ./libroff.h	Wed Apr 13 01:05:22 2011
***************
*** 17,23 ****
  #ifndef LIBROFF_H
  #define LIBROFF_H
  
- __BEGIN_DECLS
  
  enum	tbl_part {
  	TBL_PART_OPTS, /* in options (first line) */
--- 17,22 ----
***************
*** 63,68 ****
  void		 eqn_free(struct eqn_node *);
  enum rofferr 	 eqn_read(struct eqn_node **, int, const char *, int);
  
- __END_DECLS
  
  #endif /*LIBROFF_H*/
--- 62,66 ----
*** ./mdoc.h.ORIG	Wed Apr 13 01:05:43 2011
--- ./mdoc.h	Wed Apr 13 01:05:53 2011
***************
*** 380,392 ****
  /* Names of macro args.  Index is enum mdocargt. */
  extern	const char *const *mdoc_argnames;
  
- __BEGIN_DECLS
  
  struct	mdoc;
  
  const struct mdoc_node *mdoc_node(const struct mdoc *);
  const struct mdoc_meta *mdoc_meta(const struct mdoc *);
  
- __END_DECLS
  
  #endif /*!MDOC_H*/
--- 380,390 ----
*** ./man.h.ORIG	Wed Apr 13 01:06:21 2011
--- ./man.h	Wed Apr 13 01:06:28 2011
***************
*** 99,111 ****
  /* Names of macros.  Index is enum mant. */
  extern	const char *const *man_macronames;
  
- __BEGIN_DECLS
  
  struct	man;
  
  const struct man_node *man_node(const struct man *);
  const struct man_meta *man_meta(const struct man *);
  
- __END_DECLS
  
  #endif /*!MAN_H*/
--- 99,109 ----
*** ./term_ascii.c.ORIG	Fri May 27 12:20:04 2011
--- ./term_ascii.c	Fri May 27 12:20:16 2011
***************
*** 24,30 ****
--- 24,32 ----
  #ifdef USE_WCHAR
  # include <locale.h>
  #endif
+ #ifndef _AIX51
  #include <stdint.h>
+ #endif
  #include <stdio.h>
  #include <stdlib.h>
  #include <unistd.h>
*** ./Makefile.ORIG	Mon Jul 25 18:10:15 2011
--- ./Makefile	Mon Jul 25 18:10:48 2011
***************
*** 19,30 ****
  # system DOESN'T support this, -Tlocale will produce garbage.
  # If you don't define it, -Tlocale is a synonym for -Tacsii.
  CFLAGS	 	+= -DUSE_WCHAR
! CFLAGS		+= -g -DHAVE_CONFIG_H -DVERSION="\"$(VERSION)\""
! CFLAGS     	+= -W -Wall -Wstrict-prototypes -Wno-unused-parameter -Wwrite-strings
  PREFIX		 = /usr/local
  BINDIR		 = $(PREFIX)/bin
  INCLUDEDIR	 = $(PREFIX)/include/mandoc
! LIBDIR		 = $(PREFIX)/lib/mandoc
  MANDIR		 = $(PREFIX)/man
  EXAMPLEDIR	 = $(PREFIX)/share/examples/mandoc
  INSTALL		 = install
--- 19,30 ----
  # system DOESN'T support this, -Tlocale will produce garbage.
  # If you don't define it, -Tlocale is a synonym for -Tacsii.
  CFLAGS	 	+= -DUSE_WCHAR
! CFLAGS		+= -DHAVE_CONFIG_H -DVERSION="\"$(VERSION)\""
! #CFLAGS     	+= -W -Wall -Wstrict-prototypes -Wno-unused-parameter -Wwrite-strings
  PREFIX		 = /usr/local
  BINDIR		 = $(PREFIX)/bin
  INCLUDEDIR	 = $(PREFIX)/include/mandoc
! LIBDIR		 = $(PREFIX)/lib
  MANDIR		 = $(PREFIX)/man
  EXAMPLEDIR	 = $(PREFIX)/share/examples/mandoc
  INSTALL		 = install
*** ./demandoc.c.ORIG	Wed Sep  7 22:45:14 2011
--- ./demandoc.c	Wed Sep  7 22:57:04 2011
***************
*** 20,26 ****
--- 20,28 ----
  
  #include <assert.h>
  #include <ctype.h>
+ #ifndef _AIX51
  #include <getopt.h>
+ #endif
  #include <stdio.h>
  #include <stdlib.h>
  #include <string.h>