diff --git a/src/DebugServer/Gdb/GdbDebugServerConfig.hpp b/src/DebugServer/Gdb/GdbDebugServerConfig.hpp
index 1a6ff0d0..de615b46 100644
--- a/src/DebugServer/Gdb/GdbDebugServerConfig.hpp
+++ b/src/DebugServer/Gdb/GdbDebugServerConfig.hpp
@@ -1,5 +1,7 @@
 #pragma once
 
+#include <cstdint>
+
 #include "src/ProjectConfig.hpp"
 
 namespace DebugServer::Gdb
diff --git a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/AvrEvent.cpp b/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/AvrEvent.cpp
index 99b5a105..c428f99e 100644
--- a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/AvrEvent.cpp
+++ b/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/AvrEvent.cpp
@@ -1,5 +1,7 @@
 #include "AvrEvent.hpp"
 
+#include <cstdint>
+
 #include "src/Exceptions/Exception.hpp"
 
 namespace DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr
diff --git a/src/Helpers/Thread.hpp b/src/Helpers/Thread.hpp
index da0fe90a..ba5d801b 100644
--- a/src/Helpers/Thread.hpp
+++ b/src/Helpers/Thread.hpp
@@ -4,6 +4,7 @@
 #include <csignal>
 #include <cassert>
 #include <atomic>
+#include <string>
 
 enum class ThreadState: std::uint8_t
 {