diff --git a/compositor/BUILD.gn b/compositor/BUILD.gn
index 514cdcf7af8..40c4841fe03 100644
--- a/compositor/BUILD.gn
+++ b/compositor/BUILD.gn
@@ -32,10 +32,10 @@ source_set("compositor") {
     "//mojo/public/cpp/system",
     "//mojo/public/cpp/utility",
     "//mojo/public/interfaces/application",
-    "//mojo/services/public/cpp/surfaces",
     "//mojo/services/public/interfaces/geometry",
-    "//mojo/services/public/interfaces/surfaces",
-    "//mojo/services/public/interfaces/surfaces:surface_id",
+    "//mojo/services/surfaces/public/cpp",
+    "//mojo/services/surfaces/public/interfaces",
+    "//mojo/services/surfaces/public/interfaces:surface_id",
     "//mojo/skia",
     "//skia",
     "//ui/gfx/geometry",
diff --git a/compositor/layer_host.cc b/compositor/layer_host.cc
index 50fc24b7e48..36b3ec26e5c 100644
--- a/compositor/layer_host.cc
+++ b/compositor/layer_host.cc
@@ -8,7 +8,7 @@
 #include "base/message_loop/message_loop.h"
 #include "mojo/converters/geometry/geometry_type_converters.h"
 #include "mojo/gpu/gl_context.h"
-#include "mojo/services/public/cpp/surfaces/surfaces_utils.h"
+#include "mojo/services/surfaces/public/cpp/surfaces_utils.h"
 #include "mojo/skia/ganesh_context.h"
 #include "sky/compositor/layer.h"
 
diff --git a/compositor/layer_host_client.h b/compositor/layer_host_client.h
index 22a79e1f5dd..f2146d64d6a 100644
--- a/compositor/layer_host_client.h
+++ b/compositor/layer_host_client.h
@@ -6,7 +6,7 @@
 #define SKY_COMPOSITOR_LAYER_HOST_CLIENT_H_
 
 #include "base/time/time.h"
-#include "mojo/services/public/interfaces/surfaces/surface_id.mojom.h"
+#include "mojo/services/surfaces/public/interfaces/surface_id.mojom.h"
 
 namespace mojo {
 class Shell;
diff --git a/compositor/resource_manager.h b/compositor/resource_manager.h
index 24f4dbcb573..9c9b5c97ec0 100644
--- a/compositor/resource_manager.h
+++ b/compositor/resource_manager.h
@@ -7,7 +7,7 @@
 
 #include "base/containers/hash_tables.h"
 #include "base/memory/weak_ptr.h"
-#include "mojo/services/public/interfaces/surfaces/surfaces.mojom.h"
+#include "mojo/services/surfaces/public/interfaces/surfaces.mojom.h"
 
 namespace gfx {
 class Size;
diff --git a/compositor/surface_holder.h b/compositor/surface_holder.h
index 4abeb3f668c..e33bce31c94 100644
--- a/compositor/surface_holder.h
+++ b/compositor/surface_holder.h
@@ -8,9 +8,9 @@
 #include "base/callback_forward.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
-#include "mojo/services/public/interfaces/surfaces/surface_id.mojom.h"
-#include "mojo/services/public/interfaces/surfaces/surfaces.mojom.h"
-#include "mojo/services/public/interfaces/surfaces/surfaces_service.mojom.h"
+#include "mojo/services/surfaces/public/interfaces/surface_id.mojom.h"
+#include "mojo/services/surfaces/public/interfaces/surfaces.mojom.h"
+#include "mojo/services/surfaces/public/interfaces/surfaces_service.mojom.h"
 #include "ui/gfx/geometry/rect.h"
 
 namespace mojo {
diff --git a/viewer/BUILD.gn b/viewer/BUILD.gn
index 1678bbfe9b8..c4b40f53ef2 100644
--- a/viewer/BUILD.gn
+++ b/viewer/BUILD.gn
@@ -54,7 +54,7 @@ mojo_native_application("viewer") {
     "//mojo/services/public/interfaces/input_events",
     "//mojo/services/public/interfaces/navigation",
     "//mojo/services/public/interfaces/network",
-    "//mojo/services/public/interfaces/surfaces",
+    "//mojo/services/surfaces/public/interfaces",
     "//mojo/services/view_manager/public/cpp",
     "//net",
     "//skia",
diff --git a/viewer/document_view.cc b/viewer/document_view.cc
index a0a6b9c3c75..51eae14a4c3 100644
--- a/viewer/document_view.cc
+++ b/viewer/document_view.cc
@@ -14,7 +14,7 @@
 #include "mojo/public/cpp/application/connect.h"
 #include "mojo/public/cpp/system/data_pipe.h"
 #include "mojo/public/interfaces/application/shell.mojom.h"
-#include "mojo/services/public/interfaces/surfaces/surfaces_service.mojom.h"
+#include "mojo/services/surfaces/public/interfaces/surfaces_service.mojom.h"
 #include "mojo/services/view_manager/public/cpp/view.h"
 #include "skia/ext/refptr.h"
 #include "sky/compositor/layer.h"