diff --git a/app/src/main/jni/nfd-android/custom-logger-factory.hpp b/app/src/main/jni/nfd-android/custom-logger-factory.hpp
index 394c90b..10a961e 100644
--- a/app/src/main/jni/nfd-android/custom-logger-factory.hpp
+++ b/app/src/main/jni/nfd-android/custom-logger-factory.hpp
@@ -27,8 +27,8 @@
 
 #include "common.hpp"
 
-#include "config-file.hpp"
-#include "logger.hpp"
+#include "core/config-file.hpp"
+#include "core/logger.hpp"
 
 namespace nfd {
 
diff --git a/app/src/main/jni/nfd.mk b/app/src/main/jni/nfd.mk
index 2a63b03..76e3cc8 100644
--- a/app/src/main/jni/nfd.mk
+++ b/app/src/main/jni/nfd.mk
@@ -3,11 +3,11 @@
 
 NFD_BOOST_LIBS = system filesystem chrono program_options random thread
 
-# core
+# nfd itself
 include $(CLEAR_VARS)
-LOCAL_MODULE := nfd-core
+LOCAL_MODULE := nfd-daemon
 LOCAL_SHARED_LIBRARIES := cryptopp ndn-cxx $(addsuffix _shared,$(addprefix boost_,$(NFD_BOOST_LIBS)))
-NFD_CORE_SRC_FILES := \
+NFD_DAEMON_SRC_FILES := \
     core/city-hash.cpp \
     core/config-file.cpp \
     core/global-io.cpp \
@@ -15,20 +15,10 @@
     core/network.cpp \
     core/privilege-helper.cpp \
     core/random.cpp \
-    core/scheduler.cpp
-LOCAL_SRC_FILES := $(addprefix NFD/,$(NFD_CORE_SRC_FILES)) \
-    nfd-android/custom-logger.cpp \
-    nfd-android/custom-logger-factory.cpp
-LOCAL_CPPFLAGS := -I$(LOCAL_PATH)/nfd-android -I$(LOCAL_PATH)/NFD -I$(LOCAL_PATH)/NFD/core
-LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/nfd-android $(LOCAL_PATH)/NFD $(LOCAL_PATH)/NFD/core
-include $(BUILD_STATIC_LIBRARY)
-
-# nfd itself
-include $(CLEAR_VARS)
-LOCAL_MODULE := nfd-daemon
-LOCAL_SHARED_LIBRARIES := cryptopp ndn-cxx $(addsuffix _shared,$(addprefix boost_,$(NFD_BOOST_LIBS)))
-LOCAL_STATIC_LIBRARIES := nfd-core
-NFD_DAEMON_SRC_FILES := \
+    core/scheduler.cpp \
+    ../nfd-android/custom-logger.cpp \
+    ../nfd-android/custom-logger-factory.cpp \
+    \
     daemon/face/channel.cpp \
     daemon/face/face.cpp \
     daemon/face/internal-client-face.cpp \
@@ -109,6 +99,13 @@
     rib/rib.cpp \
     rib/route.cpp
 LOCAL_SRC_FILES := $(addprefix NFD/,$(NFD_DAEMON_SRC_FILES))
-LOCAL_CPPFLAGS := -I$(LOCAL_PATH)/NFD/daemon -I$(LOCAL_PATH)/NFD/rib -I$(LOCAL_PATH)/NFD/websocketpp
+LOCAL_CPPFLAGS := \
+    -I$(LOCAL_PATH)/nfd-android \
+    -I$(LOCAL_PATH)/NFD \
+    -I$(LOCAL_PATH)/NFD/core \
+    -I$(LOCAL_PATH)/NFD/daemon \
+    -I$(LOCAL_PATH)/NFD/rib \
+    -I$(LOCAL_PATH)/NFD/websocketpp
 LOCAL_LDLIBS := -llog
+LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/nfd-android $(LOCAL_PATH)/NFD
 include $(BUILD_SHARED_LIBRARY)