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 -#include -#include -#include -#include #include -#include -#include -#include -#include #include #if ENABLE_S3 @@ -44,8 +17,6 @@ #include #include -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 #include #include -#include namespace nix {