--- wvstreams-4.2.1/include/wvstring.h.gcc41	2005-11-17 21:45:04.000000000 +0100
+++ wvstreams-4.2.1/include/wvstring.h	2005-12-19 13:57:43.000000000 +0100
@@ -393,7 +393,7 @@
     
 protected:
     void copy_constructor(const WvFastString &s);
-    inline void WvString::construct(const char *_str)
+    inline void construct(const char *_str)
         {
             link(&nullbuf, _str);
     
--- wvstreams-4.2.1/include/wvhttppool.h.gcc41	2005-11-17 21:45:04.000000000 +0100
+++ wvstreams-4.2.1/include/wvhttppool.h	2005-12-19 13:57:43.000000000 +0100
@@ -57,7 +57,7 @@
     WvString linkname;
     WvUrl url;
 
-    WvUrlLink::WvUrlLink(WvStringParm _linkname, WvStringParm _url)
+    WvUrlLink(WvStringParm _linkname, WvStringParm _url)
 	: linkname(_linkname), url(_url)
     {}
 };
--- wvstreams-4.2.1/include/uniconfkey.h.gcc41	2005-11-17 21:45:04.000000000 +0100
+++ wvstreams-4.2.1/include/uniconfkey.h	2005-12-19 13:57:43.000000000 +0100
@@ -113,7 +113,7 @@
     bool iswild() const;
 
     /** Returns true if the key has a trailing slash. */
-    bool UniConfKey::hastrailingslash() const;
+    bool hastrailingslash() const;
 
     /**
      * Returns the number of segments in this path.
--- wvstreams-4.2.1/include/wvx509.h.gcc41	2005-12-19 13:57:58.000000000 +0100
+++ wvstreams-4.2.1/include/wvx509.h	2005-12-19 13:57:33.000000000 +0100
@@ -349,19 +349,19 @@
      * Set the Certificate to use X509v3, since that's all modern
      * PKI uses anyways :)
      */
-    void WvX509Mgr::set_version();
+    void set_version();
 
     /**
      * Get and set the keyUsage field.
      */
-    WvString WvX509Mgr::get_key_usage();
-    void WvX509Mgr::set_key_usage(WvStringParm values);
+    WvString get_key_usage();
+    void set_key_usage(WvStringParm values);
 
     /**
      * Get and set the extendedKeyUsage field.
      */
-    WvString WvX509Mgr::get_ext_key_usage();
-    void WvX509Mgr::set_ext_key_usage(WvStringParm values);
+    WvString get_ext_key_usage();
+    void set_ext_key_usage(WvStringParm values);
     
     /**
      * Return the Subject alt name if it exists, and WvString::null if
--- wvstreams-4.2.1/gnulib/argp.h.gcc41	2005-11-17 21:44:59.000000000 +0100
+++ wvstreams-4.2.1/gnulib/argp.h	2005-12-19 13:57:43.000000000 +0100
@@ -505,7 +505,7 @@
 			       unsigned int __flags);
 
 /* Possibly output the standard usage message for ARGP to stderr and exit.  */
-extern void argp_usage (__const struct argp_state *__state);
+extern void __NTH(argp_usage (__const struct argp_state *__state));
 extern void __argp_usage (__const struct argp_state *__state);
 
 /* If appropriate, print the printf string FMT and following args, preceded