diff --git a/Analyser/Dynamic/MultiMachine/Implementation/MultiConfigurable.cpp b/Analyser/Dynamic/MultiMachine/Implementation/MultiConfigurable.cpp
index 8d288cfb1..2aab3e028 100644
--- a/Analyser/Dynamic/MultiMachine/Implementation/MultiConfigurable.cpp
+++ b/Analyser/Dynamic/MultiMachine/Implementation/MultiConfigurable.cpp
@@ -8,6 +8,8 @@
 
 #include "MultiConfigurable.hpp"
 
+#include <algorithm>
+
 using namespace Analyser::Dynamic;
 
 MultiConfigurable::MultiConfigurable(const std::vector<std::unique_ptr<::Machine::DynamicMachine>> &machines) {
diff --git a/Analyser/Dynamic/MultiMachine/MultiMachine.cpp b/Analyser/Dynamic/MultiMachine/MultiMachine.cpp
index 4927af57a..fc018abd7 100644
--- a/Analyser/Dynamic/MultiMachine/MultiMachine.cpp
+++ b/Analyser/Dynamic/MultiMachine/MultiMachine.cpp
@@ -8,6 +8,8 @@
 
 #include "MultiMachine.hpp"
 
+#include <algorithm>
+
 using namespace Analyser::Dynamic;
 
 MultiMachine::MultiMachine(std::vector<std::unique_ptr<DynamicMachine>> &&machines) :
@@ -71,11 +73,12 @@ void MultiMachine::multi_crt_did_run_machines() {
 	printf("\n");
 
 	DynamicMachine *front = machines_.front().get();
-	std::stable_sort(machines_.begin(), machines_.end(), [] (const auto &lhs, const auto &rhs){
-		CRTMachine::Machine *lhs_crt = lhs->crt_machine();
-		CRTMachine::Machine *rhs_crt = rhs->crt_machine();
-		return lhs_crt->get_confidence() > rhs_crt->get_confidence();
-	});
+	std::stable_sort(machines_.begin(), machines_.end(),
+        [] (const std::unique_ptr<DynamicMachine> &lhs, const std::unique_ptr<DynamicMachine> &rhs){
+		    CRTMachine::Machine *lhs_crt = lhs->crt_machine();
+		    CRTMachine::Machine *rhs_crt = rhs->crt_machine();
+		    return lhs_crt->get_confidence() > rhs_crt->get_confidence();
+	    });
 
 	if(machines_.front().get() != front) {
 		crt_machine_.did_change_machine_order();
diff --git a/Analyser/Static/StaticAnalyser.cpp b/Analyser/Static/StaticAnalyser.cpp
index dab1e7705..c773d07d3 100644
--- a/Analyser/Static/StaticAnalyser.cpp
+++ b/Analyser/Static/StaticAnalyser.cpp
@@ -8,6 +8,7 @@
 
 #include "StaticAnalyser.hpp"
 
+#include <algorithm>
 #include <cstdlib>
 #include <cstring>
 
@@ -166,9 +167,10 @@ std::vector<std::unique_ptr<Target>> Analyser::Static::GetTargets(const char *fi
 
 	// Sort by initial confidence. Use a stable sort in case any of the machine-specific analysers
 	// picked their insertion order carefully.
-	std::stable_sort(targets.begin(), targets.end(), [](auto &a, auto &b) {
-		return a->confidence > b->confidence;
-	});
+	std::stable_sort(targets.begin(), targets.end(),
+        [] (const std::unique_ptr<Target> &a, const std::unique_ptr<Target> &b) {
+		    return a->confidence > b->confidence;
+	    });
 
 	return targets;
 }
diff --git a/OSBindings/SDL/SConstruct b/OSBindings/SDL/SConstruct
index 3219db008..e2559b148 100644
--- a/OSBindings/SDL/SConstruct
+++ b/OSBindings/SDL/SConstruct
@@ -10,6 +10,20 @@ env.ParseConfig('sdl2-config --libs')
 # gather a list of source files
 SOURCES = glob.glob('*.cpp')
 
+SOURCES += glob.glob('../../Analyser/Dynamic/*.cpp')
+SOURCES += glob.glob('../../Analyser/Dynamic/MultiMachine/*.cpp')
+SOURCES += glob.glob('../../Analyser/Dynamic/MultiMachine/Implementation/*.cpp')
+
+SOURCES += glob.glob('../../Analyser/Static/*.cpp')
+SOURCES += glob.glob('../../Analyser/Static/Acorn/*.cpp')
+SOURCES += glob.glob('../../Analyser/Static/AmstradCPC/*.cpp')
+SOURCES += glob.glob('../../Analyser/Static/Atari/*.cpp')
+SOURCES += glob.glob('../../Analyser/Static/Commodore/*.cpp')
+SOURCES += glob.glob('../../Analyser/Static/Disassembler/*.cpp')
+SOURCES += glob.glob('../../Analyser/Static/MSX/*.cpp')
+SOURCES += glob.glob('../../Analyser/Static/Oric/*.cpp')
+SOURCES += glob.glob('../../Analyser/Static/ZX8081/*.cpp')
+
 SOURCES += glob.glob('../../Components/1770/*.cpp')
 SOURCES += glob.glob('../../Components/6522/Implementation/*.cpp')
 SOURCES += glob.glob('../../Components/6560/*.cpp')
@@ -46,16 +60,6 @@ SOURCES += glob.glob('../../Processors/Z80/Implementation/*.cpp')
 
 SOURCES += glob.glob('../../SignalProcessing/*.cpp')
 
-SOURCES += glob.glob('../../StaticAnalyser/*.cpp')
-SOURCES += glob.glob('../../StaticAnalyser/Acorn/*.cpp')
-SOURCES += glob.glob('../../StaticAnalyser/AmstradCPC/*.cpp')
-SOURCES += glob.glob('../../StaticAnalyser/Atari/*.cpp')
-SOURCES += glob.glob('../../StaticAnalyser/Commodore/*.cpp')
-SOURCES += glob.glob('../../StaticAnalyser/Disassembler/*.cpp')
-SOURCES += glob.glob('../../StaticAnalyser/MSX/*.cpp')
-SOURCES += glob.glob('../../StaticAnalyser/Oric/*.cpp')
-SOURCES += glob.glob('../../StaticAnalyser/ZX8081/*.cpp')
-
 SOURCES += glob.glob('../../Storage/*.cpp')
 SOURCES += glob.glob('../../Storage/Cartridge/*.cpp')
 SOURCES += glob.glob('../../Storage/Cartridge/Encodings/*.cpp')