diff --git a/app/src/main/jni/nfd.mk b/app/src/main/jni/nfd.mk
index daeebb5..c8e6818 100644
--- a/app/src/main/jni/nfd.mk
+++ b/app/src/main/jni/nfd.mk
@@ -6,11 +6,12 @@
 # nfd itself
 include $(CLEAR_VARS)
 LOCAL_MODULE := nfd-daemon
-LOCAL_SHARED_LIBRARIES := cryptopp_shared ndn-cxx $(addsuffix _shared,$(addprefix boost_,$(NFD_BOOST_LIBS)))
+LOCAL_SHARED_LIBRARIES := cryptopp_shared openssl_shared ndn-cxx $(addsuffix _shared,$(addprefix boost_,$(NFD_BOOST_LIBS)))
 NFD_DAEMON_SRC_FILES := \
     core/city-hash.cpp \
     core/config-file.cpp \
     core/global-io.cpp \
+    core/manager-base.cpp \
     core/network-interface.cpp \
     core/network.cpp \
     core/privilege-helper.cpp \
@@ -20,8 +21,8 @@
     ../nfd-android/custom-logger-factory.cpp \
     \
     daemon/face/channel.cpp \
-    daemon/face/face.cpp \
     daemon/face/face-counters.cpp \
+    daemon/face/face.cpp \
     daemon/face/generic-link-service.cpp \
     daemon/face/internal-face.cpp \
     daemon/face/internal-transport.cpp \
@@ -42,32 +43,38 @@
     daemon/face/websocket-factory.cpp \
     daemon/face/websocket-transport.cpp \
     daemon/fw/access-strategy.cpp \
+    daemon/fw/asf-measurements.cpp \
+    daemon/fw/asf-probing-module.cpp \
+    daemon/fw/asf-strategy.cpp \
     daemon/fw/best-route-strategy.cpp \
     daemon/fw/best-route-strategy2.cpp \
-    daemon/fw/broadcast-strategy.cpp \
     daemon/fw/client-control-strategy.cpp \
     daemon/fw/face-table.cpp \
     daemon/fw/forwarder.cpp \
     daemon/fw/multicast-strategy.cpp \
     daemon/fw/ncc-strategy.cpp \
+    daemon/fw/pit-algorithm.cpp \
     daemon/fw/retx-suppression-exponential.cpp \
     daemon/fw/retx-suppression-fixed.cpp \
     daemon/fw/retx-suppression.cpp \
     daemon/fw/rtt-estimator.cpp \
     daemon/fw/strategy-registry.cpp \
     daemon/fw/strategy.cpp \
-    daemon/mgmt/command-validator.cpp \
+    daemon/fw/unsolicited-data-policy.cpp \
+    daemon/main.cpp \
+    daemon/mgmt/command-authenticator.cpp \
     daemon/mgmt/face-manager.cpp \
     daemon/mgmt/fib-manager.cpp \
     daemon/mgmt/forwarder-status-manager.cpp \
     daemon/mgmt/general-config-section.cpp \
-    daemon/mgmt/manager-base.cpp \
+    daemon/mgmt/nfd-manager-base.cpp \
     daemon/mgmt/strategy-choice-manager.cpp \
     daemon/mgmt/tables-config-section.cpp \
     daemon/nfd.cpp \
+    daemon/table/cleanup.cpp \
     daemon/table/cs-entry-impl.cpp \
     daemon/table/cs-entry.cpp \
-    daemon/table/cs-policy-lru.cpp  \
+    daemon/table/cs-policy-lru.cpp \
     daemon/table/cs-policy-priority-fifo.cpp \
     daemon/table/cs-policy.cpp \
     daemon/table/cs.cpp \
@@ -79,11 +86,14 @@
     daemon/table/measurements-entry.cpp \
     daemon/table/measurements.cpp \
     daemon/table/name-tree-entry.cpp \
+    daemon/table/name-tree-hashtable.cpp \
+    daemon/table/name-tree-iterator.cpp \
     daemon/table/name-tree.cpp \
     daemon/table/network-region-table.cpp \
     daemon/table/pit-entry.cpp \
     daemon/table/pit-face-record.cpp \
     daemon/table/pit-in-record.cpp \
+    daemon/table/pit-iterator.cpp \
     daemon/table/pit-out-record.cpp \
     daemon/table/pit.cpp \
     daemon/table/strategy-choice-entry.cpp \
@@ -93,15 +103,14 @@
     rib/auto-prefix-propagator.cpp \
     rib/fib-update.cpp \
     rib/fib-updater.cpp \
-    rib/nrd.cpp \
     rib/propagated-entry.cpp \
     rib/rib-entry.cpp \
     rib/rib-manager.cpp \
-    rib/rib-status-publisher.cpp \
     rib/rib-update-batch.cpp \
     rib/rib-update.cpp \
     rib/rib.cpp \
-    rib/route.cpp
+    rib/route.cpp \
+    rib/service.cpp
 LOCAL_SRC_FILES := $(addprefix NFD/,$(NFD_DAEMON_SRC_FILES))
 LOCAL_CPPFLAGS := \
     -I$(LOCAL_PATH)/nfd-android \