diff --git a/include/opendht/indexation/pht.h b/include/opendht/indexation/pht.h
index 8cfc521f453c993648d8ca05d5300b6bffb3cd6a..2e3f15efe0e7825de0694319143d4a261ddcf012 100644
--- a/include/opendht/indexation/pht.h
+++ b/include/opendht/indexation/pht.h
@@ -10,7 +10,9 @@
 #include <iostream>
 #include <sstream>
 
-#include "opendht.h"
+#include "../value.h"
+#include "../dhtrunner.h"
+#include "../infohash.h"
 
 namespace dht {
 namespace indexation {
diff --git a/src/Makefile.am b/src/Makefile.am
index f29287a53c11281f1408649f659b712ca3073dd9..2eb007a5347284aed47e5618295c4a88abe8feec 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -19,7 +19,8 @@ libopendht_la_SOURCES = \
         crypto.cpp \
         securedht.cpp \
         dhtrunner.cpp \
-        default_types.cpp
+        default_types.cpp \
+        indexation/pht.cpp
 
 if WIN32
 libopendht_la_SOURCES += rng.cpp
@@ -42,4 +43,5 @@ nobase_include_HEADERS = \
         ../include/opendht/dhtrunner.h \
         ../include/opendht/default_types.h \
         ../include/opendht/log.h \
-        ../include/opendht/rng.h
+        ../include/opendht/rng.h \
+        ../include/opendht/indexation/pht.h
diff --git a/src/indexation/pht.cpp b/src/indexation/pht.cpp
index 8fc451389fc0de540dd5124e002010d41c2f570a..80aad4b8c9ddaecf5d34702a6220d3af979ff0e3 100644
--- a/src/indexation/pht.cpp
+++ b/src/indexation/pht.cpp
@@ -166,7 +166,6 @@ void Pht::insert(Key k, Value v, Dht::DoneCallbackSimple done_cb) {
     lookupStep(kp, lo, hi, vals,
         [=](std::vector<std::shared_ptr<Value>>& values, Prefix p) {
             *final_prefix = Prefix(p);
-            return true;
         },
         [=](bool ok){
             if (not ok) {