--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2007-08-22  Eric Blake  <ebb9@byu.net>
 
+	* tests/test-getdelim.c (main): Use remove, not unlink.
+	* tests/test-getline.c (main): Likewise.
+
 	Move getline and getdelim into stdio.h, per POSIX 200x.
 	* modules/getline (Files): Remove getline.h.
 	(Depends-on): Add stdio.

deleted file mode 100644
--- a/lib/getdelim.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* getdelim.h --- Prototype for replacement getdelim function.
-   Copyright (C) 2005 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2, or (at
-   your option) any later version.
-
-   This program is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-   02110-1301, USA.  */
-
-/* Written by Simon Josefsson. */
-
-/* Get size_t, FILE, ssize_t.  And getdelim, if available.  */
-# include <stddef.h>
-# include <stdio.h>
-# include <sys/types.h>
-
-#if !HAVE_DECL_GETDELIM
-ssize_t getdelim (char **lineptr, size_t *n, int delimiter, FILE *stream);
-#endif /* !HAVE_GETDELIM */

deleted file mode 100644
--- a/lib/getline.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* getline.h --- Prototype for replacement getline function.
-   Copyright (C) 2005 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2, or (at
-   your option) any later version.
-
-   This program is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-   02110-1301, USA.  */
-
-/* Written by Simon Josefsson. */
-
-/* Get size_t, FILE, ssize_t.  And getline, if available.  */
-# include <stddef.h>
-# include <stdio.h>
-# include <sys/types.h>
-
-#if !HAVE_DECL_GETLINE
-ssize_t getline (char **lineptr, size_t *n, FILE *stream);
-#endif /* !HAVE_GETLINE */

--- a/tests/test-getdelim.c
+++ b/tests/test-getdelim.c
@@ -47,14 +47,14 @@
   if (!f || fwrite ("anbcnd\0f", 1, 8, f) != 8 || fclose (f) != 0)
     {
       fputs ("Failed to create sample file.\n", stderr);
-      unlink ("test-getdelim.txt");
+      remove ("test-getdelim.txt");
       return 1;
     }
   f = fopen ("test-getdelim.txt", "rb");
   if (!f)
     {
       fputs ("Failed to reopen sample file.\n", stderr);
-      unlink ("test-getdelim.txt");
+      remove ("test-getdelim.txt");
       return 1;
     }
 
@@ -84,6 +84,6 @@
 
   free (line);
   fclose (f);
-  unlink ("test-getdelim.txt");
+  remove ("test-getdelim.txt");
   return 0;
 }

--- a/tests/test-getline.c
+++ b/tests/test-getline.c
@@ -47,14 +47,14 @@
   if (!f || fwrite ("a\nbc\nd\0f", 1, 8, f) != 8 || fclose (f) != 0)
     {
       fputs ("Failed to create sample file.\n", stderr);
-      unlink ("test-getline.txt");
+      remove ("test-getline.txt");
       return 1;
     }
   f = fopen ("test-getline.txt", "rb");
   if (!f)
     {
       fputs ("Failed to reopen sample file.\n", stderr);
-      unlink ("test-getline.txt");
+      remove ("test-getline.txt");
       return 1;
     }
 
@@ -84,6 +84,6 @@
 
   free (line);
   fclose (f);
-  unlink ("test-getline.txt");
+  remove ("test-getline.txt");
   return 0;
 }