diff --git a/cmake/modules/FindLibOVR.cmake b/cmake/modules/FindLibOVR.cmake
index 674cbef7a4..4ec85c8161 100644
--- a/cmake/modules/FindLibOVR.cmake
+++ b/cmake/modules/FindLibOVR.cmake
@@ -24,7 +24,7 @@ find_path(LIBOVR_INCLUDE_DIRS OVR.h PATH_SUFFIXES Include HINTS ${LIBOVR_SEARCH_
 find_path(LIBOVR_UTIL_INCLUDE_DIR Util_Render_Stereo.h PATH_SUFFIXES Src/Util HINTS ${LIBOVR_SEARCH_DIRS})
 
 # add the util include dir to the general include dirs
-set(LIBOVR_INCLUDE_DIRS ${LIBOVR_INCLUDE_DIRS} ${LIBOVR_UTIL_INCLUDE_DIR})
+set(LIBOVR_INCLUDE_DIRS "${LIBOVR_INCLUDE_DIRS}" "${LIBOVR_UTIL_INCLUDE_DIR}")
 
 if (APPLE)
   find_library(LIBOVR_LIBRARY_DEBUG "Lib/MacOS/Debug/libovr.a" HINTS ${LIBOVR_SEARCH_DIRS})
diff --git a/interface/CMakeLists.txt b/interface/CMakeLists.txt
index 7ce9144031..c0ee8dc7df 100644
--- a/interface/CMakeLists.txt
+++ b/interface/CMakeLists.txt
@@ -184,9 +184,11 @@ endif (FACEPLUS_FOUND AND NOT DISABLE_FACEPLUS)
 if (LIBOVR_FOUND AND NOT DISABLE_LIBOVR)
   add_definitions(-DHAVE_LIBOVR)
   include_directories(SYSTEM ${LIBOVR_INCLUDE_DIRS})
-    
-  if (APPLE OR UNIX)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -isystem ${LIBOVR_INCLUDE_DIRS}")
+  
+  if (APPLE)
+    foreach(LIBOVR_DIR ${LIBOVR_INCLUDE_DIRS})
+       set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -isystem ${LIBOVR_DIR}")
+    endforeach()
   endif ()
   
   target_link_libraries(${TARGET_NAME} ${LIBOVR_LIBRARIES})
@@ -204,7 +206,7 @@ if (LEAPMOTION_FOUND AND NOT DISABLE_LEAPMOTION)
     add_definitions(-DHAVE_LEAPMOTION)
     include_directories(SYSTEM "${LEAPMOTION_INCLUDE_DIRS}")
 
-    if (APPLE OR UNIX)
+    if (APPLE)
       set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -isystem ${LEAPMOTION_INCLUDE_DIRS}")
     endif ()
     target_link_libraries(${TARGET_NAME} ${LEAPMOTION_LIBRARIES})