diff --git a/src/app/emu/video/ppu.cc b/src/app/emu/video/ppu.cc
index 27a3dc69..a065aa0c 100644
--- a/src/app/emu/video/ppu.cc
+++ b/src/app/emu/video/ppu.cc
@@ -8,9 +8,6 @@
 
 namespace yaze {
 namespace emu {
-namespace video {
-
-using namespace PpuRegisters;
 
 // array for layer definitions per mode:
 //   0-7: mode 0-7; 8: mode 1 + l3prio; 9: mode 7 + extbg
@@ -1053,7 +1050,5 @@ void Ppu::PutPixels(uint8_t* pixels) {
   }
 }
 
-}  // namespace video
 }  // namespace emu
-
 }  // namespace yaze
diff --git a/src/app/emu/video/ppu.h b/src/app/emu/video/ppu.h
index 33db8c0e..fe92e020 100644
--- a/src/app/emu/video/ppu.h
+++ b/src/app/emu/video/ppu.h
@@ -12,10 +12,6 @@
 
 namespace yaze {
 namespace emu {
-namespace video {
-
-using namespace PpuRegisters;
-using namespace memory;
 
 class PpuInterface {
  public:
@@ -258,7 +254,7 @@ struct BackgroundLayer {
 class Ppu : public SharedRom {
  public:
   // Initializes the PPU with the necessary resources and dependencies
-  Ppu(memory::Memory& memory, Clock& clock) : memory_(memory), clock_(clock) {}
+  Ppu(Memory& memory, Clock& clock) : memory_(memory), clock_(clock) {}
 
   // Initialize the frame buffer
   void Init() {
@@ -455,9 +451,7 @@ class Ppu : public SharedRom {
   std::array<BGVOFS, 4> bgvofs_;
 };
 
-}  // namespace video
 }  // namespace emu
-
 }  // namespace yaze
 
-#endif  // YAZE_APP_EMU_PPU_H
\ No newline at end of file
+#endif  // YAZE_APP_EMU_PPU_H
diff --git a/src/app/emu/video/ppu_registers.h b/src/app/emu/video/ppu_registers.h
index d60fcebb..492ba5ca 100644
--- a/src/app/emu/video/ppu_registers.h
+++ b/src/app/emu/video/ppu_registers.h
@@ -1,14 +1,10 @@
 #ifndef YAZE_APP_EMU_VIDEO_PPU_REGISTERS_H
 #define YAZE_APP_EMU_VIDEO_PPU_REGISTERS_H
 
-#include <array>
 #include <cstdint>
-#include <vector>
 
 namespace yaze {
 namespace emu {
-namespace video {
-namespace PpuRegisters {
 
 constexpr uint16_t INIDISP = 0x2100;
 
@@ -412,10 +408,7 @@ struct STAT78 {
   uint8_t unused : 1;
 };
 
-}  // namespace PpuRegisters
-}  // namespace video
 }  // namespace emu
-
 }  // namespace yaze
 
-#endif  // YAZE_APP_EMU_VIDEO_PPU_REGISTERS_H
\ No newline at end of file
+#endif  // YAZE_APP_EMU_VIDEO_PPU_REGISTERS_H