===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/rcs/rcsmerge.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- src/usr.bin/rcs/rcsmerge.c	2005/12/10 20:27:46	1.11
+++ src/usr.bin/rcs/rcsmerge.c	2006/01/02 08:13:28	1.12
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rcsmerge.c,v 1.11 2005/12/10 20:27:46 joris Exp $	*/
+/*	$OpenBSD: rcsmerge.c,v 1.12 2006/01/02 08:13:28 xsa Exp $	*/
 /*
  * Copyright (c) 2005 Xavier Santolaria <xsa@openbsd.org>
  * All rights reserved.
@@ -24,13 +24,7 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/param.h>
-#include <sys/stat.h>
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
+#include "includes.h"
 
 #include "log.h"
 #include "rcs.h"