From fee88353885147111bcca69c817a5339abd76109 Mon Sep 17 00:00:00 2001
From: Jack Grigg <jack@z.cash>
Date: Wed, 15 Nov 2017 16:49:10 +0000
Subject: [PATCH] Mark libsnark includes as library includes

---
 src/gtest/main.cpp            |  6 +++---
 src/gtest/test_circuit.cpp    |  9 +++++----
 src/gtest/test_merkletree.cpp |  8 ++++----
 src/gtest/test_proofs.cpp     |  7 +++----
 src/init.cpp                  |  2 +-
 src/zcash/CreateJoinSplit.cpp |  3 ++-
 src/zcash/JoinSplit.cpp       |  8 ++++----
 src/zcash/Proof.cpp           | 10 +++++-----
 8 files changed, 27 insertions(+), 26 deletions(-)

diff --git a/src/gtest/main.cpp b/src/gtest/main.cpp
index a0a2e0042..0b6e1ad08 100644
--- a/src/gtest/main.cpp
+++ b/src/gtest/main.cpp
@@ -1,12 +1,12 @@
 #include "gtest/gtest.h"
 #include "crypto/common.h"
 #include "pubkey.h"
-
-#include "libsnark/common/default_types/r1cs_ppzksnark_pp.hpp"
-#include "libsnark/zk_proof_systems/ppzksnark/r1cs_ppzksnark/r1cs_ppzksnark.hpp"
 #include "zcash/JoinSplit.hpp"
 #include "util.h"
 
