diff --git a/cmake/macros/IncludeBullet.cmake b/cmake/macros/IncludeBullet.cmake
index 53b7224bb8..a238b33660 100644
--- a/cmake/macros/IncludeBullet.cmake
+++ b/cmake/macros/IncludeBullet.cmake
@@ -10,8 +10,9 @@
 macro(INCLUDE_BULLET)
     find_package(Bullet)
     if (BULLET_FOUND)
-        include_directories(SYSTEM "${BULLET_INCLUDE_DIRS}")
-        list(APPEND ${TARGET_NAME}_LIBRARIES_TO_LINK "${BULLET_LIBRARIES}")
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DUSE_BULLET_PHYSICS")
+        include_directories("${BULLET_INCLUDE_DIRS}")
+        if (APPLE OR UNIX)
+            set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DUSE_BULLET_PHYSICS -isystem ${BULLET_INCLUDE_DIRS}")
+        endif ()
     endif (BULLET_FOUND)
 endmacro(INCLUDE_BULLET)
diff --git a/libraries/physics/CMakeLists.txt b/libraries/physics/CMakeLists.txt
index 15e1ab238c..c0ce72d45c 100644
--- a/libraries/physics/CMakeLists.txt
+++ b/libraries/physics/CMakeLists.txt
@@ -5,6 +5,9 @@ setup_hifi_library()
 
 include_glm()
 include_bullet()
+if (BULLET_FOUND)
+     target_link_libraries(${TARGET_NAME} ${BULLET_LIBRARIES})
+endif (BULLET_FOUND)
 
 link_hifi_libraries(shared fbx entities)
 include_hifi_library_headers(fbx)