diff --git a/lib/mayaUsd/ufe/UsdTRSUndoableCommandBase.h b/lib/mayaUsd/ufe/UsdTRSUndoableCommandBase.h
index dd66f33a9a..cfbecf46f7 100644
--- a/lib/mayaUsd/ufe/UsdTRSUndoableCommandBase.h
+++ b/lib/mayaUsd/ufe/UsdTRSUndoableCommandBase.h
@@ -15,14 +15,14 @@
 //
 #pragma once
 
-#include "../base/api.h"
-#include "UsdSceneItem.h"
-
-#include <ufe/transform3dUndoableCommands.h>
-#include <ufe/observer.h>
+#include <mayaUsd/base/api.h>
+#include <mayaUsd/ufe/UsdSceneItem.h>
 
 #include <pxr/usd/usd/attribute.h>
 
+#include <ufe/observer.h>
+#include <ufe/transform3dUndoableCommands.h>
+
 PXR_NAMESPACE_USING_DIRECTIVE
 
 MAYAUSD_NS_DEF {
diff --git a/lib/mayaUsd/ufe/UsdUndoInsertChildCommand.h b/lib/mayaUsd/ufe/UsdUndoInsertChildCommand.h
index fd9584a070..d7f8c203b9 100644
--- a/lib/mayaUsd/ufe/UsdUndoInsertChildCommand.h
+++ b/lib/mayaUsd/ufe/UsdUndoInsertChildCommand.h
@@ -15,14 +15,13 @@
 //
 #pragma once
 
-#include "../base/api.h"
+#include <mayaUsd/base/api.h>
+#include <mayaUsd/ufe/UsdSceneItem.h>
 
-#include "UsdSceneItem.h"
+#include <pxr/usd/usd/prim.h>
 
 #include <ufe/undoableCommand.h>
 
-#include <pxr/usd/usd/prim.h>
-
 PXR_NAMESPACE_USING_DIRECTIVE
 
 MAYAUSD_NS_DEF {
diff --git a/plugin/al/lib/AL_USDMaya/AL/usdmaya/cmds/DebugCommands.h b/plugin/al/lib/AL_USDMaya/AL/usdmaya/cmds/DebugCommands.h
index 3a271b05e7..009cf24bec 100644
--- a/plugin/al/lib/AL_USDMaya/AL/usdmaya/cmds/DebugCommands.h
+++ b/plugin/al/lib/AL_USDMaya/AL/usdmaya/cmds/DebugCommands.h
@@ -15,13 +15,12 @@
 //
 #pragma once
 
-#include "../Api.h"
+#include <AL/maya/utils/Api.h>
+#include <AL/maya/utils/MayaHelperMacros.h>
+#include <AL/usdmaya/Api.h>
 
 #include <maya/MPxCommand.h>
 
-#include "AL/maya/utils/Api.h"
-#include "AL/maya/utils/MayaHelperMacros.h"
-
 
 namespace AL {
 namespace usdmaya {
diff --git a/plugin/al/lib/AL_USDMaya/AL/usdmaya/cmds/LayerCommands.h b/plugin/al/lib/AL_USDMaya/AL/usdmaya/cmds/LayerCommands.h
index f83d9b584d..6858bea02b 100644
--- a/plugin/al/lib/AL_USDMaya/AL/usdmaya/cmds/LayerCommands.h
+++ b/plugin/al/lib/AL_USDMaya/AL/usdmaya/cmds/LayerCommands.h
@@ -15,16 +15,16 @@
 //
 #pragma once
 
-#include "../Api.h"
+#include <AL/maya/utils/Api.h>
+#include <AL/maya/utils/MayaHelperMacros.h>
+#include <AL/usdmaya/Api.h>
+#include <AL/usdmaya/ForwardDeclares.h>
+
+#include <pxr/usd/usd/stage.h>
 
-#include "AL/usdmaya/ForwardDeclares.h"
-#include "AL/maya/utils/Api.h"
-#include "AL/maya/utils/MayaHelperMacros.h"
 #include <maya/MDGModifier.h>
 #include <maya/MPxCommand.h>
 
-#include <pxr/usd/usd/stage.h>
-
 PXR_NAMESPACE_USING_DIRECTIVE
 
 namespace AL {
diff --git a/plugin/al/lib/AL_USDMaya/AL/usdmaya/cmds/ListTranslators.h b/plugin/al/lib/AL_USDMaya/AL/usdmaya/cmds/ListTranslators.h
index ce0d46b22f..71ed6f3a6c 100644
--- a/plugin/al/lib/AL_USDMaya/AL/usdmaya/cmds/ListTranslators.h
+++ b/plugin/al/lib/AL_USDMaya/AL/usdmaya/cmds/ListTranslators.h
@@ -15,9 +15,9 @@
 //
 #pragma once
 
-#include "../Api.h"
+#include <AL/maya/utils/MayaHelperMacros.h>
+#include <AL/usdmaya/Api.h>
 
-#include "AL/maya/utils/MayaHelperMacros.h"
 #include <maya/MPxCommand.h>
 
 namespace AL {
diff --git a/plugin/al/lib/AL_USDMaya/AL/usdmaya/cmds/ProxyShapeCommands.h b/plugin/al/lib/AL_USDMaya/AL/usdmaya/cmds/ProxyShapeCommands.h
index 8b1942b4e7..d500af9e18 100644
--- a/plugin/al/lib/AL_USDMaya/AL/usdmaya/cmds/ProxyShapeCommands.h
+++ b/plugin/al/lib/AL_USDMaya/AL/usdmaya/cmds/ProxyShapeCommands.h
@@ -15,18 +15,17 @@
 //
 #pragma once
 
-#include "../Api.h"
+#include <AL/usdmaya/Api.h>
+#include <AL/usdmaya/StageCache.h>
+#include <AL/usdmaya/fileio/ImportParams.h>
+#include <AL/usdmaya/nodes/ProxyShape.h>
+
+#include <pxr/usd/usd/stage.h>
 
 #include <maya/MDagModifier.h>
 #include <maya/MObjectArray.h>
 #include <maya/MPxCommand.h>
 
-#include "AL/usdmaya/fileio/ImportParams.h"
-#include "AL/usdmaya/nodes/ProxyShape.h"
-#include "AL/usdmaya/StageCache.h"
-
-#include <pxr/usd/usd/stage.h>
-
 PXR_NAMESPACE_USING_DIRECTIVE
 
 namespace AL {
diff --git a/plugin/al/lib/AL_USDMaya/AL/usdmaya/cmds/RendererCommands.h b/plugin/al/lib/AL_USDMaya/AL/usdmaya/cmds/RendererCommands.h
index c8970ada49..e358bf5a66 100644
--- a/plugin/al/lib/AL_USDMaya/AL/usdmaya/cmds/RendererCommands.h
+++ b/plugin/al/lib/AL_USDMaya/AL/usdmaya/cmds/RendererCommands.h
@@ -15,9 +15,8 @@
 //
 #pragma once
 
-#include "../Api.h"
-
-#include "AL/maya/utils/MayaHelperMacros.h"
+#include <AL/maya/utils/MayaHelperMacros.h>
+#include <AL/usdmaya/Api.h>
 
 #include <maya/MPxCommand.h>
 
diff --git a/plugin/al/lib/AL_USDMaya/AL/usdmaya/cmds/SyncFileIOGui.h b/plugin/al/lib/AL_USDMaya/AL/usdmaya/cmds/SyncFileIOGui.h
index 40020fe4d8..068480374a 100644
--- a/plugin/al/lib/AL_USDMaya/AL/usdmaya/cmds/SyncFileIOGui.h
+++ b/plugin/al/lib/AL_USDMaya/AL/usdmaya/cmds/SyncFileIOGui.h
@@ -15,12 +15,11 @@
 //
 #pragma once
 
-#include "../Api.h"
+#include <AL/maya/utils/MayaHelperMacros.h>
+#include <AL/usdmaya/Api.h>
 
 #include <maya/MPxCommand.h>
 
-#include "AL/maya/utils/MayaHelperMacros.h"
-
 namespace AL {
 namespace usdmaya {
 namespace cmds {
diff --git a/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/AnimationTranslator.h b/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/AnimationTranslator.h
index 84a31f265d..fc9792345d 100644
--- a/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/AnimationTranslator.h
+++ b/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/AnimationTranslator.h
@@ -15,14 +15,13 @@
 //
 #pragma once
 
-#include "../Api.h"
-
-#include "AL/maya/utils/Utils.h"
-
-#include "AL/usdmaya/utils/AnimationTranslator.h"
-#include "AL/usdmaya/fileio/translators/TranslatorBase.h"
+#include <AL/maya/utils/Utils.h>
+#include <AL/usdmaya/Api.h>
+#include <AL/usdmaya/fileio/translators/TranslatorBase.h>
+#include <AL/usdmaya/utils/AnimationTranslator.h>
 
 #include <pxr/usd/usd/attribute.h>
+
 PXR_NAMESPACE_USING_DIRECTIVE
 
 namespace AL {
diff --git a/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/ExportTranslator.h b/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/ExportTranslator.h
index 2e8d5b3fc8..cd24edc867 100644
--- a/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/ExportTranslator.h
+++ b/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/ExportTranslator.h
@@ -15,10 +15,9 @@
 //
 #pragma once
 
-#include "../Api.h"
-
-#include "AL/maya/utils/FileTranslatorBase.h"
-#include "AL/maya/utils/PluginTranslatorOptions.h"
+#include <AL/maya/utils/FileTranslatorBase.h>
+#include <AL/maya/utils/PluginTranslatorOptions.h>
+#include <AL/usdmaya/Api.h>
 
 namespace AL {
 namespace usdmaya {
diff --git a/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/ImportTranslator.h b/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/ImportTranslator.h
index 74ff9d63c1..04c5779b05 100644
--- a/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/ImportTranslator.h
+++ b/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/ImportTranslator.h
@@ -15,11 +15,10 @@
 //
 #pragma once
 
-#include "../Api.h"
-
-#include "AL/maya/utils/FileTranslatorBase.h"
-#include "AL/usdmaya/fileio/ImportParams.h"
-#include "AL/maya/utils/PluginTranslatorOptions.h"
+#include <AL/maya/utils/FileTranslatorBase.h>
+#include <AL/maya/utils/PluginTranslatorOptions.h>
+#include <AL/usdmaya/Api.h>
+#include <AL/usdmaya/fileio/ImportParams.h>
 
 namespace AL {
 namespace usdmaya {
diff --git a/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/translators/DagNodeTranslator.h b/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/translators/DagNodeTranslator.h
index 787df383fc..16a28e991b 100644
--- a/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/translators/DagNodeTranslator.h
+++ b/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/translators/DagNodeTranslator.h
@@ -15,13 +15,14 @@
 //
 #pragma once
 
-#include "../../Api.h"
-
+#include <AL/usdmaya/Api.h>
 #include <AL/usdmaya/ForwardDeclares.h>
-#include "AL/usdmaya/fileio/translators/DgNodeTranslator.h"
-#include <maya/MObject.h>
+#include <AL/usdmaya/fileio/translators/DgNodeTranslator.h>
+
 #include <pxr/base/tf/token.h>
 
+#include <maya/MObject.h>
+
 namespace AL {
 namespace usdmaya {
 namespace fileio {
diff --git a/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/translators/DgNodeTranslator.h b/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/translators/DgNodeTranslator.h
index 0bd1e9ead4..7d0dc729eb 100644
--- a/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/translators/DgNodeTranslator.h
+++ b/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/translators/DgNodeTranslator.h
@@ -15,24 +15,22 @@
 //
 #pragma once
 
-#include "../../Api.h"
-
+#include <AL/maya/utils/MayaHelperMacros.h>
+#include <AL/usdmaya/Api.h>
 #include <AL/usdmaya/ForwardDeclares.h>
-#include "AL/usdmaya/utils/AttributeType.h"
-#include "AL/usdmaya/utils/DgNodeHelper.h"
-#include "AL/usdmaya/utils/ForwardDeclares.h"
-#include "AL/maya/utils/MayaHelperMacros.h"
+#include <AL/usdmaya/utils/AttributeType.h>
+#include <AL/usdmaya/utils/DgNodeHelper.h>
+#include <AL/usdmaya/utils/ForwardDeclares.h>
+
+#include <pxr/base/gf/half.h>
+#include <pxr/usd/usd/attribute.h>
 
-#include <maya/MPlug.h>
 #include <maya/MAngle.h>
 #include <maya/MDistance.h>
-#include <maya/MTime.h>
-
 #include <maya/MGlobal.h>
+#include <maya/MPlug.h>
 #include <maya/MStatus.h>
-
-#include <pxr/base/gf/half.h>
-#include <pxr/usd/usd/attribute.h>
+#include <maya/MTime.h>
 
 #include <string>
 #include <vector>
diff --git a/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/translators/ExtraDataPlugin.h b/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/translators/ExtraDataPlugin.h
index 3fb78f7d02..02e25b7581 100644
--- a/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/translators/ExtraDataPlugin.h
+++ b/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/translators/ExtraDataPlugin.h
@@ -15,19 +15,18 @@
 //
 #pragma once
 
-#include "../../Api.h"
-#include "AL/maya/utils/Api.h"
-
-#include <maya/MDagPath.h>
+#include <AL/maya/utils/Api.h>
+#include <AL/usdmaya/Api.h>
+#include <AL/usdmaya/fileio/ExportParams.h>
+#include <AL/usdmaya/fileio/translators/TranslatorContext.h>
 
 #include <pxr/base/tf/refBase.h>
+#include <pxr/base/tf/registryManager.h>
 #include <pxr/base/tf/type.h>
 #include <pxr/base/tf/weakBase.h>
-#include <pxr/base/tf/registryManager.h>
 #include <pxr/usd/usd/prim.h>
 
-#include "AL/usdmaya/fileio/translators/TranslatorContext.h"
-#include "AL/usdmaya/fileio/ExportParams.h"
+#include <maya/MDagPath.h>
 
 namespace AL {
 namespace usdmaya {
diff --git a/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/translators/TestExtraDataPlugin.h b/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/translators/TestExtraDataPlugin.h
index fc8c0f8270..0bb4bb5a6d 100644
--- a/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/translators/TestExtraDataPlugin.h
+++ b/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/translators/TestExtraDataPlugin.h
@@ -15,21 +15,20 @@
 //
 #pragma once
 
-#include "../../Api.h"
-#include "AL/maya/utils/Api.h"
-
-#include <maya/MDagPath.h>
+#include <AL/maya/utils/Api.h>
+#include <AL/usdmaya/Api.h>
+#include <AL/usdmaya/fileio/ExportParams.h>
+#include <AL/usdmaya/fileio/translators/ExtraDataPlugin.h>
+#include <AL/usdmaya/fileio/translators/TranslatorContext.h>
 
 #include <pxr/base/tf/refBase.h>
+#include <pxr/base/tf/registryManager.h>
 #include <pxr/base/tf/type.h>
 #include <pxr/base/tf/weakBase.h>
-#include <pxr/base/tf/registryManager.h>
 #include <pxr/usd/usd/prim.h>
 #include <pxr/usd/usd/attribute.h>
 
-#include "AL/usdmaya/fileio/translators/TranslatorContext.h"
-#include "AL/usdmaya/fileio/translators/ExtraDataPlugin.h"
-#include "AL/usdmaya/fileio/ExportParams.h"
+#include <maya/MDagPath.h>
 
 namespace AL {
 namespace usdmaya {
diff --git a/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/translators/TransformTranslator.h b/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/translators/TransformTranslator.h
index 27d553251f..ce92d7162c 100644
--- a/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/translators/TransformTranslator.h
+++ b/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/translators/TransformTranslator.h
@@ -15,11 +15,10 @@
 //
 #pragma once
 
-#include "../../Api.h"
-
+#include <AL/usdmaya/Api.h>
 #include <AL/usdmaya/ForwardDeclares.h>
-#include "AL/usdmaya/TransformOperation.h"
-#include "AL/usdmaya/fileio/translators/DagNodeTranslator.h"
+#include <AL/usdmaya/TransformOperation.h>
+#include <AL/usdmaya/fileio/translators/DagNodeTranslator.h>
 
 #include <pxr/usd/usd/attribute.h>
 #include <pxr/usd/usdGeom/xform.h>
diff --git a/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/translators/TranslatorBase.h b/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/translators/TranslatorBase.h
index 1e3b745b1b..17bf0ca63c 100644
--- a/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/translators/TranslatorBase.h
+++ b/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/translators/TranslatorBase.h
@@ -15,23 +15,23 @@
 //
 #pragma once
 
-#include "../../Api.h"
-#include "AL/maya/utils/Api.h"
-
-#include <maya/MDagPath.h>
+#include <AL/maya/utils/Api.h>
+#include <AL/usdmaya/Api.h>
+#include <AL/usdmaya/fileio/ExportParams.h>
+#include <AL/usdmaya/fileio/translators/ExtraDataPlugin.h>
+#include <AL/usdmaya/fileio/translators/TranslatorContext.h>
 
 #include <pxr/base/tf/refBase.h>
+#include <pxr/base/tf/registryManager.h>
 #include <pxr/base/tf/type.h>
 #include <pxr/base/tf/weakBase.h>
-#include <pxr/base/tf/registryManager.h>
 #include <pxr/usd/usd/prim.h>
 
+#include <maya/MDagPath.h>
+
+#include <functional>
 #include <iostream>
 #include <unordered_map>
-#include <functional>
-#include "AL/usdmaya/fileio/translators/TranslatorContext.h"
-#include "AL/usdmaya/fileio/translators/ExtraDataPlugin.h"
-#include "AL/usdmaya/fileio/ExportParams.h"
 
 namespace AL {
 namespace usdmaya {
diff --git a/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/translators/TranslatorContext.h b/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/translators/TranslatorContext.h
index ed5d8e0582..bcad9f3e2d 100644
--- a/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/translators/TranslatorContext.h
+++ b/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/translators/TranslatorContext.h
@@ -15,24 +15,25 @@
 //
 #pragma once
 
-#include "../../Api.h"
-
+#include <AL/usdmaya/Api.h>
+#include <AL/usdmaya/DebugCodes.h>
 #include <AL/usdmaya/ForwardDeclares.h>
-#include <maya/MPxData.h>
+#include <mayaUsdUtils/ForwardDeclares.h>
+
+#include <pxr/base/tf/debug.h>
+#include <pxr/base/tf/refPtr.h>
+#include <pxr/pxr.h>
+#include <pxr/usd/usd/prim.h>
+
+#include <maya/MDGModifier.h>
 #include <maya/MGlobal.h>
 #include <maya/MObject.h>
-#include <maya/MObjectHandle.h>
 #include <maya/MObjectArray.h>
-#include <maya/MDGModifier.h>
-#include <pxr/pxr.h>
-#include <pxr/base/tf/refPtr.h>
-#include <pxr/usd/usd/prim.h>
-#include <pxr/base/tf/debug.h>
-#include "AL/usdmaya/DebugCodes.h"
+#include <maya/MObjectHandle.h>
+#include <maya/MPxData.h>
 
-#include <vector>
 #include <string>
-#include <mayaUsdUtils/ForwardDeclares.h>
+#include <vector>
 
 PXR_NAMESPACE_USING_DIRECTIVE
 
diff --git a/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/translators/TranslatorTestType.h b/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/translators/TranslatorTestType.h
index b6f5193903..7a94387215 100644
--- a/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/translators/TranslatorTestType.h
+++ b/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/translators/TranslatorTestType.h
@@ -15,14 +15,14 @@
 //
 #pragma once
 
-#include "../../Api.h"
+#include <AL/usdmaya/Api.h>
 
 #include <pxr/pxr.h>
-#include <pxr/usd/usd/typed.h>
-#include <pxr/usd/usd/prim.h>
-#include <pxr/usd/usd/stage.h>
 #include <pxr/base/tf/token.h>
 #include <pxr/base/tf/type.h>
+#include <pxr/usd/usd/prim.h>
+#include <pxr/usd/usd/stage.h>
+#include <pxr/usd/usd/typed.h>
 
 PXR_NAMESPACE_USING_DIRECTIVE
 
diff --git a/plugin/al/lib/AL_USDMaya/AL/usdmaya/nodes/proxy/LockManager.h b/plugin/al/lib/AL_USDMaya/AL/usdmaya/nodes/proxy/LockManager.h
index 75edc54260..6286cd4e94 100644
--- a/plugin/al/lib/AL_USDMaya/AL/usdmaya/nodes/proxy/LockManager.h
+++ b/plugin/al/lib/AL_USDMaya/AL/usdmaya/nodes/proxy/LockManager.h
@@ -15,9 +15,9 @@
 //
 #pragma once
 
-#include <pxr/usd/sdf/path.h>
+#include <AL/usdmaya/Api.h>
 
-#include "../../Api.h"
+#include <pxr/usd/sdf/path.h>
 
 PXR_NAMESPACE_USING_DIRECTIVE
 
diff --git a/plugin/al/lib/AL_USDMaya/AL/usdmaya/nodes/proxy/PrimFilter.h b/plugin/al/lib/AL_USDMaya/AL/usdmaya/nodes/proxy/PrimFilter.h
index 197b0f791b..2bc2b38daa 100644
--- a/plugin/al/lib/AL_USDMaya/AL/usdmaya/nodes/proxy/PrimFilter.h
+++ b/plugin/al/lib/AL_USDMaya/AL/usdmaya/nodes/proxy/PrimFilter.h
@@ -15,13 +15,13 @@
 //
 #pragma once
 
-#include "../../Api.h"
+#include <AL/usdmaya/Api.h>
+#include <mayaUsdUtils/ForwardDeclares.h>
 
-#include <vector>
-#include <pxr/usd/usd/prim.h>
 #include <pxr/usd/sdf/path.h>
+#include <pxr/usd/usd/prim.h>
 
-#include <mayaUsdUtils/ForwardDeclares.h>
+#include <vector>
 
 PXR_NAMESPACE_USING_DIRECTIVE
 
diff --git a/plugin/al/plugin/AL_USDMayaPlugin/plugin.cpp b/plugin/al/plugin/AL_USDMayaPlugin/plugin.cpp
index 4e9cb84a7c..031fef37f1 100644
--- a/plugin/al/plugin/AL_USDMayaPlugin/plugin.cpp
+++ b/plugin/al/plugin/AL_USDMayaPlugin/plugin.cpp
@@ -14,7 +14,7 @@
 // limitations under the License.
 //
 
-#include "./Api.h"
+#include "Api.h"
 
 #include <maya/MFnPlugin.h>
 
diff --git a/plugin/al/plugin/AL_USDMayaTestPlugin/plugin.cpp b/plugin/al/plugin/AL_USDMayaTestPlugin/plugin.cpp
index f9b25f892d..5122f6e533 100644
--- a/plugin/al/plugin/AL_USDMayaTestPlugin/plugin.cpp
+++ b/plugin/al/plugin/AL_USDMayaTestPlugin/plugin.cpp
@@ -14,7 +14,7 @@
 // limitations under the License.
 //
 
-#include "./Api.h"
+#include "Api.h"
 
 #include <maya/MFnPlugin.h>
 #include <maya/MGlobal.h>
diff --git a/plugin/al/schemas/AL/usd/schemas/maya/FrameRange.cpp b/plugin/al/schemas/AL/usd/schemas/maya/FrameRange.cpp
index 0c7e7251f9..caf88bba3b 100644
--- a/plugin/al/schemas/AL/usd/schemas/maya/FrameRange.cpp
+++ b/plugin/al/schemas/AL/usd/schemas/maya/FrameRange.cpp
@@ -13,12 +13,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-#include "./FrameRange.h"
-#include <pxr/usd/usd/schemaRegistry.h>
-#include <pxr/usd/usd/typed.h>
+#include "FrameRange.h"
 
-#include <pxr/usd/sdf/types.h>
 #include <pxr/usd/sdf/assetPath.h>
+#include <pxr/usd/sdf/types.h>
+#include <pxr/usd/usd/schemaRegistry.h>
+#include <pxr/usd/usd/typed.h>
 
 PXR_NAMESPACE_OPEN_SCOPE
 
diff --git a/plugin/al/schemas/AL/usd/schemas/maya/FrameRange.h b/plugin/al/schemas/AL/usd/schemas/maya/FrameRange.h
index 02548253ef..a284f49aba 100644
--- a/plugin/al/schemas/AL/usd/schemas/maya/FrameRange.h
+++ b/plugin/al/schemas/AL/usd/schemas/maya/FrameRange.h
@@ -18,21 +18,19 @@
 
 /// \file AL_USDMayaSchemas/FrameRange.h
 
-#include <pxr/pxr.h>
-#include "./api.h"
-#include <pxr/usd/usd/typed.h>
-#include <pxr/usd/usd/prim.h>
-#include <pxr/usd/usd/stage.h>
-#include "./tokens.h"
-
-#include <pxr/base/vt/value.h>
+#include "api.h"
+#include "tokens.h"
 
+#include <pxr/base/gf/matrix4d.h>
 #include <pxr/base/gf/vec3d.h>
 #include <pxr/base/gf/vec3f.h>
-#include <pxr/base/gf/matrix4d.h>
-
 #include <pxr/base/tf/token.h>
 #include <pxr/base/tf/type.h>
+#include <pxr/base/vt/value.h>
+#include <pxr/pxr.h>
+#include <pxr/usd/usd/prim.h>
+#include <pxr/usd/usd/stage.h>
+#include <pxr/usd/usd/typed.h>
 
 PXR_NAMESPACE_OPEN_SCOPE
 
diff --git a/plugin/al/schemas/AL/usd/schemas/maya/ModelAPI.cpp b/plugin/al/schemas/AL/usd/schemas/maya/ModelAPI.cpp
index 146d79cdc0..d3599355f6 100644
--- a/plugin/al/schemas/AL/usd/schemas/maya/ModelAPI.cpp
+++ b/plugin/al/schemas/AL/usd/schemas/maya/ModelAPI.cpp
@@ -13,13 +13,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-#include "./ModelAPI.h"
-#include <pxr/usd/usd/schemaRegistry.h>
-#include <pxr/usd/usd/typed.h>
-#include <pxr/usd/usd/tokens.h>
+#include "ModelAPI.h"
 
-#include <pxr/usd/sdf/types.h>
 #include <pxr/usd/sdf/assetPath.h>
+#include <pxr/usd/sdf/types.h>
+#include <pxr/usd/usd/schemaRegistry.h>
+#include <pxr/usd/usd/tokens.h>
+#include <pxr/usd/usd/typed.h>
 
 PXR_NAMESPACE_OPEN_SCOPE
 
diff --git a/plugin/al/schemas/AL/usd/schemas/maya/ModelAPI.h b/plugin/al/schemas/AL/usd/schemas/maya/ModelAPI.h
index a726394b97..8e9aa19da6 100644
--- a/plugin/al/schemas/AL/usd/schemas/maya/ModelAPI.h
+++ b/plugin/al/schemas/AL/usd/schemas/maya/ModelAPI.h
@@ -18,23 +18,19 @@
 
 /// \file AL_USDMayaSchemas/ModelAPI.h
 
-#include <pxr/pxr.h>
-#include "./api.h"
-#include <pxr/usd/usd/modelAPI.h>
-#include <pxr/usd/usd/prim.h>
-#include <pxr/usd/usd/stage.h>
-
-#include "./tokens.h"
-
-
-#include <pxr/base/vt/value.h>
+#include "api.h"
+#include "tokens.h"
 
+#include <pxr/base/gf/matrix4d.h>
 #include <pxr/base/gf/vec3d.h>
 #include <pxr/base/gf/vec3f.h>
-#include <pxr/base/gf/matrix4d.h>
-
 #include <pxr/base/tf/token.h>
 #include <pxr/base/tf/type.h>
+#include <pxr/base/vt/value.h>
+#include <pxr/pxr.h>
+#include <pxr/usd/usd/modelAPI.h>
+#include <pxr/usd/usd/prim.h>
+#include <pxr/usd/usd/stage.h>
 
 PXR_NAMESPACE_OPEN_SCOPE
 
diff --git a/plugin/al/schemas/AL/usd/schemas/maya/schema.usda.in b/plugin/al/schemas/AL/usd/schemas/maya/schema.usda.in
index 765153119b..5f7e51117e 100644
--- a/plugin/al/schemas/AL/usd/schemas/maya/schema.usda.in
+++ b/plugin/al/schemas/AL/usd/schemas/maya/schema.usda.in
@@ -75,7 +75,7 @@ doc = "Data used to import a maya reference."
         string className = "ModelAPI"
         string fileName = "ModelAPI"
         string extraIncludes = """
-#include "./tokens.h"
+#include "tokens.h"
 """
       }
 )
diff --git a/plugin/al/schemas/AL/usd/schemas/maya/tokens.cpp b/plugin/al/schemas/AL/usd/schemas/maya/tokens.cpp
index dcd10143d5..13c2d8071e 100644
--- a/plugin/al/schemas/AL/usd/schemas/maya/tokens.cpp
+++ b/plugin/al/schemas/AL/usd/schemas/maya/tokens.cpp
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-#include "./tokens.h"
+#include "tokens.h"
 
 PXR_NAMESPACE_OPEN_SCOPE
 
diff --git a/plugin/al/schemas/AL/usd/schemas/maya/tokens.h b/plugin/al/schemas/AL/usd/schemas/maya/tokens.h
index 2e9548607b..816bc77abe 100644
--- a/plugin/al/schemas/AL/usd/schemas/maya/tokens.h
+++ b/plugin/al/schemas/AL/usd/schemas/maya/tokens.h
@@ -25,10 +25,12 @@
 // 
 // XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
 
-#include <pxr/pxr.h>
-#include "./api.h"
+#include "api.h"
+
 #include <pxr/base/tf/staticData.h>
 #include <pxr/base/tf/token.h>
+#include <pxr/pxr.h>
+
 #include <vector>
 
 PXR_NAMESPACE_OPEN_SCOPE
diff --git a/plugin/al/schemas/AL/usd/schemas/maya/wrapFrameRange.cpp b/plugin/al/schemas/AL/usd/schemas/maya/wrapFrameRange.cpp
index 5aa33357d9..2bf6452ed8 100644
--- a/plugin/al/schemas/AL/usd/schemas/maya/wrapFrameRange.cpp
+++ b/plugin/al/schemas/AL/usd/schemas/maya/wrapFrameRange.cpp
@@ -13,16 +13,15 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-#include "./FrameRange.h"
-#include <pxr/usd/usd/schemaBase.h>
-
-#include <pxr/usd/sdf/primSpec.h>
+#include "FrameRange.h"
 
-#include <pxr/usd/usd/pyConversions.h>
 #include <pxr/base/tf/pyContainerConversions.h>
 #include <pxr/base/tf/pyResultConversions.h>
 #include <pxr/base/tf/pyUtils.h>
 #include <pxr/base/tf/wrapTypeHelpers.h>
+#include <pxr/usd/sdf/primSpec.h>
+#include <pxr/usd/usd/pyConversions.h>
+#include <pxr/usd/usd/schemaBase.h>
 
 #include <boost/python.hpp>
 
diff --git a/plugin/al/schemas/AL/usd/schemas/maya/wrapModelAPI.cpp b/plugin/al/schemas/AL/usd/schemas/maya/wrapModelAPI.cpp
index f72206d557..0245758946 100644
--- a/plugin/al/schemas/AL/usd/schemas/maya/wrapModelAPI.cpp
+++ b/plugin/al/schemas/AL/usd/schemas/maya/wrapModelAPI.cpp
@@ -13,16 +13,15 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-#include "./ModelAPI.h"
-#include <pxr/usd/usd/schemaBase.h>
-
-#include <pxr/usd/sdf/primSpec.h>
+#include "ModelAPI.h"
 
-#include <pxr/usd/usd/pyConversions.h>
 #include <pxr/base/tf/pyContainerConversions.h>
 #include <pxr/base/tf/pyResultConversions.h>
 #include <pxr/base/tf/pyUtils.h>
 #include <pxr/base/tf/wrapTypeHelpers.h>
+#include <pxr/usd/sdf/primSpec.h>
+#include <pxr/usd/usd/pyConversions.h>
+#include <pxr/usd/usd/schemaBase.h>
 
 #include <boost/python.hpp>
 
diff --git a/plugin/al/schemas/AL/usd/schemas/maya/wrapTokens.cpp b/plugin/al/schemas/AL/usd/schemas/maya/wrapTokens.cpp
index b1072313b8..5cdd0d9891 100644
--- a/plugin/al/schemas/AL/usd/schemas/maya/wrapTokens.cpp
+++ b/plugin/al/schemas/AL/usd/schemas/maya/wrapTokens.cpp
@@ -14,8 +14,9 @@
 // limitations under the License.
 //
 // GENERATED FILE.  DO NOT EDIT.
+#include "tokens.h"
+
 #include <boost/python/class.hpp>
-#include "./tokens.h"
 
 PXR_NAMESPACE_USING_DIRECTIVE
 
diff --git a/plugin/al/schemas/AL/usd/schemas/mayatest/ExamplePolyCubeNode.h b/plugin/al/schemas/AL/usd/schemas/mayatest/ExamplePolyCubeNode.h
index b5b913160f..f51bfc42f6 100644
--- a/plugin/al/schemas/AL/usd/schemas/mayatest/ExamplePolyCubeNode.h
+++ b/plugin/al/schemas/AL/usd/schemas/mayatest/ExamplePolyCubeNode.h
@@ -26,21 +26,19 @@
 
 /// \file AL_USDMayaSchemasTest/ExamplePolyCubeNode.h
 
-#include <pxr/pxr.h>
-#include "./api.h"
-#include <pxr/usd/usd/typed.h>
-#include <pxr/usd/usd/prim.h>
-#include <pxr/usd/usd/stage.h>
-#include "./tokens.h"
-
-#include <pxr/base/vt/value.h>
+#include "api.h"
+#include "tokens.h"
 
+#include <pxr/base/gf/matrix4d.h>
 #include <pxr/base/gf/vec3d.h>
 #include <pxr/base/gf/vec3f.h>
-#include <pxr/base/gf/matrix4d.h>
-
 #include <pxr/base/tf/token.h>
 #include <pxr/base/tf/type.h>
+#include <pxr/base/vt/value.h>
+#include <pxr/pxr.h>
+#include <pxr/usd/usd/prim.h>
+#include <pxr/usd/usd/stage.h>
+#include <pxr/usd/usd/typed.h>
 
 PXR_NAMESPACE_OPEN_SCOPE
 
diff --git a/plugin/al/schemas/AL/usd/schemas/mayatest/tokens.h b/plugin/al/schemas/AL/usd/schemas/mayatest/tokens.h
index 0dbaaca651..3d58fb0da6 100644
--- a/plugin/al/schemas/AL/usd/schemas/mayatest/tokens.h
+++ b/plugin/al/schemas/AL/usd/schemas/mayatest/tokens.h
@@ -33,10 +33,12 @@
 // 
 // XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
 
-#include <pxr/pxr.h>
-#include "./api.h"
+#include "api.h"
+
 #include <pxr/base/tf/staticData.h>
 #include <pxr/base/tf/token.h>
+#include <pxr/pxr.h>
+
 #include <vector>
 
 PXR_NAMESPACE_OPEN_SCOPE