diff --git a/.gitignore b/.gitignore
index c20f4faa..2d9cda84 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,13 @@ src/bitcoin-tx
 src/test/test_bitcoin
 src/qt/test/test_bitcoin-qt
 
+# zerocash tests and utilities
+src/zerocash/GenerateParamsForFiles
+src/zerocash/tests/merkleTest
+src/zerocash/tests/utilTest
+src/zerocash/tests/zerocashTest
+src/zerocash/tests/test_zerocash_pour_ppzksnark
+
 # autoreconf
 Makefile.in
 aclocal.m4
diff --git a/src/Makefile.am b/src/Makefile.am
index 922374ce..2d9b0aac 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -487,3 +487,5 @@ endif
 if ENABLE_QT_TESTS
 include Makefile.qttest.include
 endif
+
+include Makefile.zcash.include
diff --git a/src/Makefile.zcash.include b/src/Makefile.zcash.include
new file mode 100644
index 00000000..ccf4b31a
--- /dev/null
+++ b/src/Makefile.zcash.include
@@ -0,0 +1,46 @@
+bin_PROGRAMS += \
+  zerocash/GenerateParamsForFiles \
+  zerocash/tests/merkleTest \
+  zerocash/tests/utilTest \
+  zerocash/tests/zerocashTest \
+  zerocash/tests/test_zerocash_pour_ppzksnark
+
+# tool for generating our public parameters
+zerocash_GenerateParamsForFiles_SOURCES = zerocash/GenerateParamsForFiles.cpp
+zerocash_GenerateParamsForFiles_LDADD = \
+  $(BOOST_LIBS) \
+  $(LIBZEROCASH) \
+  $(LIBZEROCASH_LIBS)
+
+# tests for our incremental merkle tree
+zerocash_tests_merkleTest_SOURCES = zerocash/tests/merkleTest.cpp
+zerocash_tests_merkleTest_LDADD = \
+  $(BOOST_LIBS) \
+  $(LIBZEROCASH) \
+  $(LIBZEROCASH_LIBS)
+
+# tests for utilities that come with zerocash
+zerocash_tests_utilTest_SOURCES = zerocash/tests/utilTest.cpp
+zerocash_tests_utilTest_LDADD = \
+  $(BOOST_LIBS) \
+  $(LIBZEROCASH) \
+  $(LIBZEROCASH_LIBS)
+
+# tests for libzerocash APIs
+zerocash_tests_zerocashTest_SOURCES = \
+  zerocash/tests/zerocashTest.cpp \
+  zerocash/tests/timer.cpp
+
+zerocash_tests_zerocashTest_LDADD = \
+  $(BOOST_LIBS) \
+  $(LIBZEROCASH) \
+  $(LIBZEROCASH_LIBS)
+
+# tests for our zkSNARK circuit
+
+zerocash_tests_test_zerocash_pour_ppzksnark_SOURCES = zerocash/tests/test_zerocash_pour_ppzksnark.cpp
+zerocash_tests_test_zerocash_pour_ppzksnark_LDADD = \
+  $(BOOST_LIBS) \
+  $(LIBZEROCASH) \
+  $(LIBZEROCASH_LIBS)
+
diff --git a/src/zerocash/GenerateParamsForFiles.cpp b/src/zerocash/GenerateParamsForFiles.cpp
index 555e3e26..12965b91 100644
--- a/src/zerocash/GenerateParamsForFiles.cpp
+++ b/src/zerocash/GenerateParamsForFiles.cpp
@@ -15,8 +15,6 @@
 #include "ZerocashParams.h"
 #include "libsnark/common/default_types/r1cs_ppzksnark_pp.hpp"
 #include "libsnark/zk_proof_systems/ppzksnark/r1cs_ppzksnark/r1cs_ppzksnark.hpp"
-#include "zerocash_pour_ppzksnark/zerocash_pour_gadget.hpp"
-#include "zerocash_pour_ppzksnark/zerocash_pour_ppzksnark.hpp"
 
 using namespace libzerocash;
 
