9 files changed, 8 insertions, 34 deletions

diff --git a/nix/libstore/build.cc b/nix/libstore/build.cc
index 9010ca4e200..935f7aacf83 100644
--- a/nix/libstore/build.cc
+++ b/nix/libstore/build.cc
@@ -3367,9 +3367,6 @@ void DerivationGoal::registerOutputs()
 }
 
 
-string drvsLogDir = "drvs";
-
-
 Path DerivationGoal::openLogFile()
 {
     logSize = 0;
diff --git a/nix/libstore/derivations.cc b/nix/libstore/derivations.cc
index f05296702b3..b6203b1e385 100644
--- a/nix/libstore/derivations.cc
+++ b/nix/libstore/derivations.cc
@@ -211,9 +211,6 @@ bool isFixedOutputDrv(const Derivation & drv)
 }
 
 
-DrvHashes drvHashes;
-
-
 /* Returns the hash of a derivation modulo fixed-output
    subderivations.  A fixed-output derivation is a derivation with one
    output (`out') for which an expected hash and hash algorithm are
diff --git a/nix/libstore/derivations.hh b/nix/libstore/derivations.hh
index 8d5e4d05d46..0fbab3a7a4a 100644
--- a/nix/libstore/derivations.hh
+++ b/nix/libstore/derivations.hh
@@ -77,7 +77,7 @@ Hash hashDerivationModulo(StoreAPI & store, Derivation drv);
 /* Memoisation of hashDerivationModulo(). */
 typedef std::map<Path, Hash> DrvHashes;
 
-extern DrvHashes drvHashes;
+inline DrvHashes drvHashes;
 
 /* Split a string specifying a derivation and a set of outputs
    (/nix/store/hash-foo!out1,out2,...) into the derivation path and
diff --git a/nix/libstore/globals.cc b/nix/libstore/globals.cc
index 8551fea56c0..885ba4eafc1 100644
--- a/nix/libstore/globals.cc
+++ b/nix/libstore/globals.cc
@@ -17,9 +17,6 @@ namespace nix {
 #define DEFAULT_SOCKET_PATH "/daemon-socket/socket"
 
 
-Settings settings;
-
-
 Settings::Settings()
 {
     keepFailed = false;
@@ -205,7 +202,4 @@ Settings::SettingsMap Settings::getOverrides()
 }
 
 
-const string nixVersion = PACKAGE_VERSION;
-
-
 }
diff --git a/nix/libstore/globals.hh b/nix/libstore/globals.hh
index 7cfa06e76c1..c2824789ede 100644
--- a/nix/libstore/globals.hh
+++ b/nix/libstore/globals.hh
@@ -227,10 +227,10 @@ private:
 
 
 // FIXME: don't use a global variable.
-extern Settings settings;
+inline Settings settings;
 
 
-extern const string nixVersion;
+inline const string nixVersion {PACKAGE_VERSION};
 
 
 }
diff --git a/nix/libstore/local-store.hh b/nix/libstore/local-store.hh
index 20d3c3c8930..4d529b37a44 100644
--- a/nix/libstore/local-store.hh
+++ b/nix/libstore/local-store.hh
@@ -19,7 +19,7 @@ namespace nix {
 const int nixSchemaVersion = 7;
 
 
-extern string drvsLogDir;
+inline std::string drvsLogDir {"drvs"};
 
 
 struct Derivation;
@@ -293,6 +293,8 @@ void canonicaliseTimestampAndPermissions(const Path & path);
 MakeError(PathInUse, Error);
 
 /* Size below which a file is not considered for deduplication.  */
-extern const size_t deduplicationMinSize;
+/* Any file smaller than this is not considered for deduplication.
+   Keep in sync with (guix store deduplication).  */
+inline const size_t deduplicationMinSize {8192};
 
 }
diff --git a/nix/libstore/optimise-store.cc b/nix/libstore/optimise-store.cc
index d69c43e9978..54aa166c344 100644
--- a/nix/libstore/optimise-store.cc
+++ b/nix/libstore/optimise-store.cc
@@ -16,9 +16,6 @@
 
 namespace nix {
 
-/* Any file smaller than this is not considered for deduplication.
-   Keep in sync with (guix store deduplication).  */
-const size_t deduplicationMinSize = 8192;
 
 static void makeWritable(const Path & path)
 {
diff --git a/nix/libstore/store-api.cc b/nix/libstore/store-api.cc
index 1067e44a8e2..26d44f78b19 100644
--- a/nix/libstore/store-api.cc
+++ b/nix/libstore/store-api.cc
@@ -253,16 +253,3 @@ template<class T> T readStorePaths(Source & from)
 template PathSet readStorePaths(Source & from);
 
 }
-
-
-#include "local-store.hh"
-#include "serialise.hh"
-
-
-namespace nix {
-
-
-std::shared_ptr<StoreAPI> store;
-
-
-}
diff --git a/nix/libstore/store-api.hh b/nix/libstore/store-api.hh
index 32a8f2c795f..affa98b179d 100644
--- a/nix/libstore/store-api.hh
+++ b/nix/libstore/store-api.hh
@@ -363,7 +363,7 @@ Paths topoSortPaths(StoreAPI & store, const PathSet & paths);
 
 /* For now, there is a single global store API object, but we'll
    purify that in the future. */
-extern std::shared_ptr<StoreAPI> store;
+inline std::shared_ptr<StoreAPI> store;
 
 
 /* Display a set of paths in human-readable form (i.e., between quotes