BSD advertizing clause in some files

Someone has pointed out that the following files have the 4-part BSD
copyright, which includes the advertising clause:

src/backend/port/darwin/system.c
src/backend/port/dynloader/freebsd.c
src/backend/port/dynloader/openbsd.c
src/backend/port/dynloader/netbsd.c
src/backend/utils/mb/wstrcmp.c
src/backend/utils/mb/wstrncmp.c
src/port/strtoul.c
src/port/getopt.c
src/port/getopt_long.c
src/port/inet_aton.c
src/port/strtol.c
src/port/snprintf.c
contrib/pgcrypto/blf.c
contrib/pgcrypto/blf.h

Because Berkeley has said the advertising clause is to be
ignored/removed, should we remove it from our files too?

--
Bruce Momjian <bruce(at)momjian(dot)us> http://momjian.us
EnterpriseDB http://www.enterprisedb.com

+ If your life is a hard drive, Christ can be your backup. +