diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 6f21ec93cc595886aa2d56ca0b203c2537147aec..460b2e6985b61398cbee98119e84ccd7a7c70cae 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -1582,20 +1582,12 @@ if (WINDOWS)
         list(APPEND viewer_SOURCE_FILES ${viewer_RESOURCE_FILES})
     endif (NOT USESYSTEMLIBS)
 
-    find_library(DINPUT_LIBRARY dinput8 ${DIRECTX_LIBRARY_DIR})
-    find_library(DXGUID_LIBRARY dxguid ${DIRECTX_LIBRARY_DIR})
-    mark_as_advanced(
-        DINPUT_LIBRARY
-        DXGUID_LIBRARY
-        )
-
 # see EXP-1765 - theory is opengl32.lib needs to be included before gdi32.lib (windows libs)
     set(viewer_LIBRARIES
         opengl32
         ${WINDOWS_LIBRARIES}
         comdlg32
-        ${DINPUT_LIBRARY}
-        ${DXGUID_LIBRARY}
+        dxguid
         kernel32
         odbc32
         odbccp32
diff --git a/indra/win_crash_logger/CMakeLists.txt b/indra/win_crash_logger/CMakeLists.txt
index 1b038c26b58a34be16eb9c547771697493bdf5f7..86aa655f03443dc99e5187e7c50c07e40e9860bb 100644
--- a/indra/win_crash_logger/CMakeLists.txt
+++ b/indra/win_crash_logger/CMakeLists.txt
@@ -68,8 +68,6 @@ list(APPEND
     ${win_crash_logger_RESOURCE_FILES}
     )
 
-find_library(DXGUID_LIBRARY dxguid ${DIRECTX_LIBRARY_DIR})
-
 add_executable(windows-crash-logger WIN32 ${win_crash_logger_SOURCE_FILES})
 
 
@@ -87,7 +85,7 @@ target_link_libraries(windows-crash-logger
     ${BOOST_CONTEXT_LIBRARY}
     ${BOOST_FIBER_LIBRARY}
     ${WINDOWS_LIBRARIES}
-    ${DXGUID_LIBRARY}
+    dxguid
     ${GOOGLE_PERFTOOLS_LIBRARIES}
     user32
     gdi32