17 files changed, 21 insertions, 18 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e3cc3cc..d5246c6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -28,6 +28,7 @@ add_dependencies(secp256k1 libsecp256k1)
 
 # add libraries
 
+include_directories(include)
 add_library(hotstuff
     src/entity.cpp
     src/core.cpp
diff --git a/src/client.h b/include/hotstuff/client.h
index dd1cfee..dd1cfee 100644
--- a/src/client.h
+++ b/include/hotstuff/client.h
diff --git a/src/core.h b/include/hotstuff/core.h
index c7e1fe6..c7e1fe6 100644
--- a/src/core.h
+++ b/include/hotstuff/core.h
diff --git a/src/crypto.h b/include/hotstuff/crypto.h
index 2fbf745..2fbf745 100644
--- a/src/crypto.h
+++ b/include/hotstuff/crypto.h
diff --git a/src/entity.h b/include/hotstuff/entity.h
index b3a0df4..b3a0df4 100644
--- a/src/entity.h
+++ b/include/hotstuff/entity.h
diff --git a/src/promise.hpp b/include/hotstuff/promise.hpp
index 593d5c1..593d5c1 100644
--- a/src/promise.hpp
+++ b/include/hotstuff/promise.hpp
diff --git a/src/type.h b/include/hotstuff/type.h
index 4665979..4665979 100644
--- a/src/type.h
+++ b/include/hotstuff/type.h
diff --git a/src/util.h b/include/hotstuff/util.h
index 42c0135..42c0135 100644
--- a/src/util.h
+++ b/include/hotstuff/util.h
diff --git a/src/client.cpp b/src/client.cpp
index f787003..482c23d 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -1,4 +1,4 @@
-#include "client.h"
+#include "hotstuff/client.h"
 
 namespace hotstuff {
 
diff --git a/src/core.cpp b/src/core.cpp
index d6a4cc7..125e168 100644
--- a/src/core.cpp
+++ b/src/core.cpp
@@ -1,5 +1,5 @@
 #include <stack>
-#include "core.h"
+#include "hotstuff/core.h"
 
 using salticidae::DataStream;
 using salticidae::static_pointer_cast;
diff --git a/src/crypto.cpp b/src/crypto.cpp
index 335a521..7450229 100644
--- a/src/crypto.cpp
+++ b/src/crypto.cpp
@@ -1,5 +1,5 @@
-#include "entity.h"
-#include "crypto.h"
+#include "hotstuff/entity.h"
+#include "hotstuff/crypto.h"
 
 namespace hotstuff {
 
diff --git a/src/entity.cpp b/src/entity.cpp
index 1294484..1d2e926 100644
--- a/src/entity.cpp
+++ b/src/entity.cpp
@@ -1,5 +1,5 @@
-#include "entity.h"
-#include "core.h"
+#include "hotstuff/entity.h"
+#include "hotstuff/core.h"
 
 namespace hotstuff {
 
diff --git a/src/hotstuff.cpp b/src/hotstuff.cpp
index b10f103..74d2f04 100644
--- a/src/hotstuff.cpp
+++ b/src/hotstuff.cpp
@@ -11,12 +11,13 @@
 #include "salticidae/util.h"
 #include "salticidae/network.h"
 #include "salticidae/msg.h"
-#include "promise.hpp"
-#include "type.h"
-#include "core.h"
-#include "entity.h"
-#include "util.h"
-#include "client.h"
+
+#include "hotstuff/promise.hpp"
+#include "hotstuff/type.h"
+#include "hotstuff/core.h"
+#include "hotstuff/entity.h"
+#include "hotstuff/util.h"
+#include "hotstuff/client.h"
 
 using promise::promise_t;
 using salticidae::NetAddr;
diff --git a/src/hotstuff_client.cpp b/src/hotstuff_client.cpp
index 5c04e5f..6b26c9c 100644
--- a/src/hotstuff_client.cpp
+++ b/src/hotstuff_client.cpp
@@ -3,9 +3,10 @@
 #include "salticidae/netaddr.h"
 #include "salticidae/network.h"
 #include "salticidae/util.h"
-#include "util.h"
-#include "type.h"
-#include "client.h"
+
+#include "hotstuff/util.h"
+#include "hotstuff/type.h"
+#include "hotstuff/client.h"
 
 using salticidae::NetAddr;
 using salticidae::Config;
diff --git a/src/hotstuff_keygen.cpp b/src/hotstuff_keygen.cpp
index 7a7e615..100cb01 100644
--- a/src/hotstuff_keygen.cpp
+++ b/src/hotstuff_keygen.cpp
@@ -1,6 +1,6 @@
 #include <error.h>
 #include "salticidae/util.h"
-#include "crypto.h"
+#include "hotstuff/crypto.h"
 
 using salticidae::Config;
 using hotstuff::privkey_bt;
diff --git a/src/util.cpp b/src/util.cpp
index dc509f1..bed6e5a 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -1,4 +1,4 @@
-#include "util.h"
+#include "hotstuff/util.h"
 
 namespace hotstuff {
 
diff --git a/test/test_secp256k1.cpp b/test/test_secp256k1.cpp
index 0991b6e..a0d3b1c 100644
--- a/test/test_secp256k1.cpp
+++ b/test/test_secp256k1.cpp
@@ -1,4 +1,4 @@
-#include "crypto.h"
+#include "hotstuff/crypto.h"
 
 using namespace hotstuff;