===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/rcs/rcsmerge.c,v
retrieving revision 1.49
retrieving revision 1.50
diff -c -r1.49 -r1.50
*** src/usr.bin/rcs/rcsmerge.c	2006/10/12 17:20:12	1.49
--- src/usr.bin/rcs/rcsmerge.c	2007/02/27 07:59:13	1.50
***************
*** 1,4 ****
! /*	$OpenBSD: rcsmerge.c,v 1.49 2006/10/12 17:20:12 niallo Exp $	*/
  /*
   * Copyright (c) 2005, 2006 Xavier Santolaria <xsa@openbsd.org>
   * All rights reserved.
--- 1,4 ----
! /*	$OpenBSD: rcsmerge.c,v 1.50 2007/02/27 07:59:13 xsa Exp $	*/
  /*
   * Copyright (c) 2005, 2006 Xavier Santolaria <xsa@openbsd.org>
   * All rights reserved.
***************
*** 24,30 ****
   * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   */
  
! #include "includes.h"
  
  #include "rcsprog.h"
  #include "diff.h"
--- 24,34 ----
   * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   */
  
! #include <err.h>
! #include <stdio.h>
! #include <stdlib.h>
! #include <string.h>
! #include <unistd.h>
  
  #include "rcsprog.h"
  #include "diff.h"