diff --git a/src/DebugServer/Gdb/AvrGdb/AvrGdbRsp.cpp b/src/DebugServer/Gdb/AvrGdb/AvrGdbRsp.cpp
index b32d9038..0db5bf9c 100644
--- a/src/DebugServer/Gdb/AvrGdb/AvrGdbRsp.cpp
+++ b/src/DebugServer/Gdb/AvrGdb/AvrGdbRsp.cpp
@@ -41,6 +41,10 @@ namespace DebugServer::Gdb::AvrGdb
         )
     {}
 
+    std::string AvrGdbRsp::getName() const {
+        return "AVR GDB Remote Serial Protocol Debug Server";
+    }
+
     std::unique_ptr<CommandPackets::CommandPacket> AvrGdbRsp::rawPacketToCommandPacket(const RawPacket& rawPacket) {
         using Gdb::CommandPackets::Monitor;
 
diff --git a/src/DebugServer/Gdb/AvrGdb/AvrGdbRsp.hpp b/src/DebugServer/Gdb/AvrGdb/AvrGdbRsp.hpp
index 2d76708b..eaead451 100644
--- a/src/DebugServer/Gdb/AvrGdb/AvrGdbRsp.hpp
+++ b/src/DebugServer/Gdb/AvrGdb/AvrGdbRsp.hpp
@@ -2,14 +2,14 @@
 
 #include <cstdint>
 
+#include "src/DebugServer/Gdb/GdbRspDebugServer.hpp"
+
 #include "AvrGdbTargetDescriptor.hpp"
 #include "CommandPackets/CommandPacket.hpp"
 
-#include "src/DebugServer/Gdb/GdbRspDebugServer.hpp"
-
 namespace DebugServer::Gdb::AvrGdb
 {
-    class AvrGdbRsp: public GdbRspDebugServer<AvrGdbTargetDescriptor, Gdb::DebugSession, CommandPackets::CommandPacket>
+    class AvrGdbRsp: public GdbRspDebugServer<AvrGdbTargetDescriptor, DebugSession, CommandPackets::CommandPacket>
     {
     public:
         AvrGdbRsp(
@@ -19,9 +19,7 @@ namespace DebugServer::Gdb::AvrGdb
             EventFdNotifier& eventNotifier
         );
 
-        std::string getName() const override {
-            return "AVR GDB Remote Serial Protocol Debug Server";
-        }
+        std::string getName() const override;
 
     protected:
         std::unique_ptr<CommandPackets::CommandPacket> rawPacketToCommandPacket(const RawPacket& rawPacket) override;
diff --git a/src/DebugServer/Gdb/GdbRspDebugServer.hpp b/src/DebugServer/Gdb/GdbRspDebugServer.hpp
index a4ecc8a3..13d6a83b 100644
--- a/src/DebugServer/Gdb/GdbRspDebugServer.hpp
+++ b/src/DebugServer/Gdb/GdbRspDebugServer.hpp
@@ -22,26 +22,6 @@
 #include "RegisterDescriptor.hpp"
 #include "Feature.hpp"
 
-#include "src/EventManager/EventListener.hpp"
-#include "src/Helpers/EpollInstance.hpp"
-#include "src/Helpers/EventFdNotifier.hpp"
-#include "src/Services/TargetControllerService.hpp"
-#include "src/Targets/TargetDescriptor.hpp"
-
-#include "src/EventManager/Events/TargetStateChanged.hpp"
-#include "src/EventManager/EventManager.hpp"
-
-#include "src/Logger/Logger.hpp"
-
-#include "Exceptions/ClientDisconnected.hpp"
-#include "Exceptions/ClientNotSupported.hpp"
-#include "Exceptions/ClientCommunicationError.hpp"
-#include "Exceptions/DebugSessionInitialisationFailure.hpp"
-#include "Exceptions/DebugServerInterrupted.hpp"
-
-#include "src/Exceptions/Exception.hpp"
-#include "src/Exceptions/InvalidConfig.hpp"
-
 // Command packets
 #include "CommandPackets/CommandPacket.hpp"
 #include "CommandPackets/CommandPacket.hpp"
@@ -70,8 +50,26 @@
 // Response packets
 #include "ResponsePackets/TargetStopped.hpp"
 
+#include "src/EventManager/EventListener.hpp"
+#include "src/Helpers/EpollInstance.hpp"
+#include "src/Helpers/EventFdNotifier.hpp"
+#include "src/Services/TargetControllerService.hpp"
 #include "src/Services/ProcessService.hpp"
 #include "src/Services/StringService.hpp"
+#include "src/Targets/TargetDescriptor.hpp"
+#include "src/Logger/Logger.hpp"
+
+#include "src/EventManager/Events/TargetStateChanged.hpp"
+#include "src/EventManager/EventManager.hpp"
+
+#include "Exceptions/ClientDisconnected.hpp"
+#include "Exceptions/ClientNotSupported.hpp"
+#include "Exceptions/ClientCommunicationError.hpp"
+#include "Exceptions/DebugSessionInitialisationFailure.hpp"
+#include "Exceptions/DebugServerInterrupted.hpp"
+
+#include "src/Exceptions/Exception.hpp"
+#include "src/Exceptions/InvalidConfig.hpp"
 
 namespace DebugServer::Gdb
 {