diff --git a/Machines/Amiga/Audio.cpp b/Machines/Amiga/Audio.cpp
index 68a5ec48b..1fc59995c 100644
--- a/Machines/Amiga/Audio.cpp
+++ b/Machines/Amiga/Audio.cpp
@@ -14,6 +14,7 @@
 #include "../../Outputs/Log.hpp"
 
 #include <cassert>
+#include <tuple>
 
 using namespace Amiga;
 
@@ -100,6 +101,7 @@ void Audio::output() {
 	}
 
 	// Left.
+	static_assert(std::tuple_size<AudioBuffer>::value % 2 == 0);
 	buffer_[buffer_pointer_][sample_pointer_] = int16_t(
 		(
 			channels_[1].output_level * channels_[1].output_enabled +
@@ -108,7 +110,7 @@ void Audio::output() {
 	);
 
 	// Right.
-	buffer_[buffer_pointer_][sample_pointer_+1] = int16_t(
+	buffer_[buffer_pointer_][sample_pointer_ + 1] = int16_t(
 		(
 			channels_[0].output_level * channels_[0].output_enabled +
 			channels_[3].output_level * channels_[3].output_enabled
diff --git a/Machines/Amiga/Chipset.cpp b/Machines/Amiga/Chipset.cpp
index 8d8309188..f45bbff5d 100644
--- a/Machines/Amiga/Chipset.cpp
+++ b/Machines/Amiga/Chipset.cpp
@@ -17,6 +17,7 @@
 
 #include <algorithm>
 #include <cassert>
+#include <tuple>
 
 using namespace Amiga;