diff --git a/Makefile.in b/Makefile.in
index d093e770..d0fd2dbb 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -18,16 +18,6 @@ OBJSDIR_TOOLS =		objs
 
 OBJSDIRS =		$(OBJSDIR_SERVALD) $(OBJSDIR_LIB) $(OBJSDIR_TOOLS)
 
-ALL_SOURCES = \
-	$(SERVAL_CLIENT_SOURCES) \
-	$(MDP_CLIENT_SOURCES) \
-	$(SERVAL_DAEMON_SOURCES) \
-	$(SERVAL_DAEMON_JNI_SOURCES) \
-	$(MONITOR_CLIENT_SRCS) \
-	$(CLIENT_ONLY_SOURCES) \
-	$(SIMULATOR_SOURCES) \
-	$(SQLITE3_SOURCES)
-
 SERVAL_DAEMON_OBJS = \
 	$(addprefix $(OBJSDIR_SERVALD)/, $(SERVAL_CLIENT_SOURCES:.c=.o)) \
 	$(addprefix $(OBJSDIR_SERVALD)/, $(MDP_CLIENT_SOURCES:.c=.o)) \
diff --git a/sourcefiles.mk b/sourcefiles.mk
index 22d279bf..5b5c9431 100644
--- a/sourcefiles.mk
+++ b/sourcefiles.mk
@@ -147,3 +147,14 @@ CLIENT_ONLY_SOURCES = \
 
 ANDROID_SOURCES = \
 	android.c
+
+ALL_SOURCES = \
+	$(SERVAL_CLIENT_SOURCES) \
+	$(MDP_CLIENT_SOURCES) \
+	$(SQLITE3_SOURCES) \
+	$(SERVAL_DAEMON_SOURCES) \
+	$(SERVAL_DAEMON_JNI_SOURCES) \
+	$(SIMULATOR_SOURCES) \
+	$(MONITOR_CLIENT_SRCS) \
+	$(CLIENT_ONLY_SOURCES) \
+	$(ANDROID_SOURCES)