diff --git a/src/avalanche/proof.h b/src/avalanche/proof.h
--- a/src/avalanche/proof.h
+++ b/src/avalanche/proof.h
@@ -11,14 +11,14 @@
 #include <primitives/transaction.h>
 #include <pubkey.h>
 #include <serialize.h>
-#include <util/system.h>
-#include <util/translation.h>
 
 #include <array>
 #include <cstdint>
 #include <vector>
 
+class ArgsManager;
 class CCoinsView;
+struct bilingual_str;
 
 /**
  * How many UTXOs can be used for a single proof.
@@ -122,16 +122,14 @@
 
     SERIALIZE_METHODS(Proof, obj) {
         READWRITE(obj.sequence, obj.expirationTime, obj.master, obj.stakes);
-        if (!useLegacy(gArgs)) {
+        if (!useLegacy()) {
             READWRITE(obj.payoutScriptPubKey);
         }
         SER_READ(obj, obj.computeProofId());
     }
 
-    static bool useLegacy(const ArgsManager &argsman) {
-        return argsman.GetBoolArg("-legacyavaproof",
-                                  AVALANCHE_DEFAULT_LEGACY_PROOF);
-    }
+    static bool useLegacy();
+    static bool useLegacy(const ArgsManager &argsman);
 
     static bool FromHex(Proof &proof, const std::string &hexProof,
                         bilingual_str &errorOut);
diff --git a/src/avalanche/proof.cpp b/src/avalanche/proof.cpp
--- a/src/avalanche/proof.cpp
+++ b/src/avalanche/proof.cpp
@@ -11,6 +11,8 @@
 #include <script/standard.h>
 #include <streams.h>
 #include <util/strencodings.h>
+#include <util/system.h>
+#include <util/translation.h>
 
 #include <tinyformat.h>
 
@@ -35,6 +37,15 @@
     return stake.getPubkey().VerifySchnorr(stake.getHash(commitment), sig);
 }
 
+bool Proof::useLegacy() {
+    return useLegacy(gArgs);
+}
+
+bool Proof::useLegacy(const ArgsManager &argsman) {
+    return argsman.GetBoolArg("-legacyavaproof",
+                              AVALANCHE_DEFAULT_LEGACY_PROOF);
+}
+
 bool Proof::FromHex(Proof &proof, const std::string &hexProof,
                     bilingual_str &errorOut) {
     if (!IsHex(hexProof)) {
diff --git a/src/avalanche/proofbuilder.cpp b/src/avalanche/proofbuilder.cpp
--- a/src/avalanche/proofbuilder.cpp
+++ b/src/avalanche/proofbuilder.cpp
@@ -5,6 +5,7 @@
 #include <avalanche/proofbuilder.h>
 
 #include <random.h>
+#include <util/system.h>
 
 namespace avalanche {
 
diff --git a/src/avalanche/test/peermanager_tests.cpp b/src/avalanche/test/peermanager_tests.cpp
--- a/src/avalanche/test/peermanager_tests.cpp
+++ b/src/avalanche/test/peermanager_tests.cpp
@@ -7,6 +7,7 @@
 #include <avalanche/proofbuilder.h>
 #include <avalanche/test/util.h>
 #include <script/standard.h>
+#include <util/translation.h>
 #include <validation.h>
 
 #include <test/util/setup_common.h>
diff --git a/src/rpc/avalanche.cpp b/src/rpc/avalanche.cpp
--- a/src/rpc/avalanche.cpp
+++ b/src/rpc/avalanche.cpp
@@ -19,6 +19,7 @@
 #include <rpc/server.h>
 #include <rpc/util.h>
 #include <util/strencodings.h>
+#include <util/translation.h>
 
 #include <univalue.h>