5 files changed, 4 insertions, 6 deletions
diff --git a/mojo/shell/dynamic_service_loader.cc b/mojo/shell/dynamic_service_loader.cc
index 4c62dd9..4168fdf 100644
--- a/mojo/shell/dynamic_service_loader.cc
+++ b/mojo/shell/dynamic_service_loader.cc
@@ -12,7 +12,6 @@
 #include "mojo/shell/context.h"
 #include "mojo/shell/keep_alive.h"
 #include "mojo/shell/switches.h"
-#include "mojom/shell.h"
 
 typedef MojoResult (*MojoMainFunction)(MojoHandle pipe);
 
diff --git a/mojo/shell/dynamic_service_loader.h b/mojo/shell/dynamic_service_loader.h
index aef76df..bdb995c 100644
--- a/mojo/shell/dynamic_service_loader.h
+++ b/mojo/shell/dynamic_service_loader.h
@@ -8,10 +8,10 @@
 #include <map>
 
 #include "base/basictypes.h"
+#include "mojo/public/shell/shell.mojom.h"
 #include "mojo/public/system/core_cpp.h"
 #include "mojo/shell/keep_alive.h"
 #include "mojo/shell/service_manager.h"
-#include "mojom/shell.h"
 #include "url/gurl.h"
 
 namespace mojo {
diff --git a/mojo/shell/service_manager.cc b/mojo/shell/service_manager.cc
index 97a0d51..15146a8 100644
--- a/mojo/shell/service_manager.cc
+++ b/mojo/shell/service_manager.cc
@@ -8,7 +8,6 @@
 #include "mojo/public/bindings/allocation_scope.h"
 #include "mojo/public/bindings/error_handler.h"
 #include "mojo/public/bindings/remote_ptr.h"
-#include "mojom/shell.h"
 
 namespace mojo {
 namespace shell {
diff --git a/mojo/shell/service_manager.h b/mojo/shell/service_manager.h
index b21393a..fa396c7 100644
--- a/mojo/shell/service_manager.h
+++ b/mojo/shell/service_manager.h
@@ -9,8 +9,8 @@
 
 #include "base/basictypes.h"
 #include "base/callback.h"
+#include "mojo/public/shell/shell.mojom.h"
 #include "mojo/public/system/core_cpp.h"
-#include "mojom/shell.h"
 #include "url/gurl.h"
 
 namespace mojo {
diff --git a/mojo/shell/service_manager_unittest.cc b/mojo/shell/service_manager_unittest.cc
index ac5d1ba..0f17b1d 100644
--- a/mojo/shell/service_manager_unittest.cc
+++ b/mojo/shell/service_manager_unittest.cc
@@ -6,10 +6,10 @@
 #include "mojo/public/bindings/remote_ptr.h"
 #include "mojo/public/environment/environment.h"
 #include "mojo/public/shell/application.h"
+#include "mojo/public/shell/shell.mojom.h"
 #include "mojo/public/utility/run_loop.h"
 #include "mojo/shell/service_manager.h"
-#include "mojom/shell.h"
-#include "mojom/test.h"
+#include "mojo/shell/test.mojom.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojo {