diff --git a/src/XrdCl/XrdClZipArchive.hh b/src/XrdCl/XrdClZipArchive.hh
index 04864b27a16..756dcc53155 100644
--- a/src/XrdCl/XrdClZipArchive.hh
+++ b/src/XrdCl/XrdClZipArchive.hh
@@ -25,8 +25,6 @@
 #ifndef SRC_XRDZIP_XRDZIPARCHIVE_HH_
 #define SRC_XRDZIP_XRDZIPARCHIVE_HH_
 
-#include "XrdCl/XrdClXRootDResponses.hh"
-#include "XrdCl/XrdClOperations.hh"
 #include "XrdCl/XrdClFile.hh"
 #include "XrdCl/XrdClResponseJob.hh"
 #include "XrdCl/XrdClJobManager.hh"
diff --git a/src/XrdEc/XrdEcReader.hh b/src/XrdEc/XrdEcReader.hh
index dc86f8a406b..b311244592d 100644
--- a/src/XrdEc/XrdEcReader.hh
+++ b/src/XrdEc/XrdEcReader.hh
@@ -26,7 +26,9 @@
 #define SRC_XRDEC_XRDECREADER_HH_
 
 #include "XrdEc/XrdEcObjCfg.hh"
+
 #include "XrdCl/XrdClZipArchive.hh"
+#include "XrdCl/XrdClOperations.hh"
 
 #include <string>
 #include <unordered_map>
diff --git a/src/XrdEc/XrdEcStrmWriter.cc b/src/XrdEc/XrdEcStrmWriter.cc
index 994888dfc1f..f0abbfb1a78 100644
--- a/src/XrdEc/XrdEcStrmWriter.cc
+++ b/src/XrdEc/XrdEcStrmWriter.cc
@@ -27,6 +27,11 @@
 
 #include "XrdOuc/XrdOucCRC32C.hh"
 
+#include "XrdZip/XrdZipLFH.hh"
+#include "XrdZip/XrdZipCDFH.hh"
+#include "XrdZip/XrdZipEOCD.hh"
+#include "XrdZip/XrdZipUtils.hh"
+
 #include <numeric>
 #include <algorithm>
 #include <future>
diff --git a/src/XrdEc/XrdEcStrmWriter.hh b/src/XrdEc/XrdEcStrmWriter.hh
index aa0006b79f7..c71e14200d8 100644
--- a/src/XrdEc/XrdEcStrmWriter.hh
+++ b/src/XrdEc/XrdEcStrmWriter.hh
@@ -32,11 +32,6 @@
 #include "XrdCl/XrdClParallelOperation.hh"
 #include "XrdCl/XrdClZipOperations.hh"
 
-#include "XrdZip/XrdZipLFH.hh"
-#include "XrdZip/XrdZipCDFH.hh"
-#include "XrdZip/XrdZipEOCD.hh"
-#include "XrdZip/XrdZipUtils.hh"
-
 #include <random>
 #include <chrono>
 #include <future>
@@ -261,7 +256,7 @@ namespace XrdEc
       //!
       //! @return : the buffer with metadata
       //-----------------------------------------------------------------------
-      XrdZip::buffer_t GetMetadataBuffer();
+      std::vector<char> GetMetadataBuffer();
 
       //-----------------------------------------------------------------------
       //! Close the data object (implementation)
@@ -274,7 +269,7 @@ namespace XrdEc
       std::unique_ptr<WrtBuff>                         wrtbuff;            //< current write buffer
       std::vector<std::shared_ptr<XrdCl::ZipArchive>>  dataarchs;          //< ZIP archives with data
       std::vector<std::shared_ptr<XrdCl::File>>        metadataarchs;      //< ZIP archives with metadata
-      std::vector<XrdZip::buffer_t>                    cdbuffs;            //< buffers with CDs
+      std::vector<std::vector<char>>                   cdbuffs;            //< buffers with CDs
       buff_queue                                       buffers;            //< queue of buffer for writing
                                                                            //< (waiting to be erasure coded)
       std::atomic<bool>                                writer_thread_stop; //< true if the writer thread should be stopped,
diff --git a/src/XrdEc/XrdEcUtilities.hh b/src/XrdEc/XrdEcUtilities.hh
index f09a8690425..bc53634a481 100644
--- a/src/XrdEc/XrdEcUtilities.hh
+++ b/src/XrdEc/XrdEcUtilities.hh
@@ -30,10 +30,7 @@
 #include "XrdCl/XrdClXRootDResponses.hh"
 #include "XrdCl/XrdClFileSystem.hh"
 
-#include "XrdCl/XrdClDefaultEnv.hh"
-#include "XrdCl/XrdClCheckSumManager.hh"
 #include "XrdCl/XrdClUtils.hh"
-#include "XrdCks/XrdCksCalc.hh"
 
 #include <exception>
 #include <memory>