diff --git a/Machines/Commodore/1540/Implementation/C1540.cpp b/Machines/Commodore/1540/Implementation/C1540.cpp
index 316c0ab0d..654f17bf7 100644
--- a/Machines/Commodore/1540/Implementation/C1540.cpp
+++ b/Machines/Commodore/1540/Implementation/C1540.cpp
@@ -6,10 +6,10 @@
 //  Copyright © 2016 Thomas Harte. All rights reserved.
 //
 
-#include "C1540.hpp"
+#include "../C1540.hpp"
 
-#include <string>
 #include <cassert>
+#include <cstring>
 
 #include "../../../../Storage/Disk/Encodings/CommodoreGCR.hpp"
 
diff --git a/Outputs/CRT/Internals/Shaders/IntermediateShader.cpp b/Outputs/CRT/Internals/Shaders/IntermediateShader.cpp
index 5bfad3f8a..0185afb98 100644
--- a/Outputs/CRT/Internals/Shaders/IntermediateShader.cpp
+++ b/Outputs/CRT/Internals/Shaders/IntermediateShader.cpp
@@ -8,9 +8,11 @@
 
 #include "IntermediateShader.hpp"
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <math.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <cmath>
+
 #include "../../../../SignalProcessing/FIRFilter.hpp"
 
 using namespace OpenGL;
diff --git a/Outputs/CRT/Internals/Shaders/Shader.cpp b/Outputs/CRT/Internals/Shaders/Shader.cpp
index 5010dab0e..66f1c05a2 100644
--- a/Outputs/CRT/Internals/Shaders/Shader.cpp
+++ b/Outputs/CRT/Internals/Shaders/Shader.cpp
@@ -8,7 +8,8 @@
 
 #include "Shader.hpp"
 
-#include <stdio.h>
+#include <cstdio>
+#include <cstring>
 
 using namespace OpenGL;
 
diff --git a/Storage/Data/ZX8081.hpp b/Storage/Data/ZX8081.hpp
index 780cc8a15..03e5c25f8 100644
--- a/Storage/Data/ZX8081.hpp
+++ b/Storage/Data/ZX8081.hpp
@@ -9,9 +9,10 @@
 #ifndef Storage_Data_ZX8081_hpp
 #define Storage_Data_ZX8081_hpp
 
+#include <cstdint>
+#include <memory>
 #include <string>
 #include <vector>
-#include <cstdint>
 
 namespace Storage {
 namespace Data {
diff --git a/Storage/Disk/DiskImage/Formats/Utility/ImplicitSectors.cpp b/Storage/Disk/DiskImage/Formats/Utility/ImplicitSectors.cpp
index 5c1f62852..c2d601298 100644
--- a/Storage/Disk/DiskImage/Formats/Utility/ImplicitSectors.cpp
+++ b/Storage/Disk/DiskImage/Formats/Utility/ImplicitSectors.cpp
@@ -8,6 +8,8 @@
 
 #include "ImplicitSectors.hpp"
 
+#include <cstring>
+
 #include "../../../Encodings/MFM/Sector.hpp"
 #include "../../../Encodings/MFM/Encoder.hpp"
 #include "../../../Encodings/MFM/Constants.hpp"
diff --git a/Storage/Tape/Formats/TZX.cpp b/Storage/Tape/Formats/TZX.cpp
index 1c5dfe9ed..b8fa84a89 100644
--- a/Storage/Tape/Formats/TZX.cpp
+++ b/Storage/Tape/Formats/TZX.cpp
@@ -300,12 +300,14 @@ void TZX::ignore_group_end() {
 }
 
 void TZX::ignore_jump_to_block() {
-	__unused uint16_t target = file_.get16le();
+	uint16_t target = file_.get16le();
+	(void)target;
 	printf("Ignoring TZX jump\n");
 }
 
 void TZX::ignore_loop_start() {
-	__unused uint16_t number_of_repetitions = file_.get16le();
+	uint16_t number_of_repetitions = file_.get16le();
+	(void)number_of_repetitions;
 	printf("Ignoring TZX loop\n");
 }
 
@@ -313,7 +315,7 @@ void TZX::ignore_loop_end() {
 }
 
 void TZX::ignore_call_sequence() {
-	__unused uint16_t number_of_entries = file_.get16le();
+	uint16_t number_of_entries = file_.get16le();
 	file_.seek(number_of_entries * sizeof(uint16_t), SEEK_CUR);
 	printf("Ignoring TZX call sequence\n");
 }
@@ -323,7 +325,7 @@ void TZX::ignore_return_from_sequence() {
 }
 
 void TZX::ignore_select_block() {
-	__unused uint16_t length_of_block = file_.get16le();
+	uint16_t length_of_block = file_.get16le();
 	file_.seek(length_of_block, SEEK_CUR);
 	printf("Ignoring TZX select block\n");
 }
@@ -337,9 +339,10 @@ void TZX::ignore_text_description() {
 }
 
 void TZX::ignore_message_block() {
-	__unused uint8_t time_for_display = file_.get8();
+	uint8_t time_for_display = file_.get8();
 	uint8_t length = file_.get8();
 	file_.seek(length, SEEK_CUR);
+	(void)time_for_display;
 	printf("Ignoring TZX message\n");
 }
 
diff --git a/Storage/Tape/Parsers/Commodore.cpp b/Storage/Tape/Parsers/Commodore.cpp
index a676b6356..f133552e4 100644
--- a/Storage/Tape/Parsers/Commodore.cpp
+++ b/Storage/Tape/Parsers/Commodore.cpp
@@ -7,6 +7,8 @@
 //
 
 #include "Commodore.hpp"
+
+#include <cstring>
 #include "../../Data/Commodore.hpp"
 
 using namespace Storage::Tape::Commodore;