Update UniValue includes in Zcash-specific code

src/Makefile.gtest.include

@@ -40,9 +40,9 @@ zcash_gtest_SOURCES += \
 	wallet/gtest/test_wallet.cpp
 endif
 
-zcash_gtest_CPPFLAGS = -DMULTICORE -fopenmp -DBINARY_OUTPUT -DCURVE_ALT_BN128 -DSTATIC
+zcash_gtest_CPPFLAGS = -DMULTICORE -fopenmp -DBINARY_OUTPUT -DCURVE_ALT_BN128 -DSTATIC $(BITCOIN_INCLUDES)
 
-zcash_gtest_LDADD = -lgtest -lgmock $(LIBBITCOIN_SERVER) $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBBITCOIN_UTIL) $(LIBBITCOIN_CRYPTO) $(LIBBITCOIN_UNIVALUE) $(LIBLEVELDB) $(LIBMEMENV) \
+zcash_gtest_LDADD = -lgtest -lgmock $(LIBBITCOIN_SERVER) $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBBITCOIN_UTIL) $(LIBBITCOIN_CRYPTO) $(LIBUNIVALUE) $(LIBLEVELDB) $(LIBMEMENV) \
   $(BOOST_LIBS) $(BOOST_UNIT_TEST_FRAMEWORK_LIB) $(LIBSECP256K1)
 if ENABLE_ZMQ
 zcash_gtest_LDADD += $(LIBBITCOIN_ZMQ) $(ZMQ_LIBS)

src/asyncrpcoperation.h

@@ -15,7 +15,7 @@
 #include <utility>
 #include <future>
 
-#include "univalue/univalue.h"
+#include <univalue.h>
 
 using namespace std;
 

src/gtest/json_test_vectors.h

@@ -5,7 +5,7 @@
 #include "serialize.h"
 #include "streams.h"
 
-#include "univalue/univalue.h"
+#include <univalue.h>
 
 UniValue
 read_json(const std::string& jsondata);

src/gtest/test_rpc.cpp

@@ -1,5 +1,5 @@
 #include <gtest/gtest.h>
-#include "univalue/univalue.h"
+#include <univalue.h>
 
 #include "chain.h"
 #include "chainparams.h"

src/rpcprotocol.cpp

@@ -26,7 +26,7 @@
 #include <boost/iostreams/stream.hpp>
 #include <boost/shared_ptr.hpp>
 
-#include "univalue/univalue.h"
+#include <univalue.h>
 
 using namespace std;
 

src/wallet/asyncrpcoperation_sendmany.h

@@ -16,7 +16,7 @@
 #include <unordered_map>
 #include <tuple>
 
-#include "univalue/univalue.h"
+#include <univalue.h>
 
 // Default transaction fee if caller does not specify one.
 #define ASYNC_RPC_OPERATION_DEFAULT_MINERS_FEE   10000