diff --git a/OSBindings/SDL/SConstruct b/OSBindings/SDL/SConstruct
index 96b3fd3fd..a7d589613 100644
--- a/OSBindings/SDL/SConstruct
+++ b/OSBindings/SDL/SConstruct
@@ -36,6 +36,7 @@ SOURCES += glob.glob('../../Analyser/Static/Sega/*.cpp')
 SOURCES += glob.glob('../../Analyser/Static/ZX8081/*.cpp')
 
 SOURCES += glob.glob('../../Components/1770/*.cpp')
+SOURCES += glob.glob('../../Components/5380/*.cpp')
 SOURCES += glob.glob('../../Components/6522/Implementation/*.cpp')
 SOURCES += glob.glob('../../Components/6560/*.cpp')
 SOURCES += glob.glob('../../Components/8272/*.cpp')
@@ -97,6 +98,10 @@ SOURCES += glob.glob('../../Storage/Disk/Encodings/MFM/*.cpp')
 SOURCES += glob.glob('../../Storage/Disk/Parsers/*.cpp')
 SOURCES += glob.glob('../../Storage/Disk/Track/*.cpp')
 SOURCES += glob.glob('../../Storage/Disk/Data/*.cpp')
+SOURCES += glob.glob('../../Storage/MassStorage/*.cpp')
+SOURCES += glob.glob('../../Storage/MassStorage/Encodings/*.cpp')
+SOURCES += glob.glob('../../Storage/MassStorage/Formats/*.cpp')
+SOURCES += glob.glob('../../Storage/MassStorage/SCSI/*.cpp')
 SOURCES += glob.glob('../../Storage/Tape/*.cpp')
 SOURCES += glob.glob('../../Storage/Tape/Formats/*.cpp')
 SOURCES += glob.glob('../../Storage/Tape/Parsers/*.cpp')
diff --git a/Storage/MassStorage/Encodings/MacintoshVolume.hpp b/Storage/MassStorage/Encodings/MacintoshVolume.hpp
index 185c658c0..e5ade9b56 100644
--- a/Storage/MassStorage/Encodings/MacintoshVolume.hpp
+++ b/Storage/MassStorage/Encodings/MacintoshVolume.hpp
@@ -11,6 +11,8 @@
 
 #include <vector>
 #include <cstdint>
+#include <sys/types.h>
+#include <unistd.h>
 
 namespace Storage {
 namespace MassStorage {
diff --git a/Storage/MassStorage/SCSI/Target.hpp b/Storage/MassStorage/SCSI/Target.hpp
index 371f13194..6683dd242 100644
--- a/Storage/MassStorage/SCSI/Target.hpp
+++ b/Storage/MassStorage/SCSI/Target.hpp
@@ -12,6 +12,7 @@
 #include "SCSI.hpp"
 #include "../../../Outputs/Log.hpp"
 
+#include <cassert>
 #include <cstring>
 #include <functional>
 
@@ -393,7 +394,7 @@ template <typename Executor> class Target: public Bus::Observer, public Responde
 		continuation next_function_;
 };
 
-#import "TargetImplementation.hpp"
+#include "TargetImplementation.hpp"
 
 }
 }