diff --git a/lix/legacy/nix-build.cc b/lix/legacy/nix-build.cc index ebaf4f37e..2e8a0767e 100644 --- a/lix/legacy/nix-build.cc +++ b/lix/legacy/nix-build.cc @@ -7,8 +7,6 @@ #include #include -#include - #include "lix/libstore/parsed-derivations.hh" #include "lix/libstore/store-api.hh" #include "lix/libstore/local-fs-store.hh" diff --git a/lix/libcmd/command.cc b/lix/libcmd/command.cc index b2e94df8f..850bc1891 100644 --- a/lix/libcmd/command.cc +++ b/lix/libcmd/command.cc @@ -6,8 +6,6 @@ #include "lix/libstore/profiles.hh" #include "lix/libcmd/repl.hh" -#include - extern char * * environ __attribute__((weak)); namespace nix { diff --git a/lix/libcmd/installable-attr-path.cc b/lix/libcmd/installable-attr-path.cc index 11035206c..8d733abc4 100644 --- a/lix/libcmd/installable-attr-path.cc +++ b/lix/libcmd/installable-attr-path.cc @@ -7,8 +7,6 @@ #include "lix/libexpr/get-drvs.hh" #include "lix/libexpr/flake/flake.hh" -#include - namespace nix { InstallableAttrPath::InstallableAttrPath( diff --git a/lix/libcmd/installable-attr-path.hh b/lix/libcmd/installable-attr-path.hh index ce76307e6..3e50c92a2 100644 --- a/lix/libcmd/installable-attr-path.hh +++ b/lix/libcmd/installable-attr-path.hh @@ -8,8 +8,6 @@ #include "lix/libcmd/common-eval-args.hh" #include "lix/libexpr/eval.hh" -#include - namespace nix { class InstallableAttrPath : public InstallableValue diff --git a/lix/libcmd/installables.cc b/lix/libcmd/installables.cc index ec9a1693c..5111a48ba 100644 --- a/lix/libcmd/installables.cc +++ b/lix/libcmd/installables.cc @@ -20,8 +20,6 @@ #include "lix/libstore/build-result.hh" -#include - namespace nix { void completeFlakeInputPath( diff --git a/lix/libexpr/value/context.hh b/lix/libexpr/value/context.hh index a9fecce86..bc48b66fa 100644 --- a/lix/libexpr/value/context.hh +++ b/lix/libexpr/value/context.hh @@ -5,8 +5,6 @@ #include "lix/libstore/derived-path.hh" #include "lix/libutil/variant-wrapper.hh" -#include - namespace nix { class BadNixStringContextElem : public Error diff --git a/lix/libstore/remote-store.cc b/lix/libstore/remote-store.cc index a120cf8d1..6f2d61f18 100644 --- a/lix/libstore/remote-store.cc +++ b/lix/libstore/remote-store.cc @@ -25,7 +25,6 @@ #include "lix/libutil/types.hh" #include -#include #include #include diff --git a/lix/libstore/serve-protocol.cc b/lix/libstore/serve-protocol.cc index 04b35c99f..4521d0984 100644 --- a/lix/libstore/serve-protocol.cc +++ b/lix/libstore/serve-protocol.cc @@ -6,8 +6,6 @@ #include "lix/libstore/serve-protocol-impl.hh" #include "lix/libstore/path-info.hh" -#include - namespace nix { /* protocol-specific definitions */ diff --git a/lix/libstore/worker-protocol.cc b/lix/libstore/worker-protocol.cc index a81c79bd2..21e21fbde 100644 --- a/lix/libstore/worker-protocol.cc +++ b/lix/libstore/worker-protocol.cc @@ -7,8 +7,6 @@ #include "lix/libutil/archive.hh" #include "lix/libstore/path-info.hh" -#include - namespace nix { /* protocol-specific definitions */ diff --git a/lix/nix/config.cc b/lix/nix/config.cc index f33901c2a..814b028fb 100644 --- a/lix/nix/config.cc +++ b/lix/nix/config.cc @@ -4,8 +4,6 @@ #include "lix/libstore/store-api.hh" #include "config.hh" -#include - namespace nix { struct CmdConfig : MultiCommand diff --git a/lix/nix/eval.cc b/lix/nix/eval.cc index d08530c4a..25ebcbe25 100644 --- a/lix/nix/eval.cc +++ b/lix/nix/eval.cc @@ -8,8 +8,6 @@ #include "lix/libexpr/value-to-json.hh" #include "eval.hh" -#include - namespace nix { struct CmdEval : MixJSON, InstallableCommand, MixReadOnlyOption diff --git a/lix/nix/ls.cc b/lix/nix/ls.cc index 981e3f035..dcdd035ae 100644 --- a/lix/nix/ls.cc +++ b/lix/nix/ls.cc @@ -3,7 +3,6 @@ #include "lix/libstore/fs-accessor.hh" #include "lix/libstore/nar-accessor.hh" #include "lix/libmain/common-args.hh" -#include namespace nix { diff --git a/lix/nix/path-info.cc b/lix/nix/path-info.cc index 6ae313ef1..c258f1050 100644 --- a/lix/nix/path-info.cc +++ b/lix/nix/path-info.cc @@ -8,8 +8,6 @@ #include #include -#include - namespace nix { struct CmdPathInfo : StorePathsCommand, MixJSON diff --git a/lix/nix/profile.cc b/lix/nix/profile.cc index ea44ed178..58bdb80d8 100644 --- a/lix/nix/profile.cc +++ b/lix/nix/profile.cc @@ -13,7 +13,6 @@ #include "lix/libstore/names.hh" #include "profile.hh" -#include #include #include diff --git a/tests/unit/libexpr/derived-path.cc b/tests/unit/libexpr/derived-path.cc index eba295e2c..df2006e23 100644 --- a/tests/unit/libexpr/derived-path.cc +++ b/tests/unit/libexpr/derived-path.cc @@ -1,4 +1,3 @@ -#include #include #include diff --git a/tests/unit/libexpr/value/context.cc b/tests/unit/libexpr/value/context.cc index 761286dbd..864e48a33 100644 --- a/tests/unit/libexpr/value/context.cc +++ b/tests/unit/libexpr/value/context.cc @@ -1,4 +1,3 @@ -#include #include #include diff --git a/tests/unit/libstore/common-protocol.cc b/tests/unit/libstore/common-protocol.cc index ac01aa4be..61ad09e89 100644 --- a/tests/unit/libstore/common-protocol.cc +++ b/tests/unit/libstore/common-protocol.cc @@ -1,6 +1,5 @@ #include -#include #include #include "lix/libstore/common-protocol.hh" diff --git a/tests/unit/libstore/path.cc b/tests/unit/libstore/path.cc index 830f2828f..25887c858 100644 --- a/tests/unit/libstore/path.cc +++ b/tests/unit/libstore/path.cc @@ -1,6 +1,5 @@ #include -#include #include #include diff --git a/tests/unit/libstore/protocol.hh b/tests/unit/libstore/protocol.hh index 7c22f1c1d..48082c9af 100644 --- a/tests/unit/libstore/protocol.hh +++ b/tests/unit/libstore/protocol.hh @@ -1,4 +1,3 @@ -#include #include #include "lix/libutil/strings.hh" diff --git a/tests/unit/libstore/serve-protocol.cc b/tests/unit/libstore/serve-protocol.cc index e315d42fe..c3638f898 100644 --- a/tests/unit/libstore/serve-protocol.cc +++ b/tests/unit/libstore/serve-protocol.cc @@ -1,6 +1,5 @@ #include -#include #include #include "lix/libstore/serve-protocol.hh" diff --git a/tests/unit/libstore/worker-protocol.cc b/tests/unit/libstore/worker-protocol.cc index 8802b72a7..e7adcd1d8 100644 --- a/tests/unit/libstore/worker-protocol.cc +++ b/tests/unit/libstore/worker-protocol.cc @@ -1,6 +1,5 @@ #include -#include #include #include "lix/libstore/worker-protocol.hh"