diff --git a/Analyser/Dynamic/MultiMachine/Implementation/MultiJoystickMachine.cpp b/Analyser/Dynamic/MultiMachine/Implementation/MultiJoystickMachine.cpp
index 268771989..851a30d04 100644
--- a/Analyser/Dynamic/MultiMachine/Implementation/MultiJoystickMachine.cpp
+++ b/Analyser/Dynamic/MultiMachine/Implementation/MultiJoystickMachine.cpp
@@ -8,6 +8,8 @@
 
 #include "MultiJoystickMachine.hpp"
 
+#include <algorithm>
+
 using namespace Analyser::Dynamic;
 
 namespace {
diff --git a/Analyser/Static/Oric/StaticAnalyser.cpp b/Analyser/Static/Oric/StaticAnalyser.cpp
index 94e159ca3..7f7391e96 100644
--- a/Analyser/Static/Oric/StaticAnalyser.cpp
+++ b/Analyser/Static/Oric/StaticAnalyser.cpp
@@ -16,6 +16,8 @@
 
 #include "../../../Storage/Disk/Encodings/MFM/Parser.hpp"
 
+#include <cstring>
+
 using namespace Analyser::Static::Oric;
 
 static int Score(const Analyser::Static::MOS6502::Disassembly &disassembly, const std::set<uint16_t> &rom_functions, const std::set<uint16_t> &variable_locations) {
@@ -95,7 +97,7 @@ static bool IsMicrodisc(Storage::Encodings::MFM::Parser &parser) {
 		0x12, 0x00
 	};
 
-	return !memcmp(signature, first_sample.data(), sizeof(signature));
+	return !std::memcmp(signature, first_sample.data(), sizeof(signature));
 }
 
 void Analyser::Static::Oric::AddTargets(const Media &media, std::vector<std::unique_ptr<Analyser::Static::Target>> &destination) {
diff --git a/Concurrency/BestEffortUpdater.hpp b/Concurrency/BestEffortUpdater.hpp
index f15d6e474..cfbd97042 100644
--- a/Concurrency/BestEffortUpdater.hpp
+++ b/Concurrency/BestEffortUpdater.hpp
@@ -13,7 +13,7 @@
 #include <chrono>
 
 #include "AsyncTaskQueue.hpp"
-#include "TimeTypes.hpp"
+#include "../ClockReceiver/TimeTypes.hpp"
 
 namespace Concurrency {