Mojo: Include "path/to/foo.mojom.h"

mojo/public/bindings/generators/cpp_templates/module.h.tmpl

Index: mojo/public/bindings/generators/cpp_templates/module.h.tmpl
diff --git a/mojo/public/bindings/generators/cpp_templates/module.h.tmpl b/mojo/public/bindings/generators/cpp_templates/module.h.tmpl
index ad2292153766c02db529575538c19474e1ee0cac..ca5aee8cd78a3a4649b37665f116a6c4ed305c63 100644
--- a/mojo/public/bindings/generators/cpp_templates/module.h.tmpl
+++ b/mojo/public/bindings/generators/cpp_templates/module.h.tmpl
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-{%- set header_guard = "MOJO_GENERATED_BINDINGS_%s_%s_H_"|
-        format(module_name|upper, module_name|upper) %}
+{%- set header_guard = "%s_H_"|
+        format(module_path|upper|replace("/","_")|replace(".","_")) %}
 
 #ifndef {{header_guard}}
 #define {{header_guard}}
 
 #include "mojo/public/bindings/array.h"
 #include "mojo/public/bindings/interface.h"
-#include "{{include_prefix}}{{module_name|camel_to_underscores}}_internal.h"
+#include "{{include_prefix}}{{module_name|camel_to_underscores}}-internal.h"
 {%- for import in imports %}
 #include "{{include_prefix}}{{import.module_name|camel_to_underscores}}.h"
 {%- endfor %}