summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2005-11-10 16:18:56 +1100
committerDarren Tucker <dtucker@zip.com.au>2005-11-10 16:18:56 +1100
commit7f24a0e64774e6566242f44b0f06ab06607d0c97 (patch)
treef6b8d04689e1c7d6b6b5e761dfaca9b3d8d64273
parent80c0d7eb885d244d4745b55a392ee07b03e41676 (diff)
- (dtucker) [openbsd-compat/{LOTS}] Move the "OPENBSD ORIGINAL" markers to
after the copyright notices. Having them at the top next to the CVSIDs guarantees a conflict for each and every sync.
-rw-r--r--ChangeLog5
-rw-r--r--openbsd-compat/base64.c4
-rw-r--r--openbsd-compat/basename.c4
-rw-r--r--openbsd-compat/daemon.c4
-rw-r--r--openbsd-compat/dirname.c4
-rw-r--r--openbsd-compat/getcwd.c4
-rw-r--r--openbsd-compat/getgrouplist.c4
-rw-r--r--openbsd-compat/getopt.c4
-rw-r--r--openbsd-compat/getrrsetbyname.c4
-rw-r--r--openbsd-compat/glob.c4
-rw-r--r--openbsd-compat/glob.h4
-rw-r--r--openbsd-compat/inet_aton.c4
-rw-r--r--openbsd-compat/inet_ntoa.c4
-rw-r--r--openbsd-compat/inet_ntop.c4
-rw-r--r--openbsd-compat/mktemp.c4
-rw-r--r--openbsd-compat/readpassphrase.c4
-rw-r--r--openbsd-compat/readpassphrase.h4
-rw-r--r--openbsd-compat/realpath.c4
-rw-r--r--openbsd-compat/rresvport.c4
-rw-r--r--openbsd-compat/setenv.c4
-rw-r--r--openbsd-compat/sigact.c4
-rw-r--r--openbsd-compat/strlcat.c4
-rw-r--r--openbsd-compat/strlcpy.c4
-rw-r--r--openbsd-compat/strmode.c4
-rw-r--r--openbsd-compat/strsep.c4
-rw-r--r--openbsd-compat/strtoll.c4
-rw-r--r--openbsd-compat/strtonum.c4
-rw-r--r--openbsd-compat/strtoul.c4
-rw-r--r--openbsd-compat/sys-queue.h4
-rw-r--r--openbsd-compat/sys-tree.h4
-rw-r--r--openbsd-compat/vis.c4
-rw-r--r--openbsd-compat/vis.h4
32 files changed, 66 insertions, 63 deletions
diff --git a/ChangeLog b/ChangeLog
index 0ea4054f..367127eb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,6 +14,9 @@
prototypes, removal of "register").
- (dtucker) [openbsd-compat/strlcat.c] Sync OpenBSD revs 1.11 - 1.12 (removal
of "register").
+ - (dtucker) [openbsd-compat/{LOTS}] Move the "OPENBSD ORIGINAL" markers to
+ after the copyright notices. Having them at the top next to the CVSIDs
+ guarantees a conflict for each and every sync.
20051105
- (djm) OpenBSD CVS Sync
@@ -3256,4 +3259,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
-$Id: ChangeLog,v 1.3961 2005/11/10 05:05:37 dtucker Exp $
+$Id: ChangeLog,v 1.3962 2005/11/10 05:18:56 dtucker Exp $
diff --git a/openbsd-compat/base64.c b/openbsd-compat/base64.c
index dcaa03e5..6eadb5c1 100644
--- a/openbsd-compat/base64.c
+++ b/openbsd-compat/base64.c
@@ -1,5 +1,3 @@
-/* OPENBSD ORIGINAL: lib/libc/net/base64.c */
-
/* $OpenBSD: base64.c,v 1.4 2002/01/02 23:00:10 deraadt Exp $ */
/*
@@ -44,6 +42,8 @@
* IF IBM IS APPRISED OF THE POSSIBILITY OF SUCH DAMAGES.
*/
+/* OPENBSD ORIGINAL: lib/libc/net/base64.c */
+
#include "includes.h"
#if (!defined(HAVE_B64_NTOP) && !defined(HAVE___B64_NTOP)) || (!defined(HAVE_B64_PTON) && !defined(HAVE___B64_PTON))
diff --git a/openbsd-compat/basename.c b/openbsd-compat/basename.c
index 552dc1e1..5171cd64 100644
--- a/openbsd-compat/basename.c
+++ b/openbsd-compat/basename.c
@@ -1,5 +1,3 @@
-/* OPENBSD ORIGINAL: lib/libc/gen/basename.c */
-
/* $OpenBSD: basename.c,v 1.11 2003/06/17 21:56:23 millert Exp $ */
/*
@@ -18,6 +16,8 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
+/* OPENBSD ORIGINAL: lib/libc/gen/basename.c */
+
#include "includes.h"
#ifndef HAVE_BASENAME
diff --git a/openbsd-compat/daemon.c b/openbsd-compat/daemon.c
index c0be5fff..89e75a99 100644
--- a/openbsd-compat/daemon.c
+++ b/openbsd-compat/daemon.c
@@ -1,5 +1,3 @@
-/* OPENBSD ORIGINAL: lib/libc/gen/daemon.c */
-
/*-
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
@@ -29,6 +27,8 @@
* SUCH DAMAGE.
*/
+/* OPENBSD ORIGINAL: lib/libc/gen/daemon.c */
+
#include "includes.h"
#ifndef HAVE_DAEMON
diff --git a/openbsd-compat/dirname.c b/openbsd-compat/dirname.c
index 25ab34dd..e2cf81db 100644
--- a/openbsd-compat/dirname.c
+++ b/openbsd-compat/dirname.c
@@ -1,5 +1,3 @@
-/* OPENBSD ORIGINAL: lib/libc/gen/dirname.c */
-
/* $OpenBSD: dirname.c,v 1.10 2003/06/17 21:56:23 millert Exp $ */
/*
@@ -18,6 +16,8 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
+/* OPENBSD ORIGINAL: lib/libc/gen/dirname.c */
+
#include "includes.h"
#ifndef HAVE_DIRNAME
diff --git a/openbsd-compat/getcwd.c b/openbsd-compat/getcwd.c
index 19be5917..d58c03e0 100644
--- a/openbsd-compat/getcwd.c
+++ b/openbsd-compat/getcwd.c
@@ -1,5 +1,3 @@
-/* OPENBSD ORIGINAL: lib/libc/gen/getcwd.c */
-
/*
* Copyright (c) 1989, 1991, 1993
* The Regents of the University of California. All rights reserved.
@@ -29,6 +27,8 @@
* SUCH DAMAGE.
*/
+/* OPENBSD ORIGINAL: lib/libc/gen/getcwd.c */
+
#include "includes.h"
#if !defined(HAVE_GETCWD)
diff --git a/openbsd-compat/getgrouplist.c b/openbsd-compat/getgrouplist.c
index 2a2b8878..a57d7d38 100644
--- a/openbsd-compat/getgrouplist.c
+++ b/openbsd-compat/getgrouplist.c
@@ -1,5 +1,3 @@
-/* OPENBSD ORIGINAL: lib/libc/gen/getgrouplist.c */
-
/* $OpenBSD: getgrouplist.c,v 1.12 2005/08/08 08:05:34 espie Exp $ */
/*
* Copyright (c) 1991, 1993
@@ -30,6 +28,8 @@
* SUCH DAMAGE.
*/
+/* OPENBSD ORIGINAL: lib/libc/gen/getgrouplist.c */
+
#include "includes.h"
#ifndef HAVE_GETGROUPLIST
diff --git a/openbsd-compat/getopt.c b/openbsd-compat/getopt.c
index f5ee6778..5450e43d 100644
--- a/openbsd-compat/getopt.c
+++ b/openbsd-compat/getopt.c
@@ -1,5 +1,3 @@
-/* OPENBSD ORIGINAL: lib/libc/stdlib/getopt.c */
-
/*
* Copyright (c) 1987, 1993, 1994
* The Regents of the University of California. All rights reserved.
@@ -29,6 +27,8 @@
* SUCH DAMAGE.
*/
+/* OPENBSD ORIGINAL: lib/libc/stdlib/getopt.c */
+
#include "includes.h"
#if !defined(HAVE_GETOPT) || !defined(HAVE_GETOPT_OPTRESET)
diff --git a/openbsd-compat/getrrsetbyname.c b/openbsd-compat/getrrsetbyname.c
index 973e480b..8d571bee 100644
--- a/openbsd-compat/getrrsetbyname.c
+++ b/openbsd-compat/getrrsetbyname.c
@@ -1,5 +1,3 @@
-/* OPENBSD ORIGINAL: lib/libc/net/getrrsetbyname.c */
-
/* $OpenBSD: getrrsetbyname.c,v 1.10 2005/03/30 02:58:28 tedu Exp $ */
/*
@@ -45,6 +43,8 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
+/* OPENBSD ORIGINAL: lib/libc/net/getrrsetbyname.c */
+
#include "includes.h"
#ifndef HAVE_GETRRSETBYNAME
diff --git a/openbsd-compat/glob.c b/openbsd-compat/glob.c
index 7fafc8c4..e00db707 100644
--- a/openbsd-compat/glob.c
+++ b/openbsd-compat/glob.c
@@ -1,5 +1,3 @@
-/* OPENBSD ORIGINAL: lib/libc/gen/glob.c */
-
/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
@@ -32,6 +30,8 @@
* SUCH DAMAGE.
*/
+/* OPENBSD ORIGINAL: lib/libc/gen/glob.c */
+
#include "includes.h"
#include <ctype.h>
diff --git a/openbsd-compat/glob.h b/openbsd-compat/glob.h
index 3428b201..5d80073d 100644
--- a/openbsd-compat/glob.h
+++ b/openbsd-compat/glob.h
@@ -1,5 +1,3 @@
-/* OPENBSD ORIGINAL: include/glob.h */
-
/* $OpenBSD: glob.h,v 1.8 2003/06/02 19:34:12 millert Exp $ */
/* $NetBSD: glob.h,v 1.5 1994/10/26 00:55:56 cgd Exp $ */
@@ -37,6 +35,8 @@
* @(#)glob.h 8.1 (Berkeley) 6/2/93
*/
+/* OPENBSD ORIGINAL: include/glob.h */
+
#if !defined(HAVE_GLOB_H) || !defined(GLOB_HAS_ALTDIRFUNC) || \
!defined(GLOB_HAS_GL_MATCHC)
diff --git a/openbsd-compat/inet_aton.c b/openbsd-compat/inet_aton.c
index c141bcc6..355bf6bc 100644
--- a/openbsd-compat/inet_aton.c
+++ b/openbsd-compat/inet_aton.c
@@ -1,5 +1,3 @@
-/* OPENBSD ORIGINAL: lib/libc/net/inet_addr.c */
-
/* $OpenBSD: inet_addr.c,v 1.7 2003/06/02 20:18:35 millert Exp $ */
/*
@@ -51,6 +49,8 @@
* --Copyright--
*/
+/* OPENBSD ORIGINAL: lib/libc/net/inet_addr.c */
+
#include "includes.h"
#if !defined(HAVE_INET_ATON)
diff --git a/openbsd-compat/inet_ntoa.c b/openbsd-compat/inet_ntoa.c
index dc010dc5..16390b17 100644
--- a/openbsd-compat/inet_ntoa.c
+++ b/openbsd-compat/inet_ntoa.c
@@ -1,5 +1,3 @@
-/* OPENBSD ORIGINAL: lib/libc/net/inet_ntoa.c */
-
/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
@@ -29,6 +27,8 @@
* SUCH DAMAGE.
*/
+/* OPENBSD ORIGINAL: lib/libc/net/inet_ntoa.c */
+
#include "includes.h"
#if defined(BROKEN_INET_NTOA) || !defined(HAVE_INET_NTOA)
diff --git a/openbsd-compat/inet_ntop.c b/openbsd-compat/inet_ntop.c
index 47796c37..c75a80d2 100644
--- a/openbsd-compat/inet_ntop.c
+++ b/openbsd-compat/inet_ntop.c
@@ -1,5 +1,3 @@
-/* OPENBSD ORIGINAL: lib/libc/net/inet_ntop.c */
-
/* $OpenBSD: inet_ntop.c,v 1.5 2002/08/23 16:27:31 itojun Exp $ */
/* Copyright (c) 1996 by Internet Software Consortium.
@@ -18,6 +16,8 @@
* SOFTWARE.
*/
+/* OPENBSD ORIGINAL: lib/libc/net/inet_ntop.c */
+
#include "includes.h"
#ifndef HAVE_INET_NTOP
diff --git a/openbsd-compat/mktemp.c b/openbsd-compat/mktemp.c
index 969f6958..8071aa18 100644
--- a/openbsd-compat/mktemp.c
+++ b/openbsd-compat/mktemp.c
@@ -1,5 +1,3 @@
-/* OPENBSD ORIGINAL: lib/libc/stdio/mktemp.c */
-
/* THIS FILE HAS BEEN MODIFIED FROM THE ORIGINAL OPENBSD SOURCE */
/* Changes: Removed mktemp */
@@ -32,6 +30,8 @@
* SUCH DAMAGE.
*/
+/* OPENBSD ORIGINAL: lib/libc/stdio/mktemp.c */
+
#include "includes.h"
#if !defined(HAVE_MKDTEMP) || defined(HAVE_STRICT_MKSTEMP)
diff --git a/openbsd-compat/readpassphrase.c b/openbsd-compat/readpassphrase.c
index eb060bdb..2c84f802 100644
--- a/openbsd-compat/readpassphrase.c
+++ b/openbsd-compat/readpassphrase.c
@@ -1,5 +1,3 @@
-/* OPENBSD ORIGINAL: lib/libc/gen/readpassphrase.c */
-
/* $OpenBSD: readpassphrase.c,v 1.16 2003/06/17 21:56:23 millert Exp $ */
/*
@@ -22,6 +20,8 @@
* Materiel Command, USAF, under agreement number F39502-99-1-0512.
*/
+/* OPENBSD ORIGINAL: lib/libc/gen/readpassphrase.c */
+
#if defined(LIBC_SCCS) && !defined(lint)
static const char rcsid[] = "$OpenBSD: readpassphrase.c,v 1.16 2003/06/17 21:56:23 millert Exp $";
#endif /* LIBC_SCCS and not lint */
diff --git a/openbsd-compat/readpassphrase.h b/openbsd-compat/readpassphrase.h
index 178edf34..faab4718 100644
--- a/openbsd-compat/readpassphrase.h
+++ b/openbsd-compat/readpassphrase.h
@@ -1,5 +1,3 @@
-/* OPENBSD ORIGINAL: include/readpassphrase.h */
-
/* $OpenBSD: readpassphrase.h,v 1.3 2002/06/28 12:32:22 millert Exp $ */
/*
@@ -29,6 +27,8 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+/* OPENBSD ORIGINAL: include/readpassphrase.h */
+
#ifndef _READPASSPHRASE_H_
#define _READPASSPHRASE_H_
diff --git a/openbsd-compat/realpath.c b/openbsd-compat/realpath.c
index 8430bec2..8c889db3 100644
--- a/openbsd-compat/realpath.c
+++ b/openbsd-compat/realpath.c
@@ -1,5 +1,3 @@
-/* OPENBSD ORIGINAL: lib/libc/stdlib/realpath.c */
-
/*
* Copyright (c) 2003 Constantin S. Svintsoff <kostik@iclub.nsu.ru>
*
@@ -28,6 +26,8 @@
* SUCH DAMAGE.
*/
+/* OPENBSD ORIGINAL: lib/libc/stdlib/realpath.c */
+
#include "includes.h"
#if !defined(HAVE_REALPATH) || defined(BROKEN_REALPATH)
diff --git a/openbsd-compat/rresvport.c b/openbsd-compat/rresvport.c
index 75167065..aa72f4ba 100644
--- a/openbsd-compat/rresvport.c
+++ b/openbsd-compat/rresvport.c
@@ -1,5 +1,3 @@
-/* OPENBSD ORIGINAL: lib/libc/net/rresvport.c */
-
/*
* Copyright (c) 1995, 1996, 1998 Theo de Raadt. All rights reserved.
* Copyright (c) 1983, 1993, 1994
@@ -30,6 +28,8 @@
* SUCH DAMAGE.
*/
+/* OPENBSD ORIGINAL: lib/libc/net/rresvport.c */
+
#include "includes.h"
#ifndef HAVE_RRESVPORT_AF
diff --git a/openbsd-compat/setenv.c b/openbsd-compat/setenv.c
index 93a68115..b52a99c2 100644
--- a/openbsd-compat/setenv.c
+++ b/openbsd-compat/setenv.c
@@ -1,5 +1,3 @@
-/* OPENBSD ORIGINAL: lib/libc/stdlib/setenv.c */
-
/* $OpenBSD: setenv.c,v 1.9 2005/08/08 08:05:37 espie Exp $ */
/*
* Copyright (c) 1987 Regents of the University of California.
@@ -30,6 +28,8 @@
* SUCH DAMAGE.
*/
+/* OPENBSD ORIGINAL: lib/libc/stdlib/setenv.c */
+
#include "includes.h"
#if !defined(HAVE_SETENV) || !defined(HAVE_UNSETENV)
diff --git a/openbsd-compat/sigact.c b/openbsd-compat/sigact.c
index 2772ac57..d1431a0d 100644
--- a/openbsd-compat/sigact.c
+++ b/openbsd-compat/sigact.c
@@ -1,5 +1,3 @@
-/* OPENBSD ORIGINAL: lib/libcurses/base/sigaction.c */
-
/* $OpenBSD: sigaction.c,v 1.3 1999/06/27 08:14:21 millert Exp $ */
/****************************************************************************
@@ -35,6 +33,8 @@
* and: Eric S. Raymond <esr@snark.thyrsus.com> *
****************************************************************************/
+/* OPENBSD ORIGINAL: lib/libcurses/base/sigaction.c */
+
#include "includes.h"
#include <signal.h>
#include "sigact.h"
diff --git a/openbsd-compat/strlcat.c b/openbsd-compat/strlcat.c
index 8252f31a..bcc1b61a 100644
--- a/openbsd-compat/strlcat.c
+++ b/openbsd-compat/strlcat.c
@@ -1,5 +1,3 @@
-/* OPENBSD ORIGINAL: lib/libc/string/strlcat.c */
-
/* $OpenBSD: strlcat.c,v 1.13 2005/08/08 08:05:37 espie Exp $ */
/*
@@ -18,6 +16,8 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
+/* OPENBSD ORIGINAL: lib/libc/string/strlcat.c */
+
#include "includes.h"
#ifndef HAVE_STRLCAT
diff --git a/openbsd-compat/strlcpy.c b/openbsd-compat/strlcpy.c
index ccfa12a0..73642120 100644
--- a/openbsd-compat/strlcpy.c
+++ b/openbsd-compat/strlcpy.c
@@ -1,5 +1,3 @@
-/* OPENBSD ORIGINAL: lib/libc/string/strlcpy.c */
-
/* $OpenBSD: strlcpy.c,v 1.8 2003/06/17 21:56:24 millert Exp $ */
/*
@@ -18,6 +16,8 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
+/* OPENBSD ORIGINAL: lib/libc/string/strlcpy.c */
+
#include "includes.h"
#ifndef HAVE_STRLCPY
diff --git a/openbsd-compat/strmode.c b/openbsd-compat/strmode.c
index ea8d515e..0dbb2373 100644
--- a/openbsd-compat/strmode.c
+++ b/openbsd-compat/strmode.c
@@ -1,5 +1,3 @@
-/* OPENBSD ORIGINAL: lib/libc/string/strmode.c */
-
/*-
* Copyright (c) 1990 The Regents of the University of California.
* All rights reserved.
@@ -29,6 +27,8 @@
* SUCH DAMAGE.
*/
+/* OPENBSD ORIGINAL: lib/libc/string/strmode.c */
+
#include "includes.h"
#ifndef HAVE_STRMODE
diff --git a/openbsd-compat/strsep.c b/openbsd-compat/strsep.c
index 330d84ce..9e81980c 100644
--- a/openbsd-compat/strsep.c
+++ b/openbsd-compat/strsep.c
@@ -1,5 +1,3 @@
-/* OPENBSD ORIGINAL: lib/libc/string/strsep.c */
-
/* $OpenBSD: strsep.c,v 1.5 2003/06/11 21:08:16 deraadt Exp $ */
/*-
@@ -31,6 +29,8 @@
* SUCH DAMAGE.
*/
+/* OPENBSD ORIGINAL: lib/libc/string/strsep.c */
+
#include "includes.h"
#if !defined(HAVE_STRSEP)
diff --git a/openbsd-compat/strtoll.c b/openbsd-compat/strtoll.c
index 60c276f8..653f572f 100644
--- a/openbsd-compat/strtoll.c
+++ b/openbsd-compat/strtoll.c
@@ -1,5 +1,3 @@
-/* OPENBSD ORIGINAL: lib/libc/stdlib/strtoll.c */
-
/*-
* Copyright (c) 1992 The Regents of the University of California.
* All rights reserved.
@@ -29,6 +27,8 @@
* SUCH DAMAGE.
*/
+/* OPENBSD ORIGINAL: lib/libc/stdlib/strtoll.c */
+
#include "includes.h"
#ifndef HAVE_STRTOLL
diff --git a/openbsd-compat/strtonum.c b/openbsd-compat/strtonum.c
index b681ed83..8ad0d005 100644
--- a/openbsd-compat/strtonum.c
+++ b/openbsd-compat/strtonum.c
@@ -1,5 +1,3 @@
-/* OPENBSD ORIGINAL: lib/libc/stdlib/strtonum.c */
-
/* $OpenBSD: strtonum.c,v 1.6 2004/08/03 19:38:01 millert Exp $ */
/*
@@ -19,6 +17,8 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
+/* OPENBSD ORIGINAL: lib/libc/stdlib/strtonum.c */
+
#include "includes.h"
#ifndef HAVE_STRTONUM
#include <limits.h>
diff --git a/openbsd-compat/strtoul.c b/openbsd-compat/strtoul.c
index 24d0e253..7c093c48 100644
--- a/openbsd-compat/strtoul.c
+++ b/openbsd-compat/strtoul.c
@@ -1,5 +1,3 @@
-/* OPENBSD ORIGINAL: lib/libc/stdlib/strtoul.c */
-
/*
* Copyright (c) 1990 Regents of the University of California.
* All rights reserved.
@@ -29,6 +27,8 @@
* SUCH DAMAGE.
*/
+/* OPENBSD ORIGINAL: lib/libc/stdlib/strtoul.c */
+
#include "includes.h"
#ifndef HAVE_STRTOUL
diff --git a/openbsd-compat/sys-queue.h b/openbsd-compat/sys-queue.h
index c49a9465..40234332 100644
--- a/openbsd-compat/sys-queue.h
+++ b/openbsd-compat/sys-queue.h
@@ -1,5 +1,3 @@
-/* OPENBSD ORIGINAL: sys/sys/queue.h */
-
/* $OpenBSD: queue.h,v 1.25 2004/04/08 16:08:21 henning Exp $ */
/* $NetBSD: queue.h,v 1.11 1996/05/16 05:17:14 mycroft Exp $ */
@@ -34,6 +32,8 @@
* @(#)queue.h 8.5 (Berkeley) 8/20/94
*/
+/* OPENBSD ORIGINAL: sys/sys/queue.h */
+
#ifndef _FAKE_QUEUE_H_
#define _FAKE_QUEUE_H_
diff --git a/openbsd-compat/sys-tree.h b/openbsd-compat/sys-tree.h
index 73cfbe72..c80b90b2 100644
--- a/openbsd-compat/sys-tree.h
+++ b/openbsd-compat/sys-tree.h
@@ -1,5 +1,3 @@
-/* OPENBSD ORIGINAL: sys/sys/tree.h */
-
/* $OpenBSD: tree.h,v 1.7 2002/10/17 21:51:54 art Exp $ */
/*
* Copyright 2002 Niels Provos <provos@citi.umich.edu>
@@ -26,6 +24,8 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+/* OPENBSD ORIGINAL: sys/sys/tree.h */
+
#ifndef _SYS_TREE_H_
#define _SYS_TREE_H_
diff --git a/openbsd-compat/vis.c b/openbsd-compat/vis.c
index 52d19ac5..3a087b34 100644
--- a/openbsd-compat/vis.c
+++ b/openbsd-compat/vis.c
@@ -1,5 +1,3 @@
-/* OPENBSD ORIGINAL: lib/libc/gen/vis.c */
-
/* $OpenBSD: vis.c,v 1.19 2005/09/01 17:15:49 millert Exp $ */
/*-
* Copyright (c) 1989, 1993
@@ -30,6 +28,8 @@
* SUCH DAMAGE.
*/
+/* OPENBSD ORIGINAL: lib/libc/gen/vis.c */
+
#include "includes.h"
#if !defined(HAVE_STRNVIS)
diff --git a/openbsd-compat/vis.h b/openbsd-compat/vis.h
index 0588f68d..3898a9e7 100644
--- a/openbsd-compat/vis.h
+++ b/openbsd-compat/vis.h
@@ -1,5 +1,3 @@
-/* OPENBSD ORIGINAL: include/vis.h */
-
/* $OpenBSD: vis.h,v 1.11 2005/08/09 19:38:31 millert Exp $ */
/* $NetBSD: vis.h,v 1.4 1994/10/26 00:56:41 cgd Exp $ */
@@ -34,6 +32,8 @@
* @(#)vis.h 5.9 (Berkeley) 4/3/91
*/
+/* OPENBSD ORIGINAL: include/vis.h */
+
#include "includes.h"
#if !defined(HAVE_STRNVIS)