diff --git a/newlib/ChangeLog b/newlib/ChangeLog
index ff3605d6f..2a897d1d3 100644
--- a/newlib/ChangeLog
+++ b/newlib/ChangeLog
@@ -1,3 +1,12 @@
+2005-10-26  Shaun Jackman  <sjackman@gmail.com>
+
+	* libc/posix/scandir.c (scandir): Update the function
+	prototype to match the header.
+	* libc/sys/linux/linuxthreads/bits/libc-lock.h: Remove an
+	extraneous #endif.
+	* libc/sys/linux/sys/lock.h: Do not include
+	machine/weakalias.h, since it's not used by this file.
+
 2005-10-26  Jeff Johnston  <jjohnstn@redhat.com>
 
 	* libc/Makefile.am: Reorder SUBLIBS so machine and sys
diff --git a/newlib/libc/posix/scandir.c b/newlib/libc/posix/scandir.c
index 97094a676..2cd586050 100644
--- a/newlib/libc/posix/scandir.c
+++ b/newlib/libc/posix/scandir.c
@@ -74,8 +74,8 @@ int
 _DEFUN(scandir, (dirname, namelist, select, dcomp),
 	const char *dirname _AND
 	struct dirent ***namelist _AND
-	int (*select) __P((struct dirent *)) _AND
-	int (*dcomp) __P((const void *, const void *)))
+	int (*select) __P((const struct dirent *)) _AND
+	int (*dcomp) __P((const struct dirent **, const struct dirent **)))
 {
 	register struct dirent *d, *p, **names;
 	register size_t nitems;
@@ -155,7 +155,7 @@ _DEFUN(scandir, (dirname, namelist, select, dcomp),
 	}
 	closedir(dirp);
 	if (nitems && dcomp != NULL)
-		qsort(names, nitems, sizeof(struct dirent *), dcomp);
+		qsort(names, nitems, sizeof(struct dirent *), (void *)dcomp);
 	*namelist = names;
 #ifdef HAVE_DD_LOCK
 	__lock_release_recursive(dirp->dd_lock);
diff --git a/newlib/libc/sys/linux/linuxthreads/bits/libc-lock.h b/newlib/libc/sys/linux/linuxthreads/bits/libc-lock.h
index 125002255..84f91d569 100644
--- a/newlib/libc/sys/linux/linuxthreads/bits/libc-lock.h
+++ b/newlib/libc/sys/linux/linuxthreads/bits/libc-lock.h
@@ -287,7 +287,6 @@ extern int __pthread_atfork (void (*__prepare) (void),
 #  pragma weak __pthread_atfork
 #  pragma weak _pthread_cleanup_push_defer
 #  pragma weak _pthread_cleanup_pop_restore
-# endif
 #endif
 
 /* We need portable names for some functions.  E.g., when they are
diff --git a/newlib/libc/sys/linux/sys/lock.h b/newlib/libc/sys/linux/sys/lock.h
index 167392e10..d934031e2 100644
--- a/newlib/libc/sys/linux/sys/lock.h
+++ b/newlib/libc/sys/linux/sys/lock.h
@@ -1,7 +1,6 @@
 #ifndef __SYS_LOCK_H__
 #define __SYS_LOCK_H__
 
-#include <machine/weakalias.h>
 #include <features.h>
 
 #define  _LIBC  1