diff --git a/sources/Debugger/APUDebug.cpp b/sources/Debugger/APUDebug.cpp
index f0d1a0c..d0521a3 100644
--- a/sources/Debugger/APUDebug.cpp
+++ b/sources/Debugger/APUDebug.cpp
@@ -12,7 +12,7 @@ namespace ComSquare::Debugger
 {
 	APUDebug::APUDebug(APU &apu, SNES &snes) :
 			APU(apu),
-			_window(new ClosableWindow(*this, &APUDebug::disableDebugger)),
+			_window(new ClosableWindow<APUDebug>(*this, &APUDebug::disableDebugger)),
 			_ui(),
 			_snes(snes)
 	{
diff --git a/sources/Debugger/HeaderViewer.cpp b/sources/Debugger/HeaderViewer.cpp
index 2e77c88..c7a1551 100644
--- a/sources/Debugger/HeaderViewer.cpp
+++ b/sources/Debugger/HeaderViewer.cpp
@@ -9,7 +9,7 @@
 namespace ComSquare::Debugger
 {
 	HeaderViewer::HeaderViewer(ComSquare::SNES &snes)
-		: _window(new ClosableWindow(*this, &HeaderViewer::disableDebugger)),
+		: _window(new ClosableWindow<HeaderViewer>(*this, &HeaderViewer::disableDebugger)),
 		_snes(snes),
 		_cartridge(*snes.cartridge),
 		_ui()
diff --git a/sources/Debugger/MemoryBusDebug.cpp b/sources/Debugger/MemoryBusDebug.cpp
index 17314cd..2caafab 100644
--- a/sources/Debugger/MemoryBusDebug.cpp
+++ b/sources/Debugger/MemoryBusDebug.cpp
@@ -12,7 +12,7 @@ namespace ComSquare::Debugger
 {
 	MemoryBusDebug::MemoryBusDebug(SNES &snes, const Memory::MemoryBus &bus)
 		: MemoryBus(bus),
-		_window(new ClosableWindow(*this, &MemoryBusDebug::disableViewer)),
+		_window(new ClosableWindow<MemoryBusDebug>(*this, &MemoryBusDebug::disableViewer)),
 		_snes(snes),
 		_ui(),
 		_model(),
diff --git a/sources/Debugger/MemoryViewer.cpp b/sources/Debugger/MemoryViewer.cpp
index 1e59b53..f3880fc 100644
--- a/sources/Debugger/MemoryViewer.cpp
+++ b/sources/Debugger/MemoryViewer.cpp
@@ -8,7 +8,6 @@
 #include <QtWidgets/QSpinBox>
 #include "MemoryViewer.hpp"
 #include "../SNES.hpp"
-#include "../Utility/Utility.hpp"
 #include "../Memory/MemoryShadow.hpp"
 #include "../Exceptions/InvalidAddress.hpp"
 
@@ -65,7 +64,7 @@ void MemoryViewerModel::setMemory(std::shared_ptr<Ram> memory)
 namespace ComSquare::Debugger
 {
 	MemoryViewer::MemoryViewer(ComSquare::SNES &snes, Memory::MemoryBus &bus) :
-		_window(new ClosableWindow(*this, &MemoryViewer::disableViewer)),
+		_window(new ClosableWindow<MemoryViewer>(*this, &MemoryViewer::disableViewer)),
 		_snes(snes),
 		_bus(bus),
 		_ui(),