diff --git a/Storage/FileHolder.cpp b/Storage/FileHolder.cpp
index c4f7e770a..850ecf96a 100644
--- a/Storage/FileHolder.cpp
+++ b/Storage/FileHolder.cpp
@@ -10,7 +10,6 @@
 
 #include <algorithm>
 #include <cassert>
-#include <cstring>
 
 using namespace Storage;
 
diff --git a/Storage/FileHolder.hpp b/Storage/FileHolder.hpp
index 5ebfc3c92..11749d63b 100644
--- a/Storage/FileHolder.hpp
+++ b/Storage/FileHolder.hpp
@@ -9,10 +9,12 @@
 #pragma once
 
 #include "Numeric/BitStream.hpp"
+
 #include <sys/stat.h>
 #include <array>
 #include <cstdio>
 #include <cstdint>
+#include <cstring>
 #include <mutex>
 #include <string>
 #include <vector>
diff --git a/cmake/CLK_SOURCES.cmake b/cmake/CLK_SOURCES.cmake
index 22c82acea..24b39efac 100644
--- a/cmake/CLK_SOURCES.cmake
+++ b/cmake/CLK_SOURCES.cmake
@@ -226,6 +226,7 @@ set(CLK_SOURCES
 	Storage/MassStorage/Formats/DSK.cpp
 	Storage/MassStorage/Formats/HDV.cpp
 	Storage/MassStorage/Formats/HFV.cpp
+	Storage/MassStorage/Formats/VHD.cpp
 	Storage/MassStorage/MassStorageDevice.cpp
 	Storage/MassStorage/SCSI/DirectAccessDevice.cpp
 	Storage/MassStorage/SCSI/SCSI.cpp