--- wvstreams-4.6.1/crypto/wvx509.cc.ark	2010-07-12 00:44:29.020463683 +0000
+++ wvstreams-4.6.1/crypto/wvx509.cc	2010-07-12 00:44:38.685659405 +0000
@@ -1157,7 +1157,7 @@ WvString WvX509::get_extension(int nid) 
         
         if (ext)
         {
-            X509V3_EXT_METHOD *method = X509V3_EXT_get(ext);
+            X509V3_EXT_METHOD const *method = X509V3_EXT_get(ext);
             if (!method)
             {
                 WvDynBuf buf;
--- wvstreams-4.6.1/ipstreams/wvunixdgsocket.cc.ark	2010-07-12 00:46:12.415628368 +0000
+++ wvstreams-4.6.1/ipstreams/wvunixdgsocket.cc	2010-07-12 00:46:19.255585716 +0000
@@ -1,8 +1,6 @@
 #include "wvunixdgsocket.h"
-#ifdef MACOS
 #include <sys/types.h>
 #include <sys/stat.h>
-#endif
 
 WvUnixDGSocket::WvUnixDGSocket(WvStringParm filename, bool _server, int perms)
     : socketfile(filename)
--- wvstreams-4.6.1/streams/wvatomicfile.cc.ark	2010-07-12 00:49:22.802635196 +0000
+++ wvstreams-4.6.1/streams/wvatomicfile.cc	2010-07-12 00:49:28.375789302 +0000
@@ -11,9 +11,7 @@
 #include "wvfileutils.h"
 #include "wvstrutils.h"
 
-#ifdef MACOS
 #include <sys/stat.h>
-#endif
 
 WvAtomicFile::WvAtomicFile(WvStringParm filename, int flags, mode_t create_mode)
     : tmp_file(WvString::null)