diff --git a/cmake/modules/FindUSD.cmake b/cmake/modules/FindUSD.cmake
index 955cc983c5..1b75cdeb43 100644
--- a/cmake/modules/FindUSD.cmake
+++ b/cmake/modules/FindUSD.cmake
@@ -159,7 +159,6 @@ find_package_handle_standard_args(USD
     REQUIRED_VARS
         PXR_USD_LOCATION
         USD_INCLUDE_DIR
-        USD_LIBRARY_DIR
         USD_GENSCHEMA
         USD_CONFIG_FILE
         USD_VERSION
diff --git a/lib/mayaHydra/hydraExtensions/CMakeLists.txt b/lib/mayaHydra/hydraExtensions/CMakeLists.txt
index 1539859696..1c36d490f1 100644
--- a/lib/mayaHydra/hydraExtensions/CMakeLists.txt
+++ b/lib/mayaHydra/hydraExtensions/CMakeLists.txt
@@ -49,11 +49,14 @@ mayaHydra_compile_config(${TARGET_NAME})
 # include directories
 # -----------------------------------------------------------------------------
 target_include_directories(${TARGET_NAME} 
-            PUBLIC
+            SYSTEM PUBLIC
+                ${PXR_INCLUDE_DIRS}
                 ${MAYA_INCLUDE_DIRS}
+)
+target_include_directories(${TARGET_NAME}
+            PUBLIC
                 ${PYTHON_INCLUDE_DIR}
-                ${PXR_INCLUDE_DIRS}
-                ${BOOST_INCLUDE_DIR}
+                ${BOOST_INCLUDE_DIR}               
                 ${CMAKE_BINARY_DIR}/include
             PRIVATE
                 $<$<BOOL:${UFE_FOUND}>:${UFE_INCLUDE_DIR}>
diff --git a/lib/mayaHydra/ufeExtensions/CMakeLists.txt b/lib/mayaHydra/ufeExtensions/CMakeLists.txt
index 4fa29d433e..2e5386e457 100644
--- a/lib/mayaHydra/ufeExtensions/CMakeLists.txt
+++ b/lib/mayaHydra/ufeExtensions/CMakeLists.txt
@@ -34,6 +34,11 @@ mayaHydra_compile_config(${TARGET_NAME})
 # -----------------------------------------------------------------------------
 target_include_directories(${TARGET_NAME} 
         PUBLIC
+            ${PXR_INCLUDE_DIRS}
+)
+
+target_include_directories(${TARGET_NAME} 
+        SYSTEM PUBLIC
             ${MAYA_INCLUDE_DIRS}
             ${CMAKE_BINARY_DIR}/include
             $<$<BOOL:${UFE_FOUND}>:${UFE_INCLUDE_DIR}>
@@ -110,4 +115,4 @@ if(IS_WINDOWS)
         install(FILES $<TARGET_PDB_FILE:${TARGET_NAME}> 
                 DESTINATION ${CMAKE_INSTALL_PREFIX}/lib OPTIONAL)
     endif()
-endif()
+endif()
\ No newline at end of file
diff --git a/plugin/mayaHydraSceneBrowser/CMakeLists.txt b/plugin/mayaHydraSceneBrowser/CMakeLists.txt
index e9e84c63d0..4f46ac1066 100644
--- a/plugin/mayaHydraSceneBrowser/CMakeLists.txt
+++ b/plugin/mayaHydraSceneBrowser/CMakeLists.txt
@@ -40,6 +40,7 @@ target_compile_definitions(${TARGET_NAME}
 # -----------------------------------------------------------------------------
 target_include_directories(${TARGET_NAME} 
     PUBLIC
+        ${PXR_INCLUDE_DIRS}
         ${MAYA_INCLUDE_DIRS}
 )
 
diff --git a/plugin/mayaHydraSceneBrowserTest/CMakeLists.txt b/plugin/mayaHydraSceneBrowserTest/CMakeLists.txt
index e3af443ee1..91d012df02 100644
--- a/plugin/mayaHydraSceneBrowserTest/CMakeLists.txt
+++ b/plugin/mayaHydraSceneBrowserTest/CMakeLists.txt
@@ -25,8 +25,9 @@ mayaHydra_compile_config(${TARGET_NAME})
 # include directories
 # -----------------------------------------------------------------------------
 target_include_directories(${TARGET_NAME} 
-    PUBLIC
-        ${MAYA_INCLUDE_DIRS}
+            SYSTEM PUBLIC                
+                ${PXR_INCLUDE_DIRS}
+                ${MAYA_INCLUDE_DIRS}
 )
 
 # -----------------------------------------------------------------------------