diff --git a/lib/mayaUsd/fileio/importData.h b/lib/mayaUsd/fileio/importData.h
index 4d7e5afd5c..05ed5eb580 100644
--- a/lib/mayaUsd/fileio/importData.h
+++ b/lib/mayaUsd/fileio/importData.h
@@ -19,9 +19,9 @@
 #include <map>
 #include <string>
 
-#include <pxr/usd/usd/stage.h>
-#include <pxr/usd/usd/prim.h>
 #include <pxr/usd/sdf/types.h>
+#include <pxr/usd/usd/prim.h>
+#include <pxr/usd/usd/stage.h>
 
 #include <mayaUsd/base/api.h>
 
diff --git a/lib/mayaUsd/fileio/primUpdaterRegistry.cpp b/lib/mayaUsd/fileio/primUpdaterRegistry.cpp
index d7a544ac71..39b9ec57f8 100644
--- a/lib/mayaUsd/fileio/primUpdaterRegistry.cpp
+++ b/lib/mayaUsd/fileio/primUpdaterRegistry.cpp
@@ -30,8 +30,8 @@
 #include <pxr/base/tf/token.h>
 #include <pxr/usd/usd/schemaBase.h>
 
-#include <mayaUsd/fileio/registryHelper.h>
 #include <mayaUsd/base/debugCodes.h>
+#include <mayaUsd/fileio/registryHelper.h>
 
 PXR_NAMESPACE_OPEN_SCOPE
 
diff --git a/lib/mayaUsd/fileio/shading/shadingModeExporterContext.h b/lib/mayaUsd/fileio/shading/shadingModeExporterContext.h
index 9e4c932051..b7d2559652 100644
--- a/lib/mayaUsd/fileio/shading/shadingModeExporterContext.h
+++ b/lib/mayaUsd/fileio/shading/shadingModeExporterContext.h
@@ -16,8 +16,6 @@
 #ifndef PXRUSDMAYA_SHADING_MODE_EXPORTER_CONTEXT_H
 #define PXRUSDMAYA_SHADING_MODE_EXPORTER_CONTEXT_H
 
-#include <mayaUsd/base/api.h>
-
 #include <string>
 #include <utility>
 #include <vector>
@@ -32,6 +30,7 @@
 #include <pxr/usd/usd/prim.h>
 #include <pxr/usd/usd/stage.h>
 
+#include <mayaUsd/base/api.h>
 #include <mayaUsd/fileio/jobs/jobArgs.h>
 #include <mayaUsd/fileio/writeJobContext.h>
 #include <mayaUsd/utils/util.h>
diff --git a/lib/mayaUsd/nodes/proxyShapeBase.cpp b/lib/mayaUsd/nodes/proxyShapeBase.cpp
index f1daf6df8e..21c528d7da 100644
--- a/lib/mayaUsd/nodes/proxyShapeBase.cpp
+++ b/lib/mayaUsd/nodes/proxyShapeBase.cpp
@@ -74,10 +74,6 @@
 #include <pxr/usd/usdGeom/tokens.h>
 #include <pxr/usd/usdUtils/stageCache.h>
 
-#if defined(WANT_UFE_BUILD)
-#include <ufe/path.h>
-#endif
-
 #include <mayaUsd/base/debugCodes.h>
 #include <mayaUsd/listeners/proxyShapeNotice.h>
 #include <mayaUsd/nodes/stageData.h>
@@ -85,6 +81,10 @@
 #include <mayaUsd/utils/stageCache.h>
 #include <mayaUsd/utils/utilFileSystem.h>
 
