diff --git a/circuits/cpp/barretenberg b/circuits/cpp/barretenberg
index 185b05c8f2a5..832b7fd3eee2 160000
--- a/circuits/cpp/barretenberg
+++ b/circuits/cpp/barretenberg
@@ -1 +1 @@
-Subproject commit 185b05c8f2a5eaedb54d569fabcfcd3c4b1d0823
+Subproject commit 832b7fd3eee2f06f93bf3af9a1622911861e4c55
diff --git a/circuits/cpp/src/aztec3/circuits/abis/.test.cpp b/circuits/cpp/src/aztec3/circuits/abis/.test.cpp
index d2fe00a545a2..5fe2e078a1bf 100644
--- a/circuits/cpp/src/aztec3/circuits/abis/.test.cpp
+++ b/circuits/cpp/src/aztec3/circuits/abis/.test.cpp
@@ -3,8 +3,7 @@
 
 #include "aztec3/circuits/abis/combined_accumulated_data.hpp"
 
-#include <barretenberg/common/serialize.hpp>
-#include <barretenberg/serialize/cbind.hpp>
+#include <barretenberg/barretenberg.hpp>
 
 #include <gtest/gtest.h>
 
diff --git a/circuits/cpp/src/aztec3/circuits/abis/append_only_tree_snapshot.hpp b/circuits/cpp/src/aztec3/circuits/abis/append_only_tree_snapshot.hpp
index 20d6e726b019..e5c87ffe1d46 100644
--- a/circuits/cpp/src/aztec3/circuits/abis/append_only_tree_snapshot.hpp
+++ b/circuits/cpp/src/aztec3/circuits/abis/append_only_tree_snapshot.hpp
@@ -1,15 +1,9 @@
 #pragma once
 
