Index: uClibc-20060824/libpthread/linuxthreads.old/ptlongjmp.c
===================================================================
--- uClibc-20060824.orig/libpthread/linuxthreads.old/ptlongjmp.c
+++ uClibc-20060824/libpthread/linuxthreads.old/ptlongjmp.c
@@ -18,6 +18,7 @@
 #include <setjmp.h>
 #include "pthread.h"
 #include "internals.h"
+#include <jmpbuf-unwind.h>
 
 /* These functions are not declared anywhere since they shouldn't be
    used at another place but here.  */
Index: uClibc-20060824/libpthread/linuxthreads.old/internals.h
===================================================================
--- uClibc-20060824.orig/libpthread/linuxthreads.old/internals.h
+++ uClibc-20060824/libpthread/linuxthreads.old/internals.h
@@ -320,7 +320,6 @@ static inline int invalid_handle(pthread
 
 /* The page size we can get from the system.  This should likely not be
    changed by the machine file but, you never know.  */
-extern size_t __pagesize;
 #include <bits/uClibc_page.h>
 #ifndef PAGE_SIZE
 #define PAGE_SIZE  (sysconf (_SC_PAGESIZE))
@@ -333,19 +332,19 @@ extern size_t __pagesize;
 #ifdef __ARCH_USE_MMU__
 #define STACK_SIZE  (2 * 1024 * 1024)
 #else
-#define STACK_SIZE  (4 * __pagesize)
+#define STACK_SIZE  (4 * PAGE_SIZE)
 #endif
 #endif
 
 /* The initial size of the thread stack.  Must be a multiple of PAGE_SIZE.  */
 #ifndef INITIAL_STACK_SIZE
-#define INITIAL_STACK_SIZE  (4 * __pagesize)
+#define INITIAL_STACK_SIZE  (4 * PAGE_SIZE)
 #endif
 
 /* Size of the thread manager stack. The "- 32" avoids wasting space
    with some malloc() implementations. */
 #ifndef THREAD_MANAGER_STACK_SIZE
-#define THREAD_MANAGER_STACK_SIZE  (2 * __pagesize - 32)
+#define THREAD_MANAGER_STACK_SIZE  (2 * PAGE_SIZE - 32)
 #endif
 
 /* The base of the "array" of thread stacks.  The array will grow down from