Split recursion to plonk/honk

.circleci/config.yml

@@ -348,7 +348,7 @@ jobs:
       - *setup_env
       - run:
           name: "Test"
-          command: cond_spot_run_test barretenberg-x86_64-linux-clang-assert 32 ./scripts/run_tests 3 stdlib_recursion_tests --gtest_filter=-*turbo*
+          command: cond_spot_run_test barretenberg-x86_64-linux-clang-assert 32 ./scripts/run_tests 3 stdlib_plonk_recursion_tests --gtest_filter=-*turbo*
           aztec_manifest_key: barretenberg-x86_64-linux-clang-assert
 
   barretenberg-acir-tests-bb:

barretenberg/cpp/scripts/ultra_honk_tests.sh

@@ -19,7 +19,7 @@ cd build/
 ./bin/ultra_honk_tests
 ./bin/goblin_tests
 ./bin/client_ivc_tests
-./bin/stdlib_recursion_tests --gtest_filter=Goblin*
-./bin/stdlib_recursion_tests --gtest_filter=Honk*
-./bin/stdlib_recursion_tests --gtest_filter=Proto*
-./bin/stdlib_recursion_tests --gtest_filter=RecursiveMerge*
+./bin/stdlib_honk_recursion_tests --gtest_filter=Goblin*
+./bin/stdlib_honk_recursion_tests --gtest_filter=Honk*
+./bin/stdlib_honk_recursion_tests --gtest_filter=Proto*
+./bin/stdlib_honk_recursion_tests --gtest_filter=RecursiveMerge*

barretenberg/cpp/src/CMakeLists.txt

@@ -131,7 +131,8 @@ set(BARRETENBERG_TARGET_OBJECTS
     $<TARGET_OBJECTS:stdlib_pedersen_hash_objects>
     $<TARGET_OBJECTS:stdlib_poseidon2_objects>
     $<TARGET_OBJECTS:stdlib_primitives_objects>
-    $<TARGET_OBJECTS:stdlib_recursion_objects>
+    $<TARGET_OBJECTS:stdlib_honk_recursion_objects>
+    # $<TARGET_OBJECTS:stdlib_plonk_recursion_objects>
     $<TARGET_OBJECTS:stdlib_schnorr_objects>
     $<TARGET_OBJECTS:stdlib_sha256_objects>
     $<TARGET_OBJECTS:sumcheck_objects>

barretenberg/cpp/src/barretenberg/barretenberg.hpp

@@ -54,6 +54,11 @@
 #include "stdlib/merkle_tree/nullifier_tree/nullifier_leaf.hpp"
 #include "stdlib/merkle_tree/nullifier_tree/nullifier_memory_tree.hpp"
 #include "stdlib/merkle_tree/nullifier_tree/nullifier_tree.hpp"
+#include "stdlib/plonk_recursion/aggregation_state/aggregation_state.hpp"
+#include "stdlib/plonk_recursion/aggregation_state/native_aggregation_state.hpp"
+#include "stdlib/plonk_recursion/verification_key/verification_key.hpp"
+#include "stdlib/plonk_recursion/verifier/program_settings.hpp"
+#include "stdlib/plonk_recursion/verifier/verifier.hpp"
 #include "stdlib/primitives/address/address.hpp"
 #include "stdlib/primitives/bigfield/bigfield.hpp"
 #include "stdlib/primitives/biggroup/biggroup.hpp"
@@ -67,8 +72,3 @@
 #include "stdlib/primitives/packed_byte_array/packed_byte_array.hpp"
 #include "stdlib/primitives/uint/uint.hpp"
 #include "stdlib/primitives/witness/witness.hpp"
-#include "stdlib/recursion/aggregation_state/aggregation_state.hpp"
-#include "stdlib/recursion/aggregation_state/native_aggregation_state.hpp"
-#include "stdlib/recursion/verification_key/verification_key.hpp"
-#include "stdlib/recursion/verifier/program_settings.hpp"
-#include "stdlib/recursion/verifier/verifier.hpp"

barretenberg/cpp/src/barretenberg/benchmark/client_ivc_bench/CMakeLists.txt

@@ -1 +1 @@
-barretenberg_module(client_ivc_bench client_ivc stdlib_recursion stdlib_sha256 crypto_merkle_tree stdlib_primitives)
+barretenberg_module(client_ivc_bench client_ivc stdlib_honk_recursion stdlib_sha256 crypto_merkle_tree stdlib_primitives)

barretenberg/cpp/src/barretenberg/benchmark/goblin_bench/CMakeLists.txt

@@ -1 +1 @@
-barretenberg_module(goblin_bench ultra_honk eccvm stdlib_recursion stdlib_sha256 crypto_merkle_tree stdlib_primitives)
+barretenberg_module(goblin_bench ultra_honk eccvm stdlib_honk_recursion stdlib_sha256 crypto_merkle_tree stdlib_primitives)

barretenberg/cpp/src/barretenberg/benchmark/ultra_bench/CMakeLists.txt

@@ -3,4 +3,4 @@ barretenberg_module(ultra_bench
   stdlib_sha256
   stdlib_keccak
   crypto_merkle_tree
-  stdlib_recursion)
+  stdlib_honk_recursion)

