diff --git a/src/app/emu/audio/apu.cc b/src/app/emu/audio/apu.cc
index 8e2c9df0..6dbad24f 100644
--- a/src/app/emu/audio/apu.cc
+++ b/src/app/emu/audio/apu.cc
@@ -13,6 +13,7 @@
 namespace yaze {
 namespace app {
 namespace emu {
+namespace audio {
 
 void Apu::Init() {
   // Set the clock frequency
@@ -134,6 +135,7 @@ void Apu::WriteDspMemory(uint16_t address, uint8_t value) {
   dsp_.WriteGlobalReg(address, value);
 }
 
+} // namespace audio
 }  // namespace emu
 }  // namespace app
 }  // namespace yaze
\ No newline at end of file
diff --git a/src/app/emu/audio/apu.h b/src/app/emu/audio/apu.h
index f737b6c9..f656aa4f 100644
--- a/src/app/emu/audio/apu.h
+++ b/src/app/emu/audio/apu.h
@@ -13,6 +13,7 @@
 namespace yaze {
 namespace app {
 namespace emu {
+namespace audio {
 
 /**
  *
@@ -130,6 +131,7 @@ class Apu : public Observer {
   std::function<void()> ready_callback_;
 };
 
+}  // namespace audio
 }  // namespace emu
 }  // namespace app
 }  // namespace yaze
diff --git a/src/app/emu/audio/dsp.cc b/src/app/emu/audio/dsp.cc
index ccc5b2c6..61e1426f 100644
--- a/src/app/emu/audio/dsp.cc
+++ b/src/app/emu/audio/dsp.cc
@@ -5,6 +5,7 @@
 namespace yaze {
 namespace app {
 namespace emu {
+namespace audio {
 
 void DigitalSignalProcessor::Reset() {}
 
@@ -37,7 +38,8 @@ uint8_t DigitalSignalProcessor::ReadVoiceReg(uint8_t voice, uint8_t reg) const {
   }
 }
 
-void DigitalSignalProcessor::WriteVoiceReg(uint8_t voice, uint8_t reg, uint8_t value) {
+void DigitalSignalProcessor::WriteVoiceReg(uint8_t voice, uint8_t reg,
+                                           uint8_t value) {
   voice %= kNumVoices;
   switch (reg % kNumVoiceRegs) {
     case 0:
@@ -69,9 +71,13 @@ void DigitalSignalProcessor::WriteVoiceReg(uint8_t voice, uint8_t reg, uint8_t v
 }
 
 // Set the callbacks
-void DigitalSignalProcessor::SetSampleFetcher(SampleFetcher fetcher) { sample_fetcher_ = fetcher; }
+void DigitalSignalProcessor::SetSampleFetcher(SampleFetcher fetcher) {
+  sample_fetcher_ = fetcher;
+}
 
-void DigitalSignalProcessor::SetSamplePusher(SamplePusher pusher) { sample_pusher_ = pusher; }
+void DigitalSignalProcessor::SetSamplePusher(SamplePusher pusher) {
+  sample_pusher_ = pusher;
+}
 
 int16_t DigitalSignalProcessor::DecodeSample(uint8_t voice_num) {
   Voice const& voice = voices_[voice_num];
@@ -82,7 +88,8 @@ int16_t DigitalSignalProcessor::DecodeSample(uint8_t voice_num) {
   return sample;
 }
 
-int16_t DigitalSignalProcessor::ProcessSample(uint8_t voice_num, int16_t sample) {
+int16_t DigitalSignalProcessor::ProcessSample(uint8_t voice_num,
+                                              int16_t sample) {
   Voice const& voice = voices_[voice_num];
 
   // Adjust the pitch (for simplicity, we're just adjusting the sample value)
@@ -276,6 +283,7 @@ void DigitalSignalProcessor::process_envelope(uint8_t voice_num) {
   apply_envelope_to_output(voice_num);
 }
 
+}  // namespace audio
 }  // namespace emu
 }  // namespace app
 }  // namespace yaze
\ No newline at end of file
diff --git a/src/app/emu/audio/dsp.h b/src/app/emu/audio/dsp.h
index 15dc161e..37e23707 100644
--- a/src/app/emu/audio/dsp.h
+++ b/src/app/emu/audio/dsp.h
@@ -10,6 +10,7 @@
 namespace yaze {
 namespace app {
 namespace emu {
+namespace audio {
 
 using SampleFetcher = std::function<uint8_t(uint16_t)>;
 using SamplePusher = std::function<void(int16_t)>;
@@ -308,6 +309,8 @@ class DigitalSignalProcessor {
   // and apply the envelope to the audio output.
   void process_envelope(uint8_t voice_num);
 };
+
+}  // namespace audio
 }  // namespace emu
 }  // namespace app
 }  // namespace yaze
diff --git a/src/app/emu/audio/internal/addressing.cc b/src/app/emu/audio/internal/addressing.cc
index 069eb607..29097704 100644
--- a/src/app/emu/audio/internal/addressing.cc
+++ b/src/app/emu/audio/internal/addressing.cc
@@ -3,6 +3,7 @@
 namespace yaze {
 namespace app {
 namespace emu {
+namespace audio {
 
 // Immediate
 uint8_t Spc700::imm() {
@@ -89,6 +90,7 @@ uint16_t Spc700::addr_plus_i_indexed() {
   return read(addr) | (read(addr + 1) << 8);
 }
 
+}  // namespace audio
 }  // namespace emu
 }  // namespace app
 }  // namespace yaze
\ No newline at end of file
diff --git a/src/app/emu/audio/internal/instructions.cc b/src/app/emu/audio/internal/instructions.cc
index f8f973b1..79217fb9 100644
--- a/src/app/emu/audio/internal/instructions.cc
+++ b/src/app/emu/audio/internal/instructions.cc
@@ -3,6 +3,7 @@
 namespace yaze {
 namespace app {
 namespace emu {
+namespace audio {
 
 void Spc700::MOV(uint8_t& dest, uint8_t operand) {
   dest = operand;
@@ -356,6 +357,7 @@ void Spc700::SLEEP() {}
 
 void Spc700::STOP() {}
 
+}  // namespace audio
 }  // namespace emu
 }  // namespace app
 }  // namespace yaze
\ No newline at end of file
diff --git a/src/app/emu/audio/spc700.cc b/src/app/emu/audio/spc700.cc
index 5fb8e162..34a585ca 100644
--- a/src/app/emu/audio/spc700.cc
+++ b/src/app/emu/audio/spc700.cc
@@ -11,6 +11,7 @@
 namespace yaze {
 namespace app {
 namespace emu {
+namespace audio {
 
 void Spc700::Reset() {
   PC = 0;
@@ -952,6 +953,7 @@ void Spc700::LogInstruction(uint16_t initial_pc, uint8_t opcode) {
   log_.push_back(log_entry);
 }
 
+}  // namespace audio
 }  // namespace emu
 }  // namespace app
 }  // namespace yaze
diff --git a/src/app/emu/audio/spc700.h b/src/app/emu/audio/spc700.h
index f76d6170..8733de69 100644
--- a/src/app/emu/audio/spc700.h
+++ b/src/app/emu/audio/spc700.h
@@ -9,6 +9,7 @@
 namespace yaze {
 namespace app {
 namespace emu {
+namespace audio {
 
 class AudioRam {
  public:
@@ -261,6 +262,7 @@ class Spc700 {
   // CBNE DBNZ
 };
 
+}  // namespace audio
 }  // namespace emu
 }  // namespace app
 }  // namespace yaze
diff --git a/src/app/emu/snes.cc b/src/app/emu/snes.cc
index 55c19f68..6d736e70 100644
--- a/src/app/emu/snes.cc
+++ b/src/app/emu/snes.cc
@@ -46,7 +46,7 @@ uint16_t GetHeaderOffset(const Memory& memory) {
 }
 
 void audio_callback(void* userdata, uint8_t* stream, int len) {
-  auto* apu = static_cast<Apu*>(userdata);
+  auto* apu = static_cast<audio::Apu*>(userdata);
   auto* buffer = reinterpret_cast<int16_t*>(stream);
 
   for (int i = 0; i < len / 2; i++) {  // Assuming 16-bit samples
diff --git a/src/app/emu/snes.h b/src/app/emu/snes.h
index 5095bc36..8aa2c31d 100644
--- a/src/app/emu/snes.h
+++ b/src/app/emu/snes.h
@@ -88,11 +88,11 @@ class SNES : public DMA {
   // Components of the SNES
   MemoryImpl memory_;
   ClockImpl clock_;
-  AudioRamImpl audio_ram_;
+  audio::AudioRamImpl audio_ram_;
 
   CPU cpu_{memory_, clock_};
   Ppu ppu_{memory_, clock_};
-  Apu apu_{memory_, audio_ram_, clock_};
+  audio::Apu apu_{memory_, audio_ram_, clock_};
 
   // Helper classes
   ROMInfo rom_info_;
diff --git a/test/emu/spc700_test.cc b/test/emu/spc700_test.cc
index 58aed485..a5778540 100644
--- a/test/emu/spc700_test.cc
+++ b/test/emu/spc700_test.cc
@@ -7,6 +7,7 @@
 namespace yaze {
 namespace app {
 namespace emu {
+namespace audio {
 
 using testing::_;
 using testing::Return;
@@ -461,6 +462,7 @@ TEST_F(Spc700Test, BootIplRomOk) {
   // EXPECT_EQ(spc700.PC, 0xFFC1 + 0x3F);
 }
 
+}  // namespace audio
 }  // namespace emu
 }  // namespace app
 }  // namespace yaze