diff --git a/src/zerocash/tests/merkleTest.cpp b/src/zerocash/tests/merkleTest.cpp
index 6df3509c..9be66cc9 100644
--- a/src/zerocash/tests/merkleTest.cpp
+++ b/src/zerocash/tests/merkleTest.cpp
@@ -9,7 +9,7 @@
  * @copyright  MIT license (see LICENSE file)
  *****************************************************************************/
 
-#include "libzerocash/IncrementalMerkleTree.h"
+#include "zerocash/IncrementalMerkleTree.h"
 
 #include <iostream>
 #include <vector>
diff --git a/src/zerocash/tests/test_zerocash_pour_ppzksnark.cpp b/src/zerocash/tests/test_zerocash_pour_ppzksnark.cpp
index dedb97c7..4c8ad224 100644
--- a/src/zerocash/tests/test_zerocash_pour_ppzksnark.cpp
+++ b/src/zerocash/tests/test_zerocash_pour_ppzksnark.cpp
@@ -15,8 +15,8 @@
 #include "libsnark/common/utils.hpp"
 #include "libsnark/common/profiling.hpp"
 #include "libsnark/gadgetlib1/gadgets/hashes/sha256/sha256_gadget.hpp"
-#include "zerocash_pour_ppzksnark/zerocash_pour_gadget.hpp"
-#include "zerocash_pour_ppzksnark/zerocash_pour_ppzksnark.hpp"
+#include "zerocash/zerocash_pour_gadget.hpp"
+#include "zerocash/zerocash_pour_ppzksnark.hpp"
 
 using namespace libzerocash;
 
diff --git a/src/zerocash/tests/timer.cpp b/src/zerocash/tests/timer.cpp
index ec9f21f8..b5642f68 100644
--- a/src/zerocash/tests/timer.cpp
+++ b/src/zerocash/tests/timer.cpp
@@ -12,7 +12,7 @@
 #include <stdio.h>
 #include <sys/time.h>
 
-#include "tests/timer.h"
+#include "zerocash/tests/timer.h"
 
 namespace libzerocash {
 
diff --git a/src/zerocash/tests/utilTest.cpp b/src/zerocash/tests/utilTest.cpp
index 6a76f7bb..6374b350 100644
--- a/src/zerocash/tests/utilTest.cpp
+++ b/src/zerocash/tests/utilTest.cpp
@@ -2,8 +2,8 @@
 #define BOOST_TEST_MODULE utilTest
 #include <boost/test/included/unit_test.hpp>
 
-#include "libzerocash/utils/util.h"
-#include "libzerocash/utils/sha256.h"
+#include "zerocash/utils/util.h"
+#include "zerocash/utils/sha256.h"
 
 #define SHA256_PREIMAGE_BYTES 3
 const unsigned char sha256_preimage[SHA256_PREIMAGE_BYTES] = { 'a', 'b', 'c' };
diff --git a/src/zerocash/tests/zerocashTest.cpp b/src/zerocash/tests/zerocashTest.cpp
index 5095eba5..74927329 100644
--- a/src/zerocash/tests/zerocashTest.cpp
+++ b/src/zerocash/tests/zerocashTest.cpp
@@ -17,17 +17,17 @@
 
 #include "timer.h"
 
-#include "libzerocash/Zerocash.h"
-#include "libzerocash/ZerocashParams.h"
-#include "libzerocash/Address.h"
-#include "libzerocash/CoinCommitment.h"
-#include "libzerocash/Coin.h"
-#include "libzerocash/IncrementalMerkleTree.h"
-#include "libzerocash/MintTransaction.h"
-#include "libzerocash/PourTransaction.h"
-#include "libzerocash/PourInput.h"
-#include "libzerocash/PourOutput.h"
-#include "libzerocash/utils/util.h"
+#include "zerocash/Zerocash.h"
+#include "zerocash/ZerocashParams.h"
+#include "zerocash/Address.h"
+#include "zerocash/CoinCommitment.h"
+#include "zerocash/Coin.h"
+#include "zerocash/IncrementalMerkleTree.h"
+#include "zerocash/MintTransaction.h"
+#include "zerocash/PourTransaction.h"
+#include "zerocash/PourInput.h"
+#include "zerocash/PourOutput.h"
+#include "zerocash/utils/util.h"
 
 using namespace std;
 using namespace libsnark;