diff --git a/Package.resolved b/Package.resolved
index ea9343d19..5f6fbd7c2 100644
--- a/Package.resolved
+++ b/Package.resolved
@@ -1,10 +1,10 @@
 {
-  "originHash" : "3e4458027d5c69453bb80f8dc4daa2b61492d2a6ab8cd796cdeaeaf0fcf7423b",
+  "originHash" : "e3ca252fe6b740be3c1429ef06f8f1cbc4e04ce5cc0321909987e852b5b3a81a",
   "pins" : [
     {
       "identity" : "darwinprivateframeworks",
       "kind" : "remoteSourceControl",
-      "location" : "https://github.com/OpenSwiftUIProject/DarwinPrivateFrameworks.git",
+      "location" : "https://github.com/openswiftuiproject/darwinprivateframeworks",
       "state" : {
         "branch" : "main",
         "revision" : "d93839821ebebdab22081fbc0f3d0b8cb0e30b2f"
@@ -25,13 +25,13 @@
       "location" : "https://github.com/OpenSwiftUIProject/OpenCoreGraphics",
       "state" : {
         "branch" : "main",
-        "revision" : "050239bd42b19a4c8b1ef3936bfb9f3589ecfc46"
+        "revision" : "df5ab4c4dcd0afc8fde978f6a0ad5228bb8aee17"
       }
     },
     {
       "identity" : "openobservation",
       "kind" : "remoteSourceControl",
-      "location" : "https://github.com/OpenSwiftUIProject/OpenObservation",
+      "location" : "https://github.com/openswiftuiproject/openobservation",
       "state" : {
         "branch" : "main",
         "revision" : "51c52f318eb3278b1eaa8b724f50d1af9f9f8bae"
@@ -40,7 +40,7 @@
     {
       "identity" : "openrenderbox",
       "kind" : "remoteSourceControl",
-      "location" : "https://github.com/OpenSwiftUIProject/OpenRenderBox",
+      "location" : "https://github.com/openswiftuiproject/openrenderbox",
       "state" : {
         "branch" : "main",
         "revision" : "d6db14f180068c6813a936088e767c2ca99c308d"
@@ -67,7 +67,7 @@
     {
       "identity" : "symbollocator",
       "kind" : "remoteSourceControl",
-      "location" : "https://github.com/OpenSwiftUIProject/SymbolLocator.git",
+      "location" : "https://github.com/openswiftuiproject/symbollocator",
       "state" : {
         "revision" : "546053c03f282df1a8270853da6692e1b078be09",
         "version" : "0.2.1"
diff --git a/Package.swift b/Package.swift
index 267dca642..ce960b95a 100644
--- a/Package.swift
+++ b/Package.swift
@@ -586,7 +586,10 @@ let openSwiftUICoreTarget = Target.target(
     ] + (swiftUIRenderCondition && symbolLocatorCondition ? ["OpenSwiftUISymbolDualTestsSupport"] : []),
     cSettings: sharedCSettings,
     cxxSettings: sharedCxxSettings,
-    swiftSettings: sharedSwiftSettings
+    swiftSettings: sharedSwiftSettings,
+    linkerSettings: computeCondition ? [
+        .linkedLibrary("c++", .when(platforms: .darwinPlatforms)),
+    ] : []
 )
 
 let openSwiftUICoreTestTarget = Target.testTarget(
@@ -629,10 +632,6 @@ let openSwiftUITarget = Target.target(
     dependencies: [
         "OpenSwiftUICore",
         "COpenSwiftUI",
-        .product(name: "OpenCoreGraphicsShims", package: "OpenCoreGraphics"),
-        .product(name: "OpenQuartzCoreShims", package: "OpenCoreGraphics"),
-        .product(name: "OpenAttributeGraphShims", package: "OpenAttributeGraph"),
-        .product(name: "OpenRenderBoxShims", package: "OpenRenderBox"),
     ],
     cSettings: sharedCSettings,
     cxxSettings: sharedCxxSettings,
@@ -825,7 +824,6 @@ if symbolLocatorCondition {
 
 if attributeGraphCondition {
     openSwiftUICoreTarget.addAGSettings()
-    openSwiftUITarget.addAGSettings()
 
     openSwiftUISPITestTarget.addAGSettings()
     openSwiftUICoreTestTarget.addAGSettings()
@@ -983,10 +981,11 @@ let packageSettings = PackageSettings(
         "OpenSwiftUITestsSupport": ProjectDescription.Product.staticFramework,
         "OpenSwiftUISymbolDualTestsSupport": ProjectDescription.Product.staticFramework,
         "OpenAttributeGraphShims": ProjectDescription.Product.staticFramework,
-        "OpenCoreGraphicsShims": ProjectDescription.Product.staticFramework,
-        "OpenObservation": ProjectDescription.Product.staticFramework,
-        "OpenQuartzCoreShims": ProjectDescription.Product.staticFramework,
-        "OpenRenderBoxShims": ProjectDescription.Product.staticFramework,
+        "OpenCoreGraphicsShims": ProjectDescription.Product.framework,
+        "OpenObservation": ProjectDescription.Product.framework,
+        "OpenObservationCxx": ProjectDescription.Product.staticFramework,
+        "OpenQuartzCoreShims": ProjectDescription.Product.framework,
+        "OpenRenderBoxShims": ProjectDescription.Product.framework,
         "SymbolLocator": ProjectDescription.Product.staticFramework,
     ],
     baseProductType: ProjectDescription.Product.staticFramework,
diff --git a/Scripts/build_xcframework.sh b/Scripts/build_xcframework.sh
index 9b131e20d..735929d06 100755
--- a/Scripts/build_xcframework.sh
+++ b/Scripts/build_xcframework.sh
@@ -258,6 +258,7 @@ RUBY
 # macro usages inline where needed. Avoid forcing generated macro tool targets to
 # archive for simulator SDKs, where Xcode can try to build them for the target
 # platform instead of the host platform.
+remove_generated_macro_references "$PROJECT_ROOT/.build/tuist-derived/Projects/OpenObservation/OpenObservation.xcodeproj" "OpenObservation" "OpenObservationMacros"
 remove_generated_macro_references "$PROJECT_ROOT/.build/tuist-derived/OpenObservation/OpenObservation.xcodeproj" "OpenObservation" "OpenObservationMacros"
 remove_generated_macro_references "$PROJECT_ROOT/../OpenObservation/OpenObservation.xcodeproj" "OpenObservation" "OpenObservationMacros"
 remove_generated_macro_references "$XCODEPROJ" "OpenSwiftUICore" "OpenSwiftUIMacros"
@@ -324,6 +325,17 @@ first_existing_project() {
     echo "$1"
 }
 
+dependency_project_path() {
+    local local_project="$1"
+    shift
+
+    if [ "${OPENSWIFTUI_USE_LOCAL_DEPS:-0}" = "1" ]; then
+        echo "$local_project"
+    else
+        first_existing_project "$@"
+    fi
+}
+
 project_args_for_scheme() {
     local scheme="$1"
 
@@ -332,22 +344,22 @@ project_args_for_scheme() {
             echo "-workspace" "$XCODEWORKSPACE"
             ;;
         _AttributeGraphDeviceSwiftShims)
-            echo "-project" "$(first_existing_project "$PROJECT_ROOT/../DarwinPrivateFrameworks/DarwinPrivateFrameworks.xcodeproj" "$PROJECT_ROOT/.build/tuist-derived/DarwinPrivateFrameworks/DarwinPrivateFrameworks.xcodeproj")"
+            echo "-project" "$(dependency_project_path "$PROJECT_ROOT/../DarwinPrivateFrameworks/DarwinPrivateFrameworks.xcodeproj" "$PROJECT_ROOT/.build/tuist-derived/Projects/DarwinPrivateFrameworks/DarwinPrivateFrameworks.xcodeproj" "$PROJECT_ROOT/.build/tuist-derived/DarwinPrivateFrameworks/DarwinPrivateFrameworks.xcodeproj")"
             ;;
         OpenAttributeGraphShims)
-            echo "-project" "$(first_existing_project "$PROJECT_ROOT/../OpenAttributeGraph/OpenAttributeGraph.xcodeproj" "$PROJECT_ROOT/.build/tuist-derived/OpenAttributeGraph/OpenAttributeGraph.xcodeproj")"
+            echo "-project" "$(dependency_project_path "$PROJECT_ROOT/../OpenAttributeGraph/OpenAttributeGraph.xcodeproj" "$PROJECT_ROOT/.build/tuist-derived/Projects/OpenAttributeGraph/OpenAttributeGraph.xcodeproj" "$PROJECT_ROOT/.build/tuist-derived/OpenAttributeGraph/OpenAttributeGraph.xcodeproj")"
             ;;
         OpenCoreGraphics|OpenCoreGraphicsShims|OpenQuartzCore|OpenQuartzCoreShims)
-            echo "-project" "$(first_existing_project "$PROJECT_ROOT/../OpenCoreGraphics/OpenCoreGraphics.xcodeproj" "$PROJECT_ROOT/.build/tuist-derived/OpenCoreGraphics/OpenCoreGraphics.xcodeproj")"
+            echo "-project" "$(dependency_project_path "$PROJECT_ROOT/../OpenCoreGraphics/OpenCoreGraphics.xcodeproj" "$PROJECT_ROOT/.build/tuist-derived/Projects/OpenCoreGraphics/OpenCoreGraphics.xcodeproj" "$PROJECT_ROOT/.build/tuist-derived/OpenCoreGraphics/OpenCoreGraphics.xcodeproj")"
             ;;
         OpenObservation|OpenObservationCxx)
-            echo "-project" "$(first_existing_project "$PROJECT_ROOT/../OpenObservation/OpenObservation.xcodeproj" "$PROJECT_ROOT/.build/tuist-derived/OpenObservation/OpenObservation.xcodeproj")"
+            echo "-project" "$(dependency_project_path "$PROJECT_ROOT/../OpenObservation/OpenObservation.xcodeproj" "$PROJECT_ROOT/.build/tuist-derived/Projects/OpenObservation/OpenObservation.xcodeproj" "$PROJECT_ROOT/.build/tuist-derived/OpenObservation/OpenObservation.xcodeproj")"
             ;;
         OpenRenderBoxShims)
-            echo "-project" "$(first_existing_project "$PROJECT_ROOT/../OpenRenderBox/OpenRenderBox.xcodeproj" "$PROJECT_ROOT/.build/tuist-derived/OpenRenderBox/OpenRenderBox.xcodeproj")"
+            echo "-project" "$(dependency_project_path "$PROJECT_ROOT/../OpenRenderBox/OpenRenderBox.xcodeproj" "$PROJECT_ROOT/.build/tuist-derived/Projects/OpenRenderBox/OpenRenderBox.xcodeproj" "$PROJECT_ROOT/.build/tuist-derived/OpenRenderBox/OpenRenderBox.xcodeproj")"
             ;;
         SymbolLocator)
-            echo "-project" "$PROJECT_ROOT/.build/tuist-derived/SymbolLocator/SymbolLocator.xcodeproj"
+            echo "-project" "$(first_existing_project "$PROJECT_ROOT/.build/tuist-derived/Projects/SymbolLocator/SymbolLocator.xcodeproj" "$PROJECT_ROOT/.build/tuist-derived/SymbolLocator/SymbolLocator.xcodeproj")"
             ;;
         *)
             echo "Error: No Xcode project mapping for $scheme." >&2
@@ -362,7 +374,7 @@ compute_source_backend_enabled() {
 }
 
 compute_project_path() {
-    first_existing_project "$PROJECT_ROOT/../Compute/Compute.xcodeproj" "$PROJECT_ROOT/.build/tuist-derived/Compute/Compute.xcodeproj"
+    dependency_project_path "$PROJECT_ROOT/../Compute/Xcode/Compute.xcodeproj" "$PROJECT_ROOT/.build/tuist-derived/Projects/Compute/Compute.xcodeproj" "$PROJECT_ROOT/.build/tuist-derived/Compute/Compute.xcodeproj"
 }
 
 compute_archive_path() {