diff --git a/src/tools/ecode/plugins/debugger/debuggerplugin.cpp b/src/tools/ecode/plugins/debugger/debuggerplugin.cpp
index ff102f827..628d794bd 100644
--- a/src/tools/ecode/plugins/debugger/debuggerplugin.cpp
+++ b/src/tools/ecode/plugins/debugger/debuggerplugin.cpp
@@ -5,7 +5,6 @@
 #include "../../widgetcommandexecuter.hpp"
 #include "busprocess.hpp"
 #include "dap/debuggerclientdap.hpp"
-#include "debuggerclientlistener.hpp"
 #include "statusdebuggercontroller.hpp"
 #include <eepp/graphics/primitives.hpp>
 #include <eepp/system/filesystem.hpp>
diff --git a/src/tools/ecode/plugins/debugger/debuggerplugin.hpp b/src/tools/ecode/plugins/debugger/debuggerplugin.hpp
index a893d532d..29bcc63ab 100644
--- a/src/tools/ecode/plugins/debugger/debuggerplugin.hpp
+++ b/src/tools/ecode/plugins/debugger/debuggerplugin.hpp
@@ -2,19 +2,13 @@
 
 #include "../plugin.hpp"
 #include "../pluginmanager.hpp"
-#include "statusdebuggercontroller.hpp"
+#include "debuggerclientlistener.hpp"
 
 using namespace EE::UI::Models;
 using namespace EE::UI;
 
 namespace ecode {
 
-class DebuggerClient;
-class DebuggerClientListener;
-namespace dap {
-class SourceBreakpointStateful;
-}
-
 struct DapRunConfig {
 	std::string command;
 	std::vector<std::string> args;
@@ -72,7 +66,7 @@ class DebuggerPlugin : public PluginBase {
 	UIDropDownList* mUIDebuggerList{ nullptr };
 	UIDropDownList* mUIDebuggerConfList{ nullptr };
 	UIPushButton* mRunButton{ nullptr };
-	UnorderedMap<std::string, UnorderedSet<dap::SourceBreakpointStateful>> mBreakpoints;
+	UnorderedMap<std::string, UnorderedSet<SourceBreakpointStateful>> mBreakpoints;
 	UnorderedSet<std::string> mPendingBreakpoints;
 	Mutex mBreakpointsMutex;