diff -Naur fex-0.8.18-orig/src/client.cpp fex-0.8.18/src/client.cpp
--- fex-0.8.18-orig/src/client.cpp	2004-12-19 17:49:45.000000000 -0600
+++ fex-0.8.18/src/client.cpp	2007-12-28 21:03:30.000000000 -0600
@@ -53,7 +53,7 @@
 {
   lc.info("start fullsync");
   parent().write(fex_header(ME_FullSyncStart));
-  parent().wp()->createStateFile((unsigned)this, &_M_ClientFile);
+  parent().wp()->createStateFile((unsigned long)this, &_M_ClientFile);
 }
   
 void FullSyncDialog::
diff -Naur fex-0.8.18-orig/src/dialog.cpp fex-0.8.18/src/dialog.cpp
--- fex-0.8.18-orig/src/dialog.cpp	2005-05-11 10:20:52.000000000 -0600
+++ fex-0.8.18/src/dialog.cpp	2007-12-28 21:03:58.000000000 -0600
@@ -224,7 +224,7 @@
   ModLog::iterator i;
   for(i = _M_Log.begin(); i != _M_Log.end(); i++) {
     if (! FileListener::get().lock(parent().wp()->path() + i->first.str(), 
-				   (unsigned int)&parent())) {
+				   (unsigned long)&parent())) {
       ModLog::iterator j;
       for(j = _M_Log.begin(); j != i; j++) {
 	FileListener::get().unlock(parent().wp(), 
diff -Naur fex-0.8.18-orig/src/filelistener.cpp fex-0.8.18/src/filelistener.cpp
--- fex-0.8.18-orig/src/filelistener.cpp	2005-06-07 09:49:06.000000000 -0600
+++ fex-0.8.18/src/filelistener.cpp	2007-12-28 21:04:42.000000000 -0600
@@ -355,7 +355,7 @@
 
   _M_FDBuffer[0].reserve(MinFDBufferSize);
   _M_FDBuffer[1].reserve(MinFDBufferSize);
-  _S_SignalBuffer = (int)&_M_FDBuffer[0];
+  _S_SignalBuffer = (long)&_M_FDBuffer[0];
   _M_ReadBuffer   = &_M_FDBuffer[1];
 
   assert(! _S_WakeUpPipe.first);
@@ -439,7 +439,7 @@
   typedef FileListener::FileEvent::reqs_m::iterator iterator;
 
   _M_ReadBuffer->reserve(_M_Handler->size() + MinFDBufferSize);
-  _S_SignalBuffer = (int)_M_ReadBuffer;
+  _S_SignalBuffer = (long)_M_ReadBuffer;
   _M_ReadBuffer   = &_M_FDBuffer[_M_ReadBuffer == &_M_FDBuffer[0] ? 1 : 0];
 
   if (_S_RenewAll) {
diff -Naur fex-0.8.18-orig/src/nmstl/netioevent fex-0.8.18/src/nmstl/netioevent
--- fex-0.8.18-orig/src/nmstl/netioevent	2004-12-12 16:34:50.000000000 -0600
+++ fex-0.8.18/src/nmstl/netioevent	2007-12-28 21:05:51.000000000 -0600
@@ -138,7 +138,7 @@
     io_handler::set_ioh;
 
 private:
-    inline void tcp_acceptor::ravail() {
+    inline void ravail() {
         address a;
         tcpsocket ioh = sock.accept(a);
         if (ioh) {
@@ -168,7 +168,7 @@
     virtual ~tcp_acceptor() {}
 
 protected:
-    inline void tcp_acceptor::ravail() {
+    inline void ravail() {
         address a;
         tcpsocket ioh = sock.accept(a);
         if (ioh) {
diff -Naur fex-0.8.18-orig/src/server.cpp fex-0.8.18/src/server.cpp
--- fex-0.8.18-orig/src/server.cpp	2004-12-19 17:51:23.000000000 -0600
+++ fex-0.8.18/src/server.cpp	2007-12-28 21:06:27.000000000 -0600
@@ -81,7 +81,7 @@
 sendStatFile() 
 {
   size_t size;
-  size = parent().wp()->createStateFile((unsigned)this, &_M_StateFile);
+  size = parent().wp()->createStateFile((unsigned long)this, &_M_StateFile);
   omessage msg;
   msg << _M_StateFile << size;
   write(fex_header(ME_FullSyncState), msg);
diff -Naur fex-0.8.18-orig/src/watchpoint.cpp fex-0.8.18/src/watchpoint.cpp
--- fex-0.8.18-orig/src/watchpoint.cpp	2004-12-27 08:40:40.000000000 -0600
+++ fex-0.8.18/src/watchpoint.cpp	2007-12-28 21:07:31.000000000 -0600
@@ -188,7 +188,7 @@
 	 unsigned int lock_id,
 	 bool do_sync)
 {
-  if (lock_id == (unsigned int)this)
+  if (lock_id == (unsigned long)this)
     return;
 
   pair<ModLog::iterator, bool> res = _M_WriteLog->insert(key, state);
@@ -327,7 +327,7 @@
 save_state()
 {
   if (_M_Mode >= MO_fullsynched)
-    wp()->createStateFile((unsigned)this, NULL);
+    wp()->createStateFile((unsigned long)this, NULL);
 }
 
 
diff -rupN fex-0.8.18b/src/modlog.cpp fex-0.8.18/src/modlog.cpp
--- fex-0.8.18b/src/modlog.cpp	2009-01-22 17:00:41.000000000 -0400
+++ fex-0.8.18/src/modlog.cpp	2009-01-22 17:03:44.000000000 -0400
@@ -27,6 +27,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <dirent.h>
+#include <cstdlib>
 extern "C" {
 #include <librsync.h>
 }
diff -rupN fex-0.8.18b/src/modlog.h fex-0.8.18/src/modlog.h
--- fex-0.8.18b/src/modlog.h	2009-01-22 17:00:41.000000000 -0400
+++ fex-0.8.18/src/modlog.h	2009-01-22 17:01:44.000000000 -0400
@@ -22,7 +22,7 @@
 #ifndef MODLOG_H
 #define MODLOG_H
 
-#include <string>
+#include <cstring>
 #include <map>
 
 
diff -rupN fex-0.8.18b/src/nmstl/status fex-0.8.18/src/nmstl/status
--- fex-0.8.18b/src/nmstl/status	2009-01-22 17:00:41.000000000 -0400
+++ fex-0.8.18/src/nmstl/status	2009-01-22 17:02:12.000000000 -0400
@@ -23,7 +23,7 @@
 #ifndef NMSTL_H_STATUS
 #define NMSTL_H_STATUS
 
-#include <string>
+#include <cstring>
 #include <nmstl/internal.h>
 
 NMSTL_NAMESPACE_BEGIN;
diff -rupN fex-0.8.18b/src/nmstl_src/debug.cc fex-0.8.18/src/nmstl_src/debug.cc
--- fex-0.8.18b/src/nmstl_src/debug.cc	2009-01-22 17:00:41.000000000 -0400
+++ fex-0.8.18/src/nmstl_src/debug.cc	2009-01-22 17:04:16.000000000 -0400
@@ -20,7 +20,8 @@
  *
  */
 
-#include <iostream>
+#include <cstdlib>
+#include <cstring>
 
 #include <nmstl/debug>
 #include <nmstl/thread>
diff -rupN fex-0.8.18b/src/nmstl_src/internal.cc fex-0.8.18/src/nmstl_src/internal.cc
--- fex-0.8.18b/src/nmstl_src/internal.cc	2009-01-22 17:00:41.000000000 -0400
+++ fex-0.8.18/src/nmstl_src/internal.cc	2009-01-22 17:04:45.000000000 -0400
@@ -21,6 +21,7 @@
  */
 
 #include <nmstl/internal.h>
+#include <cstdlib>
 
 #undef NMSTL_DEBUG_FILE_H
 #define NMSTL_DEBUG_FILE_H "nmstl/internal"