From d4e445f2510645129c4888bdea89d2c344701306 Mon Sep 17 00:00:00 2001
From: Qyriad <qyriad@qyriad.me>
Date: Wed, 1 Jul 2026 12:36:03 +0200
Subject: [PATCH] =?UTF-8?q?libstore/filetransfer:=20re=C3=B6rganize=20incl?=
 =?UTF-8?q?udes?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I74310683b6e721f3ad0a7b2e2e2aa28c6a6a6964
---
 lix/libstore/filetransfer.cc | 35 +++--------------------------------
 lix/libstore/filetransfer.hh |  1 -
 2 files changed, 3 insertions(+), 33 deletions(-)

diff --git a/lix/libstore/filetransfer.cc b/lix/libstore/filetransfer.cc
index 53c547598..6457f0d0d 100644
--- a/lix/libstore/filetransfer.cc
+++ b/lix/libstore/filetransfer.cc
@@ -1,38 +1,11 @@
+#include "lix/libstore/curlfiletransfer.hh"
 #include "lix/libstore/curlmulti.hh"
 #include "lix/libstore/filetransfer.hh"
-#include "lix/libstore/curlfiletransfer.hh"
-#include "lix/libutil/file-system.hh"
-#include "lix/libstore/transferitem.hh"
-#include "lix/libutil/async-io.hh"
-#include "lix/libutil/async.hh"
-#include "lix/libutil/c-calls.hh"
-#include "lix/libutil/error.hh"
-#include "lix/libutil/logging.hh"
-#include "lix/libutil/namespaces.hh"
-#include "lix/libstore/globals.hh"
-#include "lix/libstore/store-api.hh"
-#include "lix/libstore/s3.hh"
-#include "lix/libutil/regex.hh"
-#include "lix/libutil/result.hh"
-#include "lix/libutil/signals.hh"
-#include "lix/libutil/strings.hh"
-#include "lix/libutil/thread-name.hh"
-#include "lix/libutil/tracepoint.hh"
-#include "lix/libutil/backoff.hh"
+#include "lix/libutil/ref.hh"
 
-#if ENABLE_DTRACE
-#include "trace-probes.gen.hh"
-#endif
+#include <optional>
 
-#include <cstddef>
-#include <cstdio>
-#include <cstring>
-#include <exception>
 #include <fcntl.h>
-#include <memory>
-#include <mutex>
-#include <regex>
-#include <thread>
 #include <unistd.h>
 
 #if ENABLE_S3
@@ -44,8 +17,6 @@
 #include <kj/encoding.h>
 #include <kj/time.h>
 
-using namespace std::string_literals;
-
 namespace nix {
 
 FileTransferSettings fileTransferSettings;
diff --git a/lix/libstore/filetransfer.hh b/lix/libstore/filetransfer.hh
index aeb5d7e0b..a15cfd961 100644
--- a/lix/libstore/filetransfer.hh
+++ b/lix/libstore/filetransfer.hh
@@ -14,7 +14,6 @@
 #include <kj/async.h>
 #include <curl/curl.h>
 #include <string>
-#include <future>
 
 namespace nix {