diff --git a/include/zim/archive.h b/include/zim/archive.h
index 0e44e6508..666e0f931 100644
--- a/include/zim/archive.h
+++ b/include/zim/archive.h
@@ -97,6 +97,8 @@ namespace zim
       /** Archive constructor.
        *
        *  Construct an archive from a file descriptor.
+       *  Fd is used only at Archive creation.
+       *  Ownership of the fd is not taken and it must be closed by caller.
        *
        *  Note: This function is not available under Windows.
        *
@@ -108,16 +110,30 @@ namespace zim
        *
        *  Construct an archive from a descriptor of a file with an embedded ZIM
        *  archive inside.
+       *  Fd is used only at Archive creation.
+       *  Ownership of the fd is not taken and it must be closed by caller.
        *
        *  Note: This function is not available under Windows.
        *
-       *  @param fd The descriptor of a seekable file with a continuous segment
-       *  representing a complete ZIM archive.
-       *  @param offset The offset of the ZIM archive relative to the beginning
-       *  of the file (rather than the current position associated with fd).
-       *  @param size The size of the ZIM archive.
+       *  @param fd A FdInput (tuple) containing the fd (int), offset (offset_type) and size (size_type)
+       *            referencing a continuous segment representing a complete ZIM archive.
        */
-      Archive(int fd, offset_type offset, size_type size);
+      explicit Archive(FdInput fd);
+
+      /** Archive constructor.
+       *
+       *  Construct an archive from several file descriptors.
+       *  Each part may be embedded in a file.
+       *  Fds are used only at Archive creation.
+       *  Ownership of the fds is not taken and they must be closed by caller.
+       *  Fds (int) can be the same between FdInput if the parts belong to the same file.
+       *
+       *  Note: This function is not available under Windows.
+       *
+       *  @param fds A vector of FdInput (tuple) containing the fd (int), offset (offset_type) and size (size_type)
+       *             referencing a series of segments representing a complete ZIM archive.
+       */
+      explicit Archive(const std::vector<FdInput>& fds);
 #endif
 
       /** Return the filename of the zim file.
diff --git a/include/zim/zim.h b/include/zim/zim.h
index 80e8596d2..4b27dc27a 100644
--- a/include/zim/zim.h
+++ b/include/zim/zim.h
@@ -58,6 +58,20 @@ namespace zim
   // An offset.
   typedef uint64_t offset_type;
 
+  struct FdInput {
+    // An open file descriptor
+    int fd;
+
+    // The (absolute) offset of the data "pointed" by FdInput in fd.
+    offset_type offset;
+
+    // The size (length) of the data "pointed" by FdInput
+    size_type size;
+
+    FdInput(int fd, offset_type offset, size_type size):
+      fd(fd), offset(offset), size(size) {}
+  };
+
   enum class Compression
   {
     None = 1,
diff --git a/scripts/download_test_data.py b/scripts/download_test_data.py
index d320fb392..90eb509ae 100755
--- a/scripts/download_test_data.py
+++ b/scripts/download_test_data.py
@@ -26,7 +26,7 @@
 import tarfile
 import sys
 
-TEST_DATA_VERSION = "0.3"
+TEST_DATA_VERSION = "0.5"
 ARCHIVE_URL_TEMPL = "https://github.com/openzim/zim-testing-suite/releases/download/v{version}/zim-testing-suite-{version}.tar.gz"
 
 if __name__ == "__main__":
diff --git a/src/_dirent.h b/src/_dirent.h
index 907e9e122..91642049a 100644
--- a/src/_dirent.h
+++ b/src/_dirent.h
@@ -25,10 +25,8 @@
 #include <string>
 #include <zim/zim.h>
 #include <exception>
-#include <memory>
 
 #include "zim_types.h"
-#include "debug.h"
 
 namespace zim
 {
diff --git a/src/archive.cpp b/src/archive.cpp
index 1237baea7..561dc6559 100644
--- a/src/archive.cpp
+++ b/src/archive.cpp
@@ -41,8 +41,12 @@ namespace zim
     : m_impl(new FileImpl(fd))
     { }
 
-  Archive::Archive(int fd, offset_type offset, size_type size)
-    : m_impl(new FileImpl(fd, offset_t(offset), zsize_t(size)))
+  Archive::Archive(FdInput fd)
+    : m_impl(new FileImpl(fd))
+    { }
+
+  Archive::Archive(const std::vector<FdInput>& fds)
+    : m_impl(new FileImpl(fds))
     { }
 #endif
 
diff --git a/src/buffer.cpp b/src/buffer.cpp
index 6cc789653..5f9132257 100644
--- a/src/buffer.cpp
+++ b/src/buffer.cpp
@@ -19,14 +19,10 @@
  */
 
 #include "buffer.h"
