diff --git a/apps/moterm/BUILD.gn b/apps/moterm/BUILD.gn
index c987d04..c28f108 100644
--- a/apps/moterm/BUILD.gn
+++ b/apps/moterm/BUILD.gn
@@ -23,7 +23,7 @@
     "//mojo/public/cpp/application",
     "//mojo/public/cpp/bindings",
     "//mojo/public/cpp/bindings:callback",
-    "//mojo/services/files/public/interfaces",
+    "//mojo/services/files/interfaces",
     "//mojo/services/surfaces/public/interfaces:surface_id",
     "//mojo/services/terminal/public/interfaces",
     "//mojo/services/view_manager/public/cpp",
@@ -57,7 +57,7 @@
   public_deps = [
     "//base",
     "//mojo/public/cpp/bindings",
-    "//mojo/services/files/public/interfaces",
+    "//mojo/services/files/interfaces",
   ]
 }
 
diff --git a/apps/moterm/README.md b/apps/moterm/README.md
index d37a8d4..451f0dd 100644
--- a/apps/moterm/README.md
+++ b/apps/moterm/README.md
@@ -23,5 +23,5 @@
 ## See also
 
 * [//examples/moterm_example_app](../../examples/moterm_example_app)
-* [//mojo/services/files/public/interfaces](../../mojo/services/files/public/interfaces)
+* [//mojo/services/files/interfaces](../../mojo/services/files/interfaces)
 * [//mojo/services/terminal/public/interfaces](../../mojo/services/terminal/public/interfaces)
diff --git a/apps/moterm/moterm_driver.cc b/apps/moterm/moterm_driver.cc
index a6af1da..d81c7b8 100644
--- a/apps/moterm/moterm_driver.cc
+++ b/apps/moterm/moterm_driver.cc
@@ -8,8 +8,8 @@
 #include <limits>
 
 #include "base/logging.h"
-#include "mojo/services/files/public/interfaces/ioctl.mojom.h"
-#include "mojo/services/files/public/interfaces/ioctl_terminal.mojom.h"
+#include "mojo/services/files/interfaces/ioctl.mojom.h"
+#include "mojo/services/files/interfaces/ioctl_terminal.mojom.h"
 
 // Character constants:
 const uint8_t kEOT = 4;
diff --git a/apps/moterm/moterm_driver.h b/apps/moterm/moterm_driver.h
index 57a2ab2..93a3445 100644
--- a/apps/moterm/moterm_driver.h
+++ b/apps/moterm/moterm_driver.h
@@ -20,8 +20,8 @@
 #include "base/memory/weak_ptr.h"
 #include "mojo/public/cpp/bindings/interface_request.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
-#include "mojo/services/files/public/interfaces/file.mojom.h"
-#include "mojo/services/files/public/interfaces/types.mojom.h"
+#include "mojo/services/files/interfaces/file.mojom.h"
+#include "mojo/services/files/interfaces/types.mojom.h"
 
 // TODO(vtl): Maybe we should Mojo-fy the driver and run it as a separate app?
 class MotermDriver : public mojo::files::File {
diff --git a/apps/moterm/moterm_driver_unittest.cc b/apps/moterm/moterm_driver_unittest.cc
index 0e6b7a1..692e75f 100644
--- a/apps/moterm/moterm_driver_unittest.cc
+++ b/apps/moterm/moterm_driver_unittest.cc
@@ -14,8 +14,8 @@
 #include "mojo/public/cpp/application/application_test_base.h"
 #include "mojo/public/cpp/bindings/callback.h"
 #include "mojo/public/cpp/bindings/type_converter.h"
-#include "mojo/services/files/public/interfaces/file.mojom.h"
-#include "mojo/services/files/public/interfaces/types.mojom.h"
+#include "mojo/services/files/interfaces/file.mojom.h"
+#include "mojo/services/files/interfaces/types.mojom.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
diff --git a/apps/moterm/moterm_view.cc b/apps/moterm/moterm_view.cc
index 35acabc..82f30d6 100644
--- a/apps/moterm/moterm_view.cc
+++ b/apps/moterm/moterm_view.cc
@@ -17,8 +17,8 @@
 #include "apps/moterm/key_util.h"
 #include "base/logging.h"
 #include "mojo/public/cpp/bindings/interface_request.h"
-#include "mojo/services/files/public/interfaces/file.mojom.h"
-#include "mojo/services/files/public/interfaces/types.mojom.h"
+#include "mojo/services/files/interfaces/file.mojom.h"
+#include "mojo/services/files/interfaces/types.mojom.h"
 #include "mojo/services/input_events/public/interfaces/input_event_constants.mojom.h"
 #include "mojo/services/input_events/public/interfaces/input_events.mojom.h"
 #include "mojo/services/terminal/public/interfaces/terminal_client.mojom.h"
diff --git a/examples/content_handler_demo/BUILD.gn b/examples/content_handler_demo/BUILD.gn
index d11b9cb..2a529d4 100644
--- a/examples/content_handler_demo/BUILD.gn
+++ b/examples/content_handler_demo/BUILD.gn
@@ -13,6 +13,6 @@
     "//mojo/public/cpp/application:standalone",
     "//mojo/public/cpp/bindings",
     "//mojo/public/cpp/utility",
-    "//mojo/services/content_handler/public/interfaces",
+    "//mojo/services/content_handler/interfaces",
   ]
 }
diff --git a/examples/content_handler_demo/content_handler_demo.cc b/examples/content_handler_demo/content_handler_demo.cc
index cc2a977..df44a5c 100644
--- a/examples/content_handler_demo/content_handler_demo.cc
+++ b/examples/content_handler_demo/content_handler_demo.cc
@@ -10,7 +10,7 @@
 #include "mojo/public/cpp/application/application_runner.h"
 #include "mojo/public/cpp/application/interface_factory_impl.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
-#include "mojo/services/content_handler/public/interfaces/content_handler.mojom.h"
+#include "mojo/services/content_handler/interfaces/content_handler.mojom.h"
 
 namespace mojo {
 namespace examples {
diff --git a/examples/echo_terminal/main.cc b/examples/echo_terminal/main.cc
index 0d4e595..6c5fefb 100644
--- a/examples/echo_terminal/main.cc
+++ b/examples/echo_terminal/main.cc
@@ -12,8 +12,8 @@
 #include "mojo/public/cpp/application/application_connection.h"
 #include "mojo/public/cpp/application/application_delegate.h"
 #include "mojo/public/cpp/application/interface_factory.h"
-#include "mojo/services/files/public/interfaces/file.mojom.h"
-#include "mojo/services/files/public/interfaces/types.mojom.h"
+#include "mojo/services/files/interfaces/file.mojom.h"
+#include "mojo/services/files/interfaces/types.mojom.h"
 #include "mojo/services/terminal/public/interfaces/terminal_client.mojom.h"
 
 const uint32_t kMaxBytesToRead = 1000;
diff --git a/examples/forwarding_content_handler/BUILD.gn b/examples/forwarding_content_handler/BUILD.gn
index 985c49c..c482cf3 100644
--- a/examples/forwarding_content_handler/BUILD.gn
+++ b/examples/forwarding_content_handler/BUILD.gn
@@ -17,7 +17,7 @@
     "//mojo/public/cpp/bindings",
     "//mojo/public/cpp/utility",
     "//mojo/public/interfaces/application:application",
-    "//mojo/services/content_handler/public/interfaces",
+    "//mojo/services/content_handler/interfaces",
     "//mojo/services/network/public/interfaces",
   ]
 }
diff --git a/examples/forwarding_content_handler/forwarding_content_handler.cc b/examples/forwarding_content_handler/forwarding_content_handler.cc
index d9c4118..045132e 100644
--- a/examples/forwarding_content_handler/forwarding_content_handler.cc
+++ b/examples/forwarding_content_handler/forwarding_content_handler.cc
@@ -14,7 +14,7 @@
 #include "mojo/public/cpp/bindings/binding.h"
 #include "mojo/public/cpp/utility/run_loop.h"
 #include "mojo/public/interfaces/application/application.mojom.h"
-#include "mojo/services/content_handler/public/interfaces/content_handler.mojom.h"
+#include "mojo/services/content_handler/interfaces/content_handler.mojom.h"
 
 namespace mojo {
 namespace examples {
diff --git a/examples/js/repl.js b/examples/js/repl.js
index 2c33d6e..ad99744 100644
--- a/examples/js/repl.js
+++ b/examples/js/repl.js
@@ -27,7 +27,7 @@
 
 define("main", [
   "mojo/services/public/js/application",
-  "mojo/services/files/public/interfaces/types.mojom",
+  "mojo/services/files/interfaces/types.mojom",
   "mojo/services/terminal/public/interfaces/terminal_client.mojom",
 ], function(application, files_types, terminal_client) {
   const Application = application.Application;
diff --git a/examples/moterm_example_app/BUILD.gn b/examples/moterm_example_app/BUILD.gn
index 65ed16d..0319d43 100644
--- a/examples/moterm_example_app/BUILD.gn
+++ b/examples/moterm_example_app/BUILD.gn
@@ -16,7 +16,7 @@
     "//mojo/public/cpp/bindings",
     "//mojo/public/cpp/utility",
     "//mojo/public/interfaces/application",
-    "//mojo/services/files/public/interfaces",
+    "//mojo/services/files/interfaces",
     "//mojo/services/geometry/public/interfaces",
     "//mojo/services/view_manager/public/cpp",
     "//mojo/services/terminal/public/interfaces",
diff --git a/examples/moterm_example_app/moterm_example_app.cc b/examples/moterm_example_app/moterm_example_app.cc
index e52ea0f..014da8f 100644
--- a/examples/moterm_example_app/moterm_example_app.cc
+++ b/examples/moterm_example_app/moterm_example_app.cc
@@ -23,8 +23,8 @@
 #include "mojo/public/cpp/bindings/array.h"
 #include "mojo/public/interfaces/application/service_provider.mojom.h"
 #include "mojo/public/interfaces/application/shell.mojom.h"
-#include "mojo/services/files/public/interfaces/file.mojom.h"
-#include "mojo/services/files/public/interfaces/types.mojom.h"
+#include "mojo/services/files/interfaces/file.mojom.h"
+#include "mojo/services/files/interfaces/types.mojom.h"
 #include "mojo/services/terminal/public/interfaces/terminal.mojom.h"
 #include "mojo/services/terminal/public/interfaces/terminal_client.mojom.h"
 #include "mojo/services/view_manager/public/cpp/view.h"
diff --git a/examples/native_run_app/BUILD.gn b/examples/native_run_app/BUILD.gn
index 2605c28..aa00f90 100644
--- a/examples/native_run_app/BUILD.gn
+++ b/examples/native_run_app/BUILD.gn
@@ -14,7 +14,7 @@
     "//mojo/application",
     "//mojo/public/cpp/bindings",
     "//mojo/public/interfaces/application",
-    "//mojo/services/files/public/interfaces",
+    "//mojo/services/files/interfaces",
     "//mojo/services/native_support/public/interfaces",
     "//mojo/services/terminal/public/interfaces",
   ]
diff --git a/examples/native_run_app/native_run_app.cc b/examples/native_run_app/native_run_app.cc
index 306265f..ea4ed82 100644
--- a/examples/native_run_app/native_run_app.cc
+++ b/examples/native_run_app/native_run_app.cc
@@ -29,10 +29,10 @@
 #include "mojo/public/cpp/application/interface_factory.h"
 #include "mojo/public/cpp/bindings/interface_request.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
-#include "mojo/services/files/public/interfaces/files.mojom.h"
-#include "mojo/services/files/public/interfaces/ioctl.mojom.h"
-#include "mojo/services/files/public/interfaces/ioctl_terminal.mojom.h"
-#include "mojo/services/files/public/interfaces/types.mojom.h"
+#include "mojo/services/files/interfaces/files.mojom.h"
+#include "mojo/services/files/interfaces/ioctl.mojom.h"
+#include "mojo/services/files/interfaces/ioctl_terminal.mojom.h"
+#include "mojo/services/files/interfaces/types.mojom.h"
 #include "mojo/services/native_support/public/interfaces/process.mojom.h"
 #include "mojo/services/terminal/public/interfaces/terminal_client.mojom.h"
 
diff --git a/examples/pdf_viewer/BUILD.gn b/examples/pdf_viewer/BUILD.gn
index 68b5b39..2ca8038 100644
--- a/examples/pdf_viewer/BUILD.gn
+++ b/examples/pdf_viewer/BUILD.gn
@@ -16,7 +16,7 @@
     "//mojo/data_pipe_utils",
     "//mojo/public/cpp/bindings",
     "//mojo/public/cpp/utility",
-    "//mojo/services/content_handler/public/interfaces",
+    "//mojo/services/content_handler/interfaces",
     "//mojo/services/input_events/public/interfaces",
     "//mojo/services/network/public/interfaces",
     "//mojo/services/view_manager/public/cpp",
diff --git a/examples/pdf_viewer/pdf_viewer.cc b/examples/pdf_viewer/pdf_viewer.cc
index 1a4dae7..681ea50 100644
--- a/examples/pdf_viewer/pdf_viewer.cc
+++ b/examples/pdf_viewer/pdf_viewer.cc
@@ -14,7 +14,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/content_handler/public/interfaces/content_handler.mojom.h"
+#include "mojo/services/content_handler/interfaces/content_handler.mojom.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/view_manager/public/cpp/types.h"
diff --git a/examples/png_viewer/BUILD.gn b/examples/png_viewer/BUILD.gn
index 15fe4d1..ee18e5a 100644
--- a/examples/png_viewer/BUILD.gn
+++ b/examples/png_viewer/BUILD.gn
@@ -16,7 +16,7 @@
     "//mojo/data_pipe_utils",
     "//mojo/public/cpp/bindings",
     "//mojo/public/cpp/utility",
-    "//mojo/services/content_handler/public/interfaces",
+    "//mojo/services/content_handler/interfaces",
     "//mojo/services/network/public/interfaces",
     "//mojo/services/view_manager/public/cpp",
     "//ui/gfx",
diff --git a/examples/png_viewer/png_viewer.cc b/examples/png_viewer/png_viewer.cc
index e29056a..a5f0c2e 100644
--- a/examples/png_viewer/png_viewer.cc
+++ b/examples/png_viewer/png_viewer.cc
@@ -18,7 +18,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/content_handler/public/interfaces/content_handler.mojom.h"
+#include "mojo/services/content_handler/interfaces/content_handler.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/recursive_content_handler/BUILD.gn b/examples/recursive_content_handler/BUILD.gn
index 4e851a0..5617d52 100644
--- a/examples/recursive_content_handler/BUILD.gn
+++ b/examples/recursive_content_handler/BUILD.gn
@@ -15,7 +15,7 @@
     "//mojo/application:content_handler",
     "//mojo/public/cpp/bindings",
     "//mojo/public/cpp/utility",
-    "//mojo/services/content_handler/public/interfaces",
+    "//mojo/services/content_handler/interfaces",
     "//mojo/services/network/public/interfaces",
   ]
 }
diff --git a/examples/recursive_content_handler/recursive_content_handler.cc b/examples/recursive_content_handler/recursive_content_handler.cc
index 6c4e264..bc4a01c 100644
--- a/examples/recursive_content_handler/recursive_content_handler.cc
+++ b/examples/recursive_content_handler/recursive_content_handler.cc
@@ -11,7 +11,7 @@
 #include "mojo/public/cpp/application/application_delegate.h"
 #include "mojo/public/cpp/application/application_impl.h"
 #include "mojo/public/cpp/application/interface_factory_impl.h"
-#include "mojo/services/content_handler/public/interfaces/content_handler.mojom.h"
+#include "mojo/services/content_handler/interfaces/content_handler.mojom.h"
 
 namespace mojo {
 namespace examples {
diff --git a/mojo/BUILD.gn b/mojo/BUILD.gn
index 7b4d582..50a4d33 100644
--- a/mojo/BUILD.gn
+++ b/mojo/BUILD.gn
@@ -67,8 +67,8 @@
     "//mojo/tools:message_generator",
     "//mojo/gles2:mgl_unittests",
     "//mojo/gpu:apptests",
-    "//mojo/services/files/public/c:apptests",
-    "//mojo/services/files/public/cpp:files_impl_apptests",
+    "//mojo/services/files/c:apptests",
+    "//mojo/services/files/cpp:files_impl_apptests",
   ]
 
   if (is_linux || is_android) {
diff --git a/mojo/application/BUILD.gn b/mojo/application/BUILD.gn
index 35cb345..dce87a2 100644
--- a/mojo/application/BUILD.gn
+++ b/mojo/application/BUILD.gn
@@ -30,7 +30,7 @@
     "//mojo/environment:chromium",
     "//mojo/message_pump",
     "//mojo/public/interfaces/application",
-    "//mojo/services/content_handler/public/interfaces",
+    "//mojo/services/content_handler/interfaces",
     "//mojo/services/network/public/interfaces",
   ]
 }
diff --git a/mojo/application/content_handler_factory.cc b/mojo/application/content_handler_factory.cc
index 9594fdb..5388315 100644
--- a/mojo/application/content_handler_factory.cc
+++ b/mojo/application/content_handler_factory.cc
@@ -19,7 +19,7 @@
 #include "mojo/public/cpp/application/application_impl.h"
 #include "mojo/public/cpp/application/interface_factory_impl.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
-#include "mojo/services/content_handler/public/interfaces/content_handler.mojom.h"
+#include "mojo/services/content_handler/interfaces/content_handler.mojom.h"
 
 namespace mojo {
 
diff --git a/mojo/application/content_handler_factory.h b/mojo/application/content_handler_factory.h
index 8b59bd9..c4ce639 100644
--- a/mojo/application/content_handler_factory.h
+++ b/mojo/application/content_handler_factory.h
@@ -8,7 +8,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "mojo/public/cpp/application/interface_factory.h"
 #include "mojo/public/interfaces/application/shell.mojom.h"
-#include "mojo/services/content_handler/public/interfaces/content_handler.mojom.h"
+#include "mojo/services/content_handler/interfaces/content_handler.mojom.h"
 #include "mojo/services/network/public/interfaces/url_loader.mojom.h"
 
 namespace mojo {
diff --git a/mojo/services/asset_bundle/public/interfaces/BUILD.gn b/mojo/services/asset_bundle/interfaces/BUILD.gn
similarity index 100%
rename from mojo/services/asset_bundle/public/interfaces/BUILD.gn
rename to mojo/services/asset_bundle/interfaces/BUILD.gn
diff --git a/mojo/services/asset_bundle/public/interfaces/asset_bundle.mojom b/mojo/services/asset_bundle/interfaces/asset_bundle.mojom
similarity index 100%
rename from mojo/services/asset_bundle/public/interfaces/asset_bundle.mojom
rename to mojo/services/asset_bundle/interfaces/asset_bundle.mojom
diff --git a/mojo/services/authenticating_url_loader_interceptor/public/interfaces/BUILD.gn b/mojo/services/authenticating_url_loader_interceptor/interfaces/BUILD.gn
similarity index 78%
rename from mojo/services/authenticating_url_loader_interceptor/public/interfaces/BUILD.gn
rename to mojo/services/authenticating_url_loader_interceptor/interfaces/BUILD.gn
index e102b2e..4bf9061 100644
--- a/mojo/services/authenticating_url_loader_interceptor/public/interfaces/BUILD.gn
+++ b/mojo/services/authenticating_url_loader_interceptor/interfaces/BUILD.gn
@@ -10,16 +10,16 @@
     "authenticating_url_loader_interceptor_meta_factory.mojom",
   ]
 
-  import_dirs = [ get_path_info("../../../", "abspath") ]
+  import_dirs = [ get_path_info("../../", "abspath") ]
 
   if (defined(mojo_network_service_root)) {
     import_dirs += [ mojo_network_service_root ]
   } else {
-    mojo_network_service_root = "../../.."
+    mojo_network_service_root = "../.."
   }
 
   deps = [
-    "../../../authentication/public/interfaces",
+    "../../authentication/interfaces",
     "$mojo_network_service_root/network/public/interfaces",
   ]
 }
diff --git a/mojo/services/authenticating_url_loader_interceptor/public/interfaces/authenticating_url_loader_interceptor_meta_factory.mojom b/mojo/services/authenticating_url_loader_interceptor/interfaces/authenticating_url_loader_interceptor_meta_factory.mojom
similarity index 91%
rename from mojo/services/authenticating_url_loader_interceptor/public/interfaces/authenticating_url_loader_interceptor_meta_factory.mojom
rename to mojo/services/authenticating_url_loader_interceptor/interfaces/authenticating_url_loader_interceptor_meta_factory.mojom
index 73c56c0..7aa1130 100644
--- a/mojo/services/authenticating_url_loader_interceptor/public/interfaces/authenticating_url_loader_interceptor_meta_factory.mojom
+++ b/mojo/services/authenticating_url_loader_interceptor/interfaces/authenticating_url_loader_interceptor_meta_factory.mojom
@@ -5,7 +5,7 @@
 [DartPackage="mojo_services"]
 module mojo;
 
-import "authentication/public/interfaces/authentication.mojom";
+import "authentication/interfaces/authentication.mojom";
 import "network/public/interfaces/url_loader_interceptor.mojom";
 
 interface AuthenticatingURLLoaderInterceptorMetaFactory {
diff --git a/mojo/services/authentication/public/interfaces/BUILD.gn b/mojo/services/authentication/interfaces/BUILD.gn
similarity index 100%
rename from mojo/services/authentication/public/interfaces/BUILD.gn
rename to mojo/services/authentication/interfaces/BUILD.gn
diff --git a/mojo/services/authentication/public/interfaces/authentication.mojom b/mojo/services/authentication/interfaces/authentication.mojom
similarity index 100%
rename from mojo/services/authentication/public/interfaces/authentication.mojom
rename to mojo/services/authentication/interfaces/authentication.mojom
diff --git a/mojo/services/camera/public/interfaces/BUILD.gn b/mojo/services/camera/interfaces/BUILD.gn
similarity index 86%
rename from mojo/services/camera/public/interfaces/BUILD.gn
rename to mojo/services/camera/interfaces/BUILD.gn
index c001bf5..327a5ce 100644
--- a/mojo/services/camera/public/interfaces/BUILD.gn
+++ b/mojo/services/camera/interfaces/BUILD.gn
@@ -10,7 +10,7 @@
     "camera.mojom",
   ]
 
-  import_dirs = [ get_path_info("../../../", "abspath") ]
+  import_dirs = [ get_path_info("../../", "abspath") ]
 
   mojo_sdk_deps = [ "mojo/public/interfaces/application" ]
 }
diff --git a/mojo/services/camera/public/interfaces/camera.mojom b/mojo/services/camera/interfaces/camera.mojom
similarity index 100%
rename from mojo/services/camera/public/interfaces/camera.mojom
rename to mojo/services/camera/interfaces/camera.mojom
diff --git a/mojo/services/clipboard/public/interfaces/BUILD.gn b/mojo/services/clipboard/interfaces/BUILD.gn
similarity index 100%
rename from mojo/services/clipboard/public/interfaces/BUILD.gn
rename to mojo/services/clipboard/interfaces/BUILD.gn
diff --git a/mojo/services/clipboard/public/interfaces/clipboard.mojom b/mojo/services/clipboard/interfaces/clipboard.mojom
similarity index 100%
rename from mojo/services/clipboard/public/interfaces/clipboard.mojom
rename to mojo/services/clipboard/interfaces/clipboard.mojom
diff --git a/mojo/services/contacts/public/interfaces/BUILD.gn b/mojo/services/contacts/interfaces/BUILD.gn
similarity index 100%
rename from mojo/services/contacts/public/interfaces/BUILD.gn
rename to mojo/services/contacts/interfaces/BUILD.gn
diff --git a/mojo/services/contacts/public/interfaces/contacts.mojom b/mojo/services/contacts/interfaces/contacts.mojom
similarity index 100%
rename from mojo/services/contacts/public/interfaces/contacts.mojom
rename to mojo/services/contacts/interfaces/contacts.mojom
diff --git a/mojo/services/content_handler/public/interfaces/BUILD.gn b/mojo/services/content_handler/interfaces/BUILD.gn
similarity index 88%
rename from mojo/services/content_handler/public/interfaces/BUILD.gn
rename to mojo/services/content_handler/interfaces/BUILD.gn
index be214e0..19b7f4b 100644
--- a/mojo/services/content_handler/public/interfaces/BUILD.gn
+++ b/mojo/services/content_handler/interfaces/BUILD.gn
@@ -10,7 +10,7 @@
     "content_handler.mojom",
   ]
 
-  import_dirs = [ get_path_info("../../../", "abspath") ]
+  import_dirs = [ get_path_info("../../", "abspath") ]
 
   mojo_sdk_deps = [
     "mojo/public/interfaces/application",
diff --git a/mojo/services/content_handler/public/interfaces/content_handler.mojom b/mojo/services/content_handler/interfaces/content_handler.mojom
similarity index 100%
rename from mojo/services/content_handler/public/interfaces/content_handler.mojom
rename to mojo/services/content_handler/interfaces/content_handler.mojom
diff --git a/mojo/services/device_info/public/interfaces/BUILD.gn b/mojo/services/device_info/interfaces/BUILD.gn
similarity index 86%
rename from mojo/services/device_info/public/interfaces/BUILD.gn
rename to mojo/services/device_info/interfaces/BUILD.gn
index a0400cf..feda5a5 100644
--- a/mojo/services/device_info/public/interfaces/BUILD.gn
+++ b/mojo/services/device_info/interfaces/BUILD.gn
@@ -10,7 +10,7 @@
     "device_info.mojom",
   ]
 
-  import_dirs = [ get_path_info("../../../", "abspath") ]
+  import_dirs = [ get_path_info("../../", "abspath") ]
 
   mojo_sdk_deps = [ "mojo/public/interfaces/application" ]
 }
diff --git a/mojo/services/device_info/public/interfaces/device_info.mojom b/mojo/services/device_info/interfaces/device_info.mojom
similarity index 100%
rename from mojo/services/device_info/public/interfaces/device_info.mojom
rename to mojo/services/device_info/interfaces/device_info.mojom
diff --git a/mojo/services/files/public/c/BUILD.gn b/mojo/services/files/c/BUILD.gn
similarity index 97%
rename from mojo/services/files/public/c/BUILD.gn
rename to mojo/services/files/c/BUILD.gn
index 9cd687b..a0126a1 100644
--- a/mojo/services/files/public/c/BUILD.gn
+++ b/mojo/services/files/c/BUILD.gn
@@ -11,7 +11,7 @@
   # dependencies (so without this we can't depend on our interfaces!).
   restrict_external_deps = false
 
-  public_configs = [ "../../../public/build/config:mojo_services" ]
+  public_configs = [ "../../public/build/config:mojo_services" ]
 
   sources = [
     "lib/directory_wrapper.cc",
diff --git a/mojo/services/files/public/c/lib/directory_wrapper.cc b/mojo/services/files/c/lib/directory_wrapper.cc
similarity index 90%
rename from mojo/services/files/public/c/lib/directory_wrapper.cc
rename to mojo/services/files/c/lib/directory_wrapper.cc
index 986df54..3225696 100644
--- a/mojo/services/files/public/c/lib/directory_wrapper.cc
+++ b/mojo/services/files/c/lib/directory_wrapper.cc
@@ -2,17 +2,17 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "files/public/c/lib/directory_wrapper.h"
+#include "files/c/lib/directory_wrapper.h"
 
 #include <errno.h>
 
-#include "files/public/c/lib/errno_impl.h"
-#include "files/public/c/lib/file_fd_impl.h"
-#include "files/public/c/lib/template_util.h"
-#include "files/public/c/lib/util.h"
-#include "files/public/c/mojio_fcntl.h"
-#include "files/public/interfaces/file.mojom.h"
-#include "files/public/interfaces/types.mojom.h"
+#include "files/c/lib/errno_impl.h"
+#include "files/c/lib/file_fd_impl.h"
+#include "files/c/lib/template_util.h"
+#include "files/c/lib/util.h"
+#include "files/c/mojio_fcntl.h"
+#include "files/interfaces/file.mojom.h"
+#include "files/interfaces/types.mojom.h"
 #include "mojo/public/cpp/bindings/interface_request.h"
 #include "mojo/public/cpp/environment/logging.h"
 
diff --git a/mojo/services/files/public/c/lib/directory_wrapper.h b/mojo/services/files/c/lib/directory_wrapper.h
similarity index 92%
rename from mojo/services/files/public/c/lib/directory_wrapper.h
rename to mojo/services/files/c/lib/directory_wrapper.h
index 90df8c0..aec5d16 100644
--- a/mojo/services/files/public/c/lib/directory_wrapper.h
+++ b/mojo/services/files/c/lib/directory_wrapper.h
@@ -7,8 +7,8 @@
 
 #include <memory>
 
-#include "files/public/c/mojio_sys_types.h"
-#include "files/public/interfaces/directory.mojom.h"
+#include "files/c/mojio_sys_types.h"
+#include "files/interfaces/directory.mojom.h"
 #include "mojo/public/c/system/macros.h"
 
 namespace mojio {
diff --git a/mojo/services/files/public/c/lib/errno_impl.h b/mojo/services/files/c/lib/errno_impl.h
similarity index 100%
rename from mojo/services/files/public/c/lib/errno_impl.h
rename to mojo/services/files/c/lib/errno_impl.h
diff --git a/mojo/services/files/public/c/lib/fd_impl.h b/mojo/services/files/c/lib/fd_impl.h
similarity index 95%
rename from mojo/services/files/public/c/lib/fd_impl.h
rename to mojo/services/files/c/lib/fd_impl.h
index 3884eee..a2822ab 100644
--- a/mojo/services/files/public/c/lib/fd_impl.h
+++ b/mojo/services/files/c/lib/fd_impl.h
@@ -7,8 +7,8 @@
 
 #include <memory>
 
-#include "files/public/c/mojio_sys_stat.h"
-#include "files/public/c/mojio_sys_types.h"
+#include "files/c/mojio_sys_stat.h"
+#include "files/c/mojio_sys_types.h"
 #include "mojo/public/cpp/system/macros.h"
 
 namespace mojio {
diff --git a/mojo/services/files/public/c/lib/fd_table.cc b/mojo/services/files/c/lib/fd_table.cc
similarity index 94%
rename from mojo/services/files/public/c/lib/fd_table.cc
rename to mojo/services/files/c/lib/fd_table.cc
index 9a7986e..e232b79 100644
--- a/mojo/services/files/public/c/lib/fd_table.cc
+++ b/mojo/services/files/c/lib/fd_table.cc
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "files/public/c/lib/fd_table.h"
+#include "files/c/lib/fd_table.h"
 
 #include <errno.h>
 
 #include <limits>
 #include <utility>
 
-#include "files/public/c/lib/errno_impl.h"
+#include "files/c/lib/errno_impl.h"
 #include "mojo/public/cpp/environment/logging.h"
 
 namespace mojio {
diff --git a/mojo/services/files/public/c/lib/fd_table.h b/mojo/services/files/c/lib/fd_table.h
similarity index 97%
rename from mojo/services/files/public/c/lib/fd_table.h
rename to mojo/services/files/c/lib/fd_table.h
index f007320..ba9c60d 100644
--- a/mojo/services/files/public/c/lib/fd_table.h
+++ b/mojo/services/files/c/lib/fd_table.h
@@ -10,7 +10,7 @@
 #include <memory>
 #include <vector>
 
-#include "files/public/c/lib/fd_impl.h"
+#include "files/c/lib/fd_impl.h"
 #include "mojo/public/cpp/system/macros.h"
 
 namespace mojio {
diff --git a/mojo/services/files/public/c/lib/file_fd_impl.cc b/mojo/services/files/c/lib/file_fd_impl.cc
similarity index 96%
rename from mojo/services/files/public/c/lib/file_fd_impl.cc
rename to mojo/services/files/c/lib/file_fd_impl.cc
index d13cf6b..e314c95 100644
--- a/mojo/services/files/public/c/lib/file_fd_impl.cc
+++ b/mojo/services/files/c/lib/file_fd_impl.cc
@@ -2,18 +2,18 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "files/public/c/lib/file_fd_impl.h"
+#include "files/c/lib/file_fd_impl.h"
 
 #include <errno.h>
 #include <string.h>
 
 #include <limits>
 
-#include "files/public/c/lib/errno_impl.h"
-#include "files/public/c/lib/template_util.h"
-#include "files/public/c/lib/util.h"
-#include "files/public/c/mojio_unistd.h"
-#include "files/public/interfaces/types.mojom.h"
+#include "files/c/lib/errno_impl.h"
+#include "files/c/lib/template_util.h"
+#include "files/c/lib/util.h"
+#include "files/c/mojio_unistd.h"
+#include "files/interfaces/types.mojom.h"
 #include "mojo/public/cpp/bindings/interface_request.h"
 #include "mojo/public/cpp/environment/logging.h"
 
diff --git a/mojo/services/files/public/c/lib/file_fd_impl.h b/mojo/services/files/c/lib/file_fd_impl.h
similarity index 88%
rename from mojo/services/files/public/c/lib/file_fd_impl.h
rename to mojo/services/files/c/lib/file_fd_impl.h
index 2a9a7d1..c781738 100644
--- a/mojo/services/files/public/c/lib/file_fd_impl.h
+++ b/mojo/services/files/c/lib/file_fd_impl.h
@@ -5,9 +5,9 @@
 #ifndef SERVICES_FILES_C_LIB_FILE_FD_IMPL_H_
 #define SERVICES_FILES_C_LIB_FILE_FD_IMPL_H_
 
-#include "files/public/c/lib/fd_impl.h"
-#include "files/public/c/mojio_sys_types.h"
-#include "files/public/interfaces/file.mojom.h"
+#include "files/c/lib/fd_impl.h"
+#include "files/c/mojio_sys_types.h"
+#include "files/interfaces/file.mojom.h"
 #include "mojo/public/c/system/macros.h"
 
 namespace mojio {
diff --git a/mojo/services/files/public/c/lib/mojio_fcntl.cc b/mojo/services/files/c/lib/mojio_fcntl.cc
similarity index 83%
rename from mojo/services/files/public/c/lib/mojio_fcntl.cc
rename to mojo/services/files/c/lib/mojio_fcntl.cc
index 30715db..9561de7 100644
--- a/mojo/services/files/public/c/lib/mojio_fcntl.cc
+++ b/mojo/services/files/c/lib/mojio_fcntl.cc
@@ -2,17 +2,17 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "files/public/c/mojio_fcntl.h"
+#include "files/c/mojio_fcntl.h"
 
 #include <stdarg.h>
 
 #include <memory>
 #include <utility>
 
-#include "files/public/c/lib/directory_wrapper.h"
-#include "files/public/c/lib/fd_impl.h"
-#include "files/public/c/lib/fd_table.h"
-#include "files/public/c/lib/singletons.h"
+#include "files/c/lib/directory_wrapper.h"
+#include "files/c/lib/fd_impl.h"
+#include "files/c/lib/fd_table.h"
+#include "files/c/lib/singletons.h"
 
 namespace mojio {
 namespace {
diff --git a/mojo/services/files/public/c/lib/mojio_sys_stat.cc b/mojo/services/files/c/lib/mojio_sys_stat.cc
similarity index 76%
rename from mojo/services/files/public/c/lib/mojio_sys_stat.cc
rename to mojo/services/files/c/lib/mojio_sys_stat.cc
index d03de5a..0dd3ce4 100644
--- a/mojo/services/files/public/c/lib/mojio_sys_stat.cc
+++ b/mojo/services/files/c/lib/mojio_sys_stat.cc
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "files/public/c/mojio_sys_stat.h"
+#include "files/c/mojio_sys_stat.h"
 
-#include "files/public/c/lib/fd_impl.h"
-#include "files/public/c/lib/fd_table.h"
-#include "files/public/c/lib/singletons.h"
+#include "files/c/lib/fd_impl.h"
+#include "files/c/lib/fd_table.h"
+#include "files/c/lib/singletons.h"
 
 namespace mojio {
 namespace {
diff --git a/mojo/services/files/public/c/lib/mojio_unistd.cc b/mojo/services/files/c/lib/mojio_unistd.cc
similarity index 91%
rename from mojo/services/files/public/c/lib/mojio_unistd.cc
rename to mojo/services/files/c/lib/mojio_unistd.cc
index f2f7f9c..20a3b9e 100644
--- a/mojo/services/files/public/c/lib/mojio_unistd.cc
+++ b/mojo/services/files/c/lib/mojio_unistd.cc
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "files/public/c/mojio_unistd.h"
+#include "files/c/mojio_unistd.h"
 
 #include <memory>
 #include <utility>
 
-#include "files/public/c/lib/directory_wrapper.h"
-#include "files/public/c/lib/fd_impl.h"
-#include "files/public/c/lib/fd_table.h"
-#include "files/public/c/lib/singletons.h"
+#include "files/c/lib/directory_wrapper.h"
+#include "files/c/lib/fd_impl.h"
+#include "files/c/lib/fd_table.h"
+#include "files/c/lib/singletons.h"
 
 namespace mojio {
 namespace {
diff --git a/mojo/services/files/public/c/lib/real_errno_impl.cc b/mojo/services/files/c/lib/real_errno_impl.cc
similarity index 87%
rename from mojo/services/files/public/c/lib/real_errno_impl.cc
rename to mojo/services/files/c/lib/real_errno_impl.cc
index 9dd4087..02e3718 100644
--- a/mojo/services/files/public/c/lib/real_errno_impl.cc
+++ b/mojo/services/files/c/lib/real_errno_impl.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "files/public/c/lib/real_errno_impl.h"
+#include "files/c/lib/real_errno_impl.h"
 
 #include <errno.h>
 
diff --git a/mojo/services/files/public/c/lib/real_errno_impl.h b/mojo/services/files/c/lib/real_errno_impl.h
similarity index 94%
rename from mojo/services/files/public/c/lib/real_errno_impl.h
rename to mojo/services/files/c/lib/real_errno_impl.h
index 32f3c9b..3c136a5 100644
--- a/mojo/services/files/public/c/lib/real_errno_impl.h
+++ b/mojo/services/files/c/lib/real_errno_impl.h
@@ -5,7 +5,7 @@
 #ifndef SERVICES_FILES_C_LIB_REAL_ERRNO_IMPL_H_
 #define SERVICES_FILES_C_LIB_REAL_ERRNO_IMPL_H_
 
-#include "files/public/c/lib/errno_impl.h"
+#include "files/c/lib/errno_impl.h"
 #include "mojo/public/cpp/system/macros.h"
 
 namespace mojio {
diff --git a/mojo/services/files/public/c/lib/singletons.cc b/mojo/services/files/c/lib/singletons.cc
similarity index 89%
rename from mojo/services/files/public/c/lib/singletons.cc
rename to mojo/services/files/c/lib/singletons.cc
index 58d23c1..bf00eda 100644
--- a/mojo/services/files/public/c/lib/singletons.cc
+++ b/mojo/services/files/c/lib/singletons.cc
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "files/public/c/lib/singletons.h"
+#include "files/c/lib/singletons.h"
 
 #include <errno.h>
 
-#include "files/public/c/lib/directory_wrapper.h"
-#include "files/public/c/lib/fd_table.h"
-#include "files/public/c/lib/real_errno_impl.h"
-#include "files/public/c/mojio_config.h"
+#include "files/c/lib/directory_wrapper.h"
+#include "files/c/lib/fd_table.h"
+#include "files/c/lib/real_errno_impl.h"
+#include "files/c/mojio_config.h"
 #include "mojo/public/cpp/environment/logging.h"
 
 namespace mojio {
diff --git a/mojo/services/files/public/c/lib/singletons.h b/mojo/services/files/c/lib/singletons.h
similarity index 96%
rename from mojo/services/files/public/c/lib/singletons.h
rename to mojo/services/files/c/lib/singletons.h
index 5c99803..03e63b4 100644
--- a/mojo/services/files/public/c/lib/singletons.h
+++ b/mojo/services/files/c/lib/singletons.h
@@ -5,7 +5,7 @@
 #ifndef SERVICES_FILES_C_LIB_SINGLETONS_H_
 #define SERVICES_FILES_C_LIB_SINGLETONS_H_
 
-#include "files/public/interfaces/directory.mojom.h"
+#include "files/interfaces/directory.mojom.h"
 
 namespace mojio {
 
diff --git a/mojo/services/files/public/c/lib/template_util.h b/mojo/services/files/c/lib/template_util.h
similarity index 100%
rename from mojo/services/files/public/c/lib/template_util.h
rename to mojo/services/files/c/lib/template_util.h
diff --git a/mojo/services/files/public/c/lib/util.cc b/mojo/services/files/c/lib/util.cc
similarity index 96%
rename from mojo/services/files/public/c/lib/util.cc
rename to mojo/services/files/c/lib/util.cc
index ca06d8f..c2434f9 100644
--- a/mojo/services/files/public/c/lib/util.cc
+++ b/mojo/services/files/c/lib/util.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "files/public/c/lib/util.h"
+#include "files/c/lib/util.h"
 
 #include <assert.h>
 #include <errno.h>
diff --git a/mojo/services/files/public/c/lib/util.h b/mojo/services/files/c/lib/util.h
similarity index 91%
rename from mojo/services/files/public/c/lib/util.h
rename to mojo/services/files/c/lib/util.h
index 628e9ce..964208b 100644
--- a/mojo/services/files/public/c/lib/util.h
+++ b/mojo/services/files/c/lib/util.h
@@ -5,7 +5,7 @@
 #ifndef SERVICES_FILES_C_LIB_UTIL_H_
 #define SERVICES_FILES_C_LIB_UTIL_H_
 
-#include "files/public/interfaces/types.mojom.h"
+#include "files/interfaces/types.mojom.h"
 #include "mojo/public/cpp/system/macros.h"
 
 namespace mojio {
diff --git a/mojo/services/files/public/c/mojio_config.h b/mojo/services/files/c/mojio_config.h
similarity index 89%
rename from mojo/services/files/public/c/mojio_config.h
rename to mojo/services/files/c/mojio_config.h
index 9dcc58b..4757248 100644
--- a/mojo/services/files/public/c/mojio_config.h
+++ b/mojo/services/files/c/mojio_config.h
@@ -8,8 +8,8 @@
 // types for typedefs) as necessary/appropriate, but they should not be used
 // directly by application code.
 
-#ifndef MOJO_SERVICES_FILES_PUBLIC_C_MOJIO_CONFIG_H_
-#define MOJO_SERVICES_FILES_PUBLIC_C_MOJIO_CONFIG_H_
+#ifndef MOJO_SERVICES_FILES_C_MOJIO_CONFIG_H_
+#define MOJO_SERVICES_FILES_C_MOJIO_CONFIG_H_
 
 // Macros ----------------------------------------------------------------------
 
@@ -35,4 +35,4 @@
 typedef long long mojio_config_int64;
 typedef unsigned long long mojio_config_uint64;
 
-#endif  // MOJO_SERVICES_FILES_PUBLIC_C_MOJIO_CONFIG_H_
+#endif  // MOJO_SERVICES_FILES_C_MOJIO_CONFIG_H_
diff --git a/mojo/services/files/public/c/mojio_fcntl.h b/mojo/services/files/c/mojio_fcntl.h
similarity index 89%
rename from mojo/services/files/public/c/mojio_fcntl.h
rename to mojo/services/files/c/mojio_fcntl.h
index bb5520e..89abb9b 100644
--- a/mojo/services/files/public/c/mojio_fcntl.h
+++ b/mojo/services/files/c/mojio_fcntl.h
@@ -8,12 +8,12 @@
 // In general, functions/types/macros are given "mojio_"/"MOJIO_"/etc. prefixes.
 // There are a handful of exceptions (noted below).
 
-#ifndef MOJO_SERVICES_FILES_PUBLIC_C_MOJIO_FCNTL_H_
-#define MOJO_SERVICES_FILES_PUBLIC_C_MOJIO_FCNTL_H_
+#ifndef MOJO_SERVICES_FILES_C_MOJIO_FCNTL_H_
+#define MOJO_SERVICES_FILES_C_MOJIO_FCNTL_H_
 
 // Includes --------------------------------------------------------------------
 
-#include "files/public/c/mojio_sys_types.h"
+#include "files/c/mojio_sys_types.h"
 
 // Macros ----------------------------------------------------------------------
 
@@ -63,4 +63,4 @@
 }  // extern "C"
 #endif
 
-#endif  // MOJO_SERVICES_FILES_PUBLIC_C_MOJIO_FCNTL_H_
+#endif  // MOJO_SERVICES_FILES_C_MOJIO_FCNTL_H_
diff --git a/mojo/services/files/public/c/mojio_stdio.h b/mojo/services/files/c/mojio_stdio.h
similarity index 97%
rename from mojo/services/files/public/c/mojio_stdio.h
rename to mojo/services/files/c/mojio_stdio.h
index 3caad09..d789b88 100644
--- a/mojo/services/files/public/c/mojio_stdio.h
+++ b/mojo/services/files/c/mojio_stdio.h
@@ -17,8 +17,8 @@
 // mysterious to me, but it's consistent with glibc. I don't know what the
 // standard specifies.
 
-#ifndef MOJO_SERVICES_FILES_PUBLIC_C_MOJIO_STDIO_H_
-#define MOJO_SERVICES_FILES_PUBLIC_C_MOJIO_STDIO_H_
+#ifndef MOJO_SERVICES_FILES_C_MOJIO_STDIO_H_
+#define MOJO_SERVICES_FILES_C_MOJIO_STDIO_H_
 
 // Includes --------------------------------------------------------------------
 
@@ -30,7 +30,7 @@
 // <stddef.h>.
 #include <stddef.h>
 
-#include "files/public/c/mojio_config.h"
+#include "files/c/mojio_config.h"
 
 // Macros ----------------------------------------------------------------------
 
@@ -200,4 +200,4 @@
 }  // extern "C"
 #endif
 
-#endif  // MOJO_SERVICES_FILES_PUBLIC_C_MOJIO_STDIO_H_
+#endif  // MOJO_SERVICES_FILES_C_MOJIO_STDIO_H_
diff --git a/mojo/services/files/public/c/mojio_sys_stat.h b/mojo/services/files/c/mojio_sys_stat.h
similarity index 94%
rename from mojo/services/files/public/c/mojio_sys_stat.h
rename to mojo/services/files/c/mojio_sys_stat.h
index 17e976b..7399d59 100644
--- a/mojo/services/files/public/c/mojio_sys_stat.h
+++ b/mojo/services/files/c/mojio_sys_stat.h
@@ -8,17 +8,17 @@
 // In general, functions/types/macros are given "mojio_"/"MOJIO_"/etc. prefixes.
 // There are a handful of exceptions (noted below).
 
-#ifndef MOJO_SERVICES_FILES_PUBLIC_C_MOJIO_SYS_STAT_H_
-#define MOJO_SERVICES_FILES_PUBLIC_C_MOJIO_SYS_STAT_H_
+#ifndef MOJO_SERVICES_FILES_C_MOJIO_SYS_STAT_H_
+#define MOJO_SERVICES_FILES_C_MOJIO_SYS_STAT_H_
 
 // Includes --------------------------------------------------------------------
 
 // <sys/stat.h> is required to define a large number of types defined in
 // <sys/types.h>, so we just include our equivalent of the latter.
-#include "files/public/c/mojio_sys_types.h"
+#include "files/c/mojio_sys_types.h"
 
 // We need our |struct timespec| equivalent.
-#include "files/public/c/mojio_time.h"
+#include "files/c/mojio_time.h"
 
 // Macros ----------------------------------------------------------------------
 
@@ -125,4 +125,4 @@
 }  // extern "C"
 #endif
 
-#endif  // MOJO_SERVICES_FILES_PUBLIC_C_MOJIO_SYS_STAT_H_
+#endif  // MOJO_SERVICES_FILES_C_MOJIO_SYS_STAT_H_
diff --git a/mojo/services/files/public/c/mojio_sys_types.h b/mojo/services/files/c/mojio_sys_types.h
similarity index 86%
rename from mojo/services/files/public/c/mojio_sys_types.h
rename to mojo/services/files/c/mojio_sys_types.h
index e4fafdc..71e4e2c 100644
--- a/mojo/services/files/public/c/mojio_sys_types.h
+++ b/mojo/services/files/c/mojio_sys_types.h
@@ -8,8 +8,8 @@
 // In general, functions/types/macros are given "mojio_"/"MOJIO_"/etc. prefixes.
 // There are a handful of exceptions (noted below).
 
-#ifndef MOJO_SERVICES_FILES_PUBLIC_C_MOJIO_SYS_TYPES_H_
-#define MOJO_SERVICES_FILES_PUBLIC_C_MOJIO_SYS_TYPES_H_
+#ifndef MOJO_SERVICES_FILES_C_MOJIO_SYS_TYPES_H_
+#define MOJO_SERVICES_FILES_C_MOJIO_SYS_TYPES_H_
 
 // Includes --------------------------------------------------------------------
 
@@ -17,11 +17,11 @@
 // prefix), and just use the standard one from <stddef.h>.
 #include <stddef.h>
 
-#include "files/public/c/mojio_config.h"
+#include "files/c/mojio_config.h"
 
 // <sys/types.h> is required to define |time_t| (which we have our own version
 // of, because the one in the C standard <time.h> is defined to be opaque).
-#include "files/public/c/mojio_time.h"
+#include "files/c/mojio_time.h"
 
 // Types -----------------------------------------------------------------------
 
@@ -51,4 +51,4 @@
 
 typedef mojio_config_uint32 mojio_uid_t;
 
-#endif  // MOJO_SERVICES_FILES_PUBLIC_C_MOJIO_SYS_TYPES_H_
+#endif  // MOJO_SERVICES_FILES_C_MOJIO_SYS_TYPES_H_
diff --git a/mojo/services/files/public/c/mojio_time.h b/mojo/services/files/c/mojio_time.h
similarity index 82%
rename from mojo/services/files/public/c/mojio_time.h
rename to mojo/services/files/c/mojio_time.h
index 70083a9..2bf27c6 100644
--- a/mojo/services/files/public/c/mojio_time.h
+++ b/mojo/services/files/c/mojio_time.h
@@ -12,12 +12,12 @@
 // the C standard), but |time_t| is opaque. Thus we need to define our own
 // equivalent. On top of that, we need to define a |struct timespec| equivalent.
 
-#ifndef MOJO_SERVICES_FILES_PUBLIC_C_MOJIO_TIME_H_
-#define MOJO_SERVICES_FILES_PUBLIC_C_MOJIO_TIME_H_
+#ifndef MOJO_SERVICES_FILES_C_MOJIO_TIME_H_
+#define MOJO_SERVICES_FILES_C_MOJIO_TIME_H_
 
 // Includes --------------------------------------------------------------------
 
-#include "files/public/c/mojio_config.h"
+#include "files/c/mojio_config.h"
 
 // Types -----------------------------------------------------------------------
 
@@ -28,4 +28,4 @@
   long tv_nsec;
 };
 
-#endif  // MOJO_SERVICES_FILES_PUBLIC_C_MOJIO_TIME_H_
+#endif  // MOJO_SERVICES_FILES_C_MOJIO_TIME_H_
diff --git a/mojo/services/files/public/c/mojio_unistd.h b/mojo/services/files/c/mojio_unistd.h
similarity index 96%
rename from mojo/services/files/public/c/mojio_unistd.h
rename to mojo/services/files/c/mojio_unistd.h
index 4b6ea90..77e891d 100644
--- a/mojo/services/files/public/c/mojio_unistd.h
+++ b/mojo/services/files/c/mojio_unistd.h
@@ -8,8 +8,8 @@
 // In general, functions/types/macros are given "mojio_"/"MOJIO_"/etc. prefixes.
 // There are a handful of exceptions (noted below).
 
-#ifndef MOJO_SERVICES_FILES_PUBLIC_C_MOJIO_UNISTD_H_
-#define MOJO_SERVICES_FILES_PUBLIC_C_MOJIO_UNISTD_H_
+#ifndef MOJO_SERVICES_FILES_C_MOJIO_UNISTD_H_
+#define MOJO_SERVICES_FILES_C_MOJIO_UNISTD_H_
 
 // Includes --------------------------------------------------------------------
 
@@ -21,7 +21,7 @@
 // <unistd.h> is required to |ssize_t|, |uid_t|, |gid_t|, |off_t|, |pid_t|, and
 // |useconds_t| from <sys/types.h>, so we may as well define our versions by
 // inclusion.
-#include "files/public/c/mojio_sys_types.h"
+#include "files/c/mojio_sys_types.h"
 
 // Macros ----------------------------------------------------------------------
 
@@ -152,4 +152,4 @@
 }  // extern "C"
 #endif
 
-#endif  // MOJO_SERVICES_FILES_PUBLIC_C_MOJIO_UNISTD_H_
+#endif  // MOJO_SERVICES_FILES_C_MOJIO_UNISTD_H_
diff --git a/mojo/services/files/public/c/tests/directory_wrapper_unittest.cc b/mojo/services/files/c/tests/directory_wrapper_unittest.cc
similarity index 95%
rename from mojo/services/files/public/c/tests/directory_wrapper_unittest.cc
rename to mojo/services/files/c/tests/directory_wrapper_unittest.cc
index c2502f1..c9060e6 100644
--- a/mojo/services/files/public/c/tests/directory_wrapper_unittest.cc
+++ b/mojo/services/files/c/tests/directory_wrapper_unittest.cc
@@ -2,18 +2,18 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "files/public/c/lib/directory_wrapper.h"
+#include "files/c/lib/directory_wrapper.h"
 
 #include <errno.h>
 
 #include <memory>
 
-#include "files/public/c/lib/fd_impl.h"
-#include "files/public/c/mojio_fcntl.h"
-#include "files/public/c/mojio_sys_stat.h"
-#include "files/public/c/tests/mock_errno_impl.h"
-#include "files/public/c/tests/mojio_impl_test_base.h"
-#include "files/public/c/tests/test_utils.h"
+#include "files/c/lib/fd_impl.h"
+#include "files/c/mojio_fcntl.h"
+#include "files/c/mojio_sys_stat.h"
+#include "files/c/tests/mock_errno_impl.h"
+#include "files/c/tests/mojio_impl_test_base.h"
+#include "files/c/tests/test_utils.h"
 
 namespace mojio {
 namespace {
diff --git a/mojo/services/files/public/c/tests/errno_impl_unittest.cc b/mojo/services/files/c/tests/errno_impl_unittest.cc
similarity index 94%
rename from mojo/services/files/public/c/tests/errno_impl_unittest.cc
rename to mojo/services/files/c/tests/errno_impl_unittest.cc
index 458f619..9c7d992 100644
--- a/mojo/services/files/public/c/tests/errno_impl_unittest.cc
+++ b/mojo/services/files/c/tests/errno_impl_unittest.cc
@@ -5,9 +5,9 @@
 // This basically tests |ErrnoImpl::Setter|, since |ErrnoImpl| itself is just a
 // simple interface.
 
-#include "files/public/c/lib/errno_impl.h"
+#include "files/c/lib/errno_impl.h"
 
-#include "files/public/c/tests/mock_errno_impl.h"
+#include "files/c/tests/mock_errno_impl.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojio {
diff --git a/mojo/services/files/public/c/tests/fd_table_unittest.cc b/mojo/services/files/c/tests/fd_table_unittest.cc
similarity index 97%
rename from mojo/services/files/public/c/tests/fd_table_unittest.cc
rename to mojo/services/files/c/tests/fd_table_unittest.cc
index 809635e..9379013 100644
--- a/mojo/services/files/public/c/tests/fd_table_unittest.cc
+++ b/mojo/services/files/c/tests/fd_table_unittest.cc
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "files/public/c/lib/fd_table.h"
+#include "files/c/lib/fd_table.h"
 
 #include <errno.h>
 
 #include <memory>
 
-#include "files/public/c/lib/fd_impl.h"
-#include "files/public/c/tests/mock_errno_impl.h"
+#include "files/c/lib/fd_impl.h"
+#include "files/c/tests/mock_errno_impl.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojio {
diff --git a/mojo/services/files/public/c/tests/file_fd_impl_unittest.cc b/mojo/services/files/c/tests/file_fd_impl_unittest.cc
similarity index 96%
rename from mojo/services/files/public/c/tests/file_fd_impl_unittest.cc
rename to mojo/services/files/c/tests/file_fd_impl_unittest.cc
index 2f91e39..7c853b2 100644
--- a/mojo/services/files/public/c/tests/file_fd_impl_unittest.cc
+++ b/mojo/services/files/c/tests/file_fd_impl_unittest.cc
@@ -2,19 +2,19 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "files/public/c/lib/file_fd_impl.h"
+#include "files/c/lib/file_fd_impl.h"
 
 #include <errno.h>
 
 #include <string>
 
-#include "files/public/c/mojio_sys_stat.h"
-#include "files/public/c/mojio_unistd.h"
-#include "files/public/c/tests/mock_errno_impl.h"
-#include "files/public/c/tests/mojio_impl_test_base.h"
-#include "files/public/c/tests/test_utils.h"
-#include "files/public/interfaces/files.mojom.h"
-#include "files/public/interfaces/types.mojom.h"
+#include "files/c/mojio_sys_stat.h"
+#include "files/c/mojio_unistd.h"
+#include "files/c/tests/mock_errno_impl.h"
+#include "files/c/tests/mojio_impl_test_base.h"
+#include "files/c/tests/test_utils.h"
+#include "files/interfaces/files.mojom.h"
+#include "files/interfaces/types.mojom.h"
 
 namespace mojio {
 namespace {
diff --git a/mojo/services/files/public/c/tests/mock_errno_impl.cc b/mojo/services/files/c/tests/mock_errno_impl.cc
similarity index 88%
rename from mojo/services/files/public/c/tests/mock_errno_impl.cc
rename to mojo/services/files/c/tests/mock_errno_impl.cc
index dc67464..7218021 100644
--- a/mojo/services/files/public/c/tests/mock_errno_impl.cc
+++ b/mojo/services/files/c/tests/mock_errno_impl.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "files/public/c/tests/mock_errno_impl.h"
+#include "files/c/tests/mock_errno_impl.h"
 
 namespace mojio {
 namespace test {
diff --git a/mojo/services/files/public/c/tests/mock_errno_impl.h b/mojo/services/files/c/tests/mock_errno_impl.h
similarity index 95%
rename from mojo/services/files/public/c/tests/mock_errno_impl.h
rename to mojo/services/files/c/tests/mock_errno_impl.h
index b8bff2f..0a04385 100644
--- a/mojo/services/files/public/c/tests/mock_errno_impl.h
+++ b/mojo/services/files/c/tests/mock_errno_impl.h
@@ -5,7 +5,7 @@
 #ifndef SERVICES_FILES_C_TESTS_MOCK_ERRNO_IMPL_H_
 #define SERVICES_FILES_C_TESTS_MOCK_ERRNO_IMPL_H_
 
-#include "files/public/c/lib/errno_impl.h"
+#include "files/c/lib/errno_impl.h"
 #include "mojo/public/cpp/system/macros.h"
 
 namespace mojio {
diff --git a/mojo/services/files/public/c/tests/mojio_impl_test_base.cc b/mojo/services/files/c/tests/mojio_impl_test_base.cc
similarity index 85%
rename from mojo/services/files/public/c/tests/mojio_impl_test_base.cc
rename to mojo/services/files/c/tests/mojio_impl_test_base.cc
index e3aeba3..b56e4db 100644
--- a/mojo/services/files/public/c/tests/mojio_impl_test_base.cc
+++ b/mojo/services/files/c/tests/mojio_impl_test_base.cc
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "files/public/c/tests/mojio_impl_test_base.h"
+#include "files/c/tests/mojio_impl_test_base.h"
 
-#include "files/public/c/lib/template_util.h"
-#include "files/public/interfaces/files.mojom.h"
+#include "files/c/lib/template_util.h"
+#include "files/interfaces/files.mojom.h"
 #include "mojo/public/cpp/application/application_impl.h"
 #include "mojo/public/cpp/bindings/interface_request.h"
 #include "mojo/public/cpp/environment/logging.h"
diff --git a/mojo/services/files/public/c/tests/mojio_impl_test_base.h b/mojo/services/files/c/tests/mojio_impl_test_base.h
similarity index 94%
rename from mojo/services/files/public/c/tests/mojio_impl_test_base.h
rename to mojo/services/files/c/tests/mojio_impl_test_base.h
index f5f5fa5..53b68a5 100644
--- a/mojo/services/files/public/c/tests/mojio_impl_test_base.h
+++ b/mojo/services/files/c/tests/mojio_impl_test_base.h
@@ -5,7 +5,7 @@
 #ifndef SERVICES_FILES_C_TESTS_MOJIO_IMPL_TEST_BASE_H_
 #define SERVICES_FILES_C_TESTS_MOJIO_IMPL_TEST_BASE_H_
 
-#include "files/public/interfaces/directory.mojom.h"
+#include "files/interfaces/directory.mojom.h"
 #include "mojo/public/cpp/application/application_test_base.h"
 #include "mojo/public/cpp/system/macros.h"
 
diff --git a/mojo/services/files/public/c/tests/mojio_sys_stat_unittest.cc b/mojo/services/files/c/tests/mojio_sys_stat_unittest.cc
similarity index 92%
rename from mojo/services/files/public/c/tests/mojio_sys_stat_unittest.cc
rename to mojo/services/files/c/tests/mojio_sys_stat_unittest.cc
index f170326..9a46108 100644
--- a/mojo/services/files/public/c/tests/mojio_sys_stat_unittest.cc
+++ b/mojo/services/files/c/tests/mojio_sys_stat_unittest.cc
@@ -8,10 +8,10 @@
 #include <errno.h>
 #include <string.h>
 
-#include "files/public/c/mojio_fcntl.h"
-#include "files/public/c/mojio_sys_stat.h"
-#include "files/public/c/mojio_unistd.h"
-#include "files/public/c/tests/mojio_test_base.h"
+#include "files/c/mojio_fcntl.h"
+#include "files/c/mojio_sys_stat.h"
+#include "files/c/mojio_unistd.h"
+#include "files/c/tests/mojio_test_base.h"
 
 namespace {
 
diff --git a/mojo/services/files/public/c/tests/mojio_test_base.cc b/mojo/services/files/c/tests/mojio_test_base.cc
similarity index 89%
rename from mojo/services/files/public/c/tests/mojio_test_base.cc
rename to mojo/services/files/c/tests/mojio_test_base.cc
index 1cae74f..eb6825c 100644
--- a/mojo/services/files/public/c/tests/mojio_test_base.cc
+++ b/mojo/services/files/c/tests/mojio_test_base.cc
@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "files/public/c/tests/mojio_test_base.h"
+#include "files/c/tests/mojio_test_base.h"
 
-#include "files/public/c/lib/singletons.h"
+#include "files/c/lib/singletons.h"
 #include "mojo/public/cpp/environment/logging.h"
 
 namespace mojio {
diff --git a/mojo/services/files/public/c/tests/mojio_test_base.h b/mojo/services/files/c/tests/mojio_test_base.h
similarity index 92%
rename from mojo/services/files/public/c/tests/mojio_test_base.h
rename to mojo/services/files/c/tests/mojio_test_base.h
index 6cf64c2..2c3e389 100644
--- a/mojo/services/files/public/c/tests/mojio_test_base.h
+++ b/mojo/services/files/c/tests/mojio_test_base.h
@@ -5,7 +5,7 @@
 #ifndef SERVICES_FILES_C_TESTS_MOJIO_TEST_BASE_H_
 #define SERVICES_FILES_C_TESTS_MOJIO_TEST_BASE_H_
 
-#include "files/public/c/tests/mojio_impl_test_base.h"
+#include "files/c/tests/mojio_impl_test_base.h"
 
 namespace mojio {
 namespace test {
diff --git a/mojo/services/files/public/c/tests/mojio_unistd_unittest.cc b/mojo/services/files/c/tests/mojio_unistd_unittest.cc
similarity index 95%
rename from mojo/services/files/public/c/tests/mojio_unistd_unittest.cc
rename to mojo/services/files/c/tests/mojio_unistd_unittest.cc
index bb6af7f..50d437d 100644
--- a/mojo/services/files/public/c/tests/mojio_unistd_unittest.cc
+++ b/mojo/services/files/c/tests/mojio_unistd_unittest.cc
@@ -9,10 +9,10 @@
 #include <errno.h>
 #include <string.h>
 
-#include "files/public/c/mojio_fcntl.h"
-#include "files/public/c/mojio_sys_stat.h"
-#include "files/public/c/mojio_unistd.h"
-#include "files/public/c/tests/mojio_test_base.h"
+#include "files/c/mojio_fcntl.h"
+#include "files/c/mojio_sys_stat.h"
+#include "files/c/mojio_unistd.h"
+#include "files/c/tests/mojio_test_base.h"
 
 namespace {
 
diff --git a/mojo/services/files/public/c/tests/real_errno_impl_unittest.cc b/mojo/services/files/c/tests/real_errno_impl_unittest.cc
similarity index 90%
rename from mojo/services/files/public/c/tests/real_errno_impl_unittest.cc
rename to mojo/services/files/c/tests/real_errno_impl_unittest.cc
index e8bd650..7af6850 100644
--- a/mojo/services/files/public/c/tests/real_errno_impl_unittest.cc
+++ b/mojo/services/files/c/tests/real_errno_impl_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "files/public/c/lib/real_errno_impl.h"
+#include "files/c/lib/real_errno_impl.h"
 
 #include <errno.h>
 
diff --git a/mojo/services/files/public/c/tests/test_utils.cc b/mojo/services/files/c/tests/test_utils.cc
similarity index 94%
rename from mojo/services/files/public/c/tests/test_utils.cc
rename to mojo/services/files/c/tests/test_utils.cc
index 5fa1ef5..518186f 100644
--- a/mojo/services/files/public/c/tests/test_utils.cc
+++ b/mojo/services/files/c/tests/test_utils.cc
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "files/public/c/tests/test_utils.h"
+#include "files/c/tests/test_utils.h"
 
-#include "files/public/c/lib/template_util.h"
-#include "files/public/interfaces/file.mojom.h"
-#include "files/public/interfaces/types.mojom.h"
+#include "files/c/lib/template_util.h"
+#include "files/interfaces/file.mojom.h"
+#include "files/interfaces/types.mojom.h"
 #include "mojo/public/cpp/environment/logging.h"
 
 namespace mojio {
diff --git a/mojo/services/files/public/c/tests/test_utils.h b/mojo/services/files/c/tests/test_utils.h
similarity index 94%
rename from mojo/services/files/public/c/tests/test_utils.h
rename to mojo/services/files/c/tests/test_utils.h
index 4d3174f..868f7ef 100644
--- a/mojo/services/files/public/c/tests/test_utils.h
+++ b/mojo/services/files/c/tests/test_utils.h
@@ -10,8 +10,8 @@
 
 #include <string>
 
-#include "files/public/interfaces/directory.mojom.h"
-#include "files/public/interfaces/file.mojom.h"
+#include "files/interfaces/directory.mojom.h"
+#include "files/interfaces/file.mojom.h"
 
 namespace mojio {
 namespace test {
diff --git a/mojo/services/files/public/c/tests/test_utils_unittest.cc b/mojo/services/files/c/tests/test_utils_unittest.cc
similarity index 91%
rename from mojo/services/files/public/c/tests/test_utils_unittest.cc
rename to mojo/services/files/c/tests/test_utils_unittest.cc
index f407cd1..e6f8ab5 100644
--- a/mojo/services/files/public/c/tests/test_utils_unittest.cc
+++ b/mojo/services/files/c/tests/test_utils_unittest.cc
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "files/public/c/tests/test_utils.h"
+#include "files/c/tests/test_utils.h"
 
 #include <errno.h>
 
-#include "files/public/c/tests/mock_errno_impl.h"
-#include "files/public/c/tests/mojio_impl_test_base.h"
-#include "files/public/c/tests/test_utils.h"
+#include "files/c/tests/mock_errno_impl.h"
+#include "files/c/tests/mojio_impl_test_base.h"
+#include "files/c/tests/test_utils.h"
 
 namespace mojio {
 namespace test {
diff --git a/mojo/services/files/public/c/tests/util_unittest.cc b/mojo/services/files/c/tests/util_unittest.cc
similarity index 93%
rename from mojo/services/files/public/c/tests/util_unittest.cc
rename to mojo/services/files/c/tests/util_unittest.cc
index 07b43c6..93847f4 100644
--- a/mojo/services/files/public/c/tests/util_unittest.cc
+++ b/mojo/services/files/c/tests/util_unittest.cc
@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "files/public/c/lib/util.h"
+#include "files/c/lib/util.h"
 
-#include "files/public/interfaces/types.mojom.h"
+#include "files/interfaces/types.mojom.h"
 #include "mojo/public/cpp/system/macros.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/mojo/services/files/public/cpp/BUILD.gn b/mojo/services/files/cpp/BUILD.gn
similarity index 95%
rename from mojo/services/files/public/cpp/BUILD.gn
rename to mojo/services/files/cpp/BUILD.gn
index df74f7d..c14aaad 100644
--- a/mojo/services/files/public/cpp/BUILD.gn
+++ b/mojo/services/files/cpp/BUILD.gn
@@ -14,7 +14,7 @@
   # this target even be a mojo_sdk_source_set?
   restrict_external_deps = false
 
-  public_configs = [ "../../../public/build/config:mojo_services" ]
+  public_configs = [ "../../public/build/config:mojo_services" ]
 
   sources = [
     "input_stream_file.h",
diff --git a/mojo/services/files/public/cpp/input_stream_file.h b/mojo/services/files/cpp/input_stream_file.h
similarity index 95%
rename from mojo/services/files/public/cpp/input_stream_file.h
rename to mojo/services/files/cpp/input_stream_file.h
index 9a24f1a..5efc355 100644
--- a/mojo/services/files/public/cpp/input_stream_file.h
+++ b/mojo/services/files/cpp/input_stream_file.h
@@ -6,8 +6,8 @@
 // like an "input stream" ("input" from the point of view of the client --
 // i.e., the client can write/stream input from it, but not write or seek).
 
-#ifndef MOJO_SERVICES_FILES_PUBLIC_CPP_INPUT_STREAM_FILE_H_
-#define MOJO_SERVICES_FILES_PUBLIC_CPP_INPUT_STREAM_FILE_H_
+#ifndef MOJO_SERVICES_FILES_CPP_INPUT_STREAM_FILE_H_
+#define MOJO_SERVICES_FILES_CPP_INPUT_STREAM_FILE_H_
 
 #include <stddef.h>
 #include <stdint.h>
@@ -20,8 +20,8 @@
 #include "mojo/public/cpp/bindings/callback.h"
 #include "mojo/public/cpp/bindings/interface_request.h"
 #include "mojo/public/cpp/system/macros.h"
-#include "mojo/services/files/public/interfaces/file.mojom.h"
-#include "mojo/services/files/public/interfaces/types.mojom.h"
+#include "mojo/services/files/interfaces/file.mojom.h"
+#include "mojo/services/files/interfaces/types.mojom.h"
 
 namespace files_impl {
 
@@ -156,4 +156,4 @@
 
 }  // namespace files_impl
 
-#endif  // MOJO_SERVICES_FILES_PUBLIC_CPP_INPUT_STREAM_FILE_H_
+#endif  // MOJO_SERVICES_FILES_CPP_INPUT_STREAM_FILE_H_
diff --git a/mojo/services/files/public/cpp/lib/input_stream_file.cc b/mojo/services/files/cpp/lib/input_stream_file.cc
similarity index 99%
rename from mojo/services/files/public/cpp/lib/input_stream_file.cc
rename to mojo/services/files/cpp/lib/input_stream_file.cc
index 7408442..f672938 100644
--- a/mojo/services/files/public/cpp/lib/input_stream_file.cc
+++ b/mojo/services/files/cpp/lib/input_stream_file.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "mojo/services/files/public/cpp/input_stream_file.h"
+#include "mojo/services/files/cpp/input_stream_file.h"
 
 #include <utility>
 
diff --git a/mojo/services/files/public/cpp/lib/output_stream_file.cc b/mojo/services/files/cpp/lib/output_stream_file.cc
similarity index 98%
rename from mojo/services/files/public/cpp/lib/output_stream_file.cc
rename to mojo/services/files/cpp/lib/output_stream_file.cc
index a1a068a..0746864 100644
--- a/mojo/services/files/public/cpp/lib/output_stream_file.cc
+++ b/mojo/services/files/cpp/lib/output_stream_file.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "mojo/services/files/public/cpp/output_stream_file.h"
+#include "mojo/services/files/cpp/output_stream_file.h"
 
 #include "mojo/public/cpp/environment/logging.h"
 
diff --git a/mojo/services/files/public/cpp/output_stream_file.h b/mojo/services/files/cpp/output_stream_file.h
similarity index 92%
rename from mojo/services/files/public/cpp/output_stream_file.h
rename to mojo/services/files/cpp/output_stream_file.h
index 037ea94..840dcbc 100644
--- a/mojo/services/files/public/cpp/output_stream_file.h
+++ b/mojo/services/files/cpp/output_stream_file.h
@@ -6,8 +6,8 @@
 // like an "output stream" ("output" from the point of view of the client --
 // i.e., the client can write/stream output to it, but not read or seek).
 
-#ifndef MOJO_SERVICES_FILES_PUBLIC_CPP_OUTPUT_STREAM_FILE_H_
-#define MOJO_SERVICES_FILES_PUBLIC_CPP_OUTPUT_STREAM_FILE_H_
+#ifndef MOJO_SERVICES_FILES_CPP_OUTPUT_STREAM_FILE_H_
+#define MOJO_SERVICES_FILES_CPP_OUTPUT_STREAM_FILE_H_
 
 #include <stddef.h>
 
@@ -16,8 +16,8 @@
 #include "mojo/public/cpp/bindings/binding.h"
 #include "mojo/public/cpp/bindings/interface_request.h"
 #include "mojo/public/cpp/system/macros.h"
-#include "mojo/services/files/public/interfaces/file.mojom.h"
-#include "mojo/services/files/public/interfaces/types.mojom.h"
+#include "mojo/services/files/interfaces/file.mojom.h"
+#include "mojo/services/files/interfaces/types.mojom.h"
 
 namespace files_impl {
 
@@ -111,4 +111,4 @@
 
 }  // namespace files_impl
 
-#endif  // MOJO_SERVICES_FILES_PUBLIC_CPP_OUTPUT_STREAM_FILE_H_
+#endif  // MOJO_SERVICES_FILES_CPP_OUTPUT_STREAM_FILE_H_
diff --git a/mojo/services/files/public/cpp/tests/input_stream_file_unittest.cc b/mojo/services/files/cpp/tests/input_stream_file_unittest.cc
similarity index 98%
rename from mojo/services/files/public/cpp/tests/input_stream_file_unittest.cc
rename to mojo/services/files/cpp/tests/input_stream_file_unittest.cc
index 71fb5bf..15da9ea 100644
--- a/mojo/services/files/public/cpp/tests/input_stream_file_unittest.cc
+++ b/mojo/services/files/cpp/tests/input_stream_file_unittest.cc
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "files/public/cpp/input_stream_file.h"
+#include "files/cpp/input_stream_file.h"
 
 #include <string.h>
 
 #include <string>
 #include <utility>
 
-#include "files/public/interfaces/files.mojom.h"
-#include "files/public/interfaces/types.mojom.h"
+#include "files/interfaces/files.mojom.h"
+#include "files/interfaces/types.mojom.h"
 #include "mojo/public/cpp/application/application_test_base.h"
 #include "mojo/public/cpp/bindings/interface_request.h"
 #include "mojo/public/cpp/environment/logging.h"
diff --git a/mojo/services/files/public/cpp/tests/output_stream_file_unittest.cc b/mojo/services/files/cpp/tests/output_stream_file_unittest.cc
similarity index 98%
rename from mojo/services/files/public/cpp/tests/output_stream_file_unittest.cc
rename to mojo/services/files/cpp/tests/output_stream_file_unittest.cc
index 678131b..5c063ac 100644
--- a/mojo/services/files/public/cpp/tests/output_stream_file_unittest.cc
+++ b/mojo/services/files/cpp/tests/output_stream_file_unittest.cc
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "files/public/cpp/output_stream_file.h"
+#include "files/cpp/output_stream_file.h"
 
 #include <string.h>
 
 #include <memory>
 #include <string>
 
-#include "files/public/interfaces/files.mojom.h"
-#include "files/public/interfaces/types.mojom.h"
+#include "files/interfaces/files.mojom.h"
+#include "files/interfaces/types.mojom.h"
 #include "mojo/public/cpp/application/application_test_base.h"
 #include "mojo/public/cpp/bindings/interface_request.h"
 #include "mojo/public/cpp/system/macros.h"
diff --git a/mojo/services/files/public/interfaces/BUILD.gn b/mojo/services/files/interfaces/BUILD.gn
similarity index 88%
rename from mojo/services/files/public/interfaces/BUILD.gn
rename to mojo/services/files/interfaces/BUILD.gn
index d745141..d8ecff7 100644
--- a/mojo/services/files/public/interfaces/BUILD.gn
+++ b/mojo/services/files/interfaces/BUILD.gn
@@ -15,5 +15,5 @@
     "types.mojom",
   ]
 
-  import_dirs = [ get_path_info("../../../", "abspath") ]
+  import_dirs = [ get_path_info("../../", "abspath") ]
 }
diff --git a/mojo/services/files/public/interfaces/directory.mojom b/mojo/services/files/interfaces/directory.mojom
similarity index 96%
rename from mojo/services/files/public/interfaces/directory.mojom
rename to mojo/services/files/interfaces/directory.mojom
index 3225650..d4759d1 100644
--- a/mojo/services/files/public/interfaces/directory.mojom
+++ b/mojo/services/files/interfaces/directory.mojom
@@ -5,8 +5,8 @@
 [DartPackage="mojo_services"]
 module mojo.files;
 
-import "files/public/interfaces/file.mojom";
-import "files/public/interfaces/types.mojom";
+import "files/interfaces/file.mojom";
+import "files/interfaces/types.mojom";
 
 // This interface provides access to a directory in a "file system", providing
 // operations such as creating/opening/removing/renaming files/directories
diff --git a/mojo/services/files/public/interfaces/file.mojom b/mojo/services/files/interfaces/file.mojom
similarity index 98%
rename from mojo/services/files/public/interfaces/file.mojom
rename to mojo/services/files/interfaces/file.mojom
index 3cb358a..e1e1db8 100644
--- a/mojo/services/files/public/interfaces/file.mojom
+++ b/mojo/services/files/interfaces/file.mojom
@@ -10,7 +10,7 @@
 [DartPackage="mojo_services"]
 module mojo.files;
 
-import "files/public/interfaces/types.mojom";
+import "files/interfaces/types.mojom";
 
 // TODO(vtl): Write comments.
 interface File {
diff --git a/mojo/services/files/public/interfaces/files.mojom b/mojo/services/files/interfaces/files.mojom
similarity index 81%
rename from mojo/services/files/public/interfaces/files.mojom
rename to mojo/services/files/interfaces/files.mojom
index dd03068..908b2c7 100644
--- a/mojo/services/files/public/interfaces/files.mojom
+++ b/mojo/services/files/interfaces/files.mojom
@@ -5,8 +5,8 @@
 [DartPackage="mojo_services"]
 module mojo.files;
 
-import "files/public/interfaces/directory.mojom";
-import "files/public/interfaces/types.mojom";
+import "files/interfaces/directory.mojom";
+import "files/interfaces/types.mojom";
 
 interface Files {
   // Opens the root directory for the file system with the given name; null
diff --git a/mojo/services/files/public/interfaces/ioctl.mojom b/mojo/services/files/interfaces/ioctl.mojom
similarity index 100%
rename from mojo/services/files/public/interfaces/ioctl.mojom
rename to mojo/services/files/interfaces/ioctl.mojom
diff --git a/mojo/services/files/public/interfaces/ioctl_terminal.mojom b/mojo/services/files/interfaces/ioctl_terminal.mojom
similarity index 100%
rename from mojo/services/files/public/interfaces/ioctl_terminal.mojom
rename to mojo/services/files/interfaces/ioctl_terminal.mojom
diff --git a/mojo/services/files/public/interfaces/types.mojom b/mojo/services/files/interfaces/types.mojom
similarity index 100%
rename from mojo/services/files/public/interfaces/types.mojom
rename to mojo/services/files/interfaces/types.mojom
diff --git a/mojo/services/mojo_services.gni b/mojo/services/mojo_services.gni
index 83eede1..c3b6263 100644
--- a/mojo/services/mojo_services.gni
+++ b/mojo/services/mojo_services.gni
@@ -8,15 +8,15 @@
 # //mojo/services/X/public/interfaces to this list.
 
 mojo_services = [
-  "//mojo/services/asset_bundle/public/interfaces",
-  "//mojo/services/authenticating_url_loader_interceptor/public/interfaces",
-  "//mojo/services/authentication/public/interfaces",
-  "//mojo/services/camera/public/interfaces",
-  "//mojo/services/clipboard/public/interfaces",
-  "//mojo/services/contacts/public/interfaces",
-  "//mojo/services/content_handler/public/interfaces",
-  "//mojo/services/device_info/public/interfaces",
-  "//mojo/services/files/public/interfaces",
+  "//mojo/services/asset_bundle/interfaces",
+  "//mojo/services/authenticating_url_loader_interceptor/interfaces",
+  "//mojo/services/authentication/interfaces",
+  "//mojo/services/camera/interfaces",
+  "//mojo/services/clipboard/interfaces",
+  "//mojo/services/contacts/interfaces",
+  "//mojo/services/content_handler/interfaces",
+  "//mojo/services/device_info/interfaces",
+  "//mojo/services/files/interfaces",
   "//mojo/services/geometry/public/interfaces",
   "//mojo/services/gpu/public/interfaces",
   "//mojo/services/http_server/public/interfaces",
diff --git a/mojo/services/native_support/public/interfaces/BUILD.gn b/mojo/services/native_support/public/interfaces/BUILD.gn
index 3dee937..64f98f2 100644
--- a/mojo/services/native_support/public/interfaces/BUILD.gn
+++ b/mojo/services/native_support/public/interfaces/BUILD.gn
@@ -13,6 +13,6 @@
   import_dirs = [ get_path_info("../../../", "abspath") ]
 
   public_deps = [
-    "../../../files/public/interfaces",
+    "../../../files/interfaces",
   ]
 }
diff --git a/mojo/services/native_support/public/interfaces/process.mojom b/mojo/services/native_support/public/interfaces/process.mojom
index ca4010c..1a06397 100644
--- a/mojo/services/native_support/public/interfaces/process.mojom
+++ b/mojo/services/native_support/public/interfaces/process.mojom
@@ -5,8 +5,8 @@
 [DartPackage="mojo_services"]
 module native_support;
 
-import "files/public/interfaces/file.mojom";
-import "files/public/interfaces/types.mojom";
+import "files/interfaces/file.mojom";
+import "files/interfaces/types.mojom";
 
 // Interface for dealing with (e.g., starting) "native" processes.
 interface Process {
diff --git a/mojo/services/terminal/public/interfaces/BUILD.gn b/mojo/services/terminal/public/interfaces/BUILD.gn
index 47f1c67..d8afbc6 100644
--- a/mojo/services/terminal/public/interfaces/BUILD.gn
+++ b/mojo/services/terminal/public/interfaces/BUILD.gn
@@ -14,6 +14,6 @@
   import_dirs = [ get_path_info("../../../", "abspath") ]
 
   public_deps = [
-    "../../../files/public/interfaces",
+    "../../../files/interfaces",
   ]
 }
diff --git a/mojo/services/terminal/public/interfaces/terminal.mojom b/mojo/services/terminal/public/interfaces/terminal.mojom
index a09ac6b..c9c928a 100644
--- a/mojo/services/terminal/public/interfaces/terminal.mojom
+++ b/mojo/services/terminal/public/interfaces/terminal.mojom
@@ -5,8 +5,8 @@
 [DartPackage="mojo_services"]
 module mojo.terminal;
 
-import "files/public/interfaces/file.mojom";
-import "files/public/interfaces/types.mojom";
+import "files/interfaces/file.mojom";
+import "files/interfaces/types.mojom";
 import "terminal/public/interfaces/terminal_client.mojom";
 
 // Interface for actual terminal programs, in particular, for a single terminal
diff --git a/mojo/services/terminal/public/interfaces/terminal_client.mojom b/mojo/services/terminal/public/interfaces/terminal_client.mojom
index 1a78fa6..1bbe5bd 100644
--- a/mojo/services/terminal/public/interfaces/terminal_client.mojom
+++ b/mojo/services/terminal/public/interfaces/terminal_client.mojom
@@ -5,7 +5,7 @@
 [DartPackage="mojo_services"]
 module mojo.terminal;
 
-import "files/public/interfaces/file.mojom";
+import "files/interfaces/file.mojom";
 
 // Interface for applications that want to be able to be connected to by a
 // terminal. (Once connected, such an application will be able to write to/read
diff --git a/services/android/BUILD.gn b/services/android/BUILD.gn
index 6753600..281d79a 100644
--- a/services/android/BUILD.gn
+++ b/services/android/BUILD.gn
@@ -21,7 +21,7 @@
     "//mojo/public/c/system:for_shared_library",
     "//mojo/public/cpp/bindings",
     "//mojo/public/cpp/system",
-    "//mojo/services/content_handler/public/interfaces",
+    "//mojo/services/content_handler/interfaces",
     "//mojo/services/url_response_disk_cache/public/interfaces",
   ]
 
diff --git a/services/android/java_handler.h b/services/android/java_handler.h
index efaa4a2..58df813 100644
--- a/services/android/java_handler.h
+++ b/services/android/java_handler.h
@@ -13,7 +13,7 @@
 #include "mojo/common/tracing_impl.h"
 #include "mojo/public/cpp/application/application_delegate.h"
 #include "mojo/public/cpp/application/interface_factory_impl.h"
-#include "mojo/services/content_handler/public/interfaces/content_handler.mojom.h"
+#include "mojo/services/content_handler/interfaces/content_handler.mojom.h"
 #include "mojo/services/url_response_disk_cache/public/interfaces/url_response_disk_cache.mojom.h"
 
 namespace services {
diff --git a/services/asset_bundle/BUILD.gn b/services/asset_bundle/BUILD.gn
index 7c38a37..1b256e0 100644
--- a/services/asset_bundle/BUILD.gn
+++ b/services/asset_bundle/BUILD.gn
@@ -19,7 +19,7 @@
     "//mojo/data_pipe_utils",
     "//mojo/public/cpp/bindings:callback",
     "//mojo/public/cpp/system",
-    "//mojo/services/asset_bundle/public/interfaces",
+    "//mojo/services/asset_bundle/interfaces",
     "//third_party/zlib:zip",
   ]
 }
@@ -35,7 +35,7 @@
     "//mojo/public/cpp/application",
     "//mojo/public/cpp/bindings:callback",
     "//mojo/public/cpp/system",
-    "//mojo/services/asset_bundle/public/interfaces",
+    "//mojo/services/asset_bundle/interfaces",
     ":lib",
   ]
 }
@@ -55,7 +55,7 @@
     "//mojo/application:test_support",
     "//mojo/data_pipe_utils",
     "//mojo/public/cpp/bindings",
-    "//mojo/services/asset_bundle/public/interfaces",
+    "//mojo/services/asset_bundle/interfaces",
     "//third_party/zlib:zip",
   ]
 
diff --git a/services/asset_bundle/asset_bundle_apptest.cc b/services/asset_bundle/asset_bundle_apptest.cc
index c449796..804866c 100644
--- a/services/asset_bundle/asset_bundle_apptest.cc
+++ b/services/asset_bundle/asset_bundle_apptest.cc
@@ -10,7 +10,7 @@
 #include "mojo/data_pipe_utils/data_pipe_utils.h"
 #include "mojo/public/cpp/application/application_impl.h"
 #include "mojo/public/cpp/application/application_test_base.h"
-#include "mojo/services/asset_bundle/public/interfaces/asset_bundle.mojom.h"
+#include "mojo/services/asset_bundle/interfaces/asset_bundle.mojom.h"
 #include "third_party/zlib/google/zip.h"
 
 namespace asset_bundle {
diff --git a/services/asset_bundle/asset_bundle_impl.h b/services/asset_bundle/asset_bundle_impl.h
index a742c32..26e734d 100644
--- a/services/asset_bundle/asset_bundle_impl.h
+++ b/services/asset_bundle/asset_bundle_impl.h
@@ -12,7 +12,7 @@
 #include "mojo/public/cpp/bindings/interface_request.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
 #include "mojo/public/cpp/system/data_pipe.h"
-#include "mojo/services/asset_bundle/public/interfaces/asset_bundle.mojom.h"
+#include "mojo/services/asset_bundle/interfaces/asset_bundle.mojom.h"
 
 namespace mojo {
 namespace asset_bundle {
diff --git a/services/asset_bundle/asset_unpacker_impl.h b/services/asset_bundle/asset_unpacker_impl.h
index 9229611..3f06a70 100644
--- a/services/asset_bundle/asset_unpacker_impl.h
+++ b/services/asset_bundle/asset_unpacker_impl.h
@@ -10,7 +10,7 @@
 #include "mojo/public/cpp/bindings/interface_request.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
 #include "mojo/public/cpp/system/data_pipe.h"
-#include "mojo/services/asset_bundle/public/interfaces/asset_bundle.mojom.h"
+#include "mojo/services/asset_bundle/interfaces/asset_bundle.mojom.h"
 
 namespace mojo {
 namespace asset_bundle {
diff --git a/services/asset_bundle/asset_unpacker_job.h b/services/asset_bundle/asset_unpacker_job.h
index ed7cddc..5406653 100644
--- a/services/asset_bundle/asset_unpacker_job.h
+++ b/services/asset_bundle/asset_unpacker_job.h
@@ -11,7 +11,7 @@
 #include "base/task_runner.h"
 #include "mojo/data_pipe_utils/data_pipe_utils.h"
 #include "mojo/public/cpp/bindings/interface_request.h"
-#include "mojo/services/asset_bundle/public/interfaces/asset_bundle.mojom.h"
+#include "mojo/services/asset_bundle/interfaces/asset_bundle.mojom.h"
 
 namespace mojo {
 namespace asset_bundle {
diff --git a/services/authenticating_url_loader_interceptor/BUILD.gn b/services/authenticating_url_loader_interceptor/BUILD.gn
index 7a769a8..be9d789 100644
--- a/services/authenticating_url_loader_interceptor/BUILD.gn
+++ b/services/authenticating_url_loader_interceptor/BUILD.gn
@@ -25,8 +25,8 @@
     "//mojo/public/c/system",
     "//mojo/public/cpp/application",
     "//mojo/public/cpp/bindings",
-    "//mojo/services/authenticating_url_loader_interceptor/public/interfaces",
-    "//mojo/services/authentication/public/interfaces",
+    "//mojo/services/authenticating_url_loader_interceptor/interfaces",
+    "//mojo/services/authentication/interfaces",
     "//mojo/services/network/public/interfaces",
     "//url",
   ]
@@ -47,7 +47,7 @@
     "//mojo/public/cpp/application",
     "//mojo/public/cpp/bindings",
     "//mojo/public/cpp/system",
-    "//mojo/services/authenticating_url_loader_interceptor/public/interfaces",
+    "//mojo/services/authenticating_url_loader_interceptor/interfaces",
     "//mojo/services/network/public/interfaces",
     "//testing/gtest",
   ]
diff --git a/services/authenticating_url_loader_interceptor/authenticating_url_loader_interceptor_app.h b/services/authenticating_url_loader_interceptor/authenticating_url_loader_interceptor_app.h
index 704fb88..ddd98bf 100644
--- a/services/authenticating_url_loader_interceptor/authenticating_url_loader_interceptor_app.h
+++ b/services/authenticating_url_loader_interceptor/authenticating_url_loader_interceptor_app.h
@@ -9,7 +9,7 @@
 #include "mojo/public/cpp/application/application_connection.h"
 #include "mojo/public/cpp/application/application_delegate.h"
 #include "mojo/public/cpp/application/interface_factory.h"
-#include "mojo/services/authenticating_url_loader_interceptor/public/interfaces/authenticating_url_loader_interceptor_meta_factory.mojom.h"
+#include "mojo/services/authenticating_url_loader_interceptor/interfaces/authenticating_url_loader_interceptor_meta_factory.mojom.h"
 #include "services/authenticating_url_loader_interceptor/authenticating_url_loader_interceptor_meta_factory_impl.h"
 
 namespace mojo {
diff --git a/services/authenticating_url_loader_interceptor/authenticating_url_loader_interceptor_apptest.cc b/services/authenticating_url_loader_interceptor/authenticating_url_loader_interceptor_apptest.cc
index ba342ac..bacd0c4 100644
--- a/services/authenticating_url_loader_interceptor/authenticating_url_loader_interceptor_apptest.cc
+++ b/services/authenticating_url_loader_interceptor/authenticating_url_loader_interceptor_apptest.cc
@@ -14,7 +14,7 @@
 #include "mojo/public/cpp/application/application_test_base.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
 #include "mojo/public/cpp/system/data_pipe.h"
-#include "mojo/services/authenticating_url_loader_interceptor/public/interfaces/authenticating_url_loader_interceptor_meta_factory.mojom.h"
+#include "mojo/services/authenticating_url_loader_interceptor/interfaces/authenticating_url_loader_interceptor_meta_factory.mojom.h"
 #include "mojo/services/network/public/interfaces/network_service.mojom.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/services/authenticating_url_loader_interceptor/authenticating_url_loader_interceptor_factory.h b/services/authenticating_url_loader_interceptor/authenticating_url_loader_interceptor_factory.h
index 933d63a..592c617 100644
--- a/services/authenticating_url_loader_interceptor/authenticating_url_loader_interceptor_factory.h
+++ b/services/authenticating_url_loader_interceptor/authenticating_url_loader_interceptor_factory.h
@@ -10,7 +10,7 @@
 #include "base/callback.h"
 #include "mojo/public/cpp/bindings/interface_request.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
-#include "mojo/services/authentication/public/interfaces/authentication.mojom.h"
+#include "mojo/services/authentication/interfaces/authentication.mojom.h"
 #include "mojo/services/network/public/interfaces/network_service.mojom.h"
 #include "url/gurl.h"
 
diff --git a/services/authenticating_url_loader_interceptor/authenticating_url_loader_interceptor_meta_factory_impl.h b/services/authenticating_url_loader_interceptor/authenticating_url_loader_interceptor_meta_factory_impl.h
index 7b58a0b..9929de1 100644
--- a/services/authenticating_url_loader_interceptor/authenticating_url_loader_interceptor_meta_factory_impl.h
+++ b/services/authenticating_url_loader_interceptor/authenticating_url_loader_interceptor_meta_factory_impl.h
@@ -10,8 +10,8 @@
 #include "base/callback.h"
 #include "mojo/public/cpp/bindings/interface_request.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
-#include "mojo/services/authenticating_url_loader_interceptor/public/interfaces/authenticating_url_loader_interceptor_meta_factory.mojom.h"
-#include "mojo/services/authentication/public/interfaces/authentication.mojom.h"
+#include "mojo/services/authenticating_url_loader_interceptor/interfaces/authenticating_url_loader_interceptor_meta_factory.mojom.h"
+#include "mojo/services/authentication/interfaces/authentication.mojom.h"
 #include "url/gurl.h"
 
 namespace mojo {
diff --git a/services/authentication/BUILD.gn b/services/authentication/BUILD.gn
index da4fe08..be794e3 100644
--- a/services/authentication/BUILD.gn
+++ b/services/authentication/BUILD.gn
@@ -20,8 +20,8 @@
       "//mojo/public/java:application",
       "//mojo/public/java:bindings",
       "//mojo/public/java:system",
-      "//mojo/services/authenticating_url_loader_interceptor/public/interfaces:interfaces_java",
-      "//mojo/services/authentication/public/interfaces:interfaces_java",
+      "//mojo/services/authenticating_url_loader_interceptor/interfaces:interfaces_java",
+      "//mojo/services/authentication/interfaces:interfaces_java",
       "//mojo/services/network/public/interfaces:interfaces_java",
       "//services/intent_receiver:bindings_java",
       "//third_party/android_tools:google_play_services_default_java",
@@ -47,7 +47,7 @@
       "//mojo/public/cpp/application:standalone",
       "//mojo/public/cpp/bindings",
       "//mojo/public/cpp/system",
-      "//mojo/services/authentication/public/interfaces",
+      "//mojo/services/authentication/interfaces",
     ]
   }
 }
diff --git a/services/authentication/dummy_authentication_app.cc b/services/authentication/dummy_authentication_app.cc
index d55d044..b98c15e 100644
--- a/services/authentication/dummy_authentication_app.cc
+++ b/services/authentication/dummy_authentication_app.cc
@@ -9,7 +9,7 @@
 #include "mojo/public/cpp/application/application_runner.h"
 #include "mojo/public/cpp/application/interface_factory.h"
 #include "mojo/public/cpp/system/macros.h"
-#include "mojo/services/authentication/public/interfaces/authentication.mojom.h"
+#include "mojo/services/authentication/interfaces/authentication.mojom.h"
 
 namespace authentication {
 namespace {
diff --git a/services/camera/BUILD.gn b/services/camera/BUILD.gn
index 6a07fcf..239524f 100644
--- a/services/camera/BUILD.gn
+++ b/services/camera/BUILD.gn
@@ -17,7 +17,7 @@
     "//base:base_java",
     "//mojo/public/interfaces/application:application_java",
     "//mojo/public/java:application",
-    "//mojo/services/camera/public/interfaces:interfaces_java",
+    "//mojo/services/camera/interfaces:interfaces_java",
   ]
 }
 
@@ -31,6 +31,6 @@
   deps = [
     "//mojo/public/interfaces/application:application_java",
     "//mojo/public/java:application",
-    "//mojo/services/camera/public/interfaces:interfaces_java",
+    "//mojo/services/camera/interfaces:interfaces_java",
   ]
 }
diff --git a/services/clipboard/BUILD.gn b/services/clipboard/BUILD.gn
index e986122..5b11fb4 100644
--- a/services/clipboard/BUILD.gn
+++ b/services/clipboard/BUILD.gn
@@ -17,7 +17,7 @@
     "//mojo/environment:chromium",
     "//mojo/public/cpp/bindings",
     "//mojo/public/cpp/bindings:callback",
-    "//mojo/services/clipboard/public/interfaces",
+    "//mojo/services/clipboard/interfaces",
   ]
 }
 
@@ -36,7 +36,7 @@
     "//mojo/application:test_support",
     "//mojo/converters/array_string",
     "//mojo/public/cpp/bindings",
-    "//mojo/services/clipboard/public/interfaces",
+    "//mojo/services/clipboard/interfaces",
   ]
 
   data_deps = [ ":clipboard($default_toolchain)" ]
diff --git a/services/clipboard/clipboard_apptest.cc b/services/clipboard/clipboard_apptest.cc
index 8a9a855..2093990 100644
--- a/services/clipboard/clipboard_apptest.cc
+++ b/services/clipboard/clipboard_apptest.cc
@@ -7,7 +7,7 @@
 #include "mojo/converters/array_string/array_string_type_converters.h"
 #include "mojo/public/cpp/application/application_impl.h"
 #include "mojo/public/cpp/application/application_test_base.h"
-#include "mojo/services/clipboard/public/interfaces/clipboard.mojom.h"
+#include "mojo/services/clipboard/interfaces/clipboard.mojom.h"
 
 using mojo::Array;
 using mojo::Clipboard;
diff --git a/services/clipboard/clipboard_standalone_impl.h b/services/clipboard/clipboard_standalone_impl.h
index 19ddd66..8607eee 100644
--- a/services/clipboard/clipboard_standalone_impl.h
+++ b/services/clipboard/clipboard_standalone_impl.h
@@ -9,7 +9,7 @@
 #include <string>
 
 #include "mojo/public/cpp/bindings/strong_binding.h"
-#include "mojo/services/clipboard/public/interfaces/clipboard.mojom.h"
+#include "mojo/services/clipboard/interfaces/clipboard.mojom.h"
 
 namespace clipboard {
 
diff --git a/services/contacts/BUILD.gn b/services/contacts/BUILD.gn
index 356ec03..1dc41e2 100644
--- a/services/contacts/BUILD.gn
+++ b/services/contacts/BUILD.gn
@@ -17,7 +17,7 @@
     "//mojo/public/java:bindings",
     "//mojo/public/java:system",
     "//mojo/public/java:application",
-    "//mojo/services/contacts/public/interfaces:interfaces_java",
+    "//mojo/services/contacts/interfaces:interfaces_java",
   ]
 }
 
@@ -35,7 +35,7 @@
     "//mojo/application",
     "//mojo/application:test_support",
     "//mojo/public/cpp/bindings",
-    "//mojo/services/contacts/public/interfaces",
+    "//mojo/services/contacts/interfaces",
   ]
 
   data_deps = [ ":contacts($default_toolchain)" ]
diff --git a/services/contacts/contacts_apptest.cc b/services/contacts/contacts_apptest.cc
index 4f33d0b..e701dcb 100644
--- a/services/contacts/contacts_apptest.cc
+++ b/services/contacts/contacts_apptest.cc
@@ -5,7 +5,7 @@
 #include "base/run_loop.h"
 #include "mojo/public/cpp/application/application_impl.h"
 #include "mojo/public/cpp/application/application_test_base.h"
-#include "mojo/services/contacts/public/interfaces/contacts.mojom.h"
+#include "mojo/services/contacts/interfaces/contacts.mojom.h"
 
 namespace contacts {
 
diff --git a/services/dart/BUILD.gn b/services/dart/BUILD.gn
index 0c0f5c8..1aee326 100644
--- a/services/dart/BUILD.gn
+++ b/services/dart/BUILD.gn
@@ -47,7 +47,7 @@
     "//mojo/public/cpp/system",
     "//mojo/public/cpp/utility",
     "//mojo/public/interfaces/application",
-    "//mojo/services/content_handler/public/interfaces",
+    "//mojo/services/content_handler/interfaces",
     "//mojo/services/network/public/interfaces",
     "//mojo/services/tracing/public/interfaces",
     "//mojo/services/url_response_disk_cache/public/interfaces",
diff --git a/services/device_info/BUILD.gn b/services/device_info/BUILD.gn
index d5daa29..9e4ee7a 100644
--- a/services/device_info/BUILD.gn
+++ b/services/device_info/BUILD.gn
@@ -15,7 +15,7 @@
     deps = [
       "//mojo/public/interfaces/application:application_java",
       "//mojo/public/java:application",
-      "//mojo/services/device_info/public/interfaces:interfaces_java",
+      "//mojo/services/device_info/interfaces:interfaces_java",
     ]
   }
 }
@@ -33,7 +33,7 @@
       "//mojo/common",
       "//mojo/public/cpp/application:standalone",
       "//mojo/public/cpp/bindings",
-      "//mojo/services/device_info/public/interfaces",
+      "//mojo/services/device_info/interfaces",
     ]
   }
 }
diff --git a/services/device_info/device_info.cc b/services/device_info/device_info.cc
index c94bd0c..0dfdfbc 100644
--- a/services/device_info/device_info.cc
+++ b/services/device_info/device_info.cc
@@ -10,7 +10,7 @@
 #include "mojo/public/cpp/application/application_delegate.h"
 #include "mojo/public/cpp/application/application_runner.h"
 #include "mojo/public/cpp/application/interface_factory.h"
-#include "mojo/services/device_info/public/interfaces/device_info.mojom.h"
+#include "mojo/services/device_info/interfaces/device_info.mojom.h"
 
 namespace mojo {
 namespace services {
diff --git a/services/files/BUILD.gn b/services/files/BUILD.gn
index a1afcf6..00fddcd 100644
--- a/services/files/BUILD.gn
+++ b/services/files/BUILD.gn
@@ -28,7 +28,7 @@
     "//mojo/public/cpp/application",
     "//mojo/public/cpp/bindings:callback",
     "//mojo/public/cpp/system",
-    "//mojo/services/files/public/interfaces",
+    "//mojo/services/files/interfaces",
   ]
 }
 
@@ -49,7 +49,7 @@
     "//mojo/application",
     "//mojo/application:test_support",
     "//mojo/public/cpp/bindings",
-    "//mojo/services/files/public/interfaces",
+    "//mojo/services/files/interfaces",
   ]
 
   data_deps = [ ":files($default_toolchain)" ]
diff --git a/services/files/directory_impl.h b/services/files/directory_impl.h
index 8cc081d..517df95 100644
--- a/services/files/directory_impl.h
+++ b/services/files/directory_impl.h
@@ -10,7 +10,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "mojo/public/cpp/bindings/interface_request.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
-#include "mojo/services/files/public/interfaces/directory.mojom.h"
+#include "mojo/services/files/interfaces/directory.mojom.h"
 
 namespace base {
 class ScopedTempDir;
diff --git a/services/files/file_impl.h b/services/files/file_impl.h
index 355b117..b037bf7 100644
--- a/services/files/file_impl.h
+++ b/services/files/file_impl.h
@@ -9,7 +9,7 @@
 #include "base/macros.h"
 #include "mojo/public/cpp/bindings/interface_request.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
-#include "mojo/services/files/public/interfaces/directory.mojom.h"
+#include "mojo/services/files/interfaces/directory.mojom.h"
 
 namespace mojo {
 namespace files {
diff --git a/services/files/files_impl.h b/services/files/files_impl.h
index 8208cbf..e4eab61 100644
--- a/services/files/files_impl.h
+++ b/services/files/files_impl.h
@@ -8,7 +8,7 @@
 #include "base/macros.h"
 #include "mojo/public/cpp/bindings/interface_request.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
-#include "mojo/services/files/public/interfaces/files.mojom.h"
+#include "mojo/services/files/interfaces/files.mojom.h"
 
 namespace mojo {
 
diff --git a/services/files/files_test_base.cc b/services/files/files_test_base.cc
index b0dade1..10baa0f 100644
--- a/services/files/files_test_base.cc
+++ b/services/files/files_test_base.cc
@@ -5,8 +5,8 @@
 #include "services/files/files_test_base.h"
 
 #include "mojo/public/cpp/application/application_impl.h"
-#include "mojo/services/files/public/interfaces/directory.mojom.h"
-#include "mojo/services/files/public/interfaces/types.mojom.h"
+#include "mojo/services/files/interfaces/directory.mojom.h"
+#include "mojo/services/files/interfaces/types.mojom.h"
 
 namespace mojo {
 namespace files {
diff --git a/services/files/files_test_base.h b/services/files/files_test_base.h
index d44d7df..01c411c 100644
--- a/services/files/files_test_base.h
+++ b/services/files/files_test_base.h
@@ -7,7 +7,7 @@
 
 #include "base/macros.h"
 #include "mojo/public/cpp/application/application_test_base.h"
-#include "mojo/services/files/public/interfaces/files.mojom.h"
+#include "mojo/services/files/interfaces/files.mojom.h"
 
 namespace mojo {
 namespace files {
diff --git a/services/files/main.cc b/services/files/main.cc
index 3d840b0..56101d9 100644
--- a/services/files/main.cc
+++ b/services/files/main.cc
@@ -8,7 +8,7 @@
 #include "mojo/public/cpp/application/application_connection.h"
 #include "mojo/public/cpp/application/application_delegate.h"
 #include "mojo/public/cpp/application/interface_factory.h"
-#include "mojo/services/files/public/interfaces/files.mojom.h"
+#include "mojo/services/files/interfaces/files.mojom.h"
 #include "services/files/files_impl.h"
 
 namespace mojo {
diff --git a/services/files/shared_impl.h b/services/files/shared_impl.h
index f88dfc4..79d8a42 100644
--- a/services/files/shared_impl.h
+++ b/services/files/shared_impl.h
@@ -9,7 +9,7 @@
 #define SERVICES_FILES_SHARED_IMPL_H_
 
 #include "mojo/public/cpp/bindings/callback.h"
-#include "mojo/services/files/public/interfaces/types.mojom.h"
+#include "mojo/services/files/interfaces/types.mojom.h"
 
 namespace mojo {
 namespace files {
diff --git a/services/files/util.h b/services/files/util.h
index 8e1e3e2..0f543c7 100644
--- a/services/files/util.h
+++ b/services/files/util.h
@@ -5,7 +5,7 @@
 #ifndef SERVICES_FILES_UTIL_H_
 #define SERVICES_FILES_UTIL_H_
 
-#include "mojo/services/files/public/interfaces/types.mojom.h"
+#include "mojo/services/files/interfaces/types.mojom.h"
 
 namespace mojo {
 
diff --git a/services/js/BUILD.gn b/services/js/BUILD.gn
index 41d54b0..2b47596 100644
--- a/services/js/BUILD.gn
+++ b/services/js/BUILD.gn
@@ -42,7 +42,7 @@
     "//mojo/public/cpp/system",
     "//mojo/public/cpp/utility",
     "//mojo/public/interfaces/application",
-    "//mojo/services/content_handler/public/interfaces",
+    "//mojo/services/content_handler/interfaces",
     "//mojo/services/network/public/interfaces",
     "//services/js/modules/clock",
     "//services/js/modules/gl",
diff --git a/services/native_support/BUILD.gn b/services/native_support/BUILD.gn
index bf72192..f7f0d0b 100644
--- a/services/native_support/BUILD.gn
+++ b/services/native_support/BUILD.gn
@@ -26,7 +26,7 @@
     "//mojo/public/cpp/application",
     "//mojo/public/cpp/bindings:callback",
     "//mojo/public/cpp/system",
-    "//mojo/services/files/public/interfaces",
+    "//mojo/services/files/interfaces",
     "//mojo/services/native_support/public/interfaces",
   ]
 }
@@ -49,8 +49,8 @@
     "//mojo/application:test_support",
     "//mojo/public/cpp/bindings",
     "//mojo/public/cpp/system",
-    "//mojo/services/files/public/cpp:files_impl",
-    "//mojo/services/files/public/interfaces",
+    "//mojo/services/files/cpp:files_impl",
+    "//mojo/services/files/interfaces",
     "//mojo/services/native_support/public/interfaces",
   ]
 
diff --git a/services/native_support/process_controller_impl.cc b/services/native_support/process_controller_impl.cc
index 3f5f4ba..e26e9bb 100644
--- a/services/native_support/process_controller_impl.cc
+++ b/services/native_support/process_controller_impl.cc
@@ -17,7 +17,7 @@
 #include "base/message_loop/message_loop.h"
 #include "base/task_runner.h"
 #include "base/threading/simple_thread.h"
-#include "mojo/services/files/public/interfaces/types.mojom.h"
+#include "mojo/services/files/interfaces/types.mojom.h"
 #include "services/native_support/process_io_redirection.h"
 
 namespace native_support {
diff --git a/services/native_support/process_controller_impl.h b/services/native_support/process_controller_impl.h
index 6182e6c..fbd844b 100644
--- a/services/native_support/process_controller_impl.h
+++ b/services/native_support/process_controller_impl.h
@@ -14,8 +14,8 @@
 #include "base/task_runner.h"
 #include "mojo/public/cpp/bindings/interface_request.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
-#include "mojo/services/files/public/interfaces/file.mojom.h"
-#include "mojo/services/files/public/interfaces/types.mojom.h"
+#include "mojo/services/files/interfaces/file.mojom.h"
+#include "mojo/services/files/interfaces/types.mojom.h"
 #include "mojo/services/native_support/public/interfaces/process.mojom.h"
 
 namespace native_support {
diff --git a/services/native_support/process_controller_impl_unittest.cc b/services/native_support/process_controller_impl_unittest.cc
index ed3a42e..6f9849c 100644
--- a/services/native_support/process_controller_impl_unittest.cc
+++ b/services/native_support/process_controller_impl_unittest.cc
@@ -10,9 +10,9 @@
 #include "base/message_loop/message_loop.h"
 #include "mojo/public/cpp/bindings/interface_request.h"
 #include "mojo/public/cpp/bindings/type_converter.h"
-#include "mojo/services/files/public/cpp/input_stream_file.h"
-#include "mojo/services/files/public/cpp/output_stream_file.h"
-#include "mojo/services/files/public/interfaces/types.mojom.h"
+#include "mojo/services/files/cpp/input_stream_file.h"
+#include "mojo/services/files/cpp/output_stream_file.h"
+#include "mojo/services/files/interfaces/types.mojom.h"
 #include "services/native_support/process_test_base.h"
 
 namespace native_support {
diff --git a/services/native_support/process_impl.cc b/services/native_support/process_impl.cc
index c268a7e..9850739 100644
--- a/services/native_support/process_impl.cc
+++ b/services/native_support/process_impl.cc
@@ -21,7 +21,7 @@
 #include "base/process/launch.h"
 #include "base/process/process.h"
 #include "build/build_config.h"
-#include "mojo/services/files/public/interfaces/types.mojom.h"
+#include "mojo/services/files/interfaces/types.mojom.h"
 #include "services/native_support/make_pty_pair.h"
 #include "services/native_support/process_controller_impl.h"
 #include "services/native_support/process_io_redirection.h"
diff --git a/services/native_support/process_impl_unittest.cc b/services/native_support/process_impl_unittest.cc
index 88a0805..9efa68f 100644
--- a/services/native_support/process_impl_unittest.cc
+++ b/services/native_support/process_impl_unittest.cc
@@ -11,9 +11,9 @@
 #include "mojo/public/cpp/bindings/interface_request.h"
 #include "mojo/public/cpp/bindings/type_converter.h"
 #include "mojo/public/cpp/system/macros.h"
-#include "mojo/services/files/public/cpp/output_stream_file.h"
-#include "mojo/services/files/public/interfaces/file.mojom.h"
-#include "mojo/services/files/public/interfaces/types.mojom.h"
+#include "mojo/services/files/cpp/output_stream_file.h"
+#include "mojo/services/files/interfaces/file.mojom.h"
+#include "mojo/services/files/interfaces/types.mojom.h"
 #include "services/native_support/process_test_base.h"
 
 namespace native_support {
diff --git a/services/native_support/process_io_redirection.h b/services/native_support/process_io_redirection.h
index 00e3461..fede949 100644
--- a/services/native_support/process_io_redirection.h
+++ b/services/native_support/process_io_redirection.h
@@ -9,7 +9,7 @@
 
 #include "base/files/scoped_file.h"
 #include "base/macros.h"
-#include "mojo/services/files/public/interfaces/file.mojom.h"
+#include "mojo/services/files/interfaces/file.mojom.h"
 #include "services/native_support/redirectors.h"
 
 namespace native_support {
diff --git a/services/native_support/redirectors.h b/services/native_support/redirectors.h
index a88eaea..b655943 100644
--- a/services/native_support/redirectors.h
+++ b/services/native_support/redirectors.h
@@ -14,8 +14,8 @@
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "mojo/public/cpp/bindings/array.h"
-#include "mojo/services/files/public/interfaces/file.mojom.h"
-#include "mojo/services/files/public/interfaces/types.mojom.h"
+#include "mojo/services/files/interfaces/file.mojom.h"
+#include "mojo/services/files/interfaces/types.mojom.h"
 
 namespace native_support {
 
diff --git a/services/python/content_handler/BUILD.gn b/services/python/content_handler/BUILD.gn
index 43563c0..c17e0fb 100644
--- a/services/python/content_handler/BUILD.gn
+++ b/services/python/content_handler/BUILD.gn
@@ -29,7 +29,7 @@
     "//mojo/public/cpp/utility",
     "//mojo/public/python:python_common",
     "//mojo/public/python:system_embedded",
-    "//mojo/services/content_handler/public/interfaces",
+    "//mojo/services/content_handler/interfaces",
     "//third_party/zlib:zip",
     "//url:url",
   ]
diff --git a/services/vanadium/security/principal_service.go b/services/vanadium/security/principal_service.go
index 5e8e087..26ebe66 100644
--- a/services/vanadium/security/principal_service.go
+++ b/services/vanadium/security/principal_service.go
@@ -17,7 +17,7 @@
 	"mojo/public/go/bindings"
 	"mojo/public/go/system"
 	"mojo/public/interfaces/network/url_request"
-	auth "mojo/services/authentication/public/interfaces/authentication"
+	auth "mojo/services/authentication/interfaces/authentication"
 	network "mojo/services/network/public/interfaces/network_service"
 	"mojo/services/network/public/interfaces/url_loader"
 	vpkg "mojo/services/vanadium/security/public/interfaces/principal"
diff --git a/shell/BUILD.gn b/shell/BUILD.gn
index deb46a4..24f9dd8 100644
--- a/shell/BUILD.gn
+++ b/shell/BUILD.gn
@@ -234,7 +234,7 @@
       ":jni_headers",
       ":run_android_application_function",
       "//mojo/application:content_handler",
-      "//mojo/services/content_handler/public/interfaces",
+      "//mojo/services/content_handler/interfaces",
       "//mojo/services/gpu/public/interfaces",
       "//mojo/services/native_viewport/public/interfaces",
       "//services/gles2",
diff --git a/shell/android/android_handler.h b/shell/android/android_handler.h
index b847e76..0607d0f 100644
--- a/shell/android/android_handler.h
+++ b/shell/android/android_handler.h
@@ -11,7 +11,7 @@
 #include "mojo/application/content_handler_factory.h"
 #include "mojo/public/cpp/application/application_delegate.h"
 #include "mojo/public/cpp/application/interface_factory_impl.h"
-#include "mojo/services/content_handler/public/interfaces/content_handler.mojom.h"
+#include "mojo/services/content_handler/interfaces/content_handler.mojom.h"
 #include "mojo/services/url_response_disk_cache/public/interfaces/url_response_disk_cache.mojom.h"
 
 namespace base {
diff --git a/shell/application_manager/BUILD.gn b/shell/application_manager/BUILD.gn
index 273b5fe..f2cb7d1 100644
--- a/shell/application_manager/BUILD.gn
+++ b/shell/application_manager/BUILD.gn
@@ -34,8 +34,8 @@
     "//mojo/converters/url",
     "//mojo/data_pipe_utils",
     "//mojo/public/interfaces/application:application",
-    "//mojo/services/authenticating_url_loader_interceptor/public/interfaces",
-    "//mojo/services/authentication/public/interfaces",
+    "//mojo/services/authenticating_url_loader_interceptor/interfaces",
+    "//mojo/services/authentication/interfaces",
     "//mojo/services/network/public/interfaces",
     "//mojo/services/url_response_disk_cache/public/interfaces",
     "//url",
@@ -46,7 +46,7 @@
     "//url",
     "//mojo/edk/system",
     "//mojo/environment:chromium",
-    "//mojo/services/content_handler/public/interfaces",
+    "//mojo/services/content_handler/interfaces",
     "//shell:native_application_support",
   ]
 }
diff --git a/shell/application_manager/application_manager.cc b/shell/application_manager/application_manager.cc
index 8fcfdd5..6f90460 100644
--- a/shell/application_manager/application_manager.cc
+++ b/shell/application_manager/application_manager.cc
@@ -11,9 +11,9 @@
 #include "base/strings/string_util.h"
 #include "base/trace_event/trace_event.h"
 #include "mojo/public/cpp/bindings/binding.h"
-#include "mojo/services/authenticating_url_loader_interceptor/public/interfaces/authenticating_url_loader_interceptor_meta_factory.mojom.h"
-#include "mojo/services/authentication/public/interfaces/authentication.mojom.h"
-#include "mojo/services/content_handler/public/interfaces/content_handler.mojom.h"
+#include "mojo/services/authenticating_url_loader_interceptor/interfaces/authenticating_url_loader_interceptor_meta_factory.mojom.h"
+#include "mojo/services/authentication/interfaces/authentication.mojom.h"
+#include "mojo/services/content_handler/interfaces/content_handler.mojom.h"
 #include "shell/application_manager/fetcher.h"
 #include "shell/application_manager/local_fetcher.h"
 #include "shell/application_manager/network_fetcher.h"
diff --git a/shell/application_manager/shell_impl.cc b/shell/application_manager/shell_impl.cc
index 8ca4e4d..f75c028 100644
--- a/shell/application_manager/shell_impl.cc
+++ b/shell/application_manager/shell_impl.cc
@@ -5,7 +5,7 @@
 #include "shell/application_manager/shell_impl.h"
 
 #include "mojo/converters/url/url_type_converters.h"
-#include "mojo/services/content_handler/public/interfaces/content_handler.mojom.h"
+#include "mojo/services/content_handler/interfaces/content_handler.mojom.h"
 #include "shell/application_manager/application_manager.h"
 
 using mojo::ServiceProvider;