=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/diff3/diff3prog.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- src/usr.bin/diff3/diff3prog.c 2012/03/04 04:05:15 1.12 +++ src/usr.bin/diff3/diff3prog.c 2013/11/15 22:20:04 1.13 @@ -1,4 +1,4 @@ -/* $OpenBSD: diff3prog.c,v 1.12 2012/03/04 04:05:15 fgsch Exp $ */ +/* $OpenBSD: diff3prog.c,v 1.13 2013/11/15 22:20:04 millert Exp $ */ /* * Copyright (C) Caldera International Inc. 2001-2002. @@ -64,11 +64,12 @@ * @(#)diff3.c 8.1 (Berkeley) 6/6/93 */ +#include +#include #include #include #include -#include -#include +#include /* diff3 - 3-way differential file comparison */