diff --git a/examples/bitmap_uploader/BUILD.gn b/examples/bitmap_uploader/BUILD.gn
index 004c4ff..0ac022b 100644
--- a/examples/bitmap_uploader/BUILD.gn
+++ b/examples/bitmap_uploader/BUILD.gn
@@ -20,7 +20,7 @@
     "//mojo/public/interfaces/application",
     "//mojo/services/geometry/public/cpp",
     "//mojo/services/geometry/public/interfaces",
-    "//mojo/services/public/interfaces/input_events:input_events",
+    "//mojo/services/input_events/public/interfaces",
     "//mojo/services/surfaces/public/cpp",
     "//mojo/services/surfaces/public/interfaces:surface_id",
     "//mojo/services/view_manager/public/cpp",
diff --git a/examples/browser/BUILD.gn b/examples/browser/BUILD.gn
index e936486..83588ec 100644
--- a/examples/browser/BUILD.gn
+++ b/examples/browser/BUILD.gn
@@ -22,7 +22,7 @@
     "//mojo/converters/geometry",
     "//mojo/converters/input_events",
     "//mojo/services/geometry/public/interfaces",
-    "//mojo/services/public/interfaces/input_events",
+    "//mojo/services/input_events/public/interfaces",
     "//mojo/services/public/interfaces/navigation",
     "//mojo/services/view_manager/public/cpp",
     "//mojo/services/view_manager/public/interfaces",
diff --git a/examples/pdf_viewer/BUILD.gn b/examples/pdf_viewer/BUILD.gn
index 9300797..256079e 100644
--- a/examples/pdf_viewer/BUILD.gn
+++ b/examples/pdf_viewer/BUILD.gn
@@ -15,9 +15,9 @@
     "//mojo/application:content_handler",
     "//mojo/public/cpp/bindings",
     "//mojo/public/cpp/utility",
+    "//mojo/services/input_events/public/interfaces",
     "//mojo/services/network/public/interfaces",
     "//mojo/services/public/interfaces/content_handler",
-    "//mojo/services/public/interfaces/input_events",
     "//mojo/services/view_manager/public/cpp",
     "//third_party/pdfium",
   ]
diff --git a/examples/pdf_viewer/pdf_viewer.cc b/examples/pdf_viewer/pdf_viewer.cc
index da3ad08..436bcc1 100644
--- a/examples/pdf_viewer/pdf_viewer.cc
+++ b/examples/pdf_viewer/pdf_viewer.cc
@@ -12,9 +12,9 @@
 #include "mojo/public/cpp/application/application_impl.h"
 #include "mojo/public/cpp/application/interface_factory_impl.h"
 #include "mojo/public/cpp/application/service_provider_impl.h"
+#include "mojo/services/input_events/public/interfaces/input_events.mojom.h"
+#include "mojo/services/input_events/public/interfaces/input_key_codes.mojom.h"
 #include "mojo/services/public/interfaces/content_handler/content_handler.mojom.h"
-#include "mojo/services/public/interfaces/input_events/input_events.mojom.h"
-#include "mojo/services/public/interfaces/input_events/input_key_codes.mojom.h"
 #include "mojo/services/view_manager/public/cpp/types.h"
 #include "mojo/services/view_manager/public/cpp/view.h"
 #include "mojo/services/view_manager/public/cpp/view_manager.h"
diff --git a/examples/window_manager/BUILD.gn b/examples/window_manager/BUILD.gn
index ead2046..6f60bf3 100644
--- a/examples/window_manager/BUILD.gn
+++ b/examples/window_manager/BUILD.gn
@@ -29,7 +29,7 @@
     "//mojo/public/cpp/bindings",
     "//mojo/public/cpp/utility",
     "//mojo/services/geometry/public/interfaces",
-    "//mojo/services/public/interfaces/input_events",
+    "//mojo/services/input_events/public/interfaces",
     "//mojo/services/public/interfaces/navigation",
     "//mojo/services/view_manager/public/cpp",
     "//mojo/views:views",
