Include rearrangement: rest

Change-Id: If9b5502ff348d358d7007b885e26e98a0d228f39

tests/unit/libutil/async-collect.cc

@@ -1,4 +1,4 @@
-#include "async-collect.hh"
+#include "lix/libutil/async-collect.hh"
 
 #include <gtest/gtest.h>
 #include <kj/array.h>

tests/unit/libutil/async-semaphore.cc

@@ -1,4 +1,4 @@
-#include "async-semaphore.hh"
+#include "lix/libutil/async-semaphore.hh"
 
 #include <gtest/gtest.h>
 #include <kj/async.h>

tests/unit/libutil/canon-path.cc

@@ -1,4 +1,4 @@
-#include "canon-path.hh"
+#include "lix/libutil/canon-path.hh"
 
 #include <gtest/gtest.h>
 

tests/unit/libutil/checked-arithmetic.cc

@@ -5,7 +5,7 @@
 #include <rapidcheck/gtest.h>
 #include <rapidcheck/gen/Arbitrary.hpp>
 
-#include <checked-arithmetic.hh>
+#include "lix/libutil/checked-arithmetic.hh"
 
 #include "tests/gtest-with-params.hh"
 

tests/unit/libutil/chunked-vector.cc

@@ -1,4 +1,4 @@
-#include "chunked-vector.hh"
+#include "lix/libutil/chunked-vector.hh"
 
 #include <gtest/gtest.h>
 

tests/unit/libutil/closure.cc

@@ -1,4 +1,4 @@
-#include "closure.hh"
+#include "lix/libutil/closure.hh"
 #include <gtest/gtest.h>
 
 namespace nix {

tests/unit/libutil/compression.cc

@@ -1,4 +1,4 @@
-#include "compression.hh"
+#include "lix/libutil/compression.hh"
 #include <cstddef>
 #include <gtest/gtest.h>
 

tests/unit/libutil/config.cc

@@ -1,8 +1,8 @@
-#include "config.hh"
-#include "args.hh"
-#include "file-system.hh"
-#include "environment-variables.hh"
-#include "logging.hh"
+#include "lix/libutil/config.hh"
+#include "lix/libutil/args.hh"
+#include "lix/libutil/file-system.hh"
+#include "lix/libutil/environment-variables.hh"
+#include "lix/libutil/logging.hh"
 #include "tests/test-data.hh"
 
 #include <sstream>

tests/unit/libutil/escape-string.cc

@@ -1,5 +1,5 @@
-#include "escape-string.hh"
-#include "ansicolor.hh"
+#include "lix/libutil/escape-string.hh"
+#include "lix/libutil/ansicolor.hh"
 #include <gtest/gtest.h>
 
 namespace nix {

tests/unit/libutil/generator.cc

@@ -1,4 +1,4 @@
-#include "generator.hh"
+#include "lix/libutil/generator.hh"
 
 #include <concepts>
 #include <cstdint>

tests/unit/libutil/git.cc

@@ -1,4 +1,4 @@
-#include "git.hh"
+#include "lix/libutil/git.hh"
 #include <gtest/gtest.h>
 
 namespace nix {

tests/unit/libutil/hash.cc

@@ -2,7 +2,7 @@
 
 #include <gtest/gtest.h>
 
-#include "hash.hh"
+#include "lix/libutil/hash.hh"
 
 namespace nix {
 

tests/unit/libutil/hilite.cc

@@ -1,4 +1,4 @@
-#include "hilite.hh"
+#include "lix/libutil/hilite.hh"
 
 #include <gtest/gtest.h>
 

tests/unit/libutil/json-utils.cc

@@ -3,7 +3,7 @@
 
 #include <gtest/gtest.h>
 
-#include "json-utils.hh"
+#include "lix/libutil/json-utils.hh"
 
 namespace nix {
 

tests/unit/libutil/lru-cache.cc

@@ -1,4 +1,4 @@
-#include "lru-cache.hh"
+#include "lix/libutil/lru-cache.hh"
 #include <gtest/gtest.h>
 
 namespace nix {

tests/unit/libutil/paths-setting.cc

@@ -1,4 +1,4 @@
-#include "config.hh"
+#include "lix/libutil/config.hh"
 
 #include <gtest/gtest.h>
 #include <gmock/gmock.h>

tests/unit/libutil/pool.cc

@@ -1,4 +1,4 @@
-#include "pool.hh"
+#include "lix/libutil/pool.hh"
 #include <gtest/gtest.h>
 
 namespace nix {

tests/unit/libutil/references.cc

@@ -1,5 +1,5 @@
-#include "references.hh"
-#include "strings.hh"
+#include "lix/libutil/references.hh"
+#include "lix/libutil/strings.hh"
 #include <gtest/gtest.h>
 
 namespace nix {

tests/unit/libutil/serialise.cc

@@ -1,10 +1,10 @@
-#include "serialise.hh"
-#include "error.hh"
-#include "fmt.hh"
-#include "pos-table.hh"
-#include "generator.hh"
-#include "ref.hh"
-#include "types.hh"
+#include "lix/libutil/serialise.hh"
+#include "lix/libutil/error.hh"
+#include "lix/libutil/fmt.hh"
+#include "lix/libexpr/pos-table.hh"
+#include "lix/libutil/generator.hh"
+#include "lix/libutil/ref.hh"
+#include "lix/libutil/types.hh"
 
 #include <concepts>
 #include <cstdint>

tests/unit/libutil/suggestions.cc

@@ -1,4 +1,4 @@
-#include "suggestions.hh"
+#include "lix/libutil/suggestions.hh"
 #include <gtest/gtest.h>
 
 namespace nix {

tests/unit/libutil/tests.cc

@@ -1,8 +1,8 @@
-#include "file-system.hh"
-#include "processes.hh"
-#include "strings.hh"
-#include "types.hh"
-#include "terminal.hh"
+#include "lix/libutil/file-system.hh"
+#include "lix/libutil/processes.hh"
+#include "lix/libutil/strings.hh"
+#include "lix/libutil/types.hh"
+#include "lix/libutil/terminal.hh"
 
 #include <gtest/gtest.h>
 

tests/unit/libutil/url-name.cc

@@ -1,4 +1,4 @@
-#include "url-name.hh"
+#include "lix/libutil/url-name.hh"
 #include <gtest/gtest.h>
 
 namespace nix {

tests/unit/libutil/url.cc

@@ -1,5 +1,5 @@
-#include "url.hh"
-#include "types.hh"
+#include "lix/libutil/url.hh"
+#include "lix/libutil/types.hh"
 #include <gtest/gtest.h>
 
 namespace nix {

tests/unit/libutil/xml-writer.cc

@@ -1,4 +1,4 @@
-#include "xml-writer.hh"
+#include "lix/libutil/xml-writer.hh"
 #include <gtest/gtest.h>
 #include <sstream>