diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -132,8 +132,6 @@
 	compat/glibcxx_sanity.cpp
 	compat/strnlen.cpp
 	fs.cpp
-	interfaces/handler.cpp
-	interfaces/node.cpp
 	logging.cpp
 	random.cpp
 	rcu.cpp
@@ -256,6 +254,8 @@
 	httprpc.cpp
 	httpserver.cpp
 	init.cpp
+	interfaces/handler.cpp
+	interfaces/node.cpp
 	dbwrapper.cpp
 	merkleblock.cpp
 	miner.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -248,6 +248,8 @@
   httprpc.cpp \
   httpserver.cpp \
   init.cpp \
+  interfaces/handler.cpp \
+  interfaces/node.cpp \
   dbwrapper.cpp \
   merkleblock.cpp \
   miner.cpp \
@@ -432,8 +434,6 @@
   compat/glibcxx_sanity.cpp \
   compat/strnlen.cpp \
   fs.cpp \
-  interfaces/handler.cpp \
-  interfaces/node.cpp \
   logging.cpp \
   random.cpp \
   rcu.cpp \