diff --git a/lib/cpp/src/transport/TFDTransport.cpp b/lib/cpp/src/transport/TFDTransport.cpp
index 8a448fa..a47e2a4 100644
--- a/lib/cpp/src/transport/TFDTransport.cpp
+++ b/lib/cpp/src/transport/TFDTransport.cpp
@@ -26,6 +26,10 @@
 #include <unistd.h>
 #endif
 
+#ifdef _WIN32
+#include <io.h>
+#endif
+
 using namespace std;
 
 namespace apache { namespace thrift { namespace transport {
diff --git a/lib/cpp/src/transport/TSimpleFileTransport.cpp b/lib/cpp/src/transport/TSimpleFileTransport.cpp
index b9a74aa..b52e4d5 100644
--- a/lib/cpp/src/transport/TSimpleFileTransport.cpp
+++ b/lib/cpp/src/transport/TSimpleFileTransport.cpp
@@ -28,6 +28,10 @@
 #endif
 #include <fcntl.h>
 
+#ifdef _WIN32
+#include <io.h>
+#endif
+
 namespace apache { namespace thrift { namespace transport {
 
 TSimpleFileTransport::
@@ -46,9 +50,14 @@
   if (write) {
     flags |= O_CREAT | O_APPEND;
   }
+#ifndef _WIN32
+  mode_t mode = S_IRUSR | S_IWUSR| S_IRGRP | S_IROTH;
+#else
+  int mode = _S_IREAD | _S_IWRITE;
+#endif
   int fd = ::open(path.c_str(),
                   flags,
-                  S_IRUSR | S_IWUSR| S_IRGRP | S_IROTH);
+                  mode);
   if (fd < 0) {
     throw TTransportException("failed to open file for writing: " + path);
   }
diff --git a/lib/cpp/src/windows/Fcntl.cpp b/lib/cpp/src/windows/WinFcntl.cpp
similarity index 100%
rename from lib/cpp/src/windows/Fcntl.cpp
rename to lib/cpp/src/windows/WinFcntl.cpp
diff --git a/lib/cpp/src/windows/Fcntl.h b/lib/cpp/src/windows/WinFcntl.h
similarity index 100%
rename from lib/cpp/src/windows/Fcntl.h
rename to lib/cpp/src/windows/WinFcntl.h
diff --git a/lib/cpp/src/windows/config.h b/lib/cpp/src/windows/config.h
index 2db2596..6116caa 100644
--- a/lib/cpp/src/windows/config.h
+++ b/lib/cpp/src/windows/config.h
@@ -31,6 +31,7 @@
 #pragma warning(disable: 4996) // Depreciated posix name.
 #pragma warning(disable: 4250) // Inherits via dominance.
 
+#define VERSION "0.8.0-dev"
 #define HAVE_GETTIMEOFDAY 1
 #define HAVE_SYS_STAT_H 1
 
@@ -38,7 +39,7 @@
 #include "GetTimeOfDay.h"
 #include "Operators.h"
 #include "TWinsockSingleton.h"
-#include "Fcntl.h"
+#include "WinFcntl.h"
 #include "SocketPair.h"
 
 // boost
@@ -58,8 +59,8 @@
 #	include <pthread.h>
 #else
 struct timespec {
-	long tv_sec;
-	long tv_nsec;
+	int64_t tv_sec;
+	int64_t tv_nsec;
 };
 #	define USE_BOOST_THREAD 1
 #	define ctime_r( _clock, _buf ) \
@@ -94,8 +95,9 @@
     return select(1, &read_fds, &write_fds, &except_fds, &time_out);
 }
 #else
-#   define poll(fds, nfds, timeout) \
-    WSAPoll(fds, nfds, timeout)
+	inline int poll(struct pollfd* fdArray, ULONG fds, INT timeout) {
+		return WSAPoll(fdArray, fds, timeout);
+	}
 #endif // WINVER
 
 inline void close(SOCKET socket)
diff --git a/lib/cpp/src/windows/force_inc.h b/lib/cpp/src/windows/force_inc.h
index a85b880..2ee0207 100644
--- a/lib/cpp/src/windows/force_inc.h
+++ b/lib/cpp/src/windows/force_inc.h
@@ -29,6 +29,8 @@
 #endif
 
 #define NOMINMAX
+#define BOOST_ALL_NO_LIB 1
+#define BOOST_THREAD_NO_LIB 1
 
 #include "windows/config.h"