diff --git a/cmake/os/WindowsCache.cmake b/cmake/os/WindowsCache.cmake
index 8456cd69b0b..b93a1c12a2e 100644
--- a/cmake/os/WindowsCache.cmake
+++ b/cmake/os/WindowsCache.cmake
@@ -364,4 +364,7 @@ SET(HAVE_SOCKADDR_IN_SIN_LEN CACHE INTERNAL "")
 SET(HAVE_SOCKADDR_IN6_SIN6_LEN CACHE INTERNAL "")
 SET(HAVE_VALGRIND CACHE INTERNAL "")
 SET(HAVE_EVENT_H CACHE INTERNAL "")
+SET(HAVE_LINUX_UNISTD_H CACHE INTERNAL "")
+SET(HAVE_SYS_UTSNAME_H CACHE INTERNAL "")
+SET(HAVE_PTHREAD_ATTR_GETGUARDSIZE CACHE INTERNAL "")
 ENDIF()
diff --git a/storage/oqgraph/CMakeLists.txt b/storage/oqgraph/CMakeLists.txt
index eb4b9f16134..ecd2d46dad3 100644
--- a/storage/oqgraph/CMakeLists.txt
+++ b/storage/oqgraph/CMakeLists.txt
@@ -4,9 +4,13 @@ IF(NOT Boost_FOUND)
 ENDIF()
 INCLUDE_DIRECTORIES(BEFORE ${Boost_INCLUDE_DIRS})
 
-# lp:756966 OQGRAPH on Win64 does not compile
-IF(MSVC AND CMAKE_SIZEOF_VOID_P EQUAL 8)
-  SET(BOOST_OK 0)
+IF(MSVC)
+  # lp:756966 OQGRAPH on Win64 does not compile
+  IF (CMAKE_SIZEOF_VOID_P EQUAL 8)
+    SET(BOOST_OK 0)
+  ELSE()
+    SET(BOOST_OK 1)
+  ENDIF()
 ELSE()
 # See if that works. On old gcc it'll fail because of -fno-rtti
 CHECK_CXX_SOURCE_COMPILES(