barretenberg/cpp/src/barretenberg/client_ivc/client_ivc.test.cpp

@@ -3,7 +3,7 @@
 #include "barretenberg/goblin/mock_circuits.hpp"
 #include "barretenberg/proof_system/circuit_builder/goblin_ultra_circuit_builder.hpp"
 #include "barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp"
-#include "barretenberg/stdlib/recursion/honk/verifier/protogalaxy_recursive_verifier.hpp"
+#include "barretenberg/stdlib/honk_recursion/verifier/protogalaxy_recursive_verifier.hpp"
 
 #include <gtest/gtest.h>
 using namespace bb;

barretenberg/cpp/src/barretenberg/dsl/acir_format/recursion_constraint.cpp

@@ -1,9 +1,9 @@
 #include "recursion_constraint.hpp"
 #include "barretenberg/plonk/proof_system/verification_key/verification_key.hpp"
 #include "barretenberg/plonk/transcript/transcript_wrappers.hpp"
+#include "barretenberg/stdlib/plonk_recursion/aggregation_state/aggregation_state.hpp"
+#include "barretenberg/stdlib/plonk_recursion/verifier/verifier.hpp"
 #include "barretenberg/stdlib/primitives/bigfield/constants.hpp"
-#include "barretenberg/stdlib/recursion/aggregation_state/aggregation_state.hpp"
-#include "barretenberg/stdlib/recursion/verifier/verifier.hpp"
 
 namespace acir_format {
 

barretenberg/cpp/src/barretenberg/dsl/types.hpp

@@ -6,6 +6,9 @@
 #include "barretenberg/plonk/proof_system/prover/prover.hpp"
 #include "barretenberg/stdlib/commitment/pedersen/pedersen.hpp"
 #include "barretenberg/stdlib/encryption/schnorr/schnorr.hpp"
+#include "barretenberg/stdlib/plonk_recursion/aggregation_state/aggregation_state.hpp"
+#include "barretenberg/stdlib/plonk_recursion/verification_key/verification_key.hpp"
+#include "barretenberg/stdlib/plonk_recursion/verifier/program_settings.hpp"
 #include "barretenberg/stdlib/primitives/bigfield/bigfield.hpp"
 #include "barretenberg/stdlib/primitives/biggroup/biggroup.hpp"
 #include "barretenberg/stdlib/primitives/bit_array/bit_array.hpp"
@@ -19,9 +22,6 @@
 #include "barretenberg/stdlib/primitives/packed_byte_array/packed_byte_array.hpp"
 #include "barretenberg/stdlib/primitives/uint/uint.hpp"
 #include "barretenberg/stdlib/primitives/witness/witness.hpp"
-#include "barretenberg/stdlib/recursion/aggregation_state/aggregation_state.hpp"
-#include "barretenberg/stdlib/recursion/verification_key/verification_key.hpp"
-#include "barretenberg/stdlib/recursion/verifier/program_settings.hpp"
 
 namespace acir_format {
 

barretenberg/cpp/src/barretenberg/examples/join_split/verify.hpp

@@ -2,8 +2,8 @@
 #include "./mock/mock_circuit.hpp"
 #include "barretenberg/ecc/curves/bn254/fq12.hpp"
 #include "barretenberg/ecc/curves/bn254/pairing.hpp"
-#include "barretenberg/stdlib/recursion/aggregation_state/aggregation_state.hpp"
-#include "barretenberg/stdlib/recursion/verifier/verifier.hpp"
+#include "barretenberg/stdlib/plonk_recursion/aggregation_state/aggregation_state.hpp"
+#include "barretenberg/stdlib/plonk_recursion/verifier/verifier.hpp"
 
 namespace bb::join_split_example::proofs {
 

barretenberg/cpp/src/barretenberg/flavor/goblin_ultra_recursive.hpp

@@ -10,9 +10,9 @@
 #include "barretenberg/polynomials/polynomial.hpp"
 #include "barretenberg/polynomials/univariate.hpp"
 #include "barretenberg/proof_system/circuit_builder/goblin_ultra_circuit_builder.hpp"
+#include "barretenberg/stdlib/honk_recursion/transcript/transcript.hpp"
 #include "barretenberg/stdlib/primitives/curves/bn254.hpp"
 #include "barretenberg/stdlib/primitives/field/field.hpp"
-#include "barretenberg/stdlib/recursion/honk/transcript/transcript.hpp"
 
 namespace bb {
 

barretenberg/cpp/src/barretenberg/flavor/ultra_recursive.hpp

@@ -25,9 +25,9 @@
 #include <type_traits>
 #include <vector>
 
+#include "barretenberg/stdlib/honk_recursion/transcript/transcript.hpp"
 #include "barretenberg/stdlib/primitives/curves/bn254.hpp"
 #include "barretenberg/stdlib/primitives/field/field.hpp"
-#include "barretenberg/stdlib/recursion/honk/transcript/transcript.hpp"
 
 namespace bb {
 

barretenberg/cpp/src/barretenberg/goblin/CMakeLists.txt

@@ -1 +1 @@
-barretenberg_module(goblin stdlib_recursion ultra_honk eccvm translator_vm stdlib_sha256 crypto_merkle_tree stdlib_primitives)
+barretenberg_module(goblin stdlib_honk_recursion ultra_honk eccvm translator_vm stdlib_sha256 crypto_merkle_tree stdlib_primitives)

barretenberg/cpp/src/barretenberg/goblin/goblin.hpp

@@ -6,7 +6,7 @@
 #include "barretenberg/proof_system/circuit_builder/goblin_translator_circuit_builder.hpp"
 #include "barretenberg/proof_system/circuit_builder/goblin_ultra_circuit_builder.hpp"
 #include "barretenberg/proof_system/instance_inspector.hpp"
-#include "barretenberg/stdlib/recursion/honk/verifier/merge_recursive_verifier.hpp"
+#include "barretenberg/stdlib/honk_recursion/verifier/merge_recursive_verifier.hpp"
 #include "barretenberg/translator_vm/goblin_translator_composer.hpp"
 #include "barretenberg/ultra_honk/merge_prover.hpp"
 #include "barretenberg/ultra_honk/merge_verifier.hpp"

barretenberg/cpp/src/barretenberg/goblin/mock_circuits.hpp

@@ -12,10 +12,10 @@
 #include "barretenberg/srs/global_crs.hpp"
 #include "barretenberg/stdlib/encryption/ecdsa/ecdsa.hpp"
 #include "barretenberg/stdlib/hash/sha256/sha256.hpp"
+#include "barretenberg/stdlib/honk_recursion/verifier/protogalaxy_recursive_verifier.hpp"
+#include "barretenberg/stdlib/honk_recursion/verifier/ultra_recursive_verifier.hpp"
 #include "barretenberg/stdlib/primitives/curves/secp256k1.hpp"
 #include "barretenberg/stdlib/primitives/packed_byte_array/packed_byte_array.hpp"
-#include "barretenberg/stdlib/recursion/honk/verifier/protogalaxy_recursive_verifier.hpp"
-#include "barretenberg/stdlib/recursion/honk/verifier/ultra_recursive_verifier.hpp"
 
 namespace bb {
 class GoblinMockCircuits {

barretenberg/cpp/src/barretenberg/plonk/proof_system/verification_key/verification_key.cpp

@@ -8,7 +8,7 @@ namespace bb::plonk {
 
 /**
  * @brief Hashes the evaluation domain to match the 'circuit' approach taken in
- * stdlib/recursion/verification_key/verification_key.hpp.
+ * stdlib/plonk_recursion/verification_key/verification_key.hpp.
  * @note: in that reference file, the circuit-equivalent of this function is a _method_ of the `evaluation_domain'
  * struct. But we cannot do that with the native `bb::evaluation_domain` type unfortunately, because it's
  * defined in polynomials/evaluation_domain.hpp, and `polynomial` is a bberg library which does not depend on `crypto`

barretenberg/cpp/src/barretenberg/solidity_helpers/circuits/recursive_circuit.hpp

@@ -3,11 +3,11 @@
 #include "barretenberg/ecc/curves/bn254/pairing.hpp"
 #include "barretenberg/plonk/composer/ultra_composer.hpp"
 #include "barretenberg/plonk/proof_system/proving_key/serialize.hpp"
+#include "barretenberg/stdlib/plonk_recursion/verifier/program_settings.hpp"
+#include "barretenberg/stdlib/plonk_recursion/verifier/verifier.hpp"
 #include "barretenberg/stdlib/primitives/bigfield/constants.hpp"
 #include "barretenberg/stdlib/primitives/circuit_builders/circuit_builders_fwd.hpp"
 #include "barretenberg/stdlib/primitives/curves/bn254.hpp"
-#include "barretenberg/stdlib/recursion/verifier/program_settings.hpp"
-#include "barretenberg/stdlib/recursion/verifier/verifier.hpp"
 #include "barretenberg/transcript/transcript.hpp"
 
 using namespace bb::plonk;

barretenberg/cpp/src/barretenberg/stdlib/CMakeLists.txt

@@ -2,4 +2,5 @@ add_subdirectory(hash)
 add_subdirectory(commitment)
 add_subdirectory(encryption)
 add_subdirectory(primitives)
-add_subdirectory(recursion)
+add_subdirectory(honk_recursion)
+add_subdirectory(plonk_recursion)

barretenberg/cpp/src/barretenberg/stdlib/honk_recursion/verifier/decider_recursive_verifier.cpp

@@ -1,4 +1,4 @@
-#include "barretenberg/stdlib/recursion/honk/verifier/decider_recursive_verifier.hpp"
+#include "barretenberg/stdlib/honk_recursion/verifier/decider_recursive_verifier.hpp"
 #include "barretenberg/commitment_schemes/zeromorph/zeromorph.hpp"
 #include "barretenberg/numeric/bitop/get_msb.hpp"
 #include "barretenberg/transcript/transcript.hpp"

barretenberg/cpp/src/barretenberg/stdlib/honk_recursion/verifier/decider_recursive_verifier.hpp

@@ -2,8 +2,8 @@
 #include "barretenberg/flavor/goblin_ultra_recursive.hpp"
 #include "barretenberg/flavor/ultra_recursive.hpp"
 #include "barretenberg/honk/proof_system/types/proof.hpp"
-#include "barretenberg/stdlib/recursion/honk/transcript/transcript.hpp"
-#include "barretenberg/stdlib/recursion/honk/verifier/recursive_verifier_instance.hpp"
+#include "barretenberg/stdlib/honk_recursion/transcript/transcript.hpp"
+#include "barretenberg/stdlib/honk_recursion/verifier/recursive_verifier_instance.hpp"
 #include "barretenberg/sumcheck/sumcheck.hpp"
 
 namespace bb::stdlib::recursion::honk {

barretenberg/cpp/src/barretenberg/stdlib/honk_recursion/verifier/goblin_verifier.test.cpp

@@ -3,8 +3,8 @@
 #include "barretenberg/flavor/ultra_recursive.hpp"
 #include "barretenberg/stdlib/hash/blake3s/blake3s.hpp"
 #include "barretenberg/stdlib/hash/pedersen/pedersen.hpp"
+#include "barretenberg/stdlib/honk_recursion/verifier/ultra_recursive_verifier.hpp"
 #include "barretenberg/stdlib/primitives/curves/bn254.hpp"
-#include "barretenberg/stdlib/recursion/honk/verifier/ultra_recursive_verifier.hpp"
 #include "barretenberg/ultra_honk/ultra_prover.hpp"
 #include "barretenberg/ultra_honk/ultra_verifier.hpp"
 

barretenberg/cpp/src/barretenberg/stdlib/honk_recursion/verifier/merge_recursive_verifier.cpp

@@ -1,4 +1,4 @@
-#include "barretenberg/stdlib/recursion/honk/verifier/merge_recursive_verifier.hpp"
+#include "barretenberg/stdlib/honk_recursion/verifier/merge_recursive_verifier.hpp"
 
 namespace bb::stdlib::recursion::goblin {
 

barretenberg/cpp/src/barretenberg/stdlib/honk_recursion/verifier/merge_recursive_verifier.hpp

@@ -1,8 +1,8 @@
 #pragma once
 #include "barretenberg/commitment_schemes/kzg/kzg.hpp"
 #include "barretenberg/honk/proof_system/types/proof.hpp"
+#include "barretenberg/stdlib/honk_recursion/transcript/transcript.hpp"
 #include "barretenberg/stdlib/primitives/curves/bn254.hpp"
-#include "barretenberg/stdlib/recursion/honk/transcript/transcript.hpp"
 
 namespace bb::stdlib::recursion::goblin {
 template <typename CircuitBuilder> class MergeRecursiveVerifier_ {

barretenberg/cpp/src/barretenberg/stdlib/honk_recursion/verifier/merge_verifier.test.cpp

@@ -1,7 +1,7 @@
 #include "barretenberg/common/test.hpp"
 #include "barretenberg/goblin/mock_circuits.hpp"
+#include "barretenberg/stdlib/honk_recursion/verifier/merge_recursive_verifier.hpp"
 #include "barretenberg/stdlib/primitives/curves/bn254.hpp"
-#include "barretenberg/stdlib/recursion/honk/verifier/merge_recursive_verifier.hpp"
 
 namespace bb::stdlib::recursion::goblin {
 

barretenberg/cpp/src/barretenberg/stdlib/honk_recursion/verifier/protogalaxy_recursive_verifier.cpp

@@ -1,7 +1,7 @@
 #include "protogalaxy_recursive_verifier.hpp"
 #include "barretenberg/polynomials/polynomial.hpp"
 #include "barretenberg/proof_system/library/grand_product_delta.hpp"
-#include "barretenberg/stdlib/recursion/honk/verifier/recursive_instances.hpp"
+#include "barretenberg/stdlib/honk_recursion/verifier/recursive_instances.hpp"
 namespace bb::stdlib::recursion::honk {
 
 template <class VerifierInstances>

barretenberg/cpp/src/barretenberg/stdlib/honk_recursion/verifier/protogalaxy_recursive_verifier.hpp

@@ -4,8 +4,8 @@
 #include "barretenberg/flavor/ultra_recursive.hpp"
 #include "barretenberg/honk/proof_system/types/proof.hpp"
 #include "barretenberg/protogalaxy/folding_result.hpp"
-#include "barretenberg/stdlib/recursion/honk/transcript/transcript.hpp"
-#include "barretenberg/stdlib/recursion/honk/verifier/recursive_instances.hpp"
+#include "barretenberg/stdlib/honk_recursion/transcript/transcript.hpp"
+#include "barretenberg/stdlib/honk_recursion/verifier/recursive_instances.hpp"
 
 namespace bb::stdlib::recursion::honk {
 template <class VerifierInstances> class ProtoGalaxyRecursiveVerifier_ {

barretenberg/cpp/src/barretenberg/stdlib/honk_recursion/verifier/protogalaxy_recursive_verifier.test.cpp

@@ -1,4 +1,4 @@
-#include "barretenberg/stdlib/recursion/honk/verifier/protogalaxy_recursive_verifier.hpp"
+#include "barretenberg/stdlib/honk_recursion/verifier/protogalaxy_recursive_verifier.hpp"
 #include "barretenberg/circuit_checker/circuit_checker.hpp"
 #include "barretenberg/common/test.hpp"
 #include "barretenberg/flavor/ultra_recursive.hpp"
@@ -8,8 +8,8 @@
 #include "barretenberg/protogalaxy/protogalaxy_verifier.hpp"
 #include "barretenberg/stdlib/hash/blake3s/blake3s.hpp"
 #include "barretenberg/stdlib/hash/pedersen/pedersen.hpp"
+#include "barretenberg/stdlib/honk_recursion/verifier/decider_recursive_verifier.hpp"
 #include "barretenberg/stdlib/primitives/curves/bn254.hpp"
-#include "barretenberg/stdlib/recursion/honk/verifier/decider_recursive_verifier.hpp"
 #include "barretenberg/sumcheck/instance/instances.hpp"
 #include "barretenberg/ultra_honk/ultra_prover.hpp"
 #include "barretenberg/ultra_honk/ultra_verifier.hpp"

barretenberg/cpp/src/barretenberg/stdlib/honk_recursion/verifier/recursive_instances.hpp

@@ -1,7 +1,7 @@
 #pragma once
 #include "barretenberg/flavor/flavor.hpp"
 #include "barretenberg/relations/relation_parameters.hpp"
-#include "barretenberg/stdlib/recursion/honk/verifier/recursive_verifier_instance.hpp"
+#include "barretenberg/stdlib/honk_recursion/verifier/recursive_verifier_instance.hpp"
 
 namespace bb::stdlib::recursion::honk {
 template <IsRecursiveFlavor Flavor_, size_t NUM_> struct RecursiveVerifierInstances_ {

barretenberg/cpp/src/barretenberg/stdlib/honk_recursion/verifier/ultra_recursive_verifier.cpp

@@ -1,4 +1,4 @@
-#include "barretenberg/stdlib/recursion/honk/verifier/ultra_recursive_verifier.hpp"
+#include "barretenberg/stdlib/honk_recursion/verifier/ultra_recursive_verifier.hpp"
 #include "barretenberg/commitment_schemes/zeromorph/zeromorph.hpp"
 #include "barretenberg/numeric/bitop/get_msb.hpp"
 #include "barretenberg/proof_system/library/grand_product_delta.hpp"

barretenberg/cpp/src/barretenberg/stdlib/honk_recursion/verifier/ultra_recursive_verifier.hpp

@@ -2,7 +2,7 @@
 #include "barretenberg/flavor/goblin_ultra_recursive.hpp"
 #include "barretenberg/flavor/ultra_recursive.hpp"
 #include "barretenberg/honk/proof_system/types/proof.hpp"
-#include "barretenberg/stdlib/recursion/honk/transcript/transcript.hpp"
+#include "barretenberg/stdlib/honk_recursion/transcript/transcript.hpp"
 #include "barretenberg/sumcheck/sumcheck.hpp"
 
 namespace bb::stdlib::recursion::honk {

barretenberg/cpp/src/barretenberg/stdlib/honk_recursion/verifier/verifier.test.cpp

@@ -3,8 +3,8 @@
 #include "barretenberg/flavor/ultra_recursive.hpp"
 #include "barretenberg/stdlib/hash/blake3s/blake3s.hpp"
 #include "barretenberg/stdlib/hash/pedersen/pedersen.hpp"
+#include "barretenberg/stdlib/honk_recursion/verifier/ultra_recursive_verifier.hpp"
 #include "barretenberg/stdlib/primitives/curves/bn254.hpp"
-#include "barretenberg/stdlib/recursion/honk/verifier/ultra_recursive_verifier.hpp"
 
 #include "barretenberg/ultra_honk/ultra_prover.hpp"
 #include "barretenberg/ultra_honk/ultra_verifier.hpp"

barretenberg/cpp/src/barretenberg/stdlib/plonk_recursion/verifier/program_settings.hpp

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "barretenberg/plonk/proof_system/types/program_settings.hpp"
-#include "barretenberg/stdlib/recursion/transcript/transcript.hpp"
+#include "barretenberg/stdlib/plonk_recursion/transcript/transcript.hpp"
 
 namespace bb::stdlib::recursion {
 

barretenberg/cpp/src/barretenberg/stdlib/plonk_recursion/verifier/verifier.hpp

@@ -6,13 +6,13 @@
 #include "barretenberg/plonk/proof_system/public_inputs/public_inputs.hpp"
 #include "barretenberg/plonk/proof_system/types/proof.hpp"
 #include "barretenberg/plonk/proof_system/utils/kate_verification.hpp"
+#include "barretenberg/stdlib/plonk_recursion/aggregation_state/aggregation_state.hpp"
+#include "barretenberg/stdlib/plonk_recursion/transcript/transcript.hpp"
+#include "barretenberg/stdlib/plonk_recursion/verifier/program_settings.hpp"
 #include "barretenberg/stdlib/primitives/bigfield/bigfield.hpp"
 #include "barretenberg/stdlib/primitives/biggroup/biggroup.hpp"
 #include "barretenberg/stdlib/primitives/bool/bool.hpp"
 #include "barretenberg/stdlib/primitives/field/field.hpp"
-#include "barretenberg/stdlib/recursion/aggregation_state/aggregation_state.hpp"
-#include "barretenberg/stdlib/recursion/transcript/transcript.hpp"
-#include "barretenberg/stdlib/recursion/verifier/program_settings.hpp"
 
 namespace bb::stdlib::recursion {
 

barretenberg/cpp/src/barretenberg/stdlib/types/ultra.hpp

@@ -6,6 +6,7 @@
 #include "barretenberg/plonk/proof_system/types/prover_settings.hpp"
 #include "barretenberg/stdlib/commitment/pedersen/pedersen.hpp"
 #include "barretenberg/stdlib/encryption/schnorr/schnorr.hpp"
+#include "barretenberg/stdlib/plonk_recursion/verifier/program_settings.hpp"
 #include "barretenberg/stdlib/primitives/bigfield/bigfield.hpp"
 #include "barretenberg/stdlib/primitives/biggroup/biggroup.hpp"
 #include "barretenberg/stdlib/primitives/bit_array/bit_array.hpp"
@@ -17,7 +18,6 @@
 #include "barretenberg/stdlib/primitives/packed_byte_array/packed_byte_array.hpp"
 #include "barretenberg/stdlib/primitives/uint/uint.hpp"
 #include "barretenberg/stdlib/primitives/witness/witness.hpp"
-#include "barretenberg/stdlib/recursion/verifier/program_settings.hpp"
 
 namespace bb::stdlib::types {
 

barretenberg/cpp/src/barretenberg/transcript/transcript.test.cpp

@@ -1,4 +1,4 @@
-#include "barretenberg/stdlib/recursion/honk/transcript/transcript.hpp"
+#include "barretenberg/stdlib/honk_recursion/transcript/transcript.hpp"
 #include <gtest/gtest.h>
 
 using namespace bb;