diff --git a/examples/window_manager/window_manager.cc b/examples/window_manager/window_manager.cc
index 0ab9c2a..34511cf 100644
--- a/examples/window_manager/window_manager.cc
+++ b/examples/window_manager/window_manager.cc
@@ -16,7 +16,7 @@
 #include "mojo/public/cpp/application/application_impl.h"
 #include "mojo/public/cpp/application/interface_factory_impl.h"
 #include "mojo/public/cpp/application/service_provider_impl.h"
-#include "mojo/services/public/interfaces/input_events/input_events.mojom.h"
+#include "mojo/services/input_events/public/interfaces/input_events.mojom.h"
 #include "mojo/services/public/interfaces/navigation/navigation.mojom.h"
 #include "mojo/services/view_manager/public/cpp/view.h"
 #include "mojo/services/view_manager/public/cpp/view_manager.h"
diff --git a/examples/wm_flow/BUILD.gn b/examples/wm_flow/BUILD.gn
index 9aa6d24..be4129f 100644
--- a/examples/wm_flow/BUILD.gn
+++ b/examples/wm_flow/BUILD.gn
@@ -32,7 +32,7 @@
     "//ui/views",
     "//ui/wm:wm",
     "//mojo/application",
-    "//mojo/services/public/interfaces/input_events",
+    "//mojo/services/input_events/public/interfaces",
     "//mojo/services/view_manager/public/cpp",
     "//mojo/views:views",
     "//services/window_manager:lib",
diff --git a/examples/wm_flow/wm/wm.cc b/examples/wm_flow/wm/wm.cc
index a91ac26..7183697 100644
--- a/examples/wm_flow/wm/wm.cc
+++ b/examples/wm_flow/wm/wm.cc
@@ -10,7 +10,7 @@
 #include "mojo/public/cpp/application/application_delegate.h"
 #include "mojo/public/cpp/application/application_impl.h"
 #include "mojo/public/cpp/application/service_provider_impl.h"
-#include "mojo/services/public/interfaces/input_events/input_events.mojom.h"
+#include "mojo/services/input_events/public/interfaces/input_events.mojom.h"
 #include "mojo/services/view_manager/public/cpp/view_manager.h"
 #include "mojo/services/view_manager/public/cpp/view_manager_delegate.h"
 #include "mojo/services/view_manager/public/cpp/view_observer.h"
diff --git a/mojo/converters/input_events/BUILD.gn b/mojo/converters/input_events/BUILD.gn
index 97c1abb..b4d46e1 100644
--- a/mojo/converters/input_events/BUILD.gn
+++ b/mojo/converters/input_events/BUILD.gn
@@ -21,6 +21,6 @@
     "//mojo/environment:chromium",
     "//mojo/public/c/system",
     "//mojo/services/geometry/public/interfaces",
-    "//mojo/services/public/interfaces/input_events",
+    "//mojo/services/input_events/public/interfaces",
   ]
 }
diff --git a/mojo/converters/input_events/input_events_type_converters.cc b/mojo/converters/input_events/input_events_type_converters.cc
index 58ee75a..cd78386 100644
--- a/mojo/converters/input_events/input_events_type_converters.cc
+++ b/mojo/converters/input_events/input_events_type_converters.cc
@@ -11,7 +11,7 @@
 
 #include "mojo/converters/geometry/geometry_type_converters.h"
 #include "mojo/converters/input_events/mojo_extended_key_event_data.h"
-#include "mojo/services/public/interfaces/input_events/input_events.mojom.h"
+#include "mojo/services/input_events/public/interfaces/input_events.mojom.h"
 #include "ui/events/event_utils.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 
diff --git a/mojo/converters/input_events/input_events_type_converters.h b/mojo/converters/input_events/input_events_type_converters.h
index 0577630..96cb264 100644
--- a/mojo/converters/input_events/input_events_type_converters.h
+++ b/mojo/converters/input_events/input_events_type_converters.h
@@ -7,7 +7,7 @@
 
 #include "base/memory/scoped_ptr.h"
 #include "mojo/converters/input_events/mojo_input_events_export.h"