+#if defined(WANT_UFE_BUILD)
+#include <ufe/path.h>
+#endif
+
 PXR_NAMESPACE_OPEN_SCOPE
 
 TF_DEFINE_PUBLIC_TOKENS(MayaUsdProxyShapeBaseTokens,
diff --git a/lib/mayaUsd/render/mayaToHydra/CMakeLists.txt b/lib/mayaUsd/render/mayaToHydra/CMakeLists.txt
index 466e87e55f..78899678df 100644
--- a/lib/mayaUsd/render/mayaToHydra/CMakeLists.txt
+++ b/lib/mayaUsd/render/mayaToHydra/CMakeLists.txt
@@ -18,17 +18,6 @@ target_sources(${TARGET_NAME}
         viewCommand.cpp
 )
 
-set(headers
-    defaultLightDelegate.h
-    pluginDebugCodes.h
-    renderGlobals.h
-    renderOverride.h
-    renderOverrideUtils.h
-    tokens.h
-    utils.h
-    viewCommand.h
-)
-
 # -----------------------------------------------------------------------------
 # compile definitions
 # -----------------------------------------------------------------------------
@@ -55,11 +44,6 @@ target_link_libraries(${TARGET_NAME}
 # -----------------------------------------------------------------------------
 maya_set_plugin_properties(${TARGET_NAME})
 
-# -----------------------------------------------------------------------------
-# promote headers
-# -----------------------------------------------------------------------------
-mayaUsd_promoteHeaderList(HEADERS ${headers} SUBDIR render/mayaToHydra)
-
 # -----------------------------------------------------------------------------
 # run-time search paths
 # -----------------------------------------------------------------------------
diff --git a/lib/mayaUsd/render/mayaToHydra/renderOverride.cpp b/lib/mayaUsd/render/mayaToHydra/renderOverride.cpp
index 7eb0f1d5d8..bfd3d801d1 100644
--- a/lib/mayaUsd/render/mayaToHydra/renderOverride.cpp
+++ b/lib/mayaUsd/render/mayaToHydra/renderOverride.cpp
@@ -35,6 +35,17 @@
 #include <pxr/base/vt/value.h>
 #include <pxr/imaging/glf/contextCaps.h>
 #include <pxr/imaging/hd/rprim.h>
+
+#include <hdMaya/delegates/delegateRegistry.h>
+#include <hdMaya/delegates/sceneDelegate.h>
+#include <hdMaya/utils.h>
+#include <mayaUsd/render/px_vp20/utils.h>
+
+#include "pluginDebugCodes.h"
+#include "renderOverrideUtils.h"
+#include "tokens.h"
+#include "utils.h"
+
 #if USD_VERSION_NUM >= 1911
 #include <pxr/imaging/hd/rendererPluginRegistry.h>
 #else
@@ -57,17 +68,6 @@ PXR_NAMESPACE_CLOSE_SCOPE
 #include <ufe/selectionNotification.h>
 #endif // WANT_UFE_BUILD
 
-#include <hdMaya/delegates/delegateRegistry.h>
-#include <hdMaya/delegates/sceneDelegate.h>
-#include <hdMaya/utils.h>
-
-#include <mayaUsd/render/px_vp20/utils.h>
-
-#include "pluginDebugCodes.h"
-#include "renderOverrideUtils.h"
-#include "tokens.h"
-#include "utils.h"
-
 PXR_NAMESPACE_OPEN_SCOPE
 
 namespace {
diff --git a/lib/mayaUsd/render/mayaToHydra/utils.cpp b/lib/mayaUsd/render/mayaToHydra/utils.cpp
index db1dc0a36d..5dbc268459 100644
--- a/lib/mayaUsd/render/mayaToHydra/utils.cpp
+++ b/lib/mayaUsd/render/mayaToHydra/utils.cpp
@@ -17,6 +17,10 @@
 
 #include <maya/MGlobal.h>
 
+#include <pxr/imaging/glf/contextCaps.h>
+
+#include "tokens.h"
+
 #if USD_VERSION_NUM >= 1911
 #include <pxr/imaging/hd/rendererPlugin.h>
 #include <pxr/imaging/hd/rendererPluginRegistry.h>
@@ -28,10 +32,6 @@ using HdRendererPluginRegistry = HdxRendererPluginRegistry;
 PXR_NAMESPACE_CLOSE_SCOPE
 #endif
 
-#include <pxr/imaging/glf/contextCaps.h>
-
-#include "tokens.h"
-
 PXR_NAMESPACE_OPEN_SCOPE
 
 namespace {
diff --git a/lib/mayaUsd/render/pxrUsdMayaGL/batchRenderer.cpp b/lib/mayaUsd/render/pxrUsdMayaGL/batchRenderer.cpp
index b2d00b067b..0d2477443b 100644
--- a/lib/mayaUsd/render/pxrUsdMayaGL/batchRenderer.cpp
+++ b/lib/mayaUsd/render/pxrUsdMayaGL/batchRenderer.cpp
@@ -71,6 +71,11 @@
 #include <pxr/imaging/hdx/tokens.h>
 #include <pxr/usd/sdf/path.h>
 
+#include <mayaUsd/render/px_vp20/utils.h>
+#include <mayaUsd/render/px_vp20/utils_legacy.h>
+#include <mayaUsd/render/pxrUsdMayaGL/debugCodes.h>
+#include <mayaUsd/render/pxrUsdMayaGL/userData.h>
+
 #if USD_VERSION_NUM > 2002
 #include <pxr/imaging/hgi/hgi.h>
 #include <pxr/imaging/hgi/tokens.h>
@@ -80,11 +85,6 @@
 #include <pxr/usd/usdGeom/tokens.h>
 #endif
 
-#include <mayaUsd/render/px_vp20/utils.h>
-#include <mayaUsd/render/px_vp20/utils_legacy.h>
-#include <mayaUsd/render/pxrUsdMayaGL/debugCodes.h>
-#include <mayaUsd/render/pxrUsdMayaGL/userData.h>
-
 PXR_NAMESPACE_OPEN_SCOPE
 
 TF_DEFINE_PRIVATE_TOKENS(
diff --git a/lib/mayaUsd/render/pxrUsdMayaGL/batchRenderer.h b/lib/mayaUsd/render/pxrUsdMayaGL/batchRenderer.h
index 19c54940ba..7bc3d863bb 100644
--- a/lib/mayaUsd/render/pxrUsdMayaGL/batchRenderer.h
+++ b/lib/mayaUsd/render/pxrUsdMayaGL/batchRenderer.h
@@ -47,10 +47,6 @@
 #include <pxr/imaging/hdx/selectionTracker.h>
 #include <pxr/usd/sdf/path.h>
 
-#if USD_VERSION_NUM > 2002
-#include <pxr/imaging/hd/driver.h>
-#endif
-
 #include <mayaUsd/base/api.h>
 #include <mayaUsd/listeners/notice.h>
 #include <mayaUsd/render/pxrUsdMayaGL/renderParams.h>
@@ -60,6 +56,10 @@
 #include <mayaUsd/utils/diagnosticDelegate.h>
 #include <mayaUsd/utils/util.h>
 
+#if USD_VERSION_NUM > 2002
+#include <pxr/imaging/hd/driver.h>
+#endif
+
 PXR_NAMESPACE_OPEN_SCOPE
 
 /// UsdMayaGLBatchRenderer is a singleton that shapes can use to get consistent
diff --git a/lib/mayaUsd/render/vp2RenderDelegate/proxyRenderDelegate.cpp b/lib/mayaUsd/render/vp2RenderDelegate/proxyRenderDelegate.cpp
index b29580d81c..41035b8a32 100644
--- a/lib/mayaUsd/render/vp2RenderDelegate/proxyRenderDelegate.cpp
+++ b/lib/mayaUsd/render/vp2RenderDelegate/proxyRenderDelegate.cpp
@@ -42,10 +42,10 @@
 #include "tokens.h"
 
 #if defined(WANT_UFE_BUILD)
-#include <ufe/sceneItem.h>
-#include <ufe/runTimeMgr.h>
 #include <ufe/globalSelection.h>
 #include <ufe/observableSelection.h>
+#include <ufe/runTimeMgr.h>
+#include <ufe/sceneItem.h>
 #include <ufe/selectionNotification.h>
 #endif
 
diff --git a/lib/mayaUsd/ufe/Global.cpp b/lib/mayaUsd/ufe/Global.cpp
index a360205276..f34fbca605 100644
--- a/lib/mayaUsd/ufe/Global.cpp
+++ b/lib/mayaUsd/ufe/Global.cpp
@@ -21,25 +21,26 @@
 #include <ufe/hierarchyHandler.h>
 #include <ufe/runTimeMgr.h>
 
+#include <mayaUsd/ufe/ProxyShapeHandler.h>
+#include <mayaUsd/ufe/ProxyShapeHierarchyHandler.h>
+#include <mayaUsd/ufe/StagesSubject.h>
+#include <mayaUsd/ufe/UsdHierarchyHandler.h>
+#include <mayaUsd/ufe/UsdSceneItemOpsHandler.h>
+#include <mayaUsd/ufe/UsdTransform3dHandler.h>
+
+#include "private/InPathChange.h"
+
 #ifdef UFE_V2_FEATURES_AVAILABLE
 // Note: must come after include of ufe files so we have the define.
-#include "UsdAttributesHandler.h"
-#include "UsdObject3dHandler.h"
+#include <mayaUsd/ufe/UsdAttributesHandler.h>
+#include <mayaUsd/ufe/UsdObject3dHandler.h>
 #if UFE_PREVIEW_VERSION_NUM >= 2009
-#include "UsdContextOpsHandler.h"
+#include <mayaUsd/ufe/UsdContextOpsHandler.h>
 #endif
 #else
-#include "UfeVersionCompat.h"
+#include <mayaUsd/ufe/UfeVersionCompat.h>
 #endif
 
-#include "private/InPathChange.h"
-#include "ProxyShapeHandler.h"
-#include "ProxyShapeHierarchyHandler.h"
-#include "StagesSubject.h"
-#include "UsdHierarchyHandler.h"
-#include "UsdSceneItemOpsHandler.h"
-#include "UsdTransform3dHandler.h"
-
 namespace {
 	int gRegistrationCount = 0;
 }
diff --git a/lib/mayaUsd/ufe/StagesSubject.cpp b/lib/mayaUsd/ufe/StagesSubject.cpp
index cebb46d3d0..358dc03d67 100644
--- a/lib/mayaUsd/ufe/StagesSubject.cpp
+++ b/lib/mayaUsd/ufe/StagesSubject.cpp
@@ -15,6 +15,20 @@
 //
 #include "StagesSubject.h"
 
+#include <vector>
+
+#include <maya/MSceneMessage.h>
+#include <maya/MMessage.h>
+
+#include <pxr/usd/usdGeom/tokens.h>
+#include <pxr/usd/usdGeom/xformOp.h>
+
+#include <mayaUsd/ufe/ProxyShapeHandler.h>
+#include <mayaUsd/ufe/UsdStageMap.h>
+#include <mayaUsd/ufe/Utils.h>
+
+#include "private/InPathChange.h"
+
 #ifdef UFE_V2_FEATURES_AVAILABLE
 #include <ufe/attributes.h>
 #endif
@@ -31,20 +45,6 @@
 #include <unordered_map>
 #endif
 
-#include <vector>
-
-#include <maya/MSceneMessage.h>
-#include <maya/MMessage.h>
-
-#include <pxr/usd/usdGeom/tokens.h>
-#include <pxr/usd/usdGeom/xformOp.h>
-
-#include <mayaUsd/ufe/ProxyShapeHandler.h>
-#include <mayaUsd/ufe/UsdStageMap.h>
-#include <mayaUsd/ufe/Utils.h>
-
-#include "private/InPathChange.h"
-
 #ifdef UFE_V2_FEATURES_AVAILABLE
 namespace {
 
diff --git a/lib/mayaUsd/ufe/UsdUndoDuplicateCommand.cpp b/lib/mayaUsd/ufe/UsdUndoDuplicateCommand.cpp
index 5fc2d07f17..d394118523 100644
--- a/lib/mayaUsd/ufe/UsdUndoDuplicateCommand.cpp
+++ b/lib/mayaUsd/ufe/UsdUndoDuplicateCommand.cpp
@@ -19,9 +19,9 @@
 #include <ufe/sceneNotification.h>
 #include <ufe/log.h>
 
-#include <pxr/usd/usd/stage.h>
-#include <pxr/usd/sdf/copyUtils.h>
 #include <pxr/base/tf/token.h>
+#include <pxr/usd/sdf/copyUtils.h>
+#include <pxr/usd/usd/stage.h>
 
 #include <mayaUsd/ufe/Utils.h>
 
diff --git a/lib/mayaUsd/ufe/UsdUndoRenameCommand.cpp b/lib/mayaUsd/ufe/UsdUndoRenameCommand.cpp
index 1f3c0c9f24..bfc1e50c6c 100644
--- a/lib/mayaUsd/ufe/UsdUndoRenameCommand.cpp
+++ b/lib/mayaUsd/ufe/UsdUndoRenameCommand.cpp
@@ -18,21 +18,22 @@
 #include <ufe/scene.h>
 #include <ufe/sceneNotification.h>
 #include <ufe/log.h>
-#ifdef UFE_V2_FEATURES_AVAILABLE
-#define UFE_ENABLE_ASSERTS
-#include <ufe/ufeAssert.h>
-#else
-#include <cassert>
-#endif
 
 #include <pxr/usd/usd/stage.h>
 #include <pxr/usd/usd/editContext.h>
 #include <pxr/usd/sdf/copyUtils.h>
 #include <pxr/base/tf/token.h>
 
+#include <mayaUsd/ufe/Utils.h>
+
 #include "private/InPathChange.h"
 
-#include <mayaUsd/ufe/Utils.h>
+#ifdef UFE_V2_FEATURES_AVAILABLE
+#define UFE_ENABLE_ASSERTS
+#include <ufe/ufeAssert.h>
+#else
+#include <cassert>
+#endif
 
 MAYAUSD_NS_DEF {
 namespace ufe {
diff --git a/lib/mayaUsd/ufe/Utils.h b/lib/mayaUsd/ufe/Utils.h
index bf6bca3457..c152a5ec26 100644
--- a/lib/mayaUsd/ufe/Utils.h
+++ b/lib/mayaUsd/ufe/Utils.h
@@ -26,7 +26,6 @@
 #include <pxr/base/tf/token.h>
 
 #include <mayaUsd/base/api.h>
-
 #include <mayaUsd/ufe/UsdSceneItem.h>
 
 PXR_NAMESPACE_USING_DIRECTIVE
diff --git a/lib/mayaUsd/ufe/wrapUtils.cpp b/lib/mayaUsd/ufe/wrapUtils.cpp
index 02e3ef982c..8603dd3603 100644
--- a/lib/mayaUsd/ufe/wrapUtils.cpp
+++ b/lib/mayaUsd/ufe/wrapUtils.cpp
@@ -20,9 +20,9 @@
 
 #include <pxr/base/tf/stringUtils.h>
 
-#include "Global.h"
-#include "UsdSceneItem.h"
-#include "Utils.h"
+#include <mayaUsd/ufe/Global.h>
+#include <mayaUsd/ufe/UsdSceneItem.h>
+#include <mayaUsd/ufe/Utils.h>
 
 using namespace MayaUsd;
 using namespace boost::python;
diff --git a/lib/mayaUsd/utils/util.cpp b/lib/mayaUsd/utils/util.cpp
index 1f969076e6..1cfac13cb5 100644
--- a/lib/mayaUsd/utils/util.cpp
+++ b/lib/mayaUsd/utils/util.cpp
@@ -71,7 +71,7 @@
 #include <pxr/usd/usdGeom/mesh.h>
 #include <pxr/usd/usdGeom/metrics.h>
 
-#include "colorSpace.h"
+#include <mayaUsd/utils/colorSpace.h>
 
 PXR_NAMESPACE_USING_DIRECTIVE