diff --git a/lib/Epub/Epub/blocks/ImageBlock.cpp b/lib/Epub/Epub/blocks/ImageBlock.cpp
index aa42865b9..b95dfb93b 100644
--- a/lib/Epub/Epub/blocks/ImageBlock.cpp
+++ b/lib/Epub/Epub/blocks/ImageBlock.cpp
@@ -2,7 +2,6 @@
 
 #include <GfxRenderer.h>
 #include <Logging.h>
-#include <SDCardManager.h>
 #include <Serialization.h>
 
 #include "../converters/DitherUtils.h"
diff --git a/lib/Epub/Epub/blocks/ImageBlock.h b/lib/Epub/Epub/blocks/ImageBlock.h
index dd37eddf6..f3b01e6cc 100644
--- a/lib/Epub/Epub/blocks/ImageBlock.h
+++ b/lib/Epub/Epub/blocks/ImageBlock.h
@@ -1,5 +1,5 @@
 #pragma once
-#include <SdFat.h>
+#include <HalStorage.h>
 
 #include <memory>
 #include <string>
diff --git a/lib/Epub/Epub/converters/ImageToFramebufferDecoder.h b/lib/Epub/Epub/converters/ImageToFramebufferDecoder.h
index 3376864ac..e10d2f307 100644
--- a/lib/Epub/Epub/converters/ImageToFramebufferDecoder.h
+++ b/lib/Epub/Epub/converters/ImageToFramebufferDecoder.h
@@ -1,5 +1,5 @@
 #pragma once
-#include <SdFat.h>
+#include <HalStorage.h>
 
 #include <memory>
 #include <string>
diff --git a/lib/Epub/Epub/converters/JpegToFramebufferConverter.cpp b/lib/Epub/Epub/converters/JpegToFramebufferConverter.cpp
index 8251156ed..c520da701 100644
--- a/lib/Epub/Epub/converters/JpegToFramebufferConverter.cpp
+++ b/lib/Epub/Epub/converters/JpegToFramebufferConverter.cpp
@@ -1,9 +1,8 @@
 #include "JpegToFramebufferConverter.h"
 
 #include <GfxRenderer.h>
+#include <HalStorage.h>
 #include <Logging.h>
-#include <SDCardManager.h>
-#include <SdFat.h>
 #include <picojpeg.h>
 
 #include <cstdio>
diff --git a/lib/Epub/Epub/converters/PngToFramebufferConverter.cpp b/lib/Epub/Epub/converters/PngToFramebufferConverter.cpp
index 7925fa62d..3b15ebf0b 100644
--- a/lib/Epub/Epub/converters/PngToFramebufferConverter.cpp
+++ b/lib/Epub/Epub/converters/PngToFramebufferConverter.cpp
@@ -1,10 +1,9 @@
 #include "PngToFramebufferConverter.h"
 
 #include <GfxRenderer.h>
+#include <HalStorage.h>
 #include <Logging.h>
 #include <PNGdec.h>
-#include <SDCardManager.h>
-#include <SdFat.h>
 
 #include <cstdlib>
 #include <new>
diff --git a/lib/hal/HalStorage.h b/lib/hal/HalStorage.h
index d3fbc7545..0a26d29f3 100644
--- a/lib/hal/HalStorage.h
+++ b/lib/hal/HalStorage.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <FS.h>  // need to be included before SdFat.h for compatibility with FS.h's File class
 #include <SDCardManager.h>
 
 #include <vector>