+#include <libsnark/common/default_types/r1cs_ppzksnark_pp.hpp>
+#include <libsnark/zk_proof_systems/ppzksnark/r1cs_ppzksnark/r1cs_ppzksnark.hpp>
+
 struct ECCryptoClosure
 {
     ECCVerifyHandle handle;
diff --git a/src/gtest/test_circuit.cpp b/src/gtest/test_circuit.cpp
index f8a0416a7..2cc9dbcbb 100644
--- a/src/gtest/test_circuit.cpp
+++ b/src/gtest/test_circuit.cpp
@@ -7,10 +7,11 @@
 #include <boost/format.hpp>
 #include <boost/optional.hpp>
 
-#include "libsnark/common/default_types/r1cs_ppzksnark_pp.hpp"
-#include "libsnark/zk_proof_systems/ppzksnark/r1cs_ppzksnark/r1cs_ppzksnark.hpp"
-#include "libsnark/gadgetlib1/gadgets/hashes/sha256/sha256_gadget.hpp"
-#include "libsnark/gadgetlib1/gadgets/merkle_tree/merkle_tree_check_read_gadget.hpp"
+#include <libsnark/common/default_types/r1cs_ppzksnark_pp.hpp>
+#include <libsnark/zk_proof_systems/ppzksnark/r1cs_ppzksnark/r1cs_ppzksnark.hpp>
+#include <libsnark/gadgetlib1/gadgets/hashes/sha256/sha256_gadget.hpp>
+#include <libsnark/gadgetlib1/gadgets/merkle_tree/merkle_tree_check_read_gadget.hpp>
+
 #include "zcash/IncrementalMerkleTree.hpp"
 
 using namespace libsnark;
diff --git a/src/gtest/test_merkletree.cpp b/src/gtest/test_merkletree.cpp
index 6bac9ab3c..d603b0aa6 100644
--- a/src/gtest/test_merkletree.cpp
+++ b/src/gtest/test_merkletree.cpp
@@ -19,10 +19,10 @@
 #include "zcash/IncrementalMerkleTree.hpp"
 #include "zcash/util.h"
 
-#include "libsnark/common/default_types/r1cs_ppzksnark_pp.hpp"
-#include "libsnark/zk_proof_systems/ppzksnark/r1cs_ppzksnark/r1cs_ppzksnark.hpp"
-#include "libsnark/gadgetlib1/gadgets/hashes/sha256/sha256_gadget.hpp"
-#include "libsnark/gadgetlib1/gadgets/merkle_tree/merkle_tree_check_read_gadget.hpp"
+#include <libsnark/common/default_types/r1cs_ppzksnark_pp.hpp>
+#include <libsnark/zk_proof_systems/ppzksnark/r1cs_ppzksnark/r1cs_ppzksnark.hpp>
+#include <libsnark/gadgetlib1/gadgets/hashes/sha256/sha256_gadget.hpp>
+#include <libsnark/gadgetlib1/gadgets/merkle_tree/merkle_tree_check_read_gadget.hpp>
 
 #include <boost/foreach.hpp>
 
diff --git a/src/gtest/test_proofs.cpp b/src/gtest/test_proofs.cpp
index cf097d716..e33b1cc0c 100644
--- a/src/gtest/test_proofs.cpp
+++ b/src/gtest/test_proofs.cpp
@@ -3,10 +3,9 @@
 
 #include <iostream>
 
-#include "libsnark/common/default_types/r1cs_ppzksnark_pp.hpp"
-#include "libsnark/zk_proof_systems/ppzksnark/r1cs_ppzksnark/r1cs_ppzksnark.hpp"
-#include "zk_proof_systems/ppzksnark/r1cs_ppzksnark/r1cs_ppzksnark.hpp"
-#include "relations/constraint_satisfaction_problems/r1cs/examples/r1cs_examples.hpp"
+#include <libsnark/common/default_types/r1cs_ppzksnark_pp.hpp>
+#include <libsnark/relations/constraint_satisfaction_problems/r1cs/examples/r1cs_examples.hpp>
+#include <libsnark/zk_proof_systems/ppzksnark/r1cs_ppzksnark/r1cs_ppzksnark.hpp>
 
 using namespace libzcash;
 
diff --git a/src/init.cpp b/src/init.cpp
index fe7f17009..7df31ab1b 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -53,7 +53,7 @@
 #include <boost/thread.hpp>
 #include <openssl/crypto.h>
 
-#include "libsnark/common/profiling.hpp"
+#include <libsnark/common/profiling.hpp>
 
 #if ENABLE_ZMQ
 #include "zmq/zmqnotificationinterface.h"
diff --git a/src/zcash/CreateJoinSplit.cpp b/src/zcash/CreateJoinSplit.cpp
index 7253e9568..bcf9a218e 100644
--- a/src/zcash/CreateJoinSplit.cpp
+++ b/src/zcash/CreateJoinSplit.cpp
@@ -5,7 +5,8 @@
 #include "../util.h"
 #include "primitives/transaction.h"
 #include "zcash/JoinSplit.hpp"
-#include "libsnark/common/profiling.hpp"
+
+#include <libsnark/common/profiling.hpp>
 
 using namespace libzcash;
 
diff --git a/src/zcash/JoinSplit.cpp b/src/zcash/JoinSplit.cpp
index ab2059238..2685569d3 100644
--- a/src/zcash/JoinSplit.cpp
+++ b/src/zcash/JoinSplit.cpp
@@ -10,10 +10,10 @@
 #include <boost/format.hpp>
 #include <boost/optional.hpp>
 #include <fstream>
-#include "libsnark/common/default_types/r1cs_ppzksnark_pp.hpp"
-#include "libsnark/zk_proof_systems/ppzksnark/r1cs_ppzksnark/r1cs_ppzksnark.hpp"
-#include "libsnark/gadgetlib1/gadgets/hashes/sha256/sha256_gadget.hpp"
-#include "libsnark/gadgetlib1/gadgets/merkle_tree/merkle_tree_check_read_gadget.hpp"
+#include <libsnark/common/default_types/r1cs_ppzksnark_pp.hpp>
+#include <libsnark/zk_proof_systems/ppzksnark/r1cs_ppzksnark/r1cs_ppzksnark.hpp>
+#include <libsnark/gadgetlib1/gadgets/hashes/sha256/sha256_gadget.hpp>
+#include <libsnark/gadgetlib1/gadgets/merkle_tree/merkle_tree_check_read_gadget.hpp>
 #include "tinyformat.h"
 #include "sync.h"
 #include "amount.h"
diff --git a/src/zcash/Proof.cpp b/src/zcash/Proof.cpp
index 1b2199407..e7264e684 100644
--- a/src/zcash/Proof.cpp
+++ b/src/zcash/Proof.cpp
@@ -1,11 +1,11 @@
 #include "Proof.hpp"
 
-#include <boost/static_assert.hpp>
-#include <mutex>
-
 #include "crypto/common.h"
-#include "libsnark/common/default_types/r1cs_ppzksnark_pp.hpp"
-#include "libsnark/zk_proof_systems/ppzksnark/r1cs_ppzksnark/r1cs_ppzksnark.hpp"
+
+#include <boost/static_assert.hpp>
+#include <libsnark/common/default_types/r1cs_ppzksnark_pp.hpp>
+#include <libsnark/zk_proof_systems/ppzksnark/r1cs_ppzksnark/r1cs_ppzksnark.hpp>
+#include <mutex>
 
 using namespace libsnark;