-#include "mojo/services/public/interfaces/input_events/input_events.mojom.h"
+#include "mojo/services/input_events/public/interfaces/input_events.mojom.h"
 #include "ui/events/event.h"
 
 namespace mojo {
diff --git a/mojo/services/BUILD.gn b/mojo/services/BUILD.gn
index f66efba..1c8a916 100644
--- a/mojo/services/BUILD.gn
+++ b/mojo/services/BUILD.gn
@@ -8,12 +8,12 @@
   deps = [
     "//mojo/services/accessibility/public/interfaces",
     "//mojo/services/geometry/public/interfaces",
+    "//mojo/services/input_events/public/interfaces",
     "//mojo/services/native_viewport/public/interfaces",
     "//mojo/services/network",
     "//mojo/services/network/public/interfaces",
     "//mojo/services/public/interfaces/clipboard",
     "//mojo/services/public/interfaces/content_handler",
-    "//mojo/services/public/interfaces/input_events",
     "//mojo/services/public/interfaces/navigation",
     "//mojo/services/surfaces/public/interfaces",
   ]
diff --git a/mojo/services/public/interfaces/input_events/BUILD.gn b/mojo/services/input_events/public/interfaces/BUILD.gn
similarity index 93%
rename from mojo/services/public/interfaces/input_events/BUILD.gn
rename to mojo/services/input_events/public/interfaces/BUILD.gn
index de7a3a9..114ccb1 100644
--- a/mojo/services/public/interfaces/input_events/BUILD.gn
+++ b/mojo/services/input_events/public/interfaces/BUILD.gn
@@ -4,7 +4,7 @@
 
 import("//mojo/public/tools/bindings/mojom.gni")
 
-mojom("input_events") {
+mojom("interfaces") {
   sources = [
     "input_events.mojom",
     "input_event_constants.mojom",
diff --git a/mojo/services/public/interfaces/input_events/input_event_constants.mojom b/mojo/services/input_events/public/interfaces/input_event_constants.mojom
similarity index 100%
rename from mojo/services/public/interfaces/input_events/input_event_constants.mojom
rename to mojo/services/input_events/public/interfaces/input_event_constants.mojom
diff --git a/mojo/services/public/interfaces/input_events/input_events.mojom b/mojo/services/input_events/public/interfaces/input_events.mojom
similarity index 94%
rename from mojo/services/public/interfaces/input_events/input_events.mojom
rename to mojo/services/input_events/public/interfaces/input_events.mojom
index 2611450..08463bc 100644
--- a/mojo/services/public/interfaces/input_events/input_events.mojom
+++ b/mojo/services/input_events/public/interfaces/input_events.mojom
@@ -5,8 +5,8 @@
 module mojo;
 
 import "mojo/services/geometry/public/interfaces/geometry.mojom";
-import "mojo/services/public/interfaces/input_events/input_event_constants.mojom";
-import "mojo/services/public/interfaces/input_events/input_key_codes.mojom";
+import "mojo/services/input_events/public/interfaces/input_event_constants.mojom";
+import "mojo/services/input_events/public/interfaces/input_key_codes.mojom";
 
 struct LocationData {
   Point? in_view_location;
diff --git a/mojo/services/public/interfaces/input_events/input_key_codes.mojom b/mojo/services/input_events/public/interfaces/input_key_codes.mojom
similarity index 100%
rename from mojo/services/public/interfaces/input_events/input_key_codes.mojom
rename to mojo/services/input_events/public/interfaces/input_key_codes.mojom
diff --git a/mojo/services/native_viewport/public/interfaces/BUILD.gn b/mojo/services/native_viewport/public/interfaces/BUILD.gn
index eda552f..8a49c91 100644
--- a/mojo/services/native_viewport/public/interfaces/BUILD.gn
+++ b/mojo/services/native_viewport/public/interfaces/BUILD.gn
@@ -12,7 +12,7 @@
   public_deps = [
     "//mojo/services/geometry/public/interfaces",
     "//mojo/services/gpu/public/interfaces",
-    "//mojo/services/public/interfaces/input_events",
+    "//mojo/services/input_events/public/interfaces",
     "//mojo/services/surfaces/public/interfaces:surface_id",
   ]
 }
diff --git a/mojo/services/native_viewport/public/interfaces/native_viewport.mojom b/mojo/services/native_viewport/public/interfaces/native_viewport.mojom
index 7772434..550aad8 100644
--- a/mojo/services/native_viewport/public/interfaces/native_viewport.mojom
+++ b/mojo/services/native_viewport/public/interfaces/native_viewport.mojom
@@ -6,7 +6,7 @@
 
 import "mojo/services/geometry/public/interfaces/geometry.mojom";
 import "mojo/services/gpu/public/interfaces/command_buffer.mojom";
-import "mojo/services/public/interfaces/input_events/input_events.mojom";
+import "mojo/services/input_events/public/interfaces/input_events.mojom";
 import "mojo/services/surfaces/public/interfaces/surface_id.mojom";
 
 [Client=NativeViewportClient]
diff --git a/mojo/services/public/mojo_services_public.gyp b/mojo/services/public/mojo_services_public.gyp
index 7059800..ed3cb25 100644
--- a/mojo/services/public/mojo_services_public.gyp
+++ b/mojo/services/public/mojo_services_public.gyp
@@ -42,13 +42,13 @@
       ],
     },
     {
-      # GN version: //mojo/services/public/interfaces/input_events
+      # GN version: //mojo/services/input_events/public/interfaces
       'target_name': 'mojo_input_events_bindings',
       'type': 'static_library',
       'sources': [
-        'interfaces/input_events/input_event_constants.mojom',
-        'interfaces/input_events/input_events.mojom',
-        'interfaces/input_events/input_key_codes.mojom',
+        '../input_events/public/interfaces/input_event_constants.mojom',
+        '../input_events/public/interfaces/input_events.mojom',
+        '../input_events/public/interfaces/input_key_codes.mojom',
       ],
       'includes': [ '../../public/tools/bindings/mojom_bindings_generator.gypi' ],
       'dependencies': [
diff --git a/mojo/services/view_manager/public/cpp/BUILD.gn b/mojo/services/view_manager/public/cpp/BUILD.gn
index e0e6a94..e86ee06 100644
--- a/mojo/services/view_manager/public/cpp/BUILD.gn
+++ b/mojo/services/view_manager/public/cpp/BUILD.gn
@@ -33,7 +33,7 @@
     "//mojo/public/cpp/bindings:bindings",
     "//mojo/public/interfaces/application",
     "//mojo/services/geometry/public/interfaces",
-    "//mojo/services/public/interfaces/input_events:input_events",
+    "//mojo/services/input_events/public/interfaces",
     "//mojo/services/surfaces/public/interfaces:surface_id",
     "//mojo/services/view_manager/public/interfaces",
     "//mojo/services/window_manager/public/interfaces",
diff --git a/mojo/services/view_manager/public/cpp/DEPS b/mojo/services/view_manager/public/cpp/DEPS
index 0165d5d..29da7f0 100644
--- a/mojo/services/view_manager/public/cpp/DEPS
+++ b/mojo/services/view_manager/public/cpp/DEPS
@@ -1,7 +1,7 @@
 include_rules = [
   "+mojo/services/geometry/public/cpp",
   "+mojo/services/geometry/public/interfaces",
-  "+mojo/services/public/interfaces/input_events",
+  "+mojo/services/input_events/public/interfaces",
   "+mojo/services/surfaces/public/interfaces",
   "+ui/gfx/geometry"
 ]
diff --git a/mojo/services/view_manager/public/cpp/view_observer.h b/mojo/services/view_manager/public/cpp/view_observer.h
index 2ce842d..1445b1c 100644
--- a/mojo/services/view_manager/public/cpp/view_observer.h
+++ b/mojo/services/view_manager/public/cpp/view_observer.h
@@ -9,7 +9,7 @@
 
 #include "base/basictypes.h"
 
-#include "mojo/services/public/interfaces/input_events/input_events.mojom.h"
+#include "mojo/services/input_events/public/interfaces/input_events.mojom.h"
 #include "mojo/services/view_manager/public/cpp/view.h"
 
 namespace mojo {
diff --git a/mojo/services/view_manager/public/interfaces/BUILD.gn b/mojo/services/view_manager/public/interfaces/BUILD.gn
index 4252ca9..74c1d83 100644
--- a/mojo/services/view_manager/public/interfaces/BUILD.gn
+++ b/mojo/services/view_manager/public/interfaces/BUILD.gn
@@ -14,7 +14,7 @@
   deps = [
     "//mojo/public/interfaces/application",
     "//mojo/services/geometry/public/interfaces",
-    "//mojo/services/public/interfaces/input_events",
+    "//mojo/services/input_events/public/interfaces",
     "//mojo/services/surfaces/public/interfaces:surface_id",
   ]
 }
diff --git a/mojo/services/view_manager/public/interfaces/view_manager.mojom b/mojo/services/view_manager/public/interfaces/view_manager.mojom
index c0967c3..706849d 100644
--- a/mojo/services/view_manager/public/interfaces/view_manager.mojom
+++ b/mojo/services/view_manager/public/interfaces/view_manager.mojom
@@ -6,7 +6,7 @@
 
 import "mojo/public/interfaces/application/service_provider.mojom";
 import "mojo/services/geometry/public/interfaces/geometry.mojom";
-import "mojo/services/public/interfaces/input_events/input_events.mojom";
+import "mojo/services/input_events/public/interfaces/input_events.mojom";
 import "mojo/services/surfaces/public/interfaces/surface_id.mojom";
 import "mojo/services/view_manager/public/interfaces/view_manager_constants.mojom";
 
diff --git a/mojo/services/window_manager/public/interfaces/BUILD.gn b/mojo/services/window_manager/public/interfaces/BUILD.gn
index 64b8005..413f2a2 100644
--- a/mojo/services/window_manager/public/interfaces/BUILD.gn
+++ b/mojo/services/window_manager/public/interfaces/BUILD.gn
@@ -13,6 +13,6 @@
   deps = [
     "//mojo/public/interfaces/application",
     "//mojo/services/geometry/public/interfaces",
-    "//mojo/services/public/interfaces/input_events",
+    "//mojo/services/input_events/public/interfaces",
   ]
 }
diff --git a/mojo/services/window_manager/public/interfaces/window_manager.mojom b/mojo/services/window_manager/public/interfaces/window_manager.mojom
index 8fe6f21..170e1e5 100644
--- a/mojo/services/window_manager/public/interfaces/window_manager.mojom
+++ b/mojo/services/window_manager/public/interfaces/window_manager.mojom
@@ -5,7 +5,7 @@
 module mojo;
 
 import "mojo/public/interfaces/application/service_provider.mojom";
-import "mojo/services/public/interfaces/input_events/input_events.mojom";
+import "mojo/services/input_events/public/interfaces/input_events.mojom";
 
 [Client=WindowManagerClient]
 interface WindowManager {
diff --git a/mojo/services/window_manager/public/interfaces/window_manager_internal.mojom b/mojo/services/window_manager/public/interfaces/window_manager_internal.mojom
index 955e534..7892288 100644
--- a/mojo/services/window_manager/public/interfaces/window_manager_internal.mojom
+++ b/mojo/services/window_manager/public/interfaces/window_manager_internal.mojom
@@ -5,7 +5,7 @@
 module mojo;
 
 import "mojo/services/geometry/public/interfaces/geometry.mojom";
-import "mojo/services/public/interfaces/input_events/input_events.mojom";
+import "mojo/services/input_events/public/interfaces/input_events.mojom";
 
 // WindowManagerInternal is an interface provided by the WindowManager
 // exclusively to the ViewManager.
diff --git a/mojo/tools/roll/rev_sdk.py b/mojo/tools/roll/rev_sdk.py
index 5d88381..7fdd9eb 100755
--- a/mojo/tools/roll/rev_sdk.py
+++ b/mojo/tools/roll/rev_sdk.py
@@ -16,6 +16,7 @@
   "mojo/services/accessibility/public",
   "mojo/services/geometry/public",
   "mojo/services/gpu/public",
+  "mojo/services/input_events/public",
   "mojo/services/native_viewport/public",
   "mojo/services/network/public",
   "mojo/services/surfaces/public",
diff --git a/services/view_manager/BUILD.gn b/services/view_manager/BUILD.gn
index aac53ff..95478b9 100644
--- a/services/view_manager/BUILD.gn
+++ b/services/view_manager/BUILD.gn
@@ -66,8 +66,8 @@
     "//mojo/public/cpp/bindings:callback",
     "//mojo/public/interfaces/application",
     "//mojo/services/geometry/public/interfaces",
+    "//mojo/services/input_events/public/interfaces",
     "//mojo/services/native_viewport/public/interfaces",
-    "//mojo/services/public/interfaces/input_events",
     "//mojo/services/surfaces/public/cpp",
     "//mojo/services/surfaces/public/interfaces",
     "//mojo/services/view_manager/public/interfaces",
diff --git a/sky/services/testing/BUILD.gn b/sky/services/testing/BUILD.gn
index 316c447..affd0c3 100644
--- a/sky/services/testing/BUILD.gn
+++ b/sky/services/testing/BUILD.gn
@@ -10,6 +10,6 @@
   ]
 
   deps = [
-    "//mojo/services/public/interfaces/input_events",
+    "//mojo/services/input_events/public/interfaces",
   ]
 }
diff --git a/sky/services/testing/test_harness.mojom b/sky/services/testing/test_harness.mojom
index 586f619..0b8d375 100644
--- a/sky/services/testing/test_harness.mojom
+++ b/sky/services/testing/test_harness.mojom
@@ -4,7 +4,7 @@
 
 module sky;
 
-import "mojo/services/public/interfaces/input_events/input_events.mojom";
+import "mojo/services/input_events/public/interfaces/input_events.mojom";
 
 interface TestHarness {
   OnTestComplete(string test_result);
diff --git a/sky/tests/resources/event-sender.sky b/sky/tests/resources/event-sender.sky
index d591bb7..fee71f7 100644
--- a/sky/tests/resources/event-sender.sky
+++ b/sky/tests/resources/event-sender.sky
@@ -1,6 +1,6 @@
-<import src="/mojo/services/public/interfaces/input_events/input_event_constants.mojom.sky" as="constants" />
-<import src="/mojo/services/public/interfaces/input_events/input_events.mojom.sky" as="events" />
-<import src="/mojo/services/public/interfaces/input_events/input_key_codes.mojom.sky" as="codes" />
+<import src="/mojo/services/input_events/public/interfaces/input_event_constants.mojom.sky" as="constants" />
+<import src="/mojo/services/input_events/public/interfaces/input_events.mojom.sky" as="events" />
+<import src="/mojo/services/input_events/public/interfaces/input_key_codes.mojom.sky" as="codes" />
 <import src="/sky/framework/shell.sky" as="shell" />
 <import src="/sky/services/testing/test_harness.mojom.sky" as="harness" />
 <script>
diff --git a/sky/tests/services/event-sender.sky b/sky/tests/services/event-sender.sky
index 748f64e..9947206 100644
--- a/sky/tests/services/event-sender.sky
+++ b/sky/tests/services/event-sender.sky
@@ -1,8 +1,8 @@
 <sky>
 <import src="../resources/chai.sky" />
 <import src="../resources/mocha.sky" />
-<import src="/mojo/services/public/interfaces/input_events/input_event_constants.mojom.sky" as="constants" />
-<import src="/mojo/services/public/interfaces/input_events/input_events.mojom.sky" as="events" />
+<import src="/mojo/services/input_events/public/interfaces/input_event_constants.mojom.sky" as="constants" />
+<import src="/mojo/services/input_events/public/interfaces/input_events.mojom.sky" as="events" />
 <import src="/sky/framework/shell.sky" as="shell" />
 <import src="/sky/services/testing/test_harness.mojom.sky" as="harness" />
 
diff --git a/sky/tools/debugger/BUILD.gn b/sky/tools/debugger/BUILD.gn
index a1bb49a..f5ca6d5 100644
--- a/sky/tools/debugger/BUILD.gn
+++ b/sky/tools/debugger/BUILD.gn
@@ -30,7 +30,7 @@
     "//mojo/converters/input_events",
     "//mojo/public/cpp/bindings",
     "//mojo/public/cpp/utility",
-    "//mojo/services/public/interfaces/input_events:input_events",
+    "//mojo/services/input_events/public/interfaces",
     "//mojo/services/public/interfaces/navigation",
     "//mojo/services/view_manager/public/cpp",
     "//services/window_manager:lib",
diff --git a/sky/tools/debugger/debugger.h b/sky/tools/debugger/debugger.h
index 67b4302..5cd1cf6 100644
--- a/sky/tools/debugger/debugger.h
+++ b/sky/tools/debugger/debugger.h
@@ -7,7 +7,7 @@
 #include "mojo/public/cpp/application/application_impl.h"
 #include "mojo/public/cpp/application/connect.h"
 #include "mojo/public/cpp/application/service_provider_impl.h"
-#include "mojo/services/public/interfaces/input_events/input_events.mojom.h"
+#include "mojo/services/input_events/public/interfaces/input_events.mojom.h"
 #include "mojo/services/public/interfaces/navigation/navigation.mojom.h"
 #include "mojo/services/view_manager/public/cpp/view_manager.h"
 #include "mojo/services/view_manager/public/cpp/view_manager_delegate.h"
diff --git a/sky/tools/tester/BUILD.gn b/sky/tools/tester/BUILD.gn
index 872f922..3da125a 100644
--- a/sky/tools/tester/BUILD.gn
+++ b/sky/tools/tester/BUILD.gn
@@ -23,7 +23,7 @@
     "//mojo/public/cpp/bindings",
     "//mojo/public/cpp/system",
     "//mojo/public/cpp/utility",
-    "//mojo/services/public/interfaces/input_events",
+    "//mojo/services/input_events/public/interfaces",
     "//mojo/services/view_manager/public/cpp",
     "//services/window_manager:lib",
     "//sky/services/testing:bindings",
diff --git a/sky/tools/tester/tester.cc b/sky/tools/tester/tester.cc
index 29bf302..19f0db8 100644
--- a/sky/tools/tester/tester.cc
+++ b/sky/tools/tester/tester.cc
@@ -11,7 +11,7 @@
 #include "mojo/public/cpp/application/application_impl.h"
 #include "mojo/public/cpp/application/connect.h"
 #include "mojo/public/cpp/application/service_provider_impl.h"
-#include "mojo/services/public/interfaces/input_events/input_events.mojom.h"
+#include "mojo/services/input_events/public/interfaces/input_events.mojom.h"
 #include "mojo/services/view_manager/public/cpp/view_manager.h"
 #include "mojo/services/view_manager/public/cpp/view_manager_delegate.h"
 #include "mojo/services/view_manager/public/cpp/view_observer.h"
diff --git a/sky/viewer/BUILD.gn b/sky/viewer/BUILD.gn
index 2f52d9d..5b94997 100644
--- a/sky/viewer/BUILD.gn
+++ b/sky/viewer/BUILD.gn
@@ -50,9 +50,9 @@
     "//mojo/public/cpp/utility",
     "//mojo/public/interfaces/application",
     "//mojo/services/gpu/public/interfaces",
+    "//mojo/services/input_events/public/interfaces",
     "//mojo/services/network/public/interfaces",
     "//mojo/services/public/interfaces/content_handler",
-    "//mojo/services/public/interfaces/input_events",
     "//mojo/services/public/interfaces/navigation",
     "//mojo/services/surfaces/public/interfaces",
     "//mojo/services/view_manager/public/cpp",
diff --git a/sky/viewer/converters/input_event_types.cc b/sky/viewer/converters/input_event_types.cc
index 045aca7..182743a 100644
--- a/sky/viewer/converters/input_event_types.cc
+++ b/sky/viewer/converters/input_event_types.cc
@@ -6,7 +6,7 @@
 
 #include "base/logging.h"
 #include "base/time/time.h"
-#include "mojo/services/public/interfaces/input_events/input_event_constants.mojom.h"
+#include "mojo/services/input_events/public/interfaces/input_event_constants.mojom.h"
 #include "sky/engine/public/web/WebInputEvent.h"
 
 namespace mojo {
diff --git a/sky/viewer/converters/input_event_types.h b/sky/viewer/converters/input_event_types.h
index 95a0e68..4d2332a 100644
--- a/sky/viewer/converters/input_event_types.h
+++ b/sky/viewer/converters/input_event_types.h
@@ -6,7 +6,7 @@
 #define SKY_VIEWER_CONVERTERS_INPUT_EVENT_TYPES_H_
 
 #include "base/memory/scoped_ptr.h"
-#include "mojo/services/public/interfaces/input_events/input_events.mojom.h"
+#include "mojo/services/input_events/public/interfaces/input_events.mojom.h"
 
 namespace blink {
 class WebInputEvent;