diff --git a/lib/mayaUsd/base/api.h b/lib/mayaUsd/base/api.h
index 6a7b6b84b7..43a3dc65ab 100644
--- a/lib/mayaUsd/base/api.h
+++ b/lib/mayaUsd/base/api.h
@@ -13,8 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-
-#include "pxr/base/arch/export.h"
+#include <pxr/base/arch/export.h>
 
 #if defined _WIN32 || defined __CYGWIN__
 
diff --git a/lib/mayaUsd/base/debugCodes.cpp b/lib/mayaUsd/base/debugCodes.cpp
index 9166057c84..de64cba321 100644
--- a/lib/mayaUsd/base/debugCodes.cpp
+++ b/lib/mayaUsd/base/debugCodes.cpp
@@ -15,11 +15,10 @@
 //
 #include "debugCodes.h"
 
-#include "pxr/base/tf/registryManager.h"
+#include <pxr/base/tf/registryManager.h>
 
 PXR_NAMESPACE_OPEN_SCOPE
 
-
 TF_REGISTRY_FUNCTION(TfDebug)
 {
     TF_DEBUG_ENVIRONMENT_SYMBOL(PXRUSDMAYA_REGISTRY,
@@ -33,4 +32,3 @@ TF_REGISTRY_FUNCTION(TfDebug)
 }
 
 PXR_NAMESPACE_CLOSE_SCOPE
-
diff --git a/lib/mayaUsd/base/debugCodes.h b/lib/mayaUsd/base/debugCodes.h
index 12f737713e..d98425addf 100644
--- a/lib/mayaUsd/base/debugCodes.h
+++ b/lib/mayaUsd/base/debugCodes.h
@@ -16,12 +16,11 @@
 #ifndef PXRUSDMAYA_DEBUGCODES_H
 #define PXRUSDMAYA_DEBUGCODES_H
 
-#include "pxr/pxr.h"
-#include "pxr/base/tf/debug.h"
+#include <pxr/pxr.h>
+#include <pxr/base/tf/debug.h>
 
 PXR_NAMESPACE_OPEN_SCOPE
 
-
 TF_DEBUG_CODES(
     PXRUSDMAYA_REGISTRY,
     PXRUSDMAYA_DIAGNOSTICS,
@@ -29,7 +28,6 @@ TF_DEBUG_CODES(
     USDMAYA_PROXYSHAPEBASE
 );
 
-
 PXR_NAMESPACE_CLOSE_SCOPE
 
 #endif
diff --git a/lib/mayaUsd/fileio/chaser/chaser.h b/lib/mayaUsd/fileio/chaser/chaser.h
index 66d125a059..0c8f9ff839 100644
--- a/lib/mayaUsd/fileio/chaser/chaser.h
+++ b/lib/mayaUsd/fileio/chaser/chaser.h
@@ -16,20 +16,15 @@
 #ifndef PXRUSDMAYA_CHASER_H
 #define PXRUSDMAYA_CHASER_H
 
-/// \file usdMaya/chaser.h
+#include <pxr/pxr.h>
+#include <pxr/base/tf/declarePtrs.h>
+#include <pxr/base/tf/refPtr.h>
+#include <pxr/usd/usd/timeCode.h>
 
-#include "../../base/api.h"
-
-#include "pxr/pxr.h"
-
-#include "pxr/base/tf/declarePtrs.h"
-#include "pxr/base/tf/refPtr.h"
-
-#include "pxr/usd/usd/timeCode.h"
+#include <mayaUsd/base/api.h>
 
 PXR_NAMESPACE_OPEN_SCOPE
 
-
 TF_DECLARE_REF_PTRS(UsdMayaChaser);
 
 /// \brief base class for plugin chasers which are plugins that run after the
diff --git a/lib/mayaUsd/fileio/chaser/chaserRegistry.cpp b/lib/mayaUsd/fileio/chaser/chaserRegistry.cpp
index 21fc882d0d..e79372562e 100644
--- a/lib/mayaUsd/fileio/chaser/chaserRegistry.cpp
+++ b/lib/mayaUsd/fileio/chaser/chaserRegistry.cpp
@@ -15,16 +15,15 @@
 //
 #include "chaserRegistry.h"
 
-#include "../../base/debugCodes.h"
-#include "../registryHelper.h"
+#include <map>
 
-#include "pxr/base/tf/instantiateSingleton.h"
+#include <pxr/base/tf/instantiateSingleton.h>
 
-#include <map>
+#include <mayaUsd/base/debugCodes.h>
+#include <mayaUsd/fileio/registryHelper.h>
 
 PXR_NAMESPACE_OPEN_SCOPE
 
-
 UsdMayaChaserRegistry::FactoryContext::FactoryContext(
         const UsdStagePtr& stage,
         const DagToUsdMap& dagToUsdMap,
diff --git a/lib/mayaUsd/fileio/chaser/chaserRegistry.h b/lib/mayaUsd/fileio/chaser/chaserRegistry.h
index cb69fc0027..abc5700689 100644
--- a/lib/mayaUsd/fileio/chaser/chaserRegistry.h
+++ b/lib/mayaUsd/fileio/chaser/chaserRegistry.h
@@ -16,26 +16,21 @@
 #ifndef PXRUSDMAYA_CHASER_REGISTRY_H
 #define PXRUSDMAYA_CHASER_REGISTRY_H
 
-/// \file usdMaya/chaserRegistry.h
-
-#include "../../base/api.h"
-#include "chaser.h"
-#include "../jobs/jobArgs.h"
-#include "../../utils/util.h"
-
-#include "pxr/pxr.h"
-
-#include "pxr/base/tf/declarePtrs.h"
-#include "pxr/base/tf/registryManager.h"
-#include "pxr/base/tf/singleton.h"
+#include <functional>
 
-#include "pxr/usd/usd/stage.h"
+#include <pxr/pxr.h>
+#include <pxr/base/tf/declarePtrs.h>
+#include <pxr/base/tf/registryManager.h>
+#include <pxr/base/tf/singleton.h>
+#include <pxr/usd/usd/stage.h>
 
-#include <functional>
+#include <mayaUsd/base/api.h>
+#include <mayaUsd/fileio/chaser/chaser.h>
+#include <mayaUsd/fileio/jobs/jobArgs.h>
+#include <mayaUsd/utils/util.h>
 
 PXR_NAMESPACE_OPEN_SCOPE
 
-
 TF_DECLARE_WEAK_PTRS(UsdMayaChaserRegistry);
 
 /// \class UsdMayaChaserRegistry
diff --git a/lib/mayaUsd/fileio/fallbackPrimReader.cpp b/lib/mayaUsd/fileio/fallbackPrimReader.cpp
index cfcb96ca6a..89b234da66 100644
--- a/lib/mayaUsd/fileio/fallbackPrimReader.cpp
+++ b/lib/mayaUsd/fileio/fallbackPrimReader.cpp
@@ -15,9 +15,9 @@
 //
 #include "fallbackPrimReader.h"
 
-#include "translators/translatorUtil.h"
+#include <pxr/usd/usdGeom/imageable.h>
 
-#include "pxr/usd/usdGeom/imageable.h"
+#include <mayaUsd/fileio/translators/translatorUtil.h>
 
 PXR_NAMESPACE_OPEN_SCOPE
 
diff --git a/lib/mayaUsd/fileio/fallbackPrimReader.h b/lib/mayaUsd/fileio/fallbackPrimReader.h
index 7034c42a56..d3dc4ac842 100644
--- a/lib/mayaUsd/fileio/fallbackPrimReader.h
+++ b/lib/mayaUsd/fileio/fallbackPrimReader.h
@@ -16,10 +16,8 @@
 #ifndef PXRUSDMAYA_FALLBACK_PRIM_READER_H
 #define PXRUSDMAYA_FALLBACK_PRIM_READER_H
 
-/// \file usdMaya/fallbackPrimReader.h
-
-#include "primReader.h"
-#include "primReaderRegistry.h"
+#include <mayaUsd/fileio/primReader.h>
+#include <mayaUsd/fileio/primReaderRegistry.h>
 
 PXR_NAMESPACE_OPEN_SCOPE
 
diff --git a/lib/mayaUsd/fileio/functorPrimReader.h b/lib/mayaUsd/fileio/functorPrimReader.h
index 79f5d5c2c5..5a7aca1344 100644
--- a/lib/mayaUsd/fileio/functorPrimReader.h
+++ b/lib/mayaUsd/fileio/functorPrimReader.h
@@ -16,17 +16,15 @@
 #ifndef PXRUSDMAYA_FUNCTORPRIMREADER_H
 #define PXRUSDMAYA_FUNCTORPRIMREADER_H
 
-/// \file usdMaya/functorPrimReader.h
-
-#include "../base/api.h"
-#include "primReader.h"
-#include "primReaderArgs.h"
-#include "primReaderContext.h"
-#include "primReaderRegistry.h"
+#include <functional>
 
-#include "pxr/pxr.h"
+#include <pxr/pxr.h>
 
-#include <functional>
+#include <mayaUsd/base/api.h>
+#include <mayaUsd/fileio/primReader.h>
+#include <mayaUsd/fileio/primReaderArgs.h>
+#include <mayaUsd/fileio/primReaderContext.h>
+#include <mayaUsd/fileio/primReaderRegistry.h>
 
 PXR_NAMESPACE_OPEN_SCOPE
 
diff --git a/lib/mayaUsd/fileio/functorPrimWriter.cpp b/lib/mayaUsd/fileio/functorPrimWriter.cpp
index 9499f8a575..0d61706c8c 100644
--- a/lib/mayaUsd/fileio/functorPrimWriter.cpp
+++ b/lib/mayaUsd/fileio/functorPrimWriter.cpp
@@ -13,28 +13,26 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-#include "pxr/pxr.h"
 #include "functorPrimWriter.h"
 
-#include "primWriter.h"
-#include "primWriterArgs.h"
-#include "primWriterContext.h"
-#include "primWriterRegistry.h"
-#include "transformWriter.h"
-#include "writeJobContext.h"
-
-#include "pxr/usd/sdf/path.h"
-#include "pxr/usd/usd/stage.h"
-#include "pxr/usd/usd/timeCode.h"
+#include <functional>
 
 #include <maya/MFnDependencyNode.h>
 
-#include <functional>
+#include <pxr/pxr.h>
+#include <pxr/usd/sdf/path.h>
+#include <pxr/usd/usd/stage.h>
+#include <pxr/usd/usd/timeCode.h>
 
+#include <mayaUsd/fileio/primWriter.h>
+#include <mayaUsd/fileio/primWriterArgs.h>
+#include <mayaUsd/fileio/primWriterContext.h>
+#include <mayaUsd/fileio/primWriterRegistry.h>
+#include <mayaUsd/fileio/transformWriter.h>
+#include <mayaUsd/fileio/writeJobContext.h>
 
 PXR_NAMESPACE_OPEN_SCOPE
 
-
 UsdMaya_FunctorPrimWriter::UsdMaya_FunctorPrimWriter(
         const MFnDependencyNode& depNodeFn,
         const SdfPath& usdPath,
diff --git a/lib/mayaUsd/fileio/functorPrimWriter.h b/lib/mayaUsd/fileio/functorPrimWriter.h
index ce9c9745f5..1270ca371c 100644
--- a/lib/mayaUsd/fileio/functorPrimWriter.h
+++ b/lib/mayaUsd/fileio/functorPrimWriter.h
@@ -16,26 +16,21 @@
 #ifndef PXRUSDMAYA_FUNCTOR_PRIM_WRITER_H
 #define PXRUSDMAYA_FUNCTOR_PRIM_WRITER_H
 
-/// \file usdMaya/functorPrimWriter.h
-
-#include "pxr/pxr.h"
-#include "transformWriter.h"
-
-#include "primWriter.h"
-#include "primWriterRegistry.h"
-#include "writeJobContext.h"
-
-#include "pxr/usd/sdf/path.h"
-#include "pxr/usd/usd/timeCode.h"
+#include <functional>
 
 #include <maya/MFnDependencyNode.h>
 
-#include <functional>
+#include <pxr/pxr.h>
+#include <pxr/usd/sdf/path.h>
+#include <pxr/usd/usd/timeCode.h>
 
+#include <mayaUsd/fileio/primWriter.h>
+#include <mayaUsd/fileio/primWriterRegistry.h>
+#include <mayaUsd/fileio/transformWriter.h>
+#include <mayaUsd/fileio/writeJobContext.h>
 
 PXR_NAMESPACE_OPEN_SCOPE
 
-
 /// \class UsdMaya_FunctorPrimWriter
 /// \brief This class is scaffolding to hold bare prim writer functions and
 /// adapt them to the UsdMayaPrimWriter or UsdMayaTransformWriter interface
diff --git a/lib/mayaUsd/fileio/importData.cpp b/lib/mayaUsd/fileio/importData.cpp
index a364323195..bf460d7af9 100644
--- a/lib/mayaUsd/fileio/importData.cpp
+++ b/lib/mayaUsd/fileio/importData.cpp
@@ -12,7 +12,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-
+//
 #include "importData.h"
 
 #include <type_traits>
diff --git a/lib/mayaUsd/fileio/importData.h b/lib/mayaUsd/fileio/importData.h
index 9f6a25d59c..4d7e5afd5c 100644
--- a/lib/mayaUsd/fileio/importData.h
+++ b/lib/mayaUsd/fileio/importData.h
@@ -16,14 +16,14 @@
 
 #pragma once
 
-#include "../base/api.h"
+#include <map>
+#include <string>
 
 #include <pxr/usd/usd/stage.h>
 #include <pxr/usd/usd/prim.h>
 #include <pxr/usd/sdf/types.h>
 
-#include <map>
-#include <string>
+#include <mayaUsd/base/api.h>
 
 PXR_NAMESPACE_USING_DIRECTIVE
 
diff --git a/lib/mayaUsd/fileio/instancedNodeWriter.cpp b/lib/mayaUsd/fileio/instancedNodeWriter.cpp
index 27f72a4986..a446bce032 100644
--- a/lib/mayaUsd/fileio/instancedNodeWriter.cpp
+++ b/lib/mayaUsd/fileio/instancedNodeWriter.cpp
@@ -13,29 +13,26 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-#include "pxr/pxr.h"
 #include "instancedNodeWriter.h"
 
-#include "primWriter.h"
-#include "../utils/util.h"
-#include "writeJobContext.h"
-
-#include "pxr/usd/sdf/path.h"
-#include "pxr/usd/usd/references.h"
-#include "pxr/usd/usd/timeCode.h"
+#include <string>
+#include <vector>
 
 #include <maya/MDagPath.h>
 #include <maya/MDagPathArray.h>
-
 #include <maya/MFnDependencyNode.h>
 
-#include <string>
-#include <vector>
+#include <pxr/pxr.h>
+#include <pxr/usd/sdf/path.h>
+#include <pxr/usd/usd/references.h>
+#include <pxr/usd/usd/timeCode.h>
 
+#include <mayaUsd/fileio/primWriter.h>
+#include <mayaUsd/fileio/writeJobContext.h>
+#include <mayaUsd/utils/util.h>
 
 PXR_NAMESPACE_OPEN_SCOPE
 
-
 /// Assuming that \p instance1 and \p instance2 are instances of one another,
 /// replaces the prefix \p instance1 in \p dagPath with \p instance2.
 static
diff --git a/lib/mayaUsd/fileio/instancedNodeWriter.h b/lib/mayaUsd/fileio/instancedNodeWriter.h
index 58643277d9..2006901e83 100644
--- a/lib/mayaUsd/fileio/instancedNodeWriter.h
+++ b/lib/mayaUsd/fileio/instancedNodeWriter.h
@@ -16,25 +16,20 @@
 #ifndef PXRUSDMAYA_INSTANCED_NODE_WRITER_H
 #define PXRUSDMAYA_INSTANCED_NODE_WRITER_H
 
-/// \file usdMaya/instancedNodeWriter.h
-
-#include "pxr/pxr.h"
-#include "primWriter.h"
-
-#include "../utils/util.h"
-#include "writeJobContext.h"
-
-#include "pxr/usd/sdf/path.h"
-#include "pxr/usd/usd/timeCode.h"
+#include <vector>
 
 #include <maya/MFnDependencyNode.h>
 
-#include <vector>
+#include <pxr/pxr.h>
+#include <pxr/usd/sdf/path.h>
+#include <pxr/usd/usd/timeCode.h>
 
+#include <mayaUsd/fileio/primWriter.h>
+#include <mayaUsd/fileio/writeJobContext.h>
+#include <mayaUsd/utils/util.h>
 
 PXR_NAMESPACE_OPEN_SCOPE
 
-
 /// This is a "helper" prim writer used internally by UsdMayaWriteJobContext to
 /// author nodes that are directly instanced in Maya.
 class UsdMaya_InstancedNodeWriter : public UsdMayaPrimWriter
diff --git a/lib/mayaUsd/fileio/jobs/jobArgs.cpp b/lib/mayaUsd/fileio/jobs/jobArgs.cpp
index 9465c3c207..7d4658e5c0 100644
--- a/lib/mayaUsd/fileio/jobs/jobArgs.cpp
+++ b/lib/mayaUsd/fileio/jobs/jobArgs.cpp
@@ -15,28 +15,26 @@
 //
 #include "jobArgs.h"
 
-#include "../registryHelper.h"
-#include "../shading/shadingModeRegistry.h"
-
-#include "pxr/base/tf/diagnostic.h"
-#include "pxr/base/tf/envSetting.h"
-#include "pxr/base/tf/staticTokens.h"
-#include "pxr/base/tf/token.h"
-#include "pxr/base/vt/dictionary.h"
-
-#include "pxr/usd/sdf/path.h"
-#include "pxr/usd/sdf/schema.h"
-#include "pxr/usd/usdGeom/tokens.h"
-#include "pxr/usd/usdUtils/pipeline.h"
+#include <ostream>
+#include <string>
 
 #include <maya/MDagPath.h>
 #include <maya/MGlobal.h>
 #include <maya/MNodeClass.h>
 #include <maya/MTypeId.h>
 
-#include <ostream>
-#include <string>
-
+#include <pxr/base/tf/diagnostic.h>
+#include <pxr/base/tf/envSetting.h>
+#include <pxr/base/tf/staticTokens.h>
+#include <pxr/base/tf/token.h>
+#include <pxr/base/vt/dictionary.h>
+#include <pxr/usd/sdf/path.h>
+#include <pxr/usd/sdf/schema.h>
+#include <pxr/usd/usdGeom/tokens.h>
+#include <pxr/usd/usdUtils/pipeline.h>
+
+#include <mayaUsd/fileio/registryHelper.h>
+#include <mayaUsd/fileio/shading/shadingModeRegistry.h>
 
 PXR_NAMESPACE_OPEN_SCOPE
 
diff --git a/lib/mayaUsd/fileio/jobs/jobArgs.h b/lib/mayaUsd/fileio/jobs/jobArgs.h
index f638c9bb15..837074fb76 100644
--- a/lib/mayaUsd/fileio/jobs/jobArgs.h
+++ b/lib/mayaUsd/fileio/jobs/jobArgs.h
@@ -16,29 +16,23 @@
 #ifndef PXRUSDMAYA_JOB_ARGS_H
 #define PXRUSDMAYA_JOB_ARGS_H
 
-/// \file usdMaya/jobArgs.h
-
-#include "../../base/api.h"
-#include "../../utils/util.h"
-
-#include "pxr/pxr.h"
-
-#include "pxr/base/tf/staticTokens.h"
-#include "pxr/base/tf/token.h"
-
-#include "pxr/usd/sdf/path.h"
-
-#include <maya/MString.h>
-
 #include <map>
 #include <ostream>
 #include <set>
 #include <string>
 #include <vector>
 
+#include <pxr/pxr.h>
+#include <pxr/base/tf/staticTokens.h>
+#include <pxr/base/tf/token.h>
+#include <pxr/usd/sdf/path.h>
 
-PXR_NAMESPACE_OPEN_SCOPE
+#include <maya/MString.h>
 
+#include <mayaUsd/base/api.h>
+#include <mayaUsd/utils/util.h>
+
+PXR_NAMESPACE_OPEN_SCOPE
 
 #define PXRUSDMAYA_TRANSLATOR_TOKENS \
     ((UsdFileExtensionDefault, "usd")) \
diff --git a/lib/mayaUsd/fileio/jobs/modelKindProcessor.cpp b/lib/mayaUsd/fileio/jobs/modelKindProcessor.cpp
index c4568ebfb0..1b9611ba80 100644
--- a/lib/mayaUsd/fileio/jobs/modelKindProcessor.cpp
+++ b/lib/mayaUsd/fileio/jobs/modelKindProcessor.cpp
@@ -15,12 +15,11 @@
 //
 #include "modelKindProcessor.h"
 
-#include "pxr/usd/kind/registry.h"
-#include "pxr/usd/usd/modelAPI.h"
+#include <pxr/usd/kind/registry.h>
+#include <pxr/usd/usd/modelAPI.h>
 
 PXR_NAMESPACE_OPEN_SCOPE
 
-
 UsdMaya_ModelKindProcessor::UsdMaya_ModelKindProcessor(
     const UsdMayaJobExportArgs& args)
     : _args(args),
@@ -28,7 +27,6 @@ UsdMaya_ModelKindProcessor::UsdMaya_ModelKindProcessor(
 {
 }
 
-
 /// Returns the root-most ancestor of prim, which is either a component
 /// or a root-level prim.
 static SdfPath
diff --git a/lib/mayaUsd/fileio/jobs/modelKindProcessor.h b/lib/mayaUsd/fileio/jobs/modelKindProcessor.h
index 654d0c1d24..d320653902 100644
--- a/lib/mayaUsd/fileio/jobs/modelKindProcessor.h
+++ b/lib/mayaUsd/fileio/jobs/modelKindProcessor.h
@@ -16,22 +16,18 @@
 #ifndef PXRUSDMAYA_MODEL_KIND_PROCESSOR_H
 #define PXRUSDMAYA_MODEL_KIND_PROCESSOR_H
 
-/// \file usdMaya/modelKindProcessor.h
-
-#include "jobArgs.h"
-#include "../primWriter.h"
-
-#include "pxr/pxr.h"
-
-#include "pxr/usd/usd/prim.h"
-#include "pxr/usd/usd/stage.h"
-
 #include <unordered_map>
 #include <unordered_set>
 #include <vector>
 
-PXR_NAMESPACE_OPEN_SCOPE
+#include <pxr/pxr.h>
+#include <pxr/usd/usd/prim.h>
+#include <pxr/usd/usd/stage.h>
+
+#include <mayaUsd/fileio/jobs/jobArgs.h>
+#include <mayaUsd/fileio/primWriter.h>
 
+PXR_NAMESPACE_OPEN_SCOPE
 
 /// This class encapsulates all of the logic for writing model kinds from
 /// UsdMaya_WriteJob. It is a "black box" that reads each newly-written prim, one
diff --git a/lib/mayaUsd/fileio/jobs/readJob.cpp b/lib/mayaUsd/fileio/jobs/readJob.cpp
index d2492796a5..f28a0c50b7 100644
--- a/lib/mayaUsd/fileio/jobs/readJob.cpp
+++ b/lib/mayaUsd/fileio/jobs/readJob.cpp
@@ -15,29 +15,11 @@
 //
 #include "readJob.h"
 
-#include "../primReaderRegistry.h"
-#include "../../utils/stageCache.h"
-#include "../../nodes/stageNode.h"
-#include "../translators/translatorMaterial.h"
-#include "../translators/translatorXformable.h"
-#include "../../utils/util.h"
-
-#include "pxr/base/tf/token.h"
-
-#include "pxr/usd/sdf/layer.h"
-#include "pxr/usd/sdf/path.h"
-#include "pxr/usd/usd/prim.h"
-#include "pxr/usd/usd/primFlags.h"
-#include "pxr/usd/usd/primRange.h"
-#include "pxr/usd/usd/stage.h"
-#include "pxr/usd/usd/stageCacheContext.h"
-#include "pxr/usd/usd/timeCode.h"
-#include "pxr/usd/usd/variantSets.h"
-#include "pxr/usd/usdGeom/metrics.h"
-#include "pxr/usd/usdGeom/xform.h"
-#include "pxr/usd/usdGeom/xformCommonAPI.h"
-#include "pxr/usd/usdUtils/pipeline.h"
-#include "pxr/usd/usdUtils/stageCache.h"
+#include <map>
+#include <string>
+#include <unordered_map>
+#include <utility>
+#include <vector>
 
 #include <maya/MAnimControl.h>
 #include <maya/MDagModifier.h>
@@ -49,12 +31,28 @@
 #include <maya/MStatus.h>
 #include <maya/MTime.h>
 
-#include <map>
-#include <string>
-#include <unordered_map>
-#include <utility>
-#include <vector>
-
+#include <pxr/base/tf/token.h>
+#include <pxr/usd/sdf/layer.h>
+#include <pxr/usd/sdf/path.h>
+#include <pxr/usd/usd/prim.h>
+#include <pxr/usd/usd/primFlags.h>
+#include <pxr/usd/usd/primRange.h>
+#include <pxr/usd/usd/stage.h>
+#include <pxr/usd/usd/stageCacheContext.h>
+#include <pxr/usd/usd/timeCode.h>
+#include <pxr/usd/usd/variantSets.h>
+#include <pxr/usd/usdGeom/metrics.h>
+#include <pxr/usd/usdGeom/xform.h>
+#include <pxr/usd/usdGeom/xformCommonAPI.h>
+#include <pxr/usd/usdUtils/pipeline.h>
+#include <pxr/usd/usdUtils/stageCache.h>
+
+#include <mayaUsd/fileio/primReaderRegistry.h>
+#include <mayaUsd/fileio/translators/translatorMaterial.h>
+#include <mayaUsd/fileio/translators/translatorXformable.h>
+#include <mayaUsd/nodes/stageNode.h>
+#include <mayaUsd/utils/stageCache.h>
+#include <mayaUsd/utils/util.h>
 
 PXR_NAMESPACE_OPEN_SCOPE
 
diff --git a/lib/mayaUsd/fileio/jobs/readJob.h b/lib/mayaUsd/fileio/jobs/readJob.h
index 3399bae383..6552362745 100644
--- a/lib/mayaUsd/fileio/jobs/readJob.h
+++ b/lib/mayaUsd/fileio/jobs/readJob.h
@@ -16,23 +16,20 @@
 #ifndef PXRUSDMAYA_READ_JOB_H
 #define PXRUSDMAYA_READ_JOB_H
 
-/// \file usdMaya/readJob.h
-
-#include "jobArgs.h"
-#include "../primReaderContext.h"
-#include "../importData.h"
-
-#include "pxr/pxr.h"
-
-#include "pxr/usd/usd/prim.h"
-#include "pxr/usd/usd/primRange.h"
+#include <map>
+#include <string>
+#include <vector>
 
 #include <maya/MDagModifier.h>
 #include <maya/MDagPath.h>
 
-#include <map>
-#include <string>
-#include <vector>
+#include <pxr/pxr.h>
+#include <pxr/usd/usd/prim.h>
+#include <pxr/usd/usd/primRange.h>
+
+#include <mayaUsd/fileio/importData.h>
+#include <mayaUsd/fileio/jobs/jobArgs.h>
+#include <mayaUsd/fileio/primReaderContext.h>
 
 PXR_NAMESPACE_OPEN_SCOPE
 
diff --git a/lib/mayaUsd/fileio/jobs/writeJob.cpp b/lib/mayaUsd/fileio/jobs/writeJob.cpp
index 82cdb407e2..f9921f4b0d 100644
--- a/lib/mayaUsd/fileio/jobs/writeJob.cpp
+++ b/lib/mayaUsd/fileio/jobs/writeJob.cpp
@@ -13,45 +13,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-#include "pxr/pxr.h"
 #include "writeJob.h"
 
-#include "jobArgs.h"
-#include "modelKindProcessor.h"
-#include "../primWriter.h"
-#include "../primWriterRegistry.h"
-#include "../shading/shadingModeExporterContext.h"
-#include "../transformWriter.h"
-#include "../translators/translatorMaterial.h"
-#include "../../utils/util.h"
-
-#include "../chaser/chaser.h"
-#include "../chaser/chaserRegistry.h"
-
-#include "pxr/base/tf/fileUtils.h"
-#include "pxr/base/tf/hash.h"
-#include "pxr/base/tf/hashset.h"
-#include "pxr/base/tf/pathUtils.h"
-#include "pxr/base/tf/stl.h"
-#include "pxr/base/tf/stringUtils.h"
-#include "pxr/usd/ar/resolver.h"
-#include "pxr/usd/kind/registry.h"
-#include "pxr/usd/sdf/layer.h"
-#include "pxr/usd/sdf/primSpec.h"
-// Needed for directly removing a UsdVariant via Sdf
-//   Remove when UsdVariantSet::RemoveVariant() is exposed
-//   XXX [bug 75864]
-#include "pxr/usd/sdf/variantSetSpec.h"
-#include "pxr/usd/sdf/variantSpec.h"
-#include "pxr/usd/usd/modelAPI.h"
-#include "pxr/usd/usd/variantSets.h"
-#include "pxr/usd/usd/editContext.h"
-#include "pxr/usd/usd/primRange.h"
-#include "pxr/usd/usd/usdcFileFormat.h"
-#include "pxr/usd/usdGeom/metrics.h"
-#include "pxr/usd/usdGeom/xform.h"
-#include "pxr/usd/usdUtils/pipeline.h"
-#include "pxr/usd/usdUtils/dependencies.h"
+#include <limits>
+#include <map>
+#include <unordered_set>
 
 #include <maya/MAnimControl.h>
 #include <maya/MComputation.h>
@@ -65,20 +31,51 @@
 #include <maya/MStatus.h>
 #include <maya/MUuid.h>
 
-#include <limits>
-#include <map>
-#include <unordered_set>
+#include <pxr/pxr.h>
+#include <pxr/base/tf/fileUtils.h>
+#include <pxr/base/tf/hash.h>
+#include <pxr/base/tf/hashset.h>
+#include <pxr/base/tf/pathUtils.h>
+#include <pxr/base/tf/stl.h>
+#include <pxr/base/tf/stringUtils.h>
+#include <pxr/usd/ar/resolver.h>
+#include <pxr/usd/kind/registry.h>
+#include <pxr/usd/sdf/layer.h>
+#include <pxr/usd/sdf/primSpec.h>
+// Needed for directly removing a UsdVariant via Sdf
+//   Remove when UsdVariantSet::RemoveVariant() is exposed
+//   XXX [bug 75864]
+#include <pxr/usd/sdf/variantSetSpec.h>
+#include <pxr/usd/sdf/variantSpec.h>
+#include <pxr/usd/usd/modelAPI.h>
+#include <pxr/usd/usd/variantSets.h>
+#include <pxr/usd/usd/editContext.h>
+#include <pxr/usd/usd/primRange.h>
+#include <pxr/usd/usd/usdcFileFormat.h>
+#include <pxr/usd/usdGeom/metrics.h>
+#include <pxr/usd/usdGeom/xform.h>
+#include <pxr/usd/usdUtils/pipeline.h>
+#include <pxr/usd/usdUtils/dependencies.h>
+
+#include <mayaUsd/fileio/chaser/chaser.h>
+#include <mayaUsd/fileio/chaser/chaserRegistry.h>
+#include <mayaUsd/fileio/jobs/jobArgs.h>
+#include <mayaUsd/fileio/jobs/modelKindProcessor.h>
+#include <mayaUsd/fileio/primWriter.h>
+#include <mayaUsd/fileio/primWriterRegistry.h>
+#include <mayaUsd/fileio/shading/shadingModeExporterContext.h>
+#include <mayaUsd/fileio/transformWriter.h>
+#include <mayaUsd/fileio/translators/translatorMaterial.h>
+#include <mayaUsd/utils/util.h>
 
 PXR_NAMESPACE_OPEN_SCOPE
 
-
 UsdMaya_WriteJob::UsdMaya_WriteJob(const UsdMayaJobExportArgs& iArgs)
     : mJobCtx(iArgs),
       _modelKindProcessor(new UsdMaya_ModelKindProcessor(iArgs))
 {
 }
 
-
 UsdMaya_WriteJob::~UsdMaya_WriteJob()
 {
 }
diff --git a/lib/mayaUsd/fileio/jobs/writeJob.h b/lib/mayaUsd/fileio/jobs/writeJob.h
index 0d3583a0de..f05076a8c8 100644
--- a/lib/mayaUsd/fileio/jobs/writeJob.h
+++ b/lib/mayaUsd/fileio/jobs/writeJob.h
@@ -16,21 +16,17 @@
 #ifndef PXRUSDMAYA_WRITE_JOB_H
 #define PXRUSDMAYA_WRITE_JOB_H
 
-/// \file usdMaya/writeJob.h
-
-#include "../../base/api.h"
-
-#include "../chaser/chaser.h"
-#include "../../utils/util.h"
-#include "../writeJobContext.h"
-
-#include "pxr/pxr.h"
-
-#include "pxr/base/tf/hashmap.h"
+#include <string>
 
 #include <maya/MObjectHandle.h>
 
-#include <string>
+#include <pxr/pxr.h>
+#include <pxr/base/tf/hashmap.h>
+
+#include <mayaUsd/base/api.h>
+#include <mayaUsd/fileio/chaser/chaser.h>
+#include <mayaUsd/fileio/writeJobContext.h>
+#include <mayaUsd/utils/util.h>
 
 PXR_NAMESPACE_OPEN_SCOPE
 
diff --git a/lib/mayaUsd/fileio/primReader.h b/lib/mayaUsd/fileio/primReader.h
index 0b9f2a6ec8..7f6a43e850 100644
--- a/lib/mayaUsd/fileio/primReader.h
+++ b/lib/mayaUsd/fileio/primReader.h
@@ -16,13 +16,11 @@
 #ifndef PXRUSDMAYA_MAYAPRIMREADER_H
 #define PXRUSDMAYA_MAYAPRIMREADER_H
 
-/// \file usdMaya/primReader.h
+#include <pxr/pxr.h>
 
-#include "../base/api.h"
-#include "primReaderArgs.h"
-#include "primReaderContext.h"
-
-#include "pxr/pxr.h"
+#include <mayaUsd/base/api.h>
+#include <mayaUsd/fileio/primReaderArgs.h>
+#include <mayaUsd/fileio/primReaderContext.h>
 
 PXR_NAMESPACE_OPEN_SCOPE
 
diff --git a/lib/mayaUsd/fileio/primReaderArgs.cpp b/lib/mayaUsd/fileio/primReaderArgs.cpp
index 9206c6fb43..5b680842f7 100644
--- a/lib/mayaUsd/fileio/primReaderArgs.cpp
+++ b/lib/mayaUsd/fileio/primReaderArgs.cpp
@@ -17,7 +17,6 @@
 
 PXR_NAMESPACE_OPEN_SCOPE
 
-
 UsdMayaPrimReaderArgs::UsdMayaPrimReaderArgs(
         const UsdPrim& prim,
         const UsdMayaJobImportArgs& jobArgs)
diff --git a/lib/mayaUsd/fileio/primReaderArgs.h b/lib/mayaUsd/fileio/primReaderArgs.h
index 415be098cc..e422d1954b 100644
--- a/lib/mayaUsd/fileio/primReaderArgs.h
+++ b/lib/mayaUsd/fileio/primReaderArgs.h
@@ -16,20 +16,15 @@
 #ifndef PXRUSDMAYA_PRIMREADERARGS_H
 #define PXRUSDMAYA_PRIMREADERARGS_H
 
-/// \file usdMaya/primReaderArgs.h
+#include <pxr/pxr.h>
+#include <pxr/base/gf/interval.h>
+#include <pxr/usd/usd/prim.h>
 
-#include "../base/api.h"
-#include "jobs/jobArgs.h"
-
-#include "pxr/pxr.h"
-
-#include "pxr/base/gf/interval.h"
-
-#include "pxr/usd/usd/prim.h"
+#include <mayaUsd/base/api.h>
+#include <mayaUsd/fileio/jobs/jobArgs.h>
 
 PXR_NAMESPACE_OPEN_SCOPE
 
-
 /// \class UsdMayaPrimReaderArgs
 /// \brief This class holds read-only arguments that are passed into reader plugins for
 /// the usdMaya library.
diff --git a/lib/mayaUsd/fileio/primReaderContext.cpp b/lib/mayaUsd/fileio/primReaderContext.cpp
index 679661501f..14aa0244d3 100644
--- a/lib/mayaUsd/fileio/primReaderContext.cpp
+++ b/lib/mayaUsd/fileio/primReaderContext.cpp
@@ -17,7 +17,6 @@
 
 PXR_NAMESPACE_OPEN_SCOPE
 
-
 UsdMayaPrimReaderContext::UsdMayaPrimReaderContext(
         ObjectRegistry* pathNodeMap)
     :
diff --git a/lib/mayaUsd/fileio/primReaderContext.h b/lib/mayaUsd/fileio/primReaderContext.h
index 76364c16fa..f6f3876a90 100644
--- a/lib/mayaUsd/fileio/primReaderContext.h
+++ b/lib/mayaUsd/fileio/primReaderContext.h
@@ -16,19 +16,15 @@
 #ifndef PXRUSDMAYA_PRIMREADERCONTEXT_H
 #define PXRUSDMAYA_PRIMREADERCONTEXT_H
 
-/// \file usdMaya/primReaderContext.h
-
-#include "../base/api.h"
+#include <maya/MObject.h>
 
-#include "pxr/pxr.h"
+#include <pxr/pxr.h>
+#include <pxr/usd/usd/prim.h>
 
-#include "pxr/usd/usd/prim.h"
-
-#include <maya/MObject.h>
+#include <mayaUsd/base/api.h>
 
 PXR_NAMESPACE_OPEN_SCOPE
 
-
 /// \class UsdMayaPrimReaderContext
 /// \brief This class provides an interface for reader plugins to communicate
 /// state back to the core usd maya logic as well as retrieve information set by
diff --git a/lib/mayaUsd/fileio/primReaderRegistry.cpp b/lib/mayaUsd/fileio/primReaderRegistry.cpp
index d259426ca9..b35127d3a4 100644
--- a/lib/mayaUsd/fileio/primReaderRegistry.cpp
+++ b/lib/mayaUsd/fileio/primReaderRegistry.cpp
@@ -15,26 +15,24 @@
 //
 #include "primReaderRegistry.h"
 
-#include "../base/debugCodes.h"
-#include "fallbackPrimReader.h"
-#include "functorPrimReader.h"
-#include "registryHelper.h"
-
-#include "pxr/base/plug/registry.h"
-#include "pxr/base/tf/registryManager.h"
-#include "pxr/base/tf/staticTokens.h"
-#include "pxr/base/tf/stl.h"
-#include "pxr/base/tf/token.h"
-#include "pxr/base/tf/type.h"
-#include "pxr/usd/usd/schemaBase.h"
-
 #include <map>
 #include <string>
 #include <utility>
 
+#include <pxr/base/plug/registry.h>
+#include <pxr/base/tf/registryManager.h>
+#include <pxr/base/tf/staticTokens.h>
+#include <pxr/base/tf/stl.h>
+#include <pxr/base/tf/token.h>
+#include <pxr/base/tf/type.h>
+#include <pxr/usd/usd/schemaBase.h>
 
-PXR_NAMESPACE_OPEN_SCOPE
+#include <mayaUsd/base/debugCodes.h>
+#include <mayaUsd/fileio/fallbackPrimReader.h>
+#include <mayaUsd/fileio/functorPrimReader.h>
+#include <mayaUsd/fileio/registryHelper.h>
 
+PXR_NAMESPACE_OPEN_SCOPE
 
 TF_DEFINE_PRIVATE_TOKENS(_tokens,
     (UsdMaya)
diff --git a/lib/mayaUsd/fileio/primReaderRegistry.h b/lib/mayaUsd/fileio/primReaderRegistry.h
index fd7b556c2e..c35b2b2a00 100644
--- a/lib/mayaUsd/fileio/primReaderRegistry.h
+++ b/lib/mayaUsd/fileio/primReaderRegistry.h
@@ -16,20 +16,16 @@
 #ifndef PXRUSDMAYA_PRIMREADERREGISTRY_H
 #define PXRUSDMAYA_PRIMREADERREGISTRY_H
 
-/// \file usdMaya/primReaderRegistry.h
+#include <pxr/pxr.h>
+#include <pxr/base/tf/registryManager.h> 
 
-#include "../base/api.h"
-#include "primReader.h"
-#include "primReaderArgs.h"
-#include "primReaderContext.h"
-
-#include "pxr/pxr.h"
-
-#include "pxr/base/tf/registryManager.h" 
+#include <mayaUsd/base/api.h>
+#include <mayaUsd/fileio/primReader.h>
+#include <mayaUsd/fileio/primReaderArgs.h>
+#include <mayaUsd/fileio/primReaderContext.h>
 
 PXR_NAMESPACE_OPEN_SCOPE
 
-
 /// \class UsdMayaPrimReaderRegistry
 /// \brief Provides functionality to register and lookup usd Maya reader
 /// plugins.
diff --git a/lib/mayaUsd/fileio/primUpdater.h b/lib/mayaUsd/fileio/primUpdater.h
index 4115ab74cc..5438ed5b03 100644
--- a/lib/mayaUsd/fileio/primUpdater.h
+++ b/lib/mayaUsd/fileio/primUpdater.h
@@ -17,17 +17,17 @@
 #ifndef PXRUSDMAYA_MAYAPRIMUPDATER_H
 #define PXRUSDMAYA_MAYAPRIMUPDATER_H
 
-#include "../base/api.h"
-#include "primUpdaterContext.h"
-#include "../utils/util.h"
-
-#include "pxr/pxr.h"
-#include "pxr/usd/sdf/path.h"
-
 #include <maya/MDagPath.h>
 #include <maya/MFnDependencyNode.h>
 #include <maya/MObject.h>
 
+#include <pxr/pxr.h>
+#include <pxr/usd/sdf/path.h>
+
+#include <mayaUsd/base/api.h>
+#include <mayaUsd/fileio/primUpdaterContext.h>
+#include <mayaUsd/utils/util.h>
+
 PXR_NAMESPACE_OPEN_SCOPE
 
 class UsdMayaPrimUpdater
diff --git a/lib/mayaUsd/fileio/primUpdaterContext.h b/lib/mayaUsd/fileio/primUpdaterContext.h
index c01f0cad7f..e682a6bb33 100644
--- a/lib/mayaUsd/fileio/primUpdaterContext.h
+++ b/lib/mayaUsd/fileio/primUpdaterContext.h
@@ -17,16 +17,14 @@
 #ifndef PXRUSDMAYA_PRIMUPDATERCONTEXT_H
 #define PXRUSDMAYA_PRIMUPDATERCONTEXT_H
 
-#include "../base/api.h"
+#include <pxr/pxr.h>
+#include <pxr/usd/usd/stage.h>
+#include <pxr/usd/usd/timeCode.h>
 
-#include "pxr/pxr.h"
-
-#include "pxr/usd/usd/stage.h"
-#include "pxr/usd/usd/timeCode.h"
+#include <mayaUsd/base/api.h>
 
 PXR_NAMESPACE_OPEN_SCOPE
 
-
 /// \class UsdMayaPrimUpdaterContext
 /// \brief This class provides an interface for updater plugins to communicate
 /// state back to the core usd maya logic.
diff --git a/lib/mayaUsd/fileio/primUpdaterRegistry.cpp b/lib/mayaUsd/fileio/primUpdaterRegistry.cpp
index a2bb16d683..d7a544ac71 100644
--- a/lib/mayaUsd/fileio/primUpdaterRegistry.cpp
+++ b/lib/mayaUsd/fileio/primUpdaterRegistry.cpp
@@ -14,29 +14,26 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-#include "pxr/pxr.h"
 #include "primUpdaterRegistry.h"
 
-#include "../base/debugCodes.h"
-#include "registryHelper.h"
-
-#include "pxr/base/plug/registry.h"
-#include "pxr/base/tf/debug.h"
-#include "pxr/base/tf/diagnostic.h"
-#include "pxr/base/tf/registryManager.h"
-#include "pxr/base/tf/staticTokens.h"
-#include "pxr/base/tf/stl.h"
-#include "pxr/base/tf/token.h"
-
-#include "pxr/usd/usd/schemaBase.h"
-
 #include <map>
 #include <string>
 #include <utility>
 
+#include <pxr/pxr.h>
+#include <pxr/base/plug/registry.h>
+#include <pxr/base/tf/debug.h>
+#include <pxr/base/tf/diagnostic.h>
+#include <pxr/base/tf/registryManager.h>
+#include <pxr/base/tf/staticTokens.h>
+#include <pxr/base/tf/stl.h>
+#include <pxr/base/tf/token.h>
+#include <pxr/usd/usd/schemaBase.h>
 
-PXR_NAMESPACE_OPEN_SCOPE
+#include <mayaUsd/fileio/registryHelper.h>
+#include <mayaUsd/base/debugCodes.h>
 
+PXR_NAMESPACE_OPEN_SCOPE
 
 TF_DEFINE_PRIVATE_TOKENS(_tokens,
     (UsdMaya)
diff --git a/lib/mayaUsd/fileio/primUpdaterRegistry.h b/lib/mayaUsd/fileio/primUpdaterRegistry.h
index 37ae0be759..ff1cb49067 100644
--- a/lib/mayaUsd/fileio/primUpdaterRegistry.h
+++ b/lib/mayaUsd/fileio/primUpdaterRegistry.h
@@ -17,23 +17,20 @@
 #ifndef PXRUSDMAYA_PRIM_UPDATER_REGISTRY_H
 #define PXRUSDMAYA_PRIM_UPDATER_REGISTRY_H
 
-#include "pxr/pxr.h"
-#include "../base/api.h"
-
-#include "primUpdater.h"
-#include "primUpdaterContext.h"
-
-#include "pxr/usd/sdf/path.h"
+#include <functional>
+#include <string>
 
 #include <maya/MFnDependencyNode.h>
 
-#include <functional>
-#include <string>
+#include <pxr/pxr.h>
+#include <pxr/usd/sdf/path.h>
 
+#include <mayaUsd/base/api.h>
+#include <mayaUsd/fileio/primUpdater.h>
+#include <mayaUsd/fileio/primUpdaterContext.h>
 
 PXR_NAMESPACE_OPEN_SCOPE
 
-
 /// \class UsdMayaPrimUpdaterRegistry
 /// \brief Provides functionality to register and lookup USD updater plugins
 /// for Maya nodes.
diff --git a/lib/mayaUsd/fileio/primWriter.cpp b/lib/mayaUsd/fileio/primWriter.cpp
index 4d03253d37..4ac4874c79 100644
--- a/lib/mayaUsd/fileio/primWriter.cpp
+++ b/lib/mayaUsd/fileio/primWriter.cpp
@@ -13,28 +13,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-#include "pxr/pxr.h"
 #include "primWriter.h"
 
-#include "utils/adaptor.h"
-#include "jobs/jobArgs.h"
-#include "translators/translatorGprim.h"
-#include "../utils//util.h"
-#include "writeJobContext.h"
-#include "utils/writeUtil.h"
-
-#include "pxr/base/tf/diagnostic.h"
-#include "pxr/base/tf/staticTokens.h"
-#include "pxr/base/tf/token.h"
-#include "pxr/base/vt/value.h"
-#include "pxr/usd/sdf/path.h"
-#include "pxr/usd/usd/prim.h"
-#include "pxr/usd/usd/stage.h"
-#include "pxr/usd/usd/timeCode.h"
-#include "pxr/usd/usdGeom/gprim.h"
-#include "pxr/usd/usdGeom/imageable.h"
-#include "pxr/usd/usdGeom/tokens.h"
-#include "pxr/usd/usdUtils/sparseValueWriter.h"
+#include <string>
+#include <typeinfo>
+#include <vector>
 
 #include <maya/MDagPath.h>
 #include <maya/MFnDagNode.h>
@@ -43,14 +26,29 @@
 #include <maya/MStatus.h>
 #include <maya/MString.h>
 
-#include <string>
-#include <typeinfo>
-#include <vector>
-
+#include <pxr/pxr.h>
+#include <pxr/base/tf/diagnostic.h>
+#include <pxr/base/tf/staticTokens.h>
+#include <pxr/base/tf/token.h>
+#include <pxr/base/vt/value.h>
+#include <pxr/usd/sdf/path.h>
+#include <pxr/usd/usd/prim.h>
+#include <pxr/usd/usd/stage.h>
+#include <pxr/usd/usd/timeCode.h>
+#include <pxr/usd/usdGeom/gprim.h>
+#include <pxr/usd/usdGeom/imageable.h>
+#include <pxr/usd/usdGeom/tokens.h>
+#include <pxr/usd/usdUtils/sparseValueWriter.h>
+
+#include <mayaUsd/fileio/jobs/jobArgs.h>
+#include <mayaUsd/fileio/translators/translatorGprim.h>
+#include <mayaUsd/fileio/utils/adaptor.h>
+#include <mayaUsd/fileio/utils/writeUtil.h>
+#include <mayaUsd/fileio/writeJobContext.h>
+#include <mayaUsd/utils/util.h>
 
 PXR_NAMESPACE_OPEN_SCOPE
 
-
 PXRUSDMAYA_REGISTER_ADAPTOR_ATTRIBUTE_ALIAS(
     UsdGeomTokens->purpose, "USD_purpose");
 
diff --git a/lib/mayaUsd/fileio/primWriter.h b/lib/mayaUsd/fileio/primWriter.h
index 85949468b9..0ae4b00cbd 100644
--- a/lib/mayaUsd/fileio/primWriter.h
+++ b/lib/mayaUsd/fileio/primWriter.h
@@ -16,35 +16,29 @@
 #ifndef PXRUSDMAYA_PRIM_WRITER_H
 #define PXRUSDMAYA_PRIM_WRITER_H
 
-/// \file usdMaya/primWriter.h
-
-#include "pxr/pxr.h"
-#include "../base/api.h"
-
-#include "jobs/jobArgs.h"
-#include "../utils/util.h"
-
-#include "pxr/base/vt/value.h"
-#include "pxr/usd/sdf/path.h"
-#include "pxr/usd/usd/attribute.h"
-#include "pxr/usd/usd/prim.h"
-#include "pxr/usd/usd/stage.h"
-#include "pxr/usd/usd/timeCode.h"
-#include "pxr/usd/usdUtils/sparseValueWriter.h"
+#include <memory>
 
 #include <maya/MDagPath.h>
 #include <maya/MFnDependencyNode.h>
 #include <maya/MObject.h>
 
-#include <memory>
+#include <pxr/pxr.h>
+#include <pxr/base/vt/value.h>
+#include <pxr/usd/sdf/path.h>
+#include <pxr/usd/usd/attribute.h>
+#include <pxr/usd/usd/prim.h>
+#include <pxr/usd/usd/stage.h>
+#include <pxr/usd/usd/timeCode.h>
+#include <pxr/usd/usdUtils/sparseValueWriter.h>
 
+#include <mayaUsd/base/api.h>
+#include <mayaUsd/fileio/jobs/jobArgs.h>
+#include <mayaUsd/utils/util.h>
 
 PXR_NAMESPACE_OPEN_SCOPE
 
-
 class UsdMayaWriteJobContext;
 
-
 /// Base class for all built-in and user-defined prim writers. Translates Maya
 /// node data into USD prim(s).
 ///
diff --git a/lib/mayaUsd/fileio/primWriterArgs.cpp b/lib/mayaUsd/fileio/primWriterArgs.cpp
index 77ca96696b..89665b47f6 100644
--- a/lib/mayaUsd/fileio/primWriterArgs.cpp
+++ b/lib/mayaUsd/fileio/primWriterArgs.cpp
@@ -15,12 +15,11 @@
 //
 #include "primWriterArgs.h"
 
-#include "utils/writeUtil.h"
-
 #include <maya/MFnDependencyNode.h>
 
-PXR_NAMESPACE_OPEN_SCOPE
+#include <mayaUsd/fileio/utils/writeUtil.h>
 
+PXR_NAMESPACE_OPEN_SCOPE
 
 UsdMayaPrimWriterArgs::UsdMayaPrimWriterArgs(
         const MDagPath& dagPath,
diff --git a/lib/mayaUsd/fileio/primWriterArgs.h b/lib/mayaUsd/fileio/primWriterArgs.h
index 7e50806793..603ff9cf62 100644
--- a/lib/mayaUsd/fileio/primWriterArgs.h
+++ b/lib/mayaUsd/fileio/primWriterArgs.h
@@ -16,19 +16,16 @@
 #ifndef PXRUSDMAYA_PRIMWRITERERARGS_H
 #define PXRUSDMAYA_PRIMWRITERERARGS_H
 
-/// \file usdMaya/primWriterArgs.h
-
-#include "../base/api.h"
-
-#include "pxr/pxr.h"
-#include "pxr/base/vt/array.h"
-#include "pxr/base/gf/vec3f.h"
-
 #include <maya/MDagPath.h>
 #include <maya/MObject.h>
 
-PXR_NAMESPACE_OPEN_SCOPE
+#include <pxr/pxr.h>
+#include <pxr/base/vt/array.h>
+#include <pxr/base/gf/vec3f.h>
+
+#include <mayaUsd/base/api.h>
 
+PXR_NAMESPACE_OPEN_SCOPE
 
 /// \class UsdMayaPrimWriterArgs
 /// \brief This class holds read-only arguments that are passed into the writer
diff --git a/lib/mayaUsd/fileio/primWriterContext.cpp b/lib/mayaUsd/fileio/primWriterContext.cpp
index b1d06a21bc..4b71ddc0ab 100644
--- a/lib/mayaUsd/fileio/primWriterContext.cpp
+++ b/lib/mayaUsd/fileio/primWriterContext.cpp
@@ -17,7 +17,6 @@
 
 PXR_NAMESPACE_OPEN_SCOPE
 
-
 UsdMayaPrimWriterContext::UsdMayaPrimWriterContext(
         const UsdTimeCode& timeCode,
         const SdfPath& authorPath, 
diff --git a/lib/mayaUsd/fileio/primWriterContext.h b/lib/mayaUsd/fileio/primWriterContext.h
index 15a97f4cd3..33eec8f439 100644
--- a/lib/mayaUsd/fileio/primWriterContext.h
+++ b/lib/mayaUsd/fileio/primWriterContext.h
@@ -16,18 +16,14 @@
 #ifndef PXRUSDMAYA_PRIMWRITERCONTEXT_H
 #define PXRUSDMAYA_PRIMWRITERCONTEXT_H
 
-/// \file usdMaya/primWriterContext.h
+#include <pxr/pxr.h>
+#include <pxr/usd/usd/stage.h>
+#include <pxr/usd/usd/timeCode.h>
 
-#include "../base/api.h"
-
-#include "pxr/pxr.h"
-
-#include "pxr/usd/usd/stage.h"
-#include "pxr/usd/usd/timeCode.h"
+#include <mayaUsd/base/api.h>
 
 PXR_NAMESPACE_OPEN_SCOPE
 
-
 /// \class UsdMayaPrimReaderContext
 /// \brief This class provides an interface for writer plugins to communicate
 /// state back to the core usd maya logic.
diff --git a/lib/mayaUsd/fileio/primWriterRegistry.cpp b/lib/mayaUsd/fileio/primWriterRegistry.cpp
index ec7df249e2..437fc09712 100644
--- a/lib/mayaUsd/fileio/primWriterRegistry.cpp
+++ b/lib/mayaUsd/fileio/primWriterRegistry.cpp
@@ -13,27 +13,25 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-#include "pxr/pxr.h"
 #include "primWriterRegistry.h"
 
-#include "../base/debugCodes.h"
-#include "functorPrimWriter.h"
-#include "registryHelper.h"
-
-#include "pxr/base/tf/debug.h"
-#include "pxr/base/tf/diagnostic.h"
-#include "pxr/base/tf/registryManager.h"
-#include "pxr/base/tf/staticTokens.h"
-#include "pxr/base/tf/stl.h"
-#include "pxr/base/tf/token.h"
-
 #include <map>
 #include <string>
 #include <utility>
 
+#include <pxr/pxr.h>
+#include <pxr/base/tf/debug.h>
+#include <pxr/base/tf/diagnostic.h>
+#include <pxr/base/tf/registryManager.h>
+#include <pxr/base/tf/staticTokens.h>
+#include <pxr/base/tf/stl.h>
+#include <pxr/base/tf/token.h>
 
-PXR_NAMESPACE_OPEN_SCOPE
+#include <mayaUsd/base/debugCodes.h>
+#include <mayaUsd/fileio/functorPrimWriter.h>
+#include <mayaUsd/fileio/registryHelper.h>
 
+PXR_NAMESPACE_OPEN_SCOPE
 
 TF_DEFINE_PRIVATE_TOKENS(_tokens,
     (UsdMaya)
diff --git a/lib/mayaUsd/fileio/primWriterRegistry.h b/lib/mayaUsd/fileio/primWriterRegistry.h
index 0f08c6c4f5..ab1381bd33 100644
--- a/lib/mayaUsd/fileio/primWriterRegistry.h
+++ b/lib/mayaUsd/fileio/primWriterRegistry.h
@@ -16,26 +16,21 @@
 #ifndef PXRUSDMAYA_PRIM_WRITER_REGISTRY_H
 #define PXRUSDMAYA_PRIM_WRITER_REGISTRY_H
 
-/// \file usdMaya/primWriterRegistry.h
-
-#include "pxr/pxr.h"
-#include "../base/api.h"
-
-#include "primWriter.h"
-#include "primWriterArgs.h"
-#include "primWriterContext.h"
-
-#include "pxr/usd/sdf/path.h"
+#include <functional>
+#include <string>
 
 #include <maya/MFnDependencyNode.h>
 
-#include <functional>
-#include <string>
+#include <pxr/pxr.h>
+#include <pxr/usd/sdf/path.h>
 
+#include <mayaUsd/base/api.h>
+#include <mayaUsd/fileio/primWriter.h>
+#include <mayaUsd/fileio/primWriterArgs.h>
+#include <mayaUsd/fileio/primWriterContext.h>
 
 PXR_NAMESPACE_OPEN_SCOPE
 
-
 /// \class UsdMayaPrimWriterRegistry
 /// \brief Provides functionality to register and lookup USD writer plugins
 /// for Maya nodes.
diff --git a/lib/mayaUsd/fileio/registryHelper.cpp b/lib/mayaUsd/fileio/registryHelper.cpp
index c48d375fae..324cedd41b 100644
--- a/lib/mayaUsd/fileio/registryHelper.cpp
+++ b/lib/mayaUsd/fileio/registryHelper.cpp
@@ -15,23 +15,22 @@
 //
 #include "registryHelper.h"
 
-#include "base/debugCodes.h"
-
-#include "pxr/base/js/converter.h"
-#include "pxr/base/plug/plugin.h"
-#include "pxr/base/plug/registry.h"
-#include "pxr/base/tf/scriptModuleLoader.h"
-#include "pxr/base/tf/staticTokens.h"
-#include "pxr/base/tf/stl.h"
-#include "pxr/base/tf/stringUtils.h"
+#include <map>
+#include <vector>
 
 #include <maya/MGlobal.h>
 
-#include <map>
-#include <vector>
+#include <pxr/base/js/converter.h>
+#include <pxr/base/plug/plugin.h>
+#include <pxr/base/plug/registry.h>
+#include <pxr/base/tf/scriptModuleLoader.h>
+#include <pxr/base/tf/staticTokens.h>
+#include <pxr/base/tf/stl.h>
+#include <pxr/base/tf/stringUtils.h>
 
-PXR_NAMESPACE_OPEN_SCOPE
+#include <mayaUsd/base/debugCodes.h>
 
+PXR_NAMESPACE_OPEN_SCOPE
 
 TF_DEFINE_PRIVATE_TOKENS(_tokens, 
     (mayaPlugin)
diff --git a/lib/mayaUsd/fileio/registryHelper.h b/lib/mayaUsd/fileio/registryHelper.h
index 9220b71806..09e8aa7d9b 100644
--- a/lib/mayaUsd/fileio/registryHelper.h
+++ b/lib/mayaUsd/fileio/registryHelper.h
@@ -16,17 +16,13 @@
 #ifndef PXRUSDMAYA_REGISTRYHELPER_H
 #define PXRUSDMAYA_REGISTRYHELPER_H
 
-/// \file usdMaya/registryHelper.h
-
-#include "pxr/pxr.h"
-
-#include "pxr/base/tf/token.h"
-#include "pxr/base/vt/dictionary.h"
-
 #include <functional>
 
-PXR_NAMESPACE_OPEN_SCOPE
+#include <pxr/pxr.h>
+#include <pxr/base/tf/token.h>
+#include <pxr/base/vt/dictionary.h>
 
+PXR_NAMESPACE_OPEN_SCOPE
 
 /// private helper so that both reader/writer registries can share the same
 /// plugin discovery/load mechanism.
diff --git a/lib/mayaUsd/fileio/shaderWriter.cpp b/lib/mayaUsd/fileio/shaderWriter.cpp
index 4345dc84f1..8b19b98d18 100644
--- a/lib/mayaUsd/fileio/shaderWriter.cpp
+++ b/lib/mayaUsd/fileio/shaderWriter.cpp
@@ -13,21 +13,19 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-#include "pxr/pxr.h"
 #include "shaderWriter.h"
 
-#include "writeJobContext.h"
-
-#include "pxr/base/tf/token.h"
-#include "pxr/usd/sdf/path.h"
-#include "pxr/usd/usd/attribute.h"
-#include "pxr/usd/usd/prim.h"
-
 #include <maya/MFnDependencyNode.h>
 
+#include <pxr/base/tf/token.h>
+#include <pxr/pxr.h>
+#include <pxr/usd/sdf/path.h>
+#include <pxr/usd/usd/attribute.h>
+#include <pxr/usd/usd/prim.h>
 
-PXR_NAMESPACE_OPEN_SCOPE
+#include <mayaUsd/fileio/writeJobContext.h>
 
+PXR_NAMESPACE_OPEN_SCOPE
 
 UsdMayaShaderWriter::UsdMayaShaderWriter(
         const MFnDependencyNode& depNodeFn,
diff --git a/lib/mayaUsd/fileio/shaderWriter.h b/lib/mayaUsd/fileio/shaderWriter.h
index 81b2129a5d..4f2ec6c69c 100644
--- a/lib/mayaUsd/fileio/shaderWriter.h
+++ b/lib/mayaUsd/fileio/shaderWriter.h
@@ -16,22 +16,17 @@
 #ifndef PXRUSDMAYA_SHADER_WRITER_H
 #define PXRUSDMAYA_SHADER_WRITER_H
 
-/// \file usdMaya/shaderWriter.h
-
-#include "pxr/pxr.h"
-#include "../base/api.h"
-
-#include "primWriter.h"
-
-#include "writeJobContext.h"
-
-#include "pxr/base/tf/token.h"
-#include "pxr/usd/sdf/path.h"
+#include <memory>
 
 #include <maya/MFnDependencyNode.h>
 
-#include <memory>
+#include <pxr/pxr.h>
+#include <pxr/base/tf/token.h>
+#include <pxr/usd/sdf/path.h>
 
+#include <mayaUsd/base/api.h>
+#include <mayaUsd/fileio/primWriter.h>
+#include <mayaUsd/fileio/writeJobContext.h>
 
 PXR_NAMESPACE_OPEN_SCOPE
 
diff --git a/lib/mayaUsd/fileio/shading/shadingModeDisplayColor.cpp b/lib/mayaUsd/fileio/shading/shadingModeDisplayColor.cpp
index 1731a002ba..69688c5f78 100644
--- a/lib/mayaUsd/fileio/shading/shadingModeDisplayColor.cpp
+++ b/lib/mayaUsd/fileio/shading/shadingModeDisplayColor.cpp
@@ -13,37 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-#include "../../utils/colorSpace.h"
-#include "./shadingModeExporter.h"
-#include "./shadingModeExporterContext.h"
-#include "./shadingModeRegistry.h"
-#include "../translators/translatorMaterial.h"
-
-#include "pxr/pxr.h"
-
-#include "pxr/base/gf/gamma.h"
-#include "pxr/base/gf/vec3f.h"
-#include "pxr/base/tf/registryManager.h"
-#include "pxr/base/tf/staticTokens.h"
-#include "pxr/base/tf/stringUtils.h"
-#include "pxr/base/tf/token.h"
-#include "pxr/base/vt/array.h"
-#include "pxr/base/vt/types.h"
-#include "pxr/base/vt/value.h"
-
-#include "pxr/usd/sdf/path.h"
-#include "pxr/usd/sdf/valueTypeName.h"
-#include "pxr/usd/usd/prim.h"
-#include "pxr/usd/usd/stage.h"
-#include "pxr/usd/usdGeom/gprim.h"
-#include "pxr/usd/usdGeom/primvar.h"
-#include "pxr/usd/usdRi/materialAPI.h"
-#include "pxr/usd/usdShade/connectableAPI.h"
-#include "pxr/usd/usdShade/input.h"
-#include "pxr/usd/usdShade/material.h"
-#include "pxr/usd/usdShade/output.h"
-#include "pxr/usd/usdShade/shader.h"
-#include "pxr/usd/usdShade/tokens.h"
+#include <string>
 
 #include <maya/MColor.h>
 #include <maya/MFnDependencyNode.h>
@@ -54,12 +24,38 @@
 #include <maya/MStatus.h>
 #include <maya/MString.h>
 
-#include <string>
-
+#include <pxr/pxr.h>
+#include <pxr/base/gf/gamma.h>
+#include <pxr/base/gf/vec3f.h>
+#include <pxr/base/tf/registryManager.h>
+#include <pxr/base/tf/staticTokens.h>
+#include <pxr/base/tf/stringUtils.h>
+#include <pxr/base/tf/token.h>
+#include <pxr/base/vt/array.h>
+#include <pxr/base/vt/types.h>
+#include <pxr/base/vt/value.h>
+#include <pxr/usd/sdf/path.h>
+#include <pxr/usd/sdf/valueTypeName.h>
+#include <pxr/usd/usd/prim.h>
+#include <pxr/usd/usd/stage.h>
+#include <pxr/usd/usdGeom/gprim.h>
+#include <pxr/usd/usdGeom/primvar.h>
+#include <pxr/usd/usdRi/materialAPI.h>
+#include <pxr/usd/usdShade/connectableAPI.h>
+#include <pxr/usd/usdShade/input.h>
+#include <pxr/usd/usdShade/material.h>
+#include <pxr/usd/usdShade/output.h>
+#include <pxr/usd/usdShade/shader.h>
+#include <pxr/usd/usdShade/tokens.h>
+
+#include <mayaUsd/fileio/shading/shadingModeExporter.h>
+#include <mayaUsd/fileio/shading/shadingModeExporterContext.h>
+#include <mayaUsd/fileio/shading/shadingModeRegistry.h>
+#include <mayaUsd/fileio/translators/translatorMaterial.h>
+#include <mayaUsd/utils/colorSpace.h>
 
 PXR_NAMESPACE_OPEN_SCOPE
 
-
 TF_DEFINE_PRIVATE_TOKENS(
     _tokens,
     (displayColor)
diff --git a/lib/mayaUsd/fileio/shading/shadingModeExporter.cpp b/lib/mayaUsd/fileio/shading/shadingModeExporter.cpp
index ee79a34abd..fe8edcca76 100644
--- a/lib/mayaUsd/fileio/shading/shadingModeExporter.cpp
+++ b/lib/mayaUsd/fileio/shading/shadingModeExporter.cpp
@@ -15,39 +15,36 @@
 //
 #include "shadingModeExporter.h"
 
-#include "../jobs/jobArgs.h"
-#include "shadingModeExporterContext.h"
-#include "../../utils/util.h"
-#include "../writeJobContext.h"
-
-#include "pxr/base/tf/diagnostic.h"
-#include "pxr/base/tf/staticTokens.h"
-#include "pxr/base/tf/token.h"
-#include "pxr/usd/sdf/path.h"
-#include "pxr/usd/usd/collectionAPI.h"
-#include "pxr/usd/usd/prim.h"
-#include "pxr/usd/usd/stage.h"
-#include "pxr/usd/usdShade/material.h"
-#include "pxr/usd/usdShade/materialBindingAPI.h"
-#include "pxr/usd/usdUtils/authoring.h"
-
-#include <maya/MItDependencyNodes.h>
-#include <maya/MObject.h>
-
 #include <string>
 #include <utility>
 #include <vector>
 
+#include <maya/MItDependencyNodes.h>
+#include <maya/MObject.h>
 
-PXR_NAMESPACE_OPEN_SCOPE
+#include <pxr/base/tf/diagnostic.h>
+#include <pxr/base/tf/staticTokens.h>
+#include <pxr/base/tf/token.h>
+#include <pxr/usd/sdf/path.h>
+#include <pxr/usd/usd/collectionAPI.h>
+#include <pxr/usd/usd/prim.h>
+#include <pxr/usd/usd/stage.h>
+#include <pxr/usd/usdShade/material.h>
+#include <pxr/usd/usdShade/materialBindingAPI.h>
+#include <pxr/usd/usdUtils/authoring.h>
+
+#include <mayaUsd/fileio/jobs/jobArgs.h>
+#include <mayaUsd/fileio/shading/shadingModeExporterContext.h>
+#include <mayaUsd/fileio/writeJobContext.h>
+#include <mayaUsd/utils/util.h>
 
+PXR_NAMESPACE_OPEN_SCOPE
 
 TF_DEFINE_PRIVATE_TOKENS(
     _tokens,
     ((materialNamespace, "material:"))
 );
 
-
 UsdMayaShadingModeExporter::UsdMayaShadingModeExporter()
 {
 }
diff --git a/lib/mayaUsd/fileio/shading/shadingModeExporter.h b/lib/mayaUsd/fileio/shading/shadingModeExporter.h
index a858f67f4a..220ae55b94 100644
--- a/lib/mayaUsd/fileio/shading/shadingModeExporter.h
+++ b/lib/mayaUsd/fileio/shading/shadingModeExporter.h
@@ -16,23 +16,19 @@
 #ifndef PXRUSDMAYA_SHADING_MODE_EXPORTER_H
 #define PXRUSDMAYA_SHADING_MODE_EXPORTER_H
 
-/// \file usdMaya/shadingModeExporter.h
-
-#include "pxr/pxr.h"
-#include "../../base/api.h"
-#include "shadingModeExporterContext.h"
-#include "../../utils/util.h"
-#include "../writeJobContext.h"
-
-#include "pxr/usd/sdf/path.h"
-#include "pxr/usd/usdShade/material.h"
-
 #include <functional>
 #include <memory>
 
+#include <pxr/pxr.h>
+#include <pxr/usd/sdf/path.h>
+#include <pxr/usd/usdShade/material.h>
 
-PXR_NAMESPACE_OPEN_SCOPE
+#include <mayaUsd/base/api.h>
+#include <mayaUsd/fileio/shading/shadingModeExporterContext.h>
+#include <mayaUsd/utils/util.h>
+#include <mayaUsd/fileio/writeJobContext.h>
 
+PXR_NAMESPACE_OPEN_SCOPE
 
 class UsdMayaShadingModeExporter
 {
diff --git a/lib/mayaUsd/fileio/shading/shadingModeExporterContext.cpp b/lib/mayaUsd/fileio/shading/shadingModeExporterContext.cpp
index 06d8f90b6f..3cad0788da 100644
--- a/lib/mayaUsd/fileio/shading/shadingModeExporterContext.cpp
+++ b/lib/mayaUsd/fileio/shading/shadingModeExporterContext.cpp
@@ -15,24 +15,8 @@
 //
 #include "shadingModeExporterContext.h"
 
-#include "../jobs/jobArgs.h"
-#include "../../utils/util.h"
-#include "../writeJobContext.h"
-
-#include "pxr/base/tf/diagnostic.h"
-#include "pxr/base/tf/envSetting.h"
-#include "pxr/base/tf/iterator.h"
-#include "pxr/base/tf/staticTokens.h"
-#include "pxr/base/tf/token.h"
-#include "pxr/base/vt/types.h"
-#include "pxr/usd/sdf/path.h"
-#include "pxr/usd/usd/prim.h"
-#include "pxr/usd/usd/stage.h"
-#include "pxr/usd/usdGeom/scope.h"
-#include "pxr/usd/usdGeom/subset.h"
-#include "pxr/usd/usdShade/material.h"
-#include "pxr/usd/usdShade/materialBindingAPI.h"
-#include "pxr/usd/usdShade/shader.h"
+#include <string>
+#include <utility>
 
 #include <maya/MDagPath.h>
 #include <maya/MDagPathArray.h>
@@ -47,9 +31,24 @@
 #include <maya/MStatus.h>
 #include <maya/MString.h>
 
-#include <string>
-#include <utility>
-
+#include <pxr/base/tf/diagnostic.h>
+#include <pxr/base/tf/envSetting.h>
+#include <pxr/base/tf/iterator.h>
+#include <pxr/base/tf/staticTokens.h>
+#include <pxr/base/tf/token.h>
+#include <pxr/base/vt/types.h>
+#include <pxr/usd/sdf/path.h>
+#include <pxr/usd/usd/prim.h>
+#include <pxr/usd/usd/stage.h>
+#include <pxr/usd/usdGeom/scope.h>
+#include <pxr/usd/usdGeom/subset.h>
+#include <pxr/usd/usdShade/material.h>
+#include <pxr/usd/usdShade/materialBindingAPI.h>
+#include <pxr/usd/usdShade/shader.h>
+
+#include <mayaUsd/fileio/jobs/jobArgs.h>
+#include <mayaUsd/fileio/writeJobContext.h>
+#include <mayaUsd/utils/util.h>
 
 PXR_NAMESPACE_OPEN_SCOPE
 
diff --git a/lib/mayaUsd/fileio/shading/shadingModeExporterContext.h b/lib/mayaUsd/fileio/shading/shadingModeExporterContext.h
index a6b49c1213..9e4c932051 100644
--- a/lib/mayaUsd/fileio/shading/shadingModeExporterContext.h
+++ b/lib/mayaUsd/fileio/shading/shadingModeExporterContext.h
@@ -16,31 +16,28 @@
 #ifndef PXRUSDMAYA_SHADING_MODE_EXPORTER_CONTEXT_H
 #define PXRUSDMAYA_SHADING_MODE_EXPORTER_CONTEXT_H
 
-/// \file usdMaya/shadingModeExporterContext.h
+#include <mayaUsd/base/api.h>
 
-#include "pxr/pxr.h"
-#include "../../base/api.h"
-#include "../jobs/jobArgs.h"
-#include "../../utils/util.h"
-#include "../writeJobContext.h"
-
-#include "pxr/base/tf/token.h"
-#include "pxr/base/vt/types.h"
-#include "pxr/usd/sdf/path.h"
-#include "pxr/usd/usd/prim.h"
-#include "pxr/usd/usd/stage.h"
+#include <string>
+#include <utility>
+#include <vector>
 
 #include <maya/MObject.h>
 #include <maya/MPlug.h>
 
-#include <string>
-#include <utility>
-#include <vector>
+#include <pxr/pxr.h>
+#include <pxr/base/tf/token.h>
+#include <pxr/base/vt/types.h>
+#include <pxr/usd/sdf/path.h>
+#include <pxr/usd/usd/prim.h>
+#include <pxr/usd/usd/stage.h>
 
+#include <mayaUsd/fileio/jobs/jobArgs.h>
+#include <mayaUsd/fileio/writeJobContext.h>
+#include <mayaUsd/utils/util.h>
 
 PXR_NAMESPACE_OPEN_SCOPE
 
-
 class UsdMayaShadingModeExportContext
 {
 public:
diff --git a/lib/mayaUsd/fileio/shading/shadingModeImporter.cpp b/lib/mayaUsd/fileio/shading/shadingModeImporter.cpp
index 8a1fb9fdd4..8e7daa2ae0 100644
--- a/lib/mayaUsd/fileio/shading/shadingModeImporter.cpp
+++ b/lib/mayaUsd/fileio/shading/shadingModeImporter.cpp
@@ -15,23 +15,20 @@
 //
 #include "shadingModeImporter.h"
 
-#include "pxr/base/tf/diagnostic.h"
-#include "pxr/base/tf/staticTokens.h"
-#include "pxr/base/tf/stringUtils.h"
-#include "pxr/base/tf/token.h"
-
-#include "pxr/usd/sdf/path.h"
-#include "pxr/usd/usd/prim.h"
-
 #include <maya/MFnSet.h>
 #include <maya/MObject.h>
 #include <maya/MSelectionList.h>
 #include <maya/MStatus.h>
 
+#include <pxr/base/tf/diagnostic.h>
+#include <pxr/base/tf/staticTokens.h>
+#include <pxr/base/tf/stringUtils.h>
+#include <pxr/base/tf/token.h>
+#include <pxr/usd/sdf/path.h>
+#include <pxr/usd/usd/prim.h>
 
 PXR_NAMESPACE_OPEN_SCOPE
 
-
 TF_DEFINE_PUBLIC_TOKENS(UsdMayaShadingModeImporterTokens,
     PXRUSDMAYA_SHADING_MODE_IMPORTER_TOKENS);
 
diff --git a/lib/mayaUsd/fileio/shading/shadingModeImporter.h b/lib/mayaUsd/fileio/shading/shadingModeImporter.h
index 0f619993e2..879ee545a1 100644
--- a/lib/mayaUsd/fileio/shading/shadingModeImporter.h
+++ b/lib/mayaUsd/fileio/shading/shadingModeImporter.h
@@ -16,29 +16,23 @@
 #ifndef PXRUSDMAYA_SHADING_MODE_IMPORTER_H
 #define PXRUSDMAYA_SHADING_MODE_IMPORTER_H
 
-/// \file usdMaya/shadingModeImporter.h
-
-#include "../../base/api.h"
-#include "../primReaderContext.h"
-
-#include "pxr/pxr.h"
-
-#include "pxr/base/tf/staticTokens.h"
-#include "pxr/base/tf/token.h"
-
-#include "pxr/usd/sdf/path.h"
-#include "pxr/usd/usd/prim.h"
-#include "pxr/usd/usdGeom/gprim.h"
-#include "pxr/usd/usdShade/material.h"
+#include <functional>
 
 #include <maya/MObject.h>
 
-#include <functional>
+#include <pxr/pxr.h>
+#include <pxr/base/tf/staticTokens.h>
+#include <pxr/base/tf/token.h>
+#include <pxr/usd/sdf/path.h>
+#include <pxr/usd/usd/prim.h>
+#include <pxr/usd/usdGeom/gprim.h>
+#include <pxr/usd/usdShade/material.h>
 
+#include <mayaUsd/base/api.h>
+#include <mayaUsd/fileio/primReaderContext.h>
 
 PXR_NAMESPACE_OPEN_SCOPE
 
-
 #define PXRUSDMAYA_SHADING_MODE_IMPORTER_TOKENS \
     ((MayaMaterialNamespace, "USD_Materials"))
 
diff --git a/lib/mayaUsd/fileio/shading/shadingModePxrRis.cpp b/lib/mayaUsd/fileio/shading/shadingModePxrRis.cpp
index 1e379f7fb6..578cebd36f 100644
--- a/lib/mayaUsd/fileio/shading/shadingModePxrRis.cpp
+++ b/lib/mayaUsd/fileio/shading/shadingModePxrRis.cpp
@@ -13,52 +13,50 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-#include "../utils/roundTripUtil.h"
-#include "shadingModeExporter.h"
-#include "shadingModeExporterContext.h"
-#include "shadingModeImporter.h"
-// Defines the RenderMan for Maya mapping between Pxr objects and Maya internal nodes
-#include "shadingModePxrRis_rfm_map.h"
-#include "shadingModeRegistry.h"
-#include "../translators/translatorUtil.h"
-#include "../../utils/util.h"
-#include "../utils/writeUtil.h"
-
-#include "pxr/pxr.h"
-
-#include "pxr/base/tf/diagnostic.h"
-#include "pxr/base/tf/staticTokens.h"
-#include "pxr/base/tf/stringUtils.h"
-#include "pxr/base/tf/token.h"
-#include "pxr/base/vt/value.h"
-
-#include "pxr/usd/sdf/path.h"
-#include "pxr/usd/sdf/valueTypeName.h"
-#include "pxr/usd/usd/attribute.h"
-#include "pxr/usd/usd/prim.h"
-#include "pxr/usd/usdGeom/gprim.h"
-#include "pxr/usd/usdRi/materialAPI.h"
-#include "pxr/usd/usdShade/connectableAPI.h"
-#include "pxr/usd/usdShade/input.h"
-#include "pxr/usd/usdShade/material.h"
-#include "pxr/usd/usdShade/output.h"
-#include "pxr/usd/usdShade/shader.h"
-#include "pxr/usd/usdShade/tokens.h"
+#include <vector>
 
 #include <maya/MFnAttribute.h>
 #include <maya/MFnDependencyNode.h>
 #include <maya/MFnSet.h>
+#include <maya/MGlobal.h>
 #include <maya/MObject.h>
 #include <maya/MPlug.h>
 #include <maya/MStatus.h>
 #include <maya/MString.h>
-#include <maya/MGlobal.h>
 
-#include <vector>
+#include <pxr/pxr.h>
+#include <pxr/base/tf/diagnostic.h>
+#include <pxr/base/tf/staticTokens.h>
+#include <pxr/base/tf/stringUtils.h>
+#include <pxr/base/tf/token.h>
+#include <pxr/base/vt/value.h>
+#include <pxr/usd/sdf/path.h>
+#include <pxr/usd/sdf/valueTypeName.h>
+#include <pxr/usd/usd/attribute.h>
+#include <pxr/usd/usd/prim.h>
+#include <pxr/usd/usdGeom/gprim.h>
+#include <pxr/usd/usdRi/materialAPI.h>
+#include <pxr/usd/usdShade/connectableAPI.h>
+#include <pxr/usd/usdShade/input.h>
+#include <pxr/usd/usdShade/material.h>
+#include <pxr/usd/usdShade/output.h>
+#include <pxr/usd/usdShade/shader.h>
+#include <pxr/usd/usdShade/tokens.h>
+
+#include <mayaUsd/fileio/shading/shadingModeExporter.h>
+#include <mayaUsd/fileio/shading/shadingModeExporterContext.h>
+#include <mayaUsd/fileio/shading/shadingModeImporter.h>
 
+// Defines the RenderMan for Maya mapping between Pxr objects and Maya internal nodes
+#include <mayaUsd/fileio/shading/shadingModePxrRis_rfm_map.h>
 
-PXR_NAMESPACE_OPEN_SCOPE
+#include <mayaUsd/fileio/shading/shadingModeRegistry.h>
+#include <mayaUsd/fileio/translators/translatorUtil.h>
+#include <mayaUsd/fileio/utils/roundTripUtil.h>
+#include <mayaUsd/fileio/utils/writeUtil.h>
+#include <mayaUsd/utils/util.h>
 
+PXR_NAMESPACE_OPEN_SCOPE
 
 TF_DEFINE_PRIVATE_TOKENS(
     _tokens,
@@ -72,7 +70,6 @@ TF_DEFINE_PRIVATE_TOKENS(
     ((RmanVolumeShaderPlugName, "volumeShader"))
 );
 
-
 namespace {
 
 struct _ShadingPlugs {
diff --git a/lib/mayaUsd/fileio/shading/shadingModePxrRis_rfm_map.h b/lib/mayaUsd/fileio/shading/shadingModePxrRis_rfm_map.h
index 817d23b4e3..fe854a6aca 100644
--- a/lib/mayaUsd/fileio/shading/shadingModePxrRis_rfm_map.h
+++ b/lib/mayaUsd/fileio/shading/shadingModePxrRis_rfm_map.h
@@ -19,13 +19,11 @@
 // We use this table both for export and for import when RIS mode is active.
 // XXX This should probably live in a xml or json file that can be easily updated without recompile
 
-#include "pxr/pxr.h"
-
-#include "pxr/base/tf/token.h"
-
 #include <utility>
 #include <vector>
 
+#include <pxr/pxr.h>
+#include <pxr/base/tf/token.h>
 
 PXR_NAMESPACE_OPEN_SCOPE
 
diff --git a/lib/mayaUsd/fileio/shading/shadingModeRegistry.cpp b/lib/mayaUsd/fileio/shading/shadingModeRegistry.cpp
index cdfffbdf4f..15c35731de 100644
--- a/lib/mayaUsd/fileio/shading/shadingModeRegistry.cpp
+++ b/lib/mayaUsd/fileio/shading/shadingModeRegistry.cpp
@@ -15,28 +15,25 @@
 //
 #include "shadingModeRegistry.h"
 
-#include "../registryHelper.h"
-#include "shadingModeExporter.h"
-#include "shadingModeExporterContext.h"
-#include "shadingModeImporter.h"
-
-#include "pxr/base/tf/instantiateSingleton.h"
-#include "pxr/base/tf/registryManager.h"
-#include "pxr/base/tf/staticTokens.h"
-#include "pxr/base/tf/token.h"
-
 #include <map>
 #include <string>
 #include <utility>
 
+#include <pxr/base/tf/instantiateSingleton.h>
+#include <pxr/base/tf/registryManager.h>
+#include <pxr/base/tf/staticTokens.h>
+#include <pxr/base/tf/token.h>
 
-PXR_NAMESPACE_OPEN_SCOPE
+#include <mayaUsd/fileio/registryHelper.h>
+#include <mayaUsd/fileio/shading/shadingModeExporter.h>
+#include <mayaUsd/fileio/shading/shadingModeExporterContext.h>
+#include <mayaUsd/fileio/shading/shadingModeImporter.h>
 
+PXR_NAMESPACE_OPEN_SCOPE
 
 TF_DEFINE_PUBLIC_TOKENS(UsdMayaShadingModeTokens,
     PXRUSDMAYA_SHADINGMODE_TOKENS);
 
-
 typedef std::map<TfToken, UsdMayaShadingModeExporterCreator> _ExportRegistry;
 static _ExportRegistry _exportReg;
 
diff --git a/lib/mayaUsd/fileio/shading/shadingModeRegistry.h b/lib/mayaUsd/fileio/shading/shadingModeRegistry.h
index a4c5164754..a1c9ec6684 100644
--- a/lib/mayaUsd/fileio/shading/shadingModeRegistry.h
+++ b/lib/mayaUsd/fileio/shading/shadingModeRegistry.h
@@ -16,29 +16,24 @@
 #ifndef PXRUSDMAYA_SHADING_MODE_REGISTRY_H
 #define PXRUSDMAYA_SHADING_MODE_REGISTRY_H
 
-/// \file usdMaya/shadingModeRegistry.h
-
-#include "../../base/api.h"
-#include "shadingModeExporter.h"
-#include "shadingModeExporterContext.h"
-#include "shadingModeImporter.h"
-
-#include "pxr/pxr.h"
-
-#include "pxr/base/tf/registryManager.h"
-#include "pxr/base/tf/singleton.h"
-#include "pxr/base/tf/staticTokens.h"
-#include "pxr/base/tf/token.h"
-#include "pxr/base/tf/weakBase.h"
+#include <string>
 
 #include <maya/MObject.h>
 
-#include <string>
+#include <pxr/pxr.h>
+#include <pxr/base/tf/registryManager.h>
+#include <pxr/base/tf/singleton.h>
+#include <pxr/base/tf/staticTokens.h>
+#include <pxr/base/tf/token.h>
+#include <pxr/base/tf/weakBase.h>
 
+#include <mayaUsd/base/api.h>
+#include <mayaUsd/fileio/shading/shadingModeExporter.h>
+#include <mayaUsd/fileio/shading/shadingModeExporterContext.h>
+#include <mayaUsd/fileio/shading/shadingModeImporter.h>
 
 PXR_NAMESPACE_OPEN_SCOPE
 
-
 #define PXRUSDMAYA_SHADINGMODE_TOKENS \
     (none) \
     (displayColor)
diff --git a/lib/mayaUsd/fileio/shading/shadingModeUseRegistry.cpp b/lib/mayaUsd/fileio/shading/shadingModeUseRegistry.cpp
index 1ed04c7bd1..17873dafba 100644
--- a/lib/mayaUsd/fileio/shading/shadingModeUseRegistry.cpp
+++ b/lib/mayaUsd/fileio/shading/shadingModeUseRegistry.cpp
@@ -13,28 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-#include "pxr/pxr.h"
-#include "../primWriter.h"
-#include "../shaderWriter.h"
-#include "shadingModeExporter.h"
-#include "shadingModeExporterContext.h"
-#include "shadingModeRegistry.h"
-#include "../utils/shadingUtil.h"
-#include "../../utils/util.h"
-
-#include "pxr/base/tf/diagnostic.h"
-#include "pxr/base/tf/token.h"
-#include "pxr/usd/sdf/path.h"
-#include "pxr/usd/sdf/types.h"
-#include "pxr/usd/usd/attribute.h"
-#include "pxr/usd/usd/prim.h"
-#include "pxr/usd/usd/timeCode.h"
-#include "pxr/usd/usdShade/connectableAPI.h"
-#include "pxr/usd/usdShade/input.h"
-#include "pxr/usd/usdShade/material.h"
-#include "pxr/usd/usdShade/output.h"
-#include "pxr/usd/usdShade/shader.h"
-#include "pxr/usd/usdShade/tokens.h"
+#include <memory>
+#include <string>
 
 #include <maya/MFn.h>
 #include <maya/MFnDependencyNode.h>
@@ -45,13 +25,31 @@
 #include <maya/MStatus.h>
 #include <maya/MString.h>
 
-#include <memory>
-#include <string>
-
+#include <pxr/pxr.h>
+#include <pxr/base/tf/diagnostic.h>
+#include <pxr/base/tf/token.h>
+#include <pxr/usd/sdf/path.h>
+#include <pxr/usd/sdf/types.h>
+#include <pxr/usd/usd/attribute.h>
+#include <pxr/usd/usd/prim.h>
+#include <pxr/usd/usd/timeCode.h>
+#include <pxr/usd/usdShade/connectableAPI.h>
+#include <pxr/usd/usdShade/input.h>
+#include <pxr/usd/usdShade/material.h>
+#include <pxr/usd/usdShade/output.h>
+#include <pxr/usd/usdShade/shader.h>
+#include <pxr/usd/usdShade/tokens.h>
+
+#include <mayaUsd/fileio/primWriter.h>
+#include <mayaUsd/fileio/shaderWriter.h>
+#include <mayaUsd/fileio/shading/shadingModeExporter.h>
+#include <mayaUsd/fileio/shading/shadingModeExporterContext.h>
+#include <mayaUsd/fileio/shading/shadingModeRegistry.h>
+#include <mayaUsd/fileio/utils/shadingUtil.h>
+#include <mayaUsd/utils/util.h>
 
 PXR_NAMESPACE_OPEN_SCOPE
 
-
 namespace {
 
 using _NodeHandleToShaderWriterMap =
diff --git a/lib/mayaUsd/fileio/transformWriter.cpp b/lib/mayaUsd/fileio/transformWriter.cpp
index 771de453ba..741ae82271 100644
--- a/lib/mayaUsd/fileio/transformWriter.cpp
+++ b/lib/mayaUsd/fileio/transformWriter.cpp
@@ -13,43 +13,40 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-#include "pxr/pxr.h"
 #include "transformWriter.h"
 
-#include "utils/adaptor.h"
-#include "primWriterRegistry.h"
-#include "../utils/util.h"
-#include "writeJobContext.h"
-#include "utils/xformStack.h"
-
-#include "pxr/base/gf/matrix4d.h"
-#include "pxr/base/gf/vec3d.h"
-#include "pxr/base/gf/vec3f.h"
-#include "pxr/base/tf/diagnostic.h"
-#include "pxr/base/tf/token.h"
-#include "pxr/base/vt/value.h"
-#include "pxr/usd/usd/timeCode.h"
-#include "pxr/usd/usdGeom/xform.h"
-#include "pxr/usd/usdGeom/xformOp.h"
-#include "pxr/usd/usdGeom/xformable.h"
-#include "pxr/usd/usdGeom/xformCommonAPI.h"
-#include "pxr/usd/usdUtils/sparseValueWriter.h"
+#include <vector>
 
 #include <maya/MFn.h>
 #include <maya/MFnDependencyNode.h>
 #include <maya/MFnTransform.h>
 #include <maya/MString.h>
 
-#include <vector>
-
+#include <pxr/pxr.h>
+#include <pxr/base/gf/matrix4d.h>
+#include <pxr/base/gf/vec3d.h>
+#include <pxr/base/gf/vec3f.h>
+#include <pxr/base/tf/diagnostic.h>
+#include <pxr/base/tf/token.h>
+#include <pxr/base/vt/value.h>
+#include <pxr/usd/usd/timeCode.h>
+#include <pxr/usd/usdGeom/xform.h>
+#include <pxr/usd/usdGeom/xformable.h>
+#include <pxr/usd/usdGeom/xformCommonAPI.h>
+#include <pxr/usd/usdGeom/xformOp.h>
+#include <pxr/usd/usdUtils/sparseValueWriter.h>
+
+#include <mayaUsd/fileio/primWriterRegistry.h>
+#include <mayaUsd/fileio/utils/adaptor.h>
+#include <mayaUsd/fileio/utils/xformStack.h>
+#include <mayaUsd/fileio/writeJobContext.h>
+#include <mayaUsd/utils/util.h>
 
 PXR_NAMESPACE_OPEN_SCOPE
 
-
 PXRUSDMAYA_REGISTER_WRITER(transform, UsdMayaTransformWriter);
 PXRUSDMAYA_REGISTER_ADAPTOR_SCHEMA(transform, UsdGeomXform);
 
-
 // Given an Op, value and time, set the Op value based on op type and precision
 static
 void
diff --git a/lib/mayaUsd/fileio/transformWriter.h b/lib/mayaUsd/fileio/transformWriter.h
index 2062f3541b..cff77c79b6 100644
--- a/lib/mayaUsd/fileio/transformWriter.h
+++ b/lib/mayaUsd/fileio/transformWriter.h
@@ -16,35 +16,30 @@
 #ifndef PXRUSDMAYA_TRANSFORM_WRITER_H
 #define PXRUSDMAYA_TRANSFORM_WRITER_H
 
-/// \file usdMaya/transformWriter.h
-
-#include "pxr/pxr.h"
-#include "../base/api.h"
-
-#include "primWriter.h"
-#include "writeJobContext.h"
-
-#include "pxr/base/gf/vec3d.h"
-#include "pxr/base/tf/token.h"
-#include "pxr/usd/sdf/path.h"
-#include "pxr/usd/usd/timeCode.h"
-#include "pxr/usd/usdGeom/xformOp.h"
-#include "pxr/usd/usdGeom/xformable.h"
-#include "pxr/usd/usdUtils/sparseValueWriter.h"
+#include <unordered_map>
+#include <vector>
 
-#include <maya/MFnDependencyNode.h>
 #include <maya/MEulerRotation.h>
+#include <maya/MFnDependencyNode.h>
 #include <maya/MFnTransform.h>
 #include <maya/MPlug.h>
 #include <maya/MString.h>
 
-#include <unordered_map>
-#include <vector>
+#include <pxr/pxr.h>
+#include <pxr/base/gf/vec3d.h>
+#include <pxr/base/tf/token.h>
+#include <pxr/usd/sdf/path.h>
+#include <pxr/usd/usd/timeCode.h>
+#include <pxr/usd/usdGeom/xformable.h>
+#include <pxr/usd/usdGeom/xformOp.h>
+#include <pxr/usd/usdUtils/sparseValueWriter.h>
 
+#include <mayaUsd/base/api.h>
+#include <mayaUsd/fileio/primWriter.h>
+#include <mayaUsd/fileio/writeJobContext.h>
 
 PXR_NAMESPACE_OPEN_SCOPE
 
-
 /// Writes transforms and serves as the base class for custom transform writers.
 /// Handles the conversion of Maya transformation data into USD xformOps.
 class UsdMayaTransformWriter : public UsdMayaPrimWriter
diff --git a/lib/mayaUsd/fileio/translators/skelBindingsProcessor.cpp b/lib/mayaUsd/fileio/translators/skelBindingsProcessor.cpp
index d456fee5cb..8f855670fa 100644
--- a/lib/mayaUsd/fileio/translators/skelBindingsProcessor.cpp
+++ b/lib/mayaUsd/fileio/translators/skelBindingsProcessor.cpp
@@ -15,12 +15,12 @@
 //
 #include "skelBindingsProcessor.h"
 
-#include "pxr/usd/usdGeom/xform.h"
-#include "pxr/usd/usdSkel/bindingAPI.h"
-#include "pxr/usd/usdSkel/root.h"
-#include "pxr/usd/usdUtils/authoring.h"
+#include <pxr/usd/usdGeom/xform.h>
+#include <pxr/usd/usdSkel/bindingAPI.h>
+#include <pxr/usd/usdSkel/root.h>
+#include <pxr/usd/usdUtils/authoring.h>
 
-#include "translatorUtil.h"
+#include <mayaUsd/fileio/translators/translatorUtil.h>
 
 PXR_NAMESPACE_OPEN_SCOPE
 
diff --git a/lib/mayaUsd/fileio/translators/skelBindingsProcessor.h b/lib/mayaUsd/fileio/translators/skelBindingsProcessor.h
index 92ef4f22b0..135493514c 100644
--- a/lib/mayaUsd/fileio/translators/skelBindingsProcessor.h
+++ b/lib/mayaUsd/fileio/translators/skelBindingsProcessor.h
@@ -16,22 +16,19 @@
 #ifndef PXRUSDMAYA_SKEL_BINDINGS_PROCESSOR_H
 #define PXRUSDMAYA_SKEL_BINDINGS_PROCESSOR_H
 
-/// \file usdMaya/skelBindingsProcessor.h
-
-#include "../../base/api.h"
-#include "../../utils/util.h"
-
-#include "pxr/pxr.h"
-#include "pxr/usd/sdf/path.h"
-#include "pxr/usd/sdf/pathTable.h"
+#include <set>
+#include <unordered_map>
 
 #include <maya/MDagPath.h>
 
-#include <set>
-#include <unordered_map>
+#include <pxr/pxr.h>
+#include <pxr/usd/sdf/path.h>
+#include <pxr/usd/sdf/pathTable.h>
 
-PXR_NAMESPACE_OPEN_SCOPE
+#include <mayaUsd/base/api.h>
+#include <mayaUsd/utils/util.h>
 
+PXR_NAMESPACE_OPEN_SCOPE
 
 /// This class encapsulates all of the logic for writing or modifying
 /// SkelRoot prims for all scopes that have skel bindings.
diff --git a/lib/mayaUsd/fileio/translators/translatorCamera.cpp b/lib/mayaUsd/fileio/translators/translatorCamera.cpp
index 254bb3ca4a..1d9c5c2b6d 100644
--- a/lib/mayaUsd/fileio/translators/translatorCamera.cpp
+++ b/lib/mayaUsd/fileio/translators/translatorCamera.cpp
@@ -15,21 +15,8 @@
 //
 #include "translatorCamera.h"
 
-#include "../jobs/jobArgs.h"
-#include "../primReaderArgs.h"
-#include "../primReaderContext.h"
-#include "translatorUtil.h"
-#include "../../utils/util.h"
-
-#include "pxr/base/gf/vec2f.h"
-#include "pxr/base/tf/token.h"
-#include "pxr/base/tf/type.h"
-
-#include "pxr/usd/sdf/path.h"
-#include "pxr/usd/usd/prim.h"
-#include "pxr/usd/usd/timeCode.h"
-#include "pxr/usd/usdGeom/camera.h"
-#include "pxr/usd/usdGeom/tokens.h"
+#include <string>
+#include <vector>
 
 #include <maya/MDagModifier.h>
 #include <maya/MDistance.h>
@@ -37,12 +24,23 @@
 #include <maya/MPlug.h>
 #include <maya/MObject.h>
 
-#include <string>
-#include <vector>
+#include <pxr/base/gf/vec2f.h>
+#include <pxr/base/tf/token.h>
+#include <pxr/base/tf/type.h>
+#include <pxr/usd/sdf/path.h>
+#include <pxr/usd/usd/prim.h>
+#include <pxr/usd/usd/timeCode.h>
+#include <pxr/usd/usdGeom/camera.h>
+#include <pxr/usd/usdGeom/tokens.h>
+
+#include <mayaUsd/fileio/jobs/jobArgs.h>
+#include <mayaUsd/fileio/primReaderArgs.h>
+#include <mayaUsd/fileio/primReaderContext.h>
+#include <mayaUsd/fileio/translators/translatorUtil.h>
+#include <mayaUsd/utils/util.h>
 
 PXR_NAMESPACE_OPEN_SCOPE
 
-
 static bool _ReadToCamera(
         const UsdGeomCamera& usdCamera,
         MFnCamera& cameraObject,
diff --git a/lib/mayaUsd/fileio/translators/translatorCamera.h b/lib/mayaUsd/fileio/translators/translatorCamera.h
index af0633e56f..2abe378560 100644
--- a/lib/mayaUsd/fileio/translators/translatorCamera.h
+++ b/lib/mayaUsd/fileio/translators/translatorCamera.h
@@ -16,21 +16,17 @@
 #ifndef PXRUSDMAYA_TRANSLATOR_CAMERA_H
 #define PXRUSDMAYA_TRANSLATOR_CAMERA_H
 
-/// \file usdMaya/translatorCamera.h
-
-#include "../../base/api.h"
-#include "../primReaderArgs.h"
-#include "../primReaderContext.h"
-
-#include "pxr/pxr.h"
-
-#include "pxr/usd/usdGeom/camera.h"
-
 #include <maya/MFnCamera.h>
 #include <maya/MObject.h>
 
-PXR_NAMESPACE_OPEN_SCOPE
+#include <pxr/pxr.h>
+#include <pxr/usd/usdGeom/camera.h>
+
+#include <mayaUsd/base/api.h>
+#include <mayaUsd/fileio/primReaderArgs.h>
+#include <mayaUsd/fileio/primReaderContext.h>
 
+PXR_NAMESPACE_OPEN_SCOPE
 
 /// \brief Provides helper functions for translating to/from UsdGeomCamera
 struct UsdMayaTranslatorCamera
diff --git a/lib/mayaUsd/fileio/translators/translatorCurves.cpp b/lib/mayaUsd/fileio/translators/translatorCurves.cpp
index 75650af97a..1b48fabca6 100644
--- a/lib/mayaUsd/fileio/translators/translatorCurves.cpp
+++ b/lib/mayaUsd/fileio/translators/translatorCurves.cpp
@@ -15,11 +15,6 @@
 //
 #include "translatorCurves.h"
 
-#include "translatorUtil.h"
-
-#include "pxr/usd/usdGeom/basisCurves.h"
-#include "pxr/usd/usdGeom/nurbsCurves.h"
-
 #include <maya/MDoubleArray.h>
 #include <maya/MFnAnimCurve.h>
 #include <maya/MFnBlendShapeDeformer.h>
@@ -31,9 +26,12 @@
 #include <maya/MTime.h>
 #include <maya/MTimeArray.h>
 
-PXR_NAMESPACE_OPEN_SCOPE
+#include <pxr/usd/usdGeom/basisCurves.h>
+#include <pxr/usd/usdGeom/nurbsCurves.h>
 
+#include <mayaUsd/fileio/translators/translatorUtil.h>
 
+PXR_NAMESPACE_OPEN_SCOPE
 
 /* static */
 bool
diff --git a/lib/mayaUsd/fileio/translators/translatorCurves.h b/lib/mayaUsd/fileio/translators/translatorCurves.h
index eb80f48661..ea4dedbda6 100644
--- a/lib/mayaUsd/fileio/translators/translatorCurves.h
+++ b/lib/mayaUsd/fileio/translators/translatorCurves.h
@@ -16,21 +16,17 @@
 #ifndef PXRUSDMAYA_TRANSLATOR_CURVES_H
 #define PXRUSDMAYA_TRANSLATOR_CURVES_H
 
-/// \file usdMaya/translatorCurves.h
-
-#include "../../base/api.h"
-#include "../primReaderArgs.h"
-#include "../primReaderContext.h"
+#include <maya/MObject.h>
 
-#include "pxr/pxr.h"
+#include <pxr/pxr.h>
+#include <pxr/usd/usdGeom/curves.h>
 
-#include "pxr/usd/usdGeom/curves.h"
-
-#include <maya/MObject.h>
+#include <mayaUsd/base/api.h>
+#include <mayaUsd/fileio/primReaderArgs.h>
+#include <mayaUsd/fileio/primReaderContext.h>
 
 PXR_NAMESPACE_OPEN_SCOPE
 
-
 /// \brief Provides helper functions for creating UsdCurves
 struct UsdMayaTranslatorCurves
 {
diff --git a/lib/mayaUsd/fileio/translators/translatorGprim.cpp b/lib/mayaUsd/fileio/translators/translatorGprim.cpp
index e437f0a7f8..b5b3bc0472 100644
--- a/lib/mayaUsd/fileio/translators/translatorGprim.cpp
+++ b/lib/mayaUsd/fileio/translators/translatorGprim.cpp
@@ -15,12 +15,11 @@
 //
 #include "translatorGprim.h"
 
-#include "../../utils/util.h"
-
 #include <maya/MFnDagNode.h>
 
-PXR_NAMESPACE_OPEN_SCOPE
+#include <mayaUsd/utils/util.h>
 
+PXR_NAMESPACE_OPEN_SCOPE
 
 void
 UsdMayaTranslatorGprim::Read(
diff --git a/lib/mayaUsd/fileio/translators/translatorGprim.h b/lib/mayaUsd/fileio/translators/translatorGprim.h
index 8d2765a292..a111e8ecde 100644
--- a/lib/mayaUsd/fileio/translators/translatorGprim.h
+++ b/lib/mayaUsd/fileio/translators/translatorGprim.h
@@ -16,21 +16,17 @@
 #ifndef PXRUSDMAYA_TRANSLATOR_GPRIM_H
 #define PXRUSDMAYA_TRANSLATOR_GPRIM_H
 
-/// \file translatorGprim.h
-
-#include "../../base/api.h"
-#include "../primReaderContext.h"
-#include "../primWriterContext.h"
+#include <maya/MObject.h>
 
-#include "pxr/pxr.h"
+#include <pxr/pxr.h>
+#include <pxr/usd/usdGeom/gprim.h>
 
-#include "pxr/usd/usdGeom/gprim.h"
-
-#include <maya/MObject.h>
+#include <mayaUsd/base/api.h>
+#include <mayaUsd/fileio/primReaderContext.h>
+#include <mayaUsd/fileio/primWriterContext.h>
 
 PXR_NAMESPACE_OPEN_SCOPE
 
-
 /// \brief Provides helper functions for reading UsdGeomGprim.
 struct UsdMayaTranslatorGprim
 {
diff --git a/lib/mayaUsd/fileio/translators/translatorMaterial.cpp b/lib/mayaUsd/fileio/translators/translatorMaterial.cpp
index c7da9e427d..b2c5be9bd8 100644
--- a/lib/mayaUsd/fileio/translators/translatorMaterial.cpp
+++ b/lib/mayaUsd/fileio/translators/translatorMaterial.cpp
@@ -15,26 +15,9 @@
 //
 #include "translatorMaterial.h"
 
-#include "../primReaderContext.h"
-#include "../shading/shadingModeExporter.h"
-#include "../shading/shadingModeImporter.h"
-#include "../shading/shadingModeRegistry.h"
-#include "../../utils/util.h"
-#include "../writeJobContext.h"
-
-#include "pxr/base/tf/diagnostic.h"
-#include "pxr/base/tf/envSetting.h"
-#include "pxr/base/tf/iterator.h"
-#include "pxr/base/tf/token.h"
-#include "pxr/base/vt/types.h"
-#include "pxr/usd/sdf/assetPath.h"
-#include "pxr/usd/sdf/path.h"
-#include "pxr/usd/usd/stage.h"
-#include "pxr/usd/usdGeom/gprim.h"
-#include "pxr/usd/usdGeom/mesh.h"
-#include "pxr/usd/usdGeom/subset.h"
-#include "pxr/usd/usdShade/material.h"
-#include "pxr/usd/usdShade/materialBindingAPI.h"
+#include <set>
+#include <string>
+#include <vector>
 
 #include <maya/MDagPath.h>
 #include <maya/MFnDagNode.h>
@@ -45,14 +28,29 @@
 #include <maya/MSelectionList.h>
 #include <maya/MStatus.h>
 
-#include <set>
-#include <string>
-#include <vector>
-
+#include <pxr/base/tf/diagnostic.h>
+#include <pxr/base/tf/envSetting.h>
+#include <pxr/base/tf/iterator.h>
+#include <pxr/base/tf/token.h>
+#include <pxr/base/vt/types.h>
+#include <pxr/usd/sdf/assetPath.h>
+#include <pxr/usd/sdf/path.h>
+#include <pxr/usd/usd/stage.h>
+#include <pxr/usd/usdGeom/gprim.h>
+#include <pxr/usd/usdGeom/mesh.h>
+#include <pxr/usd/usdGeom/subset.h>
+#include <pxr/usd/usdShade/material.h>
+#include <pxr/usd/usdShade/materialBindingAPI.h>
+
+#include <mayaUsd/fileio/primReaderContext.h>
+#include <mayaUsd/fileio/shading/shadingModeExporter.h>
+#include <mayaUsd/fileio/shading/shadingModeImporter.h>
+#include <mayaUsd/fileio/shading/shadingModeRegistry.h>
+#include <mayaUsd/fileio/writeJobContext.h>
+#include <mayaUsd/utils/util.h>
 
 PXR_NAMESPACE_OPEN_SCOPE
 
-
 /* static */
 MObject
 UsdMayaTranslatorMaterial::Read(
diff --git a/lib/mayaUsd/fileio/translators/translatorMaterial.h b/lib/mayaUsd/fileio/translators/translatorMaterial.h
index 5acd22f618..54311e9b63 100644
--- a/lib/mayaUsd/fileio/translators/translatorMaterial.h
+++ b/lib/mayaUsd/fileio/translators/translatorMaterial.h
@@ -16,24 +16,20 @@
 #ifndef PXRUSDMAYA_TRANSLATOR_MATERIAL_H
 #define PXRUSDMAYA_TRANSLATOR_MATERIAL_H
 
-/// \file usdMaya/translatorMaterial.h
-
-#include "pxr/pxr.h"
-#include "../../base/api.h"
-#include "../primReaderContext.h"
-#include "../../utils/util.h"
-#include "..//writeJobContext.h"
-
-#include "pxr/base/tf/token.h"
-#include "pxr/usd/sdf/path.h"
-#include "pxr/usd/usdGeom/gprim.h"
-#include "pxr/usd/usdShade/material.h"
-
 #include <maya/MObject.h>
 
+#include <pxr/pxr.h>
+#include <pxr/base/tf/token.h>
+#include <pxr/usd/sdf/path.h>
+#include <pxr/usd/usdGeom/gprim.h>
+#include <pxr/usd/usdShade/material.h>
 
-PXR_NAMESPACE_OPEN_SCOPE
+#include <mayaUsd/base/api.h>
+#include <mayaUsd/fileio/primReaderContext.h>
+#include <mayaUsd/fileio/writeJobContext.h>
+#include <mayaUsd/utils/util.h>
 
+PXR_NAMESPACE_OPEN_SCOPE
 
 /// \brief Provides helper functions for reading UsdShadeMaterial
 struct UsdMayaTranslatorMaterial
diff --git a/lib/mayaUsd/fileio/translators/translatorMayaReference.cpp b/lib/mayaUsd/fileio/translators/translatorMayaReference.cpp
index 8585aa6713..d655ac1483 100644
--- a/lib/mayaUsd/fileio/translators/translatorMayaReference.cpp
+++ b/lib/mayaUsd/fileio/translators/translatorMayaReference.cpp
@@ -29,26 +29,24 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-
 #include "translatorMayaReference.h"
 
-#include "../../utils/util.h"
-#include "../../base/debugCodes.h"
-
-#include <maya/MSelectionList.h>
-#include <maya/MGlobal.h>
 #include <maya/MDGModifier.h>
-#include <maya/MNodeClass.h>
-#include <maya/MPlug.h>
+#include <maya/MFileIO.h>
+#include <maya/MFnCamera.h>
+#include <maya/MFnDagNode.h>
 #include <maya/MFnStringData.h>
 #include <maya/MFnTransform.h>
-#include <maya/MFnTypedAttribute.h>
 #include <maya/MFnTransform.h>
-#include <maya/MFnCamera.h>
-#include <maya/MFileIO.h>
+#include <maya/MFnTypedAttribute.h>
+#include <maya/MGlobal.h>
 #include <maya/MItDependencyNodes.h>
+#include <maya/MNodeClass.h>
+#include <maya/MPlug.h>
+#include <maya/MSelectionList.h>
 
-#include <maya/MFnDagNode.h>
+#include <mayaUsd/base/debugCodes.h>
+#include <mayaUsd/utils/util.h>
 
 PXR_NAMESPACE_OPEN_SCOPE
 
diff --git a/lib/mayaUsd/fileio/translators/translatorMayaReference.h b/lib/mayaUsd/fileio/translators/translatorMayaReference.h
index 03565ea901..5de0e7d0ec 100644
--- a/lib/mayaUsd/fileio/translators/translatorMayaReference.h
+++ b/lib/mayaUsd/fileio/translators/translatorMayaReference.h
@@ -29,25 +29,20 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-
 #ifndef PXRUSDMAYA_TRANSLATOR_GPRIM_H
 #define PXRUSDMAYA_TRANSLATOR_GPRIM_H
 
-/// \file translatorReference.h
-
-#include "../../base/api.h"
-#include "../primReaderContext.h"
-#include "../primWriterContext.h"
-
-#include "pxr/pxr.h"
-
-#include "pxr/usd/usd/prim.h"
-
 #include <maya/MObject.h>
 #include <maya/MFnReference.h>
 
-PXR_NAMESPACE_OPEN_SCOPE
+#include <pxr/pxr.h>
+#include <pxr/usd/usd/prim.h>
 
+#include <mayaUsd/base/api.h>
+#include <mayaUsd/fileio/primReaderContext.h>
+#include <mayaUsd/fileio/primWriterContext.h>
+
+PXR_NAMESPACE_OPEN_SCOPE
 
 /// \brief Provides helper functions for reading UsdGeomGprim.
 struct UsdMayaTranslatorMayaReference
diff --git a/lib/mayaUsd/fileio/translators/translatorMesh.cpp b/lib/mayaUsd/fileio/translators/translatorMesh.cpp
index 597d05e437..39ba44ee45 100644
--- a/lib/mayaUsd/fileio/translators/translatorMesh.cpp
+++ b/lib/mayaUsd/fileio/translators/translatorMesh.cpp
@@ -13,16 +13,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-// Modifications copyright (C) 2020 Autodesk
-//
-
 #include "translatorMesh.h"
 
-#include "../../nodes/pointBasedDeformerNode.h"
-#include "../../nodes/stageNode.h"
-#include "../../utils/util.h"
-#include "../utils/meshUtil.h"
-#include "../utils/readUtil.h"
+#include <string>
+#include <vector>
 
 #include <maya/MColor.h>
 #include <maya/MColorArray.h>
@@ -44,8 +38,11 @@
 #include <maya/MPointArray.h>
 #include <maya/MString.h>
 
-#include <string>
-#include <vector>
+#include <mayaUsd/fileio/utils/meshUtil.h>
+#include <mayaUsd/fileio/utils/readUtil.h>
+#include <mayaUsd/nodes/pointBasedDeformerNode.h>
+#include <mayaUsd/nodes/stageNode.h>
+#include <mayaUsd/utils/util.h>
 
 MAYAUSD_NS_DEF {
 
@@ -181,7 +178,7 @@ TranslatorMeshRead::TranslatorMeshRead(const UsdGeomMesh& mesh,
           return;
     }
 
-	// store the path
+    // store the path
     m_shapePath = prim.GetPath().AppendChild(TfToken(shapeName));
 
     // Set normals if supplied
@@ -491,3 +488,4 @@ TranslatorMeshRead::shapePath() const
 
 } // namespace MayaUsd
 
+
diff --git a/lib/mayaUsd/fileio/translators/translatorMesh.h b/lib/mayaUsd/fileio/translators/translatorMesh.h
index f9fa2c320e..54a5b861ae 100644
--- a/lib/mayaUsd/fileio/translators/translatorMesh.h
+++ b/lib/mayaUsd/fileio/translators/translatorMesh.h
@@ -18,24 +18,20 @@
 
 #pragma once
 
-#include "../../base/api.h"
-
-#include "pxr/pxr.h"
-#include "pxr/usd/usdGeom/mesh.h"
+#include <mayaUsd/base/api.h>
 
 #include <maya/MObject.h>
 #include <maya/MString.h>
 
+#include <pxr/pxr.h>
+#include <pxr/usd/usdGeom/mesh.h>
+
 PXR_NAMESPACE_USING_DIRECTIVE
 
 MAYAUSD_NS_DEF {
 
-//
-// \class MayaUsd::TranslatorMeshRead
-//
-// This class is used to translate a UsdGeomMesh prim 
-// using schema mesh utilities into a Maya mesh.
-//
+/// Provides helper functions for translating UsdGeomMesh prims into Maya
+/// meshes.
 class MAYAUSD_CORE_PUBLIC TranslatorMeshRead
 {
 public:
diff --git a/lib/mayaUsd/fileio/translators/translatorNurbsPatch.cpp b/lib/mayaUsd/fileio/translators/translatorNurbsPatch.cpp
index 28f1d6c3d6..6bb538a95e 100644
--- a/lib/mayaUsd/fileio/translators/translatorNurbsPatch.cpp
+++ b/lib/mayaUsd/fileio/translators/translatorNurbsPatch.cpp
@@ -15,14 +15,6 @@
 //
 #include "translatorNurbsPatch.h"
 
-#include "../primReaderArgs.h"
-#include "../primReaderContext.h"
-#include "translatorGprim.h"
-#include "translatorMaterial.h"
-#include "translatorUtil.h"
-
-#include "pxr/usd/usdGeom/nurbsPatch.h"
-
 #include <maya/MDoubleArray.h>
 #include <maya/MFnAnimCurve.h>
 #include <maya/MFnBlendShapeDeformer.h>
@@ -38,9 +30,15 @@
 #include <maya/MTimeArray.h>
 #include <maya/MTrimBoundaryArray.h>
 
-PXR_NAMESPACE_OPEN_SCOPE
+#include <pxr/usd/usdGeom/nurbsPatch.h>
 
+#include <mayaUsd/fileio/primReaderArgs.h>
+#include <mayaUsd/fileio/primReaderContext.h>
+#include <mayaUsd/fileio/translators/translatorGprim.h>
+#include <mayaUsd/fileio/translators/translatorMaterial.h>
+#include <mayaUsd/fileio/translators/translatorUtil.h>
 
+PXR_NAMESPACE_OPEN_SCOPE
 
 /* static */
 bool 
diff --git a/lib/mayaUsd/fileio/translators/translatorNurbsPatch.h b/lib/mayaUsd/fileio/translators/translatorNurbsPatch.h
index eda3cf1662..d1dd5ac5ec 100644
--- a/lib/mayaUsd/fileio/translators/translatorNurbsPatch.h
+++ b/lib/mayaUsd/fileio/translators/translatorNurbsPatch.h
@@ -16,21 +16,16 @@
 #ifndef PXRUSDMAYA_TRANSLATOR_NURBSPATCH_H
 #define PXRUSDMAYA_TRANSLATOR_NURBSPATCH_H
 
-/// \file usdMaya/translatorNurbsPatch.h
-
-#include "../../base/api.h"
-#include "../primReaderArgs.h"
-#include "../primReaderContext.h"
-
-#include "pxr/pxr.h"
-
-#include "pxr/usd/usdGeom/nurbsPatch.h"
-
 #include <maya/MObject.h>
 
-PXR_NAMESPACE_OPEN_SCOPE
+#include <pxr/pxr.h>
+#include <pxr/usd/usdGeom/nurbsPatch.h>
 
+#include <mayaUsd/base/api.h>
+#include <mayaUsd/fileio/primReaderArgs.h>
+#include <mayaUsd/fileio/primReaderContext.h>
 
+PXR_NAMESPACE_OPEN_SCOPE
 
 struct UsdMayaTranslatorNurbsPatch
 {
diff --git a/lib/mayaUsd/fileio/translators/translatorPrim.cpp b/lib/mayaUsd/fileio/translators/translatorPrim.cpp
index c4d3ca6ae3..8a4f4b8739 100644
--- a/lib/mayaUsd/fileio/translators/translatorPrim.cpp
+++ b/lib/mayaUsd/fileio/translators/translatorPrim.cpp
@@ -15,17 +15,16 @@
 //
 #include "translatorPrim.h"
 
-#include "../utils/readUtil.h"
-#include "translatorUtil.h"
-#include "../../utils/util.h"
-
-#include "pxr/usd/usdGeom/imageable.h"
-
 #include <maya/MFnAnimCurve.h>
 #include <maya/MFnDagNode.h>
 
-PXR_NAMESPACE_OPEN_SCOPE
+#include <pxr/usd/usdGeom/imageable.h>
 
+#include <mayaUsd/fileio/translators/translatorUtil.h>
+#include <mayaUsd/fileio/utils/readUtil.h>
+#include <mayaUsd/utils/util.h>
+
+PXR_NAMESPACE_OPEN_SCOPE
 
 void
 UsdMayaTranslatorPrim::Read(
diff --git a/lib/mayaUsd/fileio/translators/translatorPrim.h b/lib/mayaUsd/fileio/translators/translatorPrim.h
index e118c62d72..cbe24f6e15 100644
--- a/lib/mayaUsd/fileio/translators/translatorPrim.h
+++ b/lib/mayaUsd/fileio/translators/translatorPrim.h
@@ -16,21 +16,17 @@
 #ifndef PXRUSDMAYA_TRANSLATOR_PRIM_H
 #define PXRUSDMAYA_TRANSLATOR_PRIM_H
 
-/// \file usdMaya/translatorPrim.h
-
-#include "../../base/api.h"
-#include "../primReaderArgs.h"
-#include "../primReaderContext.h"
+#include <maya/MObject.h>
 
-#include "pxr/pxr.h"
+#include <pxr/pxr.h>
+#include <pxr/usd/usd/prim.h>
 
-#include "pxr/usd/usd/prim.h"
-
-#include <maya/MObject.h>
+#include <mayaUsd/base/api.h>
+#include <mayaUsd/fileio/primReaderArgs.h>
+#include <mayaUsd/fileio/primReaderContext.h>
 
 PXR_NAMESPACE_OPEN_SCOPE
 
-
 /// \brief Provides helper functions for reading UsdPrim.  This should more
 /// accurately take a UsdGeomImageable.
 struct UsdMayaTranslatorPrim
diff --git a/lib/mayaUsd/fileio/translators/translatorRfMLight.cpp b/lib/mayaUsd/fileio/translators/translatorRfMLight.cpp
index d74371f4f6..f0691e030d 100644
--- a/lib/mayaUsd/fileio/translators/translatorRfMLight.cpp
+++ b/lib/mayaUsd/fileio/translators/translatorRfMLight.cpp
@@ -15,37 +15,7 @@
 //
 #include "translatorRfMLight.h"
 
-#include "../primReaderArgs.h"
-#include "../primReaderContext.h"
-#include "../primReaderRegistry.h"
-#include "../primWriterArgs.h"
-#include "../primWriterContext.h"
-#include "../primWriterRegistry.h"
-#include "translatorUtil.h"
-#include "translatorXformable.h"
-#include "../../utils/util.h"
-
-#include "pxr/base/gf/vec3f.h"
-#include "pxr/base/tf/staticTokens.h"
-#include "pxr/base/tf/stringUtils.h"
-#include "pxr/base/tf/token.h"
-#include "pxr/base/vt/value.h"
-#include "pxr/usd/sdf/assetPath.h"
-#include "pxr/usd/sdf/path.h"
-#include "pxr/usd/usd/prim.h"
-#include "pxr/usd/usd/stage.h"
-#include "pxr/usd/usdLux/light.h"
-#include "pxr/usd/usdLux/cylinderLight.h"
-#include "pxr/usd/usdLux/diskLight.h"
-#include "pxr/usd/usdLux/distantLight.h"
-#include "pxr/usd/usdLux/domeLight.h"
-#include "pxr/usd/usdLux/geometryLight.h"
-#include "pxr/usd/usdLux/rectLight.h"
-#include "pxr/usd/usdLux/shadowAPI.h"
-#include "pxr/usd/usdLux/shapingAPI.h"
-#include "pxr/usd/usdLux/sphereLight.h"
-#include "pxr/usd/usdRi/pxrAovLight.h"
-#include "pxr/usd/usdRi/pxrEnvDayLight.h"
+#include <string>
 
 #include <maya/MColor.h>
 #include <maya/MFnDependencyNode.h>
@@ -54,12 +24,40 @@
 #include <maya/MStatus.h>
 #include <maya/MString.h>
 
-#include <string>
-
+#include <pxr/base/gf/vec3f.h>
+#include <pxr/base/tf/staticTokens.h>
+#include <pxr/base/tf/stringUtils.h>
+#include <pxr/base/tf/token.h>
+#include <pxr/base/vt/value.h>
+#include <pxr/usd/sdf/assetPath.h>
+#include <pxr/usd/sdf/path.h>
+#include <pxr/usd/usd/prim.h>
+#include <pxr/usd/usd/stage.h>
+#include <pxr/usd/usdLux/cylinderLight.h>
+#include <pxr/usd/usdLux/diskLight.h>
+#include <pxr/usd/usdLux/distantLight.h>
+#include <pxr/usd/usdLux/domeLight.h>
+#include <pxr/usd/usdLux/geometryLight.h>
+#include <pxr/usd/usdLux/light.h>
+#include <pxr/usd/usdLux/rectLight.h>
+#include <pxr/usd/usdLux/shadowAPI.h>
+#include <pxr/usd/usdLux/shapingAPI.h>
+#include <pxr/usd/usdLux/sphereLight.h>
+#include <pxr/usd/usdRi/pxrAovLight.h>
+#include <pxr/usd/usdRi/pxrEnvDayLight.h>
+
+#include <mayaUsd/fileio/primReaderArgs.h>
+#include <mayaUsd/fileio/primReaderContext.h>
+#include <mayaUsd/fileio/primReaderRegistry.h>
+#include <mayaUsd/fileio/primWriterArgs.h>
+#include <mayaUsd/fileio/primWriterContext.h>
+#include <mayaUsd/fileio/primWriterRegistry.h>
+#include <mayaUsd/fileio/translators/translatorUtil.h>
+#include <mayaUsd/fileio/translators/translatorXformable.h>
+#include <mayaUsd/utils/util.h>
 
 PXR_NAMESPACE_OPEN_SCOPE
 
-
 TF_DEFINE_PRIVATE_TOKENS(
     _tokens,
 
diff --git a/lib/mayaUsd/fileio/translators/translatorRfMLight.h b/lib/mayaUsd/fileio/translators/translatorRfMLight.h
index 6583f36f6d..fc0e8f0601 100644
--- a/lib/mayaUsd/fileio/translators/translatorRfMLight.h
+++ b/lib/mayaUsd/fileio/translators/translatorRfMLight.h
@@ -16,20 +16,16 @@
 #ifndef PXRUSDMAYA_TRANSLATOR_RFM_LIGHT_H
 #define PXRUSDMAYA_TRANSLATOR_RFM_LIGHT_H
 
-/// \file usdMaya/translatorRfMLight.h
-
-#include "pxr/pxr.h"
-
-#include "../../base/api.h"
-#include "../primReaderArgs.h"
-#include "../primReaderContext.h"
-#include "../primWriterArgs.h"
-#include "../primWriterContext.h"
+#include <pxr/pxr.h>
 
+#include <mayaUsd/base/api.h>
+#include <mayaUsd/fileio/primReaderArgs.h>
+#include <mayaUsd/fileio/primReaderContext.h>
+#include <mayaUsd/fileio/primWriterArgs.h>
+#include <mayaUsd/fileio/primWriterContext.h>
 
 PXR_NAMESPACE_OPEN_SCOPE
 
-
 struct UsdMayaTranslatorRfMLight
 {
     /// Exports a UsdLux schema prim when provided args and a context that
diff --git a/lib/mayaUsd/fileio/translators/translatorSkel.cpp b/lib/mayaUsd/fileio/translators/translatorSkel.cpp
index 5e1beb4447..fb7d27123f 100644
--- a/lib/mayaUsd/fileio/translators/translatorSkel.cpp
+++ b/lib/mayaUsd/fileio/translators/translatorSkel.cpp
@@ -15,17 +15,12 @@
 //
 #include "translatorSkel.h"
 
-#include "translatorUtil.h"
-#include "translatorXformable.h"
-#include "../../utils/util.h"
-
-#include "pxr/base/tf/staticData.h"
-#include "pxr/base/tf/staticTokens.h"
-
-#include "pxr/usd/usdSkel/skeleton.h"
-#include "pxr/usd/usdSkel/skeletonQuery.h"
-#include "pxr/usd/usdSkel/skinningQuery.h"
-#include "pxr/usd/usdSkel/topology.h"
+#include <pxr/base/tf/staticData.h>
+#include <pxr/base/tf/staticTokens.h>
+#include <pxr/usd/usdSkel/skeleton.h>
+#include <pxr/usd/usdSkel/skeletonQuery.h>
+#include <pxr/usd/usdSkel/skinningQuery.h>
+#include <pxr/usd/usdSkel/topology.h>
 
 #include <maya/MDoubleArray.h>
 #include <maya/MDagModifier.h>
@@ -44,10 +39,12 @@
 #include <maya/MPlug.h>
 #include <maya/MPlugArray.h>
 
+#include <mayaUsd/fileio/translators/translatorUtil.h>
+#include <mayaUsd/fileio/translators/translatorXformable.h>
+#include <mayaUsd/utils/util.h>
 
 PXR_NAMESPACE_OPEN_SCOPE
 
-
 // There are a lot of nodes and connections that go into a basic skinning rig.
 // The following is an overview of everything that must be rigged up:
 //
diff --git a/lib/mayaUsd/fileio/translators/translatorSkel.h b/lib/mayaUsd/fileio/translators/translatorSkel.h
index 45fe034d9a..8b29b6348b 100644
--- a/lib/mayaUsd/fileio/translators/translatorSkel.h
+++ b/lib/mayaUsd/fileio/translators/translatorSkel.h
@@ -13,28 +13,23 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-
-/// \file usdMaya/translatorSkel.h
-
 #ifndef PXRUSDMAYA_TRANSLATOR_SKEL_H
 #define PXRUSDMAYA_TRANSLATOR_SKEL_H
 
-#include "pxr/pxr.h"
-#include "../../base/api.h"
-#include "../primReaderArgs.h"
-#include "../primReaderContext.h"
+#include <mayaUsd/base/api.h>
 
-#include "pxr/base/vt/array.h"
+#include <mayaUsd/fileio/primReaderArgs.h>
+#include <mayaUsd/fileio/primReaderContext.h>
 
+#include <pxr/pxr.h>
+#include <pxr/base/vt/array.h>
 
 PXR_NAMESPACE_OPEN_SCOPE
 
-
 class UsdSkelSkeleton;
 class UsdSkelSkeletonQuery;
 class UsdSkelSkinningQuery;
 
-
 struct UsdMayaTranslatorSkel
 {
     /// Returns true if \p joint is being used to identify the root of
diff --git a/lib/mayaUsd/fileio/translators/translatorUtil.cpp b/lib/mayaUsd/fileio/translators/translatorUtil.cpp
index 4aa3d9780b..79cf566130 100644
--- a/lib/mayaUsd/fileio/translators/translatorUtil.cpp
+++ b/lib/mayaUsd/fileio/translators/translatorUtil.cpp
@@ -13,20 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-#include "pxr/pxr.h"
 #include "translatorUtil.h"
 
-#include "../utils/adaptor.h"
-#include "../primReaderArgs.h"
-#include "../primReaderContext.h"
-#include "translatorXformable.h"
-#include "../../utils/util.h"
-#include "../utils/xformStack.h"
-
-#include "pxr/usd/sdf/schema.h"
-#include "pxr/usd/usd/prim.h"
-#include "pxr/usd/usdGeom/xformable.h"
-
 #include <maya/MDagModifier.h>
 #include <maya/MDagPath.h>
 #include <maya/MFn.h>
@@ -37,13 +25,22 @@
 #include <maya/MStatus.h>
 #include <maya/MString.h>
 
+#include <pxr/pxr.h>
+#include <pxr/usd/sdf/schema.h>
+#include <pxr/usd/usd/prim.h>
+#include <pxr/usd/usdGeom/xformable.h>
 
-PXR_NAMESPACE_OPEN_SCOPE
+#include <mayaUsd/fileio/primReaderArgs.h>
+#include <mayaUsd/fileio/primReaderContext.h>
+#include <mayaUsd/fileio/translators/translatorXformable.h>
+#include <mayaUsd/fileio/utils/adaptor.h>
+#include <mayaUsd/fileio/utils/xformStack.h>
+#include <mayaUsd/utils/util.h>
 
+PXR_NAMESPACE_OPEN_SCOPE
 
 const MString _DEFAULT_TRANSFORM_TYPE("transform");
 
-
 /* static */
 bool
 UsdMayaTranslatorUtil::CreateTransformNode(
diff --git a/lib/mayaUsd/fileio/translators/translatorUtil.h b/lib/mayaUsd/fileio/translators/translatorUtil.h
index 33474315ca..88bfc2a902 100644
--- a/lib/mayaUsd/fileio/translators/translatorUtil.h
+++ b/lib/mayaUsd/fileio/translators/translatorUtil.h
@@ -16,16 +16,17 @@
 #ifndef PXRUSDMAYA_TRANSLATOR_UTIL_H
 #define PXRUSDMAYA_TRANSLATOR_UTIL_H
 
-#include "pxr/pxr.h"
-#include "../../base/api.h"
-#include "../primReaderArgs.h"
-#include "../primReaderContext.h"
+#include <mayaUsd/base/api.h>
 
-#include "pxr/usd/usd/prim.h"
+#include <mayaUsd/fileio/primReaderContext.h>
+#include <mayaUsd/fileio/primReaderArgs.h>
 
 #include <maya/MObject.h>
 #include <maya/MString.h>
 
+#include <pxr/pxr.h>
+#include <pxr/usd/usd/prim.h>
+
 PXR_NAMESPACE_OPEN_SCOPE
 
 enum class UsdMayaShadingNodeType {
diff --git a/lib/mayaUsd/fileio/translators/translatorXformable.cpp b/lib/mayaUsd/fileio/translators/translatorXformable.cpp
index d07e287705..cd3e736112 100644
--- a/lib/mayaUsd/fileio/translators/translatorXformable.cpp
+++ b/lib/mayaUsd/fileio/translators/translatorXformable.cpp
@@ -13,22 +13,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-#include "pxr/pxr.h"
 #include "translatorXformable.h"
 
-#include "translatorPrim.h"
-#include "translatorUtil.h"
-#include "../utils/xformStack.h"
-
-#include "pxr/base/gf/math.h"
-#include "pxr/base/gf/matrix4d.h"
-#include "pxr/base/gf/vec3d.h"
-#include "pxr/base/tf/token.h"
-#include "pxr/usd/usd/stage.h"
-#include "pxr/usd/usd/timeCode.h"
-#include "pxr/usd/usdGeom/xform.h"
-#include "pxr/usd/usdGeom/xformCommonAPI.h"
-#include "pxr/usd/usdGeom/xformable.h"
+#include <algorithm>
+#include <unordered_map>
+#include <vector>
 
 #include <maya/MDagModifier.h>
 #include <maya/MEulerRotation.h>
@@ -43,14 +32,23 @@
 #include <maya/MTransformationMatrix.h>
 #include <maya/MVector.h>
 
-#include <algorithm>
-#include <unordered_map>
-#include <vector>
-
+#include <pxr/pxr.h>
+#include <pxr/base/gf/math.h>
+#include <pxr/base/gf/matrix4d.h>
+#include <pxr/base/gf/vec3d.h>
+#include <pxr/base/tf/token.h>
+#include <pxr/usd/usd/stage.h>
+#include <pxr/usd/usd/timeCode.h>
+#include <pxr/usd/usdGeom/xform.h>
+#include <pxr/usd/usdGeom/xformable.h>
+#include <pxr/usd/usdGeom/xformCommonAPI.h>
+
+#include <mayaUsd/fileio/translators/translatorPrim.h>
+#include <mayaUsd/fileio/translators/translatorUtil.h>
+#include <mayaUsd/fileio/utils/xformStack.h>
 
 PXR_NAMESPACE_OPEN_SCOPE
 
-
 // This function retrieves a value for a given xformOp and given time sample. It
 // knows how to deal with different type of ops and angle conversion
 static bool _getXformOpAsVec3d(
diff --git a/lib/mayaUsd/fileio/translators/translatorXformable.h b/lib/mayaUsd/fileio/translators/translatorXformable.h
index 52582dfe33..37d41c4ee6 100644
--- a/lib/mayaUsd/fileio/translators/translatorXformable.h
+++ b/lib/mayaUsd/fileio/translators/translatorXformable.h
@@ -16,19 +16,19 @@
 #ifndef PXRUSDMAYA_TRANSLATOR_XFORMABLE_H
 #define PXRUSDMAYA_TRANSLATOR_XFORMABLE_H
 
-#include "pxr/pxr.h"
-#include "../../base/api.h"
-#include "pxr/base/gf/matrix4d.h"
-#include "pxr/base/gf/vec3d.h"
-#include "pxr/usd/usdGeom/xformable.h"
-
-#include "../primReaderContext.h"
-#include "../primReaderArgs.h"
+#include <mayaUsd/base/api.h>
 
 #include <maya/MObject.h>
 
-PXR_NAMESPACE_OPEN_SCOPE
+#include <pxr/pxr.h>
+#include <pxr/base/gf/matrix4d.h>
+#include <pxr/base/gf/vec3d.h>
+#include <pxr/usd/usdGeom/xformable.h>
 
+#include <mayaUsd/fileio/primReaderArgs.h>
+#include <mayaUsd/fileio/primReaderContext.h>
+
+PXR_NAMESPACE_OPEN_SCOPE
 
 /// \brief Provides helper functions for reading UsdGeomXformable.  
 struct UsdMayaTranslatorXformable
diff --git a/lib/mayaUsd/fileio/translators/translatorXformable_decompose.cpp b/lib/mayaUsd/fileio/translators/translatorXformable_decompose.cpp
index 98145a66f9..eb35999e5f 100644
--- a/lib/mayaUsd/fileio/translators/translatorXformable_decompose.cpp
+++ b/lib/mayaUsd/fileio/translators/translatorXformable_decompose.cpp
@@ -13,18 +13,17 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-#include "pxr/pxr.h"
-#include "translatorXformable.h"
+#include <maya/MVector.h>
 
-#include "pxr/base/gf/math.h"
-#include "pxr/base/gf/matrix3d.h"
-#include "pxr/base/gf/transform.h"
+#include <pxr/pxr.h>
+#include <pxr/base/gf/math.h>
+#include <pxr/base/gf/matrix3d.h>
+#include <pxr/base/gf/transform.h>
 
-#include <maya/MVector.h>
+#include <mayaUsd/fileio/translators/translatorXformable.h>
 
 PXR_NAMESPACE_OPEN_SCOPE
 
-
 // XXX:
 // This implementation is ported from MfTransformablePrim::
 // MatrixToVectorsWithPivotInvariant; needs to be generalized for arbitrary
diff --git a/lib/mayaUsd/fileio/utils/adaptor.cpp b/lib/mayaUsd/fileio/utils/adaptor.cpp
index 1794306682..28df5ee35f 100644
--- a/lib/mayaUsd/fileio/utils/adaptor.cpp
+++ b/lib/mayaUsd/fileio/utils/adaptor.cpp
@@ -15,21 +15,21 @@
 //
 #include "adaptor.h"
 
-#include "../primWriterRegistry.h"
-#include "readUtil.h"
-#include "../registryHelper.h"
-#include "../../utils/util.h"
-#include "writeUtil.h"
-
-#include "pxr/usd/sdf/schema.h"
-#include "pxr/usd/usd/apiSchemaBase.h"
-#include "pxr/usd/usd/schemaBase.h"
-#include "pxr/usd/usd/tokens.h"
-
 #include <maya/MFnAttribute.h>
 #include <maya/MFnDependencyNode.h>
 #include <maya/MPlug.h>
 
+#include <pxr/usd/sdf/schema.h>
+#include <pxr/usd/usd/apiSchemaBase.h>
+#include <pxr/usd/usd/schemaBase.h>
+#include <pxr/usd/usd/tokens.h>
+
+#include <mayaUsd/fileio/primWriterRegistry.h>
+#include <mayaUsd/fileio/registryHelper.h>
+#include <mayaUsd/fileio/utils/readUtil.h>
+#include <mayaUsd/fileio/utils/writeUtil.h>
+#include <mayaUsd/utils/util.h>
+
 PXR_NAMESPACE_OPEN_SCOPE
 
 static std::string
diff --git a/lib/mayaUsd/fileio/utils/adaptor.h b/lib/mayaUsd/fileio/utils/adaptor.h
index e3b9decd6e..3935ef556c 100644
--- a/lib/mayaUsd/fileio/utils/adaptor.h
+++ b/lib/mayaUsd/fileio/utils/adaptor.h
@@ -16,24 +16,20 @@
 #ifndef PXRUSDMAYA_ADAPTOR_H
 #define PXRUSDMAYA_ADAPTOR_H
 
-/// \file usdMaya/adaptor.h
-
-#include "../../base/api.h"
-
-#include "pxr/pxr.h"
-
-#include "pxr/base/tf/registryManager.h"
-#include "pxr/base/vt/value.h"
-
-#include "pxr/usd/sdf/attributeSpec.h"
-#include "pxr/usd/sdf/primSpec.h"
-#include "pxr/usd/usd/common.h"
-#include "pxr/usd/usd/schemaRegistry.h"
-
 #include <maya/MDGModifier.h>
 #include <maya/MObjectHandle.h>
 #include <maya/MPlug.h>
 
+#include <pxr/pxr.h>
+#include <pxr/base/tf/registryManager.h>
+#include <pxr/base/vt/value.h>
+#include <pxr/usd/sdf/attributeSpec.h>
+#include <pxr/usd/sdf/primSpec.h>
+#include <pxr/usd/usd/common.h>
+#include <pxr/usd/usd/schemaRegistry.h>
+
+#include <mayaUsd/base/api.h>
+
 PXR_NAMESPACE_OPEN_SCOPE
 
 /// \class UsdMayaAdaptor
diff --git a/lib/mayaUsd/fileio/utils/meshUtil.cpp b/lib/mayaUsd/fileio/utils/meshUtil.cpp
index 3e59b6d9bc..6862330e95 100644
--- a/lib/mayaUsd/fileio/utils/meshUtil.cpp
+++ b/lib/mayaUsd/fileio/utils/meshUtil.cpp
@@ -16,22 +16,6 @@
 // Modifications copyright (C) 2020 Autodesk
 //
 #include "meshUtil.h"
-#include "roundTripUtil.h"
-#include "readUtil.h"
-#include "adaptor.h"
-
-#include "../../base/debugCodes.h"
-#include "../../utils/util.h"
-#include "../../utils/colorSpace.h"
-
-#include "pxr/base/gf/vec3f.h"
-#include "pxr/base/tf/diagnostic.h"
-#include "pxr/base/tf/staticTokens.h"
-#include "pxr/base/tf/token.h"
-#include "pxr/base/vt/array.h"
-#include "pxr/usd/usdGeom/mesh.h"
-#include "pxr/usd/usdGeom/tokens.h"
-#include "pxr/usd/usdUtils/pipeline.h"
 
 #include <maya/MFloatVector.h>
 #include <maya/MFloatVectorArray.h>
@@ -50,8 +34,22 @@
 #include <maya/MStatus.h>
 #include <maya/MUintArray.h>
 
-PXR_NAMESPACE_OPEN_SCOPE
+#include <pxr/base/gf/vec3f.h>
+#include <pxr/base/tf/diagnostic.h>
+#include <pxr/base/tf/staticTokens.h>
+#include <pxr/base/tf/token.h>
+#include <pxr/base/vt/array.h>
+#include <pxr/usd/usdGeom/mesh.h>
+#include <pxr/usd/usdGeom/tokens.h>
+#include <pxr/usd/usdUtils/pipeline.h>
+
+#include <mayaUsd/fileio/utils/adaptor.h>
+#include <mayaUsd/fileio/utils/readUtil.h>
+#include <mayaUsd/fileio/utils/roundTripUtil.h>
+#include <mayaUsd/utils/colorSpace.h>
+#include <mayaUsd/utils/util.h>
 
+PXR_NAMESPACE_OPEN_SCOPE
 
 TF_DEFINE_PUBLIC_TOKENS(UsdMayaMeshColorSetTokens,
     PXRUSDMAYA_MESH_COLOR_SET_TOKENS);
diff --git a/lib/mayaUsd/fileio/utils/meshUtil.h b/lib/mayaUsd/fileio/utils/meshUtil.h
index a87670d92d..62ec772319 100644
--- a/lib/mayaUsd/fileio/utils/meshUtil.h
+++ b/lib/mayaUsd/fileio/utils/meshUtil.h
@@ -15,25 +15,24 @@
 //
 // Modifications copyright (C) 2020 Autodesk
 //
-
 #ifndef PXRUSDMAYA_MESH_UTIL_H
 #define PXRUSDMAYA_MESH_UTIL_H
 
-#include "../../base/api.h"
-
-#include "pxr/pxr.h"
-#include "pxr/base/gf/vec3f.h"
-#include "pxr/base/tf/staticTokens.h"
-#include "pxr/base/tf/token.h"
-#include "pxr/base/vt/array.h"
-#include "pxr/usd/usd/attribute.h"
-#include "pxr/usd/usdGeom/mesh.h"
-
 #include <maya/MDagPath.h>
-#include <maya/MObject.h>
 #include <maya/MFnMesh.h>
+#include <maya/MObject.h>
 #include <maya/MString.h>
 
+#include <pxr/pxr.h>
+#include <pxr/base/gf/vec3f.h>
+#include <pxr/base/tf/staticTokens.h>
+#include <pxr/base/tf/token.h>
+#include <pxr/base/vt/array.h>
+#include <pxr/usd/usd/attribute.h>
+#include <pxr/usd/usdGeom/mesh.h>
+
+#include <mayaUsd/base/api.h>
+
 PXR_NAMESPACE_OPEN_SCOPE
 
 class UsdGeomMesh;
diff --git a/lib/mayaUsd/fileio/utils/readUtil.cpp b/lib/mayaUsd/fileio/utils/readUtil.cpp
index f6f754b499..2651e56746 100644
--- a/lib/mayaUsd/fileio/utils/readUtil.cpp
+++ b/lib/mayaUsd/fileio/utils/readUtil.cpp
@@ -15,19 +15,6 @@
 //
 #include "readUtil.h"
 
-#include "adaptor.h"
-#include "../../utils/colorSpace.h"
-#include "../../utils/util.h"
-
-#include "pxr/base/gf/gamma.h"
-#include "pxr/base/gf/matrix4d.h"
-#include "pxr/base/tf/envSetting.h"
-#include "pxr/base/vt/array.h"
-
-#include "pxr/usd/sdf/assetPath.h"
-#include "pxr/usd/sdf/listOp.h"
-#include "pxr/usd/usd/tokens.h"
-
 #include <maya/MDoubleArray.h>
 #include <maya/MFloatArray.h>
 #include <maya/MFnAttribute.h>
@@ -48,6 +35,18 @@
 #include <maya/MStringArray.h>
 #include <maya/MVectorArray.h>
 
+#include <pxr/base/gf/gamma.h>
+#include <pxr/base/gf/matrix4d.h>
+#include <pxr/base/tf/envSetting.h>
+#include <pxr/base/vt/array.h>
+#include <pxr/usd/sdf/assetPath.h>
+#include <pxr/usd/sdf/listOp.h>
+#include <pxr/usd/usd/tokens.h>
+
+#include <mayaUsd/fileio/utils/adaptor.h>
+#include <mayaUsd/utils/colorSpace.h>
+#include <mayaUsd/utils/util.h>
+
 PXR_NAMESPACE_OPEN_SCOPE
 
 TF_DEFINE_ENV_SETTING(
diff --git a/lib/mayaUsd/fileio/utils/readUtil.h b/lib/mayaUsd/fileio/utils/readUtil.h
index 1ad271e9a0..1b84d94b7e 100644
--- a/lib/mayaUsd/fileio/utils/readUtil.h
+++ b/lib/mayaUsd/fileio/utils/readUtil.h
@@ -13,27 +13,23 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-
-/// \file usdMaya/readUtil.h
-
 #ifndef PXRUSDMAYA_READUTIL_H
 #define PXRUSDMAYA_READUTIL_H
 
-#include "../../base/api.h"
-
-#include "pxr/pxr.h"
-#include "pxr/usd/sdf/attributeSpec.h"
-#include "pxr/usd/usd/attribute.h"
+#include <string>
 
 #include <maya/MDGModifier.h>
 #include <maya/MFnDependencyNode.h>
 #include <maya/MObject.h>
 #include <maya/MPlug.h>
 
-#include <string>
+#include <pxr/pxr.h>
+#include <pxr/usd/sdf/attributeSpec.h>
+#include <pxr/usd/usd/attribute.h>
 
-PXR_NAMESPACE_OPEN_SCOPE
+#include <mayaUsd/base/api.h>
 
+PXR_NAMESPACE_OPEN_SCOPE
 
 /// This struct contains helpers for reading USD (thus writing Maya data).
 struct UsdMayaReadUtil
diff --git a/lib/mayaUsd/fileio/utils/roundTripUtil.cpp b/lib/mayaUsd/fileio/utils/roundTripUtil.cpp
index 8e753a4adf..0d358e7fcf 100644
--- a/lib/mayaUsd/fileio/utils/roundTripUtil.cpp
+++ b/lib/mayaUsd/fileio/utils/roundTripUtil.cpp
@@ -15,20 +15,17 @@
 //
 #include "roundTripUtil.h"
 
-#include "pxr/base/tf/diagnostic.h"
-#include "pxr/base/tf/staticTokens.h"
-#include "pxr/base/tf/stl.h"
-#include "pxr/base/tf/token.h"
-#include "pxr/base/vt/dictionary.h"
-#include "pxr/base/vt/value.h"
-
-#include "pxr/usd/usd/attribute.h"
-#include "pxr/usd/usdGeom/primvar.h"
-
+#include <pxr/base/tf/diagnostic.h>
+#include <pxr/base/tf/staticTokens.h>
+#include <pxr/base/tf/stl.h>
+#include <pxr/base/tf/token.h>
+#include <pxr/base/vt/dictionary.h>
+#include <pxr/base/vt/value.h>
+#include <pxr/usd/usd/attribute.h>
+#include <pxr/usd/usdGeom/primvar.h>
 
 PXR_NAMESPACE_OPEN_SCOPE
 
-
 TF_DEFINE_PRIVATE_TOKENS(
     _tokens,
 
diff --git a/lib/mayaUsd/fileio/utils/roundTripUtil.h b/lib/mayaUsd/fileio/utils/roundTripUtil.h
index 405d9bed22..4aff8cf931 100644
--- a/lib/mayaUsd/fileio/utils/roundTripUtil.h
+++ b/lib/mayaUsd/fileio/utils/roundTripUtil.h
@@ -16,19 +16,14 @@
 #ifndef PXRUSDMAYA_ROUND_TRIP_UTIL_H
 #define PXRUSDMAYA_ROUND_TRIP_UTIL_H
 
-/// \file usdMaya/roundTripUtil.h
-
-#include "../../base/api.h"
-
-#include "pxr/pxr.h"
-
-#include "pxr/usd/usd/attribute.h"
-#include "pxr/usd/usdGeom/primvar.h"
+#include <pxr/pxr.h>
+#include <pxr/usd/usd/attribute.h>
+#include <pxr/usd/usdGeom/primvar.h>
 
+#include <mayaUsd/base/api.h>
 
 PXR_NAMESPACE_OPEN_SCOPE
 
-
 /// This holds some utility functions for dealing with data from Maya to Usd
 /// and back.
 struct UsdMayaRoundTripUtil
diff --git a/lib/mayaUsd/fileio/utils/shadingUtil.cpp b/lib/mayaUsd/fileio/utils/shadingUtil.cpp
index 1e26517644..99e9d57e22 100644
--- a/lib/mayaUsd/fileio/utils/shadingUtil.cpp
+++ b/lib/mayaUsd/fileio/utils/shadingUtil.cpp
@@ -13,20 +13,18 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-#include "pxr/pxr.h"
 #include "shadingUtil.h"
 
-#include "pxr/base/tf/token.h"
-#include "pxr/usd/sdf/valueTypeName.h"
-#include "pxr/usd/usdShade/input.h"
-#include "pxr/usd/usdShade/material.h"
-#include "pxr/usd/usdShade/output.h"
-#include "pxr/usd/usdShade/shader.h"
-
+#include <pxr/pxr.h>
+#include <pxr/base/tf/token.h>
+#include <pxr/usd/sdf/valueTypeName.h>
+#include <pxr/usd/usdShade/input.h>
+#include <pxr/usd/usdShade/material.h>
+#include <pxr/usd/usdShade/output.h>
+#include <pxr/usd/usdShade/shader.h>
 
 PXR_NAMESPACE_USING_DIRECTIVE
 
-
 UsdShadeInput
 UsdMayaShadingUtil::CreateMaterialInputAndConnectShader(
         UsdShadeMaterial& material,
diff --git a/lib/mayaUsd/fileio/utils/shadingUtil.h b/lib/mayaUsd/fileio/utils/shadingUtil.h
index ba3da5310a..acb4a3ba71 100644
--- a/lib/mayaUsd/fileio/utils/shadingUtil.h
+++ b/lib/mayaUsd/fileio/utils/shadingUtil.h
@@ -16,26 +16,20 @@
 #ifndef PXRUSDMAYA_SHADING_UTIL_H
 #define PXRUSDMAYA_SHADING_UTIL_H
 
-/// \file usdMaya/shadingUtil.h
-
-#include "pxr/pxr.h"
-#include "../../base/api.h"
-
-#include "pxr/base/tf/token.h"
-#include "pxr/usd/sdf/valueTypeName.h"
-#include "pxr/usd/usdShade/input.h"
-#include "pxr/usd/usdShade/material.h"
-#include "pxr/usd/usdShade/output.h"
-#include "pxr/usd/usdShade/shader.h"
+#include <pxr/pxr.h>
+#include <pxr/base/tf/token.h>
+#include <pxr/usd/sdf/valueTypeName.h>
+#include <pxr/usd/usdShade/input.h>
+#include <pxr/usd/usdShade/material.h>
+#include <pxr/usd/usdShade/output.h>
+#include <pxr/usd/usdShade/shader.h>
 
+#include <mayaUsd/base/api.h>
 
 PXR_NAMESPACE_OPEN_SCOPE
 
-
 namespace UsdMayaShadingUtil
 {
-
-
 /// Create an input on the given material and shader and create a connection
 /// between them.
 ///
diff --git a/lib/mayaUsd/fileio/utils/userTaggedAttribute.cpp b/lib/mayaUsd/fileio/utils/userTaggedAttribute.cpp
index f0a5c6a39a..07ff6f62a5 100644
--- a/lib/mayaUsd/fileio/utils/userTaggedAttribute.cpp
+++ b/lib/mayaUsd/fileio/utils/userTaggedAttribute.cpp
@@ -13,16 +13,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-#include "pxr/pxr.h"
 #include "userTaggedAttribute.h"
 
-#include "../../utils/util.h"
-
-#include "pxr/base/js/json.h"
-#include "pxr/base/js/value.h"
-#include "pxr/base/tf/staticTokens.h"
-#include "pxr/base/tf/token.h"
-#include "pxr/usd/usdGeom/tokens.h"
+#include <set>
+#include <string>
+#include <vector>
 
 #include <maya/MFnDependencyNode.h>
 #include <maya/MObject.h>
@@ -30,14 +25,17 @@
 #include <maya/MStatus.h>
 #include <maya/MString.h>
 
-#include <set>
-#include <string>
-#include <vector>
+#include <pxr/pxr.h>
+#include <pxr/base/js/json.h>
+#include <pxr/base/js/value.h>
+#include <pxr/base/tf/staticTokens.h>
+#include <pxr/base/tf/token.h>
+#include <pxr/usd/usdGeom/tokens.h>
 
+#include <mayaUsd/utils/util.h>
 
 PXR_NAMESPACE_OPEN_SCOPE
 
-
 TF_DEFINE_PUBLIC_TOKENS(
     UsdMayaUserTaggedAttributeTokens,
     PXRUSDMAYA_ATTR_TOKENS);
diff --git a/lib/mayaUsd/fileio/utils/userTaggedAttribute.h b/lib/mayaUsd/fileio/utils/userTaggedAttribute.h
index dfc9eaf484..e6c8f2fbd7 100644
--- a/lib/mayaUsd/fileio/utils/userTaggedAttribute.h
+++ b/lib/mayaUsd/fileio/utils/userTaggedAttribute.h
@@ -13,30 +13,25 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-
-/// \file usdMaya/userTaggedAttribute.h
-
 #ifndef PXRUSDMAYA_USER_TAGGED_ATTRIBUTE_H
 #define PXRUSDMAYA_USER_TAGGED_ATTRIBUTE_H
 
-#include "pxr/pxr.h"
-#include "../../base/api.h"
-
-#include "pxr/base/tf/iterator.h"
-#include "pxr/base/tf/token.h"
-#include "pxr/base/tf/staticTokens.h"
+#include <map>
+#include <string>
+#include <vector>
 
 #include <maya/MObject.h>
 #include <maya/MPlug.h>
 
-#include <map>
-#include <string>
-#include <vector>
+#include <pxr/pxr.h>
+#include <pxr/base/tf/iterator.h>
+#include <pxr/base/tf/staticTokens.h>
+#include <pxr/base/tf/token.h>
 
+#include <mayaUsd/base/api.h>
 
 PXR_NAMESPACE_OPEN_SCOPE
 
-
 #define PXRUSDMAYA_ATTR_TOKENS \
     ((USDAttrTypePrimvar, "primvar")) \
     ((USDAttrTypeUsdRi, "usdRi"))
diff --git a/lib/mayaUsd/fileio/utils/writeUtil.cpp b/lib/mayaUsd/fileio/utils/writeUtil.cpp
index e98f9cde8a..f0559ca6a6 100644
--- a/lib/mayaUsd/fileio/utils/writeUtil.cpp
+++ b/lib/mayaUsd/fileio/utils/writeUtil.cpp
@@ -13,34 +13,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-#include "pxr/pxr.h"
 #include "writeUtil.h"
 
-#include "adaptor.h"
-#include "../../utils/colorSpace.h"
-#include "../translators/translatorUtil.h"
-#include "userTaggedAttribute.h"
-
-#include "pxr/base/gf/gamma.h"
-#include "pxr/base/gf/rotation.h"
-#include "pxr/base/tf/envSetting.h"
-#include "pxr/base/tf/token.h"
-#include "pxr/base/vt/types.h"
-#include "pxr/base/vt/value.h"
-#include "pxr/usd/sdf/path.h"
-#include "pxr/usd/sdf/valueTypeName.h"
-#include "pxr/usd/usd/attribute.h"
-#include "pxr/usd/usd/inherits.h"
-#include "pxr/usd/usd/prim.h"
-#include "pxr/usd/usd/property.h"
-#include "pxr/usd/usd/timeCode.h"
-#include "pxr/usd/usdGeom/imageable.h"
-#include "pxr/usd/usdGeom/primvar.h"
-#include "pxr/usd/usdGeom/tokens.h"
-#include "pxr/usd/usdRi/statementsAPI.h"
-#include "pxr/usd/usdUtils/sparseValueWriter.h"
+#include <string>
+#include <vector>
 
 #include <maya/MDoubleArray.h>
+#include <maya/MFnAttribute.h>
 #include <maya/MFnDependencyNode.h>
 #include <maya/MFnDoubleArrayData.h>
 #include <maya/MFnEnumAttribute.h>
@@ -55,7 +34,6 @@
 #include <maya/MFnTypedAttribute.h>
 #include <maya/MFnUnitAttribute.h>
 #include <maya/MFnVectorArrayData.h>
-#include <maya/MFnAttribute.h>
 #include <maya/MMatrix.h>
 #include <maya/MObject.h>
 #include <maya/MPlug.h>
@@ -65,13 +43,33 @@
 #include <maya/MVector.h>
 #include <maya/MVectorArray.h>
 
-#include <string>
-#include <vector>
-
+#include <pxr/pxr.h>
+#include <pxr/base/gf/gamma.h>
+#include <pxr/base/gf/rotation.h>
+#include <pxr/base/tf/envSetting.h>
+#include <pxr/base/tf/token.h>
+#include <pxr/base/vt/types.h>
+#include <pxr/base/vt/value.h>
+#include <pxr/usd/sdf/path.h>
+#include <pxr/usd/sdf/valueTypeName.h>
+#include <pxr/usd/usd/attribute.h>
+#include <pxr/usd/usd/inherits.h>
+#include <pxr/usd/usd/prim.h>
+#include <pxr/usd/usd/property.h>
+#include <pxr/usd/usd/timeCode.h>
+#include <pxr/usd/usdGeom/imageable.h>
+#include <pxr/usd/usdGeom/primvar.h>
+#include <pxr/usd/usdGeom/tokens.h>
+#include <pxr/usd/usdRi/statementsAPI.h>
+#include <pxr/usd/usdUtils/sparseValueWriter.h>
+
+#include <mayaUsd/fileio/translators/translatorUtil.h>
+#include <mayaUsd/fileio/utils/adaptor.h>
+#include <mayaUsd/fileio/utils/userTaggedAttribute.h>
+#include <mayaUsd/utils/colorSpace.h>
 
 PXR_NAMESPACE_OPEN_SCOPE
 
-
 TF_DEFINE_ENV_SETTING(
     PIXMAYA_WRITE_UV_AS_FLOAT2,
     true,
diff --git a/lib/mayaUsd/fileio/utils/writeUtil.h b/lib/mayaUsd/fileio/utils/writeUtil.h
index cd32bdad18..e9cbf15b04 100644
--- a/lib/mayaUsd/fileio/utils/writeUtil.h
+++ b/lib/mayaUsd/fileio/utils/writeUtil.h
@@ -13,25 +13,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-
-/// \file usdMaya/writeUtil.h
-
 #ifndef PXRUSDMAYA_WRITEUTIL_H
 #define PXRUSDMAYA_WRITEUTIL_H
 
-#include "pxr/pxr.h"
-#include "../../base/api.h"
-#include "userTaggedAttribute.h"
-
-#include "pxr/base/tf/token.h"
-#include "pxr/base/vt/types.h"
-#include "pxr/usd/sdf/valueTypeName.h"
-#include "pxr/usd/usd/attribute.h"
-#include "pxr/usd/usd/prim.h"
-#include "pxr/usd/usd/timeCode.h"
-#include "pxr/usd/usdGeom/imageable.h"
-#include "pxr/usd/usdGeom/pointInstancer.h"
-#include "pxr/usd/usdGeom/primvar.h"
+#include <string>
 
 #include <maya/MFnArrayAttrsData.h>
 #include <maya/MFnDependencyNode.h>
@@ -39,7 +24,19 @@
 #include <maya/MPlug.h>
 #include <maya/MString.h>
 
-#include <string>
+#include <pxr/pxr.h>
+#include <pxr/base/tf/token.h>
+#include <pxr/base/vt/types.h>
+#include <pxr/usd/sdf/valueTypeName.h>
+#include <pxr/usd/usd/attribute.h>
+#include <pxr/usd/usd/prim.h>
+#include <pxr/usd/usd/timeCode.h>
+#include <pxr/usd/usdGeom/imageable.h>
+#include <pxr/usd/usdGeom/pointInstancer.h>
+#include <pxr/usd/usdGeom/primvar.h>
+
+#include <mayaUsd/base/api.h>
+#include <mayaUsd/fileio/utils/userTaggedAttribute.h>
 
 PXR_NAMESPACE_OPEN_SCOPE
 
diff --git a/lib/mayaUsd/fileio/utils/xformStack.cpp b/lib/mayaUsd/fileio/utils/xformStack.cpp
index 72c5663fd8..9fd636dd4a 100644
--- a/lib/mayaUsd/fileio/utils/xformStack.cpp
+++ b/lib/mayaUsd/fileio/utils/xformStack.cpp
@@ -12,14 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-
 #include "xformStack.h"
 
-#include "pxr/base/tf/declarePtrs.h"
-#include "pxr/base/tf/stringUtils.h"
-
 #include <exception>
 
+#include <pxr/base/tf/declarePtrs.h>
+#include <pxr/base/tf/stringUtils.h>
+
 PXR_NAMESPACE_OPEN_SCOPE
 
 TF_DEFINE_PUBLIC_TOKENS(UsdMayaXformStackTokens,
diff --git a/lib/mayaUsd/fileio/utils/xformStack.h b/lib/mayaUsd/fileio/utils/xformStack.h
index ed44d190b4..d9e6586f1a 100644
--- a/lib/mayaUsd/fileio/utils/xformStack.h
+++ b/lib/mayaUsd/fileio/utils/xformStack.h
@@ -12,21 +12,21 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-
 #ifndef PXRUSDMAYA_XFORM_STACK_H
 #define PXRUSDMAYA_XFORM_STACK_H
 
-#include "pxr/pxr.h"
-#include "../../base/api.h"
-#include "pxr/base/tf/refPtr.h"
-#include "pxr/base/tf/token.h"
-#include "pxr/usd/usdGeom/xformOp.h"
+#include <limits>
+#include <unordered_map>
+#include <vector>
 
 #include <maya/MTransformationMatrix.h>
 
-#include <limits>
-#include <vector>
-#include <unordered_map>
+#include <pxr/pxr.h>
+#include <pxr/base/tf/refPtr.h>
+#include <pxr/base/tf/token.h>
+#include <pxr/usd/usdGeom/xformOp.h>
+
+#include <mayaUsd/base/api.h>
 
 PXR_NAMESPACE_OPEN_SCOPE
 
diff --git a/lib/mayaUsd/fileio/writeJobContext.cpp b/lib/mayaUsd/fileio/writeJobContext.cpp
index 081f7b4433..13c7f417c9 100644
--- a/lib/mayaUsd/fileio/writeJobContext.cpp
+++ b/lib/mayaUsd/fileio/writeJobContext.cpp
@@ -13,30 +13,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-#include "pxr/pxr.h"
 #include "writeJobContext.h"
 
-#include "instancedNodeWriter.h"
-#include "jobs/jobArgs.h"
-#include "primWriter.h"
-#include "primWriterRegistry.h"
-#include "translators/skelBindingsProcessor.h"
-#include "../utils/stageCache.h"
-#include "transformWriter.h"
-#include "../utils/util.h"
-
-#include "pxr/base/tf/staticTokens.h"
-#include "pxr/base/tf/stringUtils.h"
-#include "pxr/base/tf/token.h"
-#include "pxr/usd/ar/resolver.h"
-#include "pxr/usd/ar/resolverContext.h"
-#include "pxr/usd/sdf/layer.h"
-#include "pxr/usd/sdf/path.h"
-#include "pxr/usd/usd/prim.h"
-#include "pxr/usd/usd/stage.h"
-#include "pxr/usd/usd/timeCode.h"
-#include "pxr/usd/usdGeom/scope.h"
-#include "pxr/usd/usdGeom/xform.h"
+#include <sstream>
+#include <string>
+#include <typeinfo>
+#include <utility>
+#include <vector>
 
 #include <maya/MDagPath.h>
 #include <maya/MDagPathArray.h>
@@ -46,27 +29,41 @@
 #include <maya/MItDag.h>
 #include <maya/MObject.h>
 #include <maya/MObjectHandle.h>
+#include <maya/MPxNode.h>
 #include <maya/MStatus.h>
 #include <maya/MString.h>
-#include <maya/MPxNode.h>
-
-#include <sstream>
-#include <string>
-#include <typeinfo>
-#include <utility>
-#include <vector>
 
+#include <pxr/pxr.h>
+#include <pxr/base/tf/staticTokens.h>
+#include <pxr/base/tf/stringUtils.h>
+#include <pxr/base/tf/token.h>
+#include <pxr/usd/ar/resolver.h>
+#include <pxr/usd/ar/resolverContext.h>
+#include <pxr/usd/sdf/layer.h>
+#include <pxr/usd/sdf/path.h>
+#include <pxr/usd/usd/prim.h>
+#include <pxr/usd/usd/stage.h>
+#include <pxr/usd/usd/timeCode.h>
+#include <pxr/usd/usdGeom/scope.h>
+#include <pxr/usd/usdGeom/xform.h>
+
+#include <mayaUsd/fileio/instancedNodeWriter.h>
+#include <mayaUsd/fileio/jobs/jobArgs.h>
+#include <mayaUsd/fileio/primWriter.h>
+#include <mayaUsd/fileio/primWriterRegistry.h>
+#include <mayaUsd/fileio/transformWriter.h>
+#include <mayaUsd/fileio/translators/skelBindingsProcessor.h>
+#include <mayaUsd/utils/stageCache.h>
+#include <mayaUsd/utils/util.h>
 
 PXR_NAMESPACE_OPEN_SCOPE
 
-
 TF_DEFINE_PRIVATE_TOKENS(
     _tokens,
 
     (Shape)
 );
 
-
 namespace {
 
 inline
diff --git a/lib/mayaUsd/fileio/writeJobContext.h b/lib/mayaUsd/fileio/writeJobContext.h
index ce9bd6093f..77dfd9ee46 100644
--- a/lib/mayaUsd/fileio/writeJobContext.h
+++ b/lib/mayaUsd/fileio/writeJobContext.h
@@ -16,27 +16,22 @@
 #ifndef PXRUSDMAYA_WRITE_JOB_CONTEXT_H
 #define PXRUSDMAYA_WRITE_JOB_CONTEXT_H
 
-/// \file usdMaya/writeJobContext.h
-
-#include "../base/api.h"
-#include "jobs/jobArgs.h"
-#include "primWriter.h"
-#include "primWriterRegistry.h"
-
-#include "pxr/pxr.h"
-
-#include "pxr/usd/sdf/path.h"
+#include <memory>
 
 #include <maya/MDagPath.h>
 #include <maya/MFnDependencyNode.h>
 #include <maya/MObjectHandle.h>
 
-#include <memory>
+#include <pxr/pxr.h>
+#include <pxr/usd/sdf/path.h>
 
+#include <mayaUsd/base/api.h>
+#include <mayaUsd/fileio/jobs/jobArgs.h>
+#include <mayaUsd/fileio/primWriter.h>
+#include <mayaUsd/fileio/primWriterRegistry.h>
 
 PXR_NAMESPACE_OPEN_SCOPE
 
-
 class UsdMaya_SkelBindingsProcessor;
 class UsdMaya_WriteJob;
 
diff --git a/lib/mayaUsd/listeners/notice.cpp b/lib/mayaUsd/listeners/notice.cpp
index badd984b53..bb011074e2 100644
--- a/lib/mayaUsd/listeners/notice.cpp
+++ b/lib/mayaUsd/listeners/notice.cpp
@@ -13,15 +13,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-#include "notice.h"
-
-#include "pxr/base/tf/instantiateType.h"
-
 #include <maya/MFileIO.h>
 #include <maya/MSceneMessage.h>
 
-PXR_NAMESPACE_OPEN_SCOPE
+#include <pxr/base/tf/instantiateType.h>
 
+#include <mayaUsd/listeners/notice.h>
+
+PXR_NAMESPACE_OPEN_SCOPE
 
 namespace {
 
diff --git a/lib/mayaUsd/listeners/notice.h b/lib/mayaUsd/listeners/notice.h
index 5fe84749bb..1c02980878 100644
--- a/lib/mayaUsd/listeners/notice.h
+++ b/lib/mayaUsd/listeners/notice.h
@@ -16,15 +16,13 @@
 #ifndef USDMAYA_NOTICE_H
 #define USDMAYA_NOTICE_H
 
-/// \file usdMaya/notice.h
-
-#include "pxr/base/tf/notice.h"
-
-#include "../base/api.h"
-
 #include <maya/MMessage.h>
 #include <maya/MObject.h>
 
+#include <pxr/base/tf/notice.h>
+
+#include <mayaUsd/base/api.h>
+
 PXR_NAMESPACE_OPEN_SCOPE
 
 /// Notice sent when the Maya scene resets, either by opening a new scene or
diff --git a/lib/mayaUsd/listeners/proxyShapeNotice.cpp b/lib/mayaUsd/listeners/proxyShapeNotice.cpp
index db6caa8e20..c7c6194089 100644
--- a/lib/mayaUsd/listeners/proxyShapeNotice.cpp
+++ b/lib/mayaUsd/listeners/proxyShapeNotice.cpp
@@ -15,7 +15,7 @@
 //
 #include "proxyShapeNotice.h"
 
-#include "pxr/base/tf/instantiateType.h"
+#include <pxr/base/tf/instantiateType.h>
 
 PXR_NAMESPACE_OPEN_SCOPE
 
diff --git a/lib/mayaUsd/listeners/proxyShapeNotice.h b/lib/mayaUsd/listeners/proxyShapeNotice.h
index b5f6733c59..6e0e78b972 100644
--- a/lib/mayaUsd/listeners/proxyShapeNotice.h
+++ b/lib/mayaUsd/listeners/proxyShapeNotice.h
@@ -16,13 +16,11 @@
 #ifndef USDMAYA_PROXYSTAGE_NOTICE_H
 #define USDMAYA_PROXYSTAGE_NOTICE_H
 
-/// \file usdMaya/proxyShapeNotice.h
-
-#include "pxr/base/tf/notice.h"
+#include <maya/MObject.h>
 
-#include "../base/api.h"
+#include <pxr/base/tf/notice.h>
 
-#include <maya/MObject.h>
+#include <mayaUsd/base/api.h>
 
 PXR_NAMESPACE_OPEN_SCOPE
 
diff --git a/lib/mayaUsd/listeners/stageNoticeListener.cpp b/lib/mayaUsd/listeners/stageNoticeListener.cpp
index 9bbc0d841a..e0f4b67a94 100644
--- a/lib/mayaUsd/listeners/stageNoticeListener.cpp
+++ b/lib/mayaUsd/listeners/stageNoticeListener.cpp
@@ -15,16 +15,13 @@
 //
 #include "stageNoticeListener.h"
 
-#include "pxr/base/tf/notice.h"
-#include "pxr/base/tf/weakBase.h"
-
-#include "pxr/usd/usd/notice.h"
-#include "pxr/usd/usd/stage.h"
-
+#include <pxr/base/tf/notice.h>
+#include <pxr/base/tf/weakBase.h>
+#include <pxr/usd/usd/notice.h>
+#include <pxr/usd/usd/stage.h>
 
 PXR_NAMESPACE_OPEN_SCOPE
 
-
 UsdMayaStageNoticeListener::UsdMayaStageNoticeListener() : TfWeakBase()
 {
 }
diff --git a/lib/mayaUsd/listeners/stageNoticeListener.h b/lib/mayaUsd/listeners/stageNoticeListener.h
index 6039715eb9..ac8eeacab4 100644
--- a/lib/mayaUsd/listeners/stageNoticeListener.h
+++ b/lib/mayaUsd/listeners/stageNoticeListener.h
@@ -16,23 +16,17 @@
 #ifndef PXRUSDMAYA_STAGE_NOTICE_LISTENER_H
 #define PXRUSDMAYA_STAGE_NOTICE_LISTENER_H
 
-/// \file usdMaya/stageNoticeListener.h
-
-#include "../base/api.h"
-
-#include "pxr/pxr.h"
-
-#include "pxr/base/tf/notice.h"
-#include "pxr/base/tf/weakBase.h"
-
-#include "pxr/usd/usd/notice.h"
-#include "pxr/usd/usd/stage.h"
-
 #include <functional>
 
+#include <pxr/pxr.h>
+#include <pxr/base/tf/notice.h>
+#include <pxr/base/tf/weakBase.h>
+#include <pxr/usd/usd/notice.h>
+#include <pxr/usd/usd/stage.h>
 
-PXR_NAMESPACE_OPEN_SCOPE
+#include <mayaUsd/base/api.h>
 
+PXR_NAMESPACE_OPEN_SCOPE
 
 /// A notice listener that can invoke callbacks in response to notices about a
 /// specific USD stage.
diff --git a/lib/mayaUsd/nodes/hdImagingShape.cpp b/lib/mayaUsd/nodes/hdImagingShape.cpp
index 83663938e5..ab36e6251c 100644
--- a/lib/mayaUsd/nodes/hdImagingShape.cpp
+++ b/lib/mayaUsd/nodes/hdImagingShape.cpp
@@ -13,22 +13,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-#include "pxr/pxr.h"
 #include "hdImagingShape.h"
 
-#include "../utils/blockSceneModificationContext.h"
-#include "../fileio/translators/translatorUtil.h"
-#include "../utils/util.h"
-
-#include "pxr/base/tf/diagnostic.h"
-#include "pxr/base/tf/envSetting.h"
-#include "pxr/base/tf/staticTokens.h"
-#include "pxr/base/tf/stringUtils.h"
+#include <string>
 
 #include <maya/MBoundingBox.h>
-#include <maya/MDGMessage.h>
 #include <maya/MDagPath.h>
 #include <maya/MDataHandle.h>
+#include <maya/MDGMessage.h>
 #include <maya/MFn.h>
 #include <maya/MFnDependencyNode.h>
 #include <maya/MFnEnumAttribute.h>
@@ -47,12 +39,18 @@
 #include <maya/MUuid.h>
 #include <maya/MViewport2Renderer.h>
 
-#include <string>
+#include <pxr/pxr.h>
+#include <pxr/base/tf/diagnostic.h>
+#include <pxr/base/tf/envSetting.h>
+#include <pxr/base/tf/staticTokens.h>
+#include <pxr/base/tf/stringUtils.h>
 
+#include <mayaUsd/fileio/translators/translatorUtil.h>
+#include <mayaUsd/utils/blockSceneModificationContext.h>
+#include <mayaUsd/utils/util.h>
 
 PXR_NAMESPACE_OPEN_SCOPE
 
-
 TF_DEFINE_ENV_SETTING(
     PXRMAYAHD_DEFAULT_SELECTION_RESOLUTION,
     256,
diff --git a/lib/mayaUsd/nodes/hdImagingShape.h b/lib/mayaUsd/nodes/hdImagingShape.h
index 21170eb251..9384259cb2 100644
--- a/lib/mayaUsd/nodes/hdImagingShape.h
+++ b/lib/mayaUsd/nodes/hdImagingShape.h
@@ -16,15 +16,6 @@
 #ifndef PXRUSDMAYA_HD_IMAGING_SHAPE_H
 #define PXRUSDMAYA_HD_IMAGING_SHAPE_H
 
-/// \file usdMaya/hdImagingShape.h
-
-#include "pxr/pxr.h"
-
-#include "../base/api.h"
-#include "../utils/util.h"
-
-#include "pxr/base/tf/staticTokens.h"
-
 #include <maya/MBoundingBox.h>
 #include <maya/MDagPath.h>
 #include <maya/MDataHandle.h>
@@ -37,9 +28,13 @@
 #include <maya/MString.h>
 #include <maya/MTypeId.h>
 
+#include <pxr/pxr.h>
+#include <pxr/base/tf/staticTokens.h>
 
-PXR_NAMESPACE_OPEN_SCOPE
+#include <mayaUsd/base/api.h>
+#include <mayaUsd/utils/util.h>
 
+PXR_NAMESPACE_OPEN_SCOPE
 
 #define PXRUSDMAYA_HD_IMAGING_SHAPE_TOKENS \
     ((MayaTypeName, "pxrHdImagingShape"))
diff --git a/lib/mayaUsd/nodes/pointBasedDeformerNode.cpp b/lib/mayaUsd/nodes/pointBasedDeformerNode.cpp
index b9a07eccde..e0909b7c6b 100644
--- a/lib/mayaUsd/nodes/pointBasedDeformerNode.cpp
+++ b/lib/mayaUsd/nodes/pointBasedDeformerNode.cpp
@@ -15,22 +15,7 @@
 //
 #include "pointBasedDeformerNode.h"
 
-#include "stageData.h"
-
-#include "pxr/base/gf/math.h"
-#include "pxr/base/gf/vec3f.h"
-#include "pxr/base/tf/staticTokens.h"
-#include "pxr/base/tf/stringUtils.h"
-#include "pxr/base/tf/token.h"
-#include "pxr/base/vt/array.h"
-#include "pxr/base/vt/types.h"
-
-#include "pxr/usd/sdf/path.h"
-#include "pxr/usd/usd/attribute.h"
-#include "pxr/usd/usd/prim.h"
-#include "pxr/usd/usd/stage.h"
-#include "pxr/usd/usd/timeCode.h"
-#include "pxr/usd/usdGeom/pointBased.h"
+#include <string>
 
 #include <maya/MDataBlock.h>
 #include <maya/MDataHandle.h>
@@ -50,11 +35,24 @@
 #include <maya/MTime.h>
 #include <maya/MTypeId.h>
 
-#include <string>
+#include <pxr/base/gf/math.h>
+#include <pxr/base/gf/vec3f.h>
+#include <pxr/base/tf/staticTokens.h>
+#include <pxr/base/tf/stringUtils.h>
+#include <pxr/base/tf/token.h>
+#include <pxr/base/vt/array.h>
+#include <pxr/base/vt/types.h>
 
+#include <pxr/usd/sdf/path.h>
+#include <pxr/usd/usd/attribute.h>
+#include <pxr/usd/usd/prim.h>
+#include <pxr/usd/usd/stage.h>
+#include <pxr/usd/usd/timeCode.h>
+#include <pxr/usd/usdGeom/pointBased.h>
 
-PXR_NAMESPACE_OPEN_SCOPE
+#include <mayaUsd/nodes/stageData.h>
 
+PXR_NAMESPACE_OPEN_SCOPE
 
 TF_DEFINE_PUBLIC_TOKENS(UsdMayaPointBasedDeformerNodeTokens,
                         PXRUSDMAYA_POINT_BASED_DEFORMER_NODE_TOKENS);
diff --git a/lib/mayaUsd/nodes/pointBasedDeformerNode.h b/lib/mayaUsd/nodes/pointBasedDeformerNode.h
index 211279508a..fe3f7ee157 100644
--- a/lib/mayaUsd/nodes/pointBasedDeformerNode.h
+++ b/lib/mayaUsd/nodes/pointBasedDeformerNode.h
@@ -16,14 +16,6 @@
 #ifndef PXRUSDMAYA_POINT_BASED_DEFORMER_NODE_H
 #define PXRUSDMAYA_POINT_BASED_DEFORMER_NODE_H
 
-/// \file usdMaya/pointBasedDeformerNode.h
-
-#include "../base/api.h"
-
-#include "pxr/pxr.h"
-
-#include "pxr/base/tf/staticTokens.h"
-
 #include <maya/MDataBlock.h>
 #include <maya/MItGeometry.h>
 #include <maya/MMatrix.h>
@@ -33,9 +25,12 @@
 #include <maya/MString.h>
 #include <maya/MTypeId.h>
 
+#include <pxr/pxr.h>
+#include <pxr/base/tf/staticTokens.h>
 
-PXR_NAMESPACE_OPEN_SCOPE
+#include <mayaUsd/base/api.h>
 
+PXR_NAMESPACE_OPEN_SCOPE
 
 #define PXRUSDMAYA_POINT_BASED_DEFORMER_NODE_TOKENS \
     ((MayaTypeName, "pxrUsdPointBasedDeformerNode"))
diff --git a/lib/mayaUsd/nodes/proxyShapeBase.cpp b/lib/mayaUsd/nodes/proxyShapeBase.cpp
index 85dbae1fd5..f1daf6df8e 100644
--- a/lib/mayaUsd/nodes/proxyShapeBase.cpp
+++ b/lib/mayaUsd/nodes/proxyShapeBase.cpp
@@ -15,38 +15,10 @@
 //
 #include "proxyShapeBase.h"
 
-#include "../base/debugCodes.h"
-#include "../listeners/proxyShapeNotice.h"
-#include "../utils/query.h"
-#include "../utils/stageCache.h"
-#include "../utils/utilFileSystem.h"
-#include "stageData.h"
-
-#include "pxr/base/gf/bbox3d.h"
-#include "pxr/base/gf/range3d.h"
-#include "pxr/base/gf/ray.h"
-#include "pxr/base/gf/vec3d.h"
-#include "pxr/base/tf/envSetting.h"
-#include "pxr/base/tf/fileUtils.h"
-#include "pxr/base/tf/hash.h"
-#include "pxr/base/tf/pathUtils.h"
-#include "pxr/base/tf/staticData.h"
-#include "pxr/base/tf/staticTokens.h"
-#include "pxr/base/tf/stringUtils.h"
-#include "pxr/base/tf/token.h"
-#include "pxr/base/trace/trace.h"
-
-#include "pxr/usd/ar/resolver.h"
-#include "pxr/usd/sdf/layer.h"
-#include "pxr/usd/sdf/path.h"
-#include "pxr/usd/usd/prim.h"
-#include "pxr/usd/usd/stage.h"
-#include "pxr/usd/usd/stageCacheContext.h"
-#include "pxr/usd/usd/timeCode.h"
-#include "pxr/usd/usdGeom/bboxCache.h"
-#include "pxr/usd/usdGeom/imageable.h"
-#include "pxr/usd/usdGeom/tokens.h"
-#include "pxr/usd/usdUtils/stageCache.h"
+#include <map>
+#include <string>
+#include <utility>
+#include <vector>
 
 #include <maya/MBoundingBox.h>
 #include <maya/MDagPath.h>
@@ -54,18 +26,18 @@
 #include <maya/MDataHandle.h>
 #include <maya/MDGContext.h>
 #include <maya/MFileIO.h>
-#include <maya/MItDependencyNodes.h>
-#include <maya/MFnReference.h>
 #include <maya/MFnCompoundAttribute.h>
-#include <maya/MFnData.h>
 #include <maya/MFnDagNode.h>
+#include <maya/MFnData.h>
 #include <maya/MFnDependencyNode.h>
 #include <maya/MFnEnumAttribute.h>
 #include <maya/MFnNumericAttribute.h>
 #include <maya/MFnPluginData.h>
+#include <maya/MFnReference.h>
 #include <maya/MFnTypedAttribute.h>
 #include <maya/MFnUnitAttribute.h>
 #include <maya/MGlobal.h>
+#include <maya/MItDependencyNodes.h>
 #include <maya/MObject.h>
 #include <maya/MPlug.h>
 #include <maya/MPlugArray.h>
@@ -77,15 +49,42 @@
 #include <maya/MTime.h>
 #include <maya/MViewport2Renderer.h>
 
-#include <map>
-#include <string>
-#include <utility>
-#include <vector>
+#include <pxr/base/gf/bbox3d.h>
+#include <pxr/base/gf/range3d.h>
+#include <pxr/base/gf/ray.h>
+#include <pxr/base/gf/vec3d.h>
+#include <pxr/base/tf/envSetting.h>
+#include <pxr/base/tf/fileUtils.h>
+#include <pxr/base/tf/hash.h>
+#include <pxr/base/tf/pathUtils.h>
+#include <pxr/base/tf/staticData.h>
+#include <pxr/base/tf/staticTokens.h>
+#include <pxr/base/tf/stringUtils.h>
+#include <pxr/base/tf/token.h>
+#include <pxr/base/trace/trace.h>
+#include <pxr/usd/ar/resolver.h>
+#include <pxr/usd/sdf/layer.h>
+#include <pxr/usd/sdf/path.h>
+#include <pxr/usd/usd/prim.h>
+#include <pxr/usd/usd/stage.h>
+#include <pxr/usd/usd/stageCacheContext.h>
+#include <pxr/usd/usd/timeCode.h>
+#include <pxr/usd/usdGeom/bboxCache.h>
+#include <pxr/usd/usdGeom/imageable.h>
+#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>
+#include <mayaUsd/utils/query.h>
+#include <mayaUsd/utils/stageCache.h>
+#include <mayaUsd/utils/utilFileSystem.h>
+
 PXR_NAMESPACE_OPEN_SCOPE
 
 TF_DEFINE_PUBLIC_TOKENS(MayaUsdProxyShapeBaseTokens,
diff --git a/lib/mayaUsd/nodes/proxyShapeBase.h b/lib/mayaUsd/nodes/proxyShapeBase.h
index 03936323ed..9b8ee2b0ba 100644
--- a/lib/mayaUsd/nodes/proxyShapeBase.h
+++ b/lib/mayaUsd/nodes/proxyShapeBase.h
@@ -16,22 +16,7 @@
 #ifndef PXRUSDMAYA_PROXY_SHAPE_BASE_H
 #define PXRUSDMAYA_PROXY_SHAPE_BASE_H
 
-/// \file usdMaya/proxyShapeBase.h
-
-#include "../base/api.h"
-#include "../listeners/stageNoticeListener.h"
-#include "usdPrimProvider.h"
-
-#include "pxr/pxr.h"
-
-#include "pxr/base/gf/ray.h"
-#include "pxr/base/gf/vec3d.h"
-#include "pxr/base/tf/staticTokens.h"
-
-#include "pxr/usd/sdf/path.h"
-#include "pxr/usd/usd/notice.h"
-#include "pxr/usd/usd/prim.h"
-#include "pxr/usd/usd/timeCode.h"
+#include <map>
 
 #include <maya/MBoundingBox.h>
 #include <maya/MDagPath.h>
@@ -47,7 +32,14 @@
 #include <maya/MString.h>
 #include <maya/MTypeId.h>
 
-#include <map>
+#include <pxr/pxr.h>
+#include <pxr/base/gf/ray.h>
+#include <pxr/base/gf/vec3d.h>
+#include <pxr/base/tf/staticTokens.h>
+#include <pxr/usd/sdf/path.h>
+#include <pxr/usd/usd/notice.h>
+#include <pxr/usd/usd/prim.h>
+#include <pxr/usd/usd/timeCode.h>
 
 #if defined(WANT_UFE_BUILD)
 #include <ufe/ufe.h>
@@ -62,10 +54,12 @@ constexpr int USD_UFE_RUNTIME_ID = 2;
 constexpr char USD_UFE_SEPARATOR = '/';
 #endif
 
+#include <mayaUsd/base/api.h>
+#include <mayaUsd/listeners/stageNoticeListener.h>
+#include <mayaUsd/nodes/usdPrimProvider.h>
 
 PXR_NAMESPACE_OPEN_SCOPE
 
-
 #define MAYAUSD_PROXY_SHAPE_BASE_TOKENS \
     ((MayaTypeName, "mayaUsdProxyShapeBase"))
 
@@ -73,7 +67,6 @@ TF_DECLARE_PUBLIC_TOKENS(MayaUsdProxyShapeBaseTokens,
                          MAYAUSD_CORE_PUBLIC,
                          MAYAUSD_PROXY_SHAPE_BASE_TOKENS);
 
-
 class MayaUsdProxyShapeBase : public MPxSurfaceShape,
                               public UsdMayaUsdPrimProvider
 {
diff --git a/lib/mayaUsd/nodes/proxyShapePlugin.cpp b/lib/mayaUsd/nodes/proxyShapePlugin.cpp
index da4323a2c4..efacd2e271 100644
--- a/lib/mayaUsd/nodes/proxyShapePlugin.cpp
+++ b/lib/mayaUsd/nodes/proxyShapePlugin.cpp
@@ -15,24 +15,24 @@
 //
 #include "proxyShapePlugin.h"
 
-#include "../render/pxrUsdMayaGL/hdImagingShapeDrawOverride.h"
-#include "../render/pxrUsdMayaGL/hdImagingShapeUI.h"
-#include "../render/pxrUsdMayaGL/proxyDrawOverride.h"
-#include "../render/pxrUsdMayaGL/proxyShapeUI.h"
-#include "../render/vp2RenderDelegate/proxyRenderDelegate.h"
-#include "../render/vp2ShaderFragments/shaderFragments.h"
-
-#include "stageData.h"
-#include "hdImagingShape.h"
-#include "proxyShapeBase.h"
-
-#include "pxr/base/tf/envSetting.h"
+#include <mayaUsd/render/pxrUsdMayaGL/hdImagingShapeDrawOverride.h>
+#include <mayaUsd/render/pxrUsdMayaGL/hdImagingShapeUI.h>
+#include <mayaUsd/render/pxrUsdMayaGL/proxyDrawOverride.h>
+#include <mayaUsd/render/pxrUsdMayaGL/proxyShapeUI.h>
+#include <mayaUsd/render/vp2RenderDelegate/proxyRenderDelegate.h>
+#include <mayaUsd/render/vp2ShaderFragments/shaderFragments.h>
 
 #include <maya/MStatus.h>
 #include <maya/MGlobal.h>
 #include <maya/MFnPlugin.h>
 #include <maya/MDrawRegistry.h>
 
+#include <pxr/base/tf/envSetting.h>
+
+#include <mayaUsd/nodes/hdImagingShape.h>
+#include <mayaUsd/nodes/proxyShapeBase.h>
+#include <mayaUsd/nodes/stageData.h>
+
 PXR_NAMESPACE_USING_DIRECTIVE
 
 namespace {
diff --git a/lib/mayaUsd/nodes/proxyShapePlugin.h b/lib/mayaUsd/nodes/proxyShapePlugin.h
index 42e7f2cc5c..60b30e841e 100644
--- a/lib/mayaUsd/nodes/proxyShapePlugin.h
+++ b/lib/mayaUsd/nodes/proxyShapePlugin.h
@@ -16,13 +16,11 @@
 #ifndef PXRUSDMAYA_PROXY_SHAPE_PLUGIN_H
 #define PXRUSDMAYA_PROXY_SHAPE_PLUGIN_H
 
-/// \file usdMaya/proxyShapePlugin.h
-
-#include "../base/api.h"
+#include <maya/MApiNamespace.h>
 
-#include "pxr/pxr.h"
+#include <pxr/pxr.h>
 
-#include <maya/MApiNamespace.h>
+#include <mayaUsd/base/api.h>
 
 PXR_NAMESPACE_OPEN_SCOPE
 
diff --git a/lib/mayaUsd/nodes/stageData.cpp b/lib/mayaUsd/nodes/stageData.cpp
index caf689113d..135a0e0242 100644
--- a/lib/mayaUsd/nodes/stageData.cpp
+++ b/lib/mayaUsd/nodes/stageData.cpp
@@ -15,21 +15,18 @@
 //
 #include "stageData.h"
 
-#include "pxr/base/gf/bbox3d.h"
-#include "pxr/base/tf/staticTokens.h"
-
-#include "pxr/usd/sdf/path.h"
-#include "pxr/usd/usd/stage.h"
-
 #include <maya/MGlobal.h>
 #include <maya/MSceneMessage.h>
 #include <maya/MString.h>
 #include <maya/MTypeId.h>
 
+#include <pxr/base/gf/bbox3d.h>
+#include <pxr/base/tf/staticTokens.h>
+#include <pxr/usd/sdf/path.h>
+#include <pxr/usd/usd/stage.h>
 
 PXR_NAMESPACE_OPEN_SCOPE
 
-
 TF_DEFINE_PUBLIC_TOKENS(MayaUsdStageDataTokens,
                         PXRMAYAUSD_STAGE_DATA_TOKENS);
 
diff --git a/lib/mayaUsd/nodes/stageData.h b/lib/mayaUsd/nodes/stageData.h
index 6891021fd2..015d54322e 100644
--- a/lib/mayaUsd/nodes/stageData.h
+++ b/lib/mayaUsd/nodes/stageData.h
@@ -16,26 +16,20 @@
 #ifndef PXRUSDMAYA_STAGE_DATA_H
 #define PXRUSDMAYA_STAGE_DATA_H
 
-/// \file usdMaya/stageData.h
-
-#include "../base/api.h"
-
-#include "pxr/pxr.h"
-
-#include "pxr/base/tf/staticTokens.h"
-
-#include "pxr/usd/sdf/path.h"
-#include "pxr/usd/usd/stage.h"
-
 #include <maya/MMessage.h>
 #include <maya/MPxData.h>
 #include <maya/MPxGeometryData.h>
 #include <maya/MString.h>
 #include <maya/MTypeId.h>
 
+#include <pxr/base/tf/staticTokens.h>
+#include <pxr/pxr.h>
+#include <pxr/usd/sdf/path.h>
+#include <pxr/usd/usd/stage.h>
 
-PXR_NAMESPACE_OPEN_SCOPE
+#include <mayaUsd/base/api.h>
 
+PXR_NAMESPACE_OPEN_SCOPE
 
 #define PXRMAYAUSD_STAGE_DATA_TOKENS \
     ((MayaTypeName, "pxrUsdStageData"))
diff --git a/lib/mayaUsd/nodes/stageNode.cpp b/lib/mayaUsd/nodes/stageNode.cpp
index 53df5bd390..58c706b0e0 100644
--- a/lib/mayaUsd/nodes/stageNode.cpp
+++ b/lib/mayaUsd/nodes/stageNode.cpp
@@ -15,19 +15,7 @@
 //
 #include "stageNode.h"
 
-#include "../utils/stageCache.h"
-#include "stageData.h"
-
-#include "pxr/base/tf/staticTokens.h"
-#include "pxr/base/tf/stringUtils.h"
-#include "pxr/base/tf/token.h"
-
-#include "pxr/usd/ar/resolver.h"
-#include "pxr/usd/sdf/layer.h"
-#include "pxr/usd/sdf/path.h"
-#include "pxr/usd/usd/prim.h"
-#include "pxr/usd/usd/stage.h"
-#include "pxr/usd/usd/stageCacheContext.h"
+#include <string>
 
 #include <maya/MDataBlock.h>
 #include <maya/MDataHandle.h>
@@ -42,12 +30,21 @@
 #include <maya/MString.h>
 #include <maya/MTypeId.h>
 
-#include <string>
+#include <pxr/base/tf/staticTokens.h>
+#include <pxr/base/tf/stringUtils.h>
+#include <pxr/base/tf/token.h>
+#include <pxr/usd/ar/resolver.h>
+#include <pxr/usd/sdf/layer.h>
+#include <pxr/usd/sdf/path.h>
+#include <pxr/usd/usd/prim.h>
+#include <pxr/usd/usd/stage.h>
+#include <pxr/usd/usd/stageCacheContext.h>
 
+#include <mayaUsd/nodes/stageData.h>
+#include <mayaUsd/utils/stageCache.h>
 
 PXR_NAMESPACE_OPEN_SCOPE
 
-
 TF_DEFINE_PUBLIC_TOKENS(UsdMayaStageNodeTokens,
                         PXRUSDMAYA_STAGE_NODE_TOKENS);
 
diff --git a/lib/mayaUsd/nodes/stageNode.h b/lib/mayaUsd/nodes/stageNode.h
index aeb929d9a4..c705feac48 100644
--- a/lib/mayaUsd/nodes/stageNode.h
+++ b/lib/mayaUsd/nodes/stageNode.h
@@ -16,14 +16,6 @@
 #ifndef PXRUSDMAYA_STAGE_NODE_H
 #define PXRUSDMAYA_STAGE_NODE_H
 
-/// \file usdMaya/stageNode.h
-
-#include "../base/api.h"
-
-#include "pxr/pxr.h"
-
-#include "pxr/base/tf/staticTokens.h"
-
 #include <maya/MDataBlock.h>
 #include <maya/MObject.h>
 #include <maya/MPlug.h>
@@ -32,9 +24,12 @@
 #include <maya/MString.h>
 #include <maya/MTypeId.h>
 
+#include <pxr/pxr.h>
+#include <pxr/base/tf/staticTokens.h>
 
-PXR_NAMESPACE_OPEN_SCOPE
+#include <mayaUsd/base/api.h>
 
+PXR_NAMESPACE_OPEN_SCOPE
 
 #define PXRUSDMAYA_STAGE_NODE_TOKENS \
     ((MayaTypeName, "pxrUsdStageNode"))
diff --git a/lib/mayaUsd/nodes/usdPrimProvider.cpp b/lib/mayaUsd/nodes/usdPrimProvider.cpp
index 479b6b4f58..463bc044a1 100644
--- a/lib/mayaUsd/nodes/usdPrimProvider.cpp
+++ b/lib/mayaUsd/nodes/usdPrimProvider.cpp
@@ -13,9 +13,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-#include "pxr/pxr.h"
 #include "usdPrimProvider.h"
 
+#include <pxr/pxr.h>
+
 PXR_NAMESPACE_OPEN_SCOPE
 
 
diff --git a/lib/mayaUsd/nodes/usdPrimProvider.h b/lib/mayaUsd/nodes/usdPrimProvider.h
index 2dab51d245..b9e5bb490b 100644
--- a/lib/mayaUsd/nodes/usdPrimProvider.h
+++ b/lib/mayaUsd/nodes/usdPrimProvider.h
@@ -16,12 +16,12 @@
 #ifndef PXRUSDMAYA_USD_PRIM_PROVIDER_H
 #define PXRUSDMAYA_USD_PRIM_PROVIDER_H
 
-#include "pxr/pxr.h"
-#include "../base/api.h"
-#include "pxr/usd/usd/prim.h"
+#include <pxr/pxr.h>
+#include <pxr/usd/usd/prim.h>
 
-PXR_NAMESPACE_OPEN_SCOPE
+#include <mayaUsd/base/api.h>
 
+PXR_NAMESPACE_OPEN_SCOPE
 
 // interface class 
 class UsdMayaUsdPrimProvider
diff --git a/lib/mayaUsd/python/module.cpp b/lib/mayaUsd/python/module.cpp
index 8c1c56423c..3dca1f51e9 100644
--- a/lib/mayaUsd/python/module.cpp
+++ b/lib/mayaUsd/python/module.cpp
@@ -13,8 +13,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-#include "pxr/pxr.h"
-#include "pxr/base/tf/pyModule.h"
+#include <pxr/pxr.h>
+
+#include <pxr/base/tf/pyModule.h>
 
 PXR_NAMESPACE_USING_DIRECTIVE
 
diff --git a/lib/mayaUsd/python/moduleDeps.cpp b/lib/mayaUsd/python/moduleDeps.cpp
index 4ab212b654..d4bc421308 100644
--- a/lib/mayaUsd/python/moduleDeps.cpp
+++ b/lib/mayaUsd/python/moduleDeps.cpp
@@ -13,13 +13,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-#include "pxr/pxr.h"
-#include "pxr/base/tf/registryManager.h"
-#include "pxr/base/tf/scriptModuleLoader.h"
-#include "pxr/base/tf/token.h"
-
 #include <vector>
 
+#include <pxr/pxr.h>
+#include <pxr/base/tf/registryManager.h>
+#include <pxr/base/tf/scriptModuleLoader.h>
+#include <pxr/base/tf/token.h>
+
 PXR_NAMESPACE_OPEN_SCOPE
 
 TF_REGISTRY_FUNCTION(TfScriptModuleLoader) {
diff --git a/lib/mayaUsd/python/wrapAdaptor.cpp b/lib/mayaUsd/python/wrapAdaptor.cpp
index 3e8f992d45..ca82e640e1 100644
--- a/lib/mayaUsd/python/wrapAdaptor.cpp
+++ b/lib/mayaUsd/python/wrapAdaptor.cpp
@@ -13,21 +13,20 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
+#include <boost/python.hpp>
+
+#include <maya/MObject.h>
+
+#include <pxr/pxr.h>
+#include <pxr/base/tf/pyResultConversions.h>
+#include <pxr/usd/usdGeom/primvar.h>
+#include <pxr/usd/usd/attribute.h>
+#include <pxr/usd/usd/pyConversions.h>
 
-#include "pxr/pxr.h"
 #include <mayaUsd/fileio/utils/adaptor.h>
 #include <mayaUsd/utils/undoHelperCommand.h>
 #include <mayaUsd/utils/util.h>
 
-#include "pxr/base/tf/pyResultConversions.h"
-#include "pxr/usd/usdGeom/primvar.h"
-#include "pxr/usd/usd/attribute.h"
-#include "pxr/usd/usd/pyConversions.h"
-
-#include <maya/MObject.h>
-
-#include <boost/python.hpp>
-
 using namespace boost::python;
 
 PXR_NAMESPACE_USING_DIRECTIVE;
diff --git a/lib/mayaUsd/python/wrapBlockSceneModificationContext.cpp b/lib/mayaUsd/python/wrapBlockSceneModificationContext.cpp
index fe3fd6dadb..ae6c60a0a1 100644
--- a/lib/mayaUsd/python/wrapBlockSceneModificationContext.cpp
+++ b/lib/mayaUsd/python/wrapBlockSceneModificationContext.cpp
@@ -13,19 +13,18 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-#include "pxr/pxr.h"
-#include <mayaUsd/utils/blockSceneModificationContext.h>
+#include <memory>
 
 #include <boost/python.hpp>
 
-#include <memory>
+#include <pxr/pxr.h>
 
-using namespace boost::python;
+#include <mayaUsd/utils/blockSceneModificationContext.h>
 
+using namespace boost::python;
 
 PXR_NAMESPACE_USING_DIRECTIVE;
 
-
 namespace {
 
 // This exposes UsdMayaBlockSceneModificationContext as a Python "context
diff --git a/lib/mayaUsd/python/wrapColorSpace.cpp b/lib/mayaUsd/python/wrapColorSpace.cpp
index 5641339c5e..97b02de4e3 100644
--- a/lib/mayaUsd/python/wrapColorSpace.cpp
+++ b/lib/mayaUsd/python/wrapColorSpace.cpp
@@ -13,18 +13,17 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-#include "pxr/pxr.h"
-#include <mayaUsd/utils/colorSpace.h>
-
-#include "pxr/base/gf/vec3f.h"
-#include "pxr/base/gf/vec3d.h"
-#include "pxr/base/gf/vec4f.h"
-#include "pxr/base/gf/vec4d.h"
-
 #include <boost/python/def.hpp>
 #include <boost/python.hpp>
 
-#include "pxr/base/tf/pyResultConversions.h"
+#include <pxr/pxr.h>
+#include <pxr/base/gf/vec3d.h>
+#include <pxr/base/gf/vec3f.h>
+#include <pxr/base/gf/vec4d.h>
+#include <pxr/base/gf/vec4f.h>
+#include <pxr/base/tf/pyResultConversions.h>
+
+#include <mayaUsd/utils/colorSpace.h>
 
 using namespace std;
 using namespace boost::python;
diff --git a/lib/mayaUsd/python/wrapDiagnosticDelegate.cpp b/lib/mayaUsd/python/wrapDiagnosticDelegate.cpp
index f15663ced9..0f5e9750ba 100644
--- a/lib/mayaUsd/python/wrapDiagnosticDelegate.cpp
+++ b/lib/mayaUsd/python/wrapDiagnosticDelegate.cpp
@@ -13,13 +13,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-
-#include "pxr/pxr.h"
-#include <mayaUsd/utils/diagnosticDelegate.h>
-
 #include <boost/noncopyable.hpp>
 #include <boost/python.hpp>
 
+#include <pxr/pxr.h>
+
+#include <mayaUsd/utils/diagnosticDelegate.h>
+
 using namespace boost::python;
 
 PXR_NAMESPACE_USING_DIRECTIVE;
diff --git a/lib/mayaUsd/python/wrapMeshUtil.cpp b/lib/mayaUsd/python/wrapMeshUtil.cpp
index e5b77b718c..304aa736ef 100644
--- a/lib/mayaUsd/python/wrapMeshUtil.cpp
+++ b/lib/mayaUsd/python/wrapMeshUtil.cpp
@@ -13,31 +13,28 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-#include "pxr/pxr.h"
-
-#include <mayaUsd/fileio/utils/meshUtil.h>
-#include <mayaUsd/utils/util.h>
+#include <string>
 
-#include "pxr/base/gf/vec3f.h"
-#include "pxr/base/tf/pyResultConversions.h"
-#include "pxr/base/tf/token.h"
-#include "pxr/base/vt/array.h"
+#include <boost/python/class.hpp>
+#include <boost/python.hpp>
 
 #include <maya/MFnMesh.h>
 #include <maya/MObject.h>
 #include <maya/MStatus.h>
 
-#include <boost/python/class.hpp>
-#include <boost/python.hpp>
-
-#include <string>
+#include <pxr/pxr.h>
+#include <pxr/base/gf/vec3f.h>
+#include <pxr/base/tf/pyResultConversions.h>
+#include <pxr/base/tf/token.h>
+#include <pxr/base/vt/array.h>
 
+#include <mayaUsd/fileio/utils/meshUtil.h>
+#include <mayaUsd/utils/util.h>
 
 using namespace boost::python;
 
 PXR_NAMESPACE_USING_DIRECTIVE
 
-
 namespace {
 
 static
diff --git a/lib/mayaUsd/python/wrapQuery.cpp b/lib/mayaUsd/python/wrapQuery.cpp
index 3fb69cc4ba..5ef7df9515 100644
--- a/lib/mayaUsd/python/wrapQuery.cpp
+++ b/lib/mayaUsd/python/wrapQuery.cpp
@@ -13,13 +13,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-#include "pxr/pxr.h"
-#include <mayaUsd/utils/query.h>
-
 #include <boost/python/def.hpp>
 #include <boost/python.hpp>
 
-#include "pxr/base/tf/pyResultConversions.h"
+#include <pxr/pxr.h>
+#include <pxr/base/tf/pyResultConversions.h>
+
+#include <mayaUsd/utils/query.h>
 
 using namespace std;
 using namespace boost::python;
diff --git a/lib/mayaUsd/python/wrapReadUtil.cpp b/lib/mayaUsd/python/wrapReadUtil.cpp
index 6db3bb06df..3afed7d846 100644
--- a/lib/mayaUsd/python/wrapReadUtil.cpp
+++ b/lib/mayaUsd/python/wrapReadUtil.cpp
@@ -13,18 +13,17 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-
-#include "pxr/pxr.h"
-#include <mayaUsd/utils/util.h>
-#include <mayaUsd/fileio/utils/readUtil.h>
-
-#include "pxr/base/tf/pyResultConversions.h"
-#include "pxr/usd/usd/attribute.h"
-#include "pxr/usd/usd/pyConversions.h"
+#include <boost/python.hpp>
 
 #include <maya/MObject.h>
 
-#include <boost/python.hpp>
+#include <pxr/pxr.h>
+#include <pxr/base/tf/pyResultConversions.h>
+#include <pxr/usd/usd/attribute.h>
+#include <pxr/usd/usd/pyConversions.h>
+
+#include <mayaUsd/fileio/utils/readUtil.h>
+#include <mayaUsd/utils/util.h>
 
 using namespace boost::python;
 
diff --git a/lib/mayaUsd/python/wrapRoundTripUtil.cpp b/lib/mayaUsd/python/wrapRoundTripUtil.cpp
index 3a4994d8a2..8c790ecdc0 100644
--- a/lib/mayaUsd/python/wrapRoundTripUtil.cpp
+++ b/lib/mayaUsd/python/wrapRoundTripUtil.cpp
@@ -13,15 +13,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
+#include <boost/python.hpp>
 
-#include "pxr/pxr.h"
-#include <mayaUsd/fileio/utils/roundTripUtil.h>
-
-#include "pxr/usd/usdGeom/primvar.h"
-#include "pxr/usd/usd/attribute.h"
-#include "pxr/usd/usd/pyConversions.h"
+#include <pxr/pxr.h>
+#include <pxr/usd/usdGeom/primvar.h>
+#include <pxr/usd/usd/attribute.h>
+#include <pxr/usd/usd/pyConversions.h>
 
-#include <boost/python.hpp>
+#include <mayaUsd/fileio/utils/roundTripUtil.h>
 
 using namespace std;
 using namespace boost::python;
diff --git a/lib/mayaUsd/python/wrapStageCache.cpp b/lib/mayaUsd/python/wrapStageCache.cpp
index 5ced7aac53..f74a641c7e 100644
--- a/lib/mayaUsd/python/wrapStageCache.cpp
+++ b/lib/mayaUsd/python/wrapStageCache.cpp
@@ -13,14 +13,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-#include "pxr/pxr.h"
-#include <mayaUsd/utils/stageCache.h>
-
 #include <boost/python/args.hpp>
 #include <boost/python/def.hpp>
 #include <boost/python.hpp>
 
-#include "pxr/base/tf/pyResultConversions.h"
+#include <pxr/pxr.h>
+#include <pxr/base/tf/pyResultConversions.h>
+
+#include <mayaUsd/utils/stageCache.h>
 
 using namespace std;
 using namespace boost::python;
diff --git a/lib/mayaUsd/python/wrapUserTaggedAttribute.cpp b/lib/mayaUsd/python/wrapUserTaggedAttribute.cpp
index 5f9c78fe50..50d1958bef 100644
--- a/lib/mayaUsd/python/wrapUserTaggedAttribute.cpp
+++ b/lib/mayaUsd/python/wrapUserTaggedAttribute.cpp
@@ -13,31 +13,28 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-#include "pxr/pxr.h"
-#include <mayaUsd/fileio/utils/userTaggedAttribute.h>
-
-#include <mayaUsd/utils/util.h>
+#include <string>
+#include <vector>
 
-#include "pxr/base/tf/pyContainerConversions.h"
-#include "pxr/base/tf/pyResultConversions.h"
-#include "pxr/base/tf/pyStaticTokens.h"
-#include "pxr/base/tf/token.h"
+#include <boost/python.hpp>
+#include <boost/python/def.hpp>
 
 #include <maya/MDagPath.h>
 #include <maya/MObject.h>
 #include <maya/MStatus.h>
 #include <maya/MString.h>
 
-#include <boost/python.hpp>
-#include <boost/python/def.hpp>
-
-#include <string>
-#include <vector>
+#include <pxr/pxr.h>
+#include <pxr/base/tf/pyContainerConversions.h>
+#include <pxr/base/tf/pyResultConversions.h>
+#include <pxr/base/tf/pyStaticTokens.h>
+#include <pxr/base/tf/token.h>
 
+#include <mayaUsd/fileio/utils/userTaggedAttribute.h>
+#include <mayaUsd/utils/util.h>
 
 PXR_NAMESPACE_USING_DIRECTIVE
 
-
 namespace {
 
 static
diff --git a/lib/mayaUsd/python/wrapWriteUtil.cpp b/lib/mayaUsd/python/wrapWriteUtil.cpp
index 9c2003499e..4d83035ec6 100644
--- a/lib/mayaUsd/python/wrapWriteUtil.cpp
+++ b/lib/mayaUsd/python/wrapWriteUtil.cpp
@@ -13,18 +13,17 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-
-#include "pxr/pxr.h"
-#include <mayaUsd/utils/util.h>
-#include <mayaUsd/fileio/utils/writeUtil.h>
-
-#include "pxr/base/tf/pyResultConversions.h"
-#include "pxr/usd/usd/attribute.h"
-#include "pxr/usd/usd/pyConversions.h"
+#include <boost/python.hpp>
 
 #include <maya/MObject.h>
 
-#include <boost/python.hpp>
+#include <pxr/pxr.h>
+#include <pxr/base/tf/pyResultConversions.h>
+#include <pxr/usd/usd/attribute.h>
+#include <pxr/usd/usd/pyConversions.h>
+
+#include <mayaUsd/fileio/utils/writeUtil.h>
+#include <mayaUsd/utils/util.h>
 
 using namespace boost::python;
 
diff --git a/lib/mayaUsd/python/wrapXformStack.cpp b/lib/mayaUsd/python/wrapXformStack.cpp
index 4219c95c86..e79ca3442d 100644
--- a/lib/mayaUsd/python/wrapXformStack.cpp
+++ b/lib/mayaUsd/python/wrapXformStack.cpp
@@ -13,22 +13,22 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-#include "pxr/pxr.h"
-#include "../fileio/utils/xformStack.h"
-
-#include "pxr/base/tf/pyContainerConversions.h"
-#include "pxr/base/tf/pyEnum.h"
-#include "pxr/base/tf/pyResultConversions.h"
-#include "pxr/base/tf/stringUtils.h"
-
-#include <maya/MEulerRotation.h>
-#include <maya/MTransformationMatrix.h>
-
 #include <boost/python/class.hpp>
 #include <boost/python/copy_const_reference.hpp>
 #include <boost/python/import.hpp>
 #include <boost/python/raw_function.hpp>
 
+#include <maya/MEulerRotation.h>
+#include <maya/MTransformationMatrix.h>
+
+#include <pxr/pxr.h>
+#include <pxr/base/tf/pyContainerConversions.h>
+#include <pxr/base/tf/pyEnum.h>
+#include <pxr/base/tf/pyResultConversions.h>
+#include <pxr/base/tf/stringUtils.h>
+
+#include <mayaUsd/fileio/utils/xformStack.h>
+
 using namespace std;
 using boost::python::object;
 using boost::python::class_;
diff --git a/lib/mayaUsd/render/mayaToHydra/defaultLightDelegate.cpp b/lib/mayaUsd/render/mayaToHydra/defaultLightDelegate.cpp
index 3307994e0a..3cdb9d0352 100644
--- a/lib/mayaUsd/render/mayaToHydra/defaultLightDelegate.cpp
+++ b/lib/mayaUsd/render/mayaToHydra/defaultLightDelegate.cpp
@@ -15,15 +15,14 @@
 //
 #include "defaultLightDelegate.h"
 
-#include "../../usd/hdMaya/delegates/delegateDebugCodes.h"
-
 #include <pxr/base/gf/rotation.h>
 #include <pxr/base/gf/transform.h>
-
 #include <pxr/imaging/hd/light.h>
 #include <pxr/imaging/hd/tokens.h>
 #include <pxr/imaging/hdx/simpleLightTask.h>
 
+#include <hdMaya/delegates/delegateDebugCodes.h>
+
 PXR_NAMESPACE_OPEN_SCOPE
 
 // clang-format off
diff --git a/lib/mayaUsd/render/mayaToHydra/defaultLightDelegate.h b/lib/mayaUsd/render/mayaToHydra/defaultLightDelegate.h
index 908de0df7e..6a5c389e52 100644
--- a/lib/mayaUsd/render/mayaToHydra/defaultLightDelegate.h
+++ b/lib/mayaUsd/render/mayaToHydra/defaultLightDelegate.h
@@ -17,16 +17,13 @@
 #define MTOH_DEFAULT_LIGHT_DELEGATE_H
 
 #include <pxr/pxr.h>
-
 #include <pxr/imaging/glf/simpleLight.h>
 #include <pxr/imaging/hd/renderIndex.h>
-
 #include <pxr/usd/sdf/path.h>
-
 #include <pxr/usd/usd/stage.h>
 #include <pxr/usdImaging/usdImaging/delegate.h>
 
-#include "../../usd/hdMaya/delegates/delegateCtx.h"
+#include <hdMaya/delegates/delegateCtx.h>
 
 PXR_NAMESPACE_OPEN_SCOPE
 
diff --git a/lib/mayaUsd/render/mayaToHydra/plugin.cpp b/lib/mayaUsd/render/mayaToHydra/plugin.cpp
index 5fb0a0e16f..e89878f27f 100644
--- a/lib/mayaUsd/render/mayaToHydra/plugin.cpp
+++ b/lib/mayaUsd/render/mayaToHydra/plugin.cpp
@@ -13,23 +13,22 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-#include <maya/MFnPlugin.h>
-
-#include "renderGlobals.h"
-#include "renderOverride.h"
-#include "viewCommand.h"
-
 #include <stdio.h>
 #include <stdlib.h>
 
+#include <maya/MFnPlugin.h>
+
 #include <pxr/base/plug/plugin.h>
 #include <pxr/base/plug/registry.h>
 #include <pxr/base/tf/envSetting.h>
 
-#include "../../usd/hdMaya/adapters/adapter.h"
+#include <hdMaya/adapters/adapter.h>
 
-PXR_NAMESPACE_USING_DIRECTIVE
+#include "renderGlobals.h"
+#include "renderOverride.h"
+#include "viewCommand.h"
 
+PXR_NAMESPACE_USING_DIRECTIVE
 
 PLUGIN_EXPORT MStatus initializePlugin(MObject obj) {
     MStatus ret = MS::kSuccess;
diff --git a/lib/mayaUsd/render/mayaToHydra/pluginDebugCodes.h b/lib/mayaUsd/render/mayaToHydra/pluginDebugCodes.h
index 960e811e06..39ea56e005 100644
--- a/lib/mayaUsd/render/mayaToHydra/pluginDebugCodes.h
+++ b/lib/mayaUsd/render/mayaToHydra/pluginDebugCodes.h
@@ -17,7 +17,6 @@
 #define HDMAYA_PLUGIN_DEBUG_CODES_H
 
 #include <pxr/pxr.h>
-
 #include <pxr/base/tf/debug.h>
 
 PXR_NAMESPACE_OPEN_SCOPE
diff --git a/lib/mayaUsd/render/mayaToHydra/renderGlobals.cpp b/lib/mayaUsd/render/mayaToHydra/renderGlobals.cpp
index 3f5b750a9a..d688bd90a2 100644
--- a/lib/mayaUsd/render/mayaToHydra/renderGlobals.cpp
+++ b/lib/mayaUsd/render/mayaToHydra/renderGlobals.cpp
@@ -15,9 +15,8 @@
 //
 #include "renderGlobals.h"
 
-#include <pxr/imaging/hd/renderDelegate.h>
-#include <pxr/imaging/hd/rendererPlugin.h>
-#include <pxr/imaging/hd/rendererPluginRegistry.h>
+#include <functional>
+#include <sstream>
 
 #include <maya/MFnDependencyNode.h>
 #include <maya/MFnEnumAttribute.h>
@@ -28,10 +27,11 @@
 #include <maya/MSelectionList.h>
 #include <maya/MStatus.h>
 
-#include "utils.h"
+#include <pxr/imaging/hd/renderDelegate.h>
+#include <pxr/imaging/hd/rendererPlugin.h>
+#include <pxr/imaging/hd/rendererPluginRegistry.h>
 
-#include <functional>
-#include <sstream>
+#include "utils.h"
 
 PXR_NAMESPACE_OPEN_SCOPE
 
diff --git a/lib/mayaUsd/render/mayaToHydra/renderGlobals.h b/lib/mayaUsd/render/mayaToHydra/renderGlobals.h
index 933f69f2a9..cfed597fe4 100644
--- a/lib/mayaUsd/render/mayaToHydra/renderGlobals.h
+++ b/lib/mayaUsd/render/mayaToHydra/renderGlobals.h
@@ -16,20 +16,20 @@
 #ifndef MTOH_RENDER_GLOBALS_H
 #define MTOH_RENDER_GLOBALS_H
 
-#include <pxr/pxr.h>
+#include <unordered_map>
+#include <vector>
+
+#include <maya/MObject.h>
 
+#include <pxr/pxr.h>
 #include <pxr/base/gf/vec4f.h>
 #include <pxr/base/tf/token.h>
 #include <pxr/base/vt/value.h>
 
-#include <maya/MObject.h>
+#include <hdMaya/delegates/params.h>
 
 #include "tokens.h"
 #include "utils.h"
-#include "../../usd/hdMaya/delegates/params.h"
-
-#include <unordered_map>
-#include <vector>
 
 PXR_NAMESPACE_OPEN_SCOPE
 
diff --git a/lib/mayaUsd/render/mayaToHydra/renderOverride.cpp b/lib/mayaUsd/render/mayaToHydra/renderOverride.cpp
index 80a3480e4b..7eb0f1d5d8 100644
--- a/lib/mayaUsd/render/mayaToHydra/renderOverride.cpp
+++ b/lib/mayaUsd/render/mayaToHydra/renderOverride.cpp
@@ -15,13 +15,25 @@
 //
 #include "renderOverride.h"
 
-#include <pxr/base/gf/matrix4d.h>
+#include <atomic>
+#include <chrono>
+#include <exception>
 
+#include <maya/M3dView.h>
+#include <maya/MDagPath.h>
+#include <maya/MDrawContext.h>
+#include <maya/MEventMessage.h>
+#include <maya/MGlobal.h>
+#include <maya/MNodeMessage.h>
+#include <maya/MSceneMessage.h>
+#include <maya/MSelectionList.h>
+#include <maya/MTimerMessage.h>
+#include <maya/MUiMessage.h>
+
+#include <pxr/base/gf/matrix4d.h>
 #include <pxr/base/tf/instantiateSingleton.h>
 #include <pxr/base/vt/value.h>
-
 #include <pxr/imaging/glf/contextCaps.h>
-
 #include <pxr/imaging/hd/rprim.h>
 #if USD_VERSION_NUM >= 1911
 #include <pxr/imaging/hd/rendererPluginRegistry.h>
@@ -38,39 +50,24 @@ PXR_NAMESPACE_CLOSE_SCOPE
 #include <pxr/imaging/hgi/tokens.h>
 #endif
 
-#include <maya/M3dView.h>
-#include <maya/MDagPath.h>
-#include <maya/MDrawContext.h>
-#include <maya/MEventMessage.h>
-#include <maya/MGlobal.h>
-#include <maya/MNodeMessage.h>
-#include <maya/MSceneMessage.h>
-#include <maya/MSelectionList.h>
-#include <maya/MTimerMessage.h>
-#include <maya/MUiMessage.h>
-
-#include <atomic>
-#include <chrono>
-#include <exception>
+#if WANT_UFE_BUILD
+#include <maya/MFileIO.h>
+#include <ufe/globalSelection.h>
+#include <ufe/observableSelection.h>
+#include <ufe/selectionNotification.h>
+#endif // WANT_UFE_BUILD
 
-#include "mayaUsd/render/px_vp20/utils.h"
-#include "../../usd/hdMaya/delegates/delegateRegistry.h"
-#include "../../usd/hdMaya/delegates/sceneDelegate.h"
+#include <hdMaya/delegates/delegateRegistry.h>
+#include <hdMaya/delegates/sceneDelegate.h>
+#include <hdMaya/utils.h>
 
-#include "../../usd/hdMaya/utils.h"
+#include <mayaUsd/render/px_vp20/utils.h>
 
 #include "pluginDebugCodes.h"
 #include "renderOverrideUtils.h"
 #include "tokens.h"
 #include "utils.h"
 
-#if WANT_UFE_BUILD
-#include <maya/MFileIO.h>
-#include <ufe/globalSelection.h>
-#include <ufe/observableSelection.h>
-#include <ufe/selectionNotification.h>
-#endif // WANT_UFE_BUILD
-
 PXR_NAMESPACE_OPEN_SCOPE
 
 namespace {
diff --git a/lib/mayaUsd/render/mayaToHydra/renderOverride.h b/lib/mayaUsd/render/mayaToHydra/renderOverride.h
index 4797220ab1..1b311ccf75 100644
--- a/lib/mayaUsd/render/mayaToHydra/renderOverride.h
+++ b/lib/mayaUsd/render/mayaToHydra/renderOverride.h
@@ -16,9 +16,18 @@
 #ifndef MTOH_VIEW_OVERRIDE_H
 #define MTOH_VIEW_OVERRIDE_H
 
-#include <pxr/imaging/glf/glew.h>
-#include <pxr/pxr.h>
+#include <atomic>
+#include <chrono>
+#include <memory>
+#include <mutex>
 
+#include <maya/MCallbackIdArray.h>
+#include <maya/MMessage.h>
+#include <maya/MString.h>
+#include <maya/MViewport2Renderer.h>
+
+#include <pxr/pxr.h>
+#include <pxr/imaging/glf/glew.h>
 #include <pxr/base/tf/singleton.h>
 
 #if USD_VERSION_NUM > 2002
@@ -39,27 +48,17 @@ PXR_NAMESPACE_CLOSE_SCOPE
 #endif
 #include <pxr/imaging/hdx/taskController.h>
 
-#include <maya/MCallbackIdArray.h>
-#include <maya/MMessage.h>
-#include <maya/MString.h>
-#include <maya/MViewport2Renderer.h>
+#if WANT_UFE_BUILD
+#include <ufe/observer.h>
+#endif // WANT_UFE_BUILD
 
-#include "../../usd/hdMaya/delegates/delegate.h"
-#include "../../usd/hdMaya/delegates/params.h"
+#include <hdMaya/delegates/delegate.h>
+#include <hdMaya/delegates/params.h>
 
 #include "defaultLightDelegate.h"
 #include "renderGlobals.h"
 #include "utils.h"
 
-#include <atomic>
-#include <chrono>
-#include <memory>
-#include <mutex>
-
-#if WANT_UFE_BUILD
-#include <ufe/observer.h>
-#endif // WANT_UFE_BUILD
-
 PXR_NAMESPACE_OPEN_SCOPE
 
 class MtohRenderOverride : public MHWRender::MRenderOverride {
diff --git a/lib/mayaUsd/render/mayaToHydra/shadingModeExporter.cpp b/lib/mayaUsd/render/mayaToHydra/shadingModeExporter.cpp
index eab2faa971..e642dd2b25 100644
--- a/lib/mayaUsd/render/mayaToHydra/shadingModeExporter.cpp
+++ b/lib/mayaUsd/render/mayaToHydra/shadingModeExporter.cpp
@@ -14,15 +14,14 @@
 // limitations under the License.
 //
 #include <pxr/pxr.h>
-
 #include <pxr/imaging/hio/glslfx.h>
 #include <pxr/usd/usdShade/connectableAPI.h>
 #include <pxr/usd/usdShade/shader.h>
 
-#include "../../fileio/shading/shadingModeExporter.h"
-#include "../../fileio/shading/shadingModeRegistry.h"
+#include <mayaUsd/fileio/shading/shadingModeExporter.h>
+#include <mayaUsd/fileio/shading/shadingModeRegistry.h>
 
-#include "../../usd/hdMaya/adapters/materialNetworkConverter.h"
+#include <hdMaya/adapters/materialNetworkConverter.h>
 
 PXR_NAMESPACE_OPEN_SCOPE
 
diff --git a/lib/mayaUsd/render/mayaToHydra/utils.cpp b/lib/mayaUsd/render/mayaToHydra/utils.cpp
index 75c7e1592f..db1dc0a36d 100644
--- a/lib/mayaUsd/render/mayaToHydra/utils.cpp
+++ b/lib/mayaUsd/render/mayaToHydra/utils.cpp
@@ -14,7 +14,6 @@
 // limitations under the License.
 //
 #include "utils.h"
-#include "tokens.h"
 
 #include <maya/MGlobal.h>
 
@@ -31,6 +30,8 @@ PXR_NAMESPACE_CLOSE_SCOPE
 
 #include <pxr/imaging/glf/contextCaps.h>
 
+#include "tokens.h"
+
 PXR_NAMESPACE_OPEN_SCOPE
 
 namespace {
diff --git a/lib/mayaUsd/render/mayaToHydra/utils.h b/lib/mayaUsd/render/mayaToHydra/utils.h
index 1f46de69a3..469477a786 100644
--- a/lib/mayaUsd/render/mayaToHydra/utils.h
+++ b/lib/mayaUsd/render/mayaToHydra/utils.h
@@ -16,14 +16,13 @@
 #ifndef MTOH_UTILS_H
 #define MTOH_UTILS_H
 
-#include <pxr/pxr.h>
+#include <string>
+#include <vector>
 
+#include <pxr/pxr.h>
 #include <pxr/base/tf/token.h>
 #include <pxr/imaging/hd/renderDelegate.h>
 
-#include <string>
-#include <vector>
-
 PXR_NAMESPACE_OPEN_SCOPE
 
 struct MtohRendererDescription {
diff --git a/lib/mayaUsd/render/mayaToHydra/viewCommand.cpp b/lib/mayaUsd/render/mayaToHydra/viewCommand.cpp
index 01d8457cdf..1d69d5a69c 100644
--- a/lib/mayaUsd/render/mayaToHydra/viewCommand.cpp
+++ b/lib/mayaUsd/render/mayaToHydra/viewCommand.cpp
@@ -19,11 +19,11 @@
 #include <maya/MGlobal.h>
 #include <maya/MSyntax.h>
 
-#include "../../usd/hdMaya/delegates/delegateRegistry.h"
-#include "renderOverride.h"
+#include <hdMaya/delegates/delegateRegistry.h>
 
 #include "renderGlobals.h"
 #include "renderOverride.h"
+#include "renderOverride.h"
 #include "utils.h"
 
 PXR_NAMESPACE_OPEN_SCOPE
diff --git a/lib/mayaUsd/render/mayaToHydra/viewCommand.h b/lib/mayaUsd/render/mayaToHydra/viewCommand.h
index 9060db63d3..b6bf58fcfb 100644
--- a/lib/mayaUsd/render/mayaToHydra/viewCommand.h
+++ b/lib/mayaUsd/render/mayaToHydra/viewCommand.h
@@ -16,10 +16,10 @@
 #ifndef MTOH_CMD_H
 #define MTOH_CMD_H
 
-#include <pxr/pxr.h>
-
 #include <maya/MPxCommand.h>
 
+#include <pxr/pxr.h>
+
 PXR_NAMESPACE_OPEN_SCOPE
 
 class MtohViewCmd : public MPxCommand {
diff --git a/lib/mayaUsd/render/px_vp20/glslProgram.cpp b/lib/mayaUsd/render/px_vp20/glslProgram.cpp
index 790bcd27ad..7ee285f6e2 100644
--- a/lib/mayaUsd/render/px_vp20/glslProgram.cpp
+++ b/lib/mayaUsd/render/px_vp20/glslProgram.cpp
@@ -15,20 +15,18 @@
 //
 
 // glew must be included before any other GL header.
-#include "pxr/imaging/glf/glew.h"
+#include <pxr/imaging/glf/glew.h>
 
-#include "./glslProgram.h"
-
-#include "pxr/pxr.h"
-#include "pxr/base/tf/diagnostic.h"
-#include "pxr/imaging/garch/gl.h"
+#include "glslProgram.h"
 
 #include <string>
 
+#include <pxr/pxr.h>
+#include <pxr/base/tf/diagnostic.h>
+#include <pxr/imaging/garch/gl.h>
 
 PXR_NAMESPACE_OPEN_SCOPE
 
-
 PxrMayaGLSLProgram::PxrMayaGLSLProgram() : mProgramId(0)
 {
 }
diff --git a/lib/mayaUsd/render/px_vp20/glslProgram.h b/lib/mayaUsd/render/px_vp20/glslProgram.h
index 78c4780690..9b8b867799 100644
--- a/lib/mayaUsd/render/px_vp20/glslProgram.h
+++ b/lib/mayaUsd/render/px_vp20/glslProgram.h
@@ -16,19 +16,17 @@
 
 /// \file glslProgram.h
 
-
 #ifndef __PX_VP20_GLSL_PROGRAM_H__
 #define __PX_VP20_GLSL_PROGRAM_H__
 
-#include "pxr/pxr.h"
-#include "../../base/api.h"
-#include "pxr/imaging/garch/gl.h"
-
 #include <string>
 
+#include <pxr/pxr.h>
+#include <pxr/imaging/garch/gl.h>
 
-PXR_NAMESPACE_OPEN_SCOPE
+#include <mayaUsd/base/api.h>
 
+PXR_NAMESPACE_OPEN_SCOPE
 
 /// \class PxrMayaGLSLProgram
 ///
diff --git a/lib/mayaUsd/render/px_vp20/utils.cpp b/lib/mayaUsd/render/px_vp20/utils.cpp
index 24288932ce..8a18f28bab 100644
--- a/lib/mayaUsd/render/px_vp20/utils.cpp
+++ b/lib/mayaUsd/render/px_vp20/utils.cpp
@@ -13,25 +13,16 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-// glew must be included before any other GL header.
-#include "pxr/imaging/glf/glew.h"
 
-#include "./utils.h"
+// glew must be included before any other GL header.
+#include <pxr/imaging/glf/glew.h>
 
-#include "./glslProgram.h"
+#include "utils.h"
 
-#include "pxr/base/gf/math.h"
-#include "pxr/base/gf/matrix4d.h"
-#include "pxr/base/gf/matrix4f.h"
-#include "pxr/base/gf/vec2f.h"
-#include "pxr/base/gf/vec3f.h"
-#include "pxr/base/gf/vec4f.h"
-#include "pxr/base/tf/stringUtils.h"
-#include "pxr/imaging/garch/gl.h"
-#include "pxr/imaging/glf/simpleLight.h"
-#include "pxr/imaging/glf/simpleLightingContext.h"
-#include "pxr/imaging/glf/simpleMaterial.h"
-#include "pxr/imaging/hdx/version.h"
+#include <cmath>
+#include <ostream>
+#include <string>
+#include <vector>
 
 #include <maya/M3dView.h>
 #include <maya/MBoundingBox.h>
@@ -47,20 +38,28 @@
 #include <maya/MIntArray.h>
 #include <maya/MMatrix.h>
 #include <maya/MSelectionContext.h>
+#include <maya/MStatus.h>
 #include <maya/MString.h>
 #include <maya/MStringArray.h>
-#include <maya/MStatus.h>
 #include <maya/MTransformationMatrix.h>
 
-#include <cmath>
-#include <ostream>
-#include <string>
-#include <vector>
-
+#include <pxr/base/gf/math.h>
+#include <pxr/base/gf/matrix4d.h>
+#include <pxr/base/gf/matrix4f.h>
+#include <pxr/base/gf/vec2f.h>
+#include <pxr/base/gf/vec3f.h>
+#include <pxr/base/gf/vec4f.h>
+#include <pxr/base/tf/stringUtils.h>
+#include <pxr/imaging/garch/gl.h>
+#include <pxr/imaging/glf/simpleLight.h>
+#include <pxr/imaging/glf/simpleLightingContext.h>
+#include <pxr/imaging/glf/simpleMaterial.h>
+#include <pxr/imaging/hdx/version.h>
+
+#include <mayaUsd/render/px_vp20/glslProgram.h>
 
 PXR_NAMESPACE_OPEN_SCOPE
 
-
 /* static */
 bool
 px_vp20Utils::setupLightingGL(const MHWRender::MDrawContext& context)
diff --git a/lib/mayaUsd/render/px_vp20/utils.h b/lib/mayaUsd/render/px_vp20/utils.h
index 75d213e9fa..c7ef3dc45b 100644
--- a/lib/mayaUsd/render/px_vp20/utils.h
+++ b/lib/mayaUsd/render/px_vp20/utils.h
@@ -18,14 +18,8 @@
 
 /// \file px_vp20/utils.h
 
-#include "pxr/pxr.h"
-#include "../../base/api.h"
-
-#include "pxr/base/gf/matrix4d.h"
-#include "pxr/base/gf/matrix4f.h"
-#include "pxr/base/gf/vec4f.h"
-#include "pxr/imaging/garch/gl.h"
-#include "pxr/imaging/glf/simpleLightingContext.h"
+#include <array>
+#include <ostream>
 
 #include <maya/M3dView.h>
 #include <maya/MBoundingBox.h>
@@ -34,13 +28,17 @@
 #include <maya/MMatrix.h>
 #include <maya/MSelectionContext.h>
 
-#include <array>
-#include <ostream>
+#include <pxr/pxr.h>
+#include <pxr/base/gf/matrix4d.h>
+#include <pxr/base/gf/matrix4f.h>
+#include <pxr/base/gf/vec4f.h>
+#include <pxr/imaging/garch/gl.h>
+#include <pxr/imaging/glf/simpleLightingContext.h>
 
+#include <mayaUsd/base/api.h>
 
 PXR_NAMESPACE_OPEN_SCOPE
 
-
 class px_vp20Utils
 {
     public:
diff --git a/lib/mayaUsd/render/px_vp20/utils_legacy.cpp b/lib/mayaUsd/render/px_vp20/utils_legacy.cpp
index 86dc958a8b..8d3370a9fb 100644
--- a/lib/mayaUsd/render/px_vp20/utils_legacy.cpp
+++ b/lib/mayaUsd/render/px_vp20/utils_legacy.cpp
@@ -13,10 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-#include "pxr/pxr.h"
-#include "./utils_legacy.h"
-
-#include "pxr/base/gf/matrix4d.h"
+#include "utils_legacy.h"
 
 #include <maya/M3dView.h>
 #include <maya/MDagPath.h>
@@ -24,10 +21,11 @@
 #include <maya/MSelectInfo.h>
 #include <maya/MStatus.h>
 
+#include <pxr/pxr.h>
+#include <pxr/base/gf/matrix4d.h>
 
 PXR_NAMESPACE_OPEN_SCOPE
 
-
 /* static */
 bool
 px_LegacyViewportUtils::GetSelectionMatrices(
diff --git a/lib/mayaUsd/render/px_vp20/utils_legacy.h b/lib/mayaUsd/render/px_vp20/utils_legacy.h
index a9e448ffb5..cc0148d3e9 100644
--- a/lib/mayaUsd/render/px_vp20/utils_legacy.h
+++ b/lib/mayaUsd/render/px_vp20/utils_legacy.h
@@ -18,17 +18,15 @@
 
 /// \file px_vp20/utils_legacy.h
 
-#include "pxr/pxr.h"
-#include "../../base/api.h"
-
-#include "pxr/base/gf/matrix4d.h"
+#include <pxr/pxr.h>
+#include <pxr/base/gf/matrix4d.h>
 
 #include <maya/MSelectInfo.h>
 
+#include <mayaUsd/base/api.h>
 
 PXR_NAMESPACE_OPEN_SCOPE
 
-
 /// This class contains helper methods and utilities to help with the
 /// transition from the Maya legacy viewport to Viewport 2.0.
 class px_LegacyViewportUtils
diff --git a/lib/mayaUsd/render/pxrUsdMayaGL/batchRenderer.cpp b/lib/mayaUsd/render/pxrUsdMayaGL/batchRenderer.cpp
index f6a5bc9192..b2d00b067b 100644
--- a/lib/mayaUsd/render/pxrUsdMayaGL/batchRenderer.cpp
+++ b/lib/mayaUsd/render/pxrUsdMayaGL/batchRenderer.cpp
@@ -15,49 +15,12 @@
 //
 
 // glew needs to be included before any other OpenGL headers.
-#include "pxr/imaging/glf/glew.h"
-
-#include "pxr/pxr.h"
-#include "./batchRenderer.h"
-#include "./debugCodes.h"
-#include "./userData.h"
-
-#include "mayaUsd/render/px_vp20/utils.h"
-#include "mayaUsd/render/px_vp20/utils_legacy.h"
-
-#include "pxr/base/gf/matrix4d.h"
-#include "pxr/base/gf/vec2i.h"
-#include "pxr/base/gf/vec3f.h"
-#include "pxr/base/gf/vec4d.h"
-#include "pxr/base/gf/vec4f.h"
-#include "pxr/base/tf/debug.h"
-#include "pxr/base/tf/diagnostic.h"
-#include "pxr/base/tf/getenv.h"
-#include "pxr/base/tf/instantiateSingleton.h"
-#include "pxr/base/tf/singleton.h"
-#include "pxr/base/tf/staticTokens.h"
-#include "pxr/base/tf/stringUtils.h"
-#include "pxr/base/tf/stl.h"
-#include "pxr/base/tf/token.h"
-#include "pxr/base/trace/trace.h"
-#include "pxr/base/vt/types.h"
-#include "pxr/base/vt/value.h"
-#include "pxr/imaging/glf/contextCaps.h"
-#include "pxr/imaging/hd/renderIndex.h"
-#include "pxr/imaging/hd/rprimCollection.h"
-#include "pxr/imaging/hd/task.h"
-#include "pxr/imaging/hd/tokens.h"
-#include "pxr/imaging/hdx/selectionTracker.h"
-#include "pxr/imaging/hdx/tokens.h"
-#if USD_VERSION_NUM > 2002
-#include "pxr/imaging/hgi/hgi.h"
-#include "pxr/imaging/hgi/tokens.h"
-#endif
-#include "pxr/usd/sdf/path.h"
+#include <pxr/imaging/glf/glew.h>
 
-#if USD_VERSION_NUM < 1911
-#include "pxr/usd/usdGeom/tokens.h"
-#endif
+#include "batchRenderer.h"
+
+#include <utility>
+#include <vector>
 
 #include <maya/M3dView.h>
 #include <maya/MDagPath.h>
@@ -81,12 +44,48 @@
 #include <maya/MUserData.h>
 #include <maya/MViewport2Renderer.h>
 
-#include <utility>
-#include <vector>
+#include <pxr/pxr.h>
+#include <pxr/base/gf/matrix4d.h>
+#include <pxr/base/gf/vec2i.h>
+#include <pxr/base/gf/vec3f.h>
+#include <pxr/base/gf/vec4d.h>
+#include <pxr/base/gf/vec4f.h>
+#include <pxr/base/tf/debug.h>
+#include <pxr/base/tf/diagnostic.h>
+#include <pxr/base/tf/getenv.h>
+#include <pxr/base/tf/instantiateSingleton.h>
+#include <pxr/base/tf/singleton.h>
+#include <pxr/base/tf/staticTokens.h>
+#include <pxr/base/tf/stl.h>
+#include <pxr/base/tf/stringUtils.h>
+#include <pxr/base/tf/token.h>
+#include <pxr/base/trace/trace.h>
+#include <pxr/base/vt/types.h>
+#include <pxr/base/vt/value.h>
+#include <pxr/imaging/glf/contextCaps.h>
+#include <pxr/imaging/hd/renderIndex.h>
+#include <pxr/imaging/hd/rprimCollection.h>
+#include <pxr/imaging/hd/task.h>
+#include <pxr/imaging/hd/tokens.h>
+#include <pxr/imaging/hdx/selectionTracker.h>
+#include <pxr/imaging/hdx/tokens.h>
+#include <pxr/usd/sdf/path.h>
 
+#if USD_VERSION_NUM > 2002
+#include <pxr/imaging/hgi/hgi.h>
+#include <pxr/imaging/hgi/tokens.h>
+#endif
 
-PXR_NAMESPACE_OPEN_SCOPE
+#if USD_VERSION_NUM < 1911
+#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(
     _tokens,
diff --git a/lib/mayaUsd/render/pxrUsdMayaGL/batchRenderer.h b/lib/mayaUsd/render/pxrUsdMayaGL/batchRenderer.h
index c4eac861e8..19c54940ba 100644
--- a/lib/mayaUsd/render/pxrUsdMayaGL/batchRenderer.h
+++ b/lib/mayaUsd/render/pxrUsdMayaGL/batchRenderer.h
@@ -17,52 +17,50 @@
 #define PXRUSDMAYAGL_BATCH_RENDERER_H
 
 /// \file pxrUsdMayaGL/batchRenderer.h
-
-#include "pxr/pxr.h"
-#include "../../base/api.h"
-#include "./renderParams.h"
-#include "./sceneDelegate.h"
-#include "./shapeAdapter.h"
-#include "./softSelectHelper.h"
-#include "../../utils/diagnosticDelegate.h"
-#include "../../listeners/notice.h"
-#include "../../utils/util.h"
-
-#include "pxr/base/gf/matrix4d.h"
-#include "pxr/base/gf/vec2i.h"
-#include "pxr/base/gf/vec3f.h"
-#include "pxr/base/gf/vec4d.h"
-#include "pxr/base/tf/singleton.h"
-#include "pxr/base/tf/weakBase.h"
-#if USD_VERSION_NUM > 2002
-#include "pxr/imaging/hd/driver.h"
-#endif
-#include "pxr/imaging/hd/engine.h"
-#include "pxr/imaging/hd/renderIndex.h"
-#include "pxr/imaging/hd/rprimCollection.h"
-#include "pxr/imaging/hdSt/renderDelegate.h"
-#include "pxr/imaging/hdx/selectionTracker.h"
-#include "pxr/imaging/hdx/pickTask.h"
-#include "pxr/usd/sdf/path.h"
+#include <memory>
+#include <unordered_map>
+#include <unordered_set>
+#include <utility>
 
 #include <maya/M3dView.h>
 #include <maya/MDrawContext.h>
 #include <maya/MDrawRequest.h>
-#include <maya/MObjectHandle.h>
 #include <maya/MMessage.h>
+#include <maya/MObjectHandle.h>
 #include <maya/MSelectInfo.h>
 #include <maya/MSelectionContext.h>
 #include <maya/MTypes.h>
 #include <maya/MUserData.h>
 
-#include <memory>
-#include <utility>
-#include <unordered_map>
-#include <unordered_set>
+#include <pxr/pxr.h>
+#include <pxr/base/gf/matrix4d.h>
+#include <pxr/base/gf/vec2i.h>
+#include <pxr/base/gf/vec3f.h>
+#include <pxr/base/gf/vec4d.h>
+#include <pxr/base/tf/singleton.h>
+#include <pxr/base/tf/weakBase.h>
+#include <pxr/imaging/hd/engine.h>
+#include <pxr/imaging/hd/renderIndex.h>
+#include <pxr/imaging/hd/rprimCollection.h>
+#include <pxr/imaging/hdSt/renderDelegate.h>
+#include <pxr/imaging/hdx/pickTask.h>
+#include <pxr/imaging/hdx/selectionTracker.h>
+#include <pxr/usd/sdf/path.h>
 
+#if USD_VERSION_NUM > 2002
+#include <pxr/imaging/hd/driver.h>
+#endif
 
-PXR_NAMESPACE_OPEN_SCOPE
+#include <mayaUsd/base/api.h>
+#include <mayaUsd/listeners/notice.h>
+#include <mayaUsd/render/pxrUsdMayaGL/renderParams.h>
+#include <mayaUsd/render/pxrUsdMayaGL/sceneDelegate.h>
+#include <mayaUsd/render/pxrUsdMayaGL/shapeAdapter.h>
+#include <mayaUsd/render/pxrUsdMayaGL/softSelectHelper.h>
+#include <mayaUsd/utils/diagnosticDelegate.h>
+#include <mayaUsd/utils/util.h>
 
+PXR_NAMESPACE_OPEN_SCOPE
 
 /// UsdMayaGLBatchRenderer is a singleton that shapes can use to get consistent
 /// batched drawing via Hydra in Maya, regardless of legacy viewport or
diff --git a/lib/mayaUsd/render/pxrUsdMayaGL/debugCodes.cpp b/lib/mayaUsd/render/pxrUsdMayaGL/debugCodes.cpp
index 24c53c119c..1f23e8e1ce 100644
--- a/lib/mayaUsd/render/pxrUsdMayaGL/debugCodes.cpp
+++ b/lib/mayaUsd/render/pxrUsdMayaGL/debugCodes.cpp
@@ -13,16 +13,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-#include "./debugCodes.h"
-
-#include "pxr/pxr.h"
-#include "pxr/base/tf/debug.h"
-#include "pxr/base/tf/registryManager.h"
+#include "debugCodes.h"
 
+#include <pxr/pxr.h>
+#include <pxr/base/tf/debug.h>
+#include <pxr/base/tf/registryManager.h>
 
 PXR_NAMESPACE_OPEN_SCOPE
 
-
 TF_REGISTRY_FUNCTION(TfDebug)
 {
     TF_DEBUG_ENVIRONMENT_SYMBOL(
diff --git a/lib/mayaUsd/render/pxrUsdMayaGL/debugCodes.h b/lib/mayaUsd/render/pxrUsdMayaGL/debugCodes.h
index 7456baf4b8..b68d73d5b5 100644
--- a/lib/mayaUsd/render/pxrUsdMayaGL/debugCodes.h
+++ b/lib/mayaUsd/render/pxrUsdMayaGL/debugCodes.h
@@ -18,13 +18,11 @@
 
 /// \file pxrUsdMayaGL/debugCodes.h
 
-#include "pxr/pxr.h"
-#include "pxr/base/tf/debug.h"
-
+#include <pxr/pxr.h>
+#include <pxr/base/tf/debug.h>
 
 PXR_NAMESPACE_OPEN_SCOPE
 
-
 TF_DEBUG_CODES(
     PXRUSDMAYAGL_BATCHED_DRAWING,
     PXRUSDMAYAGL_BATCHED_SELECTION,
@@ -33,8 +31,6 @@ TF_DEBUG_CODES(
     PXRUSDMAYAGL_SHAPE_ADAPTER_LIFECYCLE
 );
 
-
 PXR_NAMESPACE_CLOSE_SCOPE
 
-
 #endif
diff --git a/lib/mayaUsd/render/pxrUsdMayaGL/hdImagingShapeDrawOverride.cpp b/lib/mayaUsd/render/pxrUsdMayaGL/hdImagingShapeDrawOverride.cpp
index f43da25176..d338afe268 100644
--- a/lib/mayaUsd/render/pxrUsdMayaGL/hdImagingShapeDrawOverride.cpp
+++ b/lib/mayaUsd/render/pxrUsdMayaGL/hdImagingShapeDrawOverride.cpp
@@ -13,24 +13,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-#include "pxr/pxr.h"
-#include "./hdImagingShapeDrawOverride.h"
-
-#include "./batchRenderer.h"
-#include "./debugCodes.h"
-#include "./instancerImager.h"
-#include "./userData.h"
-
-#include "../../nodes/hdImagingShape.h"
-
-#include "pxr/base/gf/vec2i.h"
-#include "pxr/base/tf/debug.h"
-#include "pxr/base/tf/stringUtils.h"
-#include "pxr/base/trace/trace.h"
+#include "hdImagingShapeDrawOverride.h"
 
 #include <maya/MBoundingBox.h>
-#include <maya/MDGContext.h>
 #include <maya/MDagPath.h>
+#include <maya/MDGContext.h>
 #include <maya/MDrawContext.h>
 #include <maya/MFnDependencyNode.h>
 #include <maya/MFrameContext.h>
@@ -43,9 +30,19 @@
 #include <maya/MUserData.h>
 #include <maya/MViewport2Renderer.h>
 
+#include <pxr/pxr.h>
+#include <pxr/base/gf/vec2i.h>
+#include <pxr/base/tf/debug.h>
+#include <pxr/base/tf/stringUtils.h>
+#include <pxr/base/trace/trace.h>
 
-PXR_NAMESPACE_OPEN_SCOPE
+#include <mayaUsd/nodes/hdImagingShape.h>
+#include <mayaUsd/render/pxrUsdMayaGL/batchRenderer.h>
+#include <mayaUsd/render/pxrUsdMayaGL/debugCodes.h>
+#include <mayaUsd/render/pxrUsdMayaGL/instancerImager.h>
+#include <mayaUsd/render/pxrUsdMayaGL/userData.h>
 
+PXR_NAMESPACE_OPEN_SCOPE
 
 const MString PxrMayaHdImagingShapeDrawOverride::drawDbClassification(
     TfStringPrintf("drawdb/geometry/pxrUsdMayaGL/%s",
diff --git a/lib/mayaUsd/render/pxrUsdMayaGL/hdImagingShapeDrawOverride.h b/lib/mayaUsd/render/pxrUsdMayaGL/hdImagingShapeDrawOverride.h
index 7f69ffbf39..71dfb1a6fc 100644
--- a/lib/mayaUsd/render/pxrUsdMayaGL/hdImagingShapeDrawOverride.h
+++ b/lib/mayaUsd/render/pxrUsdMayaGL/hdImagingShapeDrawOverride.h
@@ -18,9 +18,6 @@
 
 /// \file pxrUsdMayaGL/hdImagingShapeDrawOverride.h
 
-#include "pxr/pxr.h"
-#include "../../base/api.h"
-
 #include <maya/MBoundingBox.h>
 #include <maya/MDagPath.h>
 #include <maya/MDrawContext.h>
@@ -32,9 +29,11 @@
 #include <maya/MUserData.h>
 #include <maya/MViewport2Renderer.h>
 
+#include <pxr/pxr.h>
 
-PXR_NAMESPACE_OPEN_SCOPE
+#include <mayaUsd/base/api.h>
 
+PXR_NAMESPACE_OPEN_SCOPE
 
 /// Draw override for drawing the pxrHdImagingShape node in Viewport 2.0
 ///
diff --git a/lib/mayaUsd/render/pxrUsdMayaGL/hdImagingShapeUI.cpp b/lib/mayaUsd/render/pxrUsdMayaGL/hdImagingShapeUI.cpp
index 47184903c6..3678c08c79 100644
--- a/lib/mayaUsd/render/pxrUsdMayaGL/hdImagingShapeUI.cpp
+++ b/lib/mayaUsd/render/pxrUsdMayaGL/hdImagingShapeUI.cpp
@@ -13,23 +13,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-#include "pxr/pxr.h"
-#include "./hdImagingShapeUI.h"
-
-#include "./batchRenderer.h"
-#include "./debugCodes.h"
-#include "./instancerImager.h"
-#include "./userData.h"
-
-#include "../../nodes/hdImagingShape.h"
-
-#include "pxr/base/gf/vec2i.h"
-#include "pxr/base/tf/debug.h"
-#include "pxr/base/trace/trace.h"
+#include "hdImagingShapeUI.h"
 
 #include <maya/M3dView.h>
-#include <maya/MDGContext.h>
 #include <maya/MDagPath.h>
+#include <maya/MDGContext.h>
 #include <maya/MDrawData.h>
 #include <maya/MDrawInfo.h>
 #include <maya/MDrawRequest.h>
@@ -40,9 +28,18 @@
 #include <maya/MPxSurfaceShapeUI.h>
 #include <maya/MStatus.h>
 
+#include <pxr/pxr.h>
+#include <pxr/base/gf/vec2i.h>
+#include <pxr/base/tf/debug.h>
+#include <pxr/base/trace/trace.h>
 
-PXR_NAMESPACE_OPEN_SCOPE
+#include <mayaUsd/nodes/hdImagingShape.h>
+#include <mayaUsd/render/pxrUsdMayaGL/batchRenderer.h>
+#include <mayaUsd/render/pxrUsdMayaGL/debugCodes.h>
+#include <mayaUsd/render/pxrUsdMayaGL/instancerImager.h>
+#include <mayaUsd/render/pxrUsdMayaGL/userData.h>
 
+PXR_NAMESPACE_OPEN_SCOPE
 
 /* static */
 void*
diff --git a/lib/mayaUsd/render/pxrUsdMayaGL/hdImagingShapeUI.h b/lib/mayaUsd/render/pxrUsdMayaGL/hdImagingShapeUI.h
index 53c67cea90..2c214c272c 100644
--- a/lib/mayaUsd/render/pxrUsdMayaGL/hdImagingShapeUI.h
+++ b/lib/mayaUsd/render/pxrUsdMayaGL/hdImagingShapeUI.h
@@ -17,15 +17,12 @@
 #define PXRUSDMAYAGL_HD_IMAGING_SHAPE_UI_H
 
 /// \file pxrUsdMayaGL/hdImagingShapeUI.h
-
-#include "pxr/pxr.h"
-#include "../../base/api.h"
-
+#include <pxr/pxr.h>
 // XXX: On Linux, some Maya headers (notably M3dView.h) end up indirectly
 //      including X11/Xlib.h, which #define's "Bool" as int. This can cause
 //      compilation issues if sdf/types.h is included afterwards, so to fix
 //      this, we ensure that it gets included first.
-#include "pxr/usd/sdf/types.h"
+#include <pxr/usd/sdf/types.h>
 
 #include <maya/M3dView.h>
 #include <maya/MDrawInfo.h>
@@ -33,10 +30,10 @@
 #include <maya/MDrawRequestQueue.h>
 #include <maya/MPxSurfaceShapeUI.h>
 
+#include <mayaUsd/base/api.h>
 
 PXR_NAMESPACE_OPEN_SCOPE
 
-
 /// Class for drawing the pxrHdImagingShape node in the legacy viewport
 ///
 /// In most cases, there will only be a single instance of the
diff --git a/lib/mayaUsd/render/pxrUsdMayaGL/hdRenderer.cpp b/lib/mayaUsd/render/pxrUsdMayaGL/hdRenderer.cpp
index d40462f81f..da7bdf4954 100644
--- a/lib/mayaUsd/render/pxrUsdMayaGL/hdRenderer.cpp
+++ b/lib/mayaUsd/render/pxrUsdMayaGL/hdRenderer.cpp
@@ -15,16 +15,14 @@
 //
 // Some header #define's Bool as int, which breaks stuff in sdf/types.h.
 // Include it first to sidestep the problem. :-/
-#include "pxr/pxr.h"
-#include "pxr/usd/sdf/types.h"
+#include <pxr/pxr.h>
+#include <pxr/usd/sdf/types.h>
 
 // Make sure to include glew first before any header that might include
 // gl.h
-#include "pxr/imaging/glf/glew.h"
+#include <pxr/imaging/glf/glew.h>
 
-#include "./hdRenderer.h"
-#include "../px_vp20/utils.h"
-#include "../px_vp20/utils_legacy.h"
+#include <memory>
 
 #include <maya/M3dView.h>
 #include <maya/MColor.h>
@@ -39,12 +37,12 @@
 #include <maya/MStateManager.h>
 #include <maya/MViewport2Renderer.h>
 
-#include <memory>
-
+#include <mayaUsd/render/px_vp20/utils.h>
+#include <mayaUsd/render/px_vp20/utils_legacy.h>
+#include <mayaUsd/render/pxrUsdMayaGL/hdRenderer.h>
 
 PXR_NAMESPACE_OPEN_SCOPE
 
-
 void
 UsdMayaGLHdRenderer::CheckRendererSetup(
         const UsdPrim& usdPrim,
diff --git a/lib/mayaUsd/render/pxrUsdMayaGL/hdRenderer.h b/lib/mayaUsd/render/pxrUsdMayaGL/hdRenderer.h
index 82ec386b14..9b169b1e1b 100644
--- a/lib/mayaUsd/render/pxrUsdMayaGL/hdRenderer.h
+++ b/lib/mayaUsd/render/pxrUsdMayaGL/hdRenderer.h
@@ -18,14 +18,8 @@
 
 /// \file pxrUsdMayaGL/hdRenderer.h
 
-#include "pxr/pxr.h"
-#include "../../base/api.h"
-
-#include "pxr/base/gf/vec3d.h"
-#include "pxr/base/gf/vec4f.h"
-#include "pxr/usd/sdf/path.h"
-#include "pxr/usd/usd/prim.h"
-#include "pxr/usdImaging/usdImagingGL/engine.h"
+#include <memory>
+#include <vector>
 
 #include <maya/M3dView.h>
 #include <maya/MBoundingBox.h>
@@ -36,13 +30,17 @@
 #include <maya/MFrameContext.h>
 #include <maya/MSelectInfo.h>
 
-#include <memory>
-#include <vector>
+#include <pxr/pxr.h>
+#include <pxr/base/gf/vec3d.h>
+#include <pxr/base/gf/vec4f.h>
+#include <pxr/usd/sdf/path.h>
+#include <pxr/usd/usd/prim.h>
+#include <pxr/usdImaging/usdImagingGL/engine.h>
 
+#include <mayaUsd/base/api.h>
 
 PXR_NAMESPACE_OPEN_SCOPE
 
-
 /// Simple implementation of a Hydra renderer for a Maya shape.
 ///
 /// This class is mainly intended as a "reference" implementation of how
diff --git a/lib/mayaUsd/render/pxrUsdMayaGL/instancerImager.cpp b/lib/mayaUsd/render/pxrUsdMayaGL/instancerImager.cpp
index 0078e7aee9..daa335d81d 100644
--- a/lib/mayaUsd/render/pxrUsdMayaGL/instancerImager.cpp
+++ b/lib/mayaUsd/render/pxrUsdMayaGL/instancerImager.cpp
@@ -13,14 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-#include "./instancerImager.h"
-
-#include "./batchRenderer.h"
-#include "./debugCodes.h"
-
-#include "../../nodes/hdImagingShape.h"
-
-#include "pxr/base/tf/instantiateSingleton.h"
+#include "instancerImager.h"
 
 #include <maya/MDagMessage.h>
 #include <maya/MDagPath.h>
@@ -29,6 +22,12 @@
 #include <maya/MNodeMessage.h>
 #include <maya/MObjectHandle.h>
 
+#include <pxr/base/tf/instantiateSingleton.h>
+
+#include <mayaUsd/nodes/hdImagingShape.h>
+#include <mayaUsd/render/pxrUsdMayaGL/batchRenderer.h>
+#include <mayaUsd/render/pxrUsdMayaGL/debugCodes.h>
+
 PXR_NAMESPACE_OPEN_SCOPE
 
 TF_INSTANTIATE_SINGLETON(UsdMayaGL_InstancerImager);
diff --git a/lib/mayaUsd/render/pxrUsdMayaGL/instancerImager.h b/lib/mayaUsd/render/pxrUsdMayaGL/instancerImager.h
index 67e6653e69..f551e7e874 100644
--- a/lib/mayaUsd/render/pxrUsdMayaGL/instancerImager.h
+++ b/lib/mayaUsd/render/pxrUsdMayaGL/instancerImager.h
@@ -18,20 +18,19 @@
 
 /// \file pxrUsdMayaGL/instancerImager.h
 
-#include "../../base/api.h"
-#include "./instancerShapeAdapter.h"
-
-#include "pxr/base/tf/singleton.h"
-#include "pxr/base/tf/weakBase.h"
-
-#include "../../listeners/notice.h"
-#include "../../utils/util.h"
+#include <functional>
 
 #include <maya/MCallbackIdArray.h>
 #include <maya/MDagMessage.h>
 #include <maya/MApiNamespace.h>
 
-#include <functional>
+#include <pxr/base/tf/singleton.h>
+#include <pxr/base/tf/weakBase.h>
+
+#include <mayaUsd/base/api.h>
+#include <mayaUsd/listeners/notice.h>
+#include <mayaUsd/render/pxrUsdMayaGL/instancerShapeAdapter.h>
+#include <mayaUsd/utils/util.h>
 
 PXR_NAMESPACE_OPEN_SCOPE
 
diff --git a/lib/mayaUsd/render/pxrUsdMayaGL/instancerShapeAdapter.cpp b/lib/mayaUsd/render/pxrUsdMayaGL/instancerShapeAdapter.cpp
index 38ea86254e..7a8b2a6347 100644
--- a/lib/mayaUsd/render/pxrUsdMayaGL/instancerShapeAdapter.cpp
+++ b/lib/mayaUsd/render/pxrUsdMayaGL/instancerShapeAdapter.cpp
@@ -13,42 +13,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-#include "./instancerShapeAdapter.h"
+#include "instancerShapeAdapter.h"
 
-#include "./batchRenderer.h"
-#include "./debugCodes.h"
-#include "./renderParams.h"
-#include "./shapeAdapter.h"
-
-#include "../../utils/util.h"
-#include "../../fileio/utils/writeUtil.h"
-
-#include "pxr/base/gf/vec4f.h"
-#include "pxr/base/gf/matrix4d.h"
-
-#include "pxr/base/tf/debug.h"
-#include "pxr/base/tf/diagnostic.h"
-#include "pxr/base/tf/staticTokens.h"
-#include "pxr/base/tf/stringUtils.h"
-#include "pxr/base/tf/token.h"
-
-#include "pxr/imaging/hd/enums.h"
-#include "pxr/imaging/hd/renderIndex.h"
-#include "pxr/imaging/hd/repr.h"
-#include "pxr/imaging/hd/rprimCollection.h"
-#include "pxr/imaging/hd/tokens.h"
-
-#include "pxr/usd/kind/registry.h"
-
-#include "pxr/usd/sdf/path.h"
-
-#include "pxr/usd/usd/modelAPI.h"
-#include "pxr/usd/usd/prim.h"
-#include "pxr/usd/usd/timeCode.h"
-
-#include "pxr/usd/usdGeom/pointInstancer.h"
+#include <string>
 
-#include "pxr/usdImaging/usdImaging/delegate.h"
+#include <boost/functional/hash.hpp>
 
 #include <maya/M3dView.h>
 #include <maya/MColor.h>
@@ -64,14 +33,35 @@
 #include <maya/MStatus.h>
 #include <maya/MString.h>
 
-#include <boost/functional/hash.hpp>
-
-#include <string>
-
+#include <pxr/base/gf/matrix4d.h>
+#include <pxr/base/gf/vec4f.h>
+#include <pxr/base/tf/debug.h>
+#include <pxr/base/tf/diagnostic.h>
+#include <pxr/base/tf/staticTokens.h>
+#include <pxr/base/tf/stringUtils.h>
+#include <pxr/base/tf/token.h>
+#include <pxr/imaging/hd/enums.h>
+#include <pxr/imaging/hd/renderIndex.h>
+#include <pxr/imaging/hd/repr.h>
+#include <pxr/imaging/hd/rprimCollection.h>
+#include <pxr/imaging/hd/tokens.h>
+#include <pxr/usd/kind/registry.h>
+#include <pxr/usd/sdf/path.h>
+#include <pxr/usd/usd/modelAPI.h>
+#include <pxr/usd/usd/prim.h>
+#include <pxr/usd/usd/timeCode.h>
+#include <pxr/usd/usdGeom/pointInstancer.h>
+#include <pxr/usdImaging/usdImaging/delegate.h>
+
+#include <mayaUsd/fileio/utils/writeUtil.h>
+#include <mayaUsd/render/pxrUsdMayaGL/batchRenderer.h>
+#include <mayaUsd/render/pxrUsdMayaGL/debugCodes.h>
+#include <mayaUsd/render/pxrUsdMayaGL/renderParams.h>
+#include <mayaUsd/render/pxrUsdMayaGL/shapeAdapter.h>
+#include <mayaUsd/utils/util.h>
 
 PXR_NAMESPACE_OPEN_SCOPE
 
-
 TF_DEFINE_PRIVATE_TOKENS(
     _tokens,
     ((NativeInstancerType, "instancer"))
diff --git a/lib/mayaUsd/render/pxrUsdMayaGL/instancerShapeAdapter.h b/lib/mayaUsd/render/pxrUsdMayaGL/instancerShapeAdapter.h
index b8d4220673..f4181a9ae4 100644
--- a/lib/mayaUsd/render/pxrUsdMayaGL/instancerShapeAdapter.h
+++ b/lib/mayaUsd/render/pxrUsdMayaGL/instancerShapeAdapter.h
@@ -17,24 +17,21 @@
 #define PXRUSDMAYAGL_INSTANCER_SHAPE_ADAPTER_H
 
 /// \file pxrUsdMayaGL/instancerShapeAdapter.h
-
-#include "../../base/api.h"
-#include "./shapeAdapter.h"
-
-#include "pxr/base/gf/matrix4d.h"
-#include "pxr/imaging/hd/renderIndex.h"
-#include "pxr/usd/sdf/path.h"
-#include "pxr/usd/usd/prim.h"
-#include "pxr/usdImaging/usdImaging/delegate.h"
+#include <memory>
 
 #include <maya/M3dView.h>
 
-#include <memory>
+#include <pxr/base/gf/matrix4d.h>
+#include <pxr/imaging/hd/renderIndex.h>
+#include <pxr/usd/sdf/path.h>
+#include <pxr/usd/usd/prim.h>
+#include <pxr/usdImaging/usdImaging/delegate.h>
 
+#include <mayaUsd/base/api.h>
+#include <mayaUsd/render/pxrUsdMayaGL/shapeAdapter.h>
 
 PXR_NAMESPACE_OPEN_SCOPE
 
-
 /// Class to manage translation of native Maya instancers into
 /// UsdGeomPointInstancers for imaging with Hydra.
 /// This adapter will translate instancer prototypes that are USD reference
diff --git a/lib/mayaUsd/render/pxrUsdMayaGL/proxyDrawOverride.cpp b/lib/mayaUsd/render/pxrUsdMayaGL/proxyDrawOverride.cpp
index 89ecc82cfe..f9283e2ed4 100644
--- a/lib/mayaUsd/render/pxrUsdMayaGL/proxyDrawOverride.cpp
+++ b/lib/mayaUsd/render/pxrUsdMayaGL/proxyDrawOverride.cpp
@@ -13,21 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-#include "pxr/pxr.h"
-#include "./proxyDrawOverride.h"
-
-#include "./batchRenderer.h"
-#include "./renderParams.h"
-#include "./usdProxyShapeAdapter.h"
-
-#include "../px_vp20/utils.h"
-
-#include "../../nodes/proxyShapeBase.h"
-
-#include "pxr/base/gf/matrix4d.h"
-#include "pxr/base/gf/vec3f.h"
-#include "pxr/base/tf/stringUtils.h"
-#include "pxr/base/trace/trace.h"
+#include "proxyDrawOverride.h"
 
 #include <maya/M3dView.h>
 #include <maya/MBoundingBox.h>
@@ -46,9 +32,19 @@
 #include <maya/MUserData.h>
 #include <maya/MViewport2Renderer.h>
 
+#include <pxr/pxr.h>
+#include <pxr/base/gf/matrix4d.h>
+#include <pxr/base/gf/vec3f.h>
+#include <pxr/base/tf/stringUtils.h>
+#include <pxr/base/trace/trace.h>
 
-PXR_NAMESPACE_OPEN_SCOPE
+#include <mayaUsd/nodes/proxyShapeBase.h>
+#include <mayaUsd/render/px_vp20/utils.h>
+#include <mayaUsd/render/pxrUsdMayaGL/batchRenderer.h>
+#include <mayaUsd/render/pxrUsdMayaGL/renderParams.h>
+#include <mayaUsd/render/pxrUsdMayaGL/usdProxyShapeAdapter.h>
 
+PXR_NAMESPACE_OPEN_SCOPE
 
 const MString UsdMayaProxyDrawOverride::drawDbClassification(
     TfStringPrintf("drawdb/geometry/pxrUsdMayaGL/%s",
diff --git a/lib/mayaUsd/render/pxrUsdMayaGL/proxyDrawOverride.h b/lib/mayaUsd/render/pxrUsdMayaGL/proxyDrawOverride.h
index 67c71ab827..200e258880 100644
--- a/lib/mayaUsd/render/pxrUsdMayaGL/proxyDrawOverride.h
+++ b/lib/mayaUsd/render/pxrUsdMayaGL/proxyDrawOverride.h
@@ -18,9 +18,7 @@
 
 /// \file pxrUsdMayaGL/proxyDrawOverride.h
 
-#include "pxr/pxr.h"
-#include "../../base/api.h"
-#include "./usdProxyShapeAdapter.h"
+#include <mayaUsd/base/api.h>
 
 #include <maya/MBoundingBox.h>
 #include <maya/MDagPath.h>
@@ -35,9 +33,11 @@
 #include <maya/MUserData.h>
 #include <maya/MViewport2Renderer.h>
 
+#include <pxr/pxr.h>
 
-PXR_NAMESPACE_OPEN_SCOPE
+#include <mayaUsd/render/pxrUsdMayaGL/usdProxyShapeAdapter.h>
 
+PXR_NAMESPACE_OPEN_SCOPE
 
 class UsdMayaProxyDrawOverride : public MHWRender::MPxDrawOverride
 {
diff --git a/lib/mayaUsd/render/pxrUsdMayaGL/proxyShapeDelegate.cpp b/lib/mayaUsd/render/pxrUsdMayaGL/proxyShapeDelegate.cpp
index 97ecc01817..c44d275515 100644
--- a/lib/mayaUsd/render/pxrUsdMayaGL/proxyShapeDelegate.cpp
+++ b/lib/mayaUsd/render/pxrUsdMayaGL/proxyShapeDelegate.cpp
@@ -13,27 +13,23 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-
-#include "pxr/imaging/glf/glew.h" // This header must absolutely come first.
-
-#include "./batchRenderer.h"
-
-#include "../../nodes/proxyShapeBase.h"
-
-#include "pxr/base/gf/rotation.h"
-#include "pxr/base/gf/frustum.h"
-#include "pxr/base/gf/matrix4d.h"
-#include "pxr/base/gf/range1d.h"
-#include "pxr/base/gf/ray.h"
-#include "pxr/base/gf/vec3d.h"
-
-#include "pxr/base/tf/registryManager.h"
-
-#include "pxr/imaging/glf/drawTarget.h"
-#include "pxr/imaging/glf/glContext.h"
+#include <pxr/imaging/glf/glew.h> // This header must absolutely come first.
 
 #include <maya/MFnDagNode.h>
 
+#include <pxr/base/gf/frustum.h>
+#include <pxr/base/gf/matrix4d.h>
+#include <pxr/base/gf/range1d.h>
+#include <pxr/base/gf/ray.h>
+#include <pxr/base/gf/rotation.h>
+#include <pxr/base/gf/vec3d.h>
+#include <pxr/base/tf/registryManager.h>
+#include <pxr/imaging/glf/drawTarget.h>
+#include <pxr/imaging/glf/glContext.h>
+
+#include <mayaUsd/nodes/proxyShapeBase.h>
+#include <mayaUsd/render/pxrUsdMayaGL/batchRenderer.h>
+
 PXR_NAMESPACE_OPEN_SCOPE
 
 static PxrMayaHdPrimFilter _sharedPrimFilter = {
diff --git a/lib/mayaUsd/render/pxrUsdMayaGL/proxyShapeUI.cpp b/lib/mayaUsd/render/pxrUsdMayaGL/proxyShapeUI.cpp
index 12a46a7d34..e94eb4e82e 100644
--- a/lib/mayaUsd/render/pxrUsdMayaGL/proxyShapeUI.cpp
+++ b/lib/mayaUsd/render/pxrUsdMayaGL/proxyShapeUI.cpp
@@ -13,25 +13,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-#include "pxr/pxr.h"
-#include "./proxyShapeUI.h"
-
-#include "./batchRenderer.h"
-#include "./renderParams.h"
-#include "./usdProxyShapeAdapter.h"
-#include "../../nodes/proxyShapeBase.h"
-
-#include "pxr/base/gf/vec3f.h"
-#include "pxr/base/gf/vec4f.h"
-#include "pxr/base/trace/trace.h"
-#include "pxr/usd/sdf/path.h"
-#include "pxr/usd/usd/prim.h"
-#include "pxr/usd/usd/timeCode.h"
+#include "proxyShapeUI.h"
 
 #include <maya/M3dView.h>
 #include <maya/MBoundingBox.h>
-#include <maya/MDGMessage.h>
 #include <maya/MDagPath.h>
+#include <maya/MDGMessage.h>
 #include <maya/MDrawInfo.h>
 #include <maya/MDrawRequest.h>
 #include <maya/MDrawRequestQueue.h>
@@ -46,9 +33,20 @@
 #include <maya/MSelectionMask.h>
 #include <maya/MStatus.h>
 
+#include <pxr/pxr.h>
+#include <pxr/base/gf/vec3f.h>
+#include <pxr/base/gf/vec4f.h>
+#include <pxr/base/trace/trace.h>
+#include <pxr/usd/sdf/path.h>
+#include <pxr/usd/usd/prim.h>
+#include <pxr/usd/usd/timeCode.h>
 
-PXR_NAMESPACE_OPEN_SCOPE
+#include <mayaUsd/nodes/proxyShapeBase.h>
+#include <mayaUsd/render/pxrUsdMayaGL/batchRenderer.h>
+#include <mayaUsd/render/pxrUsdMayaGL/renderParams.h>
+#include <mayaUsd/render/pxrUsdMayaGL/usdProxyShapeAdapter.h>
 
+PXR_NAMESPACE_OPEN_SCOPE
 
 /* static */
 void*
diff --git a/lib/mayaUsd/render/pxrUsdMayaGL/proxyShapeUI.h b/lib/mayaUsd/render/pxrUsdMayaGL/proxyShapeUI.h
index 36f3ee9d16..8e20e1a5da 100644
--- a/lib/mayaUsd/render/pxrUsdMayaGL/proxyShapeUI.h
+++ b/lib/mayaUsd/render/pxrUsdMayaGL/proxyShapeUI.h
@@ -18,10 +18,6 @@
 
 /// \file pxrUsdMayaGL/proxyShapeUI.h
 
-#include "pxr/pxr.h"
-#include "../../base/api.h"
-#include "./usdProxyShapeAdapter.h"
-
 #include <maya/M3dView.h>
 #include <maya/MDrawInfo.h>
 #include <maya/MDrawRequest.h>
@@ -33,9 +29,12 @@
 #include <maya/MSelectInfo.h>
 #include <maya/MSelectionList.h>
 
+#include <pxr/pxr.h>
 
-PXR_NAMESPACE_OPEN_SCOPE
+#include <mayaUsd/base/api.h>
+#include <mayaUsd/render/pxrUsdMayaGL/usdProxyShapeAdapter.h>
 
+PXR_NAMESPACE_OPEN_SCOPE
 
 class UsdMayaProxyShapeUI : public MPxSurfaceShapeUI
 {
diff --git a/lib/mayaUsd/render/pxrUsdMayaGL/renderParams.h b/lib/mayaUsd/render/pxrUsdMayaGL/renderParams.h
index a13537e7e0..30ca201d99 100644
--- a/lib/mayaUsd/render/pxrUsdMayaGL/renderParams.h
+++ b/lib/mayaUsd/render/pxrUsdMayaGL/renderParams.h
@@ -18,18 +18,15 @@
 
 /// \file pxrUsdMayaGL/renderParams.h
 
-#include "pxr/pxr.h"
-
-#include "../../base/api.h"
-
-#include "pxr/base/gf/vec4f.h"
-#include "pxr/base/tf/token.h"
-
 #include <boost/functional/hash.hpp>
 
+#include <pxr/pxr.h>
+#include <pxr/base/gf/vec4f.h>
+#include <pxr/base/tf/token.h>
 
-PXR_NAMESPACE_OPEN_SCOPE
+#include <mayaUsd/base/api.h>
 
+PXR_NAMESPACE_OPEN_SCOPE
 
 struct PxrMayaHdRenderParams
 {
diff --git a/lib/mayaUsd/render/pxrUsdMayaGL/sceneDelegate.cpp b/lib/mayaUsd/render/pxrUsdMayaGL/sceneDelegate.cpp
index 3d63fb770c..6d4c9baecf 100644
--- a/lib/mayaUsd/render/pxrUsdMayaGL/sceneDelegate.cpp
+++ b/lib/mayaUsd/render/pxrUsdMayaGL/sceneDelegate.cpp
@@ -13,55 +13,51 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-#include "./sceneDelegate.h"
-
-#include "pxr/pxr.h"
-#include "../../base/api.h"
-#include "./renderParams.h"
-
-#include "../px_vp20/utils.h"
-
-#include "pxr/base/gf/matrix4d.h"
-#include "pxr/base/gf/vec2f.h"
-#include "pxr/base/gf/vec4d.h"
-#include "pxr/base/gf/vec4f.h"
-#include "pxr/base/tf/diagnostic.h"
-#include "pxr/base/tf/staticTokens.h"
-#include "pxr/base/tf/stl.h"
-#include "pxr/base/tf/stringUtils.h"
-#include "pxr/base/tf/token.h"
-#include "pxr/base/vt/value.h"
-#include "pxr/imaging/cameraUtil/conformWindow.h"
-#include "pxr/imaging/glf/simpleLight.h"
-#include "pxr/imaging/glf/simpleLightingContext.h"
-#include "pxr/imaging/hd/renderIndex.h"
-#include "pxr/imaging/hd/repr.h"
-#include "pxr/imaging/hd/rprimCollection.h"
-#include "pxr/imaging/hd/sceneDelegate.h"
-#include "pxr/imaging/hd/task.h"
-#include "pxr/imaging/hd/tokens.h"
-#include "pxr/imaging/hd/camera.h"
-#include "pxr/imaging/hdSt/light.h"
-#include "pxr/imaging/hdx/pickTask.h"
-#include "pxr/imaging/hdx/renderSetupTask.h"
-#include "pxr/imaging/hdx/renderTask.h"
-#include "pxr/imaging/hdx/selectionTask.h"
-#include "pxr/imaging/hdx/shadowMatrixComputation.h"
-#include "pxr/imaging/hdx/shadowTask.h"
-#include "pxr/imaging/hdx/simpleLightTask.h"
-#include "pxr/imaging/hdx/tokens.h"
-#include "pxr/usd/sdf/path.h"
-
-#include <maya/MDrawContext.h>
+#include "sceneDelegate.h"
 
+#include <vector>
 #include <boost/functional/hash.hpp>
 
-#include <vector>
+#include <maya/MDrawContext.h>
 
+#include <pxr/pxr.h>
+#include <pxr/base/gf/matrix4d.h>
+#include <pxr/base/gf/vec2f.h>
+#include <pxr/base/gf/vec4d.h>
+#include <pxr/base/gf/vec4f.h>
+#include <pxr/base/tf/diagnostic.h>
+#include <pxr/base/tf/staticTokens.h>
+#include <pxr/base/tf/stl.h>
+#include <pxr/base/tf/stringUtils.h>
+#include <pxr/base/tf/token.h>
+#include <pxr/base/vt/value.h>
+#include <pxr/imaging/cameraUtil/conformWindow.h>
+#include <pxr/imaging/glf/simpleLight.h>
+#include <pxr/imaging/glf/simpleLightingContext.h>
+#include <pxr/imaging/hd/camera.h>
+#include <pxr/imaging/hd/renderIndex.h>
+#include <pxr/imaging/hd/repr.h>
+#include <pxr/imaging/hd/rprimCollection.h>
+#include <pxr/imaging/hd/sceneDelegate.h>
+#include <pxr/imaging/hd/task.h>
+#include <pxr/imaging/hd/tokens.h>
+#include <pxr/imaging/hdSt/light.h>
+#include <pxr/imaging/hdx/pickTask.h>
+#include <pxr/imaging/hdx/renderSetupTask.h>
+#include <pxr/imaging/hdx/renderTask.h>
+#include <pxr/imaging/hdx/selectionTask.h>
+#include <pxr/imaging/hdx/shadowMatrixComputation.h>
+#include <pxr/imaging/hdx/shadowTask.h>
+#include <pxr/imaging/hdx/simpleLightTask.h>
+#include <pxr/imaging/hdx/tokens.h>
+#include <pxr/usd/sdf/path.h>
+
+#include <mayaUsd/base/api.h>
+#include <mayaUsd/render/px_vp20/utils.h>
+#include <mayaUsd/render/pxrUsdMayaGL/renderParams.h>
 
 PXR_NAMESPACE_OPEN_SCOPE
 
-
 TF_DEFINE_PRIVATE_TOKENS(
     _tokens,
 
diff --git a/lib/mayaUsd/render/pxrUsdMayaGL/sceneDelegate.h b/lib/mayaUsd/render/pxrUsdMayaGL/sceneDelegate.h
index 2a6a7427f9..c71a5358a7 100644
--- a/lib/mayaUsd/render/pxrUsdMayaGL/sceneDelegate.h
+++ b/lib/mayaUsd/render/pxrUsdMayaGL/sceneDelegate.h
@@ -18,29 +18,28 @@
 
 /// \file pxrUsdMayaGL/sceneDelegate.h
 
-#include "pxr/pxr.h"
-
-#include "../../base/api.h"
-#include "./renderParams.h"
-
-#include "pxr/base/gf/matrix4d.h"
-#include "pxr/base/gf/vec4d.h"
-#include "pxr/base/tf/diagnostic.h"
-#include "pxr/base/tf/hashmap.h"
-#include "pxr/base/tf/token.h"
-#include "pxr/base/vt/value.h"
-#include "pxr/imaging/glf/simpleLightingContext.h"
-#include "pxr/imaging/hd/renderIndex.h"
-#include "pxr/imaging/hd/rprimCollection.h"
-#include "pxr/imaging/hd/sceneDelegate.h"
-#include "pxr/imaging/hd/task.h"
-#include "pxr/usd/sdf/path.h"
-
-#include <maya/MDrawContext.h>
-
 #include <memory>
 #include <unordered_map>
 
+#include <maya/MDrawContext.h>
+
+#include <pxr/pxr.h>
+#include <pxr/base/gf/matrix4d.h>
+#include <pxr/base/gf/vec4d.h>
+#include <pxr/base/tf/diagnostic.h>
+#include <pxr/base/tf/hashmap.h>
+#include <pxr/base/tf/token.h>
+#include <pxr/base/vt/value.h>
+#include <pxr/imaging/glf/simpleLightingContext.h>
+#include <pxr/imaging/hd/renderIndex.h>
+#include <pxr/imaging/hd/rprimCollection.h>
+#include <pxr/imaging/hd/sceneDelegate.h>
+#include <pxr/imaging/hd/task.h>
+#include <pxr/usd/sdf/path.h>
+
+#include <mayaUsd/base/api.h>
+
+#include <mayaUsd/render/pxrUsdMayaGL/renderParams.h>
 
 PXR_NAMESPACE_OPEN_SCOPE
 
diff --git a/lib/mayaUsd/render/pxrUsdMayaGL/shapeAdapter.cpp b/lib/mayaUsd/render/pxrUsdMayaGL/shapeAdapter.cpp
index 8bee32e0a1..df520f88a1 100644
--- a/lib/mayaUsd/render/pxrUsdMayaGL/shapeAdapter.cpp
+++ b/lib/mayaUsd/render/pxrUsdMayaGL/shapeAdapter.cpp
@@ -13,25 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-#include "./shapeAdapter.h"
-
-#include "pxr/pxr.h"
-#include "../../base/api.h"
-#include "./batchRenderer.h"
-#include "./debugCodes.h"
-#include "./renderParams.h"
-#include "./softSelectHelper.h"
-#include "./userData.h"
-
-#include "pxr/base/gf/gamma.h"
-#include "pxr/base/gf/matrix4d.h"
-#include "pxr/base/gf/vec4f.h"
-#include "pxr/base/tf/debug.h"
-#include "pxr/base/tf/stringUtils.h"
-#include "pxr/base/tf/token.h"
-#include "pxr/imaging/hd/repr.h"
-#include "pxr/imaging/hd/rprimCollection.h"
-#include "pxr/usd/sdf/path.h"
+#include "shapeAdapter.h"
 
 #include <maya/M3dView.h>
 #include <maya/MBoundingBox.h>
@@ -46,13 +28,29 @@
 #include <maya/MPxSurfaceShapeUI.h>
 #include <maya/MSelectionList.h>
 #include <maya/MStatus.h>
-#include <maya/MUuid.h>
 #include <maya/MUserData.h>
+#include <maya/MUuid.h>
 
+#include <pxr/pxr.h>
+#include <pxr/base/gf/gamma.h>
+#include <pxr/base/gf/matrix4d.h>
+#include <pxr/base/gf/vec4f.h>
+#include <pxr/base/tf/debug.h>
+#include <pxr/base/tf/stringUtils.h>
+#include <pxr/base/tf/token.h>
+#include <pxr/imaging/hd/repr.h>
+#include <pxr/imaging/hd/rprimCollection.h>
+#include <pxr/usd/sdf/path.h>
+
+#include <mayaUsd/base/api.h>
+#include <mayaUsd/render/pxrUsdMayaGL/batchRenderer.h>
+#include <mayaUsd/render/pxrUsdMayaGL/debugCodes.h>
+#include <mayaUsd/render/pxrUsdMayaGL/renderParams.h>
+#include <mayaUsd/render/pxrUsdMayaGL/softSelectHelper.h>
+#include <mayaUsd/render/pxrUsdMayaGL/userData.h>
 
 PXR_NAMESPACE_OPEN_SCOPE
 
-
 // Helper function that converts M3dView::DisplayStyle (legacy viewport) into
 // MHWRender::MFrameContext::DisplayStyle (Viewport 2.0).
 //
diff --git a/lib/mayaUsd/render/pxrUsdMayaGL/shapeAdapter.h b/lib/mayaUsd/render/pxrUsdMayaGL/shapeAdapter.h
index da53ef5ef5..fbb9dcd2c0 100644
--- a/lib/mayaUsd/render/pxrUsdMayaGL/shapeAdapter.h
+++ b/lib/mayaUsd/render/pxrUsdMayaGL/shapeAdapter.h
@@ -18,23 +18,20 @@
 
 /// \file pxrUsdMayaGL/shapeAdapter.h
 
-#include "pxr/pxr.h"
-
-#include "../../base/api.h"
-#include "./renderParams.h"
-#include "./userData.h"
+#include <memory>
 
-#include "pxr/base/gf/matrix4d.h"
-#include "pxr/base/tf/token.h"
-#include "pxr/imaging/hd/repr.h"
-#include "pxr/imaging/hd/rprimCollection.h"
-#include "pxr/usd/sdf/path.h"
+#include <pxr/pxr.h>
+#include <pxr/base/gf/matrix4d.h>
+#include <pxr/base/tf/token.h>
+#include <pxr/imaging/hd/repr.h>
+#include <pxr/imaging/hd/rprimCollection.h>
+#include <pxr/usd/sdf/path.h>
 
 // XXX: On Linux, some Maya headers (notably M3dView.h) end up indirectly
 //      including X11/Xlib.h, which #define's "Bool" as int. This can cause
 //      compilation issues if sdf/types.h is included afterwards, so to fix
 //      this, we ensure that it gets included first.
-#include "pxr/usd/sdf/types.h"
+#include <pxr/usd/sdf/types.h>
 
 #include <maya/M3dView.h>
 #undef Always // Defined in /usr/lib/X11/X.h (eventually included by M3dView.h) - breaks pxr/usd/lib/usdUtils/registeredVariantSet.h
@@ -46,8 +43,9 @@
 #include <maya/MPxSurfaceShapeUI.h>
 #include <maya/MUserData.h>
 
-#include <memory>
-
+#include <mayaUsd/base/api.h>
+#include <mayaUsd/render/pxrUsdMayaGL/renderParams.h>
+#include <mayaUsd/render/pxrUsdMayaGL/userData.h>
 
 PXR_NAMESPACE_OPEN_SCOPE
 
diff --git a/lib/mayaUsd/render/pxrUsdMayaGL/softSelectHelper.cpp b/lib/mayaUsd/render/pxrUsdMayaGL/softSelectHelper.cpp
index e476b61605..2b6d1f29e5 100644
--- a/lib/mayaUsd/render/pxrUsdMayaGL/softSelectHelper.cpp
+++ b/lib/mayaUsd/render/pxrUsdMayaGL/softSelectHelper.cpp
@@ -13,19 +13,17 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-
-#include "pxr/pxr.h"
-#include "./softSelectHelper.h"
-
-#include "pxr/base/tf/stl.h"
+#include "softSelectHelper.h"
 
 #include <maya/MGlobal.h>
 #include <maya/MItSelectionList.h>
 #include <maya/MRichSelection.h>
 #include <maya/MSelectionList.h>
 
-PXR_NAMESPACE_OPEN_SCOPE
+#include <pxr/pxr.h>
+#include <pxr/base/tf/stl.h>
 
+PXR_NAMESPACE_OPEN_SCOPE
 
 UsdMayaGLSoftSelectHelper::UsdMayaGLSoftSelectHelper()
     : _populated(false)
diff --git a/lib/mayaUsd/render/pxrUsdMayaGL/softSelectHelper.h b/lib/mayaUsd/render/pxrUsdMayaGL/softSelectHelper.h
index b8c72241b8..2d90f14987 100644
--- a/lib/mayaUsd/render/pxrUsdMayaGL/softSelectHelper.h
+++ b/lib/mayaUsd/render/pxrUsdMayaGL/softSelectHelper.h
@@ -18,22 +18,20 @@
 
 /// \file pxrUsdMayaGL/softSelectHelper.h
 
-#include "pxr/pxr.h"
-#include "../../base/api.h"
-
-#include "pxr/base/tf/hash.h"
+#include <unordered_map>
 
 #include <maya/MColor.h>
 #include <maya/MDagPath.h>
 #include <maya/MRampAttribute.h>
 #include <maya/MString.h>
 
-#include <unordered_map>
+#include <pxr/pxr.h>
+#include <pxr/base/tf/hash.h>
 
+#include <mayaUsd/base/api.h>
 
 PXR_NAMESPACE_OPEN_SCOPE
 
-
 /// \class UsdMayaGLSoftSelectHelper
 /// \brief Helper class to store soft ("rich") selection state while
 /// computing render params for a frame.
diff --git a/lib/mayaUsd/render/pxrUsdMayaGL/usdProxyShapeAdapter.cpp b/lib/mayaUsd/render/pxrUsdMayaGL/usdProxyShapeAdapter.cpp
index 24915ceb71..1f57bfac71 100644
--- a/lib/mayaUsd/render/pxrUsdMayaGL/usdProxyShapeAdapter.cpp
+++ b/lib/mayaUsd/render/pxrUsdMayaGL/usdProxyShapeAdapter.cpp
@@ -13,33 +13,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-#include "./usdProxyShapeAdapter.h"
-
-#include "pxr/pxr.h"
-#include "../../base/api.h"
-#include "./batchRenderer.h"
-#include "./debugCodes.h"
-#include "./renderParams.h"
-#include "./shapeAdapter.h"
-#include "../../nodes/proxyShapeBase.h"
-
-#include "pxr/base/gf/matrix4d.h"
-#include "pxr/base/gf/vec4f.h"
-#include "pxr/base/tf/debug.h"
-#include "pxr/base/tf/diagnostic.h"
-#include "pxr/base/tf/stringUtils.h"
-#include "pxr/base/tf/token.h"
-#include "pxr/base/trace/trace.h"
-#include "pxr/imaging/hd/enums.h"
-#include "pxr/imaging/hd/renderIndex.h"
-#include "pxr/imaging/hd/repr.h"
-#include "pxr/imaging/hd/rprimCollection.h"
-#include "pxr/imaging/hd/tokens.h"
-#include "pxr/usd/sdf/path.h"
-#include "pxr/usd/usd/prim.h"
-#include "pxr/usd/usd/timeCode.h"
-#include "pxr/usd/usdGeom/tokens.h"
-#include "pxr/usdImaging/usdImaging/delegate.h"
+#include "usdProxyShapeAdapter.h"
+
+#include <string>
+
+#include <boost/functional/hash.hpp>
 
 #include <maya/M3dView.h>
 #include <maya/MColor.h>
@@ -54,10 +32,31 @@
 #include <maya/MStatus.h>
 #include <maya/MString.h>
 
-#include <boost/functional/hash.hpp>
-
-#include <string>
-
+#include <pxr/pxr.h>
+#include <pxr/base/gf/matrix4d.h>
+#include <pxr/base/gf/vec4f.h>
+#include <pxr/base/tf/debug.h>
+#include <pxr/base/tf/diagnostic.h>
+#include <pxr/base/tf/stringUtils.h>
+#include <pxr/base/tf/token.h>
+#include <pxr/base/trace/trace.h>
+#include <pxr/imaging/hd/enums.h>
+#include <pxr/imaging/hd/renderIndex.h>
+#include <pxr/imaging/hd/repr.h>
+#include <pxr/imaging/hd/rprimCollection.h>
+#include <pxr/imaging/hd/tokens.h>
+#include <pxr/usd/sdf/path.h>
+#include <pxr/usd/usd/prim.h>
+#include <pxr/usd/usd/timeCode.h>
+#include <pxr/usd/usdGeom/tokens.h>
+#include <pxr/usdImaging/usdImaging/delegate.h>
+
+#include <mayaUsd/base/api.h>
+#include <mayaUsd/nodes/proxyShapeBase.h>
+#include <mayaUsd/render/pxrUsdMayaGL/batchRenderer.h>
+#include <mayaUsd/render/pxrUsdMayaGL/debugCodes.h>
+#include <mayaUsd/render/pxrUsdMayaGL/renderParams.h>
+#include <mayaUsd/render/pxrUsdMayaGL/shapeAdapter.h>
 
 PXR_NAMESPACE_OPEN_SCOPE
 
diff --git a/lib/mayaUsd/render/pxrUsdMayaGL/usdProxyShapeAdapter.h b/lib/mayaUsd/render/pxrUsdMayaGL/usdProxyShapeAdapter.h
index c152d30c4b..b9b7763593 100644
--- a/lib/mayaUsd/render/pxrUsdMayaGL/usdProxyShapeAdapter.h
+++ b/lib/mayaUsd/render/pxrUsdMayaGL/usdProxyShapeAdapter.h
@@ -18,27 +18,24 @@
 
 /// \file pxrUsdMayaGL/usdProxyShapeAdapter.h
 
-#include "pxr/pxr.h"
-
-#include "../../base/api.h"
-#include "./shapeAdapter.h"
-
-#include "pxr/base/gf/matrix4d.h"
-#include "pxr/imaging/hd/renderIndex.h"
-#include "pxr/usd/sdf/path.h"
-#include "pxr/usd/usd/prim.h"
-#include "pxr/usdImaging/usdImaging/delegate.h"
+#include <memory>
 
 #include <maya/M3dView.h>
 #include <maya/MHWGeometryUtilities.h>
 #include <maya/MPxSurfaceShape.h>
 
-#include <memory>
+#include <pxr/pxr.h>
+#include <pxr/base/gf/matrix4d.h>
+#include <pxr/imaging/hd/renderIndex.h>
+#include <pxr/usd/sdf/path.h>
+#include <pxr/usd/usd/prim.h>
+#include <pxr/usdImaging/usdImaging/delegate.h>
 
+#include <mayaUsd/base/api.h>
+#include <mayaUsd/render/pxrUsdMayaGL/shapeAdapter.h>
 
 PXR_NAMESPACE_OPEN_SCOPE
 
-
 class UsdMayaProxyDrawOverride;
 class UsdMayaProxyShapeUI;
 
diff --git a/lib/mayaUsd/render/pxrUsdMayaGL/userData.cpp b/lib/mayaUsd/render/pxrUsdMayaGL/userData.cpp
index 49f8c7c0ad..740410d767 100644
--- a/lib/mayaUsd/render/pxrUsdMayaGL/userData.cpp
+++ b/lib/mayaUsd/render/pxrUsdMayaGL/userData.cpp
@@ -13,17 +13,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-#include "./userData.h"
-
-#include "pxr/pxr.h"
-#include "../../base/api.h"
+#include "userData.h"
 
 #include <maya/MUserData.h>
 
+#include <pxr/pxr.h>
 
 PXR_NAMESPACE_OPEN_SCOPE
 
-
 /// Note that we set deleteAfterUse=false when calling the MUserData
 /// constructor. This ensures that the draw data survives across multiple draw
 /// passes in Viewport 2.0 (e.g. a shadow pass and a color pass).
diff --git a/lib/mayaUsd/render/pxrUsdMayaGL/userData.h b/lib/mayaUsd/render/pxrUsdMayaGL/userData.h
index 2f4603addd..d2b05f42cb 100644
--- a/lib/mayaUsd/render/pxrUsdMayaGL/userData.h
+++ b/lib/mayaUsd/render/pxrUsdMayaGL/userData.h
@@ -18,20 +18,18 @@
 
 /// \file pxrUsdMayaGL/userData.h
 
-#include "pxr/pxr.h"
-#include "../../base/api.h"
-
-#include "pxr/base/gf/vec4f.h"
+#include <memory>
 
 #include <maya/MBoundingBox.h>
 #include <maya/MUserData.h>
 
-#include <memory>
+#include <pxr/pxr.h>
+#include <pxr/base/gf/vec4f.h>
 
+#include <mayaUsd/base/api.h>
 
 PXR_NAMESPACE_OPEN_SCOPE
 
-
 /// Container for all of the information needed for a draw request in the
 /// legacy viewport or Viewport 2.0, without requiring shape querying at draw
 /// time.
diff --git a/lib/mayaUsd/render/vp2RenderDelegate/CMakeLists.txt b/lib/mayaUsd/render/vp2RenderDelegate/CMakeLists.txt
index 4582c2887e..ef90e7db48 100644
--- a/lib/mayaUsd/render/vp2RenderDelegate/CMakeLists.txt
+++ b/lib/mayaUsd/render/vp2RenderDelegate/CMakeLists.txt
@@ -18,21 +18,7 @@ target_sources(${PROJECT_NAME}
 )
 
 set(headers
-    basisCurves.h
-    bboxGeom.h
-    debugCodes.h
-    draw_item.h
-    instancer.h
-    material.h
-    mesh.h
     proxyRenderDelegate.h
-    render_delegate.h
-    render_param.h
-    render_pass.h
-    resource_registry.h
-    sampler.h
-    task_commit.h
-    tokens.h
 )
 
 # -----------------------------------------------------------------------------
@@ -43,6 +29,6 @@ mayaUsd_promoteHeaderList(HEADERS ${headers} SUBDIR render/vp2RenderDelegate)
 # -----------------------------------------------------------------------------
 # install
 # -----------------------------------------------------------------------------
-install(FILES proxyRenderDelegate.h
+install(FILES ${headers}
     DESTINATION ${CMAKE_INSTALL_PREFIX}/include/${PROJECT_NAME}/render/vp2RenderDelegate
 )
diff --git a/lib/mayaUsd/render/vp2RenderDelegate/basisCurves.cpp b/lib/mayaUsd/render/vp2RenderDelegate/basisCurves.cpp
index b12f6b1580..dc151e644b 100644
--- a/lib/mayaUsd/render/vp2RenderDelegate/basisCurves.cpp
+++ b/lib/mayaUsd/render/vp2RenderDelegate/basisCurves.cpp
@@ -14,28 +14,27 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-
 #include "basisCurves.h"
+
+#include <maya/MMatrix.h>
+#include <maya/MProfiler.h>
+#include <maya/MSelectionMask.h>
+
+#include <pxr/base/gf/matrix4d.h>
+#include <pxr/base/gf/matrix4f.h>
+#include <pxr/base/vt/value.h>
+#include <pxr/imaging/hd/repr.h>
+#include <pxr/imaging/hd/sceneDelegate.h>
+#include <pxr/imaging/hd/tokens.h>
+
 #include "bboxGeom.h"
 #include "debugCodes.h"
 #include "draw_item.h"
-#include "material.h"
 #include "instancer.h"
+#include "material.h"
 #include "render_delegate.h"
 #include "tokens.h"
 
-#include "pxr/base/gf/matrix4d.h"
-#include "pxr/base/gf/matrix4f.h"
-#include "pxr/base/vt/value.h"
-
-#include "pxr/imaging/hd/repr.h"
-#include "pxr/imaging/hd/sceneDelegate.h"
-#include "pxr/imaging/hd/tokens.h"
-
-#include <maya/MMatrix.h>
-#include <maya/MProfiler.h>
-#include <maya/MSelectionMask.h>
-
 PXR_NAMESPACE_OPEN_SCOPE
 
 namespace {
diff --git a/lib/mayaUsd/render/vp2RenderDelegate/basisCurves.h b/lib/mayaUsd/render/vp2RenderDelegate/basisCurves.h
index 4c901fdc86..bfb2c6b319 100644
--- a/lib/mayaUsd/render/vp2RenderDelegate/basisCurves.h
+++ b/lib/mayaUsd/render/vp2RenderDelegate/basisCurves.h
@@ -13,21 +13,20 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-
 #ifndef HDVP2_BASIS_CURVES_H
 #define HDVP2_BASIS_CURVES_H
 
-#include "pxr/pxr.h"
-#include "pxr/base/vt/array.h"
-#include "pxr/imaging/hd/basisCurves.h"
-#include "pxr/imaging/hd/enums.h"
-#include "pxr/usd/sdf/path.h"
+#include <memory>
 
 #include <maya/MHWGeometry.h>
 
-#include "proxyRenderDelegate.h"
+#include <pxr/pxr.h>
+#include <pxr/base/vt/array.h>
+#include <pxr/imaging/hd/basisCurves.h>
+#include <pxr/imaging/hd/enums.h>
+#include <pxr/usd/sdf/path.h>
 
-#include <memory>
+#include <mayaUsd/render/vp2RenderDelegate/proxyRenderDelegate.h>
 
 PXR_NAMESPACE_OPEN_SCOPE
 
diff --git a/lib/mayaUsd/render/vp2RenderDelegate/bboxGeom.cpp b/lib/mayaUsd/render/vp2RenderDelegate/bboxGeom.cpp
index a6c169707a..e38dae004a 100644
--- a/lib/mayaUsd/render/vp2RenderDelegate/bboxGeom.cpp
+++ b/lib/mayaUsd/render/vp2RenderDelegate/bboxGeom.cpp
@@ -13,11 +13,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-
 #include "bboxGeom.h"
 
-#include "pxr/base/arch/threads.h"
-#include "pxr/base/tf/diagnostic.h"
+#include <pxr/base/arch/threads.h>
+#include <pxr/base/tf/diagnostic.h>
 
 PXR_NAMESPACE_OPEN_SCOPE
 
diff --git a/lib/mayaUsd/render/vp2RenderDelegate/bboxGeom.h b/lib/mayaUsd/render/vp2RenderDelegate/bboxGeom.h
index c7fa5e8622..74ef0efcf3 100644
--- a/lib/mayaUsd/render/vp2RenderDelegate/bboxGeom.h
+++ b/lib/mayaUsd/render/vp2RenderDelegate/bboxGeom.h
@@ -13,17 +13,16 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-
 #ifndef HD_VP2_BBOX_GEOM
 #define HD_VP2_BBOX_GEOM
 
-#include "maya/MHWGeometry.h"
-
-#include "pxr/pxr.h"
-#include "pxr/base/gf/range3d.h"
+#include <maya/MHWGeometry.h>
 
 #include <memory>
 
+#include <pxr/pxr.h>
+#include <pxr/base/gf/range3d.h>
+
 PXR_NAMESPACE_OPEN_SCOPE
 
 /*! \brief  Geometry used for bounding box display in VP2.
diff --git a/lib/mayaUsd/render/vp2RenderDelegate/debugCodes.cpp b/lib/mayaUsd/render/vp2RenderDelegate/debugCodes.cpp
index f0b5ca52db..c5c33d6d1d 100644
--- a/lib/mayaUsd/render/vp2RenderDelegate/debugCodes.cpp
+++ b/lib/mayaUsd/render/vp2RenderDelegate/debugCodes.cpp
@@ -13,10 +13,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-
 #include "debugCodes.h"
 
-#include "pxr/base/tf/registryManager.h"
+#include <pxr/base/tf/registryManager.h>
 
 PXR_NAMESPACE_OPEN_SCOPE
 
diff --git a/lib/mayaUsd/render/vp2RenderDelegate/debugCodes.h b/lib/mayaUsd/render/vp2RenderDelegate/debugCodes.h
index 77aa94e580..029c910adf 100644
--- a/lib/mayaUsd/render/vp2RenderDelegate/debugCodes.h
+++ b/lib/mayaUsd/render/vp2RenderDelegate/debugCodes.h
@@ -13,12 +13,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-
 #ifndef HD_VP2_DEBUGCODES_H
 #define HD_VP2_DEBUGCODES_H
 
-#include "pxr/pxr.h"
-#include "pxr/base/tf/debug.h"
+#include <pxr/pxr.h>
+
+#include <pxr/base/tf/debug.h>
 
 PXR_NAMESPACE_OPEN_SCOPE
 
diff --git a/lib/mayaUsd/render/vp2RenderDelegate/draw_item.cpp b/lib/mayaUsd/render/vp2RenderDelegate/draw_item.cpp
index 09bdb58235..918fd7195e 100644
--- a/lib/mayaUsd/render/vp2RenderDelegate/draw_item.cpp
+++ b/lib/mayaUsd/render/vp2RenderDelegate/draw_item.cpp
@@ -13,10 +13,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
+#include "draw_item.h"
 
-#include "pxr/imaging/hd/mesh.h"
+#include <pxr/imaging/hd/mesh.h>
 
-#include "draw_item.h"
 #include "render_delegate.h"
 
 PXR_NAMESPACE_OPEN_SCOPE
diff --git a/lib/mayaUsd/render/vp2RenderDelegate/draw_item.h b/lib/mayaUsd/render/vp2RenderDelegate/draw_item.h
index 2cbd72e56b..f9196bd8fc 100644
--- a/lib/mayaUsd/render/vp2RenderDelegate/draw_item.h
+++ b/lib/mayaUsd/render/vp2RenderDelegate/draw_item.h
@@ -13,22 +13,21 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-
 #ifndef HD_VP2_DRAW_ITEM
 #define HD_VP2_DRAW_ITEM
 
-#include "pxr/pxr.h"
-#include "pxr/base/gf/vec3f.h"
-#include "pxr/base/vt/array.h"
-#include "pxr/imaging/hd/drawItem.h"
-#include "pxr/imaging/hd/mesh.h"
-#include "pxr/usd/usd/timeCode.h"
-
 #include <maya/MBoundingBox.h>
 #include <maya/MHWGeometry.h>
 #include <maya/MMatrix.h>
 #include <maya/MString.h>
 
+#include <pxr/pxr.h>
+#include <pxr/base/gf/vec3f.h>
+#include <pxr/base/vt/array.h>
+#include <pxr/imaging/hd/drawItem.h>
+#include <pxr/imaging/hd/mesh.h>
+#include <pxr/usd/usd/timeCode.h>
+
 PXR_NAMESPACE_OPEN_SCOPE
 
 class HdVP2RenderDelegate;
diff --git a/lib/mayaUsd/render/vp2RenderDelegate/instancer.cpp b/lib/mayaUsd/render/vp2RenderDelegate/instancer.cpp
index 5e3f5e60dc..c4b4b84e6f 100644
--- a/lib/mayaUsd/render/vp2RenderDelegate/instancer.cpp
+++ b/lib/mayaUsd/render/vp2RenderDelegate/instancer.cpp
@@ -15,19 +15,19 @@
 //
 // Modifications copyright (C) 2019 Autodesk
 //
-#include "pxr/imaging/glf/glew.h"
+#include <pxr/imaging/glf/glew.h>
 
 #include "instancer.h"
-#include "sampler.h"
 
-#include "pxr/imaging/hd/sceneDelegate.h"
+#include <pxr/base/gf/matrix4d.h>
+#include <pxr/base/gf/quaternion.h>
+#include <pxr/base/gf/rotation.h>
+#include <pxr/base/gf/vec3f.h>
+#include <pxr/base/gf/vec4f.h>
+#include <pxr/base/tf/staticTokens.h>
+#include <pxr/imaging/hd/sceneDelegate.h>
 
-#include "pxr/base/gf/vec3f.h"
-#include "pxr/base/gf/vec4f.h"
-#include "pxr/base/gf/matrix4d.h"
-#include "pxr/base/gf/rotation.h"
-#include "pxr/base/gf/quaternion.h"
-#include "pxr/base/tf/staticTokens.h"
+#include "sampler.h"
 
 PXR_NAMESPACE_OPEN_SCOPE
 
diff --git a/lib/mayaUsd/render/vp2RenderDelegate/instancer.h b/lib/mayaUsd/render/vp2RenderDelegate/instancer.h
index c1807fedf6..4cda3e674c 100644
--- a/lib/mayaUsd/render/vp2RenderDelegate/instancer.h
+++ b/lib/mayaUsd/render/vp2RenderDelegate/instancer.h
@@ -18,16 +18,14 @@
 #ifndef HD_VP2_INSTANCER
 #define HD_VP2_INSTANCER
 
-#include "pxr/pxr.h"
-
-#include "pxr/imaging/hd/instancer.h"
-#include "pxr/imaging/hd/vtBufferSource.h"
-
-#include "pxr/base/tf/hashmap.h"
-#include "pxr/base/tf/token.h"
-
 #include <mutex>
 
+#include <pxr/pxr.h>
+#include <pxr/base/tf/hashmap.h>
+#include <pxr/base/tf/token.h>
+#include <pxr/imaging/hd/instancer.h>
+#include <pxr/imaging/hd/vtBufferSource.h>
+
 PXR_NAMESPACE_OPEN_SCOPE
 
 /*! \brief  VP2 instancing of prototype geometry with varying transforms
diff --git a/lib/mayaUsd/render/vp2RenderDelegate/material.cpp b/lib/mayaUsd/render/vp2RenderDelegate/material.cpp
index 33b1e135e9..5724805c64 100644
--- a/lib/mayaUsd/render/vp2RenderDelegate/material.cpp
+++ b/lib/mayaUsd/render/vp2RenderDelegate/material.cpp
@@ -13,40 +13,38 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-
-#include "debugCodes.h"
 #include "material.h"
-#include "render_delegate.h"
 
-#include "pxr/imaging/glf/image.h"
-#include "pxr/imaging/hd/sceneDelegate.h"
-#include "pxr/usd/ar/packageUtils.h"
-#include "pxr/usd/sdf/assetPath.h"
-#include "pxr/usd/usdHydra/tokens.h"
-#include "pxr/usdImaging/usdImaging/tokens.h"
+#include <iostream>
+#include <string>
 
-#include "pxr/base/gf/vec2f.h"
-#include "pxr/base/gf/vec3f.h"
-#include "pxr/base/gf/vec4f.h"
-#include "pxr/base/gf/matrix4d.h"
-#include "pxr/base/gf/matrix4f.h"
-#include "pxr/base/tf/diagnostic.h"
+#include <boost/filesystem.hpp>
 
+#include <maya/MFragmentManager.h>
 #include <maya/MProfiler.h>
+#include <maya/MShaderManager.h>
 #include <maya/MStatus.h>
 #include <maya/MString.h>
 #include <maya/MStringArray.h>
+#include <maya/MTextureManager.h>
 #include <maya/MUintArray.h>
 #include <maya/MViewport2Renderer.h>
-#include <maya/MFragmentManager.h>
-#include <maya/MShaderManager.h>
-#include <maya/MTextureManager.h>
 
-#include <boost/filesystem.hpp>
-
-#include <iostream>
-#include <string>
+#include <pxr/base/gf/matrix4d.h>
+#include <pxr/base/gf/matrix4f.h>
+#include <pxr/base/gf/vec2f.h>
+#include <pxr/base/gf/vec3f.h>
+#include <pxr/base/gf/vec4f.h>
+#include <pxr/base/tf/diagnostic.h>
+#include <pxr/imaging/glf/image.h>
+#include <pxr/imaging/hd/sceneDelegate.h>
+#include <pxr/usd/ar/packageUtils.h>
+#include <pxr/usd/sdf/assetPath.h>
+#include <pxr/usd/usdHydra/tokens.h>
+#include <pxr/usdImaging/usdImaging/tokens.h>
 
+#include "debugCodes.h"
+#include "render_delegate.h"
 
 PXR_NAMESPACE_OPEN_SCOPE
 
diff --git a/lib/mayaUsd/render/vp2RenderDelegate/material.h b/lib/mayaUsd/render/vp2RenderDelegate/material.h
index ea66c7c7fb..f5bc82ab7c 100644
--- a/lib/mayaUsd/render/vp2RenderDelegate/material.h
+++ b/lib/mayaUsd/render/vp2RenderDelegate/material.h
@@ -13,16 +13,15 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-
 #ifndef HD_VP2_MATERIAL
 #define HD_VP2_MATERIAL
 
-#include "pxr/pxr.h"
-#include "pxr/imaging/hd/material.h"
+#include <unordered_map>
 
 #include <maya/MShaderManager.h>
 
-#include <unordered_map>
+#include <pxr/pxr.h>
+#include <pxr/imaging/hd/material.h>
 
 PXR_NAMESPACE_OPEN_SCOPE
 
diff --git a/lib/mayaUsd/render/vp2RenderDelegate/mesh.cpp b/lib/mayaUsd/render/vp2RenderDelegate/mesh.cpp
index 96836ca7d7..b2ad96db8e 100644
--- a/lib/mayaUsd/render/vp2RenderDelegate/mesh.cpp
+++ b/lib/mayaUsd/render/vp2RenderDelegate/mesh.cpp
@@ -13,28 +13,29 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-
 #include "mesh.h"
+
+#include <numeric>
+
+#include <maya/MMatrix.h>
+#include <maya/MProfiler.h>
+#include <maya/MSelectionMask.h>
+
+#include <pxr/base/gf/matrix4d.h>
+#include <pxr/imaging/hd/meshUtil.h>
+#include <pxr/imaging/hd/sceneDelegate.h>
+#include <pxr/imaging/hd/smoothNormals.h>
+#include <pxr/imaging/hd/vertexAdjacency.h>
+
 #include "bboxGeom.h"
 #include "debugCodes.h"
 #include "draw_item.h"
-#include "material.h"
 #include "instancer.h"
-#include "proxyRenderDelegate.h"
+#include "material.h"
 #include "render_delegate.h"
 #include "tokens.h"
 
-#include "pxr/base/gf/matrix4d.h"
-#include "pxr/imaging/hd/sceneDelegate.h"
-#include "pxr/imaging/hd/meshUtil.h"
-#include "pxr/imaging/hd/smoothNormals.h"
-#include "pxr/imaging/hd/vertexAdjacency.h"
-
-#include <maya/MMatrix.h>
-#include <maya/MProfiler.h>
-#include <maya/MSelectionMask.h>
-
-#include <numeric>
+#include <mayaUsd/render/vp2RenderDelegate/proxyRenderDelegate.h>
 
 PXR_NAMESPACE_OPEN_SCOPE
 
diff --git a/lib/mayaUsd/render/vp2RenderDelegate/mesh.h b/lib/mayaUsd/render/vp2RenderDelegate/mesh.h
index 6c39d83bb9..697234f3c7 100644
--- a/lib/mayaUsd/render/vp2RenderDelegate/mesh.h
+++ b/lib/mayaUsd/render/vp2RenderDelegate/mesh.h
@@ -13,16 +13,15 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-
 #ifndef HD_VP2_MESH
 #define HD_VP2_MESH
 
-#include "pxr/pxr.h"
-#include "pxr/imaging/hd/mesh.h"
-
 #include <maya/MHWGeometry.h>
 
-#include "proxyRenderDelegate.h"
+#include <pxr/pxr.h>
+#include <pxr/imaging/hd/mesh.h>
+
+#include <mayaUsd/render/vp2RenderDelegate/proxyRenderDelegate.h>
 
 PXR_NAMESPACE_OPEN_SCOPE
 
diff --git a/lib/mayaUsd/render/vp2RenderDelegate/proxyRenderDelegate.cpp b/lib/mayaUsd/render/vp2RenderDelegate/proxyRenderDelegate.cpp
index 76b5a7ca34..b29580d81c 100644
--- a/lib/mayaUsd/render/vp2RenderDelegate/proxyRenderDelegate.cpp
+++ b/lib/mayaUsd/render/vp2RenderDelegate/proxyRenderDelegate.cpp
@@ -13,26 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-
 #include "proxyRenderDelegate.h"
-#include "render_delegate.h"
-#include "tokens.h"
-
-#include "pxr/base/tf/diagnostic.h"
-#include "pxr/base/tf/stringUtils.h"
-#include "pxr/usdImaging/usdImaging/delegate.h"
-#include "pxr/imaging/hdx/renderTask.h"
-#include "pxr/imaging/hdx/selectionTracker.h"
-#include "pxr/imaging/hdx/taskController.h"
-#include "pxr/imaging/hd/basisCurves.h"
-#include "pxr/imaging/hd/enums.h"
-#include "pxr/imaging/hd/mesh.h"
-#include "pxr/imaging/hd/repr.h"
-#include "pxr/imaging/hd/rprimCollection.h"
-
-#include "../../nodes/proxyShapeBase.h"
-#include "../../nodes/stageData.h"
-#include "../../utils/util.h"
 
 #include <maya/MFileIO.h>
 #include <maya/MFnPluginData.h>
@@ -41,6 +22,25 @@
 #include <maya/MProfiler.h>
 #include <maya/MSelectionContext.h>
 
+#include <pxr/base/tf/diagnostic.h>
+#include <pxr/base/tf/stringUtils.h>
+#include <pxr/usdImaging/usdImaging/delegate.h>
+#include <pxr/imaging/hdx/renderTask.h>
+#include <pxr/imaging/hdx/selectionTracker.h>
+#include <pxr/imaging/hdx/taskController.h>
+#include <pxr/imaging/hd/basisCurves.h>
+#include <pxr/imaging/hd/enums.h>
+#include <pxr/imaging/hd/mesh.h>
+#include <pxr/imaging/hd/repr.h>
+#include <pxr/imaging/hd/rprimCollection.h>
+
+#include <mayaUsd/nodes/proxyShapeBase.h>
+#include <mayaUsd/nodes/stageData.h>
+#include <mayaUsd/utils/util.h>
+
+#include "render_delegate.h"
+#include "tokens.h"
+
 #if defined(WANT_UFE_BUILD)
 #include <ufe/sceneItem.h>
 #include <ufe/runTimeMgr.h>
diff --git a/lib/mayaUsd/render/vp2RenderDelegate/proxyRenderDelegate.h b/lib/mayaUsd/render/vp2RenderDelegate/proxyRenderDelegate.h
index 43c3cc8a8f..7a0805092e 100644
--- a/lib/mayaUsd/render/vp2RenderDelegate/proxyRenderDelegate.h
+++ b/lib/mayaUsd/render/vp2RenderDelegate/proxyRenderDelegate.h
@@ -13,19 +13,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-
 #ifndef PROXY_RENDER_DELEGATE
 #define PROXY_RENDER_DELEGATE
 
-#include "pxr/pxr.h"
-
-#include "pxr/imaging/hd/engine.h"
-#include "pxr/imaging/hd/selection.h"
-#include "pxr/imaging/hd/task.h"
-#include "pxr/usd/sdf/path.h"
-#include "pxr/usd/usd/prim.h"
-
-#include "../../base/api.h"
+#include <memory>
 
 #include <maya/MDagPath.h>
 #include <maya/MDrawContext.h>
@@ -35,7 +26,14 @@
 #include <maya/MObject.h>
 #include <maya/MPxSubSceneOverride.h>
 
-#include <memory>
+#include <pxr/pxr.h>
+#include <pxr/imaging/hd/engine.h>
+#include <pxr/imaging/hd/selection.h>
+#include <pxr/imaging/hd/task.h>
+#include <pxr/usd/sdf/path.h>
+#include <pxr/usd/usd/prim.h>
+
+#include <mayaUsd/base/api.h>
 
 #if defined(WANT_UFE_BUILD)
 #include <ufe/observer.h>
diff --git a/lib/mayaUsd/render/vp2RenderDelegate/render_delegate.cpp b/lib/mayaUsd/render/vp2RenderDelegate/render_delegate.cpp
index 7cf91c912a..adc769522f 100644
--- a/lib/mayaUsd/render/vp2RenderDelegate/render_delegate.cpp
+++ b/lib/mayaUsd/render/vp2RenderDelegate/render_delegate.cpp
@@ -13,31 +13,30 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-
 #include "render_delegate.h"
 
-#include "basisCurves.h"
-#include "bboxGeom.h"
-#include "material.h"
-#include "mesh.h"
+#include <unordered_map>
 
-#include "render_pass.h"
-#include "instancer.h"
+#include <tbb/spin_rw_mutex.h>
+#include <tbb/reader_writer_lock.h>
 
-#include "pxr/imaging/hd/bprim.h"
-#include "pxr/imaging/hd/camera.h"
-#include "pxr/imaging/hd/instancer.h"
-#include "pxr/imaging/hd/resourceRegistry.h"
-#include "pxr/imaging/hd/rprim.h"
-#include "pxr/imaging/hd/tokens.h"
+#include <boost/functional/hash.hpp>
 
 #include <maya/MProfiler.h>
 
-#include <unordered_map>
+#include <pxr/imaging/hd/bprim.h>
+#include <pxr/imaging/hd/camera.h>
+#include <pxr/imaging/hd/instancer.h>
+#include <pxr/imaging/hd/resourceRegistry.h>
+#include <pxr/imaging/hd/rprim.h>
+#include <pxr/imaging/hd/tokens.h>
 
-#include "tbb/spin_rw_mutex.h"
-#include <tbb/reader_writer_lock.h>
-#include <boost/functional/hash.hpp>
+#include "basisCurves.h"
+#include "bboxGeom.h"
+#include "instancer.h"
+#include "material.h"
+#include "mesh.h"
+#include "render_pass.h"
 
 PXR_NAMESPACE_OPEN_SCOPE
 
diff --git a/lib/mayaUsd/render/vp2RenderDelegate/render_delegate.h b/lib/mayaUsd/render/vp2RenderDelegate/render_delegate.h
index 0cf7736df9..f0c2c19ee5 100644
--- a/lib/mayaUsd/render/vp2RenderDelegate/render_delegate.h
+++ b/lib/mayaUsd/render/vp2RenderDelegate/render_delegate.h
@@ -13,22 +13,21 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-
 #ifndef HD_VP2_RENDER_DELEGATE
 #define HD_VP2_RENDER_DELEGATE
 
-#include "pxr/pxr.h"
-#include "pxr/imaging/hd/renderDelegate.h"
-#include "pxr/imaging/hd/resourceRegistry.h"
-
-#include "render_param.h"
-#include "resource_registry.h"
+#include <mutex>
+#include <atomic>
 
 #include <maya/MString.h>
 #include <maya/MShaderManager.h>
 
-#include <mutex>
-#include <atomic>
+#include <pxr/pxr.h>
+#include <pxr/imaging/hd/renderDelegate.h>
+#include <pxr/imaging/hd/resourceRegistry.h>
+
+#include "render_param.h"
+#include "resource_registry.h"
 
 PXR_NAMESPACE_OPEN_SCOPE
 
diff --git a/lib/mayaUsd/render/vp2RenderDelegate/render_param.cpp b/lib/mayaUsd/render/vp2RenderDelegate/render_param.cpp
index 3aa1f99ded..d155c0383f 100644
--- a/lib/mayaUsd/render/vp2RenderDelegate/render_param.cpp
+++ b/lib/mayaUsd/render/vp2RenderDelegate/render_param.cpp
@@ -13,7 +13,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-
 #include "render_param.h"
 
 #include <maya/MProfiler.h>
diff --git a/lib/mayaUsd/render/vp2RenderDelegate/render_param.h b/lib/mayaUsd/render/vp2RenderDelegate/render_param.h
index 47cc8413c7..02cbddf817 100644
--- a/lib/mayaUsd/render/vp2RenderDelegate/render_param.h
+++ b/lib/mayaUsd/render/vp2RenderDelegate/render_param.h
@@ -13,17 +13,15 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-
 #ifndef HD_VP2_RENDER_PARAM
 #define HD_VP2_RENDER_PARAM
 
-#include "pxr/pxr.h"
-
-#include "pxr/imaging/hd/renderDelegate.h"
-#include "pxr/usd/usd/timeCode.h"
-
 #include <maya/MPxSubSceneOverride.h>
 
+#include <pxr/pxr.h>
+#include <pxr/imaging/hd/renderDelegate.h>
+#include <pxr/usd/usd/timeCode.h>
+
 PXR_NAMESPACE_OPEN_SCOPE
 
 class ProxyRenderDelegate;
diff --git a/lib/mayaUsd/render/vp2RenderDelegate/render_pass.h b/lib/mayaUsd/render/vp2RenderDelegate/render_pass.h
index 5b0c4236a6..58933d4839 100644
--- a/lib/mayaUsd/render/vp2RenderDelegate/render_pass.h
+++ b/lib/mayaUsd/render/vp2RenderDelegate/render_pass.h
@@ -13,12 +13,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-
 #ifndef HD_VP2_RENDER_PASS
 #define HD_VP2_RENDER_PASS
 
-#include "pxr/pxr.h"
-#include "pxr/imaging/hd/renderPass.h"
+#include <pxr/pxr.h>
+
+#include <pxr/imaging/hd/renderPass.h>
 
 PXR_NAMESPACE_OPEN_SCOPE
 
diff --git a/lib/mayaUsd/render/vp2RenderDelegate/resource_registry.h b/lib/mayaUsd/render/vp2RenderDelegate/resource_registry.h
index afc52e59aa..eea61f8926 100644
--- a/lib/mayaUsd/render/vp2RenderDelegate/resource_registry.h
+++ b/lib/mayaUsd/render/vp2RenderDelegate/resource_registry.h
@@ -13,15 +13,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-
 #ifndef HD_VP2_RESOURCE_REGISTRY
 #define HD_VP2_RESOURCE_REGISTRY
 
-#include "task_commit.h"
-
 #include <tbb/concurrent_queue.h>
 #include <tbb/tbb_allocator.h>
 
+#include "task_commit.h"
+
 PXR_NAMESPACE_OPEN_SCOPE
 
 /*! \brief  Central place to manage GPU resources commits and any resources not managed by VP2 directly
diff --git a/lib/mayaUsd/render/vp2RenderDelegate/sampler.h b/lib/mayaUsd/render/vp2RenderDelegate/sampler.h
index 342a1e2737..274547f2df 100644
--- a/lib/mayaUsd/render/vp2RenderDelegate/sampler.h
+++ b/lib/mayaUsd/render/vp2RenderDelegate/sampler.h
@@ -18,25 +18,23 @@
 #ifndef HD_VP2_SAMPLER_H
 #define HD_VP2_SAMPLER_H
 
-#include "pxr/pxr.h"
 #include <cstddef>
 
-#include "pxr/imaging/glf/glew.h"
-
-#include "pxr/imaging/hd/enums.h"
-#include "pxr/imaging/hd/vtBufferSource.h"
-
-#include "pxr/base/gf/matrix4d.h"
-#include "pxr/base/gf/matrix4f.h"
-#include "pxr/base/gf/vec2d.h"
-#include "pxr/base/gf/vec2f.h"
-#include "pxr/base/gf/vec2i.h"
-#include "pxr/base/gf/vec3d.h"
-#include "pxr/base/gf/vec3f.h"
-#include "pxr/base/gf/vec3i.h"
-#include "pxr/base/gf/vec4d.h"
-#include "pxr/base/gf/vec4f.h"
-#include "pxr/base/gf/vec4i.h"
+#include <pxr/pxr.h>
+#include <pxr/base/gf/matrix4d.h>
+#include <pxr/base/gf/matrix4f.h>
+#include <pxr/base/gf/vec2d.h>
+#include <pxr/base/gf/vec2f.h>
+#include <pxr/base/gf/vec2i.h>
+#include <pxr/base/gf/vec3d.h>
+#include <pxr/base/gf/vec3f.h>
+#include <pxr/base/gf/vec3i.h>
+#include <pxr/base/gf/vec4d.h>
+#include <pxr/base/gf/vec4f.h>
+#include <pxr/base/gf/vec4i.h>
+#include <pxr/imaging/glf/glew.h>
+#include <pxr/imaging/hd/enums.h>
+#include <pxr/imaging/hd/vtBufferSource.h>
 
 PXR_NAMESPACE_OPEN_SCOPE
 
diff --git a/lib/mayaUsd/render/vp2RenderDelegate/task_commit.h b/lib/mayaUsd/render/vp2RenderDelegate/task_commit.h
index 88d8a5310e..108da6da24 100644
--- a/lib/mayaUsd/render/vp2RenderDelegate/task_commit.h
+++ b/lib/mayaUsd/render/vp2RenderDelegate/task_commit.h
@@ -13,7 +13,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-
 #ifndef HD_VP2_TASK_COMMIT
 #define HD_VP2_TASK_COMMIT
 
diff --git a/lib/mayaUsd/render/vp2RenderDelegate/tokens.cpp b/lib/mayaUsd/render/vp2RenderDelegate/tokens.cpp
index 1b7f485be6..6a86d597d5 100644
--- a/lib/mayaUsd/render/vp2RenderDelegate/tokens.cpp
+++ b/lib/mayaUsd/render/vp2RenderDelegate/tokens.cpp
@@ -13,7 +13,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-
 #include "tokens.h"
 
 PXR_NAMESPACE_OPEN_SCOPE
diff --git a/lib/mayaUsd/render/vp2RenderDelegate/tokens.h b/lib/mayaUsd/render/vp2RenderDelegate/tokens.h
index 59780b8f7b..67ff2fc241 100644
--- a/lib/mayaUsd/render/vp2RenderDelegate/tokens.h
+++ b/lib/mayaUsd/render/vp2RenderDelegate/tokens.h
@@ -13,12 +13,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-
 #ifndef HD_VP2_TOKENS_H
 #define HD_VP2_TOKENS_H
 
-#include "pxr/pxr.h"
-#include "pxr/base/tf/staticTokens.h"
+#include <pxr/pxr.h>
+
+#include <pxr/base/tf/staticTokens.h>
 
 PXR_NAMESPACE_OPEN_SCOPE
 
diff --git a/lib/mayaUsd/render/vp2ShaderFragments/shaderFragments.cpp b/lib/mayaUsd/render/vp2ShaderFragments/shaderFragments.cpp
index 8e74e71991..f8f43790d3 100644
--- a/lib/mayaUsd/render/vp2ShaderFragments/shaderFragments.cpp
+++ b/lib/mayaUsd/render/vp2ShaderFragments/shaderFragments.cpp
@@ -13,19 +13,17 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-
 #include "shaderFragments.h"
 
-#include "pxr/base/plug/plugin.h"
-#include "pxr/base/plug/thisPlugin.h"
-#include "pxr/base/tf/stringUtils.h"
-
-#include "pxr/usdImaging/usdImaging/tokens.h"
-
-#include <maya/MGlobal.h>
-#include <maya/MViewport2Renderer.h>
 #include <maya/MFragmentManager.h>
+#include <maya/MGlobal.h>
 #include <maya/MShaderManager.h>
+#include <maya/MViewport2Renderer.h>
+
+#include <pxr/base/plug/plugin.h>
+#include <pxr/base/plug/thisPlugin.h>
+#include <pxr/base/tf/stringUtils.h>
+#include <pxr/usdImaging/usdImaging/tokens.h>
 
 PXR_NAMESPACE_OPEN_SCOPE
 
diff --git a/lib/mayaUsd/render/vp2ShaderFragments/shaderFragments.h b/lib/mayaUsd/render/vp2ShaderFragments/shaderFragments.h
index 7c4db7a285..1fe597e8a0 100644
--- a/lib/mayaUsd/render/vp2ShaderFragments/shaderFragments.h
+++ b/lib/mayaUsd/render/vp2ShaderFragments/shaderFragments.h
@@ -13,11 +13,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-
 #ifndef HD_VP2_SHADER_FRAGMENTS
 #define HD_VP2_SHADER_FRAGMENTS
 
-#include "pxr/pxr.h"
+#include <pxr/pxr.h>
 
 #include <maya/MStatus.h>
 
diff --git a/lib/mayaUsd/ufe/Global.cpp b/lib/mayaUsd/ufe/Global.cpp
index 98973309df..a360205276 100644
--- a/lib/mayaUsd/ufe/Global.cpp
+++ b/lib/mayaUsd/ufe/Global.cpp
@@ -13,18 +13,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-
 #include "Global.h"
-#include "ProxyShapeHandler.h"
-#include "StagesSubject.h"
-#include "private/InPathChange.h"
-#include "UsdHierarchyHandler.h"
-#include "UsdTransform3dHandler.h"
-#include "UsdSceneItemOpsHandler.h"
 
-#include <ufe/runTimeMgr.h>
+#include <string>
+#include <cassert>
+
 #include <ufe/hierarchyHandler.h>
-#include <ufe/ProxyShapeHierarchyHandler.h>
+#include <ufe/runTimeMgr.h>
 
 #ifdef UFE_V2_FEATURES_AVAILABLE
 // Note: must come after include of ufe files so we have the define.
@@ -37,8 +32,13 @@
 #include "UfeVersionCompat.h"
 #endif
 
-#include <string>
-#include <cassert>
+#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/Global.h b/lib/mayaUsd/ufe/Global.h
index 2179b522fe..85f09c3ab6 100644
--- a/lib/mayaUsd/ufe/Global.h
+++ b/lib/mayaUsd/ufe/Global.h
@@ -15,11 +15,11 @@
 //
 #pragma once
 
-#include "../base/api.h"
+#include <maya/MStatus.h>
 
 #include <ufe/rtid.h>
 
-#include <maya/MStatus.h>
+#include <mayaUsd/base/api.h>
 
 MAYAUSD_NS_DEF {
 namespace ufe {
diff --git a/lib/mayaUsd/ufe/ProxyShapeHandler.cpp b/lib/mayaUsd/ufe/ProxyShapeHandler.cpp
index a78c009f6c..4515469a23 100644
--- a/lib/mayaUsd/ufe/ProxyShapeHandler.cpp
+++ b/lib/mayaUsd/ufe/ProxyShapeHandler.cpp
@@ -13,15 +13,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-
 #include "ProxyShapeHandler.h"
 
-#include "../utils/query.h"
-
 #include <maya/MGlobal.h>
 #include <maya/MString.h>
 #include <maya/MStringArray.h>
 
+#include <mayaUsd/utils/query.h>
+
 MAYAUSD_NS_DEF {
 namespace ufe {
 
diff --git a/lib/mayaUsd/ufe/ProxyShapeHandler.h b/lib/mayaUsd/ufe/ProxyShapeHandler.h
index 941ec0fc04..96e77d0e5e 100644
--- a/lib/mayaUsd/ufe/ProxyShapeHandler.h
+++ b/lib/mayaUsd/ufe/ProxyShapeHandler.h
@@ -15,13 +15,13 @@
 //
 #pragma once
 
-#include "../base/api.h"
+#include <string>
+#include <vector>
 
 #include <pxr/pxr.h>
 #include <pxr/usd/usd/prim.h>
 
-#include <string>
-#include <vector>
+#include <mayaUsd/base/api.h>
 
 PXR_NAMESPACE_USING_DIRECTIVE
 
diff --git a/lib/mayaUsd/ufe/ProxyShapeHierarchy.cpp b/lib/mayaUsd/ufe/ProxyShapeHierarchy.cpp
index 1ca4ff52f1..b40298c701 100644
--- a/lib/mayaUsd/ufe/ProxyShapeHierarchy.cpp
+++ b/lib/mayaUsd/ufe/ProxyShapeHierarchy.cpp
@@ -13,9 +13,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-
 #include "ProxyShapeHierarchy.h"
-#include "Utils.h"
+
+#include <stdexcept>
 
 #include <ufe/log.h>
 #include <ufe/pathComponent.h>
@@ -24,7 +24,7 @@
 
 #include <pxr/usd/usd/stage.h>
 
-#include <stdexcept>
+#include <mayaUsd/ufe/Utils.h>
 
 MAYAUSD_NS_DEF {
 namespace ufe {
diff --git a/lib/mayaUsd/ufe/ProxyShapeHierarchy.h b/lib/mayaUsd/ufe/ProxyShapeHierarchy.h
index 61f25dfa84..e0f099046d 100644
--- a/lib/mayaUsd/ufe/ProxyShapeHierarchy.h
+++ b/lib/mayaUsd/ufe/ProxyShapeHierarchy.h
@@ -15,13 +15,12 @@
 //
 #pragma once
 
-#include "../base/api.h"
-
-#include "UsdSceneItem.h"
-
 #include <ufe/hierarchy.h>
 #include <ufe/hierarchyHandler.h>
 
+#include <mayaUsd/base/api.h>
+#include <mayaUsd/ufe/UsdSceneItem.h>
+
 PXR_NAMESPACE_USING_DIRECTIVE
 
 MAYAUSD_NS_DEF {
diff --git a/lib/mayaUsd/ufe/ProxyShapeHierarchyHandler.cpp b/lib/mayaUsd/ufe/ProxyShapeHierarchyHandler.cpp
index 9c62e9e369..3cde93795a 100644
--- a/lib/mayaUsd/ufe/ProxyShapeHierarchyHandler.cpp
+++ b/lib/mayaUsd/ufe/ProxyShapeHierarchyHandler.cpp
@@ -13,11 +13,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-
 #include "ProxyShapeHierarchyHandler.h"
-#include "Utils.h"
 
-#include <ufe/ProxyShapeHierarchy.h>
+#include <mayaUsd/ufe/ProxyShapeHierarchy.h>
+#include <mayaUsd/ufe/Utils.h>
 
 MAYAUSD_NS_DEF {
 namespace ufe {
diff --git a/lib/mayaUsd/ufe/ProxyShapeHierarchyHandler.h b/lib/mayaUsd/ufe/ProxyShapeHierarchyHandler.h
index 62f129e5b3..7c1bc1a3d3 100644
--- a/lib/mayaUsd/ufe/ProxyShapeHierarchyHandler.h
+++ b/lib/mayaUsd/ufe/ProxyShapeHierarchyHandler.h
@@ -15,10 +15,10 @@
 //
 #pragma once
 
-#include "../base/api.h"
-
 #include <ufe/hierarchyHandler.h>
 
+#include <mayaUsd/base/api.h>
+
 MAYAUSD_NS_DEF {
 namespace ufe {
 
diff --git a/lib/mayaUsd/ufe/StagesSubject.cpp b/lib/mayaUsd/ufe/StagesSubject.cpp
index 287bc97c2d..cebb46d3d0 100644
--- a/lib/mayaUsd/ufe/StagesSubject.cpp
+++ b/lib/mayaUsd/ufe/StagesSubject.cpp
@@ -13,12 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-
 #include "StagesSubject.h"
-#include "Utils.h"
-#include "UsdStageMap.h"
-#include "ProxyShapeHandler.h"
-#include "private/InPathChange.h"
 
 #ifdef UFE_V2_FEATURES_AVAILABLE
 #include <ufe/attributes.h>
@@ -33,19 +28,24 @@
 #if UFE_PREVIEW_VERSION_NUM >= 2010
 #include <ufe/object3dNotification.h>
 #endif
+#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 <vector>
+#include <mayaUsd/ufe/ProxyShapeHandler.h>
+#include <mayaUsd/ufe/UsdStageMap.h>
+#include <mayaUsd/ufe/Utils.h>
 
-#ifdef UFE_V2_FEATURES_AVAILABLE
-#include <unordered_map>
+#include "private/InPathChange.h"
 
+#ifdef UFE_V2_FEATURES_AVAILABLE
 namespace {
 
 // The attribute change notification guard is not meant to be nested, but
diff --git a/lib/mayaUsd/ufe/StagesSubject.h b/lib/mayaUsd/ufe/StagesSubject.h
index 840658398f..d8d6917d8f 100644
--- a/lib/mayaUsd/ufe/StagesSubject.h
+++ b/lib/mayaUsd/ufe/StagesSubject.h
@@ -15,8 +15,9 @@
 //
 #pragma once
 
-#include "../base/api.h"
-#include "../listeners/proxyShapeNotice.h"
+#include <maya/MCallbackIdArray.h>
+
+#include <ufe/ufe.h>            // For UFE_V2_FEATURES_AVAILABLE
 
 #include <pxr/base/tf/weakBase.h>
 #include <pxr/usd/usd/stage.h>
@@ -24,9 +25,8 @@
 #include <pxr/base/tf/notice.h>
 #include <pxr/usd/usd/notice.h>
 
-#include <maya/MCallbackIdArray.h>
-
-#include <ufe/ufe.h>            // For UFE_V2_FEATURES_AVAILABLE
+#include <mayaUsd/base/api.h>
+#include <mayaUsd/listeners/proxyShapeNotice.h>
 
 PXR_NAMESPACE_USING_DIRECTIVE
 
diff --git a/lib/mayaUsd/ufe/UsdAttribute.cpp b/lib/mayaUsd/ufe/UsdAttribute.cpp
index 86b948a659..200f34fd63 100644
--- a/lib/mayaUsd/ufe/UsdAttribute.cpp
+++ b/lib/mayaUsd/ufe/UsdAttribute.cpp
@@ -13,23 +13,23 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-
 #include "UsdAttribute.h"
-#include "StagesSubject.h"
+
+#include <iostream>
+#include <unordered_map>
+#include <unordered_set>
 
 #include <pxr/base/tf/token.h>
 #include <pxr/base/vt/value.h>
-#include <pxr/usd/usd/schemaRegistry.h>
 #include <pxr/usd/sdf/attributeSpec.h>
+#include <pxr/usd/usd/schemaRegistry.h>
 
 // We unconditionally want the UFE asserts here (even in release builds).
 // The UFE_ASSERT_MSG has a built-in throw which we want to use for error handling.
 #define UFE_ENABLE_ASSERTS
 #include <ufe/ufeAssert.h>
 
-#include <unordered_map>
-#include <unordered_set>
-#include <iostream>
+#include <mayaUsd/ufe/StagesSubject.h>
 
 // Note: normally we would use this using directive, but here we cannot because
 //		 our class is called UsdAttribute which is exactly the same as the one
diff --git a/lib/mayaUsd/ufe/UsdAttribute.h b/lib/mayaUsd/ufe/UsdAttribute.h
index 46e77a44cb..ab1e2a6c3d 100644
--- a/lib/mayaUsd/ufe/UsdAttribute.h
+++ b/lib/mayaUsd/ufe/UsdAttribute.h
@@ -15,13 +15,13 @@
 //
 #pragma once
 
-#include "UsdSceneItem.h"
-
 #include <ufe/attribute.h>
 
 #include <pxr/usd/usd/prim.h>
 #include <pxr/usd/usd/attribute.h>
 
+#include <mayaUsd/ufe/UsdSceneItem.h>
+
 // Ufe::Attribute overrides (minus the type method)
 #define UFE_ATTRIBUTE_OVERRIDES																\
 	bool hasValue() const override { return UsdAttribute::hasValue(); }						\
diff --git a/lib/mayaUsd/ufe/UsdAttributes.cpp b/lib/mayaUsd/ufe/UsdAttributes.cpp
index a8dbfd0e70..4aa45ea295 100644
--- a/lib/mayaUsd/ufe/UsdAttributes.cpp
+++ b/lib/mayaUsd/ufe/UsdAttributes.cpp
@@ -13,14 +13,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-
 #include "UsdAttributes.h"
 
 #include <ufe/ufeAssert.h>
 
 #include <pxr/base/tf/token.h>
-#include <pxr/usd/usd/schemaRegistry.h>
 #include <pxr/usd/sdf/attributeSpec.h>
+#include <pxr/usd/usd/schemaRegistry.h>
 
 // Note: normally we would use this using directive, but here we cannot because
 //		 one of our classes is called UsdAttribute which is exactly the same as
diff --git a/lib/mayaUsd/ufe/UsdAttributes.h b/lib/mayaUsd/ufe/UsdAttributes.h
index caff395025..165d664fdd 100644
--- a/lib/mayaUsd/ufe/UsdAttributes.h
+++ b/lib/mayaUsd/ufe/UsdAttributes.h
@@ -15,16 +15,15 @@
 //
 #pragma once
 
-#include "../base/api.h"
-
-#include "UsdSceneItem.h"
-#include "UsdAttribute.h"
+#include <unordered_map>
 
 #include <ufe/attributes.h>
 
 #include <pxr/usd/usd/prim.h>
 
-#include <unordered_map>
+#include <mayaUsd/base/api.h>
+#include <mayaUsd/ufe/UsdSceneItem.h>
+#include <mayaUsd/ufe/UsdAttribute.h>
 
 MAYAUSD_NS_DEF {
 namespace ufe {
diff --git a/lib/mayaUsd/ufe/UsdAttributesHandler.cpp b/lib/mayaUsd/ufe/UsdAttributesHandler.cpp
index 0366ba1971..4ebb58ddbd 100644
--- a/lib/mayaUsd/ufe/UsdAttributesHandler.cpp
+++ b/lib/mayaUsd/ufe/UsdAttributesHandler.cpp
@@ -13,9 +13,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-
 #include "UsdAttributesHandler.h"
-#include "UsdSceneItem.h"
+
+#include <mayaUsd/ufe/UsdSceneItem.h>
 
 MAYAUSD_NS_DEF {
 namespace ufe {
diff --git a/lib/mayaUsd/ufe/UsdAttributesHandler.h b/lib/mayaUsd/ufe/UsdAttributesHandler.h
index 1fd6acec73..29ba1469ae 100644
--- a/lib/mayaUsd/ufe/UsdAttributesHandler.h
+++ b/lib/mayaUsd/ufe/UsdAttributesHandler.h
@@ -15,12 +15,11 @@
 //
 #pragma once
 
-#include "../base/api.h"
-
-#include "UsdAttributes.h"
-
 #include <ufe/attributesHandler.h>
 
+#include <mayaUsd/base/api.h>
+#include <mayaUsd/ufe/UsdAttributes.h>
+
 MAYAUSD_NS_DEF {
 namespace ufe {
 
diff --git a/lib/mayaUsd/ufe/UsdContextOps.cpp b/lib/mayaUsd/ufe/UsdContextOps.cpp
index 8e62320917..fb01395c33 100644
--- a/lib/mayaUsd/ufe/UsdContextOps.cpp
+++ b/lib/mayaUsd/ufe/UsdContextOps.cpp
@@ -13,9 +13,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-
 #include "UsdContextOps.h"
-#include "Utils.h"
+
+#include <cassert>
+
+#include <maya/MGlobal.h>
 
 #include <ufe/attributes.h>
 #include <ufe/attribute.h>
@@ -24,9 +26,7 @@
 #include <pxr/base/tf/diagnostic.h>
 #include <pxr/usd/usdGeom/tokens.h>
 
-#include <maya/MGlobal.h>
-
-#include <cassert>
+#include <mayaUsd/ufe/Utils.h>
 
 namespace {
 
diff --git a/lib/mayaUsd/ufe/UsdContextOps.h b/lib/mayaUsd/ufe/UsdContextOps.h
index deaf98464b..81e4320c95 100644
--- a/lib/mayaUsd/ufe/UsdContextOps.h
+++ b/lib/mayaUsd/ufe/UsdContextOps.h
@@ -15,15 +15,14 @@
 //
 #pragma once
 
-#include "../base/api.h"
-
-#include "UsdSceneItem.h"
-
 #include <ufe/path.h>
 #include <ufe/contextOps.h>
 
 #include <pxr/usd/usd/prim.h>
 
+#include <mayaUsd/base/api.h>
+#include <mayaUsd/ufe/UsdSceneItem.h>
+
 PXR_NAMESPACE_USING_DIRECTIVE
 
 MAYAUSD_NS_DEF {
diff --git a/lib/mayaUsd/ufe/UsdContextOpsHandler.cpp b/lib/mayaUsd/ufe/UsdContextOpsHandler.cpp
index 4430c3262f..e3ca048f73 100644
--- a/lib/mayaUsd/ufe/UsdContextOpsHandler.cpp
+++ b/lib/mayaUsd/ufe/UsdContextOpsHandler.cpp
@@ -13,7 +13,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-
 #include "UsdContextOpsHandler.h"
 
 MAYAUSD_NS_DEF {
diff --git a/lib/mayaUsd/ufe/UsdContextOpsHandler.h b/lib/mayaUsd/ufe/UsdContextOpsHandler.h
index 7f5a601532..3a7d1241ab 100644
--- a/lib/mayaUsd/ufe/UsdContextOpsHandler.h
+++ b/lib/mayaUsd/ufe/UsdContextOpsHandler.h
@@ -15,12 +15,11 @@
 //
 #pragma once
 
-#include "../base/api.h"
-
-#include "UsdContextOps.h"
-
 #include <ufe/contextOpsHandler.h>
 
+#include <mayaUsd/base/api.h>
+#include <mayaUsd/ufe/UsdContextOps.h>
+
 //PXR_NAMESPACE_USING_DIRECTIVE
 
 MAYAUSD_NS_DEF {
diff --git a/lib/mayaUsd/ufe/UsdHierarchy.cpp b/lib/mayaUsd/ufe/UsdHierarchy.cpp
index 37266ca503..3bfb644823 100644
--- a/lib/mayaUsd/ufe/UsdHierarchy.cpp
+++ b/lib/mayaUsd/ufe/UsdHierarchy.cpp
@@ -13,15 +13,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-
 #include "UsdHierarchy.h"
-#include "UsdUndoCreateGroupCommand.h"
-#include "private/Utils.h"
-#include "Utils.h"
-#include "private/InPathChange.h"
 
-#include <ufe/sceneNotification.h>
+#include <cassert>
+#include <stdexcept>
+
 #include <ufe/scene.h>
+#include <ufe/sceneNotification.h>
 
 #include <pxr/usd/usd/prim.h>
 #include <pxr/usd/usd/stage.h>
@@ -30,8 +28,11 @@
 #include <pxr/usd/usdGeom/xform.h>
 #include <pxr/base/tf/stringUtils.h>
 
-#include <cassert>
-#include <stdexcept>
+#include <mayaUsd/ufe/UsdUndoCreateGroupCommand.h>
+#include <mayaUsd/ufe/Utils.h>
+
+#include "private/InPathChange.h"
+#include "private/Utils.h"
 
 namespace {
 	UsdPrimSiblingRange filteredChildren( const UsdPrim& prim )
diff --git a/lib/mayaUsd/ufe/UsdHierarchy.h b/lib/mayaUsd/ufe/UsdHierarchy.h
index a6dcbc7c94..70469cfb27 100644
--- a/lib/mayaUsd/ufe/UsdHierarchy.h
+++ b/lib/mayaUsd/ufe/UsdHierarchy.h
@@ -15,12 +15,12 @@
 //
 #pragma once
 
-#include "../base/api.h"
-#include "UsdSceneItem.h"
-
 #include <ufe/hierarchy.h>
 #include <ufe/path.h>
 
+#include <mayaUsd/base/api.h>
+#include <mayaUsd/ufe/UsdSceneItem.h>
+
 MAYAUSD_NS_DEF {
 namespace ufe {
 
diff --git a/lib/mayaUsd/ufe/UsdHierarchyHandler.cpp b/lib/mayaUsd/ufe/UsdHierarchyHandler.cpp
index 240ed3ff94..5d313080df 100644
--- a/lib/mayaUsd/ufe/UsdHierarchyHandler.cpp
+++ b/lib/mayaUsd/ufe/UsdHierarchyHandler.cpp
@@ -13,10 +13,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-
 #include "UsdHierarchyHandler.h"
-#include "UsdSceneItem.h"
-#include "Utils.h"
+
+#include <mayaUsd/ufe/UsdSceneItem.h>
+#include <mayaUsd/ufe/Utils.h>
 
 MAYAUSD_NS_DEF {
 namespace ufe {
diff --git a/lib/mayaUsd/ufe/UsdHierarchyHandler.h b/lib/mayaUsd/ufe/UsdHierarchyHandler.h
index 0ef2f67ff0..be273b2c29 100644
--- a/lib/mayaUsd/ufe/UsdHierarchyHandler.h
+++ b/lib/mayaUsd/ufe/UsdHierarchyHandler.h
@@ -15,13 +15,12 @@
 //
 #pragma once
 
-#include "../base/api.h"
-
-#include "UsdHierarchy.h"
-#include "UsdRootChildHierarchy.h"
-
 #include <ufe/hierarchyHandler.h>
 
+#include <mayaUsd/base/api.h>
+#include <mayaUsd/ufe/UsdHierarchy.h>
+#include <mayaUsd/ufe/UsdRootChildHierarchy.h>
+
 //PXR_NAMESPACE_USING_DIRECTIVE
 
 MAYAUSD_NS_DEF {
diff --git a/lib/mayaUsd/ufe/UsdObject3d.cpp b/lib/mayaUsd/ufe/UsdObject3d.cpp
index 9c8d7a1f5b..e147aedaa9 100644
--- a/lib/mayaUsd/ufe/UsdObject3d.cpp
+++ b/lib/mayaUsd/ufe/UsdObject3d.cpp
@@ -1,22 +1,30 @@
-// ===========================================================================
-// Copyright 2019 Autodesk, Inc. All rights reserved.
 //
-// Use of this software is subject to the terms of the Autodesk license
-// agreement provided at the time of installation or download, or which
-// otherwise accompanies this software in either electronic or hard copy form.
-// ===========================================================================
-
+// Copyright 2019 Autodesk
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
 #include "UsdObject3d.h"
-#include "Utils.h"
 
-#include "ufe/attributes.h"
-#include "ufe/types.h"
+#include <ufe/attributes.h>
+#include <ufe/types.h>
+
+#include <stdexcept>
 
 #include <pxr/usd/usdGeom/bboxCache.h>
 #include <pxr/usd/usd/timeCode.h>
 #include <pxr/usd/usdGeom/tokens.h>
 
-#include <stdexcept>
+#include <mayaUsd/ufe/Utils.h>
 
 namespace {
 Ufe::Vector3d toVector3d(const GfVec3d& v)
diff --git a/lib/mayaUsd/ufe/UsdObject3d.h b/lib/mayaUsd/ufe/UsdObject3d.h
index cd5e3bbe66..108332afbe 100644
--- a/lib/mayaUsd/ufe/UsdObject3d.h
+++ b/lib/mayaUsd/ufe/UsdObject3d.h
@@ -7,10 +7,10 @@
 // ===========================================================================
 #pragma once
 
-#include "../base/api.h"
-#include "UsdSceneItem.h"
+#include <ufe/object3d.h>
 
-#include "ufe/object3d.h"
+#include <mayaUsd/base/api.h>
+#include <mayaUsd/ufe/UsdSceneItem.h>
 
 MAYAUSD_NS_DEF {
 namespace ufe {
diff --git a/lib/mayaUsd/ufe/UsdObject3dHandler.cpp b/lib/mayaUsd/ufe/UsdObject3dHandler.cpp
index 0fcbb8b81b..b9b93ef4d8 100644
--- a/lib/mayaUsd/ufe/UsdObject3dHandler.cpp
+++ b/lib/mayaUsd/ufe/UsdObject3dHandler.cpp
@@ -7,10 +7,11 @@
 // ===========================================================================
 
 #include "UsdObject3dHandler.h"
-#include "UsdSceneItem.h"
 
 #include <pxr/usd/usdGeom/imageable.h>
 
+#include <mayaUsd/ufe/UsdSceneItem.h>
+
 MAYAUSD_NS_DEF {
 namespace ufe {
 
diff --git a/lib/mayaUsd/ufe/UsdObject3dHandler.h b/lib/mayaUsd/ufe/UsdObject3dHandler.h
index 448705637e..3f7630648b 100644
--- a/lib/mayaUsd/ufe/UsdObject3dHandler.h
+++ b/lib/mayaUsd/ufe/UsdObject3dHandler.h
@@ -7,11 +7,10 @@
 // ===========================================================================
 #pragma once
 
-#include "../base/api.h"
+#include <ufe/object3dHandler.h>
 
-#include "UsdObject3d.h"
-
-#include "ufe/object3dHandler.h"
+#include <mayaUsd/base/api.h>
+#include <mayaUsd/ufe/UsdObject3d.h>
 
 MAYAUSD_NS_DEF {
 namespace ufe {
diff --git a/lib/mayaUsd/ufe/UsdRootChildHierarchy.cpp b/lib/mayaUsd/ufe/UsdRootChildHierarchy.cpp
index 2231b6555b..8d20cd1733 100644
--- a/lib/mayaUsd/ufe/UsdRootChildHierarchy.cpp
+++ b/lib/mayaUsd/ufe/UsdRootChildHierarchy.cpp
@@ -13,13 +13,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-
 #include "UsdRootChildHierarchy.h"
 
-#include <ufe/runTimeMgr.h>
-
 #include <cassert>
 
+#include <ufe/runTimeMgr.h>
+
 MAYAUSD_NS_DEF {
 namespace ufe {
 
diff --git a/lib/mayaUsd/ufe/UsdRootChildHierarchy.h b/lib/mayaUsd/ufe/UsdRootChildHierarchy.h
index ab63f2215c..998f7546d5 100644
--- a/lib/mayaUsd/ufe/UsdRootChildHierarchy.h
+++ b/lib/mayaUsd/ufe/UsdRootChildHierarchy.h
@@ -15,9 +15,8 @@
 //
 #pragma once
 
-#include "../base/api.h"
-
-#include "UsdHierarchy.h"
+#include <mayaUsd/base/api.h>
+#include <mayaUsd/ufe/UsdHierarchy.h>
 
 //PXR_NAMESPACE_USING_DIRECTIVE
 
diff --git a/lib/mayaUsd/ufe/UsdRotatePivotTranslateUndoableCommand.cpp b/lib/mayaUsd/ufe/UsdRotatePivotTranslateUndoableCommand.cpp
index 68eb56bb72..ee1f17c4d1 100644
--- a/lib/mayaUsd/ufe/UsdRotatePivotTranslateUndoableCommand.cpp
+++ b/lib/mayaUsd/ufe/UsdRotatePivotTranslateUndoableCommand.cpp
@@ -13,8 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-
 #include "UsdRotatePivotTranslateUndoableCommand.h"
+
 #include "private/Utils.h"
 
 MAYAUSD_NS_DEF {
diff --git a/lib/mayaUsd/ufe/UsdRotatePivotTranslateUndoableCommand.h b/lib/mayaUsd/ufe/UsdRotatePivotTranslateUndoableCommand.h
index b223e5af76..353c4a70d4 100644
--- a/lib/mayaUsd/ufe/UsdRotatePivotTranslateUndoableCommand.h
+++ b/lib/mayaUsd/ufe/UsdRotatePivotTranslateUndoableCommand.h
@@ -15,12 +15,12 @@
 //
 #pragma once
 
-#include "../base/api.h"
-
 #include <ufe/transform3dUndoableCommands.h>
 
 #include <pxr/usd/usd/attribute.h>
 
+#include <mayaUsd/base/api.h>
+
 PXR_NAMESPACE_USING_DIRECTIVE
 
 MAYAUSD_NS_DEF {
diff --git a/lib/mayaUsd/ufe/UsdRotateUndoableCommand.cpp b/lib/mayaUsd/ufe/UsdRotateUndoableCommand.cpp
index ea5663d074..3a5ebcca75 100644
--- a/lib/mayaUsd/ufe/UsdRotateUndoableCommand.cpp
+++ b/lib/mayaUsd/ufe/UsdRotateUndoableCommand.cpp
@@ -13,8 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-
 #include "UsdRotateUndoableCommand.h"
+
 #include "private/Utils.h"
 
 MAYAUSD_NS_DEF {
diff --git a/lib/mayaUsd/ufe/UsdRotateUndoableCommand.h b/lib/mayaUsd/ufe/UsdRotateUndoableCommand.h
index 60b53cf56c..cf6b243a40 100644
--- a/lib/mayaUsd/ufe/UsdRotateUndoableCommand.h
+++ b/lib/mayaUsd/ufe/UsdRotateUndoableCommand.h
@@ -15,13 +15,13 @@
 //
 #pragma once
 
-#include "../base/api.h"
+#include <exception>
 
 #include <ufe/transform3dUndoableCommands.h>
 
 #include <pxr/usd/usd/attribute.h>
 
-#include <exception>
+#include <mayaUsd/base/api.h>
 
 PXR_NAMESPACE_USING_DIRECTIVE
 
diff --git a/lib/mayaUsd/ufe/UsdScaleUndoableCommand.cpp b/lib/mayaUsd/ufe/UsdScaleUndoableCommand.cpp
index ee4f93156f..53e15f51d6 100644
--- a/lib/mayaUsd/ufe/UsdScaleUndoableCommand.cpp
+++ b/lib/mayaUsd/ufe/UsdScaleUndoableCommand.cpp
@@ -13,10 +13,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-
 #include "UsdScaleUndoableCommand.h"
+
 #include "private/Utils.h"
-#include "Utils.h"
+
+#include <mayaUsd/ufe/Utils.h>
 
 MAYAUSD_NS_DEF {
 namespace ufe {
diff --git a/lib/mayaUsd/ufe/UsdScaleUndoableCommand.h b/lib/mayaUsd/ufe/UsdScaleUndoableCommand.h
index e5a26f7474..33f90a498e 100644
--- a/lib/mayaUsd/ufe/UsdScaleUndoableCommand.h
+++ b/lib/mayaUsd/ufe/UsdScaleUndoableCommand.h
@@ -15,12 +15,12 @@
 //
 #pragma once
 
-#include "../base/api.h"
-
 #include <ufe/transform3dUndoableCommands.h>
 
 #include <pxr/usd/usd/attribute.h>
 
+#include <mayaUsd/base/api.h>
+
 PXR_NAMESPACE_USING_DIRECTIVE
 
 MAYAUSD_NS_DEF {
diff --git a/lib/mayaUsd/ufe/UsdSceneItem.cpp b/lib/mayaUsd/ufe/UsdSceneItem.cpp
index b3e8782a37..2d50c39896 100644
--- a/lib/mayaUsd/ufe/UsdSceneItem.cpp
+++ b/lib/mayaUsd/ufe/UsdSceneItem.cpp
@@ -13,7 +13,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-
 #include "UsdSceneItem.h"
 
 MAYAUSD_NS_DEF {
diff --git a/lib/mayaUsd/ufe/UsdSceneItem.h b/lib/mayaUsd/ufe/UsdSceneItem.h
index cb7e73758e..0e6fc5044c 100644
--- a/lib/mayaUsd/ufe/UsdSceneItem.h
+++ b/lib/mayaUsd/ufe/UsdSceneItem.h
@@ -15,12 +15,12 @@
 //
 #pragma once
 
-#include "../base/api.h"
-
 #include <ufe/sceneItem.h>
 
 #include <pxr/usd/usd/prim.h>
 
+#include <mayaUsd/base/api.h>
+
 PXR_NAMESPACE_USING_DIRECTIVE
 
 MAYAUSD_NS_DEF {
diff --git a/lib/mayaUsd/ufe/UsdSceneItemOps.cpp b/lib/mayaUsd/ufe/UsdSceneItemOps.cpp
index 60b7895f47..8fe2e439d3 100644
--- a/lib/mayaUsd/ufe/UsdSceneItemOps.cpp
+++ b/lib/mayaUsd/ufe/UsdSceneItemOps.cpp
@@ -13,12 +13,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-
 #include "UsdSceneItemOps.h"
-#include "UsdUndoDeleteCommand.h"
-#include "UsdUndoDuplicateCommand.h"
-#include "UsdUndoRenameCommand.h"
-#include "Utils.h"
+
+#include <mayaUsd/ufe/UsdUndoDeleteCommand.h>
+#include <mayaUsd/ufe/UsdUndoDuplicateCommand.h>
+#include <mayaUsd/ufe/UsdUndoRenameCommand.h>
+#include <mayaUsd/ufe/Utils.h>
 
 MAYAUSD_NS_DEF {
 namespace ufe {
diff --git a/lib/mayaUsd/ufe/UsdSceneItemOps.h b/lib/mayaUsd/ufe/UsdSceneItemOps.h
index 290c9bc8d9..4f581842ec 100644
--- a/lib/mayaUsd/ufe/UsdSceneItemOps.h
+++ b/lib/mayaUsd/ufe/UsdSceneItemOps.h
@@ -15,15 +15,14 @@
 //
 #pragma once
 
-#include "../base/api.h"
-
-#include "UsdSceneItem.h"
-
 #include <ufe/path.h>
 #include <ufe/sceneItemOps.h>
 
 #include <pxr/usd/usd/prim.h>
 
+#include <mayaUsd/base/api.h>
+#include <mayaUsd/ufe/UsdSceneItem.h>
+
 PXR_NAMESPACE_USING_DIRECTIVE
 
 MAYAUSD_NS_DEF {
diff --git a/lib/mayaUsd/ufe/UsdSceneItemOpsHandler.cpp b/lib/mayaUsd/ufe/UsdSceneItemOpsHandler.cpp
index f305034fd8..84517a8bba 100644
--- a/lib/mayaUsd/ufe/UsdSceneItemOpsHandler.cpp
+++ b/lib/mayaUsd/ufe/UsdSceneItemOpsHandler.cpp
@@ -13,7 +13,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-
 #include "UsdSceneItemOpsHandler.h"
 
 MAYAUSD_NS_DEF {
diff --git a/lib/mayaUsd/ufe/UsdSceneItemOpsHandler.h b/lib/mayaUsd/ufe/UsdSceneItemOpsHandler.h
index 2ed85c24b5..9fd84cc525 100644
--- a/lib/mayaUsd/ufe/UsdSceneItemOpsHandler.h
+++ b/lib/mayaUsd/ufe/UsdSceneItemOpsHandler.h
@@ -15,12 +15,11 @@
 //
 #pragma once
 
-#include "../base/api.h"
-
-#include "UsdSceneItemOps.h"
-
 #include <ufe/sceneItemOpsHandler.h>
 
+#include <mayaUsd/base/api.h>
+#include <mayaUsd/ufe/UsdSceneItemOps.h>
+
 //PXR_NAMESPACE_USING_DIRECTIVE
 
 MAYAUSD_NS_DEF {
diff --git a/lib/mayaUsd/ufe/UsdStageMap.cpp b/lib/mayaUsd/ufe/UsdStageMap.cpp
index 97b7f6d57d..0b9c1af926 100644
--- a/lib/mayaUsd/ufe/UsdStageMap.cpp
+++ b/lib/mayaUsd/ufe/UsdStageMap.cpp
@@ -13,13 +13,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-
 #include "UsdStageMap.h"
-#include "Utils.h"
+
+#include <cassert>
 
 #include <maya/MFnDagNode.h>
 
-#include <cassert>
+#include <mayaUsd/ufe/Utils.h>
 
 namespace {
 
diff --git a/lib/mayaUsd/ufe/UsdStageMap.h b/lib/mayaUsd/ufe/UsdStageMap.h
index 954eb640e9..2abecd3573 100644
--- a/lib/mayaUsd/ufe/UsdStageMap.h
+++ b/lib/mayaUsd/ufe/UsdStageMap.h
@@ -15,16 +15,16 @@
 //
 #pragma once
 
-#include "../base/api.h"
-
 #include <ufe/path.h>
 
-#include <pxr/usd/usd/stage.h>
-#include <pxr/base/tf/hash.h>
+#include <unordered_map>
 
 #include <maya/MObjectHandle.h>
 
-#include <unordered_map>
+#include <pxr/usd/usd/stage.h>
+#include <pxr/base/tf/hash.h>
+
+#include <mayaUsd/base/api.h>
 
 // Allow for use of MObjectHandle with std::unordered_map.
 namespace std {
diff --git a/lib/mayaUsd/ufe/UsdTransform3d.cpp b/lib/mayaUsd/ufe/UsdTransform3d.cpp
index bc13ac28d8..140a565891 100644
--- a/lib/mayaUsd/ufe/UsdTransform3d.cpp
+++ b/lib/mayaUsd/ufe/UsdTransform3d.cpp
@@ -13,17 +13,18 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-
 #include "UsdTransform3d.h"
-#include "UsdTranslateUndoableCommand.h"
-#include "UsdRotateUndoableCommand.h"
-#include "UsdScaleUndoableCommand.h"
-#include "UsdRotatePivotTranslateUndoableCommand.h"
-#include "private/Utils.h"
-#include "Utils.h"
 
 #include <pxr/usd/usdGeom/xformCache.h>
 
+#include <mayaUsd/ufe/UsdRotatePivotTranslateUndoableCommand.h>
+#include <mayaUsd/ufe/UsdRotateUndoableCommand.h>
+#include <mayaUsd/ufe/UsdScaleUndoableCommand.h>
+#include <mayaUsd/ufe/UsdTranslateUndoableCommand.h>
+#include <mayaUsd/ufe/Utils.h>
+
+#include "private/Utils.h"
+
 MAYAUSD_NS_DEF {
 namespace ufe {
 
diff --git a/lib/mayaUsd/ufe/UsdTransform3d.h b/lib/mayaUsd/ufe/UsdTransform3d.h
index 82d1d27f3e..2e7978ffa7 100644
--- a/lib/mayaUsd/ufe/UsdTransform3d.h
+++ b/lib/mayaUsd/ufe/UsdTransform3d.h
@@ -15,15 +15,14 @@
 //
 #pragma once
 
-#include "../base/api.h"
-
-#include "UsdSceneItem.h"
-
 #include <ufe/path.h>
 #include <ufe/transform3d.h>
 
 #include <pxr/usd/usd/prim.h>
 
+#include <mayaUsd/base/api.h>
+#include <mayaUsd/ufe/UsdSceneItem.h>
+
 PXR_NAMESPACE_USING_DIRECTIVE
 
 MAYAUSD_NS_DEF {
diff --git a/lib/mayaUsd/ufe/UsdTransform3dHandler.cpp b/lib/mayaUsd/ufe/UsdTransform3dHandler.cpp
index a47957f456..08099ef252 100644
--- a/lib/mayaUsd/ufe/UsdTransform3dHandler.cpp
+++ b/lib/mayaUsd/ufe/UsdTransform3dHandler.cpp
@@ -13,9 +13,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-
 #include "UsdTransform3dHandler.h"
-#include "UsdSceneItem.h"
+
+#include <mayaUsd/ufe/UsdSceneItem.h>
 
 MAYAUSD_NS_DEF {
 namespace ufe {
diff --git a/lib/mayaUsd/ufe/UsdTransform3dHandler.h b/lib/mayaUsd/ufe/UsdTransform3dHandler.h
index 2e56ab2d5a..1f94fe19d3 100644
--- a/lib/mayaUsd/ufe/UsdTransform3dHandler.h
+++ b/lib/mayaUsd/ufe/UsdTransform3dHandler.h
@@ -15,12 +15,11 @@
 //
 #pragma once
 
-#include "../base/api.h"
-
-#include "UsdTransform3d.h"
-
 #include <ufe/transform3dHandler.h>
 
+#include <mayaUsd/base/api.h>
+#include <mayaUsd/ufe/UsdTransform3d.h>
+
 MAYAUSD_NS_DEF {
 namespace ufe {
 
diff --git a/lib/mayaUsd/ufe/UsdTranslateUndoableCommand.cpp b/lib/mayaUsd/ufe/UsdTranslateUndoableCommand.cpp
index 7ba15e63ce..8d650a3d66 100644
--- a/lib/mayaUsd/ufe/UsdTranslateUndoableCommand.cpp
+++ b/lib/mayaUsd/ufe/UsdTranslateUndoableCommand.cpp
@@ -13,10 +13,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-
 #include "UsdTranslateUndoableCommand.h"
+
 #include "private/Utils.h"
-#include "Utils.h"
+
+#include <mayaUsd/ufe/Utils.h>
 
 MAYAUSD_NS_DEF {
 namespace ufe {
diff --git a/lib/mayaUsd/ufe/UsdTranslateUndoableCommand.h b/lib/mayaUsd/ufe/UsdTranslateUndoableCommand.h
index eb31034cd5..3de48c7602 100644
--- a/lib/mayaUsd/ufe/UsdTranslateUndoableCommand.h
+++ b/lib/mayaUsd/ufe/UsdTranslateUndoableCommand.h
@@ -15,12 +15,12 @@
 //
 #pragma once
 
-#include "../base/api.h"
-
 #include <ufe/transform3dUndoableCommands.h>
 
 #include <pxr/usd/usd/attribute.h>
 
+#include <mayaUsd/base/api.h>
+
 PXR_NAMESPACE_USING_DIRECTIVE
 
 MAYAUSD_NS_DEF {
diff --git a/lib/mayaUsd/ufe/UsdUndoCreateGroupCommand.cpp b/lib/mayaUsd/ufe/UsdUndoCreateGroupCommand.cpp
index f942b8deb8..92d96158d1 100644
--- a/lib/mayaUsd/ufe/UsdUndoCreateGroupCommand.cpp
+++ b/lib/mayaUsd/ufe/UsdUndoCreateGroupCommand.cpp
@@ -13,11 +13,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-
 #include "UsdUndoCreateGroupCommand.h"
 
-#include <ufe/scene.h>
 #include <ufe/hierarchy.h>
+#include <ufe/scene.h>
 #include <ufe/sceneNotification.h>
 
 #include <pxr/usd/usd/prim.h>
diff --git a/lib/mayaUsd/ufe/UsdUndoCreateGroupCommand.h b/lib/mayaUsd/ufe/UsdUndoCreateGroupCommand.h
index be48c5ec3e..3c070ff1c7 100644
--- a/lib/mayaUsd/ufe/UsdUndoCreateGroupCommand.h
+++ b/lib/mayaUsd/ufe/UsdUndoCreateGroupCommand.h
@@ -15,13 +15,12 @@
 //
 #pragma once
 
-#include "../base/api.h"
-
-#include "UsdSceneItem.h"
-
 #include <ufe/undoableCommand.h>
 #include <ufe/pathComponent.h>
 
+#include <mayaUsd/base/api.h>
+#include <mayaUsd/ufe/UsdSceneItem.h>
+
 //PXR_NAMESPACE_USING_DIRECTIVE
 
 MAYAUSD_NS_DEF {
diff --git a/lib/mayaUsd/ufe/UsdUndoDeleteCommand.cpp b/lib/mayaUsd/ufe/UsdUndoDeleteCommand.cpp
index f8835070dc..be8696fdef 100644
--- a/lib/mayaUsd/ufe/UsdUndoDeleteCommand.cpp
+++ b/lib/mayaUsd/ufe/UsdUndoDeleteCommand.cpp
@@ -13,7 +13,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-
 #include "UsdUndoDeleteCommand.h"
 
 MAYAUSD_NS_DEF {
diff --git a/lib/mayaUsd/ufe/UsdUndoDeleteCommand.h b/lib/mayaUsd/ufe/UsdUndoDeleteCommand.h
index f964016dcc..80a265e66d 100644
--- a/lib/mayaUsd/ufe/UsdUndoDeleteCommand.h
+++ b/lib/mayaUsd/ufe/UsdUndoDeleteCommand.h
@@ -15,14 +15,13 @@
 //
 #pragma once
 
-#include "../base/api.h"
-
-#include "UsdSceneItem.h"
-
 #include <ufe/undoableCommand.h>
 
 #include <pxr/usd/usd/prim.h>
 
+#include <mayaUsd/base/api.h>
+#include <mayaUsd/ufe/UsdSceneItem.h>
+
 PXR_NAMESPACE_USING_DIRECTIVE
 
 MAYAUSD_NS_DEF {
diff --git a/lib/mayaUsd/ufe/UsdUndoDuplicateCommand.cpp b/lib/mayaUsd/ufe/UsdUndoDuplicateCommand.cpp
index 61382faee2..5fc2d07f17 100644
--- a/lib/mayaUsd/ufe/UsdUndoDuplicateCommand.cpp
+++ b/lib/mayaUsd/ufe/UsdUndoDuplicateCommand.cpp
@@ -13,9 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-
 #include "UsdUndoDuplicateCommand.h"
-#include "Utils.h"
 
 #include <ufe/scene.h>
 #include <ufe/sceneNotification.h>
@@ -25,6 +23,8 @@
 #include <pxr/usd/sdf/copyUtils.h>
 #include <pxr/base/tf/token.h>
 
+#include <mayaUsd/ufe/Utils.h>
+
 MAYAUSD_NS_DEF {
 namespace ufe {
 
diff --git a/lib/mayaUsd/ufe/UsdUndoDuplicateCommand.h b/lib/mayaUsd/ufe/UsdUndoDuplicateCommand.h
index 82780f5385..8d18905c06 100644
--- a/lib/mayaUsd/ufe/UsdUndoDuplicateCommand.h
+++ b/lib/mayaUsd/ufe/UsdUndoDuplicateCommand.h
@@ -15,16 +15,15 @@
 //
 #pragma once
 
-#include "../base/api.h"
-
-#include "UsdSceneItem.h"
-
 #include <ufe/path.h>
 #include <ufe/undoableCommand.h>
 
 #include <pxr/usd/sdf/path.h>
 #include <pxr/usd/usd/prim.h>
 
+#include <mayaUsd/base/api.h>
+#include <mayaUsd/ufe/UsdSceneItem.h>
+
 PXR_NAMESPACE_USING_DIRECTIVE
 
 MAYAUSD_NS_DEF {
diff --git a/lib/mayaUsd/ufe/UsdUndoRenameCommand.cpp b/lib/mayaUsd/ufe/UsdUndoRenameCommand.cpp
index 679623fbdf..1f3c0c9f24 100644
--- a/lib/mayaUsd/ufe/UsdUndoRenameCommand.cpp
+++ b/lib/mayaUsd/ufe/UsdUndoRenameCommand.cpp
@@ -13,10 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-
 #include "UsdUndoRenameCommand.h"
-#include "Utils.h"
-#include "private/InPathChange.h"
 
 #include <ufe/scene.h>
 #include <ufe/sceneNotification.h>
@@ -33,6 +30,10 @@
 #include <pxr/usd/sdf/copyUtils.h>
 #include <pxr/base/tf/token.h>
 
+#include "private/InPathChange.h"
+
+#include <mayaUsd/ufe/Utils.h>
+
 MAYAUSD_NS_DEF {
 namespace ufe {
 
diff --git a/lib/mayaUsd/ufe/UsdUndoRenameCommand.h b/lib/mayaUsd/ufe/UsdUndoRenameCommand.h
index c22b2c28aa..cac5ebaa49 100644
--- a/lib/mayaUsd/ufe/UsdUndoRenameCommand.h
+++ b/lib/mayaUsd/ufe/UsdUndoRenameCommand.h
@@ -15,10 +15,6 @@
 //
 #pragma once
 
-#include "../base/api.h"
-
-#include "UsdSceneItem.h"
-
 #include <ufe/path.h>
 #include <ufe/pathComponent.h>
 #include <ufe/undoableCommand.h>
@@ -26,6 +22,9 @@
 #include <pxr/usd/sdf/path.h>
 #include <pxr/usd/usd/prim.h>
 
+#include <mayaUsd/base/api.h>
+#include <mayaUsd/ufe/UsdSceneItem.h>
+
 PXR_NAMESPACE_USING_DIRECTIVE
 
 MAYAUSD_NS_DEF {
diff --git a/lib/mayaUsd/ufe/Utils.cpp b/lib/mayaUsd/ufe/Utils.cpp
index fe424ad2c6..88fad56afa 100644
--- a/lib/mayaUsd/ufe/Utils.cpp
+++ b/lib/mayaUsd/ufe/Utils.cpp
@@ -13,27 +13,28 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-
 #include "Utils.h"
-#include "private/Utils.h"
-#include "UsdStageMap.h"
-#include "ProxyShapeHandler.h"
-#include "../nodes/proxyShapeBase.h"
 
-#include <pxr/base/tf/hashset.h>
-#include <pxr/usd/usd/stage.h>
+#include <cassert>
+#include <memory>
+#include <regex>
+#include <stdexcept>
+#include <string>
+#include <unordered_map>
 
 #include <maya/MGlobal.h>
 #include <maya/MSelectionList.h>
 #include <maya/MObjectHandle.h>
 #include <maya/MFnDependencyNode.h>
 
-#include <cassert>
-#include <string>
-#include <unordered_map>
-#include <regex>
-#include <memory>
-#include <stdexcept>
+#include <pxr/base/tf/hashset.h>
+#include <pxr/usd/usd/stage.h>
+
+#include <mayaUsd/nodes/proxyShapeBase.h>
+#include <mayaUsd/ufe/ProxyShapeHandler.h>
+#include <mayaUsd/ufe/UsdStageMap.h>
+
+#include "private/Utils.h"
 
 PXR_NAMESPACE_USING_DIRECTIVE
 
diff --git a/lib/mayaUsd/ufe/Utils.h b/lib/mayaUsd/ufe/Utils.h
index 1785a58f00..bf6bca3457 100644
--- a/lib/mayaUsd/ufe/Utils.h
+++ b/lib/mayaUsd/ufe/Utils.h
@@ -15,19 +15,19 @@
 //
 #pragma once
 
-#include "../base/api.h"
-
-#include "UsdSceneItem.h"
-
 #include <ufe/path.h>
 #include <ufe/pathSegment.h>
 
+#include <maya/MDagPath.h>
+
 #include <pxr/usd/usd/prim.h>
 #include <pxr/usd/usd/timeCode.h>
 #include <pxr/usd/sdf/layer.h>
 #include <pxr/base/tf/token.h>
 
-#include <maya/MDagPath.h>
+#include <mayaUsd/base/api.h>
+
+#include <mayaUsd/ufe/UsdSceneItem.h>
 
 PXR_NAMESPACE_USING_DIRECTIVE
 
diff --git a/lib/mayaUsd/ufe/private/CMakeLists.txt b/lib/mayaUsd/ufe/private/CMakeLists.txt
index e1e1b1a3f3..01bd4194a2 100644
--- a/lib/mayaUsd/ufe/private/CMakeLists.txt
+++ b/lib/mayaUsd/ufe/private/CMakeLists.txt
@@ -5,13 +5,3 @@ target_sources(${PROJECT_NAME}
     PRIVATE
         Utils.cpp
 )
-
-set(headers
-    Utils.h
-    InPathChange.h
-)
-
-# -----------------------------------------------------------------------------
-# promoted headers
-# -----------------------------------------------------------------------------
-mayaUsd_promoteHeaderList(HEADERS ${headers} SUBDIR ufe/private)
diff --git a/lib/mayaUsd/ufe/private/InPathChange.h b/lib/mayaUsd/ufe/private/InPathChange.h
index bd9e1d173f..81205d70a2 100644
--- a/lib/mayaUsd/ufe/private/InPathChange.h
+++ b/lib/mayaUsd/ufe/private/InPathChange.h
@@ -15,7 +15,7 @@
 //
 #pragma once
 
-#include "../../base/api.h"
+#include <mayaUsd/base/api.h>
 
 MAYAUSD_NS_DEF {
 namespace ufe {
diff --git a/lib/mayaUsd/ufe/private/Utils.cpp b/lib/mayaUsd/ufe/private/Utils.cpp
index f5fd8af502..ed99d702a2 100644
--- a/lib/mayaUsd/ufe/private/Utils.cpp
+++ b/lib/mayaUsd/ufe/private/Utils.cpp
@@ -13,17 +13,16 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-
 #include "Utils.h"
 
+#include <memory>
+#include <string>
+
 #include <ufe/log.h>
 
 #include <pxr/base/tf/stringUtils.h>
 #include <pxr/usd/usdGeom/xformable.h>
 
-#include <string>
-#include <memory>
-
 PXR_NAMESPACE_USING_DIRECTIVE
 
 MAYAUSD_NS_DEF {
diff --git a/lib/mayaUsd/ufe/private/Utils.h b/lib/mayaUsd/ufe/private/Utils.h
index 7d6ce11506..7ccd6b219a 100644
--- a/lib/mayaUsd/ufe/private/Utils.h
+++ b/lib/mayaUsd/ufe/private/Utils.h
@@ -15,14 +15,14 @@
 //
 #pragma once
 
-#include "../../base/api.h"
-
 #include <ufe/path.h>
 
 #include <pxr/usd/usd/prim.h>
 #include <pxr/base/tf/token.h>
 #include <pxr/usd/usdGeom/xformCommonAPI.h>
 
+#include <mayaUsd/base/api.h>
+
 PXR_NAMESPACE_USING_DIRECTIVE
 
 MAYAUSD_NS_DEF {
diff --git a/lib/mayaUsd/ufe/wrapUtils.cpp b/lib/mayaUsd/ufe/wrapUtils.cpp
index a42bd88b5a..02e3ef982c 100644
--- a/lib/mayaUsd/ufe/wrapUtils.cpp
+++ b/lib/mayaUsd/ufe/wrapUtils.cpp
@@ -13,18 +13,17 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-
 #include <boost/python.hpp>
 
-#include "UsdSceneItem.h"
-#include "Utils.h"
-#include "Global.h"
-
 #include <ufe/runTimeMgr.h>
 #include <ufe/rtid.h>
 
 #include <pxr/base/tf/stringUtils.h>
 
+#include "Global.h"
+#include "UsdSceneItem.h"
+#include "Utils.h"
+
 using namespace MayaUsd;
 using namespace boost::python;
 
diff --git a/lib/mayaUsd/utils/blockSceneModificationContext.cpp b/lib/mayaUsd/utils/blockSceneModificationContext.cpp
index 7a070d3526..b4c3b6ade9 100644
--- a/lib/mayaUsd/utils/blockSceneModificationContext.cpp
+++ b/lib/mayaUsd/utils/blockSceneModificationContext.cpp
@@ -13,19 +13,17 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-#include "pxr/pxr.h"
 #include "blockSceneModificationContext.h"
 
-#include "pxr/base/tf/stringUtils.h"
-
 #include <maya/MGlobal.h>
 #include <maya/MStatus.h>
 #include <maya/MString.h>
 
+#include <pxr/pxr.h>
+#include <pxr/base/tf/stringUtils.h>
 
 PXR_NAMESPACE_OPEN_SCOPE
 
-
 UsdMayaBlockSceneModificationContext::UsdMayaBlockSceneModificationContext()
 {
     const MString fileModifiedCmd("file -query -modified");
diff --git a/lib/mayaUsd/utils/blockSceneModificationContext.h b/lib/mayaUsd/utils/blockSceneModificationContext.h
index fe3428ae33..08c219c6de 100644
--- a/lib/mayaUsd/utils/blockSceneModificationContext.h
+++ b/lib/mayaUsd/utils/blockSceneModificationContext.h
@@ -16,15 +16,12 @@
 #ifndef PXRUSDMAYA_BLOCK_SCENE_MODIFICATION_CONTEXT_H
 #define PXRUSDMAYA_BLOCK_SCENE_MODIFICATION_CONTEXT_H
 
-/// \file usdMaya/blockSceneModificationContext.h
-
-#include "pxr/pxr.h"
-#include "../base/api.h"
+#include <pxr/pxr.h>
 
+#include <mayaUsd/base/api.h>
 
 PXR_NAMESPACE_OPEN_SCOPE
 
-
 /// Utility class for wrapping a scope of Maya operations such that the
 /// modification status of the Maya scene is preserved.
 class UsdMayaBlockSceneModificationContext
diff --git a/lib/mayaUsd/utils/colorSpace.cpp b/lib/mayaUsd/utils/colorSpace.cpp
index 4d19f915a6..8ed847f3cc 100644
--- a/lib/mayaUsd/utils/colorSpace.cpp
+++ b/lib/mayaUsd/utils/colorSpace.cpp
@@ -15,7 +15,7 @@
 //
 #include "colorSpace.h"
 
-#include "pxr/base/tf/envSetting.h"
+#include <pxr/base/tf/envSetting.h>
 
 PXR_NAMESPACE_USING_DIRECTIVE
 
diff --git a/lib/mayaUsd/utils/colorSpace.h b/lib/mayaUsd/utils/colorSpace.h
index eb3b6f9772..aff84a00a0 100644
--- a/lib/mayaUsd/utils/colorSpace.h
+++ b/lib/mayaUsd/utils/colorSpace.h
@@ -16,13 +16,10 @@
 #ifndef PXRUSDMAYA_COLORSPACE_H
 #define PXRUSDMAYA_COLORSPACE_H
 
-/// \file usdMaya/colorSpace.h
+#include <pxr/pxr.h>
+#include <pxr/base/gf/gamma.h>
 
-#include "../base/api.h"
-
-#include "pxr/pxr.h"
-
-#include "pxr/base/gf/gamma.h"
+#include <mayaUsd/base/api.h>
 
 PXR_NAMESPACE_OPEN_SCOPE
 
diff --git a/lib/mayaUsd/utils/diagnosticDelegate.cpp b/lib/mayaUsd/utils/diagnosticDelegate.cpp
index 19c9101347..271cde5e1e 100644
--- a/lib/mayaUsd/utils/diagnosticDelegate.cpp
+++ b/lib/mayaUsd/utils/diagnosticDelegate.cpp
@@ -13,17 +13,17 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-#include "./diagnosticDelegate.h"
+#include "diagnosticDelegate.h"
 
-#include "../base/debugCodes.h"
-
-#include "pxr/base/arch/threads.h"
-#include "pxr/base/tf/envSetting.h"
-#include "pxr/base/tf/stackTrace.h"
+#include <iostream>
 
 #include <maya/MGlobal.h>
 
-#include <iostream>
+#include <pxr/base/arch/threads.h>
+#include <pxr/base/tf/envSetting.h>
+#include <pxr/base/tf/stackTrace.h>
+
+#include <mayaUsd/base/debugCodes.h>
 
 PXR_NAMESPACE_OPEN_SCOPE
 
diff --git a/lib/mayaUsd/utils/diagnosticDelegate.h b/lib/mayaUsd/utils/diagnosticDelegate.h
index 9f00a3a6cb..b034bc06c1 100644
--- a/lib/mayaUsd/utils/diagnosticDelegate.h
+++ b/lib/mayaUsd/utils/diagnosticDelegate.h
@@ -16,20 +16,16 @@
 #ifndef PXRUSDMAYA_DIAGNOSTICDELEGATE_H
 #define PXRUSDMAYA_DIAGNOSTICDELEGATE_H
 
-/// \file usdMaya/diagnosticDelegate.h
-
-#include "../base/api.h"
-
-#include "pxr/pxr.h"
-
-#include "pxr/base/tf/diagnosticMgr.h"
-
-#include "pxr/usd/usdUtils/coalescingDiagnosticDelegate.h"
+#include <atomic>
+#include <memory>
 
 #include <maya/MGlobal.h>
 
-#include <atomic>
-#include <memory>
+#include <pxr/pxr.h>
+#include <pxr/base/tf/diagnosticMgr.h>
+#include <pxr/usd/usdUtils/coalescingDiagnosticDelegate.h>
+
+#include <mayaUsd/base/api.h>
 
 PXR_NAMESPACE_OPEN_SCOPE
 
diff --git a/lib/mayaUsd/utils/query.cpp b/lib/mayaUsd/utils/query.cpp
index 2afefa934e..365c695b6e 100644
--- a/lib/mayaUsd/utils/query.cpp
+++ b/lib/mayaUsd/utils/query.cpp
@@ -15,15 +15,7 @@
 //
 #include "query.h"
 
-#include "../nodes/usdPrimProvider.h"
-#include "util.h"
-
-#include "pxr/base/arch/systemInfo.h"
-
-#include "pxr/usd/ar/resolver.h"
-#include "pxr/usd/ar/resolverContext.h"
-#include "pxr/usd/ar/resolverContextBinder.h"
-#include "pxr/usd/usd/prim.h"
+#include <string>
 
 #include <maya/MDagPath.h>
 #include <maya/MFnDagNode.h>
@@ -31,11 +23,16 @@
 #include <maya/MPxNode.h>
 #include <maya/MStatus.h>
 
-#include <string>
-
-PXR_NAMESPACE_OPEN_SCOPE
+#include <pxr/base/arch/systemInfo.h>
+#include <pxr/usd/ar/resolver.h>
+#include <pxr/usd/ar/resolverContext.h>
+#include <pxr/usd/ar/resolverContextBinder.h>
+#include <pxr/usd/usd/prim.h>
 
+#include <mayaUsd/nodes/usdPrimProvider.h>
+#include <mayaUsd/utils/util.h>
 
+PXR_NAMESPACE_OPEN_SCOPE
 
 UsdPrim
 UsdMayaQuery::GetPrim(const std::string& shapeName)
diff --git a/lib/mayaUsd/utils/query.h b/lib/mayaUsd/utils/query.h
index 6916cf65a0..704929204e 100644
--- a/lib/mayaUsd/utils/query.h
+++ b/lib/mayaUsd/utils/query.h
@@ -16,20 +16,16 @@
 #ifndef PXRUSDMAYA_QUERY_H
 #define PXRUSDMAYA_QUERY_H
 
-/// \file usdMaya/query.h
-
-#include "../base/api.h"
-
-#include "pxr/pxr.h"
-
-#include "pxr/usd/usd/stage.h"
-#include "pxr/usd/usd/prim.h"
-
 #include <string>
 #include <vector>
 
-PXR_NAMESPACE_OPEN_SCOPE
+#include <pxr/pxr.h>
+#include <pxr/usd/usd/prim.h>
+#include <pxr/usd/usd/stage.h>
+
+#include <mayaUsd/base/api.h>
 
+PXR_NAMESPACE_OPEN_SCOPE
 
 struct UsdMayaQuery
 {
diff --git a/lib/mayaUsd/utils/stageCache.cpp b/lib/mayaUsd/utils/stageCache.cpp
index f0b13c07b6..4a707b338c 100644
--- a/lib/mayaUsd/utils/stageCache.cpp
+++ b/lib/mayaUsd/utils/stageCache.cpp
@@ -15,27 +15,25 @@
 //
 #include "stageCache.h"
 
-#include "../listeners/notice.h"
-
-#include "pxr/usd/sdf/attributeSpec.h"
-#include "pxr/usd/sdf/layer.h"
-#include "pxr/usd/sdf/primSpec.h"
-#include "pxr/usd/sdf/relationshipSpec.h"
-#include "pxr/usd/usd/stageCache.h"
-#include "pxr/usd/usdGeom/tokens.h"
-
-#include <maya/MFileIO.h>
-#include <maya/MSceneMessage.h>
-
 #include <map>
 #include <memory>
 #include <mutex>
 #include <sstream>
 #include <string>
 
+#include <maya/MFileIO.h>
+#include <maya/MSceneMessage.h>
 
-PXR_NAMESPACE_OPEN_SCOPE
+#include <pxr/usd/sdf/attributeSpec.h>
+#include <pxr/usd/sdf/layer.h>
+#include <pxr/usd/sdf/primSpec.h>
+#include <pxr/usd/sdf/relationshipSpec.h>
+#include <pxr/usd/usd/stageCache.h>
+#include <pxr/usd/usdGeom/tokens.h>
 
+#include <mayaUsd/listeners/notice.h>
+
+PXR_NAMESPACE_OPEN_SCOPE
 
 namespace {
 
diff --git a/lib/mayaUsd/utils/stageCache.h b/lib/mayaUsd/utils/stageCache.h
index 61d59141d6..897dc88507 100644
--- a/lib/mayaUsd/utils/stageCache.h
+++ b/lib/mayaUsd/utils/stageCache.h
@@ -16,20 +16,15 @@
 #ifndef PXRUSDMAYA_STAGECACHE_H
 #define PXRUSDMAYA_STAGECACHE_H
 
-/// \file usdMaya/stageCache.h
-
-#include "../base/api.h"
-
-#include "pxr/pxr.h"
-
-#include "pxr/usd/sdf/path.h"
-#include "pxr/usd/usd/stageCache.h"
-
 #include <string>
 
+#include <pxr/pxr.h>
+#include <pxr/usd/sdf/path.h>
+#include <pxr/usd/usd/stageCache.h>
 
-PXR_NAMESPACE_OPEN_SCOPE
+#include <mayaUsd/base/api.h>
 
+PXR_NAMESPACE_OPEN_SCOPE
 
 class UsdMayaStageCache
 {
diff --git a/lib/mayaUsd/utils/undoHelperCommand.cpp b/lib/mayaUsd/utils/undoHelperCommand.cpp
index 23ba81f6bf..0f7a4bb707 100644
--- a/lib/mayaUsd/utils/undoHelperCommand.cpp
+++ b/lib/mayaUsd/utils/undoHelperCommand.cpp
@@ -15,7 +15,7 @@
 //
 #include "undoHelperCommand.h"
 
-#include "pxr/base/tf/errorMark.h"
+#include <pxr/base/tf/errorMark.h>
 
 #include <maya/MSyntax.h>
 
diff --git a/lib/mayaUsd/utils/undoHelperCommand.h b/lib/mayaUsd/utils/undoHelperCommand.h
index 0aeaaa1ba2..954c60d9a0 100644
--- a/lib/mayaUsd/utils/undoHelperCommand.h
+++ b/lib/mayaUsd/utils/undoHelperCommand.h
@@ -16,19 +16,17 @@
 #ifndef PXRUSDMAYA_UNDO_HELPER_CMD_H
 #define PXRUSDMAYA_UNDO_HELPER_CMD_H
 
-/// \file usdMaya/undoHelperCommand.h
-
-#include "pxr/pxr.h"
-#include "pxr/base/tf/token.h"
-#include "pxr/base/vt/value.h"
-
-#include "../base/api.h"
-#include <mayaUsd/fileio/utils/adaptor.h>
-
+#include <maya/MApiNamespace.h> // For MFnPlugin
 #include <maya/MDGModifier.h>
 #include <maya/MGlobal.h>
 #include <maya/MPxCommand.h>
-#include <maya/MApiNamespace.h> // For MFnPlugin
+
+#include <pxr/pxr.h>
+#include <pxr/base/tf/token.h>
+#include <pxr/base/vt/value.h>
+
+#include <mayaUsd/base/api.h>
+#include <mayaUsd/fileio/utils/adaptor.h>
 
 PXR_NAMESPACE_OPEN_SCOPE
 
diff --git a/lib/mayaUsd/utils/util.cpp b/lib/mayaUsd/utils/util.cpp
index 17094ce285..1f969076e6 100644
--- a/lib/mayaUsd/utils/util.cpp
+++ b/lib/mayaUsd/utils/util.cpp
@@ -13,26 +13,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-
 #include "util.h"
 
-#include "colorSpace.h"
+#include <sstream>
+#include <string>
+#include <unordered_map>
+#include <vector>
 
-#include "pxr/base/gf/gamma.h"
-#include "pxr/base/gf/vec2f.h"
-#include "pxr/base/gf/vec3f.h"
-#include "pxr/base/gf/vec4f.h"
-#include "pxr/base/tf/hashmap.h"
-#include "pxr/base/tf/staticTokens.h"
-#include "pxr/base/tf/stringUtils.h"
-#include "pxr/base/tf/token.h"
-#include "pxr/base/vt/array.h"
-#include "pxr/base/vt/types.h"
-#include "pxr/base/vt/value.h"
-#include "pxr/usd/sdf/path.h"
-#include "pxr/usd/sdf/tokens.h"
-#include "pxr/usd/usdGeom/mesh.h"
-#include "pxr/usd/usdGeom/metrics.h"
+#include <boost/functional/hash.hpp>
 
 #include <maya/MAnimControl.h>
 #include <maya/MAnimUtil.h>
@@ -40,8 +28,8 @@
 #include <maya/MArgList.h>
 #include <maya/MBoundingBox.h>
 #include <maya/MColor.h>
-#include <maya/MDGModifier.h>
 #include <maya/MDagPath.h>
+#include <maya/MDGModifier.h>
 #include <maya/MFnDagNode.h>
 #include <maya/MFnDependencyNode.h>
 #include <maya/MFnEnumAttribute.h>
@@ -67,13 +55,23 @@
 #include <maya/MStringArray.h>
 #include <maya/MTime.h>
 
-#include <boost/functional/hash.hpp>
-
-#include <sstream>
-#include <string>
-#include <unordered_map>
-#include <vector>
+#include <pxr/base/gf/gamma.h>
+#include <pxr/base/gf/vec2f.h>
+#include <pxr/base/gf/vec3f.h>
+#include <pxr/base/gf/vec4f.h>
+#include <pxr/base/tf/hashmap.h>
+#include <pxr/base/tf/staticTokens.h>
+#include <pxr/base/tf/stringUtils.h>
+#include <pxr/base/tf/token.h>
+#include <pxr/base/vt/array.h>
+#include <pxr/base/vt/types.h>
+#include <pxr/base/vt/value.h>
+#include <pxr/usd/sdf/path.h>
+#include <pxr/usd/sdf/tokens.h>
+#include <pxr/usd/usdGeom/mesh.h>
+#include <pxr/usd/usdGeom/metrics.h>
 
+#include "colorSpace.h"
 
 PXR_NAMESPACE_USING_DIRECTIVE
 
diff --git a/lib/mayaUsd/utils/util.h b/lib/mayaUsd/utils/util.h
index 13537167c2..28b5c70ec0 100644
--- a/lib/mayaUsd/utils/util.h
+++ b/lib/mayaUsd/utils/util.h
@@ -16,23 +16,12 @@
 #ifndef PXRUSDMAYA_UTIL_H
 #define PXRUSDMAYA_UTIL_H
 
-/// \file usdMaya/util.h
-
-#include "pxr/pxr.h"
-#include "../base/api.h"
-
-#include "pxr/base/gf/vec2f.h"
-#include "pxr/base/gf/vec3f.h"
-#include "pxr/base/gf/vec4f.h"
-#include "pxr/base/tf/declarePtrs.h"
-#include "pxr/base/tf/refPtr.h"
-#include "pxr/base/tf/token.h"
-#include "pxr/base/vt/dictionary.h"
-#include "pxr/base/vt/types.h"
-#include "pxr/base/vt/value.h"
-#include "pxr/usd/sdf/path.h"
-#include "pxr/usd/usd/attribute.h"
-#include "pxr/usd/usd/timeCode.h"
+#include <map>
+#include <set>
+#include <string>
+#include <unordered_map>
+#include <unordered_set>
+#include <vector>
 
 #include <maya/MArgDatabase.h>
 #include <maya/MBoundingBox.h>
@@ -50,17 +39,24 @@
 #include <maya/MStatus.h>
 #include <maya/MString.h>
 
-#include <map>
-#include <set>
-#include <string>
-#include <unordered_map>
-#include <unordered_set>
-#include <vector>
-
+#include <pxr/pxr.h>
+#include <pxr/base/gf/vec2f.h>
+#include <pxr/base/gf/vec3f.h>
+#include <pxr/base/gf/vec4f.h>
+#include <pxr/base/tf/declarePtrs.h>
+#include <pxr/base/tf/refPtr.h>
+#include <pxr/base/tf/token.h>
+#include <pxr/base/vt/dictionary.h>
+#include <pxr/base/vt/types.h>
+#include <pxr/base/vt/value.h>
+#include <pxr/usd/sdf/path.h>
+#include <pxr/usd/usd/attribute.h>
+#include <pxr/usd/usd/timeCode.h>
+
+#include <mayaUsd/base/api.h>
 
 PXR_NAMESPACE_OPEN_SCOPE
 
-
 /// General utilities for working with the Maya API.
 namespace UsdMayaUtil
 {
diff --git a/lib/mayaUsd/utils/utilFileSystem.cpp b/lib/mayaUsd/utils/utilFileSystem.cpp
index 57be2519c6..22642257ae 100644
--- a/lib/mayaUsd/utils/utilFileSystem.cpp
+++ b/lib/mayaUsd/utils/utilFileSystem.cpp
@@ -1,12 +1,27 @@
-
+//
+// Copyright 2019 Autodesk
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
 #include "utilFileSystem.h"
-#include "../base/debugCodes.h"
 
 #include <maya/MFileIO.h>
 #include <maya/MItDependencyNodes.h>
 #include <maya/MFnReference.h>
 
-#include "pxr/usd/ar/resolver.h"
+#include <pxr/usd/ar/resolver.h>
+
+#include <mayaUsd/base/debugCodes.h>
 
 PXR_NAMESPACE_USING_DIRECTIVE
 
diff --git a/lib/mayaUsd/utils/utilFileSystem.h b/lib/mayaUsd/utils/utilFileSystem.h
index 9241c1c224..874b34302f 100644
--- a/lib/mayaUsd/utils/utilFileSystem.h
+++ b/lib/mayaUsd/utils/utilFileSystem.h
@@ -1,11 +1,27 @@
-#include "pxr/pxr.h"
+//
+// Copyright 2019 Autodesk
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+#include <string>
 
-#include "../base/api.h"
+#include <boost/filesystem.hpp>
 
 #include <maya/MObject.h>
-#include <string>
 
-#include <boost/filesystem.hpp>
+#include <pxr/pxr.h>
+
+#include <mayaUsd/base/api.h>
 
 PXR_NAMESPACE_OPEN_SCOPE