diff --git a/lib/Basics/StringUtils.cpp b/lib/Basics/StringUtils.cpp
index bc4ac0361a..07bafe348f 100644
--- a/lib/Basics/StringUtils.cpp
+++ b/lib/Basics/StringUtils.cpp
@@ -38,11 +38,13 @@
 #include "Logger/Logger.h"
 
 // TODO need to this in another way
+#ifndef TRI_HAVE_GLOBAL_TIMEZONE_PROTO
 #ifdef GLOBAL_TIMEZONE
 extern long GLOBAL_TIMEZONE;
 #else
 static long GLOBAL_TIMEZONE = 0;
 #endif
+#endif
 
 using namespace std;
 
diff --git a/lib/BasicsC/operating-system.h b/lib/BasicsC/operating-system.h
index d060896f28..c2e571a470 100644
--- a/lib/BasicsC/operating-system.h
+++ b/lib/BasicsC/operating-system.h
@@ -595,6 +595,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #define GLOBAL_TIMEZONE                     timezone
+#define TRI_HAVE_GLOBAL_TIMEZONE_PROTO      1
+
+#define YY_NO_UNISTD_H                      1
 
 #define TRI_WIN32_CONSOLE                   1
 #define TRI_WIN32_THREAD_LOCAL_STORAGE      1
@@ -611,6 +614,7 @@
 #define TRI_HAVE_WIN32_PWD                  1
 
 #define TRI_HAVE_ANONYMOUS_MMAP             1
+#define TRI_MISSING_MEMRCHR                 1
 
 // ..............................................................
 // usleep in POSIX is for microseconds - not milliseconds