diff --git a/src/libmain/loggers.cc b/src/libmain/loggers.cc
index ee3836382fa4e6b82e7dd48092419dc286aa84fb..41f0b35fb3cfa44d9a728a5dbe4ec4a61bdf4d52 100644
--- a/src/libmain/loggers.cc
+++ b/src/libmain/loggers.cc
@@ -1,5 +1,5 @@
 #include "loggers.hh"
-#include "../nix/progress-bar.hh"
+#include "progress-bar.hh"
 
 namespace nix {
 
diff --git a/src/nix/progress-bar.cc b/src/libmain/progress-bar.cc
similarity index 100%
rename from src/nix/progress-bar.cc
rename to src/libmain/progress-bar.cc
diff --git a/src/nix/progress-bar.hh b/src/libmain/progress-bar.hh
similarity index 100%
rename from src/nix/progress-bar.hh
rename to src/libmain/progress-bar.hh
diff --git a/src/libexpr/names.cc b/src/libutil/names.cc
similarity index 100%
rename from src/libexpr/names.cc
rename to src/libutil/names.cc
diff --git a/src/libexpr/names.hh b/src/libutil/names.hh
similarity index 100%
rename from src/libexpr/names.hh
rename to src/libutil/names.hh
diff --git a/src/nix-prefetch-url/nix-prefetch-url.cc b/src/nix-prefetch-url/nix-prefetch-url.cc
index 5a686c8cd67cdc4596e6452acabf741011613679..b645bdc1b0aa254bff543172a80f596352c10658 100644
--- a/src/nix-prefetch-url/nix-prefetch-url.cc
+++ b/src/nix-prefetch-url/nix-prefetch-url.cc
@@ -8,7 +8,7 @@
 #include "attr-path.hh"
 #include "finally.hh"
 #include "../nix/legacy.hh"
-#include "../nix/progress-bar.hh"
+#include "progress-bar.hh"
 #include "tarfile.hh"
 
 #include <iostream>