+#include "debug.h"
 
 #include <sys/stat.h>
-#include <cstdio>
-#include <cstdlib>
 #include <fcntl.h>
-#include <string.h>
-#include <errno.h>
-#include <sstream>
 
 #ifndef _WIN32
 #  include <sys/mman.h>
diff --git a/src/buffer.h b/src/buffer.h
index b14e60919..339c0da5e 100644
--- a/src/buffer.h
+++ b/src/buffer.h
@@ -21,15 +21,10 @@
 #ifndef ZIM_BUFFER_H_
 #define ZIM_BUFFER_H_
 
-#include <cstddef>
-#include <exception>
 #include <memory>
-#include <iostream>
 
 #include "config.h"
 #include "zim_types.h"
-#include "endian_tools.h"
-#include "debug.h"
 #include <zim/blob.h>
 
 namespace zim {
diff --git a/src/bufferstreamer.h b/src/bufferstreamer.h
index ff447d97e..18f198221 100644
--- a/src/bufferstreamer.h
+++ b/src/bufferstreamer.h
@@ -21,6 +21,7 @@
 #define ZIM_BUFFERSTREAMER_H
 
 #include "debug.h"
+#include "endian_tools.h"
 
 #include <string.h>
 
diff --git a/src/cluster.cpp b/src/cluster.cpp
index 7ac93e359..f0e384297 100644
--- a/src/cluster.cpp
+++ b/src/cluster.cpp
@@ -23,15 +23,12 @@
 #include <zim/blob.h>
 #include <zim/error.h>
 #include "buffer_reader.h"
-#include "endian_tools.h"
 #include "bufferstreamer.h"
 #include "decoderstreamreader.h"
 #include "rawstreamreader.h"
 #include <algorithm>
 #include <stdlib.h>
-#include <sstream>
 
-#include "compression.h"
 #include "log.h"
 
 #include "config.h"
diff --git a/src/cluster.h b/src/cluster.h
index e8c966285..6d2932d31 100644
--- a/src/cluster.h
+++ b/src/cluster.h
@@ -26,14 +26,11 @@
 #include <zim/zim.h>
 #include "buffer.h"
 #include "zim_types.h"
-#include "file_reader.h"
-#include <iosfwd>
 #include <vector>
 #include <memory>
 #include <mutex>
 
 #include "zim_types.h"
-#include "zim/error.h"
 
 namespace zim
 {
diff --git a/src/compression.h b/src/compression.h
index c6e03e0bf..b8c898930 100644
--- a/src/compression.h
+++ b/src/compression.h
@@ -22,10 +22,8 @@
 #ifndef _LIBZIM_COMPRESSION_
 #define _LIBZIM_COMPRESSION_
 
-#include <vector>
-#include "string.h"
+#include "reader.h"
 
-#include "file_reader.h"
 #include <zim/error.h>
 
 #include "config.h"
@@ -36,6 +34,10 @@
 #include "zim_types.h"
 #include "constants.h"
 
+#include <cstring>
+#include <vector>
+#include <memory>
+
 //#define DEB(X) std::cerr << __func__ << " " << X << std::endl ;
 #define DEB(X)
 
diff --git a/src/dirent.cpp b/src/dirent.cpp
index 9c262121f..3316d36d2 100644
--- a/src/dirent.cpp
+++ b/src/dirent.cpp
@@ -24,9 +24,7 @@
 #include <zim/error.h>
 #include "buffer.h"
 #include "bufferstreamer.h"
-#include "endian_tools.h"
 #include "log.h"
-#include <algorithm>
 #include <cstring>
 
 log_define("zim.dirent")
diff --git a/src/dirent_accessor.h b/src/dirent_accessor.h
index 501e9b618..b9a3b3719 100644
--- a/src/dirent_accessor.h
+++ b/src/dirent_accessor.h
@@ -21,7 +21,6 @@
 #define ZIM_DIRENT_ACCESSOR_H
 
 #include "zim_types.h"
-#include "debug.h"
 #include "lrucache.h"
 
 #include <memory>
diff --git a/src/dirent_lookup.h b/src/dirent_lookup.h
index ffb76efaa..1a5215615 100644
--- a/src/dirent_lookup.h
+++ b/src/dirent_lookup.h
@@ -27,7 +27,6 @@
 #include <algorithm>
 #include <map>
 #include <mutex>
-#include <vector>
 #include <cassert>
 
 namespace zim
diff --git a/src/endian_tools.h b/src/endian_tools.h
index e51a58c99..fce33ba41 100644
--- a/src/endian_tools.h
+++ b/src/endian_tools.h
@@ -21,10 +21,10 @@
 #ifndef ENDIAN_H
 #define ENDIAN_H
 
-#include <algorithm>
-#include <iostream>
 #include <zim/zim.h>
 
+#include <cstddef>
+
 namespace zim
 {
 
diff --git a/src/entry.cpp b/src/entry.cpp
index e28b8788b..4d3e14a34 100644
--- a/src/entry.cpp
+++ b/src/entry.cpp
@@ -21,9 +21,7 @@
 #include <zim/entry.h>
 #include <zim/error.h>
 #include <zim/item.h>
-#include "_dirent.h"
 #include "fileimpl.h"
-#include "file_part.h"
 #include "log.h"
 
 #include <sstream>
diff --git a/src/file_compound.cpp b/src/file_compound.cpp
index a8f6bf1fa..c3fcd8262 100644
--- a/src/file_compound.cpp
+++ b/src/file_compound.cpp
@@ -19,7 +19,6 @@
  */
 
 #include "file_compound.h"
-#include "buffer.h"
 
 #include <errno.h>
 #include <string.h>
@@ -77,6 +76,22 @@ FileCompound::FileCompound(int fd):
 {
   addPart(new FilePart(fd));
 }
+
+FileCompound::FileCompound(FdInput fd):
+  _filename(),
+  _fsize(0)
+{
+  addPart(new FilePart(fd));
+}
+
+FileCompound::FileCompound(const std::vector<FdInput>& fds):
+  _filename(),
+  _fsize(0)
+{
+  for (auto& fd: fds) {
+    addPart(new FilePart(fd));
+  }
+}
 #endif
 
 FileCompound::~FileCompound() {
diff --git a/src/file_compound.h b/src/file_compound.h
index 1f56fd9f4..05fc13c38 100644
--- a/src/file_compound.h
+++ b/src/file_compound.h
@@ -25,8 +25,7 @@
 #include "zim_types.h"
 #include "debug.h"
 #include <map>
-#include <memory>
-#include <cstdio>
+#include <vector>
 
 namespace zim {
 
@@ -60,6 +59,8 @@ class FileCompound : private std::map<Range, FilePart*, less_range> {
 
 #ifndef _WIN32
     explicit FileCompound(int fd);
+    explicit FileCompound(FdInput fd);
+    explicit FileCompound(const std::vector<FdInput>& fds);
 #endif
 
     ~FileCompound();
diff --git a/src/file_part.h b/src/file_part.h
index 6362baf83..c2733423f 100644
--- a/src/file_part.h
+++ b/src/file_part.h
@@ -22,7 +22,6 @@
 #define ZIM_FILE_PART_H_
 
 #include <string>
-#include <cstdio>
 #include <memory>
 
 #include <zim/zim.h>
@@ -32,6 +31,14 @@
 
 namespace zim {
 
+/** A part of file.
+ *
+ * `FilePart` references a part(section) of a physical file.
+ * Most of the time, `FilePart` will reference the whole file (m_offset==0 and m_size==m_fhandle->getSize())
+ * but in some situation, it can reference only a part of the file:
+ * We have this case on android where the zim file is split in different part and stored in a "resource" (zip) archive
+ * using no-compression.
+ */
 class FilePart {
   typedef DEFAULTFS FS;
 
@@ -39,14 +46,21 @@ class FilePart {
     using FDSharedPtr = std::shared_ptr<FS::FD>;
 
   public:
-    FilePart(const std::string& filename) :
+    explicit FilePart(const std::string& filename) :
         m_filename(filename),
         m_fhandle(std::make_shared<FS::FD>(FS::openFile(filename))),
+        m_offset(0),
         m_size(m_fhandle->getSize()) {}
 
 #ifndef _WIN32
-    FilePart(int fd) :
+    explicit FilePart(int fd) :
         FilePart(getFilePathFromFD(fd)) {}
+
+    explicit FilePart(FdInput fdInput):
+        m_filename(getFilePathFromFD(fdInput.fd)),
+        m_fhandle(std::make_shared<FS::FD>(FS::openFile(m_filename))),
+        m_offset(fdInput.offset),
+        m_size(fdInput.size) {}
 #endif
 
     ~FilePart() = default;
@@ -55,13 +69,15 @@ class FilePart {
     const FDSharedPtr& shareable_fhandle() const { return m_fhandle; };
 
     zsize_t size() const { return m_size; };
+    offset_t offset() const { return m_offset; }
     bool fail() const { return !m_size; };
     bool good() const { return bool(m_size); };
 
   private:
     const std::string m_filename;
     FDSharedPtr m_fhandle;
-    zsize_t m_size;
+    offset_t m_offset;
+    zsize_t m_size; // The total size of the (starting at m_offset) of the part
 };
 
 };
diff --git a/src/file_reader.cpp b/src/file_reader.cpp
index cfabe335f..2fcf09661 100644
--- a/src/file_reader.cpp
+++ b/src/file_reader.cpp
@@ -66,11 +66,12 @@ char MultiPartFileReader::read(offset_t offset) const {
   offset += _offset;
   auto part_pair = source->locate(offset);
   auto& fhandle = part_pair->second->fhandle();
-  offset_t local_offset = offset - part_pair->first.min;
-  ASSERT(local_offset, <=, part_pair->first.max);
+  offset_t logical_local_offset = offset - part_pair->first.min;
+  ASSERT(logical_local_offset, <=, part_pair->first.max);
+  offset_t physical_local_offset = logical_local_offset + part_pair->second->offset();
   char ret;
   try {
-    fhandle.readAt(&ret, zsize_t(1), local_offset);
+    fhandle.readAt(&ret, zsize_t(1), physical_local_offset);
   } catch (std::runtime_error& e) {
     //Error while reading.
     std::ostringstream s;
@@ -79,7 +80,8 @@ char MultiPartFileReader::read(offset_t offset) const {
     s << " - File part size is " << part_pair->second->size().v << "\n";
     s << " - File part range is " << part_pair->first.min << "-" << part_pair->first.max << "\n";
     s << " - Reading offset at " << offset.v << "\n";
-    s << " - local offset is " << local_offset.v << "\n";
+    s << " - logical local offset is " << logical_local_offset.v << "\n";
+    s << " - physical local offset is " << physical_local_offset.v << "\n";
     s << " - error is " << strerror(errno) << "\n";
     std::error_code ec(errno, std::generic_category());
     throw std::system_error(ec, s.str());
@@ -98,11 +100,12 @@ void MultiPartFileReader::read(char* dest, offset_t offset, zsize_t size) const
   for(auto current = found_range.first; current!=found_range.second; current++){
     auto part = current->second;
     Range partRange = current->first;
-    offset_t local_offset = offset-partRange.min;
+    offset_t logical_local_offset = offset - partRange.min;
     ASSERT(size.v, >, 0U);
-    zsize_t size_to_get = zsize_t(std::min(size.v, part->size().v-local_offset.v));
+    zsize_t size_to_get = zsize_t(std::min(size.v, part->size().v-logical_local_offset.v));
+    offset_t physical_local_offset = logical_local_offset + part->offset();
     try {
-      part->fhandle().readAt(dest, size_to_get, local_offset);
+      part->fhandle().readAt(dest, size_to_get, physical_local_offset);
     } catch (std::runtime_error& e) {
       std::ostringstream s;
       s << "Cannot read chars.\n";
@@ -112,7 +115,8 @@ void MultiPartFileReader::read(char* dest, offset_t offset, zsize_t size) const
       s << " - size_to_get is " << size_to_get.v << "\n";
       s << " - total size is " << size.v << "\n";
       s << " - Reading offset at " << offset.v << "\n";
-      s << " - local offset is " << local_offset.v << "\n";
+      s << " - logical local offset is " << logical_local_offset.v << "\n";
+      s << " - physical local offset is " << physical_local_offset.v << "\n";
       s << " - error is " << strerror(errno) << "\n";
       std::error_code ec(errno, std::generic_category());
       throw std::system_error(ec, s.str());
@@ -189,10 +193,11 @@ const Buffer MultiPartFileReader::get_buffer(offset_t offset, zsize_t size) cons
     // The range is in only one part
     auto range = found_range.first->first;
     auto part = found_range.first->second;
-    auto local_offset = offset + _offset - range.min;
+    auto logical_local_offset = offset + _offset - range.min;
     ASSERT(size, <=, part->size());
     int fd = part->fhandle().getNativeHandle();
-    return Buffer::makeBuffer(makeMmappedBuffer(fd, local_offset, size), size);
+    auto physical_local_offset = logical_local_offset + part->offset();
+    return Buffer::makeBuffer(makeMmappedBuffer(fd, physical_local_offset, size), size);
   } catch(MMapException& e)
 #endif
   {
diff --git a/src/fileheader.h b/src/fileheader.h
index 95be6917b..468800e65 100644
--- a/src/fileheader.h
+++ b/src/fileheader.h
@@ -21,10 +21,8 @@
 #ifndef ZIM_FILEHEADER_H
 #define ZIM_FILEHEADER_H
 
-#include <memory>
 #include <zim/zim.h>
 #include <zim/uuid.h>
-#include <iosfwd>
 #include <limits>
 
 // max may be defined as a macro by window includes
diff --git a/src/fileimpl.cpp b/src/fileimpl.cpp
index 152f98aa0..7882d381b 100644
--- a/src/fileimpl.cpp
+++ b/src/fileimpl.cpp
@@ -27,7 +27,6 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sstream>
-#include <errno.h>
 #include <cstring>
 #include <fstream>
 #include <numeric>
@@ -67,17 +66,15 @@ sectionSubReader(const Reader& zimReader, const std::string& sectionName,
 }
 
 std::shared_ptr<Reader>
-makeFileReader(std::shared_ptr<const FileCompound> zimFile, offset_t offset, zsize_t size)
+makeFileReader(std::shared_ptr<const FileCompound> zimFile)
 {
   if (zimFile->fail()) {
     return nullptr;
   } else if ( zimFile->is_multiPart() ) {
-    ASSERT(offset.v, ==, 0u);
-    ASSERT(size, ==, zimFile->fsize());
     return std::make_shared<MultiPartFileReader>(zimFile);
   } else {
     const auto& firstAndOnlyPart = zimFile->begin()->second;
-    return std::make_shared<FileReader>(firstAndOnlyPart->shareable_fhandle(), offset, size);
+    return std::make_shared<FileReader>(firstAndOnlyPart->shareable_fhandle(), firstAndOnlyPart->offset(), firstAndOnlyPart->size());
   }
 }
 
@@ -172,19 +169,18 @@ class Grouping
     : FileImpl(std::make_shared<FileCompound>(fd))
   {}
 
-  FileImpl::FileImpl(int fd, offset_t offset, zsize_t size)
-    : FileImpl(std::make_shared<FileCompound>(fd), offset, size)
+  FileImpl::FileImpl(FdInput fd)
+    : FileImpl(std::make_shared<FileCompound>(fd))
   {}
-#endif
 
-  FileImpl::FileImpl(std::shared_ptr<FileCompound> _zimFile)
-    : FileImpl(_zimFile, offset_t(0), _zimFile->fsize())
+  FileImpl::FileImpl(const std::vector<FdInput>& fds)
+    : FileImpl(std::make_shared<FileCompound>(fds))
   {}
+#endif
 
-  FileImpl::FileImpl(std::shared_ptr<FileCompound> _zimFile, offset_t offset, zsize_t size)
+  FileImpl::FileImpl(std::shared_ptr<FileCompound> _zimFile)
     : zimFile(_zimFile),
-      archiveStartOffset(offset),
-      zimReader(makeFileReader(zimFile, offset, size)),
+      zimReader(makeFileReader(zimFile)),
       direntReader(new DirentReader(zimReader)),
       clusterCache(envValue("ZIM_CLUSTERCACHE", CLUSTER_CACHE_SIZE)),
       m_newNamespaceScheme(false),
diff --git a/src/fileimpl.h b/src/fileimpl.h
index cc85c46d6..b07d2c7f1 100644
--- a/src/fileimpl.h
+++ b/src/fileimpl.h
@@ -24,17 +24,14 @@
 
 #include <string>
 #include <vector>
-#include <map>
 #include <memory>
 #include <zim/zim.h>
 #include <mutex>
-#include "lrucache.h"
 #include "concurrent_cache.h"
 #include "_dirent.h"
 #include "dirent_accessor.h"
 #include "dirent_lookup.h"
 #include "cluster.h"
-#include "buffer.h"
 #include "file_reader.h"
 #include "file_compound.h"
 #include "fileheader.h"
@@ -47,7 +44,6 @@ namespace zim
   class FileImpl
   {
       std::shared_ptr<FileCompound> zimFile;
-      offset_t archiveStartOffset;
       std::shared_ptr<Reader> zimReader;
       std::shared_ptr<DirentReader> direntReader;
       Fileheader header;
@@ -104,10 +100,10 @@ namespace zim
       explicit FileImpl(const std::string& fname);
 #ifndef _WIN32
       explicit FileImpl(int fd);
-      FileImpl(int fd, offset_t offset, zsize_t size);
+      explicit FileImpl(FdInput fd);
+      explicit FileImpl(const std::vector<FdInput>& fds);
 #endif
 
-      offset_t getArchiveStartOffset() const { return archiveStartOffset; }
       time_t getMTime() const;
 
       const std::string& getFilename() const   { return zimFile->filename(); }
diff --git a/src/fs_unix.cpp b/src/fs_unix.cpp
index 6ac076750..872393d3e 100644
--- a/src/fs_unix.cpp
+++ b/src/fs_unix.cpp
@@ -19,7 +19,6 @@
 
 #include "fs_unix.h"
 #include <stdexcept>
-#include <vector>
 #include <sstream>
 
 #include <sys/types.h>
diff --git a/src/fs_unix.h b/src/fs_unix.h
index 51aab05ac..f45826aa2 100644
--- a/src/fs_unix.h
+++ b/src/fs_unix.h
@@ -22,8 +22,6 @@
 
 #include "zim_types.h"
 
-#include <stdexcept>
-
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
diff --git a/src/fs_windows.h b/src/fs_windows.h
index 9e4ae07f1..25521545f 100644
--- a/src/fs_windows.h
+++ b/src/fs_windows.h
@@ -22,7 +22,6 @@
 
 #include "zim_types.h"
 
-#include <stdexcept>
 #include <memory>
 
 typedef void* HANDLE;
diff --git a/src/istreamreader.h b/src/istreamreader.h
index 4255d3f33..0d55186c6 100644
--- a/src/istreamreader.h
+++ b/src/istreamreader.h
@@ -21,12 +21,11 @@
 #ifndef ZIM_IDATASTREAM_H
 #define ZIM_IDATASTREAM_H
 
-#include <exception>
-#include <memory>
-
 #include "endian_tools.h"
 #include "reader.h"
 
+#include <memory>
+
 namespace zim
 {
 
diff --git a/src/item.cpp b/src/item.cpp
index 931ba47e8..ff70828ff 100644
--- a/src/item.cpp
+++ b/src/item.cpp
@@ -22,9 +22,10 @@
 #include <zim/item.h>
 #include "cluster.h"
 #include "fileimpl.h"
-#include "file_part.h"
 #include "log.h"
 
+#include <cassert>
+
 log_define("zim.item")
 
 using namespace zim;
@@ -70,8 +71,6 @@ std::pair<std::string, offset_type> Item::getDirectAccessInformation() const
   auto full_offset = m_file->getBlobOffset(m_dirent->getClusterNumber(),
                                          m_dirent->getBlobNumber());
 
-  full_offset += m_file->getArchiveStartOffset().v;
-
   auto part_its = m_file->getFileParts(full_offset, zsize_t(getSize()));
   auto first_part = part_its.first;
   if (++part_its.first != part_its.second) {
@@ -80,8 +79,9 @@ std::pair<std::string, offset_type> Item::getDirectAccessInformation() const
   }
   auto range = first_part->first;
   auto part = first_part->second;
-  const offset_type local_offset(full_offset - range.min);
-  return std::make_pair(part->filename(), local_offset);
+  const offset_type logical_local_offset(full_offset - range.min);
+  const auto physical_local_offset = logical_local_offset + part->offset().v;
+  return std::make_pair(part->filename(), physical_local_offset);
 }
 
 cluster_index_type Item::getClusterIndex() const
diff --git a/src/narrowdown.h b/src/narrowdown.h
index 361a07840..6ce4caf73 100644
--- a/src/narrowdown.h
+++ b/src/narrowdown.h
@@ -21,7 +21,6 @@
 #ifndef ZIM_NARROWDOWN_H
 #define ZIM_NARROWDOWN_H
 
-#include "zim_types.h"
 #include "debug.h"
 
 #include <algorithm>
diff --git a/src/rawstreamreader.h b/src/rawstreamreader.h
index 43596fcc7..504f67e63 100644
--- a/src/rawstreamreader.h
+++ b/src/rawstreamreader.h
@@ -23,7 +23,6 @@
 
 #include "istreamreader.h"
 #include "reader.h"
-#include "debug.h"
 
 namespace zim
 {
diff --git a/src/search.cpp b/src/search.cpp
index d0e9e710f..cac358531 100644
--- a/src/search.cpp
+++ b/src/search.cpp
@@ -27,7 +27,6 @@
 #include <zim/item.h>
 #include "fileimpl.h"
 #include "search_internal.h"
-#include "fs.h"
 #include "tools.h"
 
 #include <sstream>
@@ -39,7 +38,6 @@
 #else
 # include <io.h>
 #endif
-#include <errno.h>
 
 #include "xapian.h"
 #include <unicode/locid.h>
diff --git a/src/suggestion.cpp b/src/suggestion.cpp
index 8ed711714..33305c662 100644
--- a/src/suggestion.cpp
+++ b/src/suggestion.cpp
@@ -22,7 +22,6 @@
 #include <zim/suggestion.h>
 #include <zim/item.h>
 #include "suggestion_internal.h"
-#include <iostream>
 #include "fileimpl.h"
 #include "tools.h"
 #include "constants.h"
diff --git a/src/tools.cpp b/src/tools.cpp
index 58894f384..17ef33697 100644
--- a/src/tools.cpp
+++ b/src/tools.cpp
@@ -28,11 +28,9 @@
 #include <stdio.h>
 #include <sys/stat.h>
 #include <fcntl.h>
-#include <memory>
 #include <mutex>
 #include <stdexcept>
 #include <random>
-#include <errno.h>
 #include <sstream>
 
 #ifdef _WIN32
diff --git a/test/archive.cpp b/test/archive.cpp
index 838c4551b..5a1d57d03 100644
--- a/test/archive.cpp
+++ b/test/archive.cpp
@@ -624,7 +624,39 @@ TEST(ZimArchive, openZIMFileEmbeddedInAnotherFile)
   for(auto i=0UL; i < normalZims.size(); i++) {
     const zim::Archive archive1(normalZims[i].path);
     const int fd = OPEN_READ_ONLY(embeddedZims[i].path);
-    const zim::Archive archive2(fd, 8, archive1.getFilesize());
+    const zim::Archive archive2(zim::FdInput(fd, 8, archive1.getFilesize()));
+    close(fd);
+
+    checkEquivalence(archive1, archive2);
+  }
+}
+
+TEST(ZimArchive, openZIMFileMultiPartEmbeddedInAnotherFile)
+{
+  auto normalZims = getDataFilePath("small.zim");
+  auto embeddedZims = getDataFilePath("small.zim.embedded.multi");
+
+  ASSERT_EQ(normalZims.size(), embeddedZims.size()) << "We must have same number of zim files. (This is a test data issue)";
+  for(auto i=0UL; i < normalZims.size(); i++) {
+    const zim::Archive archive1(normalZims[i].path);
+    auto archive_size = archive1.getFilesize();
+
+    std::vector<zim::FdInput> fds;
+    zim::offset_type start_offset = std::string("BEGINZIMMULTIPART").size();
+    while (archive_size > 2048) {
+      int fd = OPEN_READ_ONLY(embeddedZims[i].path);
+      fds.push_back(zim::FdInput(fd, start_offset, 2048));
+      start_offset += 2048 + std::string("NEWSECTIONZIMMULTI").size();
+      archive_size -= 2048;
+    }
+    int fd = OPEN_READ_ONLY(embeddedZims[i].path);
+    fds.push_back(zim::FdInput(fd, start_offset, archive_size));
+
+    const zim::Archive archive2(fds);
+
+    for(auto &fd: fds) {
+      close(fd.fd);
+    }
 
     checkEquivalence(archive1, archive2);
   }
@@ -693,7 +725,7 @@ TEST(ZimArchive, getDirectAccessInformationFromEmbeddedArchive)
   for(auto i=0UL; i < normalZims.size(); i++) {
     const int fd = OPEN_READ_ONLY(embeddedZims[i].path);
     const auto size = zim::DEFAULTFS::openFile(normalZims[i].path).getSize();
-    const zim::Archive archive(fd, 8, size.v);
+    const zim::Archive archive(zim::FdInput(fd, 8, size.v));
     zim::entry_index_type checkedItemCount = 0;
     for ( auto entry : archive.iterEfficient() ) {
       if (!entry.isRedirect()) {
diff --git a/test/cluster.cpp b/test/cluster.cpp
index bc5993044..f97b83aa0 100644
--- a/test/cluster.cpp
+++ b/test/cluster.cpp
@@ -49,7 +49,7 @@
 
 #include "../src/buffer.h"
 #include "../src/cluster.h"
-#include "../src/file_part.h"
+#include "../src/file_reader.h"
 #include "../src/file_compound.h"
 #include "../src/buffer_reader.h"
 #include "../src/writer/cluster.h"
diff --git a/test/creator.cpp b/test/creator.cpp
index db13e8c12..b884dce83 100644
--- a/test/creator.cpp
+++ b/test/creator.cpp
@@ -22,6 +22,7 @@
 #include <zim/writer/item.h>
 #include <zim/writer/contentProvider.h>
 #include <zim/archive.h>
+#include <zim/error.h>
 
 #include "tools.h"
 #include "../src/file_compound.h"
diff --git a/test/tools.h b/test/tools.h
index 5ca1e2398..e65a1afed 100644
--- a/test/tools.h
+++ b/test/tools.h
@@ -22,7 +22,7 @@
 
 
 #include <string>
-#include <vector>
+#include <sstream>
 #include <sys/types.h>
 #ifdef _WIN32
 #include <windows.h>