diff --git a/lib/mayaHydra/hydraExtensions/api.h b/lib/mayaHydra/hydraExtensions/api.h index 10f692c3be..77d0a59663 100644 --- a/lib/mayaHydra/hydraExtensions/api.h +++ b/lib/mayaHydra/hydraExtensions/api.h @@ -37,4 +37,8 @@ #endif #endif +// Convenience symbol versioning include: because api.h is widely +// included, this reduces the need to explicitly include mayaHydra.h. +#include + #endif // MAYAHYDRALIB_API_H diff --git a/lib/mayaHydra/hydraExtensions/hydraUtils.h b/lib/mayaHydra/hydraExtensions/hydraUtils.h index 294ee7be30..28f2acdcc8 100644 --- a/lib/mayaHydra/hydraExtensions/hydraUtils.h +++ b/lib/mayaHydra/hydraExtensions/hydraUtils.h @@ -19,7 +19,6 @@ #define MAYAHYDRALIB_HYDRA_UTILS_H #include -#include #include #include diff --git a/lib/mayaHydra/hydraExtensions/mayaUtils.h b/lib/mayaHydra/hydraExtensions/mayaUtils.h index 005ba20591..5e1264c7d9 100644 --- a/lib/mayaHydra/hydraExtensions/mayaUtils.h +++ b/lib/mayaHydra/hydraExtensions/mayaUtils.h @@ -18,7 +18,6 @@ #define MAYAHYDRALIB_MAYA_UTILS_H #include -#include #include #include diff --git a/lib/mayaHydra/hydraExtensions/mhLeadObjectPathTracker.h b/lib/mayaHydra/hydraExtensions/mhLeadObjectPathTracker.h index 28e9e48b7f..1c29883bf0 100644 --- a/lib/mayaHydra/hydraExtensions/mhLeadObjectPathTracker.h +++ b/lib/mayaHydra/hydraExtensions/mhLeadObjectPathTracker.h @@ -18,7 +18,6 @@ //Local headers #include "mayaHydraLib/api.h" -#include "mayaHydraLib/mayaHydra.h" #include "mayaHydraLib/sceneIndex/mhDirtyLeadObjectSceneIndex.h" //Flow viewport headers diff --git a/lib/mayaHydra/hydraExtensions/mhWireframeColorInterfaceImp.h b/lib/mayaHydra/hydraExtensions/mhWireframeColorInterfaceImp.h index 1c92f0652e..61bbe8c948 100644 --- a/lib/mayaHydra/hydraExtensions/mhWireframeColorInterfaceImp.h +++ b/lib/mayaHydra/hydraExtensions/mhWireframeColorInterfaceImp.h @@ -18,7 +18,6 @@ //Local headers #include -#include #include //Flow viewport headers diff --git a/lib/mayaHydra/hydraExtensions/mixedUtils.h b/lib/mayaHydra/hydraExtensions/mixedUtils.h index f7baec92b2..a35e1d3c08 100644 --- a/lib/mayaHydra/hydraExtensions/mixedUtils.h +++ b/lib/mayaHydra/hydraExtensions/mixedUtils.h @@ -19,7 +19,6 @@ #define MAYAHYDRALIB_MIXED_UTILS_H #include -#include #include #include diff --git a/lib/mayaHydra/hydraExtensions/sceneIndex/mayaHydraMayaDataProducerSceneIndexDataConcreteFactory.h b/lib/mayaHydra/hydraExtensions/sceneIndex/mayaHydraMayaDataProducerSceneIndexDataConcreteFactory.h index d7abcdcb76..e9cb712886 100644 --- a/lib/mayaHydra/hydraExtensions/sceneIndex/mayaHydraMayaDataProducerSceneIndexDataConcreteFactory.h +++ b/lib/mayaHydra/hydraExtensions/sceneIndex/mayaHydraMayaDataProducerSceneIndexDataConcreteFactory.h @@ -18,7 +18,6 @@ //MayaHydra headers #include "mayaHydraLib/api.h" -#include "mayaHydraLib/mayaHydra.h" //Flow Viewport headers #include diff --git a/lib/mayaHydra/hydraExtensions/sceneIndex/mayaHydraMayaFilteringSceneIndexDataConcreteFactory.h b/lib/mayaHydra/hydraExtensions/sceneIndex/mayaHydraMayaFilteringSceneIndexDataConcreteFactory.h index bc3f93fad4..b24576ba1d 100644 --- a/lib/mayaHydra/hydraExtensions/sceneIndex/mayaHydraMayaFilteringSceneIndexDataConcreteFactory.h +++ b/lib/mayaHydra/hydraExtensions/sceneIndex/mayaHydraMayaFilteringSceneIndexDataConcreteFactory.h @@ -18,7 +18,6 @@ //MayaHydra headers #include "mayaHydraLib/api.h" -#include "mayaHydraLib/mayaHydra.h" //Flow Viewport headers #include "flowViewport/API/perViewportSceneIndicesData/fvpFilteringSceneIndexDataAbstractFactory.h" diff --git a/lib/mayaHydra/hydraExtensions/sceneIndex/mayaHydraSceneIndexDataFactoriesSetup.h b/lib/mayaHydra/hydraExtensions/sceneIndex/mayaHydraSceneIndexDataFactoriesSetup.h index e0fd83293c..6f4eb29069 100644 --- a/lib/mayaHydra/hydraExtensions/sceneIndex/mayaHydraSceneIndexDataFactoriesSetup.h +++ b/lib/mayaHydra/hydraExtensions/sceneIndex/mayaHydraSceneIndexDataFactoriesSetup.h @@ -18,7 +18,6 @@ //Local headers #include "mayaHydraLib/api.h" -#include "mayaHydraLib/mayaHydra.h" namespace MAYAHYDRA_NS_DEF{ diff --git a/lib/mayaHydra/hydraExtensions/sceneIndex/mhDirtyLeadObjectSceneIndex.h b/lib/mayaHydra/hydraExtensions/sceneIndex/mhDirtyLeadObjectSceneIndex.h index 9ac549ace7..461c6934db 100644 --- a/lib/mayaHydra/hydraExtensions/sceneIndex/mhDirtyLeadObjectSceneIndex.h +++ b/lib/mayaHydra/hydraExtensions/sceneIndex/mhDirtyLeadObjectSceneIndex.h @@ -18,7 +18,6 @@ //MayaHydra headers #include "mayaHydraLib/api.h" -#include "mayaHydraLib/mayaHydra.h" // Flow Viewport Toolkit headers. #include "flowViewport/sceneIndex/fvpSceneIndexUtils.h" diff --git a/lib/mayaHydra/hydraExtensions/sceneIndex/mhMayaUsdProxyShapeSceneIndex.h b/lib/mayaHydra/hydraExtensions/sceneIndex/mhMayaUsdProxyShapeSceneIndex.h index 1072b1ef67..c3dc8ea25f 100644 --- a/lib/mayaHydra/hydraExtensions/sceneIndex/mhMayaUsdProxyShapeSceneIndex.h +++ b/lib/mayaHydra/hydraExtensions/sceneIndex/mhMayaUsdProxyShapeSceneIndex.h @@ -19,7 +19,6 @@ #if defined(MAYAHYDRALIB_MAYAUSDAPI_ENABLED) //MayaHydra headers #include "mayaHydraLib/api.h" -#include "mayaHydraLib/mayaHydra.h" //MayaUsdAPI headers #include