diff --git a/Editor/NewGameObjectAndAddComponent.cs b/Editor/NewGameObjectAndAddComponent.cs
index df0cd567..3beae629 100644
--- a/Editor/NewGameObjectAndAddComponent.cs
+++ b/Editor/NewGameObjectAndAddComponent.cs
@@ -41,7 +41,9 @@ private static void CreateAndAddComponent<T>(string componentName) where T : Mon
         [MenuItem(BASE_PATH + MERGE_PHYSBONE, true, PRIORITY)]
         private static bool ValidateCreateMergePhysBone() => Selection.activeGameObject != null;
 
+#if AAO_VRCSDK3_AVATARS
         [MenuItem(BASE_PATH + MERGE_PHYSBONE, false, PRIORITY)]
         private static void CreateMergePhysBone() => CreateAndAddComponent<MergePhysBone>(MERGE_PHYSBONE);
+#endif
     }
 }
diff --git a/Editor/ObjectMapping/ObjectMappingContext.cs b/Editor/ObjectMapping/ObjectMappingContext.cs
index 30722bf5..cf01cfc8 100644
--- a/Editor/ObjectMapping/ObjectMappingContext.cs
+++ b/Editor/ObjectMapping/ObjectMappingContext.cs
@@ -48,7 +48,9 @@ public void OnDeactivate(BuildContext context)
                     switch (component)
                     {
                         case Animator _:
+#if AAO_VRCSDK3_AVATARS
                         case VRC.SDK3.Avatars.Components.VRCAvatarDescriptor _:
+#endif
 #if AAO_VRM0
                         case VRM.VRMBlendShapeProxy _:
 #endif