[wallet] Followup (partial) changes to fix more include guards from Zcash / new files

src/crypto/equihash.h

@@ -3,8 +3,8 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#ifndef BITCOIN_EQUIHASH_H
-#define BITCOIN_EQUIHASH_H
+#ifndef BITCOIN_CRYPTO_EQUIHASH_H
+#define BITCOIN_CRYPTO_EQUIHASH_H
 
 #include "crypto/sha256.h"
 #include "utilstrencodings.h"
@@ -276,4 +276,4 @@ inline bool EhOptimisedSolveUncancellable(unsigned int n, unsigned int k, const
         throw std::invalid_argument("Unsupported Equihash parameters"); \
     }
 
-#endif // BITCOIN_EQUIHASH_H
+#endif // BITCOIN_CRYPTO_EQUIHASH_H

src/gtest/json_test_vectors.h

@@ -1,3 +1,10 @@
+// Copyright (c) 2016 The Zcash developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#ifndef BITCOIN_GTEST_JSON_TEST_VECTORS_H
+#define BITCOIN_GTEST_JSON_TEST_VECTORS_H
+
 #include <gtest/gtest.h>
 
 #include <utilstrencodings.h>
@@ -49,3 +56,5 @@ void expect_test_vector(T& v, const U& expected)
     ASSERT_TRUE(memcmp(&*ss1.begin(), &*ss2.begin(), ss1.size()) == 0);
     #endif
 }
+
+#endif // BITCOIN_GTEST_JSON_TEST_VECTORS_H

src/paymentdisclosure.h

@@ -2,8 +2,8 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#ifndef ZCASH_PAYMENTDISCLOSURE_H
-#define ZCASH_PAYMENTDISCLOSURE_H
+#ifndef BITCOIN_PAYMENTDISCLOSURE_H
+#define BITCOIN_PAYMENTDISCLOSURE_H
 
 #include <uint256.h>
 #include <clientversion.h>

src/paymentdisclosuredb.h

@@ -2,8 +2,8 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#ifndef ZCASH_PAYMENTDISCLOSUREDB_H
-#define ZCASH_PAYMENTDISCLOSUREDB_H
+#ifndef BITCOIN_PAYMENTDISCLOSUREDB_H
+#define BITCOIN_PAYMENTDISCLOSUREDB_H
 
 #include <paymentdisclosure.h>
 

src/uint252.h

@@ -1,5 +1,10 @@
-#ifndef UINT252_H
-#define UINT252_H
+// Copyright (c) 2009-2010 Satoshi Nakamoto
+// Copyright (c) 2009-2014 The Bitcoin Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#ifndef BITCOIN_UINT252_H
+#define BITCOIN_UINT252_H
 
 #include <vector>
 #include <uint256.h>
@@ -47,4 +52,4 @@ public:
     friend inline bool operator==(const uint252& a, const uint252& b) { return a.contents == b.contents; }
 };
 
-#endif
+#endif // BITCOIN_UINT_252_H

src/zkaddr.cpp

@@ -1,4 +1,6 @@
-// Copyright (c) 2014 The Bitcoin Core developers
+// Copyright (c) 2009-2010 Satoshi Nakamoto
+// Copyright (c) 2009-2014 The Bitcoin Core developers
+// Copyright (c) 2016-2017 The Zcash Developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 

src/zkaddr.h

@@ -1,5 +1,6 @@
 // Copyright (c) 2009-2010 Satoshi Nakamoto
 // Copyright (c) 2009-2014 The Bitcoin Core developers
+// Copyright (c) 2016-2017 The Zcash Developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.