-#include "aztec3/utils/types/circuit_types.hpp"
-
-#include <barretenberg/serialize/msgpack.hpp>
+#include <barretenberg/barretenberg.hpp>
 
 namespace aztec3::circuits::abis {
 
-using aztec3::utils::types::CircuitTypes;
-using aztec3::utils::types::NativeTypes;
-using std::is_same;
-
 template <typename NCT> struct AppendOnlyTreeSnapshot {
     using fr = typename NCT::fr;
     using uint32 = typename NCT::uint32;
diff --git a/circuits/cpp/src/aztec3/circuits/abis/c_bind.cpp b/circuits/cpp/src/aztec3/circuits/abis/c_bind.cpp
index 1323eec894da..c3269ba0bded 100644
--- a/circuits/cpp/src/aztec3/circuits/abis/c_bind.cpp
+++ b/circuits/cpp/src/aztec3/circuits/abis/c_bind.cpp
@@ -21,17 +21,11 @@
 #include "aztec3/circuits/abis/private_kernel/private_kernel_inputs_init.hpp"
 #include "aztec3/circuits/abis/signed_tx_request.hpp"
 #include "aztec3/circuits/abis/types.hpp"
-#include <aztec3/circuits/hash.hpp>
-#include <aztec3/constants.hpp>
-#include <aztec3/utils/array.hpp>
-#include <aztec3/utils/types/native_types.hpp>
-
-#include "barretenberg/crypto/ecdsa/ecdsa.hpp"
-#include "barretenberg/srs/reference_string/mem_reference_string.hpp"
-#include "barretenberg/stdlib/commitment/pedersen/pedersen_plookup.hpp"
-#include <barretenberg/crypto/keccak/keccak.hpp>
-#include <barretenberg/serialize/cbind.hpp>
-#include <barretenberg/stdlib/merkle_tree/membership.hpp>
+#include "aztec3/circuits/hash.hpp"
+#include "aztec3/constants.hpp"
+#include "aztec3/utils/types/native_types.hpp"
+
+#include <barretenberg/barretenberg.hpp>
 
 namespace {
 
diff --git a/circuits/cpp/src/aztec3/circuits/abis/c_bind.h b/circuits/cpp/src/aztec3/circuits/abis/c_bind.h
index 340f67928f97..9c2f6a7845a4 100644
--- a/circuits/cpp/src/aztec3/circuits/abis/c_bind.h
+++ b/circuits/cpp/src/aztec3/circuits/abis/c_bind.h
@@ -1,4 +1,4 @@
-#include <barretenberg/serialize/cbind_fwd.hpp>
+#include <barretenberg/barretenberg.hpp>
 
 #include <algorithm>
 #include <cstddef>
@@ -27,4 +27,3 @@ WASM_EXPORT void abis__compute_message_secret_hash(uint8_t const* secret, uint8_
 WASM_EXPORT void abis__compute_contract_leaf(uint8_t const* contract_leaf_preimage_buf, uint8_t* output);
 WASM_EXPORT void abis__compute_transaction_hash(uint8_t const* signed_tx_request_buf, uint8_t* output);
 WASM_EXPORT void abis__compute_call_stack_item_hash(uint8_t const* call_stack_item_buf, uint8_t* output);
-
diff --git a/circuits/cpp/src/aztec3/circuits/abis/c_bind.test.cpp b/circuits/cpp/src/aztec3/circuits/abis/c_bind.test.cpp
index 590c88a0f540..15bd25b6b195 100644
--- a/circuits/cpp/src/aztec3/circuits/abis/c_bind.test.cpp
+++ b/circuits/cpp/src/aztec3/circuits/abis/c_bind.test.cpp
@@ -6,10 +6,7 @@
 #include "aztec3/circuits/abis/signed_tx_request.hpp"
 #include "aztec3/circuits/hash.hpp"
 
-#include <barretenberg/common/serialize.hpp>
-#include <barretenberg/numeric/random/engine.hpp>
-#include <barretenberg/serialize/test_helper.hpp>
-#include <barretenberg/stdlib/merkle_tree/membership.hpp>
+#include <barretenberg/barretenberg.hpp>
 
 #include <gtest/gtest.h>
 
diff --git a/circuits/cpp/src/aztec3/circuits/abis/call_context.hpp b/circuits/cpp/src/aztec3/circuits/abis/call_context.hpp
index 94aff911ba1a..1a40181b8210 100644
--- a/circuits/cpp/src/aztec3/circuits/abis/call_context.hpp
+++ b/circuits/cpp/src/aztec3/circuits/abis/call_context.hpp
@@ -1,16 +1,13 @@
 #pragma once
 
-#include <aztec3/constants.hpp>
-#include <aztec3/utils/msgpack_derived_equals.hpp>
-#include <aztec3/utils/msgpack_derived_output.hpp>
-#include <aztec3/utils/types/circuit_types.hpp>
-#include <aztec3/utils/types/convert.hpp>
-#include <aztec3/utils/types/native_types.hpp>
-
-#include <barretenberg/crypto/generators/generator_data.hpp>
-#include <barretenberg/serialize/msgpack.hpp>
-#include <barretenberg/stdlib/hash/pedersen/pedersen.hpp>
-#include <barretenberg/stdlib/primitives/witness/witness.hpp>
+#include "aztec3/constants.hpp"
+#include "aztec3/utils/msgpack_derived_equals.hpp"
+#include "aztec3/utils/msgpack_derived_output.hpp"
+#include "aztec3/utils/types/circuit_types.hpp"
+#include "aztec3/utils/types/convert.hpp"
+#include "aztec3/utils/types/native_types.hpp"
+
+#include <barretenberg/barretenberg.hpp>
 
 namespace aztec3::circuits::abis {
 
diff --git a/circuits/cpp/src/aztec3/circuits/abis/call_stack_item.hpp b/circuits/cpp/src/aztec3/circuits/abis/call_stack_item.hpp
index bb1b5a4093b9..d4a8b1a8e736 100644
--- a/circuits/cpp/src/aztec3/circuits/abis/call_stack_item.hpp
+++ b/circuits/cpp/src/aztec3/circuits/abis/call_stack_item.hpp
@@ -5,18 +5,16 @@
 #include "public_circuit_public_inputs.hpp"
 
 #include "aztec3/circuits/abis/types.hpp"
-#include <aztec3/utils/types/circuit_types.hpp>
-#include <aztec3/utils/types/convert.hpp>
-#include <aztec3/utils/types/native_types.hpp>
+#include "aztec3/utils/types/circuit_types.hpp"
+#include "aztec3/utils/types/convert.hpp"
+#include "aztec3/utils/types/native_types.hpp"
 
-#include <barretenberg/serialize/msgpack.hpp>
-#include <barretenberg/stdlib/primitives/witness/witness.hpp>
+#include <barretenberg/barretenberg.hpp>
 
 namespace aztec3::circuits::abis {
 
 using aztec3::utils::types::CircuitTypes;
 using aztec3::utils::types::NativeTypes;
-using std::conditional;
 using std::is_same;
 
 template <typename NCT, template <class> typename PrivatePublic> struct CallStackItem {
diff --git a/circuits/cpp/src/aztec3/circuits/abis/combined_accumulated_data.hpp b/circuits/cpp/src/aztec3/circuits/abis/combined_accumulated_data.hpp
index d049b3a8e8ca..46d585b4f338 100644
--- a/circuits/cpp/src/aztec3/circuits/abis/combined_accumulated_data.hpp
+++ b/circuits/cpp/src/aztec3/circuits/abis/combined_accumulated_data.hpp
@@ -5,13 +5,12 @@
 #include "public_data_update_request.hpp"
 
 #include "aztec3/constants.hpp"
-#include <aztec3/utils/array.hpp>
-#include <aztec3/utils/types/circuit_types.hpp>
-#include <aztec3/utils/types/convert.hpp>
-#include <aztec3/utils/types/native_types.hpp>
+#include "aztec3/utils/array.hpp"
+#include "aztec3/utils/types/circuit_types.hpp"
+#include "aztec3/utils/types/convert.hpp"
+#include "aztec3/utils/types/native_types.hpp"
 
-#include <barretenberg/common/map.hpp>
-#include <barretenberg/stdlib/primitives/witness/witness.hpp>
+#include <barretenberg/barretenberg.hpp>
 
 namespace aztec3::circuits::abis {
 
diff --git a/circuits/cpp/src/aztec3/circuits/abis/combined_constant_data.hpp b/circuits/cpp/src/aztec3/circuits/abis/combined_constant_data.hpp
index ff4561af945d..39ebb0bf1cd0 100644
--- a/circuits/cpp/src/aztec3/circuits/abis/combined_constant_data.hpp
+++ b/circuits/cpp/src/aztec3/circuits/abis/combined_constant_data.hpp
@@ -3,18 +3,17 @@
 #include "tx_context.hpp"
 
 #include "aztec3/circuits/abis/combined_historic_tree_roots.hpp"
-#include <aztec3/utils/types/circuit_types.hpp>
-#include <aztec3/utils/types/convert.hpp>
-#include <aztec3/utils/types/native_types.hpp>
+#include "aztec3/utils/types/circuit_types.hpp"
+#include "aztec3/utils/types/convert.hpp"
+#include "aztec3/utils/types/native_types.hpp"
 
-#include <barretenberg/stdlib/primitives/witness/witness.hpp>
+#include <barretenberg/barretenberg.hpp>
 
 namespace aztec3::circuits::abis {
 
 using aztec3::circuits::abis::CombinedHistoricTreeRoots;
 using aztec3::utils::types::CircuitTypes;
 using aztec3::utils::types::NativeTypes;
-using plonk::stdlib::witness_t;
 using std::is_same;
 
 template <typename NCT> struct CombinedConstantData {
diff --git a/circuits/cpp/src/aztec3/circuits/abis/combined_historic_tree_roots.hpp b/circuits/cpp/src/aztec3/circuits/abis/combined_historic_tree_roots.hpp
index a8fd946493e2..0f4152ae59d4 100644
--- a/circuits/cpp/src/aztec3/circuits/abis/combined_historic_tree_roots.hpp
+++ b/circuits/cpp/src/aztec3/circuits/abis/combined_historic_tree_roots.hpp
@@ -1,18 +1,17 @@
 #pragma once
 #include "private_historic_tree_roots.hpp"
 
-#include <aztec3/utils/types/circuit_types.hpp>
-#include <aztec3/utils/types/convert.hpp>
-#include <aztec3/utils/types/native_types.hpp>
+#include "aztec3/utils/types/circuit_types.hpp"
+#include "aztec3/utils/types/convert.hpp"
+#include "aztec3/utils/types/native_types.hpp"
 
-#include <barretenberg/stdlib/primitives/witness/witness.hpp>
+#include <barretenberg/barretenberg.hpp>
 
 namespace aztec3::circuits::abis {
 
 using aztec3::circuits::abis::PrivateHistoricTreeRoots;
 using aztec3::utils::types::CircuitTypes;
 using aztec3::utils::types::NativeTypes;
-using plonk::stdlib::witness_t;
 using std::is_same;
 
 template <typename NCT> struct CombinedHistoricTreeRoots {
diff --git a/circuits/cpp/src/aztec3/circuits/abis/contract_deployment_data.hpp b/circuits/cpp/src/aztec3/circuits/abis/contract_deployment_data.hpp
index 4eca2dc176b5..91bebfbda49b 100644
--- a/circuits/cpp/src/aztec3/circuits/abis/contract_deployment_data.hpp
+++ b/circuits/cpp/src/aztec3/circuits/abis/contract_deployment_data.hpp
@@ -1,18 +1,15 @@
 #pragma once
-#include <aztec3/constants.hpp>
-#include <aztec3/utils/types/circuit_types.hpp>
-#include <aztec3/utils/types/convert.hpp>
-#include <aztec3/utils/types/native_types.hpp>
+#include "aztec3/constants.hpp"
+#include "aztec3/utils/types/circuit_types.hpp"
+#include "aztec3/utils/types/convert.hpp"
+#include "aztec3/utils/types/native_types.hpp"
 
-#include <barretenberg/crypto/generators/generator_data.hpp>
-#include <barretenberg/stdlib/hash/pedersen/pedersen.hpp>
-#include <barretenberg/stdlib/primitives/witness/witness.hpp>
+#include <barretenberg/barretenberg.hpp>
 
 namespace aztec3::circuits::abis {
 
 using aztec3::utils::types::CircuitTypes;
 using aztec3::utils::types::NativeTypes;
-using plonk::stdlib::witness_t;
 using std::is_same;
 
 template <typename NCT> struct ContractDeploymentData {
diff --git a/circuits/cpp/src/aztec3/circuits/abis/contract_storage_read.hpp b/circuits/cpp/src/aztec3/circuits/abis/contract_storage_read.hpp
index 7dbbe331c3de..3a13701fb820 100644
--- a/circuits/cpp/src/aztec3/circuits/abis/contract_storage_read.hpp
+++ b/circuits/cpp/src/aztec3/circuits/abis/contract_storage_read.hpp
@@ -1,11 +1,10 @@
 #pragma once
-#include <aztec3/utils/msgpack_derived_output.hpp>
-#include <aztec3/utils/types/circuit_types.hpp>
-#include <aztec3/utils/types/convert.hpp>
-#include <aztec3/utils/types/native_types.hpp>
+#include "aztec3/utils/msgpack_derived_output.hpp"
+#include "aztec3/utils/types/circuit_types.hpp"
+#include "aztec3/utils/types/convert.hpp"
+#include "aztec3/utils/types/native_types.hpp"
 
-#include <barretenberg/serialize/msgpack.hpp>
-#include <barretenberg/stdlib/primitives/witness/witness.hpp>
+#include <barretenberg/barretenberg.hpp>
 
 namespace aztec3::circuits::abis {
 
diff --git a/circuits/cpp/src/aztec3/circuits/abis/contract_storage_update_request.hpp b/circuits/cpp/src/aztec3/circuits/abis/contract_storage_update_request.hpp
index e952542b09a3..73109e138861 100644
--- a/circuits/cpp/src/aztec3/circuits/abis/contract_storage_update_request.hpp
+++ b/circuits/cpp/src/aztec3/circuits/abis/contract_storage_update_request.hpp
@@ -1,11 +1,10 @@
 #pragma once
-#include <aztec3/utils/msgpack_derived_output.hpp>
-#include <aztec3/utils/types/circuit_types.hpp>
-#include <aztec3/utils/types/convert.hpp>
-#include <aztec3/utils/types/native_types.hpp>
+#include "aztec3/utils/msgpack_derived_output.hpp"
+#include "aztec3/utils/types/circuit_types.hpp"
+#include "aztec3/utils/types/convert.hpp"
+#include "aztec3/utils/types/native_types.hpp"
 
-#include <barretenberg/serialize/msgpack.hpp>
-#include <barretenberg/stdlib/primitives/witness/witness.hpp>
+#include <barretenberg/barretenberg.hpp>
 
 namespace aztec3::circuits::abis {
 
diff --git a/circuits/cpp/src/aztec3/circuits/abis/function_data.hpp b/circuits/cpp/src/aztec3/circuits/abis/function_data.hpp
index f1745dfb7f0c..6e6d939856ad 100644
--- a/circuits/cpp/src/aztec3/circuits/abis/function_data.hpp
+++ b/circuits/cpp/src/aztec3/circuits/abis/function_data.hpp
@@ -1,8 +1,9 @@
 #pragma once
-#include <aztec3/constants.hpp>
-#include <aztec3/utils/types/circuit_types.hpp>
-#include <aztec3/utils/types/convert.hpp>
-#include <aztec3/utils/types/native_types.hpp>
+
+#include "aztec3/constants.hpp"
+#include "aztec3/utils/types/circuit_types.hpp"
+#include "aztec3/utils/types/convert.hpp"
+#include "aztec3/utils/types/native_types.hpp"
 
 namespace aztec3::circuits::abis {
 
diff --git a/circuits/cpp/src/aztec3/circuits/abis/function_leaf_preimage.hpp b/circuits/cpp/src/aztec3/circuits/abis/function_leaf_preimage.hpp
index 616f4b561208..f5297667941e 100644
--- a/circuits/cpp/src/aztec3/circuits/abis/function_leaf_preimage.hpp
+++ b/circuits/cpp/src/aztec3/circuits/abis/function_leaf_preimage.hpp
@@ -1,8 +1,9 @@
 #pragma once
-#include <aztec3/constants.hpp>
-#include <aztec3/utils/types/circuit_types.hpp>
-#include <aztec3/utils/types/convert.hpp>
-#include <aztec3/utils/types/native_types.hpp>
+
+#include "aztec3/constants.hpp"
+#include "aztec3/utils/types/circuit_types.hpp"
+#include "aztec3/utils/types/convert.hpp"
+#include "aztec3/utils/types/native_types.hpp"
 
 namespace aztec3::circuits::abis {
 
diff --git a/circuits/cpp/src/aztec3/circuits/abis/kernel_circuit_public_inputs.hpp b/circuits/cpp/src/aztec3/circuits/abis/kernel_circuit_public_inputs.hpp
index 923b98a9e608..76b4878d5985 100644
--- a/circuits/cpp/src/aztec3/circuits/abis/kernel_circuit_public_inputs.hpp
+++ b/circuits/cpp/src/aztec3/circuits/abis/kernel_circuit_public_inputs.hpp
@@ -2,18 +2,16 @@
 #include "combined_accumulated_data.hpp"
 #include "combined_constant_data.hpp"
 
-#include <aztec3/utils/types/circuit_types.hpp>
-#include <aztec3/utils/types/convert.hpp>
-#include <aztec3/utils/types/native_types.hpp>
+#include "aztec3/utils/types/circuit_types.hpp"
+#include "aztec3/utils/types/convert.hpp"
+#include "aztec3/utils/types/native_types.hpp"
 
-#include <barretenberg/stdlib/primitives/witness/witness.hpp>
+#include <barretenberg/barretenberg.hpp>
 
 namespace aztec3::circuits::abis {
 
 using aztec3::utils::types::CircuitTypes;
 using aztec3::utils::types::NativeTypes;
-using plonk::stdlib::witness_t;
-using std::conditional;
 using std::is_same;
 
 template <typename NCT> struct KernelCircuitPublicInputs {
diff --git a/circuits/cpp/src/aztec3/circuits/abis/membership_witness.hpp b/circuits/cpp/src/aztec3/circuits/abis/membership_witness.hpp
index 466c761785aa..67e9b423e307 100644
--- a/circuits/cpp/src/aztec3/circuits/abis/membership_witness.hpp
+++ b/circuits/cpp/src/aztec3/circuits/abis/membership_witness.hpp
@@ -1,8 +1,9 @@
 #pragma once
 
+#include "aztec3/utils/array.hpp"
 #include "aztec3/utils/types/circuit_types.hpp"
 #include "aztec3/utils/types/convert.hpp"
-#include <aztec3/utils/array.hpp>
+
 namespace aztec3::circuits::abis {
 
 using aztec3::utils::zero_array;
diff --git a/circuits/cpp/src/aztec3/circuits/abis/new_contract_data.hpp b/circuits/cpp/src/aztec3/circuits/abis/new_contract_data.hpp
index 6c14f4e0a39a..d062c46f3d68 100644
--- a/circuits/cpp/src/aztec3/circuits/abis/new_contract_data.hpp
+++ b/circuits/cpp/src/aztec3/circuits/abis/new_contract_data.hpp
@@ -5,13 +5,12 @@
 #include "aztec3/utils/types/circuit_types.hpp"
 #include "aztec3/utils/types/convert.hpp"
 
-#include "barretenberg/serialize/msgpack.hpp"
-#include "barretenberg/stdlib/primitives/witness/witness.hpp"
+#include <barretenberg/barretenberg.hpp>
+
 namespace aztec3::circuits::abis {
 
 using aztec3::utils::types::CircuitTypes;
 using aztec3::utils::types::NativeTypes;
-using plonk::stdlib::witness_t;
 using std::is_same;
 
 template <typename NCT> struct NewContractData {
diff --git a/circuits/cpp/src/aztec3/circuits/abis/optionally_revealed_data.hpp b/circuits/cpp/src/aztec3/circuits/abis/optionally_revealed_data.hpp
index b92d56e39138..3eb9e498573a 100644
--- a/circuits/cpp/src/aztec3/circuits/abis/optionally_revealed_data.hpp
+++ b/circuits/cpp/src/aztec3/circuits/abis/optionally_revealed_data.hpp
@@ -1,12 +1,13 @@
 #pragma once
 #include "function_data.hpp"
 
-#include <aztec3/utils/array.hpp>
-#include <aztec3/utils/types/circuit_types.hpp>
-#include <aztec3/utils/types/convert.hpp>
-#include <aztec3/utils/types/native_types.hpp>
+#include "aztec3/utils/array.hpp"
+#include "aztec3/utils/types/circuit_types.hpp"
+#include "aztec3/utils/types/convert.hpp"
+#include "aztec3/utils/types/native_types.hpp"
+
+#include <barretenberg/barretenberg.hpp>
 
-#include <barretenberg/stdlib/primitives/witness/witness.hpp>
 namespace aztec3::circuits::abis {
 
 using aztec3::utils::zero_array;
diff --git a/circuits/cpp/src/aztec3/circuits/abis/previous_kernel_data.hpp b/circuits/cpp/src/aztec3/circuits/abis/previous_kernel_data.hpp
index 4a30333ce59e..4558a4828a8f 100644
--- a/circuits/cpp/src/aztec3/circuits/abis/previous_kernel_data.hpp
+++ b/circuits/cpp/src/aztec3/circuits/abis/previous_kernel_data.hpp
@@ -1,12 +1,10 @@
 #pragma once
 #include "aztec3/circuits/abis/kernel_circuit_public_inputs.hpp"
-#include <aztec3/utils/types/circuit_types.hpp>
-#include <aztec3/utils/types/convert.hpp>
-#include <aztec3/utils/types/native_types.hpp>
+#include "aztec3/utils/types/circuit_types.hpp"
+#include "aztec3/utils/types/convert.hpp"
+#include "aztec3/utils/types/native_types.hpp"
 
-#include <barretenberg/plonk/proof_system/types/proof.hpp>
-#include <barretenberg/srs/reference_string/env_reference_string.hpp>
-#include <barretenberg/stdlib/primitives/witness/witness.hpp>
+#include <barretenberg/barretenberg.hpp>
 
 namespace aztec3::circuits::abis {
 
diff --git a/circuits/cpp/src/aztec3/circuits/abis/private_circuit_public_inputs.hpp b/circuits/cpp/src/aztec3/circuits/abis/private_circuit_public_inputs.hpp
index e91c2da98d6b..a77f454508dc 100644
--- a/circuits/cpp/src/aztec3/circuits/abis/private_circuit_public_inputs.hpp
+++ b/circuits/cpp/src/aztec3/circuits/abis/private_circuit_public_inputs.hpp
@@ -3,22 +3,20 @@
 #include "call_context.hpp"
 #include "contract_deployment_data.hpp"
 
-#include <aztec3/constants.hpp>
-#include <aztec3/utils/array.hpp>
-#include <aztec3/utils/types/circuit_types.hpp>
-#include <aztec3/utils/types/convert.hpp>
-#include <aztec3/utils/types/native_types.hpp>
+#include "aztec3/constants.hpp"
+#include "aztec3/utils/array.hpp"
+#include "aztec3/utils/types/circuit_types.hpp"
+#include "aztec3/utils/types/convert.hpp"
+#include "aztec3/utils/types/native_types.hpp"
 
-#include <barretenberg/common/map.hpp>
-#include <barretenberg/crypto/generators/generator_data.hpp>
-#include <barretenberg/stdlib/hash/pedersen/pedersen.hpp>
-#include <barretenberg/stdlib/primitives/witness/witness.hpp>
+#include <barretenberg/barretenberg.hpp>
 
 namespace aztec3::circuits::abis {
 
 using aztec3::utils::zero_array;
 using aztec3::utils::types::CircuitTypes;
 using aztec3::utils::types::NativeTypes;
+using plonk::stdlib::witness_t;
 
 template <typename NCT> class PrivateCircuitPublicInputs {
     using fr = typename NCT::fr;
diff --git a/circuits/cpp/src/aztec3/circuits/abis/private_historic_tree_roots.hpp b/circuits/cpp/src/aztec3/circuits/abis/private_historic_tree_roots.hpp
index 4c0fcfd2d0d7..a1048a68f152 100644
--- a/circuits/cpp/src/aztec3/circuits/abis/private_historic_tree_roots.hpp
+++ b/circuits/cpp/src/aztec3/circuits/abis/private_historic_tree_roots.hpp
@@ -1,15 +1,15 @@
 #pragma once
-#include <aztec3/utils/types/circuit_types.hpp>
-#include <aztec3/utils/types/convert.hpp>
-#include <aztec3/utils/types/native_types.hpp>
 
-#include <barretenberg/stdlib/primitives/witness/witness.hpp>
+#include "aztec3/utils/types/circuit_types.hpp"
+#include "aztec3/utils/types/convert.hpp"
+#include "aztec3/utils/types/native_types.hpp"
+
+#include <barretenberg/barretenberg.hpp>
 
 namespace aztec3::circuits::abis {
 
 using aztec3::utils::types::CircuitTypes;
 using aztec3::utils::types::NativeTypes;
-using plonk::stdlib::witness_t;
 using std::is_same;
 
 template <typename NCT> struct PrivateHistoricTreeRoots {
diff --git a/circuits/cpp/src/aztec3/circuits/abis/private_kernel/call_context_reconciliation_data.hpp b/circuits/cpp/src/aztec3/circuits/abis/private_kernel/call_context_reconciliation_data.hpp
index bc1b8d39d42f..68b6bc041e87 100644
--- a/circuits/cpp/src/aztec3/circuits/abis/private_kernel/call_context_reconciliation_data.hpp
+++ b/circuits/cpp/src/aztec3/circuits/abis/private_kernel/call_context_reconciliation_data.hpp
@@ -2,11 +2,11 @@
 
 // #include "../call_context.hpp"
 
-// #include <barretenberg/common/map.hpp>
-// #include <barretenberg/stdlib/primitives/witness/witness.hpp>
-// #include <aztec3/utils/types/native_types.hpp>
-// #include <aztec3/utils/types/circuit_types.hpp>
-// #include <aztec3/utils/types/convert.hpp>
+// #include "aztec3/utils/types/native_types.hpp"
+// #include "aztec3/utils/types/circuit_types.hpp"
+// #include "aztec3/utils/types/convert.hpp"
+
+// #include <barretenberg/barretenberg.hpp>
 
 // namespace aztec3::circuits::abis::private_kernel {
 
diff --git a/circuits/cpp/src/aztec3/circuits/abis/private_kernel/globals.hpp b/circuits/cpp/src/aztec3/circuits/abis/private_kernel/globals.hpp
index d3fb6ecda574..8edb04939535 100644
--- a/circuits/cpp/src/aztec3/circuits/abis/private_kernel/globals.hpp
+++ b/circuits/cpp/src/aztec3/circuits/abis/private_kernel/globals.hpp
@@ -1,9 +1,9 @@
 #pragma once
-#include <aztec3/utils/types/circuit_types.hpp>
-#include <aztec3/utils/types/convert.hpp>
-#include <aztec3/utils/types/native_types.hpp>
+#include "aztec3/utils/types/circuit_types.hpp"
+#include "aztec3/utils/types/convert.hpp"
+#include "aztec3/utils/types/native_types.hpp"
 
-#include <barretenberg/stdlib/primitives/witness/witness.hpp>
+#include <barretenberg/barretenberg.hpp>
 
 namespace aztec3::circuits::abis::private_kernel {
 
diff --git a/circuits/cpp/src/aztec3/circuits/abis/private_kernel/private_call_data.hpp b/circuits/cpp/src/aztec3/circuits/abis/private_kernel/private_call_data.hpp
index 05df82cca514..6fc72e370445 100644
--- a/circuits/cpp/src/aztec3/circuits/abis/private_kernel/private_call_data.hpp
+++ b/circuits/cpp/src/aztec3/circuits/abis/private_kernel/private_call_data.hpp
@@ -6,19 +6,16 @@
 #include "../types.hpp"
 
 #include "aztec3/constants.hpp"
-#include "aztec3/utils/array.hpp"
-#include <aztec3/utils/types/circuit_types.hpp>
-#include <aztec3/utils/types/convert.hpp>
-#include <aztec3/utils/types/native_types.hpp>
+#include "aztec3/utils/types/circuit_types.hpp"
+#include "aztec3/utils/types/convert.hpp"
+#include "aztec3/utils/types/native_types.hpp"
 
-#include <barretenberg/common/map.hpp>
-#include <barretenberg/stdlib/primitives/witness/witness.hpp>
+#include <barretenberg/barretenberg.hpp>
 
 namespace aztec3::circuits::abis::private_kernel {
 
 using aztec3::utils::types::CircuitTypes;
 using aztec3::utils::types::NativeTypes;
-using plonk::stdlib::witness_t;
 using std::is_same;
 
 template <typename NCT> struct PrivateCallData {
diff --git a/circuits/cpp/src/aztec3/circuits/abis/private_kernel/private_kernel_inputs_inner.hpp b/circuits/cpp/src/aztec3/circuits/abis/private_kernel/private_kernel_inputs_inner.hpp
index 79c0d9235cc9..f29ab8bbc371 100644
--- a/circuits/cpp/src/aztec3/circuits/abis/private_kernel/private_kernel_inputs_inner.hpp
+++ b/circuits/cpp/src/aztec3/circuits/abis/private_kernel/private_kernel_inputs_inner.hpp
@@ -4,10 +4,9 @@
 #include "../previous_kernel_data.hpp"
 
 #include "aztec3/utils/types/circuit_types.hpp"
-#include "aztec3/utils/types/convert.hpp"
 #include "aztec3/utils/types/native_types.hpp"
 
-#include <barretenberg/stdlib/primitives/witness/witness.hpp>
+#include <barretenberg/barretenberg.hpp>
 
 namespace aztec3::circuits::abis::private_kernel {
 
diff --git a/circuits/cpp/src/aztec3/circuits/abis/public_circuit_public_inputs.hpp b/circuits/cpp/src/aztec3/circuits/abis/public_circuit_public_inputs.hpp
index b28d34e90e29..a040cece9382 100644
--- a/circuits/cpp/src/aztec3/circuits/abis/public_circuit_public_inputs.hpp
+++ b/circuits/cpp/src/aztec3/circuits/abis/public_circuit_public_inputs.hpp
@@ -11,8 +11,7 @@
 #include "aztec3/utils/types/circuit_types.hpp"
 #include "aztec3/utils/types/native_types.hpp"
 
-#include <barretenberg/common/map.hpp>
-#include <barretenberg/stdlib/primitives/witness/witness.hpp>
+#include <barretenberg/barretenberg.hpp>
 
 namespace aztec3::circuits::abis {
 
diff --git a/circuits/cpp/src/aztec3/circuits/abis/public_data_read.hpp b/circuits/cpp/src/aztec3/circuits/abis/public_data_read.hpp
index 4cf4afb64567..f8c1830bd5f9 100644
--- a/circuits/cpp/src/aztec3/circuits/abis/public_data_read.hpp
+++ b/circuits/cpp/src/aztec3/circuits/abis/public_data_read.hpp
@@ -1,10 +1,10 @@
 #pragma once
 #include "aztec3/constants.hpp"
-#include <aztec3/utils/types/circuit_types.hpp>
-#include <aztec3/utils/types/convert.hpp>
-#include <aztec3/utils/types/native_types.hpp>
+#include "aztec3/utils/types/circuit_types.hpp"
+#include "aztec3/utils/types/convert.hpp"
+#include "aztec3/utils/types/native_types.hpp"
 
-#include <barretenberg/stdlib/primitives/witness/witness.hpp>
+#include <barretenberg/barretenberg.hpp>
 
 namespace aztec3::circuits::abis {
 
diff --git a/circuits/cpp/src/aztec3/circuits/abis/public_data_update_request.hpp b/circuits/cpp/src/aztec3/circuits/abis/public_data_update_request.hpp
index e0dac31f075f..866291ff53b4 100644
--- a/circuits/cpp/src/aztec3/circuits/abis/public_data_update_request.hpp
+++ b/circuits/cpp/src/aztec3/circuits/abis/public_data_update_request.hpp
@@ -1,11 +1,10 @@
 #pragma once
 #include "aztec3/constants.hpp"
-#include <aztec3/utils/types/circuit_types.hpp>
-#include <aztec3/utils/types/convert.hpp>
-#include <aztec3/utils/types/native_types.hpp>
+#include "aztec3/utils/types/circuit_types.hpp"
+#include "aztec3/utils/types/convert.hpp"
+#include "aztec3/utils/types/native_types.hpp"
 
-#include <barretenberg/serialize/msgpack.hpp>
-#include <barretenberg/stdlib/primitives/witness/witness.hpp>
+#include <barretenberg/barretenberg.hpp>
 
 namespace aztec3::circuits::abis {
 
diff --git a/circuits/cpp/src/aztec3/circuits/abis/public_kernel/public_call_data.hpp b/circuits/cpp/src/aztec3/circuits/abis/public_kernel/public_call_data.hpp
index f205f440cde9..8b265b2bea49 100644
--- a/circuits/cpp/src/aztec3/circuits/abis/public_kernel/public_call_data.hpp
+++ b/circuits/cpp/src/aztec3/circuits/abis/public_kernel/public_call_data.hpp
@@ -4,19 +4,16 @@
 #include "../types.hpp"
 
 #include "aztec3/constants.hpp"
-#include "aztec3/utils/array.hpp"
-#include <aztec3/utils/types/circuit_types.hpp>
-#include <aztec3/utils/types/convert.hpp>
-#include <aztec3/utils/types/native_types.hpp>
+#include "aztec3/utils/types/circuit_types.hpp"
+#include "aztec3/utils/types/convert.hpp"
+#include "aztec3/utils/types/native_types.hpp"
 
-#include <barretenberg/common/map.hpp>
-#include <barretenberg/stdlib/primitives/witness/witness.hpp>
+#include <barretenberg/barretenberg.hpp>
 
 namespace aztec3::circuits::abis::public_kernel {
 
 using aztec3::utils::types::CircuitTypes;
 using aztec3::utils::types::NativeTypes;
-using plonk::stdlib::witness_t;
 using std::is_same;
 
 template <typename NCT> struct PublicCallData {
diff --git a/circuits/cpp/src/aztec3/circuits/abis/public_kernel/public_kernel_inputs.hpp b/circuits/cpp/src/aztec3/circuits/abis/public_kernel/public_kernel_inputs.hpp
index 3ed17b808fd7..f4a50dd7e485 100644
--- a/circuits/cpp/src/aztec3/circuits/abis/public_kernel/public_kernel_inputs.hpp
+++ b/circuits/cpp/src/aztec3/circuits/abis/public_kernel/public_kernel_inputs.hpp
@@ -2,14 +2,11 @@
 
 #include "public_call_data.hpp"
 #include "../previous_kernel_data.hpp"
-#include "../signed_tx_request.hpp"
 
-#include <aztec3/utils/types/circuit_types.hpp>
-#include <aztec3/utils/types/convert.hpp>
-#include <aztec3/utils/types/native_types.hpp>
+#include "aztec3/utils/types/circuit_types.hpp"
+#include "aztec3/utils/types/native_types.hpp"
 
-#include <barretenberg/serialize/msgpack.hpp>
-#include <barretenberg/stdlib/primitives/witness/witness.hpp>
+#include <barretenberg/barretenberg.hpp>
 
 namespace aztec3::circuits::abis::public_kernel {
 
diff --git a/circuits/cpp/src/aztec3/circuits/abis/public_kernel/public_kernel_inputs_no_previous_kernel.hpp b/circuits/cpp/src/aztec3/circuits/abis/public_kernel/public_kernel_inputs_no_previous_kernel.hpp
index 8a33296fba2f..64962296ca2d 100644
--- a/circuits/cpp/src/aztec3/circuits/abis/public_kernel/public_kernel_inputs_no_previous_kernel.hpp
+++ b/circuits/cpp/src/aztec3/circuits/abis/public_kernel/public_kernel_inputs_no_previous_kernel.hpp
@@ -1,15 +1,13 @@
 #pragma once
 
 #include "public_call_data.hpp"
-#include "../previous_kernel_data.hpp"
 #include "../signed_tx_request.hpp"
 
 #include "aztec3/circuits/abis/combined_historic_tree_roots.hpp"
-#include <aztec3/utils/types/circuit_types.hpp>
-#include <aztec3/utils/types/convert.hpp>
-#include <aztec3/utils/types/native_types.hpp>
+#include "aztec3/utils/types/circuit_types.hpp"
+#include "aztec3/utils/types/native_types.hpp"
 
-#include <barretenberg/stdlib/primitives/witness/witness.hpp>
+#include <barretenberg/barretenberg.hpp>
 
 namespace aztec3::circuits::abis::public_kernel {
 
diff --git a/circuits/cpp/src/aztec3/circuits/abis/rollup/base/base_or_merge_rollup_public_inputs.hpp b/circuits/cpp/src/aztec3/circuits/abis/rollup/base/base_or_merge_rollup_public_inputs.hpp
index 7305890f4551..ca6d86e7f2ea 100644
--- a/circuits/cpp/src/aztec3/circuits/abis/rollup/base/base_or_merge_rollup_public_inputs.hpp
+++ b/circuits/cpp/src/aztec3/circuits/abis/rollup/base/base_or_merge_rollup_public_inputs.hpp
@@ -1,16 +1,10 @@
 #pragma once
+
 #include "../../append_only_tree_snapshot.hpp"
 #include "../constant_rollup_data.hpp"
 
-#include <aztec3/utils/types/circuit_types.hpp>
-#include <aztec3/utils/types/convert.hpp>
-#include <aztec3/utils/types/native_types.hpp>
-
 namespace aztec3::circuits::abis {
 
-using aztec3::utils::types::CircuitTypes;
-using aztec3::utils::types::NativeTypes;
-using std::is_same;
 
 const uint32_t BASE_ROLLUP_TYPE = 0;
 const uint32_t MERGE_ROLLUP_TYPE = 1;
diff --git a/circuits/cpp/src/aztec3/circuits/abis/rollup/base/base_rollup_inputs.hpp b/circuits/cpp/src/aztec3/circuits/abis/rollup/base/base_rollup_inputs.hpp
index 64866d87ef99..e0740f761a9a 100644
--- a/circuits/cpp/src/aztec3/circuits/abis/rollup/base/base_rollup_inputs.hpp
+++ b/circuits/cpp/src/aztec3/circuits/abis/rollup/base/base_rollup_inputs.hpp
@@ -7,17 +7,10 @@
 
 #include "aztec3/constants.hpp"
 
-#include <barretenberg/serialize/msgpack.hpp>
-
-#include <math.h>
-
+#include <barretenberg/barretenberg.hpp>
 
 namespace aztec3::circuits::abis {
 
-using aztec3::utils::types::CircuitTypes;
-using aztec3::utils::types::NativeTypes;
-using std::is_same;
-
 template <typename NCT> struct BaseRollupInputs {
     using fr = typename NCT::fr;
 
diff --git a/circuits/cpp/src/aztec3/circuits/abis/rollup/constant_rollup_data.hpp b/circuits/cpp/src/aztec3/circuits/abis/rollup/constant_rollup_data.hpp
index 49cba625823c..d6e14fb659d3 100644
--- a/circuits/cpp/src/aztec3/circuits/abis/rollup/constant_rollup_data.hpp
+++ b/circuits/cpp/src/aztec3/circuits/abis/rollup/constant_rollup_data.hpp
@@ -1,14 +1,11 @@
 #pragma once
+
 #include "../append_only_tree_snapshot.hpp"
 
-#include <barretenberg/serialize/msgpack.hpp>
+#include <barretenberg/barretenberg.hpp>
 
 namespace aztec3::circuits::abis {
 
-using aztec3::utils::types::CircuitTypes;
-using aztec3::utils::types::NativeTypes;
-using std::is_same;
-
 template <typename NCT> struct ConstantRollupData {
     using fr = typename NCT::fr;
 
diff --git a/circuits/cpp/src/aztec3/circuits/abis/rollup/merge/merge_rollup_inputs.hpp b/circuits/cpp/src/aztec3/circuits/abis/rollup/merge/merge_rollup_inputs.hpp
index 759f1ed2e411..69cd0d041097 100644
--- a/circuits/cpp/src/aztec3/circuits/abis/rollup/merge/merge_rollup_inputs.hpp
+++ b/circuits/cpp/src/aztec3/circuits/abis/rollup/merge/merge_rollup_inputs.hpp
@@ -1,18 +1,11 @@
 #pragma once
 #include "aztec3/circuits/abis/append_only_tree_snapshot.hpp"
-#include <aztec3/circuits/abis/rollup/merge/previous_rollup_data.hpp>
-#include <aztec3/utils/types/circuit_types.hpp>
-#include <aztec3/utils/types/convert.hpp>
-#include <aztec3/utils/types/native_types.hpp>
+#include "aztec3/circuits/abis/rollup/merge/previous_rollup_data.hpp"
 
 #include <type_traits>
 
 namespace aztec3::circuits::abis {
 
-using aztec3::utils::types::CircuitTypes;
-using aztec3::utils::types::NativeTypes;
-using std::is_same;
-
 template <typename NCT> struct MergeRollupInputs {
     std::array<PreviousRollupData<NCT>, 2> previous_rollup_data;
 
diff --git a/circuits/cpp/src/aztec3/circuits/abis/rollup/merge/previous_rollup_data.hpp b/circuits/cpp/src/aztec3/circuits/abis/rollup/merge/previous_rollup_data.hpp
index c31dce73fe3d..dc01289ac94f 100644
--- a/circuits/cpp/src/aztec3/circuits/abis/rollup/merge/previous_rollup_data.hpp
+++ b/circuits/cpp/src/aztec3/circuits/abis/rollup/merge/previous_rollup_data.hpp
@@ -3,24 +3,20 @@
 #include "aztec3/circuits/abis/membership_witness.hpp"
 #include "aztec3/circuits/abis/rollup/base/base_or_merge_rollup_public_inputs.hpp"
 #include "aztec3/constants.hpp"
-#include <aztec3/utils/types/circuit_types.hpp>
-#include <aztec3/utils/types/convert.hpp>
-#include <aztec3/utils/types/native_types.hpp>
+#include "aztec3/utils/types/native_types.hpp"
 
 #include <type_traits>
 
 namespace aztec3::circuits::abis {
 
-using aztec3::utils::types::CircuitTypes;
 using aztec3::utils::types::NativeTypes;
-using std::is_same;
 
 template <typename NCT> struct PreviousRollupData {
     BaseOrMergeRollupPublicInputs<NCT> base_or_merge_rollup_public_inputs;
 
     NativeTypes::Proof proof;
     std::shared_ptr<NativeTypes::VK> vk;
-    NativeTypes::uint32 vk_index;
+    NativeTypes::uint32 vk_index = 0;
     MembershipWitness<NCT, ROLLUP_VK_TREE_HEIGHT> vk_sibling_path;
 
     bool operator==(PreviousRollupData<NCT> const&) const = default;
diff --git a/circuits/cpp/src/aztec3/circuits/abis/rollup/nullifier_leaf_preimage.hpp b/circuits/cpp/src/aztec3/circuits/abis/rollup/nullifier_leaf_preimage.hpp
index cfe082219ab2..7a0d6beab70e 100644
--- a/circuits/cpp/src/aztec3/circuits/abis/rollup/nullifier_leaf_preimage.hpp
+++ b/circuits/cpp/src/aztec3/circuits/abis/rollup/nullifier_leaf_preimage.hpp
@@ -2,9 +2,8 @@
 
 #include "aztec3/utils/types/circuit_types.hpp"
 
-#include "barretenberg/serialize/msgpack.hpp"
-#include "barretenberg/stdlib/merkle_tree/hash.hpp"
-#include "barretenberg/stdlib/merkle_tree/nullifier_tree/nullifier_leaf.hpp"
+#include <barretenberg/barretenberg.hpp>
+
 namespace aztec3::circuits::abis {
 
 using aztec3::utils::types::CircuitTypes;
diff --git a/circuits/cpp/src/aztec3/circuits/abis/rollup/root/root_rollup_inputs.hpp b/circuits/cpp/src/aztec3/circuits/abis/rollup/root/root_rollup_inputs.hpp
index e16d8b738e12..5bb089f66d22 100644
--- a/circuits/cpp/src/aztec3/circuits/abis/rollup/root/root_rollup_inputs.hpp
+++ b/circuits/cpp/src/aztec3/circuits/abis/rollup/root/root_rollup_inputs.hpp
@@ -4,17 +4,11 @@
 #include "aztec3/circuits/abis/append_only_tree_snapshot.hpp"
 #include "aztec3/circuits/abis/rollup/merge/previous_rollup_data.hpp"
 #include "aztec3/constants.hpp"
-#include <aztec3/utils/types/circuit_types.hpp>
-#include <aztec3/utils/types/convert.hpp>
-#include <aztec3/utils/types/native_types.hpp>
 
 #include <ostream>
 
 namespace aztec3::circuits::abis {
 
-using aztec3::utils::types::CircuitTypes;
-using aztec3::utils::types::NativeTypes;
-
 // TODO: The copy constructor for this struct may throw memory access out of bounds
 // Hit when running aztec3-packages/yarn-project/circuits.js/src/rollup/rollup_wasm_wrapper.test.ts."calls
 // root_rollup__sim"
diff --git a/circuits/cpp/src/aztec3/circuits/abis/rollup/root/root_rollup_public_inputs.hpp b/circuits/cpp/src/aztec3/circuits/abis/rollup/root/root_rollup_public_inputs.hpp
index 474ce2dd196a..9cefb2e1e985 100644
--- a/circuits/cpp/src/aztec3/circuits/abis/rollup/root/root_rollup_public_inputs.hpp
+++ b/circuits/cpp/src/aztec3/circuits/abis/rollup/root/root_rollup_public_inputs.hpp
@@ -1,21 +1,16 @@
-
 #pragma once
 
 #include "aztec3/circuits/abis/append_only_tree_snapshot.hpp"
-#include <aztec3/utils/types/circuit_types.hpp>
-#include <aztec3/utils/types/convert.hpp>
-#include <aztec3/utils/types/native_types.hpp>
+#include "aztec3/utils/types/circuit_types.hpp"
+#include "aztec3/utils/types/convert.hpp"
+#include "aztec3/utils/types/native_types.hpp"
 
-#include "barretenberg/crypto/sha256/sha256.hpp"
+#include <barretenberg/barretenberg.hpp>
 
 #include <ostream>
 
 namespace aztec3::circuits::abis {
 
-using aztec3::utils::types::CircuitTypes;
-using aztec3::utils::types::NativeTypes;
-
-
 template <typename NCT> struct RootRollupPublicInputs {
     using fr = typename NCT::fr;
     using AggregationObject = typename NCT::AggregationObject;
diff --git a/circuits/cpp/src/aztec3/circuits/abis/signed_tx_request.hpp b/circuits/cpp/src/aztec3/circuits/abis/signed_tx_request.hpp
index 3425c1d2a1b4..e428395d07b4 100644
--- a/circuits/cpp/src/aztec3/circuits/abis/signed_tx_request.hpp
+++ b/circuits/cpp/src/aztec3/circuits/abis/signed_tx_request.hpp
@@ -2,11 +2,10 @@
 
 #include "tx_request.hpp"
 
-#include <aztec3/utils/types/circuit_types.hpp>
-#include <aztec3/utils/types/convert.hpp>
-#include <aztec3/utils/types/native_types.hpp>
+#include "aztec3/utils/types/circuit_types.hpp"
+#include "aztec3/utils/types/native_types.hpp"
 
-#include <barretenberg/stdlib/primitives/witness/witness.hpp>
+#include <barretenberg/barretenberg.hpp>
 
 namespace aztec3::circuits::abis {
 
diff --git a/circuits/cpp/src/aztec3/circuits/abis/tx_context.hpp b/circuits/cpp/src/aztec3/circuits/abis/tx_context.hpp
index 5ad9d2ab127a..329528b1fa4a 100644
--- a/circuits/cpp/src/aztec3/circuits/abis/tx_context.hpp
+++ b/circuits/cpp/src/aztec3/circuits/abis/tx_context.hpp
@@ -2,13 +2,11 @@
 #include "contract_deployment_data.hpp"
 #include "function_data.hpp"
 
-#include <aztec3/utils/types/circuit_types.hpp>
-#include <aztec3/utils/types/convert.hpp>
-#include <aztec3/utils/types/native_types.hpp>
+#include "aztec3/utils/types/circuit_types.hpp"
+#include "aztec3/utils/types/convert.hpp"
+#include "aztec3/utils/types/native_types.hpp"
 
-#include <barretenberg/crypto/generators/generator_data.hpp>
-#include <barretenberg/stdlib/hash/pedersen/pedersen.hpp>
-#include <barretenberg/stdlib/primitives/witness/witness.hpp>
+#include <barretenberg/barretenberg.hpp>
 
 namespace aztec3::circuits::abis {
 
diff --git a/circuits/cpp/src/aztec3/circuits/abis/tx_request.hpp b/circuits/cpp/src/aztec3/circuits/abis/tx_request.hpp
index ca4fd8ee8ef1..51b2db0cfbdb 100644
--- a/circuits/cpp/src/aztec3/circuits/abis/tx_request.hpp
+++ b/circuits/cpp/src/aztec3/circuits/abis/tx_request.hpp
@@ -2,12 +2,12 @@
 #include "function_data.hpp"
 #include "tx_context.hpp"
 
-#include <aztec3/utils/array.hpp>
-#include <aztec3/utils/types/circuit_types.hpp>
-#include <aztec3/utils/types/convert.hpp>
-#include <aztec3/utils/types/native_types.hpp>
+#include "aztec3/utils/array.hpp"
+#include "aztec3/utils/types/circuit_types.hpp"
+#include "aztec3/utils/types/convert.hpp"
+#include "aztec3/utils/types/native_types.hpp"
 
-#include <barretenberg/stdlib/primitives/witness/witness.hpp>
+#include <barretenberg/barretenberg.hpp>
 
 namespace aztec3::circuits::abis {
 
diff --git a/circuits/cpp/src/aztec3/circuits/abis/types.hpp b/circuits/cpp/src/aztec3/circuits/abis/types.hpp
index 59c39b0f414b..bbb6fe2ed87e 100644
--- a/circuits/cpp/src/aztec3/circuits/abis/types.hpp
+++ b/circuits/cpp/src/aztec3/circuits/abis/types.hpp
@@ -2,16 +2,13 @@
 #include "private_circuit_public_inputs.hpp"
 #include "public_circuit_public_inputs.hpp"
 
-#include <aztec3/constants.hpp>
-#include <aztec3/utils/array.hpp>
-#include <aztec3/utils/types/circuit_types.hpp>
-#include <aztec3/utils/types/convert.hpp>
-#include <aztec3/utils/types/native_types.hpp>
+#include "aztec3/constants.hpp"
+#include "aztec3/utils/array.hpp"
+#include "aztec3/utils/types/circuit_types.hpp"
+#include "aztec3/utils/types/convert.hpp"
+#include "aztec3/utils/types/native_types.hpp"
 
-#include <barretenberg/common/map.hpp>
-#include <barretenberg/crypto/generators/generator_data.hpp>
-#include <barretenberg/stdlib/hash/pedersen/pedersen.hpp>
-#include <barretenberg/stdlib/primitives/witness/witness.hpp>
+#include <barretenberg/barretenberg.hpp>
 
 namespace aztec3::circuits::abis {
 
diff --git a/circuits/cpp/src/aztec3/circuits/apps/.test.cpp b/circuits/cpp/src/aztec3/circuits/apps/.test.cpp
index 340b69425ff7..a486fe4da8bf 100644
--- a/circuits/cpp/src/aztec3/circuits/apps/.test.cpp
+++ b/circuits/cpp/src/aztec3/circuits/apps/.test.cpp
@@ -1,10 +1,4 @@
 
-// #include <barretenberg/common/serialize.hpp>
-// #include <barretenberg/stdlib/types/types.hpp>
-// #include <barretenberg/numeric/random/engine.hpp>
-
-#include <barretenberg/common/test.hpp>
-
 #include <gtest/gtest.h>
 
 // #include "utxo_state_var.hpp"
@@ -12,7 +6,6 @@
 #include "contract.hpp"
 #include "function_execution_context.hpp"
 #include "oracle_wrapper.hpp"
-#include "utxo_datum.hpp"
 #include "notes/default_private_note/note.hpp"
 #include "notes/default_private_note/note_preimage.hpp"
 #include "notes/default_singleton_private_note/note.hpp"
@@ -23,10 +16,12 @@
 #include "state_vars/utxo_set_state_var.hpp"
 #include "state_vars/utxo_state_var.hpp"
 
-#include <aztec3/oracle/oracle.hpp>
-#include <aztec3/utils/types/circuit_types.hpp>
-#include <aztec3/utils/types/convert.hpp>
-#include <aztec3/utils/types/native_types.hpp>
+#include "aztec3/oracle/oracle.hpp"
+#include "aztec3/utils/types/circuit_types.hpp"
+#include "aztec3/utils/types/convert.hpp"
+#include "aztec3/utils/types/native_types.hpp"
+
+#include <barretenberg/barretenberg.hpp>
 
 namespace {
 // Composer
diff --git a/circuits/cpp/src/aztec3/circuits/apps/contract.hpp b/circuits/cpp/src/aztec3/circuits/apps/contract.hpp
index eeb8d3b169a2..537d9dc8ff81 100644
--- a/circuits/cpp/src/aztec3/circuits/apps/contract.hpp
+++ b/circuits/cpp/src/aztec3/circuits/apps/contract.hpp
@@ -2,16 +2,14 @@
 
 #include "function_declaration.hpp"
 
-#include <aztec3/circuits/abis/function_data.hpp>
+#include "aztec3/circuits/abis/function_data.hpp"
 
-#include <barretenberg/common/container.hpp>
+#include <barretenberg/barretenberg.hpp>
 
 namespace aztec3::circuits::apps {
 
 using aztec3::circuits::abis::FunctionData;
 
-using aztec3::utils::types::CircuitTypes;
-using plonk::stdlib::witness_t;
 using NT = aztec3::utils::types::NativeTypes;
 
 // template <typename Composer> class FunctionExecutionContext;
diff --git a/circuits/cpp/src/aztec3/circuits/apps/contract.tpp b/circuits/cpp/src/aztec3/circuits/apps/contract.tpp
index 2e2745494250..5eb8dcd04c9c 100644
--- a/circuits/cpp/src/aztec3/circuits/apps/contract.tpp
+++ b/circuits/cpp/src/aztec3/circuits/apps/contract.tpp
@@ -1,22 +1,18 @@
 #pragma once
-#include "function_execution_context.hpp"
-#include "function_declaration.hpp"
-
-#include <barretenberg/common/container.hpp>
 
-#include <aztec3/constants.hpp>
+#include "function_declaration.hpp"
+#include "function_execution_context.hpp"
 
-#include <aztec3/circuits/abis/function_data.hpp>
+#include "aztec3/circuits/abis/function_data.hpp"
+#include "aztec3/constants.hpp"
+#include "aztec3/utils/types/convert.hpp"
 
-#include <aztec3/utils/types/convert.hpp>
+#include <barretenberg/barretenberg.hpp>
 
 namespace aztec3::circuits::apps {
 
-using aztec3::utils::types::CircuitTypes;
-using plonk::stdlib::witness_t;
 using NT = aztec3::utils::types::NativeTypes;
 using aztec3::circuits::abis::FunctionData;
-// using aztec3::circuits::abis::OptionalPrivateCircuitPublicInputs;
 
 template <typename NCT> void Contract<NCT>::set_functions(std::vector<FunctionDeclaration<NCT>> const& functions)
 {
@@ -62,4 +58,4 @@ template <typename NCT> FunctionData<NCT> Contract<NCT>::get_function_data_by_na
     return function_datas[name];
 }
 
-} // namespace aztec3::circuits::apps
\ No newline at end of file
+}  // namespace aztec3::circuits::apps
\ No newline at end of file
diff --git a/circuits/cpp/src/aztec3/circuits/apps/function_declaration.hpp b/circuits/cpp/src/aztec3/circuits/apps/function_declaration.hpp
index df774b359266..0fbaa562ee23 100644
--- a/circuits/cpp/src/aztec3/circuits/apps/function_declaration.hpp
+++ b/circuits/cpp/src/aztec3/circuits/apps/function_declaration.hpp
@@ -1,9 +1,9 @@
 #pragma once
-#include <aztec3/utils/types/circuit_types.hpp>
-#include <aztec3/utils/types/convert.hpp>
-#include <aztec3/utils/types/native_types.hpp>
+#include "aztec3/utils/types/circuit_types.hpp"
+#include "aztec3/utils/types/convert.hpp"
+#include "aztec3/utils/types/native_types.hpp"
 
-#include <barretenberg/stdlib/primitives/witness/witness.hpp>
+#include <barretenberg/barretenberg.hpp>
 
 namespace aztec3::circuits::apps {
 
diff --git a/circuits/cpp/src/aztec3/circuits/apps/function_execution_context.hpp b/circuits/cpp/src/aztec3/circuits/apps/function_execution_context.hpp
index 99dd08c8c52f..7c1a8e87a54e 100644
--- a/circuits/cpp/src/aztec3/circuits/apps/function_execution_context.hpp
+++ b/circuits/cpp/src/aztec3/circuits/apps/function_execution_context.hpp
@@ -5,15 +5,14 @@
 #include "notes/note_interface.hpp"
 #include "opcodes/opcodes.hpp"
 
-#include <aztec3/circuits/abis/call_stack_item.hpp>
-#include <aztec3/circuits/abis/function_data.hpp>
-#include <aztec3/circuits/abis/private_circuit_public_inputs.hpp>
-#include <aztec3/circuits/abis/types.hpp>
-#include <aztec3/constants.hpp>
-#include <aztec3/utils/types/convert.hpp>
-
-#include <barretenberg/common/container.hpp>
-#include <barretenberg/stdlib/primitives/field/array.hpp>
+#include "aztec3/circuits/abis/call_stack_item.hpp"
+#include "aztec3/circuits/abis/function_data.hpp"
+#include "aztec3/circuits/abis/private_circuit_public_inputs.hpp"
+#include "aztec3/circuits/abis/types.hpp"
+#include "aztec3/constants.hpp"
+#include "aztec3/utils/types/convert.hpp"
+
+#include <barretenberg/barretenberg.hpp>
 
 namespace aztec3::circuits::apps {
 
diff --git a/circuits/cpp/src/aztec3/circuits/apps/notes/default_private_note/note.hpp b/circuits/cpp/src/aztec3/circuits/apps/notes/default_private_note/note.hpp
index 2d5e966dde7f..c4c8a81e4bb4 100644
--- a/circuits/cpp/src/aztec3/circuits/apps/notes/default_private_note/note.hpp
+++ b/circuits/cpp/src/aztec3/circuits/apps/notes/default_private_note/note.hpp
@@ -4,8 +4,8 @@
 #include "nullifier_preimage.hpp"
 #include "../note_interface.hpp"
 
-#include <aztec3/utils/types/circuit_types.hpp>
-#include <aztec3/utils/types/native_types.hpp>
+#include "aztec3/utils/types/circuit_types.hpp"
+#include "aztec3/utils/types/native_types.hpp"
 
 // Forward-declare from this namespace in particular:
 namespace aztec3::circuits::apps::state_vars {
diff --git a/circuits/cpp/src/aztec3/circuits/apps/notes/default_private_note/note.tpp b/circuits/cpp/src/aztec3/circuits/apps/notes/default_private_note/note.tpp
index fb2cfdeb03c9..15826362d3ab 100644
--- a/circuits/cpp/src/aztec3/circuits/apps/notes/default_private_note/note.tpp
+++ b/circuits/cpp/src/aztec3/circuits/apps/notes/default_private_note/note.tpp
@@ -1,28 +1,20 @@
 #include "note_preimage.hpp"
 #include "nullifier_preimage.hpp"
-
-#include "../note_interface.hpp"
-
-#include "../../oracle_wrapper.hpp"
 #include "../../opcodes/opcodes.hpp"
-
+#include "../../oracle_wrapper.hpp"
 #include "../../state_vars/state_var_base.hpp"
+#include "../note_interface.hpp"
 
-#include <barretenberg/crypto/generators/generator_data.hpp>
-
-#include <barretenberg/plonk/composer/turbo_plonk_composer.hpp>
+#include "aztec3/utils/types/circuit_types.hpp"
+#include "aztec3/utils/types/convert.hpp"
+#include "aztec3/utils/types/native_types.hpp"
 
-#include <barretenberg/stdlib/hash/pedersen/pedersen.hpp>
-#include <barretenberg/stdlib/hash/blake2s/blake2s.hpp>
-#include <barretenberg/stdlib/primitives/witness/witness.hpp>
-#include <aztec3/utils/types/native_types.hpp>
-#include <aztec3/utils/types/circuit_types.hpp>
-#include <aztec3/utils/types/convert.hpp>
+#include <barretenberg/barretenberg.hpp>
 
 namespace {
 using aztec3::circuits::apps::opcodes::Opcodes;
 using aztec3::circuits::apps::state_vars::StateVar;
-} // namespace
+}  // namespace
 
 namespace aztec3::circuits::apps::notes {
 
@@ -75,16 +67,18 @@ typename CircuitTypes<Composer>::fr DefaultPrivateNote<Composer, V>::compute_com
 
     auto gen_pair_address = [&](std::optional<address> const& input, size_t const hash_sub_index) {
         if (!input) {
-            throw_or_abort("Cannot commit to a partial preimage. Call compute_partial_commitment instead, or complete "
-                           "the preimage.");
+            throw_or_abort(
+                "Cannot commit to a partial preimage. Call compute_partial_commitment instead, or complete "
+                "the preimage.");
         }
         return std::make_pair((*input).to_field(), generator_index_t({ GeneratorIndex::COMMITMENT, hash_sub_index }));
     };
 
     auto gen_pair_fr = [&](std::optional<fr> const& input, size_t const hash_sub_index) {
         if (!input) {
-            throw_or_abort("Cannot commit to a partial preimage. Call compute_partial_commitment instead, or complete "
-                           "the preimage.");
+            throw_or_abort(
+                "Cannot commit to a partial preimage. Call compute_partial_commitment instead, or complete "
+                "the preimage.");
         }
         return std::make_pair(*input, generator_index_t({ GeneratorIndex::COMMITMENT, hash_sub_index }));
     };
@@ -285,4 +279,4 @@ typename CircuitTypes<Composer>::fr DefaultPrivateNote<Composer, V>::generate_no
     return *(note_preimage.nonce);
 };
 
-} // namespace aztec3::circuits::apps::notes
\ No newline at end of file
+}  // namespace aztec3::circuits::apps::notes
\ No newline at end of file
diff --git a/circuits/cpp/src/aztec3/circuits/apps/notes/default_private_note/note_preimage.hpp b/circuits/cpp/src/aztec3/circuits/apps/notes/default_private_note/note_preimage.hpp
index 1e4eb3a7f111..a520e8e4b852 100644
--- a/circuits/cpp/src/aztec3/circuits/apps/notes/default_private_note/note_preimage.hpp
+++ b/circuits/cpp/src/aztec3/circuits/apps/notes/default_private_note/note_preimage.hpp
@@ -1,12 +1,10 @@
 #pragma once
 
-#include <aztec3/utils/types/circuit_types.hpp>
-#include <aztec3/utils/types/convert.hpp>
-#include <aztec3/utils/types/native_types.hpp>
+#include "aztec3/utils/types/circuit_types.hpp"
+#include "aztec3/utils/types/convert.hpp"
+#include "aztec3/utils/types/native_types.hpp"
 
-#include <barretenberg/common/map.hpp>
-#include <barretenberg/common/streams.hpp>
-#include <barretenberg/crypto/generators/generator_data.hpp>
+#include <barretenberg/barretenberg.hpp>
 
 namespace aztec3::circuits::apps::notes {
 
diff --git a/circuits/cpp/src/aztec3/circuits/apps/notes/default_private_note/nullifier_preimage.hpp b/circuits/cpp/src/aztec3/circuits/apps/notes/default_private_note/nullifier_preimage.hpp
index bc05f8c8cff5..fdc9658b4587 100644
--- a/circuits/cpp/src/aztec3/circuits/apps/notes/default_private_note/nullifier_preimage.hpp
+++ b/circuits/cpp/src/aztec3/circuits/apps/notes/default_private_note/nullifier_preimage.hpp
@@ -1,17 +1,15 @@
 #pragma once
-#include <aztec3/utils/types/circuit_types.hpp>
-#include <aztec3/utils/types/convert.hpp>
-#include <aztec3/utils/types/native_types.hpp>
 
-#include <barretenberg/common/map.hpp>
-#include <barretenberg/common/streams.hpp>
-#include <barretenberg/crypto/generators/generator_data.hpp>
+#include "aztec3/utils/types/circuit_types.hpp"
+#include "aztec3/utils/types/convert.hpp"
+#include "aztec3/utils/types/native_types.hpp"
+
+#include <barretenberg/barretenberg.hpp>
 
 namespace aztec3::circuits::apps::notes {
 
 using aztec3::utils::types::CircuitTypes;
 using aztec3::utils::types::NativeTypes;
-using crypto::generators::generator_index_t;
 
 template <typename NCT> struct DefaultPrivateNoteNullifierPreimage {
     using fr = typename NCT::fr;
diff --git a/circuits/cpp/src/aztec3/circuits/apps/notes/default_singleton_private_note/note.hpp b/circuits/cpp/src/aztec3/circuits/apps/notes/default_singleton_private_note/note.hpp
index 4edf46d08bb0..a3f231f13075 100644
--- a/circuits/cpp/src/aztec3/circuits/apps/notes/default_singleton_private_note/note.hpp
+++ b/circuits/cpp/src/aztec3/circuits/apps/notes/default_singleton_private_note/note.hpp
@@ -4,8 +4,8 @@
 #include "nullifier_preimage.hpp"
 #include "../note_interface.hpp"
 
-#include <aztec3/utils/types/circuit_types.hpp>
-#include <aztec3/utils/types/native_types.hpp>
+#include "aztec3/utils/types/circuit_types.hpp"
+#include "aztec3/utils/types/native_types.hpp"
 
 // Forward-declare from this namespace in particular:
 namespace aztec3::circuits::apps::state_vars {
diff --git a/circuits/cpp/src/aztec3/circuits/apps/notes/default_singleton_private_note/note.tpp b/circuits/cpp/src/aztec3/circuits/apps/notes/default_singleton_private_note/note.tpp
index d0581244611c..6d7c4173037a 100644
--- a/circuits/cpp/src/aztec3/circuits/apps/notes/default_singleton_private_note/note.tpp
+++ b/circuits/cpp/src/aztec3/circuits/apps/notes/default_singleton_private_note/note.tpp
@@ -1,28 +1,20 @@
 #include "note_preimage.hpp"
 #include "nullifier_preimage.hpp"
-
-#include "../note_interface.hpp"
-
-#include "../../oracle_wrapper.hpp"
 #include "../../opcodes/opcodes.hpp"
-
+#include "../../oracle_wrapper.hpp"
 #include "../../state_vars/state_var_base.hpp"
+#include "../note_interface.hpp"
 
-#include <barretenberg/crypto/generators/generator_data.hpp>
-
-#include <barretenberg/plonk/composer/turbo_plonk_composer.hpp>
+#include "aztec3/utils/types/circuit_types.hpp"
+#include "aztec3/utils/types/convert.hpp"
+#include "aztec3/utils/types/native_types.hpp"
 
-#include <barretenberg/stdlib/hash/pedersen/pedersen.hpp>
-#include <barretenberg/stdlib/hash/blake2s/blake2s.hpp>
-#include <barretenberg/stdlib/primitives/witness/witness.hpp>
-#include <aztec3/utils/types/native_types.hpp>
-#include <aztec3/utils/types/circuit_types.hpp>
-#include <aztec3/utils/types/convert.hpp>
+#include <barretenberg/barretenberg.hpp>
 
 namespace {
 using aztec3::circuits::apps::opcodes::Opcodes;
 using aztec3::circuits::apps::state_vars::StateVar;
-} // namespace
+}  // namespace
 
 namespace aztec3::circuits::apps::notes {
 
@@ -246,4 +238,4 @@ typename CircuitTypes<Composer>::fr DefaultSingletonPrivateNote<Composer, V>::ge
         compressed_storage_slot_point, owner_private_key, is_dummy);
 };
 
-} // namespace aztec3::circuits::apps::notes
\ No newline at end of file
+}  // namespace aztec3::circuits::apps::notes
\ No newline at end of file
diff --git a/circuits/cpp/src/aztec3/circuits/apps/notes/default_singleton_private_note/note_preimage.hpp b/circuits/cpp/src/aztec3/circuits/apps/notes/default_singleton_private_note/note_preimage.hpp
index bac26ade68b8..3e84dbb5f24d 100644
--- a/circuits/cpp/src/aztec3/circuits/apps/notes/default_singleton_private_note/note_preimage.hpp
+++ b/circuits/cpp/src/aztec3/circuits/apps/notes/default_singleton_private_note/note_preimage.hpp
@@ -1,18 +1,15 @@
 #pragma once
 
-#include <aztec3/utils/types/circuit_types.hpp>
-#include <aztec3/utils/types/convert.hpp>
-#include <aztec3/utils/types/native_types.hpp>
+#include "aztec3/utils/types/circuit_types.hpp"
+#include "aztec3/utils/types/convert.hpp"
+#include "aztec3/utils/types/native_types.hpp"
 
-#include <barretenberg/common/map.hpp>
-#include <barretenberg/common/streams.hpp>
-#include <barretenberg/crypto/generators/generator_data.hpp>
+#include <barretenberg/barretenberg.hpp>
 
 namespace aztec3::circuits::apps::notes {
 
 using aztec3::utils::types::CircuitTypes;
 using aztec3::utils::types::NativeTypes;
-using crypto::generators::generator_index_t;
 
 template <typename NCT, typename V> struct DefaultSingletonPrivateNotePreimage {
     using fr = typename NCT::fr;
diff --git a/circuits/cpp/src/aztec3/circuits/apps/notes/default_singleton_private_note/nullifier_preimage.hpp b/circuits/cpp/src/aztec3/circuits/apps/notes/default_singleton_private_note/nullifier_preimage.hpp
index 88f3852d8bb0..0e7765e2c456 100644
--- a/circuits/cpp/src/aztec3/circuits/apps/notes/default_singleton_private_note/nullifier_preimage.hpp
+++ b/circuits/cpp/src/aztec3/circuits/apps/notes/default_singleton_private_note/nullifier_preimage.hpp
@@ -1,17 +1,15 @@
 #pragma once
-#include <aztec3/utils/types/circuit_types.hpp>
-#include <aztec3/utils/types/convert.hpp>
-#include <aztec3/utils/types/native_types.hpp>
 
-#include <barretenberg/common/map.hpp>
-#include <barretenberg/common/streams.hpp>
-#include <barretenberg/crypto/generators/generator_data.hpp>
+#include "aztec3/utils/types/circuit_types.hpp"
+#include "aztec3/utils/types/convert.hpp"
+#include "aztec3/utils/types/native_types.hpp"
+
+#include <barretenberg/barretenberg.hpp>
 
 namespace aztec3::circuits::apps::notes {
 
 using aztec3::utils::types::CircuitTypes;
 using aztec3::utils::types::NativeTypes;
-using crypto::generators::generator_index_t;
 
 template <typename NCT> struct DefaultSingletonPrivateNoteNullifierPreimage {
     using fr = typename NCT::fr;
diff --git a/circuits/cpp/src/aztec3/circuits/apps/notes/note_interface.hpp b/circuits/cpp/src/aztec3/circuits/apps/notes/note_interface.hpp
index ff0349909e9a..beddc7167100 100644
--- a/circuits/cpp/src/aztec3/circuits/apps/notes/note_interface.hpp
+++ b/circuits/cpp/src/aztec3/circuits/apps/notes/note_interface.hpp
@@ -1,12 +1,10 @@
 #pragma once
 
-#include <aztec3/utils/types/circuit_types.hpp>
-#include <aztec3/utils/types/native_types.hpp>
+#include "aztec3/utils/types/circuit_types.hpp"
 
 namespace aztec3::circuits::apps::notes {
 
 using aztec3::utils::types::CircuitTypes;
-using aztec3::utils::types::NativeTypes;
 
 /**
  * Note: The methods in this interface must be implemented by the derived Note types, even if such note types don't
diff --git a/circuits/cpp/src/aztec3/circuits/apps/opcodes/opcodes.hpp b/circuits/cpp/src/aztec3/circuits/apps/opcodes/opcodes.hpp
index 35e68bc1b9f4..55c4aeacfa30 100644
--- a/circuits/cpp/src/aztec3/circuits/apps/opcodes/opcodes.hpp
+++ b/circuits/cpp/src/aztec3/circuits/apps/opcodes/opcodes.hpp
@@ -1,9 +1,9 @@
 #pragma once
 
-#include <aztec3/utils/types/circuit_types.hpp>
-#include <aztec3/utils/types/native_types.hpp>
+#include "aztec3/utils/types/circuit_types.hpp"
+#include "aztec3/utils/types/native_types.hpp"
 
-#include <barretenberg/stdlib/primitives/witness/witness.hpp>
+#include <barretenberg/barretenberg.hpp>
 
 namespace aztec3::circuits::apps::state_vars {
 template <typename Composer> class StateVar;
diff --git a/circuits/cpp/src/aztec3/circuits/apps/opcodes/opcodes.tpp b/circuits/cpp/src/aztec3/circuits/apps/opcodes/opcodes.tpp
index fae9e1f63384..f3716aefd4e0 100644
--- a/circuits/cpp/src/aztec3/circuits/apps/opcodes/opcodes.tpp
+++ b/circuits/cpp/src/aztec3/circuits/apps/opcodes/opcodes.tpp
@@ -1,22 +1,22 @@
 #pragma once
 
+#include "../state_vars/state_var_base.hpp"
+#include "../state_vars/utxo_set_state_var.hpp"
+#include "../state_vars/utxo_state_var.hpp"
 #include "../function_execution_context.hpp"
 #include "../utxo_datum.hpp"
 
-#include "../state_vars/state_var_base.hpp"
-#include "../state_vars/utxo_state_var.hpp"
-#include "../state_vars/utxo_set_state_var.hpp"
+#include "aztec3/utils/types/circuit_types.hpp"
+#include "aztec3/utils/types/native_types.hpp"
 
-#include <barretenberg/stdlib/primitives/witness/witness.hpp>
-#include <aztec3/utils/types/native_types.hpp>
-#include <aztec3/utils/types/circuit_types.hpp>
+#include <barretenberg/barretenberg.hpp>
 
 namespace {
 // Declared here, so that `opcodes.hpp` doesn't see it; thereby preventing circular dependencies.
 using aztec3::circuits::apps::state_vars::StateVar;
 using aztec3::circuits::apps::state_vars::UTXOSetStateVar;
 using aztec3::circuits::apps::state_vars::UTXOStateVar;
-} // namespace
+}  // namespace
 
 namespace aztec3::circuits::apps::opcodes {
 
@@ -26,8 +26,7 @@ using aztec3::utils::types::CircuitTypes;
 using aztec3::utils::types::NativeTypes;
 using plonk::stdlib::witness_t;
 
-template <typename Composer>
-template <typename Note>
+template <typename Composer> template <typename Note>
 Note Opcodes<Composer>::UTXO_SLOAD(UTXOStateVar<Composer, Note>* utxo_state_var,
                                    typename Note::NotePreimage const& advice)
 {
@@ -60,8 +59,7 @@ Note Opcodes<Composer>::UTXO_SLOAD(UTXOStateVar<Composer, Note>* utxo_state_var,
     return new_note;
 };
 
-template <typename Composer>
-template <typename Note>
+template <typename Composer> template <typename Note>
 std::vector<Note> Opcodes<Composer>::UTXO_SLOAD(UTXOSetStateVar<Composer, Note>* utxo_set_state_var,
                                                 size_t const& num_notes,
                                                 typename Note::NotePreimage const& advice)
@@ -105,8 +103,7 @@ std::vector<Note> Opcodes<Composer>::UTXO_SLOAD(UTXOSetStateVar<Composer, Note>*
     return new_notes;
 };
 
-template <typename Composer>
-template <typename Note>
+template <typename Composer> template <typename Note>
 void Opcodes<Composer>::UTXO_NULL(StateVar<Composer>* state_var, Note& note_to_nullify)
 {
     typename CT::fr const nullifier = note_to_nullify.get_nullifier();
@@ -120,8 +117,7 @@ void Opcodes<Composer>::UTXO_NULL(StateVar<Composer>* state_var, Note& note_to_n
     exec_ctx->nullified_notes.push_back(nullified_note_ptr);
 };
 
-template <typename Composer>
-template <typename Note>
+template <typename Composer> template <typename Note>
 void Opcodes<Composer>::UTXO_INIT(StateVar<Composer>* state_var, Note& note_to_initialise)
 {
     typename CT::fr const init_nullifier = note_to_initialise.get_initialisation_nullifier();
@@ -138,8 +134,7 @@ void Opcodes<Composer>::UTXO_INIT(StateVar<Composer>* state_var, Note& note_to_i
     exec_ctx->new_notes.push_back(init_note_ptr);
 };
 
-template <typename Composer>
-template <typename Note>
+template <typename Composer> template <typename Note>
 void Opcodes<Composer>::UTXO_SSTORE(StateVar<Composer>* state_var, typename Note::NotePreimage new_note_preimage)
 {
     auto& exec_ctx = state_var->exec_ctx;
@@ -151,4 +146,4 @@ void Opcodes<Composer>::UTXO_SSTORE(StateVar<Composer>* state_var, typename Note
     exec_ctx->new_notes.push_back(new_note_ptr);
 };
 
-} // namespace aztec3::circuits::apps::opcodes
+}  // namespace aztec3::circuits::apps::opcodes
diff --git a/circuits/cpp/src/aztec3/circuits/apps/oracle_wrapper.hpp b/circuits/cpp/src/aztec3/circuits/apps/oracle_wrapper.hpp
index 857e18ef1e76..3377c6580e53 100644
--- a/circuits/cpp/src/aztec3/circuits/apps/oracle_wrapper.hpp
+++ b/circuits/cpp/src/aztec3/circuits/apps/oracle_wrapper.hpp
@@ -1,12 +1,13 @@
 #pragma once
-#include <aztec3/circuits/abis/call_context.hpp>
-#include <aztec3/circuits/abis/contract_deployment_data.hpp>
-#include <aztec3/oracle/oracle.hpp>
-#include <aztec3/utils/types/circuit_types.hpp>
-#include <aztec3/utils/types/convert.hpp>
-#include <aztec3/utils/types/native_types.hpp>
-
-#include <barretenberg/common/map.hpp>
+
+#include "aztec3/circuits/abis/call_context.hpp"
+#include "aztec3/circuits/abis/contract_deployment_data.hpp"
+#include "aztec3/oracle/oracle.hpp"
+#include "aztec3/utils/types/circuit_types.hpp"
+#include "aztec3/utils/types/convert.hpp"
+#include "aztec3/utils/types/native_types.hpp"
+
+#include <barretenberg/barretenberg.hpp>
 
 namespace aztec3::circuits::apps {
 
diff --git a/circuits/cpp/src/aztec3/circuits/apps/private_state.test.cpp b/circuits/cpp/src/aztec3/circuits/apps/private_state.test.cpp
index 0df65efc6a6f..b304d32b2719 100644
--- a/circuits/cpp/src/aztec3/circuits/apps/private_state.test.cpp
+++ b/circuits/cpp/src/aztec3/circuits/apps/private_state.test.cpp
@@ -1,13 +1,9 @@
 // #include "index.hpp"
 
+// // #include "aztec3/constants.hpp"
+//
 // #include <gtest/gtest.h>
-// #include <barretenberg/common/test.hpp>
-// #include <barretenberg/common/serialize.hpp>
-// // #include <barretenberg/numeric/random/engine.hpp>
-// #include <barretenberg/stdlib/types/types.hpp>
-// // #include <aztec3/constants.hpp>
-// // #include <barretenberg/crypto/pedersen/pedersen.hpp>
-// // #include <barretenberg/stdlib/hash/pedersen/pedersen.hpp>
+// #include <barretenberg/barretenberg.hpp>
 
 // namespace aztec3::circuits::apps {
 
diff --git a/circuits/cpp/src/aztec3/circuits/apps/state_vars/field_state_var.hpp b/circuits/cpp/src/aztec3/circuits/apps/state_vars/field_state_var.hpp
index e582fbaec425..00fc50a71416 100644
--- a/circuits/cpp/src/aztec3/circuits/apps/state_vars/field_state_var.hpp
+++ b/circuits/cpp/src/aztec3/circuits/apps/state_vars/field_state_var.hpp
@@ -1,10 +1,9 @@
 #pragma once
 
 #include "state_var_base.hpp"
-#include "../function_execution_context.hpp"
 
-#include <aztec3/utils/types/circuit_types.hpp>
-#include <aztec3/utils/types/native_types.hpp>
+#include "aztec3/utils/types/circuit_types.hpp"
+#include "aztec3/utils/types/native_types.hpp"
 
 namespace aztec3::circuits::apps::state_vars {
 
diff --git a/circuits/cpp/src/aztec3/circuits/apps/state_vars/mapping_state_var.hpp b/circuits/cpp/src/aztec3/circuits/apps/state_vars/mapping_state_var.hpp
index f977d168246d..a387c720142b 100644
--- a/circuits/cpp/src/aztec3/circuits/apps/state_vars/mapping_state_var.hpp
+++ b/circuits/cpp/src/aztec3/circuits/apps/state_vars/mapping_state_var.hpp
@@ -1,10 +1,9 @@
 #pragma once
 
 #include "state_var_base.hpp"
-// #include "../function_execution_context.hpp"
 
-#include <aztec3/utils/types/circuit_types.hpp>
-#include <aztec3/utils/types/native_types.hpp>
+#include "aztec3/utils/types/circuit_types.hpp"
+#include "aztec3/utils/types/native_types.hpp"
 
 // Forward-declare from this namespace in particular:
 namespace aztec3::circuits::apps {
diff --git a/circuits/cpp/src/aztec3/circuits/apps/state_vars/mapping_state_var.tpp b/circuits/cpp/src/aztec3/circuits/apps/state_vars/mapping_state_var.tpp
index c25d4186d93a..06419fdb1674 100644
--- a/circuits/cpp/src/aztec3/circuits/apps/state_vars/mapping_state_var.tpp
+++ b/circuits/cpp/src/aztec3/circuits/apps/state_vars/mapping_state_var.tpp
@@ -1,5 +1,5 @@
 #pragma once
-// #include <barretenberg/common/container.hpp>
+
 // #include "oracle_wrapper.hpp"
 // #include "private_state_note.hpp"
 // #include "private_state_note_preimage.hpp"
@@ -7,19 +7,15 @@
 
 #include "../function_execution_context.hpp"
 
-#include <barretenberg/plonk/composer/turbo_plonk_composer.hpp>
+#include "aztec3/utils/types/circuit_types.hpp"
+#include "aztec3/utils/types/convert.hpp"
+#include "aztec3/utils/types/native_types.hpp"
 
-#include <barretenberg/common/streams.hpp>
-#include <barretenberg/common/map.hpp>
-#include <barretenberg/crypto/generators/generator_data.hpp>
-#include <barretenberg/stdlib/hash/pedersen/pedersen.hpp>
-#include <aztec3/utils/types/native_types.hpp>
-#include <aztec3/utils/types/circuit_types.hpp>
-#include <aztec3/utils/types/convert.hpp>
+#include <barretenberg/barretenberg.hpp>
 
 namespace {
 using aztec3::circuits::apps::FunctionExecutionContext;
-} // namespace
+}  // namespace
 
 namespace aztec3::circuits::apps::state_vars {
 
@@ -78,16 +74,17 @@ std::tuple<typename CircuitTypes<Composer>::grumpkin_point, bool> MappingStateVa
 
     std::vector<std::pair<fr, generator_index_t>> input_pairs;
 
-    input_pairs.push_back(std::make_pair(this->start_slot,
-                                         generator_index_t({ StorageSlotGeneratorIndex::MAPPING_SLOT,
-                                                             0 }))); // hash_sub_index 0 is reserved for the start_slot.
+    input_pairs.push_back(
+        std::make_pair(this->start_slot,
+                       generator_index_t({ StorageSlotGeneratorIndex::MAPPING_SLOT,
+                                           0 })));  // hash_sub_index 0 is reserved for the start_slot.
 
     if (key) {
         input_pairs.push_back(std::make_pair(
             *key,
             generator_index_t(
                 { StorageSlotGeneratorIndex::MAPPING_SLOT,
-                  this->level_of_container_nesting }))); // hash_sub_index 0 is reserved for the start_slot.
+                  this->level_of_container_nesting })));  // hash_sub_index 0 is reserved for the start_slot.
     } else {
         // If this mapping key has no mapping_key_value (std::nullopt), then we must be partially committing and
         // omitting this mapping key from that partial commitment.
@@ -145,4 +142,4 @@ template <typename Composer, typename V> V& MappingStateVar<Composer, V>::at(std
     return this->value_cache[lookup];
 }
 
-}; // namespace aztec3::circuits::apps::state_vars
+};  // namespace aztec3::circuits::apps::state_vars
diff --git a/circuits/cpp/src/aztec3/circuits/apps/state_vars/state_var_base.hpp b/circuits/cpp/src/aztec3/circuits/apps/state_vars/state_var_base.hpp
index 4dc9f2d7dbeb..718de6c3f705 100644
--- a/circuits/cpp/src/aztec3/circuits/apps/state_vars/state_var_base.hpp
+++ b/circuits/cpp/src/aztec3/circuits/apps/state_vars/state_var_base.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <aztec3/utils/types/circuit_types.hpp>
-#include <aztec3/utils/types/native_types.hpp>
+#include "aztec3/utils/types/circuit_types.hpp"
+#include "aztec3/utils/types/native_types.hpp"
 
 // Forward-declare from this namespace in particular:
 namespace aztec3::circuits::apps {
diff --git a/circuits/cpp/src/aztec3/circuits/apps/state_vars/state_var_base.tpp b/circuits/cpp/src/aztec3/circuits/apps/state_vars/state_var_base.tpp
index 895173646797..dfbd18e1bbf4 100644
--- a/circuits/cpp/src/aztec3/circuits/apps/state_vars/state_var_base.tpp
+++ b/circuits/cpp/src/aztec3/circuits/apps/state_vars/state_var_base.tpp
@@ -2,12 +2,9 @@
 
 #include "../function_execution_context.hpp"
 
-#include <barretenberg/plonk/composer/turbo_plonk_composer.hpp>
+#include "aztec3/utils/types/circuit_types.hpp"
 
-#include <barretenberg/crypto/generators/generator_data.hpp>
-
-#include <barretenberg/stdlib/hash/pedersen/pedersen.hpp>
-#include <aztec3/utils/types/circuit_types.hpp>
+#include <barretenberg/barretenberg.hpp>
 
 namespace {
 using aztec3::circuits::apps::FunctionExecutionContext;
@@ -20,8 +17,7 @@ using crypto::generators::generator_index_t;
 
 template <typename Composer>
 StateVar<Composer>::StateVar(FunctionExecutionContext<Composer>* exec_ctx, std::string const& state_var_name)
-    : exec_ctx(exec_ctx)
-    , state_var_name(state_var_name)
+    : exec_ctx(exec_ctx), state_var_name(state_var_name)
 {
     // NOLINTBEGIN(cppcoreguidelines-prefer-member-initializer)
     // this ^ linter rule breaks things here here
@@ -38,4 +34,4 @@ template <typename Composer> typename CircuitTypes<Composer>::grumpkin_point Sta
 
 // template class PrivateStateVar<Composer>;
 
-}; // namespace aztec3::circuits::apps::state_vars
+};  // namespace aztec3::circuits::apps::state_vars
diff --git a/circuits/cpp/src/aztec3/circuits/apps/state_vars/utxo_set_state_var.hpp b/circuits/cpp/src/aztec3/circuits/apps/state_vars/utxo_set_state_var.hpp
index 8bf14032f66b..f74b60f57c93 100644
--- a/circuits/cpp/src/aztec3/circuits/apps/state_vars/utxo_set_state_var.hpp
+++ b/circuits/cpp/src/aztec3/circuits/apps/state_vars/utxo_set_state_var.hpp
@@ -2,8 +2,8 @@
 
 #include "state_var_base.hpp"
 
-#include <aztec3/utils/types/circuit_types.hpp>
-#include <aztec3/utils/types/native_types.hpp>
+#include "aztec3/utils/types/circuit_types.hpp"
+#include "aztec3/utils/types/native_types.hpp"
 
 // Forward-declare from this namespace in particular:
 namespace aztec3::circuits::apps {
diff --git a/circuits/cpp/src/aztec3/circuits/apps/state_vars/utxo_set_state_var.tpp b/circuits/cpp/src/aztec3/circuits/apps/state_vars/utxo_set_state_var.tpp
index 87ceac2ed5fa..0864cb2d2246 100644
--- a/circuits/cpp/src/aztec3/circuits/apps/state_vars/utxo_set_state_var.tpp
+++ b/circuits/cpp/src/aztec3/circuits/apps/state_vars/utxo_set_state_var.tpp
@@ -2,12 +2,12 @@
 
 #include "../opcodes/opcodes.hpp"
 
-#include <aztec3/utils/types/native_types.hpp>
-#include <aztec3/utils/types/circuit_types.hpp>
+#include "aztec3/utils/types/circuit_types.hpp"
+#include "aztec3/utils/types/native_types.hpp"
 
 namespace {
 using aztec3::circuits::apps::opcodes::Opcodes;
-} // namespace
+}  // namespace
 
 namespace aztec3::circuits::apps::state_vars {
 
@@ -24,4 +24,4 @@ void UTXOSetStateVar<Composer, Note>::insert(typename Note::NotePreimage new_not
     return Opcodes<Composer>::template UTXO_SSTORE<Note>(this, new_note_preimage);
 };
 
-} // namespace aztec3::circuits::apps::state_vars
\ No newline at end of file
+}  // namespace aztec3::circuits::apps::state_vars
\ No newline at end of file
diff --git a/circuits/cpp/src/aztec3/circuits/apps/state_vars/utxo_state_var.hpp b/circuits/cpp/src/aztec3/circuits/apps/state_vars/utxo_state_var.hpp
index b9c1a41c3372..456de1c9a81b 100644
--- a/circuits/cpp/src/aztec3/circuits/apps/state_vars/utxo_state_var.hpp
+++ b/circuits/cpp/src/aztec3/circuits/apps/state_vars/utxo_state_var.hpp
@@ -2,8 +2,8 @@
 
 #include "state_var_base.hpp"
 
-#include <aztec3/utils/types/circuit_types.hpp>
-#include <aztec3/utils/types/native_types.hpp>
+#include "aztec3/utils/types/circuit_types.hpp"
+#include "aztec3/utils/types/native_types.hpp"
 
 // Forward-declare from this namespace in particular:
 namespace aztec3::circuits::apps {
diff --git a/circuits/cpp/src/aztec3/circuits/apps/state_vars/utxo_state_var.tpp b/circuits/cpp/src/aztec3/circuits/apps/state_vars/utxo_state_var.tpp
index e76b66af1be3..10f963091278 100644
--- a/circuits/cpp/src/aztec3/circuits/apps/state_vars/utxo_state_var.tpp
+++ b/circuits/cpp/src/aztec3/circuits/apps/state_vars/utxo_state_var.tpp
@@ -2,12 +2,12 @@
 
 #include "../opcodes/opcodes.hpp"
 
-#include <aztec3/utils/types/native_types.hpp>
-#include <aztec3/utils/types/circuit_types.hpp>
+#include "aztec3/utils/types/circuit_types.hpp"
+#include "aztec3/utils/types/native_types.hpp"
 
 namespace {
 using aztec3::circuits::apps::opcodes::Opcodes;
-} // namespace
+}  // namespace
 
 namespace aztec3::circuits::apps::state_vars {
 
@@ -30,4 +30,4 @@ void UTXOStateVar<Composer, Note>::insert(typename Note::NotePreimage new_note_p
     Opcodes<Composer>::template UTXO_SSTORE<Note>(this, new_note_preimage);
 };
 
-} // namespace aztec3::circuits::apps::state_vars
\ No newline at end of file
+}  // namespace aztec3::circuits::apps::state_vars
\ No newline at end of file
diff --git a/circuits/cpp/src/aztec3/circuits/apps/test_apps/basic_contract_deployment/basic_contract_deployment.cpp b/circuits/cpp/src/aztec3/circuits/apps/test_apps/basic_contract_deployment/basic_contract_deployment.cpp
index 300de51f2f8e..c66963291918 100644
--- a/circuits/cpp/src/aztec3/circuits/apps/test_apps/basic_contract_deployment/basic_contract_deployment.cpp
+++ b/circuits/cpp/src/aztec3/circuits/apps/test_apps/basic_contract_deployment/basic_contract_deployment.cpp
@@ -2,7 +2,7 @@
 
 #include "contract.hpp"
 
-#include <aztec3/circuits/abis/private_circuit_public_inputs.hpp>
+#include "aztec3/circuits/abis/private_circuit_public_inputs.hpp"
 
 namespace aztec3::circuits::apps::test_apps::basic_contract_deployment {
 
diff --git a/circuits/cpp/src/aztec3/circuits/apps/test_apps/basic_contract_deployment/basic_contract_deployment.hpp b/circuits/cpp/src/aztec3/circuits/apps/test_apps/basic_contract_deployment/basic_contract_deployment.hpp
index 2fbe30bd7b78..c22c02e37515 100644
--- a/circuits/cpp/src/aztec3/circuits/apps/test_apps/basic_contract_deployment/basic_contract_deployment.hpp
+++ b/circuits/cpp/src/aztec3/circuits/apps/test_apps/basic_contract_deployment/basic_contract_deployment.hpp
@@ -2,8 +2,8 @@
 
 #include "init.hpp"
 
-#include <aztec3/circuits/abis/private_circuit_public_inputs.hpp>
-#include <aztec3/circuits/apps/function_execution_context.hpp>
+#include "aztec3/circuits/abis/private_circuit_public_inputs.hpp"
+#include "aztec3/circuits/apps/function_execution_context.hpp"
 
 namespace aztec3::circuits::apps::test_apps::basic_contract_deployment {
 
diff --git a/circuits/cpp/src/aztec3/circuits/apps/test_apps/basic_contract_deployment/contract.hpp b/circuits/cpp/src/aztec3/circuits/apps/test_apps/basic_contract_deployment/contract.hpp
index 843d1d66e0af..11e110731ea6 100644
--- a/circuits/cpp/src/aztec3/circuits/apps/test_apps/basic_contract_deployment/contract.hpp
+++ b/circuits/cpp/src/aztec3/circuits/apps/test_apps/basic_contract_deployment/contract.hpp
@@ -3,8 +3,8 @@
 #include "contract.hpp"
 #include "init.hpp"
 
-#include <aztec3/circuits/apps/contract.hpp>
-#include <aztec3/circuits/apps/function_declaration.hpp>
+#include "aztec3/circuits/apps/contract.hpp"
+#include "aztec3/circuits/apps/function_declaration.hpp"
 
 namespace aztec3::circuits::apps::test_apps::basic_contract_deployment {
 
diff --git a/circuits/cpp/src/aztec3/circuits/apps/test_apps/basic_contract_deployment/init.hpp b/circuits/cpp/src/aztec3/circuits/apps/test_apps/basic_contract_deployment/init.hpp
index 022dc7006d04..e3ae322d1f20 100644
--- a/circuits/cpp/src/aztec3/circuits/apps/test_apps/basic_contract_deployment/init.hpp
+++ b/circuits/cpp/src/aztec3/circuits/apps/test_apps/basic_contract_deployment/init.hpp
@@ -1,15 +1,15 @@
 #pragma once
 
-#include <aztec3/circuits/apps/contract.hpp>
-#include <aztec3/circuits/apps/function_execution_context.hpp>
-#include <aztec3/circuits/apps/notes/default_private_note/note.hpp>
-#include <aztec3/circuits/apps/oracle_wrapper.hpp>
-#include <aztec3/circuits/apps/state_vars/mapping_state_var.hpp>
-#include <aztec3/circuits/apps/state_vars/utxo_set_state_var.hpp>
-#include <aztec3/oracle/oracle.hpp>
-#include <aztec3/utils/types/circuit_types.hpp>
-#include <aztec3/utils/types/convert.hpp>
-#include <aztec3/utils/types/native_types.hpp>
+#include "aztec3/circuits/apps/contract.hpp"
+#include "aztec3/circuits/apps/function_execution_context.hpp"
+#include "aztec3/circuits/apps/notes/default_private_note/note.hpp"
+#include "aztec3/circuits/apps/oracle_wrapper.hpp"
+#include "aztec3/circuits/apps/state_vars/mapping_state_var.hpp"
+#include "aztec3/circuits/apps/state_vars/utxo_set_state_var.hpp"
+#include "aztec3/oracle/oracle.hpp"
+#include "aztec3/utils/types/circuit_types.hpp"
+#include "aztec3/utils/types/convert.hpp"
+#include "aztec3/utils/types/native_types.hpp"
 
 namespace aztec3::circuits::apps::test_apps::basic_contract_deployment {
 
diff --git a/circuits/cpp/src/aztec3/circuits/apps/test_apps/escrow/.test.cpp b/circuits/cpp/src/aztec3/circuits/apps/test_apps/escrow/.test.cpp
index f3e21e0cb8bf..982d150e35be 100644
--- a/circuits/cpp/src/aztec3/circuits/apps/test_apps/escrow/.test.cpp
+++ b/circuits/cpp/src/aztec3/circuits/apps/test_apps/escrow/.test.cpp
@@ -1,17 +1,8 @@
-#include "contract.hpp"
 #include "index.hpp"
 
-// #include <aztec3/circuits/abis/call_context.hpp>
-// #include <aztec3/circuits/abis/function_data.hpp>
-
-// #include <aztec3/circuits/apps/function_execution_context.hpp>
-
-#include <barretenberg/common/test.hpp>
+#include <barretenberg/barretenberg.hpp>
 
 #include <gtest/gtest.h>
-// #include <barretenberg/common/serialize.hpp>
-// #include <barretenberg/stdlib/types/types.hpp>
-// #include <barretenberg/numeric/random/engine.hpp>
 
 namespace aztec3::circuits::apps::test_apps::escrow {
 
diff --git a/circuits/cpp/src/aztec3/circuits/apps/test_apps/escrow/contract.hpp b/circuits/cpp/src/aztec3/circuits/apps/test_apps/escrow/contract.hpp
index f26f52b92d59..2aa577eafbbb 100644
--- a/circuits/cpp/src/aztec3/circuits/apps/test_apps/escrow/contract.hpp
+++ b/circuits/cpp/src/aztec3/circuits/apps/test_apps/escrow/contract.hpp
@@ -2,8 +2,8 @@
 
 #include "init.hpp"
 
-#include <aztec3/circuits/apps/contract.hpp>
-#include <aztec3/circuits/apps/function_declaration.hpp>
+#include "aztec3/circuits/apps/contract.hpp"
+#include "aztec3/circuits/apps/function_declaration.hpp"
 
 namespace aztec3::circuits::apps::test_apps::escrow {
 
diff --git a/circuits/cpp/src/aztec3/circuits/apps/test_apps/escrow/deposit.cpp b/circuits/cpp/src/aztec3/circuits/apps/test_apps/escrow/deposit.cpp
index 1ef4b8b4dca5..f5820bde03a3 100644
--- a/circuits/cpp/src/aztec3/circuits/apps/test_apps/escrow/deposit.cpp
+++ b/circuits/cpp/src/aztec3/circuits/apps/test_apps/escrow/deposit.cpp
@@ -2,8 +2,8 @@
 
 #include "contract.hpp"
 
-#include <aztec3/circuits/abis/private_circuit_public_inputs.hpp>
-#include <aztec3/circuits/apps/function_execution_context.hpp>
+#include "aztec3/circuits/abis/private_circuit_public_inputs.hpp"
+#include "aztec3/circuits/apps/function_execution_context.hpp"
 
 namespace aztec3::circuits::apps::test_apps::escrow {
 
diff --git a/circuits/cpp/src/aztec3/circuits/apps/test_apps/escrow/deposit.hpp b/circuits/cpp/src/aztec3/circuits/apps/test_apps/escrow/deposit.hpp
index 9d96d1feb62a..2d15bc7d2eda 100644
--- a/circuits/cpp/src/aztec3/circuits/apps/test_apps/escrow/deposit.hpp
+++ b/circuits/cpp/src/aztec3/circuits/apps/test_apps/escrow/deposit.hpp
@@ -2,8 +2,8 @@
 
 #include "init.hpp"
 
-#include <aztec3/circuits/abis/private_circuit_public_inputs.hpp>
-#include <aztec3/circuits/apps/function_execution_context.hpp>
+#include "aztec3/circuits/abis/private_circuit_public_inputs.hpp"
+#include "aztec3/circuits/apps/function_execution_context.hpp"
 
 namespace aztec3::circuits::apps::test_apps::escrow {
 
diff --git a/circuits/cpp/src/aztec3/circuits/apps/test_apps/escrow/init.hpp b/circuits/cpp/src/aztec3/circuits/apps/test_apps/escrow/init.hpp
index aa4a05569ce6..b4af4a005409 100644
--- a/circuits/cpp/src/aztec3/circuits/apps/test_apps/escrow/init.hpp
+++ b/circuits/cpp/src/aztec3/circuits/apps/test_apps/escrow/init.hpp
@@ -1,15 +1,15 @@
 #pragma once
 
-#include <aztec3/circuits/apps/contract.hpp>
-#include <aztec3/circuits/apps/function_execution_context.hpp>
-#include <aztec3/circuits/apps/notes/default_private_note/note.hpp>
-#include <aztec3/circuits/apps/oracle_wrapper.hpp>
-#include <aztec3/circuits/apps/state_vars/mapping_state_var.hpp>
-#include <aztec3/circuits/apps/state_vars/utxo_set_state_var.hpp>
-#include <aztec3/oracle/oracle.hpp>
-#include <aztec3/utils/types/circuit_types.hpp>
-#include <aztec3/utils/types/convert.hpp>
-#include <aztec3/utils/types/native_types.hpp>
+#include "aztec3/circuits/apps/contract.hpp"
+#include "aztec3/circuits/apps/function_execution_context.hpp"
+#include "aztec3/circuits/apps/notes/default_private_note/note.hpp"
+#include "aztec3/circuits/apps/oracle_wrapper.hpp"
+#include "aztec3/circuits/apps/state_vars/mapping_state_var.hpp"
+#include "aztec3/circuits/apps/state_vars/utxo_set_state_var.hpp"
+#include "aztec3/oracle/oracle.hpp"
+#include "aztec3/utils/types/circuit_types.hpp"
+#include "aztec3/utils/types/convert.hpp"
+#include "aztec3/utils/types/native_types.hpp"
 
 namespace aztec3::circuits::apps::test_apps::escrow {
 
diff --git a/circuits/cpp/src/aztec3/circuits/apps/test_apps/escrow/transfer.cpp b/circuits/cpp/src/aztec3/circuits/apps/test_apps/escrow/transfer.cpp
index 677f03673c66..9c926b4c06eb 100644
--- a/circuits/cpp/src/aztec3/circuits/apps/test_apps/escrow/transfer.cpp
+++ b/circuits/cpp/src/aztec3/circuits/apps/test_apps/escrow/transfer.cpp
@@ -2,7 +2,7 @@
 
 #include "contract.hpp"
 
-#include <aztec3/circuits/abis/private_circuit_public_inputs.hpp>
+#include "aztec3/circuits/abis/private_circuit_public_inputs.hpp"
 
 namespace aztec3::circuits::apps::test_apps::escrow {
 
diff --git a/circuits/cpp/src/aztec3/circuits/apps/test_apps/escrow/transfer.hpp b/circuits/cpp/src/aztec3/circuits/apps/test_apps/escrow/transfer.hpp
index a37203a08c48..444f5052ea4a 100644
--- a/circuits/cpp/src/aztec3/circuits/apps/test_apps/escrow/transfer.hpp
+++ b/circuits/cpp/src/aztec3/circuits/apps/test_apps/escrow/transfer.hpp
@@ -2,8 +2,8 @@
 
 #include "init.hpp"
 
-#include <aztec3/circuits/abis/private_circuit_public_inputs.hpp>
-#include <aztec3/circuits/apps/function_execution_context.hpp>
+#include "aztec3/circuits/abis/private_circuit_public_inputs.hpp"
+#include "aztec3/circuits/apps/function_execution_context.hpp"
 
 namespace aztec3::circuits::apps::test_apps::escrow {
 
diff --git a/circuits/cpp/src/aztec3/circuits/apps/test_apps/escrow/withdraw.cpp b/circuits/cpp/src/aztec3/circuits/apps/test_apps/escrow/withdraw.cpp
index b1c2d67d18ad..2a922de22a20 100644
--- a/circuits/cpp/src/aztec3/circuits/apps/test_apps/escrow/withdraw.cpp
+++ b/circuits/cpp/src/aztec3/circuits/apps/test_apps/escrow/withdraw.cpp
@@ -2,7 +2,7 @@
 
 #include "contract.hpp"
 
-#include <aztec3/circuits/abis/private_circuit_public_inputs.hpp>
+#include "aztec3/circuits/abis/private_circuit_public_inputs.hpp"
 
 namespace aztec3::circuits::apps::test_apps::escrow {
 
diff --git a/circuits/cpp/src/aztec3/circuits/apps/test_apps/escrow/withdraw.hpp b/circuits/cpp/src/aztec3/circuits/apps/test_apps/escrow/withdraw.hpp
index 51d47d4fa602..666e9db417eb 100644
--- a/circuits/cpp/src/aztec3/circuits/apps/test_apps/escrow/withdraw.hpp
+++ b/circuits/cpp/src/aztec3/circuits/apps/test_apps/escrow/withdraw.hpp
@@ -2,8 +2,8 @@
 
 #include "init.hpp"
 
-#include <aztec3/circuits/abis/private_circuit_public_inputs.hpp>
-#include <aztec3/circuits/apps/function_execution_context.hpp>
+#include "aztec3/circuits/abis/private_circuit_public_inputs.hpp"
+#include "aztec3/circuits/apps/function_execution_context.hpp"
 
 namespace aztec3::circuits::apps::test_apps::escrow {
 
diff --git a/circuits/cpp/src/aztec3/circuits/apps/test_apps/private_to_private_function_call/.test.cpp b/circuits/cpp/src/aztec3/circuits/apps/test_apps/private_to_private_function_call/.test.cpp
index 0d219693b34b..bfbc842a2c9f 100644
--- a/circuits/cpp/src/aztec3/circuits/apps/test_apps/private_to_private_function_call/.test.cpp
+++ b/circuits/cpp/src/aztec3/circuits/apps/test_apps/private_to_private_function_call/.test.cpp
@@ -1,11 +1,9 @@
 #include "index.hpp"
 
-#include <aztec3/circuits/abis/call_context.hpp>
-#include <aztec3/circuits/abis/function_data.hpp>
+#include "aztec3/circuits/abis/call_context.hpp"
+#include "aztec3/circuits/abis/function_data.hpp"
 
-// #include <aztec3/circuits/apps/function_execution_context.hpp>
-
-#include <barretenberg/common/test.hpp>
+#include <barretenberg/barretenberg.hpp>
 
 #include <gtest/gtest.h>
 
diff --git a/circuits/cpp/src/aztec3/circuits/apps/test_apps/private_to_private_function_call/contract.hpp b/circuits/cpp/src/aztec3/circuits/apps/test_apps/private_to_private_function_call/contract.hpp
index ee4c3da41b11..4d62ff38fda1 100644
--- a/circuits/cpp/src/aztec3/circuits/apps/test_apps/private_to_private_function_call/contract.hpp
+++ b/circuits/cpp/src/aztec3/circuits/apps/test_apps/private_to_private_function_call/contract.hpp
@@ -2,9 +2,9 @@
 
 #include "init.hpp"
 
-#include <aztec3/circuits/apps/contract.hpp>
-#include <aztec3/circuits/apps/function_declaration.hpp>
-#include <aztec3/circuits/apps/function_execution_context.hpp>
+#include "aztec3/circuits/apps/contract.hpp"
+#include "aztec3/circuits/apps/function_declaration.hpp"
+#include "aztec3/circuits/apps/function_execution_context.hpp"
 
 namespace aztec3::circuits::apps::test_apps::private_to_private_function_call {
 
diff --git a/circuits/cpp/src/aztec3/circuits/apps/test_apps/private_to_private_function_call/function_1_1.cpp b/circuits/cpp/src/aztec3/circuits/apps/test_apps/private_to_private_function_call/function_1_1.cpp
index 72b4a1b0260c..6731aed166d1 100644
--- a/circuits/cpp/src/aztec3/circuits/apps/test_apps/private_to_private_function_call/function_1_1.cpp
+++ b/circuits/cpp/src/aztec3/circuits/apps/test_apps/private_to_private_function_call/function_1_1.cpp
@@ -3,7 +3,7 @@
 #include "contract.hpp"
 #include "function_2_1.hpp"
 
-#include <aztec3/circuits/apps/function_execution_context.hpp>
+#include "aztec3/circuits/apps/function_execution_context.hpp"
 
 namespace aztec3::circuits::apps::test_apps::private_to_private_function_call {
 
diff --git a/circuits/cpp/src/aztec3/circuits/apps/test_apps/private_to_private_function_call/function_1_1.hpp b/circuits/cpp/src/aztec3/circuits/apps/test_apps/private_to_private_function_call/function_1_1.hpp
index 14fdb7062062..4a2557f68016 100644
--- a/circuits/cpp/src/aztec3/circuits/apps/test_apps/private_to_private_function_call/function_1_1.hpp
+++ b/circuits/cpp/src/aztec3/circuits/apps/test_apps/private_to_private_function_call/function_1_1.hpp
@@ -2,7 +2,7 @@
 
 #include "init.hpp"
 
-#include <aztec3/circuits/apps/function_execution_context.hpp>
+#include "aztec3/circuits/apps/function_execution_context.hpp"
 
 namespace aztec3::circuits::apps::test_apps::private_to_private_function_call {
 
diff --git a/circuits/cpp/src/aztec3/circuits/apps/test_apps/private_to_private_function_call/function_2_1.cpp b/circuits/cpp/src/aztec3/circuits/apps/test_apps/private_to_private_function_call/function_2_1.cpp
index 719501518b3c..6cbf5f7d2cf7 100644
--- a/circuits/cpp/src/aztec3/circuits/apps/test_apps/private_to_private_function_call/function_2_1.cpp
+++ b/circuits/cpp/src/aztec3/circuits/apps/test_apps/private_to_private_function_call/function_2_1.cpp
@@ -2,7 +2,7 @@
 
 #include "contract.hpp"
 
-#include <aztec3/circuits/abis/private_circuit_public_inputs.hpp>
+#include "aztec3/circuits/abis/private_circuit_public_inputs.hpp"
 
 namespace aztec3::circuits::apps::test_apps::private_to_private_function_call {
 
diff --git a/circuits/cpp/src/aztec3/circuits/apps/test_apps/private_to_private_function_call/function_2_1.hpp b/circuits/cpp/src/aztec3/circuits/apps/test_apps/private_to_private_function_call/function_2_1.hpp
index 63b52aa91aa0..869a0f5d2fad 100644
--- a/circuits/cpp/src/aztec3/circuits/apps/test_apps/private_to_private_function_call/function_2_1.hpp
+++ b/circuits/cpp/src/aztec3/circuits/apps/test_apps/private_to_private_function_call/function_2_1.hpp
@@ -2,7 +2,7 @@
 
 #include "init.hpp"
 
-#include <aztec3/circuits/abis/private_circuit_public_inputs.hpp>
+#include "aztec3/circuits/abis/private_circuit_public_inputs.hpp"
 
 namespace aztec3::circuits::apps::test_apps::private_to_private_function_call {
 
diff --git a/circuits/cpp/src/aztec3/circuits/apps/test_apps/private_to_private_function_call/init.hpp b/circuits/cpp/src/aztec3/circuits/apps/test_apps/private_to_private_function_call/init.hpp
index f524e76c40de..44816fcbc2e4 100644
--- a/circuits/cpp/src/aztec3/circuits/apps/test_apps/private_to_private_function_call/init.hpp
+++ b/circuits/cpp/src/aztec3/circuits/apps/test_apps/private_to_private_function_call/init.hpp
@@ -1,14 +1,14 @@
 #pragma once
 
-#include <aztec3/circuits/apps/contract.hpp>
-#include <aztec3/circuits/apps/function_execution_context.hpp>
-#include <aztec3/circuits/apps/notes/default_singleton_private_note/note.hpp>
-#include <aztec3/circuits/apps/oracle_wrapper.hpp>
-#include <aztec3/circuits/apps/state_vars/utxo_state_var.hpp>
-#include <aztec3/oracle/oracle.hpp>
-#include <aztec3/utils/types/circuit_types.hpp>
-#include <aztec3/utils/types/convert.hpp>
-#include <aztec3/utils/types/native_types.hpp>
+#include "aztec3/circuits/apps/contract.hpp"
+#include "aztec3/circuits/apps/function_execution_context.hpp"
+#include "aztec3/circuits/apps/notes/default_singleton_private_note/note.hpp"
+#include "aztec3/circuits/apps/oracle_wrapper.hpp"
+#include "aztec3/circuits/apps/state_vars/utxo_state_var.hpp"
+#include "aztec3/oracle/oracle.hpp"
+#include "aztec3/utils/types/circuit_types.hpp"
+#include "aztec3/utils/types/convert.hpp"
+#include "aztec3/utils/types/native_types.hpp"
 
 namespace aztec3::circuits::apps::test_apps::private_to_private_function_call {
 
diff --git a/circuits/cpp/src/aztec3/circuits/apps/utxo_datum.hpp b/circuits/cpp/src/aztec3/circuits/apps/utxo_datum.hpp
index 0588a8dfed17..ce924ce7b73c 100644
--- a/circuits/cpp/src/aztec3/circuits/apps/utxo_datum.hpp
+++ b/circuits/cpp/src/aztec3/circuits/apps/utxo_datum.hpp
@@ -1,9 +1,9 @@
 #pragma once
 
-#include <aztec3/utils/types/circuit_types.hpp>
-#include <aztec3/utils/types/native_types.hpp>
+#include "aztec3/utils/types/circuit_types.hpp"
+#include "aztec3/utils/types/native_types.hpp"
 
-#include <barretenberg/stdlib/primitives/witness/witness.hpp>
+#include <barretenberg/barretenberg.hpp>
 
 namespace aztec3::circuits::apps {
 
diff --git a/circuits/cpp/src/aztec3/circuits/hash.hpp b/circuits/cpp/src/aztec3/circuits/hash.hpp
index 045206a990f9..daf3e8bb0e9c 100644
--- a/circuits/cpp/src/aztec3/circuits/hash.hpp
+++ b/circuits/cpp/src/aztec3/circuits/hash.hpp
@@ -1,12 +1,12 @@
 #pragma once
 
+#include "aztec3/circuits/abis/function_data.hpp"
 #include "aztec3/circuits/abis/function_leaf_preimage.hpp"
-#include <aztec3/circuits/abis/function_data.hpp>
-#include <aztec3/circuits/abis/new_contract_data.hpp>
-#include <aztec3/constants.hpp>
-#include <aztec3/utils/circuit_errors.hpp>
+#include "aztec3/circuits/abis/new_contract_data.hpp"
+#include "aztec3/constants.hpp"
+#include "aztec3/utils/circuit_errors.hpp"
 
-#include "barretenberg/crypto/sha256/sha256.hpp"
+#include <barretenberg/barretenberg.hpp>
 
 #include <array>
 
diff --git a/circuits/cpp/src/aztec3/circuits/kernel/private/.test.cpp b/circuits/cpp/src/aztec3/circuits/kernel/private/.test.cpp
index 534dde73a4bc..422b55279a3d 100644
--- a/circuits/cpp/src/aztec3/circuits/kernel/private/.test.cpp
+++ b/circuits/cpp/src/aztec3/circuits/kernel/private/.test.cpp
@@ -25,10 +25,7 @@
 #include "aztec3/constants.hpp"
 #include "aztec3/utils/circuit_errors.hpp"
 
-#include <barretenberg/common/map.hpp>
-#include <barretenberg/common/test.hpp>
-#include <barretenberg/serialize/test_helper.hpp>
-#include <barretenberg/stdlib/merkle_tree/membership.hpp>
+#include <barretenberg/barretenberg.hpp>
 
 #include <gtest/gtest.h>
 
diff --git a/circuits/cpp/src/aztec3/circuits/kernel/private/c_bind.cpp b/circuits/cpp/src/aztec3/circuits/kernel/private/c_bind.cpp
index e6578c45be15..96c3764c55a1 100644
--- a/circuits/cpp/src/aztec3/circuits/kernel/private/c_bind.cpp
+++ b/circuits/cpp/src/aztec3/circuits/kernel/private/c_bind.cpp
@@ -6,8 +6,7 @@
 #include "aztec3/circuits/abis/combined_constant_data.hpp"
 #include "aztec3/circuits/abis/kernel_circuit_public_inputs.hpp"
 
-#include "barretenberg/srs/reference_string/env_reference_string.hpp"
-#include <barretenberg/serialize/cbind.hpp>
+#include <barretenberg/barretenberg.hpp>
 
 namespace {
 using Composer = plonk::UltraPlonkComposer;
diff --git a/circuits/cpp/src/aztec3/circuits/kernel/private/c_bind.h b/circuits/cpp/src/aztec3/circuits/kernel/private/c_bind.h
index c0a095727f27..45920f008c66 100644
--- a/circuits/cpp/src/aztec3/circuits/kernel/private/c_bind.h
+++ b/circuits/cpp/src/aztec3/circuits/kernel/private/c_bind.h
@@ -1,5 +1,5 @@
 #pragma once
-#include <barretenberg/serialize/cbind_fwd.hpp>
+#include <barretenberg/barretenberg.hpp>
 
 #include <cstddef>
 #include <cstdint>
diff --git a/circuits/cpp/src/aztec3/circuits/kernel/private/private_kernel_circuit.cpp b/circuits/cpp/src/aztec3/circuits/kernel/private/private_kernel_circuit.cpp
index 71d73a09c5e2..2d77a36e2743 100644
--- a/circuits/cpp/src/aztec3/circuits/kernel/private/private_kernel_circuit.cpp
+++ b/circuits/cpp/src/aztec3/circuits/kernel/private/private_kernel_circuit.cpp
@@ -6,7 +6,7 @@
 #include "aztec3/circuits/hash.hpp"
 #include "aztec3/constants.hpp"
 
-#include "barretenberg/stdlib/primitives/field/array.hpp"
+#include <barretenberg/barretenberg.hpp>
 
 namespace aztec3::circuits::kernel::private_kernel {
 
diff --git a/circuits/cpp/src/aztec3/circuits/kernel/private/utils.cpp b/circuits/cpp/src/aztec3/circuits/kernel/private/utils.cpp
index 7049082cfdf2..ed0fb7964b82 100644
--- a/circuits/cpp/src/aztec3/circuits/kernel/private/utils.cpp
+++ b/circuits/cpp/src/aztec3/circuits/kernel/private/utils.cpp
@@ -1,10 +1,9 @@
 #include "index.hpp"
 #include "init.hpp"
 
-#include "aztec3/circuits/abis/new_contract_data.hpp"
 #include "aztec3/circuits/mock/mock_kernel_circuit.hpp"
 
-#include "barretenberg/proof_system/types/composer_type.hpp"
+#include <barretenberg/barretenberg.hpp>
 
 namespace {
 using NT = aztec3::utils::types::NativeTypes;
diff --git a/circuits/cpp/src/aztec3/circuits/kernel/public/.test.cpp b/circuits/cpp/src/aztec3/circuits/kernel/public/.test.cpp
index 9786041f606b..350e43da5ffc 100644
--- a/circuits/cpp/src/aztec3/circuits/kernel/public/.test.cpp
+++ b/circuits/cpp/src/aztec3/circuits/kernel/public/.test.cpp
@@ -3,27 +3,27 @@
 #include "native_public_kernel_circuit_private_previous_kernel.hpp"
 #include "native_public_kernel_circuit_public_previous_kernel.hpp"
 
+#include "aztec3/circuits/abis/call_context.hpp"
+#include "aztec3/circuits/abis/call_stack_item.hpp"
+#include "aztec3/circuits/abis/combined_accumulated_data.hpp"
+#include "aztec3/circuits/abis/combined_constant_data.hpp"
 #include "aztec3/circuits/abis/combined_historic_tree_roots.hpp"
-#include <aztec3/circuits/abis/call_context.hpp>
-#include <aztec3/circuits/abis/call_stack_item.hpp>
-#include <aztec3/circuits/abis/combined_accumulated_data.hpp>
-#include <aztec3/circuits/abis/combined_constant_data.hpp>
-#include <aztec3/circuits/abis/contract_deployment_data.hpp>
-#include <aztec3/circuits/abis/function_data.hpp>
-#include <aztec3/circuits/abis/kernel_circuit_public_inputs.hpp>
-#include <aztec3/circuits/abis/previous_kernel_data.hpp>
-#include <aztec3/circuits/abis/private_circuit_public_inputs.hpp>
-#include <aztec3/circuits/abis/private_historic_tree_roots.hpp>
-#include <aztec3/circuits/abis/private_kernel/globals.hpp>
-#include <aztec3/circuits/abis/public_kernel/public_call_data.hpp>
-#include <aztec3/circuits/abis/public_kernel/public_kernel_inputs.hpp>
-#include <aztec3/circuits/abis/signed_tx_request.hpp>
-#include <aztec3/circuits/abis/tx_context.hpp>
-#include <aztec3/circuits/abis/tx_request.hpp>
-#include <aztec3/circuits/abis/types.hpp>
-#include <aztec3/circuits/apps/function_execution_context.hpp>
-#include <aztec3/utils/array.hpp>
-#include <aztec3/utils/circuit_errors.hpp>
+#include "aztec3/circuits/abis/contract_deployment_data.hpp"
+#include "aztec3/circuits/abis/function_data.hpp"
+#include "aztec3/circuits/abis/kernel_circuit_public_inputs.hpp"
+#include "aztec3/circuits/abis/previous_kernel_data.hpp"
+#include "aztec3/circuits/abis/private_circuit_public_inputs.hpp"
+#include "aztec3/circuits/abis/private_historic_tree_roots.hpp"
+#include "aztec3/circuits/abis/private_kernel/globals.hpp"
+#include "aztec3/circuits/abis/public_kernel/public_call_data.hpp"
+#include "aztec3/circuits/abis/public_kernel/public_kernel_inputs.hpp"
+#include "aztec3/circuits/abis/signed_tx_request.hpp"
+#include "aztec3/circuits/abis/tx_context.hpp"
+#include "aztec3/circuits/abis/tx_request.hpp"
+#include "aztec3/circuits/abis/types.hpp"
+#include "aztec3/circuits/apps/function_execution_context.hpp"
+#include "aztec3/utils/array.hpp"
+#include "aztec3/utils/circuit_errors.hpp"
 
 #include <gtest/gtest.h>
 
diff --git a/circuits/cpp/src/aztec3/circuits/kernel/public/c_bind.cpp b/circuits/cpp/src/aztec3/circuits/kernel/public/c_bind.cpp
index 717918f51406..9b6827a68e93 100644
--- a/circuits/cpp/src/aztec3/circuits/kernel/public/c_bind.cpp
+++ b/circuits/cpp/src/aztec3/circuits/kernel/public/c_bind.cpp
@@ -3,16 +3,14 @@
 #include "index.hpp"
 #include "init.hpp"
 
+#include "aztec3/circuits/abis/kernel_circuit_public_inputs.hpp"
+#include "aztec3/circuits/abis/public_kernel/public_kernel_inputs.hpp"
+#include "aztec3/circuits/abis/public_kernel/public_kernel_inputs_no_previous_kernel.hpp"
+#include "aztec3/constants.hpp"
 #include "aztec3/utils/dummy_composer.hpp"
-#include <aztec3/circuits/abis/kernel_circuit_public_inputs.hpp>
-#include <aztec3/circuits/abis/public_kernel/public_kernel_inputs.hpp>
-#include <aztec3/circuits/abis/public_kernel/public_kernel_inputs_no_previous_kernel.hpp>
-#include <aztec3/constants.hpp>
-#include <aztec3/utils/types/native_types.hpp>
-
-#include <barretenberg/common/serialize.hpp>
-#include <barretenberg/serialize/cbind.hpp>
-#include <barretenberg/srs/reference_string/env_reference_string.hpp>
+#include "aztec3/utils/types/native_types.hpp"
+
+#include <barretenberg/barretenberg.hpp>
 
 namespace {
 using Composer = plonk::UltraPlonkComposer;
diff --git a/circuits/cpp/src/aztec3/circuits/kernel/public/c_bind.h b/circuits/cpp/src/aztec3/circuits/kernel/public/c_bind.h
index ab5d16980ae8..7aaae9fa54f8 100644
--- a/circuits/cpp/src/aztec3/circuits/kernel/public/c_bind.h
+++ b/circuits/cpp/src/aztec3/circuits/kernel/public/c_bind.h
@@ -1,6 +1,7 @@
-#include <cstdint>
+#include <barretenberg/barretenberg.hpp>
+
 #include <cstddef>
-#include <barretenberg/serialize/cbind_fwd.hpp>
+#include <cstdint>
 
 WASM_EXPORT size_t public_kernel__init_proving_key(uint8_t const** pk_buf);
 WASM_EXPORT size_t public_kernel__init_verification_key(uint8_t const* pk_buf, uint8_t const** vk_buf);
diff --git a/circuits/cpp/src/aztec3/circuits/kernel/public/common.hpp b/circuits/cpp/src/aztec3/circuits/kernel/public/common.hpp
index bfbf91e6ec2d..1ba6ffdea03e 100644
--- a/circuits/cpp/src/aztec3/circuits/kernel/public/common.hpp
+++ b/circuits/cpp/src/aztec3/circuits/kernel/public/common.hpp
@@ -2,15 +2,15 @@
 
 #include "init.hpp"
 
-#include <aztec3/circuits/abis/contract_storage_read.hpp>
-#include <aztec3/circuits/abis/contract_storage_update_request.hpp>
-#include <aztec3/circuits/abis/kernel_circuit_public_inputs.hpp>
-#include <aztec3/circuits/abis/public_data_update_request.hpp>
-#include <aztec3/circuits/abis/public_kernel/public_kernel_inputs.hpp>
-#include <aztec3/circuits/abis/public_kernel/public_kernel_inputs_no_previous_kernel.hpp>
-#include <aztec3/circuits/hash.hpp>
-#include <aztec3/utils/array.hpp>
-#include <aztec3/utils/dummy_composer.hpp>
+#include "aztec3/circuits/abis/contract_storage_read.hpp"
+#include "aztec3/circuits/abis/contract_storage_update_request.hpp"
+#include "aztec3/circuits/abis/kernel_circuit_public_inputs.hpp"
+#include "aztec3/circuits/abis/public_data_update_request.hpp"
+#include "aztec3/circuits/abis/public_kernel/public_kernel_inputs.hpp"
+#include "aztec3/circuits/abis/public_kernel/public_kernel_inputs_no_previous_kernel.hpp"
+#include "aztec3/circuits/hash.hpp"
+#include "aztec3/utils/array.hpp"
+#include "aztec3/utils/dummy_composer.hpp"
 
 using NT = aztec3::utils::types::NativeTypes;
 using aztec3::circuits::abis::ContractStorageRead;
diff --git a/circuits/cpp/src/aztec3/circuits/kernel/public/init.hpp b/circuits/cpp/src/aztec3/circuits/kernel/public/init.hpp
index b2482fb7a723..9c89a76aabda 100644
--- a/circuits/cpp/src/aztec3/circuits/kernel/public/init.hpp
+++ b/circuits/cpp/src/aztec3/circuits/kernel/public/init.hpp
@@ -1,12 +1,12 @@
 #pragma once
-#include <aztec3/circuits/abis/public_kernel/public_kernel_inputs.hpp>
-#include <aztec3/circuits/apps/oracle_wrapper.hpp>
-#include <aztec3/circuits/recursion/aggregator.hpp>
-#include <aztec3/oracle/oracle.hpp>
-#include <aztec3/utils/dummy_composer.hpp>
-#include <aztec3/utils/types/circuit_types.hpp>
-#include <aztec3/utils/types/convert.hpp>
-#include <aztec3/utils/types/native_types.hpp>
+#include "aztec3/circuits/abis/public_kernel/public_kernel_inputs.hpp"
+#include "aztec3/circuits/apps/oracle_wrapper.hpp"
+#include "aztec3/circuits/recursion/aggregator.hpp"
+#include "aztec3/oracle/oracle.hpp"
+#include "aztec3/utils/dummy_composer.hpp"
+#include "aztec3/utils/types/circuit_types.hpp"
+#include "aztec3/utils/types/convert.hpp"
+#include "aztec3/utils/types/native_types.hpp"
 
 namespace aztec3::circuits::kernel::public_kernel {
 
diff --git a/circuits/cpp/src/aztec3/circuits/kernel/public/native_public_kernel_circuit_no_previous_kernel.cpp b/circuits/cpp/src/aztec3/circuits/kernel/public/native_public_kernel_circuit_no_previous_kernel.cpp
index 9b7651a22a93..8cde730ba83a 100644
--- a/circuits/cpp/src/aztec3/circuits/kernel/public/native_public_kernel_circuit_no_previous_kernel.cpp
+++ b/circuits/cpp/src/aztec3/circuits/kernel/public/native_public_kernel_circuit_no_previous_kernel.cpp
@@ -3,12 +3,12 @@
 #include "common.hpp"
 #include "init.hpp"
 
+#include "aztec3/circuits/abis/kernel_circuit_public_inputs.hpp"
+#include "aztec3/circuits/abis/public_kernel/public_kernel_inputs_no_previous_kernel.hpp"
+#include "aztec3/circuits/hash.hpp"
+#include "aztec3/utils/array.hpp"
 #include "aztec3/utils/circuit_errors.hpp"
-#include <aztec3/circuits/abis/kernel_circuit_public_inputs.hpp>
-#include <aztec3/circuits/abis/public_kernel/public_kernel_inputs_no_previous_kernel.hpp>
-#include <aztec3/circuits/hash.hpp>
-#include <aztec3/utils/array.hpp>
-#include <aztec3/utils/dummy_composer.hpp>
+#include "aztec3/utils/dummy_composer.hpp"
 
 namespace {
 
diff --git a/circuits/cpp/src/aztec3/circuits/kernel/public/native_public_kernel_circuit_no_previous_kernel.hpp b/circuits/cpp/src/aztec3/circuits/kernel/public/native_public_kernel_circuit_no_previous_kernel.hpp
index fff242d92676..1cf9cda92e00 100644
--- a/circuits/cpp/src/aztec3/circuits/kernel/public/native_public_kernel_circuit_no_previous_kernel.hpp
+++ b/circuits/cpp/src/aztec3/circuits/kernel/public/native_public_kernel_circuit_no_previous_kernel.hpp
@@ -3,9 +3,9 @@
 #include "common.hpp"
 #include "init.hpp"
 
-#include <aztec3/circuits/abis/kernel_circuit_public_inputs.hpp>
-#include <aztec3/circuits/abis/public_kernel/public_kernel_inputs_no_previous_kernel.hpp>
-#include <aztec3/utils/dummy_composer.hpp>
+#include "aztec3/circuits/abis/kernel_circuit_public_inputs.hpp"
+#include "aztec3/circuits/abis/public_kernel/public_kernel_inputs_no_previous_kernel.hpp"
+#include "aztec3/utils/dummy_composer.hpp"
 
 namespace aztec3::circuits::kernel::public_kernel {
 
diff --git a/circuits/cpp/src/aztec3/circuits/kernel/public/native_public_kernel_circuit_private_previous_kernel.cpp b/circuits/cpp/src/aztec3/circuits/kernel/public/native_public_kernel_circuit_private_previous_kernel.cpp
index 41d79b69962b..d9acbdeb8a21 100644
--- a/circuits/cpp/src/aztec3/circuits/kernel/public/native_public_kernel_circuit_private_previous_kernel.cpp
+++ b/circuits/cpp/src/aztec3/circuits/kernel/public/native_public_kernel_circuit_private_previous_kernel.cpp
@@ -2,12 +2,12 @@
 #include "init.hpp"
 #include "native_public_kernel_circuit_public_previous_kernel.hpp"
 
+#include "aztec3/circuits/abis/kernel_circuit_public_inputs.hpp"
+#include "aztec3/circuits/abis/public_kernel/public_kernel_inputs.hpp"
 #include "aztec3/constants.hpp"
+#include "aztec3/utils/array.hpp"
 #include "aztec3/utils/circuit_errors.hpp"
-#include <aztec3/circuits/abis/kernel_circuit_public_inputs.hpp>
-#include <aztec3/circuits/abis/public_kernel/public_kernel_inputs.hpp>
-#include <aztec3/utils/array.hpp>
-#include <aztec3/utils/dummy_composer.hpp>
+#include "aztec3/utils/dummy_composer.hpp"
 
 namespace {
 using CircuitErrorCode = aztec3::utils::CircuitErrorCode;
diff --git a/circuits/cpp/src/aztec3/circuits/kernel/public/native_public_kernel_circuit_private_previous_kernel.hpp b/circuits/cpp/src/aztec3/circuits/kernel/public/native_public_kernel_circuit_private_previous_kernel.hpp
index b7176d8866a8..8cfba2fb8998 100644
--- a/circuits/cpp/src/aztec3/circuits/kernel/public/native_public_kernel_circuit_private_previous_kernel.hpp
+++ b/circuits/cpp/src/aztec3/circuits/kernel/public/native_public_kernel_circuit_private_previous_kernel.hpp
@@ -3,9 +3,9 @@
 #include "common.hpp"
 #include "init.hpp"
 
-#include <aztec3/circuits/abis/kernel_circuit_public_inputs.hpp>
-#include <aztec3/circuits/abis/public_kernel/public_kernel_inputs.hpp>
-#include <aztec3/utils/dummy_composer.hpp>
+#include "aztec3/circuits/abis/kernel_circuit_public_inputs.hpp"
+#include "aztec3/circuits/abis/public_kernel/public_kernel_inputs.hpp"
+#include "aztec3/utils/dummy_composer.hpp"
 
 namespace aztec3::circuits::kernel::public_kernel {
 
diff --git a/circuits/cpp/src/aztec3/circuits/kernel/public/native_public_kernel_circuit_public_previous_kernel.cpp b/circuits/cpp/src/aztec3/circuits/kernel/public/native_public_kernel_circuit_public_previous_kernel.cpp
index 0b2497e28e08..ca10aa1c4284 100644
--- a/circuits/cpp/src/aztec3/circuits/kernel/public/native_public_kernel_circuit_public_previous_kernel.cpp
+++ b/circuits/cpp/src/aztec3/circuits/kernel/public/native_public_kernel_circuit_public_previous_kernel.cpp
@@ -3,10 +3,10 @@
 #include "common.hpp"
 #include "init.hpp"
 
-#include <aztec3/circuits/abis/kernel_circuit_public_inputs.hpp>
-#include <aztec3/circuits/abis/public_kernel/public_kernel_inputs.hpp>
-#include <aztec3/utils/array.hpp>
-#include <aztec3/utils/dummy_composer.hpp>
+#include "aztec3/circuits/abis/kernel_circuit_public_inputs.hpp"
+#include "aztec3/circuits/abis/public_kernel/public_kernel_inputs.hpp"
+#include "aztec3/utils/array.hpp"
+#include "aztec3/utils/dummy_composer.hpp"
 
 namespace {
 using CircuitErrorCode = aztec3::utils::CircuitErrorCode;
diff --git a/circuits/cpp/src/aztec3/circuits/kernel/public/native_public_kernel_circuit_public_previous_kernel.hpp b/circuits/cpp/src/aztec3/circuits/kernel/public/native_public_kernel_circuit_public_previous_kernel.hpp
index b5eaedb894e0..317b06d12b08 100644
--- a/circuits/cpp/src/aztec3/circuits/kernel/public/native_public_kernel_circuit_public_previous_kernel.hpp
+++ b/circuits/cpp/src/aztec3/circuits/kernel/public/native_public_kernel_circuit_public_previous_kernel.hpp
@@ -3,9 +3,9 @@
 #include "common.hpp"
 #include "init.hpp"
 
-#include <aztec3/circuits/abis/kernel_circuit_public_inputs.hpp>
-#include <aztec3/circuits/abis/public_kernel/public_kernel_inputs.hpp>
-#include <aztec3/utils/dummy_composer.hpp>
+#include "aztec3/circuits/abis/kernel_circuit_public_inputs.hpp"
+#include "aztec3/circuits/abis/public_kernel/public_kernel_inputs.hpp"
+#include "aztec3/utils/dummy_composer.hpp"
 
 namespace aztec3::circuits::kernel::public_kernel {
 
diff --git a/circuits/cpp/src/aztec3/circuits/mock/mock_circuit.hpp b/circuits/cpp/src/aztec3/circuits/mock/mock_circuit.hpp
index 6d4e0c8e1cef..5c9c433fdce0 100644
--- a/circuits/cpp/src/aztec3/circuits/mock/mock_circuit.hpp
+++ b/circuits/cpp/src/aztec3/circuits/mock/mock_circuit.hpp
@@ -1,7 +1,6 @@
 #pragma once
-#include <barretenberg/common/map.hpp>
-#include <barretenberg/stdlib/hash/pedersen/pedersen.hpp>
-#include <barretenberg/stdlib/primitives/field/field.hpp>
+
+#include <barretenberg/barretenberg.hpp>
 
 namespace aztec3::circuits::mock {
 
diff --git a/circuits/cpp/src/aztec3/circuits/mock/mock_kernel_circuit.hpp b/circuits/cpp/src/aztec3/circuits/mock/mock_kernel_circuit.hpp
index 40eaf5d66764..9816622c526a 100644
--- a/circuits/cpp/src/aztec3/circuits/mock/mock_kernel_circuit.hpp
+++ b/circuits/cpp/src/aztec3/circuits/mock/mock_kernel_circuit.hpp
@@ -1,14 +1,9 @@
 #pragma once
-#include <aztec3/circuits/abis/kernel_circuit_public_inputs.hpp>
-#include <aztec3/utils/types/circuit_types.hpp>
-#include <aztec3/utils/types/native_types.hpp>
-
-#include <barretenberg/common/map.hpp>
-#include <barretenberg/numeric/random/engine.hpp>
-#include <barretenberg/stdlib/commitment/pedersen/pedersen.hpp>
-#include <barretenberg/stdlib/primitives/field/field.hpp>
-#include <barretenberg/stdlib/primitives/witness/witness.hpp>
-// #include <aztec3/circuits/abis/private_circuit_public_inputs.hpp>
+#include "aztec3/circuits/abis/kernel_circuit_public_inputs.hpp"
+#include "aztec3/utils/types/circuit_types.hpp"
+#include "aztec3/utils/types/native_types.hpp"
+
+#include <barretenberg/barretenberg.hpp>
 
 namespace {
 auto& engine = numeric::random::get_debug_engine();
diff --git a/circuits/cpp/src/aztec3/circuits/recursion/aggregator.hpp b/circuits/cpp/src/aztec3/circuits/recursion/aggregator.hpp
index d15592a60017..244edf349158 100644
--- a/circuits/cpp/src/aztec3/circuits/recursion/aggregator.hpp
+++ b/circuits/cpp/src/aztec3/circuits/recursion/aggregator.hpp
@@ -1,12 +1,10 @@
 #pragma once
 #include "init.hpp"
 
-#include <aztec3/utils/types/circuit_types.hpp>
-#include <aztec3/utils/types/native_types.hpp>
+#include "aztec3/utils/types/circuit_types.hpp"
+#include "aztec3/utils/types/native_types.hpp"
 
-#include <barretenberg/stdlib/recursion/verifier/program_settings.hpp>
-#include <barretenberg/stdlib/recursion/verifier/verifier.hpp>
-#include <barretenberg/transcript/manifest.hpp>
+#include <barretenberg/barretenberg.hpp>
 
 namespace aztec3::circuits::recursion {
 
diff --git a/circuits/cpp/src/aztec3/circuits/recursion/init.hpp b/circuits/cpp/src/aztec3/circuits/recursion/init.hpp
index 60af41555ffa..6731110b6cfe 100644
--- a/circuits/cpp/src/aztec3/circuits/recursion/init.hpp
+++ b/circuits/cpp/src/aztec3/circuits/recursion/init.hpp
@@ -1,10 +1,9 @@
 #pragma once
-#include <aztec3/utils/types/circuit_types.hpp>
-#include <aztec3/utils/types/convert.hpp>
-#include <aztec3/utils/types/native_types.hpp>
+#include "aztec3/utils/types/circuit_types.hpp"
+#include "aztec3/utils/types/convert.hpp"
+#include "aztec3/utils/types/native_types.hpp"
 
-#include <barretenberg/stdlib/recursion/verifier/program_settings.hpp>
-#include <barretenberg/stdlib/recursion/verifier/verifier.hpp>
+#include <barretenberg/barretenberg.hpp>
 
 namespace aztec3::circuits::recursion {
 // Composer
diff --git a/circuits/cpp/src/aztec3/circuits/recursion/play.test.cpp b/circuits/cpp/src/aztec3/circuits/recursion/play.test.cpp
index 30e6d15a989b..61aa879ce2b7 100644
--- a/circuits/cpp/src/aztec3/circuits/recursion/play.test.cpp
+++ b/circuits/cpp/src/aztec3/circuits/recursion/play.test.cpp
@@ -1,7 +1,8 @@
 #include "index.hpp"
 
-#include <barretenberg/common/test.hpp>
-// #include <barretenberg/numeric/random/engine.hpp>
+#include <barretenberg/barretenberg.hpp>
+
+#include <gtest/gtest.h>
 
 namespace aztec3::circuits::recursion {
 
diff --git a/circuits/cpp/src/aztec3/circuits/rollup/base/.test.cpp b/circuits/cpp/src/aztec3/circuits/rollup/base/.test.cpp
index 7a907c011058..02f5d8ab534f 100644
--- a/circuits/cpp/src/aztec3/circuits/rollup/base/.test.cpp
+++ b/circuits/cpp/src/aztec3/circuits/rollup/base/.test.cpp
@@ -3,6 +3,8 @@
 #include "init.hpp"
 
 #include "aztec3/circuits/abis/append_only_tree_snapshot.hpp"
+#include "aztec3/circuits/abis/combined_accumulated_data.hpp"
+#include "aztec3/circuits/abis/kernel_circuit_public_inputs.hpp"
 #include "aztec3/circuits/abis/membership_witness.hpp"
 #include "aztec3/circuits/abis/new_contract_data.hpp"
 #include "aztec3/circuits/abis/previous_kernel_data.hpp"
@@ -11,31 +13,8 @@
 #include "aztec3/circuits/rollup/components/components.hpp"
 #include "aztec3/circuits/rollup/test_utils/utils.hpp"
 #include "aztec3/constants.hpp"
-#include <aztec3/circuits/abis/call_context.hpp>
-#include <aztec3/circuits/abis/call_stack_item.hpp>
-#include <aztec3/circuits/abis/combined_accumulated_data.hpp>
-#include <aztec3/circuits/abis/combined_constant_data.hpp>
-#include <aztec3/circuits/abis/combined_historic_tree_roots.hpp>
-#include <aztec3/circuits/abis/contract_deployment_data.hpp>
-#include <aztec3/circuits/abis/function_data.hpp>
-#include <aztec3/circuits/abis/kernel_circuit_public_inputs.hpp>
-#include <aztec3/circuits/abis/private_circuit_public_inputs.hpp>
-#include <aztec3/circuits/abis/private_historic_tree_roots.hpp>
-#include <aztec3/circuits/abis/private_kernel/globals.hpp>
-#include <aztec3/circuits/abis/signed_tx_request.hpp>
-#include <aztec3/circuits/abis/tx_context.hpp>
-#include <aztec3/circuits/abis/tx_request.hpp>
-#include <aztec3/circuits/apps/function_execution_context.hpp>
-#include <aztec3/circuits/apps/test_apps/basic_contract_deployment/basic_contract_deployment.hpp>
-#include <aztec3/circuits/apps/test_apps/escrow/deposit.hpp>
-#include <aztec3/circuits/mock/mock_kernel_circuit.hpp>
-
-#include "barretenberg/crypto/sha256/sha256.hpp"
-#include "barretenberg/ecc/curves/bn254/fr.hpp"
-#include "barretenberg/stdlib/merkle_tree/memory_store.hpp"
-#include "barretenberg/stdlib/merkle_tree/memory_tree.hpp"
-#include <barretenberg/common/map.hpp>
-#include <barretenberg/common/test.hpp>
+
+#include <barretenberg/barretenberg.hpp>
 
 #include <gtest/gtest.h>
 
diff --git a/circuits/cpp/src/aztec3/circuits/rollup/base/c_bind.cpp b/circuits/cpp/src/aztec3/circuits/rollup/base/c_bind.cpp
index 6daaf42c52d8..e4538a39c940 100644
--- a/circuits/cpp/src/aztec3/circuits/rollup/base/c_bind.cpp
+++ b/circuits/cpp/src/aztec3/circuits/rollup/base/c_bind.cpp
@@ -3,19 +3,12 @@
 #include "index.hpp"
 #include "init.hpp"
 
-#include "aztec3/circuits/abis/private_kernel/private_call_data.hpp"
 #include "aztec3/circuits/abis/rollup/base/base_or_merge_rollup_public_inputs.hpp"
-#include "aztec3/circuits/abis/signed_tx_request.hpp"
+#include "aztec3/constants.hpp"
 #include "aztec3/utils/dummy_composer.hpp"
-#include <aztec3/circuits/abis/kernel_circuit_public_inputs.hpp>
-#include <aztec3/circuits/mock/mock_kernel_circuit.hpp>
-#include <aztec3/constants.hpp>
-#include <aztec3/utils/types/native_types.hpp>
-
-#include "barretenberg/common/serialize.hpp"
-#include "barretenberg/plonk/composer/turbo_plonk_composer.hpp"
-#include "barretenberg/srs/reference_string/env_reference_string.hpp"
+#include "aztec3/utils/types/native_types.hpp"
 
+#include <barretenberg/barretenberg.hpp>
 namespace {
 using Composer = plonk::UltraPlonkComposer;
 using NT = aztec3::utils::types::NativeTypes;
@@ -26,7 +19,6 @@ using aztec3::circuits::rollup::native_base_rollup::base_rollup_circuit;
 
 }  // namespace
 
-#define WASM_EXPORT __attribute__((visibility("default")))
 // WASM Cbinds
 extern "C" {
 
diff --git a/circuits/cpp/src/aztec3/circuits/rollup/base/c_bind.h b/circuits/cpp/src/aztec3/circuits/rollup/base/c_bind.h
index d8bbe20f43f4..5f5095f9fa85 100644
--- a/circuits/cpp/src/aztec3/circuits/rollup/base/c_bind.h
+++ b/circuits/cpp/src/aztec3/circuits/rollup/base/c_bind.h
@@ -1,18 +1,17 @@
-#include <cstdint>
-#include <cstddef>
+#pragma once
+
+#include <barretenberg/barretenberg.hpp>
 
-#define WASM_EXPORT __attribute__((visibility("default")))
+#include <cstddef>
+#include <cstdint>
 
 extern "C" {
 
 WASM_EXPORT size_t base_rollup__init_proving_key(uint8_t const** pk_buf);
 WASM_EXPORT size_t base_rollup__init_verification_key(uint8_t const* pk_buf, uint8_t const** vk_buf);
 WASM_EXPORT size_t base_rollup__dummy_previous_rollup(uint8_t const** previous_rollup_buf);
-WASM_EXPORT uint8_t*  base_rollup__sim(uint8_t const* base_rollup_inputs_buf,
-                                       size_t* base_rollup_public_inputs_size_out,
-                                       uint8_t const** base_or_merge_rollup_public_inputs_buf);
-WASM_EXPORT size_t base_rollup__verify_proof(uint8_t const* vk_buf,
-                                             uint8_t const* proof,
-                                             uint32_t length);
-
+WASM_EXPORT uint8_t* base_rollup__sim(uint8_t const* base_rollup_inputs_buf,
+                                      size_t* base_rollup_public_inputs_size_out,
+                                      uint8_t const** base_or_merge_rollup_public_inputs_buf);
+WASM_EXPORT size_t base_rollup__verify_proof(uint8_t const* vk_buf, uint8_t const* proof, uint32_t length);
 }
\ No newline at end of file
diff --git a/circuits/cpp/src/aztec3/circuits/rollup/base/init.hpp b/circuits/cpp/src/aztec3/circuits/rollup/base/init.hpp
index 10f8c1216b18..76072735b9ea 100644
--- a/circuits/cpp/src/aztec3/circuits/rollup/base/init.hpp
+++ b/circuits/cpp/src/aztec3/circuits/rollup/base/init.hpp
@@ -3,25 +3,19 @@
 
 #include "aztec3/circuits/abis/append_only_tree_snapshot.hpp"
 #include "aztec3/circuits/abis/previous_kernel_data.hpp"
+#include "aztec3/circuits/abis/private_circuit_public_inputs.hpp"
 #include "aztec3/circuits/abis/rollup/base/base_or_merge_rollup_public_inputs.hpp"
 #include "aztec3/circuits/abis/rollup/base/base_rollup_inputs.hpp"
 #include "aztec3/circuits/abis/rollup/constant_rollup_data.hpp"
+#include "aztec3/circuits/hash.hpp"
+#include "aztec3/circuits/recursion/aggregator.hpp"
 #include "aztec3/utils/circuit_errors.hpp"
 #include "aztec3/utils/dummy_composer.hpp"
-#include <aztec3/circuits/abis/private_circuit_public_inputs.hpp>
-#include <aztec3/circuits/hash.hpp>
-#include <aztec3/circuits/recursion/aggregator.hpp>
-#include <aztec3/utils/types/circuit_types.hpp>
-#include <aztec3/utils/types/convert.hpp>
-#include <aztec3/utils/types/native_types.hpp>
-
-#include "barretenberg/stdlib/merkle_tree/memory_store.hpp"
-#include "barretenberg/stdlib/merkle_tree/memory_tree.hpp"
-#include "barretenberg/stdlib/merkle_tree/merkle_tree.hpp"
-#include "barretenberg/stdlib/merkle_tree/nullifier_tree/nullifier_memory_tree.hpp"
-#include <barretenberg/crypto/sha256/sha256.hpp>
-#include <barretenberg/stdlib/merkle_tree/nullifier_tree/nullifier_leaf.hpp>
-#include <barretenberg/stdlib/merkle_tree/nullifier_tree/nullifier_tree.hpp>
+#include "aztec3/utils/types/circuit_types.hpp"
+#include "aztec3/utils/types/convert.hpp"
+#include "aztec3/utils/types/native_types.hpp"
+
+#include <barretenberg/barretenberg.hpp>
 
 namespace aztec3::circuits::rollup::native_base_rollup {
 
diff --git a/circuits/cpp/src/aztec3/circuits/rollup/base/native_base_rollup_circuit.cpp b/circuits/cpp/src/aztec3/circuits/rollup/base/native_base_rollup_circuit.cpp
index 57168b00470b..998301997db8 100644
--- a/circuits/cpp/src/aztec3/circuits/rollup/base/native_base_rollup_circuit.cpp
+++ b/circuits/cpp/src/aztec3/circuits/rollup/base/native_base_rollup_circuit.cpp
@@ -3,21 +3,15 @@
 #include "aztec3/circuits/abis/membership_witness.hpp"
 #include "aztec3/circuits/abis/public_data_read.hpp"
 #include "aztec3/circuits/abis/public_data_update_request.hpp"
+#include "aztec3/circuits/abis/rollup/base/base_or_merge_rollup_public_inputs.hpp"
+#include "aztec3/circuits/abis/rollup/base/base_rollup_inputs.hpp"
+#include "aztec3/circuits/abis/rollup/nullifier_leaf_preimage.hpp"
 #include "aztec3/circuits/hash.hpp"
 #include "aztec3/circuits/rollup/components/components.hpp"
 #include "aztec3/constants.hpp"
 #include "aztec3/utils/circuit_errors.hpp"
-#include <aztec3/circuits/abis/rollup/base/base_or_merge_rollup_public_inputs.hpp>
-#include <aztec3/circuits/abis/rollup/base/base_rollup_inputs.hpp>
-#include <aztec3/circuits/abis/rollup/nullifier_leaf_preimage.hpp>
-
-#include "barretenberg/crypto/pedersen_hash/pedersen.hpp"
-#include "barretenberg/crypto/sha256/sha256.hpp"
-#include "barretenberg/ecc/curves/bn254/fr.hpp"
-#include "barretenberg/stdlib/hash/pedersen/pedersen.hpp"
-#include "barretenberg/stdlib/merkle_tree/membership.hpp"
-#include "barretenberg/stdlib/merkle_tree/memory_tree.hpp"
-#include "barretenberg/stdlib/merkle_tree/merkle_tree.hpp"
+
+#include <barretenberg/barretenberg.hpp>
 
 #include <algorithm>
 #include <array>
diff --git a/circuits/cpp/src/aztec3/circuits/rollup/base/native_base_rollup_circuit.hpp b/circuits/cpp/src/aztec3/circuits/rollup/base/native_base_rollup_circuit.hpp
index 75ee5676fdb8..af1af8c5dec3 100644
--- a/circuits/cpp/src/aztec3/circuits/rollup/base/native_base_rollup_circuit.hpp
+++ b/circuits/cpp/src/aztec3/circuits/rollup/base/native_base_rollup_circuit.hpp
@@ -3,13 +3,13 @@
 #include "init.hpp"
 
 // TODO: not needed right at this moment for native impl
-#include <aztec3/circuits/abis/rollup/base/base_or_merge_rollup_public_inputs.hpp>
-#include <aztec3/circuits/abis/rollup/base/base_rollup_inputs.hpp>
-#include <aztec3/circuits/abis/rollup/constant_rollup_data.hpp>
-#include <aztec3/circuits/abis/rollup/nullifier_leaf_preimage.hpp>
-#include <aztec3/utils/types/circuit_types.hpp>
-#include <aztec3/utils/types/convert.hpp>
-#include <aztec3/utils/types/native_types.hpp>
+#include "aztec3/circuits/abis/rollup/base/base_or_merge_rollup_public_inputs.hpp"
+#include "aztec3/circuits/abis/rollup/base/base_rollup_inputs.hpp"
+#include "aztec3/circuits/abis/rollup/constant_rollup_data.hpp"
+#include "aztec3/circuits/abis/rollup/nullifier_leaf_preimage.hpp"
+#include "aztec3/utils/types/circuit_types.hpp"
+#include "aztec3/utils/types/convert.hpp"
+#include "aztec3/utils/types/native_types.hpp"
 
 namespace aztec3::circuits::rollup::native_base_rollup {
 
diff --git a/circuits/cpp/src/aztec3/circuits/rollup/components/components.cpp b/circuits/cpp/src/aztec3/circuits/rollup/components/components.cpp
index 86ba0c59912f..8998b0f60609 100644
--- a/circuits/cpp/src/aztec3/circuits/rollup/components/components.cpp
+++ b/circuits/cpp/src/aztec3/circuits/rollup/components/components.cpp
@@ -4,11 +4,7 @@
 #include "aztec3/constants.hpp"
 #include "aztec3/utils/circuit_errors.hpp"
 
-#include "barretenberg/crypto/pedersen_hash/pedersen.hpp"
-#include "barretenberg/crypto/sha256/sha256.hpp"
-#include "barretenberg/ecc/curves/bn254/fr.hpp"
-#include "barretenberg/stdlib/hash/pedersen/pedersen.hpp"
-#include "barretenberg/stdlib/merkle_tree/memory_tree.hpp"
+#include <barretenberg/barretenberg.hpp>
 
 #include <algorithm>
 #include <array>
diff --git a/circuits/cpp/src/aztec3/circuits/rollup/components/init.hpp b/circuits/cpp/src/aztec3/circuits/rollup/components/init.hpp
index ace4a8668b33..464cf017717c 100644
--- a/circuits/cpp/src/aztec3/circuits/rollup/components/init.hpp
+++ b/circuits/cpp/src/aztec3/circuits/rollup/components/init.hpp
@@ -3,18 +3,18 @@
 
 #include "aztec3/circuits/abis/append_only_tree_snapshot.hpp"
 #include "aztec3/circuits/abis/previous_kernel_data.hpp"
+#include "aztec3/circuits/abis/private_circuit_public_inputs.hpp"
 #include "aztec3/circuits/abis/rollup/base/base_or_merge_rollup_public_inputs.hpp"
 #include "aztec3/circuits/abis/rollup/constant_rollup_data.hpp"
 #include "aztec3/circuits/abis/rollup/merge/merge_rollup_inputs.hpp"
+#include "aztec3/circuits/hash.hpp"
+#include "aztec3/circuits/recursion/aggregator.hpp"
 #include "aztec3/utils/dummy_composer.hpp"
-#include <aztec3/circuits/abis/private_circuit_public_inputs.hpp>
-#include <aztec3/circuits/hash.hpp>
-#include <aztec3/circuits/recursion/aggregator.hpp>
-#include <aztec3/utils/types/circuit_types.hpp>
-#include <aztec3/utils/types/convert.hpp>
-#include <aztec3/utils/types/native_types.hpp>
+#include "aztec3/utils/types/circuit_types.hpp"
+#include "aztec3/utils/types/convert.hpp"
+#include "aztec3/utils/types/native_types.hpp"
 
-#include <barretenberg/crypto/sha256/sha256.hpp>
+#include <barretenberg/barretenberg.hpp>
 
 namespace aztec3::circuits::rollup::components {
 
diff --git a/circuits/cpp/src/aztec3/circuits/rollup/merge/c_bind.cpp b/circuits/cpp/src/aztec3/circuits/rollup/merge/c_bind.cpp
index 95222f4724f3..fd09dffc25a7 100644
--- a/circuits/cpp/src/aztec3/circuits/rollup/merge/c_bind.cpp
+++ b/circuits/cpp/src/aztec3/circuits/rollup/merge/c_bind.cpp
@@ -4,15 +4,16 @@
 
 #include "aztec3/utils/dummy_composer.hpp"
 
+#include <barretenberg/barretenberg.hpp>
+
 namespace {
 using NT = aztec3::utils::types::NativeTypes;
 using DummyComposer = aztec3::utils::DummyComposer;
 using aztec3::circuits::abis::BaseOrMergeRollupPublicInputs;
 using aztec3::circuits::abis::MergeRollupInputs;
 using aztec3::circuits::rollup::merge::merge_rollup_circuit;
-
 }  // namespace
-#define WASM_EXPORT __attribute__((visibility("default")))
+
 // WASM Cbinds
 extern "C" {
 
diff --git a/circuits/cpp/src/aztec3/circuits/rollup/merge/c_bind.h b/circuits/cpp/src/aztec3/circuits/rollup/merge/c_bind.h
index 80c5fbd22ea1..c16fdc190e61 100644
--- a/circuits/cpp/src/aztec3/circuits/rollup/merge/c_bind.h
+++ b/circuits/cpp/src/aztec3/circuits/rollup/merge/c_bind.h
@@ -1,7 +1,9 @@
-#include <cstdint>
-#include <cstddef>
+#pragma once
+
+#include <barretenberg/barretenberg.hpp>
 
-#define WASM_EXPORT __attribute__((visibility("default")))
+#include <cstddef>
+#include <cstdint>
 
 extern "C" {
 
diff --git a/circuits/cpp/src/aztec3/circuits/rollup/merge/init.hpp b/circuits/cpp/src/aztec3/circuits/rollup/merge/init.hpp
index 65b3f92b5f1f..13cc7774c46a 100644
--- a/circuits/cpp/src/aztec3/circuits/rollup/merge/init.hpp
+++ b/circuits/cpp/src/aztec3/circuits/rollup/merge/init.hpp
@@ -2,17 +2,17 @@
 #pragma once
 
 #include "aztec3/circuits/abis/append_only_tree_snapshot.hpp"
+#include "aztec3/circuits/abis/private_circuit_public_inputs.hpp"
 #include "aztec3/circuits/abis/rollup/base/base_or_merge_rollup_public_inputs.hpp"
 #include "aztec3/circuits/abis/rollup/constant_rollup_data.hpp"
 #include "aztec3/circuits/abis/rollup/merge/merge_rollup_inputs.hpp"
+#include "aztec3/circuits/recursion/aggregator.hpp"
 #include "aztec3/utils/dummy_composer.hpp"
-#include <aztec3/circuits/abis/private_circuit_public_inputs.hpp>
-#include <aztec3/circuits/recursion/aggregator.hpp>
-#include <aztec3/utils/types/circuit_types.hpp>
-#include <aztec3/utils/types/convert.hpp>
-#include <aztec3/utils/types/native_types.hpp>
+#include "aztec3/utils/types/circuit_types.hpp"
+#include "aztec3/utils/types/convert.hpp"
+#include "aztec3/utils/types/native_types.hpp"
 
-#include <barretenberg/crypto/sha256/sha256.hpp>
+#include <barretenberg/barretenberg.hpp>
 
 namespace aztec3::circuits::rollup::merge {
 
diff --git a/circuits/cpp/src/aztec3/circuits/rollup/merge/native_merge_rollup_circuit.cpp b/circuits/cpp/src/aztec3/circuits/rollup/merge/native_merge_rollup_circuit.cpp
index 58dcb6f2f63c..ea606b0da04e 100644
--- a/circuits/cpp/src/aztec3/circuits/rollup/merge/native_merge_rollup_circuit.cpp
+++ b/circuits/cpp/src/aztec3/circuits/rollup/merge/native_merge_rollup_circuit.cpp
@@ -1,11 +1,8 @@
 #include "init.hpp"
 
-#include <aztec3/circuits/rollup/components/components.hpp>
+#include "aztec3/circuits/rollup/components/components.hpp"
 
-#include "barretenberg/crypto/pedersen_hash/pedersen.hpp"
-#include "barretenberg/crypto/sha256/sha256.hpp"
-#include "barretenberg/ecc/curves/bn254/fr.hpp"
-#include "barretenberg/stdlib/hash/pedersen/pedersen.hpp"
+#include <barretenberg/barretenberg.hpp>
 
 #include <algorithm>
 #include <array>
diff --git a/circuits/cpp/src/aztec3/circuits/rollup/root/.test.cpp b/circuits/cpp/src/aztec3/circuits/rollup/root/.test.cpp
index 926cc4dccb89..be76e9ca39ae 100644
--- a/circuits/cpp/src/aztec3/circuits/rollup/root/.test.cpp
+++ b/circuits/cpp/src/aztec3/circuits/rollup/root/.test.cpp
@@ -3,42 +3,19 @@
 #include "init.hpp"
 
 #include "aztec3/circuits/abis/append_only_tree_snapshot.hpp"
-#include "aztec3/circuits/abis/membership_witness.hpp"
+#include "aztec3/circuits/abis/combined_accumulated_data.hpp"
+#include "aztec3/circuits/abis/kernel_circuit_public_inputs.hpp"
 #include "aztec3/circuits/abis/new_contract_data.hpp"
 #include "aztec3/circuits/abis/previous_kernel_data.hpp"
 #include "aztec3/circuits/abis/rollup/merge/previous_rollup_data.hpp"
-#include "aztec3/circuits/abis/rollup/nullifier_leaf_preimage.hpp"
 #include "aztec3/circuits/kernel/private/utils.hpp"
 #include "aztec3/circuits/rollup/base/init.hpp"
-#include "aztec3/circuits/rollup/base/native_base_rollup_circuit.hpp"
 #include "aztec3/circuits/rollup/components/components.hpp"
 #include "aztec3/circuits/rollup/test_utils/utils.hpp"
 #include "aztec3/constants.hpp"
 #include "aztec3/utils/dummy_composer.hpp"
-#include <aztec3/circuits/abis/call_context.hpp>
-#include <aztec3/circuits/abis/call_stack_item.hpp>
-#include <aztec3/circuits/abis/combined_accumulated_data.hpp>
-#include <aztec3/circuits/abis/combined_constant_data.hpp>
-#include <aztec3/circuits/abis/combined_historic_tree_roots.hpp>
-#include <aztec3/circuits/abis/contract_deployment_data.hpp>
-#include <aztec3/circuits/abis/function_data.hpp>
-#include <aztec3/circuits/abis/kernel_circuit_public_inputs.hpp>
-#include <aztec3/circuits/abis/private_circuit_public_inputs.hpp>
-#include <aztec3/circuits/abis/private_historic_tree_roots.hpp>
-#include <aztec3/circuits/abis/private_kernel/globals.hpp>
-#include <aztec3/circuits/abis/signed_tx_request.hpp>
-#include <aztec3/circuits/abis/tx_context.hpp>
-#include <aztec3/circuits/abis/tx_request.hpp>
-#include <aztec3/circuits/apps/function_execution_context.hpp>
-#include <aztec3/circuits/apps/test_apps/basic_contract_deployment/basic_contract_deployment.hpp>
-#include <aztec3/circuits/apps/test_apps/escrow/deposit.hpp>
-#include <aztec3/circuits/mock/mock_kernel_circuit.hpp>
-
-#include "barretenberg/crypto/sha256/sha256.hpp"
-#include "barretenberg/ecc/curves/bn254/fr.hpp"
-#include "barretenberg/stdlib/merkle_tree/memory_tree.hpp"
-#include <barretenberg/common/map.hpp>
-#include <barretenberg/common/test.hpp>
+
+#include <barretenberg/barretenberg.hpp>
 
 #include <gtest/gtest.h>
 
diff --git a/circuits/cpp/src/aztec3/circuits/rollup/root/c_bind.cpp b/circuits/cpp/src/aztec3/circuits/rollup/root/c_bind.cpp
index 5601f1521720..70da1ca64e38 100644
--- a/circuits/cpp/src/aztec3/circuits/rollup/root/c_bind.cpp
+++ b/circuits/cpp/src/aztec3/circuits/rollup/root/c_bind.cpp
@@ -3,16 +3,10 @@
 #include "index.hpp"
 #include "init.hpp"
 
-#include "aztec3/circuits/abis/private_kernel/private_call_data.hpp"
-#include "aztec3/circuits/abis/signed_tx_request.hpp"
-#include <aztec3/circuits/abis/kernel_circuit_public_inputs.hpp>
-#include <aztec3/circuits/mock/mock_kernel_circuit.hpp>
-#include <aztec3/constants.hpp>
-#include <aztec3/utils/types/native_types.hpp>
+#include "aztec3/constants.hpp"
+#include "aztec3/utils/types/native_types.hpp"
 
-#include "barretenberg/common/serialize.hpp"
-#include "barretenberg/plonk/composer/turbo_plonk_composer.hpp"
-#include "barretenberg/srs/reference_string/env_reference_string.hpp"
+#include <barretenberg/barretenberg.hpp>
 
 namespace {
 using Composer = plonk::UltraPlonkComposer;
@@ -24,7 +18,6 @@ using aztec3::circuits::rollup::native_root_rollup::RootRollupPublicInputs;
 
 }  // namespace
 
-#define WASM_EXPORT __attribute__((visibility("default")))
 // WASM Cbinds
 extern "C" {
 
diff --git a/circuits/cpp/src/aztec3/circuits/rollup/root/c_bind.h b/circuits/cpp/src/aztec3/circuits/rollup/root/c_bind.h
index a8cb90502891..d159a6464122 100644
--- a/circuits/cpp/src/aztec3/circuits/rollup/root/c_bind.h
+++ b/circuits/cpp/src/aztec3/circuits/rollup/root/c_bind.h
@@ -1,7 +1,9 @@
-#include <cstdint>
-#include <cstddef>
+#pragma once
+
+#include <barretenberg/barretenberg.hpp>
 
-#define WASM_EXPORT __attribute__((visibility("default")))
+#include <cstddef>
+#include <cstdint>
 
 extern "C" {
 
@@ -10,8 +12,5 @@ WASM_EXPORT size_t root_rollup__init_verification_key(uint8_t const* pk_buf, uin
 WASM_EXPORT uint8_t* root_rollup__sim(uint8_t const* root_rollup_inputs_buf,
                                       size_t* root_rollup_public_inputs_size_out,
                                       uint8_t const** root_rollup_public_inputs_buf);
-WASM_EXPORT size_t root_rollup__verify_proof(uint8_t const* vk_buf,
-                                             uint8_t const* proof,
-                                             uint32_t length);
-
+WASM_EXPORT size_t root_rollup__verify_proof(uint8_t const* vk_buf, uint8_t const* proof, uint32_t length);
 }
\ No newline at end of file
diff --git a/circuits/cpp/src/aztec3/circuits/rollup/root/init.hpp b/circuits/cpp/src/aztec3/circuits/rollup/root/init.hpp
index efb914db4222..0f7e24bb5ff3 100644
--- a/circuits/cpp/src/aztec3/circuits/rollup/root/init.hpp
+++ b/circuits/cpp/src/aztec3/circuits/rollup/root/init.hpp
@@ -5,14 +5,13 @@
 #include "aztec3/circuits/abis/rollup/constant_rollup_data.hpp"
 #include "aztec3/circuits/abis/rollup/root/root_rollup_inputs.hpp"
 #include "aztec3/circuits/abis/rollup/root/root_rollup_public_inputs.hpp"
+#include "aztec3/circuits/recursion/aggregator.hpp"
 #include "aztec3/utils/dummy_composer.hpp"
-#include <aztec3/circuits/recursion/aggregator.hpp>
-#include <aztec3/utils/types/circuit_types.hpp>
-#include <aztec3/utils/types/convert.hpp>
-#include <aztec3/utils/types/native_types.hpp>
+#include "aztec3/utils/types/circuit_types.hpp"
+#include "aztec3/utils/types/convert.hpp"
+#include "aztec3/utils/types/native_types.hpp"
 
-#include "barretenberg/stdlib/merkle_tree/memory_tree.hpp"
-#include <barretenberg/crypto/sha256/sha256.hpp>
+#include <barretenberg/barretenberg.hpp>
 
 namespace aztec3::circuits::rollup::native_root_rollup {
 
diff --git a/circuits/cpp/src/aztec3/circuits/rollup/root/native_root_rollup_circuit.cpp b/circuits/cpp/src/aztec3/circuits/rollup/root/native_root_rollup_circuit.cpp
index 8fb79210f07f..65714897ce06 100644
--- a/circuits/cpp/src/aztec3/circuits/rollup/root/native_root_rollup_circuit.cpp
+++ b/circuits/cpp/src/aztec3/circuits/rollup/root/native_root_rollup_circuit.cpp
@@ -1,18 +1,9 @@
 #include "init.hpp"
 
+#include "aztec3/circuits/abis/rollup/root/root_rollup_inputs.hpp"
+#include "aztec3/circuits/abis/rollup/root/root_rollup_public_inputs.hpp"
+#include "aztec3/circuits/rollup/components/components.hpp"
 #include "aztec3/constants.hpp"
-#include <aztec3/circuits/abis/rollup/nullifier_leaf_preimage.hpp>
-#include <aztec3/circuits/abis/rollup/root/root_rollup_inputs.hpp>
-#include <aztec3/circuits/abis/rollup/root/root_rollup_public_inputs.hpp>
-#include <aztec3/circuits/rollup/components/components.hpp>
-
-#include "barretenberg/crypto/pedersen_hash/pedersen.hpp"
-#include "barretenberg/crypto/sha256/sha256.hpp"
-#include "barretenberg/ecc/curves/bn254/fr.hpp"
-#include "barretenberg/stdlib/hash/pedersen/pedersen.hpp"
-#include "barretenberg/stdlib/merkle_tree/membership.hpp"
-#include "barretenberg/stdlib/merkle_tree/memory_tree.hpp"
-#include "barretenberg/stdlib/merkle_tree/merkle_tree.hpp"
 
 #include <algorithm>
 #include <array>
diff --git a/circuits/cpp/src/aztec3/circuits/rollup/root/native_root_rollup_circuit.hpp b/circuits/cpp/src/aztec3/circuits/rollup/root/native_root_rollup_circuit.hpp
index 5418ff7060b2..c1318015cd48 100644
--- a/circuits/cpp/src/aztec3/circuits/rollup/root/native_root_rollup_circuit.hpp
+++ b/circuits/cpp/src/aztec3/circuits/rollup/root/native_root_rollup_circuit.hpp
@@ -3,11 +3,11 @@
 #include "init.hpp"
 
 // TODO: not needed right at this moment for native impl
-#include <aztec3/circuits/abis/rollup/root/root_rollup_inputs.hpp>
-#include <aztec3/circuits/abis/rollup/root/root_rollup_public_inputs.hpp>
-#include <aztec3/utils/types/circuit_types.hpp>
-#include <aztec3/utils/types/convert.hpp>
-#include <aztec3/utils/types/native_types.hpp>
+#include "aztec3/circuits/abis/rollup/root/root_rollup_inputs.hpp"
+#include "aztec3/circuits/abis/rollup/root/root_rollup_public_inputs.hpp"
+#include "aztec3/utils/types/circuit_types.hpp"
+#include "aztec3/utils/types/convert.hpp"
+#include "aztec3/utils/types/native_types.hpp"
 
 namespace aztec3::circuits::rollup::native_root_rollup {
 
diff --git a/circuits/cpp/src/aztec3/circuits/rollup/test_utils/init.hpp b/circuits/cpp/src/aztec3/circuits/rollup/test_utils/init.hpp
index c7eafd1364a9..4cf0843c6ce6 100644
--- a/circuits/cpp/src/aztec3/circuits/rollup/test_utils/init.hpp
+++ b/circuits/cpp/src/aztec3/circuits/rollup/test_utils/init.hpp
@@ -2,25 +2,22 @@
 #pragma once
 
 #include "aztec3/circuits/abis/append_only_tree_snapshot.hpp"
+#include "aztec3/circuits/abis/private_circuit_public_inputs.hpp"
 #include "aztec3/circuits/abis/rollup/base/base_or_merge_rollup_public_inputs.hpp"
 #include "aztec3/circuits/abis/rollup/base/base_rollup_inputs.hpp"
 #include "aztec3/circuits/abis/rollup/constant_rollup_data.hpp"
 #include "aztec3/circuits/abis/rollup/merge/merge_rollup_inputs.hpp"
 #include "aztec3/circuits/abis/rollup/merge/previous_rollup_data.hpp"
 #include "aztec3/circuits/abis/rollup/root/root_rollup_inputs.hpp"
+#include "aztec3/circuits/recursion/aggregator.hpp"
 #include "aztec3/circuits/rollup/base/native_base_rollup_circuit.hpp"
 #include "aztec3/utils/dummy_composer.hpp"
-#include <aztec3/circuits/abis/private_circuit_public_inputs.hpp>
-#include <aztec3/circuits/recursion/aggregator.hpp>
-#include <aztec3/utils/types/circuit_types.hpp>
-#include <aztec3/utils/types/convert.hpp>
-#include <aztec3/utils/types/native_types.hpp>
-
-#include "barretenberg/stdlib/merkle_tree/memory_tree.hpp"
-#include "barretenberg/stdlib/merkle_tree/nullifier_tree/nullifier_memory_tree.hpp"
-#include <barretenberg/crypto/sha256/sha256.hpp>
-#include <barretenberg/stdlib/merkle_tree/nullifier_tree/nullifier_leaf.hpp>
-#include <barretenberg/stdlib/merkle_tree/nullifier_tree/nullifier_tree.hpp>
+#include "aztec3/utils/types/circuit_types.hpp"
+#include "aztec3/utils/types/convert.hpp"
+#include "aztec3/utils/types/native_types.hpp"
+
+// TODO(dbanks12) should we force files to explicitly include barretenberg when using it?
+#include <barretenberg/barretenberg.hpp>
 
 namespace aztec3::circuits::rollup::test_utils {
 
diff --git a/circuits/cpp/src/aztec3/circuits/rollup/test_utils/nullifier_tree_testing_harness.cpp b/circuits/cpp/src/aztec3/circuits/rollup/test_utils/nullifier_tree_testing_harness.cpp
index d6f27367de4a..8ddc564c86ce 100644
--- a/circuits/cpp/src/aztec3/circuits/rollup/test_utils/nullifier_tree_testing_harness.cpp
+++ b/circuits/cpp/src/aztec3/circuits/rollup/test_utils/nullifier_tree_testing_harness.cpp
@@ -1,7 +1,6 @@
 #include "nullifier_tree_testing_harness.hpp"
 
-#include <barretenberg/stdlib/merkle_tree/nullifier_tree/nullifier_leaf.hpp>
-#include <barretenberg/stdlib/merkle_tree/nullifier_tree/nullifier_memory_tree.hpp>
+#include <barretenberg/barretenberg.hpp>
 
 #include <cstdint>
 #include <tuple>
diff --git a/circuits/cpp/src/aztec3/circuits/rollup/test_utils/nullifier_tree_testing_harness.hpp b/circuits/cpp/src/aztec3/circuits/rollup/test_utils/nullifier_tree_testing_harness.hpp
index f23d1b8cf7c7..9b4a39512f57 100644
--- a/circuits/cpp/src/aztec3/circuits/rollup/test_utils/nullifier_tree_testing_harness.hpp
+++ b/circuits/cpp/src/aztec3/circuits/rollup/test_utils/nullifier_tree_testing_harness.hpp
@@ -1,13 +1,14 @@
 #pragma once
 #include "aztec3/circuits/abis/append_only_tree_snapshot.hpp"
+#include "aztec3/utils/types/native_types.hpp"
 
-#include "barretenberg/stdlib/merkle_tree/hash.hpp"
-#include "barretenberg/stdlib/merkle_tree/memory_tree.hpp"
-#include "barretenberg/stdlib/merkle_tree/nullifier_tree/nullifier_leaf.hpp"
-#include "barretenberg/stdlib/merkle_tree/nullifier_tree/nullifier_memory_tree.hpp"
+#include <barretenberg/barretenberg.hpp>
 
 #include <tuple>
 
+namespace {
+using aztec3::utils::types::NativeTypes;
+}  // namespace
 /**
  * A version of the nullifier memory tree with extra methods specific to testing our rollup circuits.
  */
diff --git a/circuits/cpp/src/aztec3/circuits/rollup/test_utils/utils.cpp b/circuits/cpp/src/aztec3/circuits/rollup/test_utils/utils.cpp
index bfc2855a8a72..e1100d4c50af 100644
--- a/circuits/cpp/src/aztec3/circuits/rollup/test_utils/utils.cpp
+++ b/circuits/cpp/src/aztec3/circuits/rollup/test_utils/utils.cpp
@@ -1,19 +1,15 @@
 #include "utils.hpp"
 
-#include "init.hpp"
 #include "nullifier_tree_testing_harness.hpp"
 
 #include "aztec3/circuits/abis/membership_witness.hpp"
 #include "aztec3/circuits/abis/new_contract_data.hpp"
 #include "aztec3/circuits/abis/rollup/root/root_rollup_public_inputs.hpp"
+#include "aztec3/circuits/kernel/private/utils.hpp"
 #include "aztec3/circuits/rollup/base/init.hpp"
 #include "aztec3/constants.hpp"
-#include <aztec3/circuits/kernel/private/utils.hpp>
-#include <aztec3/circuits/mock/mock_kernel_circuit.hpp>
 
-#include "barretenberg/numeric/uint256/uint256.hpp"
-#include "barretenberg/stdlib/merkle_tree/memory_store.hpp"
-#include "barretenberg/stdlib/merkle_tree/merkle_tree.hpp"
+#include <barretenberg/barretenberg.hpp>
 
 #include <set>
 #include <utility>
diff --git a/circuits/cpp/src/aztec3/circuits/rollup/test_utils/utils.hpp b/circuits/cpp/src/aztec3/circuits/rollup/test_utils/utils.hpp
index 04d7c8d76783..c5e1f11732f7 100644
--- a/circuits/cpp/src/aztec3/circuits/rollup/test_utils/utils.hpp
+++ b/circuits/cpp/src/aztec3/circuits/rollup/test_utils/utils.hpp
@@ -5,7 +5,7 @@
 #include "aztec3/circuits/abis/public_data_update_request.hpp"
 #include "aztec3/constants.hpp"
 
-#include "barretenberg/numeric/uint256/uint256.hpp"
+#include <barretenberg/barretenberg.hpp>
 
 namespace aztec3::circuits::rollup::test_utils::utils {
 
diff --git a/circuits/cpp/src/aztec3/dbs/private_state_db.hpp b/circuits/cpp/src/aztec3/dbs/private_state_db.hpp
index e2c872181639..8b661b6a7d26 100644
--- a/circuits/cpp/src/aztec3/dbs/private_state_db.hpp
+++ b/circuits/cpp/src/aztec3/dbs/private_state_db.hpp
@@ -1,9 +1,10 @@
 // // TODO: move the leveldb_store to a more neutral module.
-// #include <barretenberg/stdlib/merkle_tree/leveldb_store.hpp>
-// #include <aztec3/utils/types/native_types.hpp>
-// #include <barretenberg/crypto/pedersen/pedersen.hpp>
 // #include "../constants.hpp"
 
+// #include "aztec3/utils/types/native_types.hpp"
+
+// #include <barretenberg/barretenberg.hpp>
+
 // namespace aztec3::db {
 
 // using aztec3::GeneratorIndex;
diff --git a/circuits/cpp/src/aztec3/oracle/fake_db.hpp b/circuits/cpp/src/aztec3/oracle/fake_db.hpp
index b46a137a2ede..d486c509158b 100644
--- a/circuits/cpp/src/aztec3/oracle/fake_db.hpp
+++ b/circuits/cpp/src/aztec3/oracle/fake_db.hpp
@@ -1,22 +1,19 @@
 #pragma once
 
-#include <aztec3/circuits/abis/call_context.hpp>
-#include <aztec3/circuits/apps/notes/default_private_note/note_preimage.hpp>
-#include <aztec3/circuits/apps/notes/default_singleton_private_note/note_preimage.hpp>
-#include <aztec3/circuits/apps/utxo_datum.hpp>
-#include <aztec3/utils/types/native_types.hpp>
+#include "aztec3/circuits/abis/call_context.hpp"
+#include "aztec3/circuits/apps/notes/default_private_note/note_preimage.hpp"
+#include "aztec3/circuits/apps/notes/default_singleton_private_note/note_preimage.hpp"
+#include "aztec3/circuits/apps/utxo_datum.hpp"
+#include "aztec3/utils/types/native_types.hpp"
 
 namespace aztec3::oracle {
 
-using aztec3::circuits::abis::CallContext;
-
 using aztec3::circuits::apps::UTXOSLoadDatum;
 
 using aztec3::circuits::apps::notes::DefaultPrivateNotePreimage;
 
 using aztec3::circuits::apps::notes::DefaultSingletonPrivateNotePreimage;
 
-using aztec3::utils::types::CircuitTypes;
 using NT = aztec3::utils::types::NativeTypes;
 
 // A temporary stub, whilst building other things first.
diff --git a/circuits/cpp/src/aztec3/oracle/oracle.hpp b/circuits/cpp/src/aztec3/oracle/oracle.hpp
index 6a9042e7a0ab..8744f30f0ec1 100644
--- a/circuits/cpp/src/aztec3/oracle/oracle.hpp
+++ b/circuits/cpp/src/aztec3/oracle/oracle.hpp
@@ -2,13 +2,12 @@
 
 #include "fake_db.hpp"
 
-#include <aztec3/circuits/abis/call_context.hpp>
-#include <aztec3/circuits/abis/contract_deployment_data.hpp>
-#include <aztec3/circuits/abis/function_data.hpp>
-#include <aztec3/circuits/apps/notes/default_private_note/note_preimage.hpp>
-#include <aztec3/circuits/apps/notes/default_singleton_private_note/note_preimage.hpp>
-#include <aztec3/circuits/apps/utxo_datum.hpp>
-#include <aztec3/utils/types/native_types.hpp>
+#include "aztec3/circuits/abis/call_context.hpp"
+#include "aztec3/circuits/abis/contract_deployment_data.hpp"
+#include "aztec3/circuits/abis/function_data.hpp"
+#include "aztec3/circuits/apps/notes/default_singleton_private_note/note_preimage.hpp"
+#include "aztec3/circuits/apps/utxo_datum.hpp"
+#include "aztec3/utils/types/native_types.hpp"
 
 namespace aztec3::oracle {
 
@@ -18,7 +17,6 @@ using aztec3::circuits::abis::FunctionData;
 
 using aztec3::circuits::apps::UTXOSLoadDatum;
 
-using aztec3::utils::types::CircuitTypes;
 using NT = aztec3::utils::types::NativeTypes;
 
 /// Note: the server will always serve NATIVE types to the circuit, since eventually we'll be passing data to Noir (so
diff --git a/circuits/cpp/src/aztec3/utils/array.hpp b/circuits/cpp/src/aztec3/utils/array.hpp
index 74d334df8927..fc7da729a8cd 100644
--- a/circuits/cpp/src/aztec3/utils/array.hpp
+++ b/circuits/cpp/src/aztec3/utils/array.hpp
@@ -1,7 +1,7 @@
 #pragma once
 #include "./types/native_types.hpp"
 
-#include "barretenberg/common/throw_or_abort.hpp"
+#include <barretenberg/barretenberg.hpp>
 
 /**
  * NOTE: see bberg's stdlib/primitives/field/array.hpp for the corresponding circuit implementations of these functions.
diff --git a/circuits/cpp/src/aztec3/utils/circuit_errors.hpp b/circuits/cpp/src/aztec3/utils/circuit_errors.hpp
index 739447d002bc..7ad669af5c4f 100644
--- a/circuits/cpp/src/aztec3/utils/circuit_errors.hpp
+++ b/circuits/cpp/src/aztec3/utils/circuit_errors.hpp
@@ -1,7 +1,6 @@
 #pragma once
-#include "aztec3/utils/types/circuit_types.hpp"
 
-#include <barretenberg/serialize/msgpack.hpp>
+#include <barretenberg/barretenberg.hpp>
 
 #include <variant>
 
diff --git a/circuits/cpp/src/aztec3/utils/msgpack_derived_output.hpp b/circuits/cpp/src/aztec3/utils/msgpack_derived_output.hpp
index 524a0ff7aaec..b134651e9239 100644
--- a/circuits/cpp/src/aztec3/utils/msgpack_derived_output.hpp
+++ b/circuits/cpp/src/aztec3/utils/msgpack_derived_output.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <barretenberg/serialize/msgpack.hpp>
+#include <barretenberg/barretenberg.hpp>
 
 #include <iostream>
 #include <string>
diff --git a/circuits/cpp/src/aztec3/utils/types/circuit_types.hpp b/circuits/cpp/src/aztec3/utils/types/circuit_types.hpp
index 7e3e7899659c..eb2a3042d9b2 100644
--- a/circuits/cpp/src/aztec3/utils/types/circuit_types.hpp
+++ b/circuits/cpp/src/aztec3/utils/types/circuit_types.hpp
@@ -1,27 +1,9 @@
 #pragma once
+
+// TODO(dbanks12) consider removing this include which is used by consumers of circuit_types.hpp
 #include "native_types.hpp"
 
-#include <barretenberg/stdlib/commitment/pedersen/pedersen.hpp>
-#include <barretenberg/stdlib/encryption/ecdsa/ecdsa.hpp>
-#include <barretenberg/stdlib/encryption/schnorr/schnorr.hpp>
-#include <barretenberg/stdlib/hash/blake2s/blake2s.hpp>
-#include <barretenberg/stdlib/hash/blake3s/blake3s.hpp>
-#include <barretenberg/stdlib/hash/pedersen/pedersen.hpp>
-#include <barretenberg/stdlib/primitives/address/address.hpp>
-#include <barretenberg/stdlib/primitives/bigfield/bigfield.hpp>
-#include <barretenberg/stdlib/primitives/biggroup/biggroup.hpp>
-#include <barretenberg/stdlib/primitives/bit_array/bit_array.hpp>
-#include <barretenberg/stdlib/primitives/bool/bool.hpp>
-#include <barretenberg/stdlib/primitives/byte_array/byte_array.hpp>
-#include <barretenberg/stdlib/primitives/curves/bn254.hpp>
-#include <barretenberg/stdlib/primitives/group/group.hpp>
-#include <barretenberg/stdlib/primitives/packed_byte_array/packed_byte_array.hpp>
-#include <barretenberg/stdlib/primitives/point/point.hpp>
-#include <barretenberg/stdlib/primitives/uint/uint.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>
-#include <barretenberg/stdlib/recursion/verifier/verifier.hpp>
+#include <barretenberg/barretenberg.hpp>
 
 using namespace proof_system::plonk;
 
diff --git a/circuits/cpp/src/aztec3/utils/types/convert.hpp b/circuits/cpp/src/aztec3/utils/types/convert.hpp
index 6f3c8ef43d0e..c7073984e126 100644
--- a/circuits/cpp/src/aztec3/utils/types/convert.hpp
+++ b/circuits/cpp/src/aztec3/utils/types/convert.hpp
@@ -3,9 +3,7 @@
 #include "circuit_types.hpp"
 #include "native_types.hpp"
 
-#include <barretenberg/common/map.hpp>
-#include <barretenberg/stdlib/primitives/point/point.hpp>
-#include <barretenberg/stdlib/primitives/witness/witness.hpp>
+#include <barretenberg/barretenberg.hpp>
 
 #include <array>
 
diff --git a/circuits/cpp/src/aztec3/utils/types/native_types.hpp b/circuits/cpp/src/aztec3/utils/types/native_types.hpp
index 320e9b1b9567..0271f3fa22b9 100644
--- a/circuits/cpp/src/aztec3/utils/types/native_types.hpp
+++ b/circuits/cpp/src/aztec3/utils/types/native_types.hpp
@@ -1,21 +1,6 @@
 #pragma once
-#include <barretenberg/crypto/blake2s/blake2s.hpp>
-#include <barretenberg/crypto/blake3s/blake3s.hpp>
-#include <barretenberg/crypto/ecdsa/ecdsa.hpp>
-#include <barretenberg/crypto/generators/generator_data.hpp>
-#include <barretenberg/crypto/pedersen_commitment/pedersen.hpp>
-#include <barretenberg/crypto/schnorr/schnorr.hpp>
-#include <barretenberg/ecc/curves/bn254/fq.hpp>
-#include <barretenberg/ecc/curves/bn254/fr.hpp>
-#include <barretenberg/ecc/curves/bn254/g1.hpp>
-#include <barretenberg/ecc/curves/grumpkin/grumpkin.hpp>
-#include <barretenberg/numeric/uint256/uint256.hpp>
-#include <barretenberg/plonk/proof_system/types/proof.hpp>
-#include <barretenberg/plonk/proof_system/verification_key/verification_key.hpp>
-#include <barretenberg/stdlib/primitives/address/address.hpp>
-#include <barretenberg/stdlib/recursion/aggregation_state/native_aggregation_state.hpp>
-#include <barretenberg/stdlib/recursion/verifier/verifier.hpp>
 
+#include <barretenberg/barretenberg.hpp>
 namespace aztec3::utils::types {
 
 struct NativeTypes {