diff --git a/barretenberg/cpp/src/barretenberg/vm/avm_trace/AvmMini_common.hpp b/barretenberg/cpp/src/barretenberg/vm/avm_trace/AvmMini_common.hpp
index fdbf49ebe57..1a8508377e6 100644
--- a/barretenberg/cpp/src/barretenberg/vm/avm_trace/AvmMini_common.hpp
+++ b/barretenberg/cpp/src/barretenberg/vm/avm_trace/AvmMini_common.hpp
@@ -4,12 +4,12 @@
 #include "barretenberg/proof_system/circuit_builder/generated/AvmMini_circuit_builder.hpp"
 #include <cstdint>
 
+namespace avm_trace {
+
 using Flavor = bb::AvmMiniFlavor;
 using FF = Flavor::FF;
 using Row = bb::AvmMiniFullRow<bb::fr>;
 
-namespace avm_trace {
-
 // Number of rows
 static const size_t AVM_TRACE_SIZE = 256;
 enum class IntermRegister : uint32_t { IA = 0, IB = 1, IC = 2 };
diff --git a/barretenberg/cpp/src/barretenberg/vm/avm_trace/AvmMini_opcode.hpp b/barretenberg/cpp/src/barretenberg/vm/avm_trace/AvmMini_opcode.hpp
index c945f6158c6..bdb03bde7b0 100644
--- a/barretenberg/cpp/src/barretenberg/vm/avm_trace/AvmMini_opcode.hpp
+++ b/barretenberg/cpp/src/barretenberg/vm/avm_trace/AvmMini_opcode.hpp
@@ -1,10 +1,10 @@
 #pragma once
 
+#include <cstddef>
 #include <cstdint>
 #include <unordered_map>
 
 namespace avm_trace {
-using std::size_t;
 
 /**
  * All AVM opcodes (Keep in sync with TS counterpart code opcodes.ts)
diff --git a/barretenberg/cpp/src/barretenberg/vm/tests/AvmMini_execution.test.cpp b/barretenberg/cpp/src/barretenberg/vm/tests/AvmMini_execution.test.cpp
index c6680631aec..5ff248a6c2d 100644
--- a/barretenberg/cpp/src/barretenberg/vm/tests/AvmMini_execution.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/vm/tests/AvmMini_execution.test.cpp
@@ -12,9 +12,16 @@
 #include <string>
 #include <utility>
 
+namespace tests_avm {
+
 using namespace bb;
+using namespace avm_trace;
 using namespace testing;
+
+using bb::utils::hex_to_bytes;
+
 namespace {
+
 void gen_proof_and_validate(std::vector<uint8_t> const& bytecode,
                             std::vector<Row>&& trace,
                             std::vector<FF> const& calldata)
@@ -32,10 +39,6 @@ void gen_proof_and_validate(std::vector<uint8_t> const& bytecode,
 }
 } // namespace
 
-namespace tests_avm {
-using namespace avm_trace;
-using bb::utils::hex_to_bytes;
-
 class AvmMiniExecutionTests : public ::testing::Test {
   public:
     AvmMiniTraceBuilder trace_builder;
diff --git a/barretenberg/cpp/src/barretenberg/vm/tests/helpers.test.hpp b/barretenberg/cpp/src/barretenberg/vm/tests/helpers.test.hpp
index 430c1cce45b..d6071fe421e 100644
--- a/barretenberg/cpp/src/barretenberg/vm/tests/helpers.test.hpp
+++ b/barretenberg/cpp/src/barretenberg/vm/tests/helpers.test.hpp
@@ -11,6 +11,11 @@
         EXPECT_TRUE(message.find(expectedMessage) != std::string::npos);                                               \
     }
 namespace tests_avm {
+
+using Flavor = bb::AvmMiniFlavor;
+using FF = Flavor::FF;
+using Row = bb::AvmMiniFullRow<bb::fr>;
+
 void validate_trace_proof(std::vector<Row>&& trace);
 void mutate_ic_in_trace(std::vector<Row>& trace,
                         std::function<bool(Row)>&& selectRow,