diff -Naur pwlib-1.8.7.old/include/ptclib/vxml.h pwlib-1.8.7/include/ptclib/vxml.h
--- pwlib-1.8.7.old/include/ptclib/vxml.h	2006-03-13 07:38:38.000000000 -0500
+++ pwlib-1.8.7/include/ptclib/vxml.h	2006-03-13 21:43:56.000000000 -0500
@@ -366,7 +366,7 @@
 
     virtual PString GetVar(const PString & str) const;
     virtual void SetVar(const PString & ostr, const PString & val);
-    virtual PString PVXMLSession::EvaluateExpr(const PString & oexpr);
+    virtual PString EvaluateExpr(const PString & oexpr);
 
     virtual BOOL RetreiveResource(const PURL & url, PString & contentType, PFilePath & fn, BOOL useCache = TRUE);
 
diff -Naur pwlib-1.8.7.old/include/ptlib/pstring.h pwlib-1.8.7/include/ptlib/pstring.h
--- pwlib-1.8.7.old/include/ptlib/pstring.h	2006-03-13 07:38:38.000000000 -0500
+++ pwlib-1.8.7/include/ptlib/pstring.h	2006-03-13 21:17:08.000000000 -0500
@@ -353,11 +353,11 @@
    they are compatible enough for them to be treated the same for most real
    world usage.
  */
-
+    
 class PString : public PCharArray {
   PCLASSINFO(PString, PCharArray);
 
-//  using namespace std;
+  //using namespace std;
 
   public:
   /**@name Construction */
@@ -1846,6 +1846,8 @@
     PString(int dummy, const PString * str);
 };
 
+PString psprintf(const char * cfmt, ...);
+
 
 //////////////////////////////////////////////////////////////////////////////
 
diff -Naur pwlib-1.8.7.old/plugins/vidinput_v4l2/vidinput_v4l2.cxx pwlib-1.8.7/plugins/vidinput_v4l2/vidinput_v4l2.cxx
--- pwlib-1.8.7.old/plugins/vidinput_v4l2/vidinput_v4l2.cxx	2006-03-13 07:38:38.000000000 -0500
+++ pwlib-1.8.7/plugins/vidinput_v4l2/vidinput_v4l2.cxx	2006-03-14 07:06:14.000000000 -0500
@@ -74,7 +74,7 @@
   
 protected:
   
-  virtual PString V4L2Names::BuildUserFriendly(PString devname);
+  virtual PString BuildUserFriendly(PString devname);
 
   enum KernelVersionEnum {
     K2_4, 
diff -Naur pwlib-1.8.7.old/src/ptlib/unix/svcproc.cxx pwlib-1.8.7/src/ptlib/unix/svcproc.cxx
--- pwlib-1.8.7.old/src/ptlib/unix/svcproc.cxx	2006-03-13 07:38:38.000000000 -0500
+++ pwlib-1.8.7/src/ptlib/unix/svcproc.cxx	2006-03-13 22:16:59.000000000 -0500
@@ -279,6 +279,8 @@
 #include <sys/resource.h>
 #endif
 
+void PXSignalHandler(int);
+
 #define new PNEW
 
 
@@ -312,7 +314,7 @@
   "Debug5",
   "Debug6",
 };
-
+            
 #ifdef P_MAC_MPTHREADS
 // alas, this can't be statically initialized
 // XXX This ought to be an MPCriticalRegionID, but they're broken in
diff -Naur pwlib-1.8.7.old/src/ptlib/unix/tlib.cxx pwlib-1.8.7/src/ptlib/unix/tlib.cxx
--- pwlib-1.8.7.old/src/ptlib/unix/tlib.cxx	2006-03-13 07:38:38.000000000 -0500
+++ pwlib-1.8.7/src/ptlib/unix/tlib.cxx	2006-03-13 22:16:47.000000000 -0500
@@ -296,6 +296,7 @@
 #include "OS.h"
 #endif
 
+void PXSignalHandler(int);
 
 PString PProcess::GetOSClass()
 {