summaryrefslogtreecommitdiff
path: root/usr.bin/rcs/rcsmerge.c
diff options
context:
space:
mode:
authorXavier Santolaria <xsa@cvs.openbsd.org>2007-02-27 07:59:14 +0000
committerXavier Santolaria <xsa@cvs.openbsd.org>2007-02-27 07:59:14 +0000
commita50c6629c4b87021063cca8ee33d033693044f19 (patch)
tree9cd41a61ed2caed4fdd960c4a6f86d18750f2427 /usr.bin/rcs/rcsmerge.c
parent9f064f1ae44f3419a81d855a6c20ccf1003319b2 (diff)
As done in OpenCVS, general includes cleanup sweep. OK otto@.
Diffstat (limited to 'usr.bin/rcs/rcsmerge.c')
-rw-r--r--usr.bin/rcs/rcsmerge.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/usr.bin/rcs/rcsmerge.c b/usr.bin/rcs/rcsmerge.c
index ef69302c01b..ba0e93cf0d5 100644
--- a/usr.bin/rcs/rcsmerge.c
+++ b/usr.bin/rcs/rcsmerge.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rcsmerge.c,v 1.49 2006/10/12 17:20:12 niallo Exp $ */
+/* $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,7 +24,11 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "includes.h"
+#include <err.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
#include "rcsprog.h"
#include "diff.h"