diff --git a/Android.mk b/Android.mk
index c8f4bf8..1d9eebd 100644
--- a/Android.mk
+++ b/Android.mk
@@ -67,7 +67,9 @@
     dbus_bindings/org.chromium.apmanager.Service.dbus-xml \
     config.cc \
     daemon.cc \
-    dbus_control.cc \
+    dbus/dbus_control.cc \
+    dbus/firewalld_dbus_proxy.cc \
+    dbus/shill_dbus_proxy.cc \
     device.cc \
     device_info.cc \
     dhcp_server.cc \
@@ -75,13 +77,11 @@
     event_dispatcher.cc \
     file_writer.cc \
     firewall_manager.cc \
-    firewalld_dbus_proxy.cc \
     hostapd_monitor.cc \
     manager.cc \
     process_factory.cc \
     service.cc \
-    shill_manager.cc \
-    shill_dbus_proxy.cc
+    shill_manager.cc
 $(eval $(apmanager_common))
 include $(BUILD_STATIC_TEST_LIBRARY)