diff --git a/services/inputflinger/Android.bp b/services/inputflinger/Android.bp
index bdee6fe..8649c1e 100644
--- a/services/inputflinger/Android.bp
+++ b/services/inputflinger/Android.bp
@@ -30,7 +30,7 @@
     srcs: [
         "InputClassifier.cpp",
         "InputClassifierConverter.cpp",
-        "InputDispatcher.cpp",
+        "dispatcher/InputDispatcher.cpp",
         "InputManager.cpp",
     ],
 
@@ -58,6 +58,7 @@
     export_include_dirs: [
         ".",
         "include",
+        "dispatcher",
     ],
 
 }