Mojo: Unify the disparate source and header files into 3

mojo/public/bindings/generators/cpp_templates/module.h-template

Index: mojo/public/bindings/generators/cpp_templates/module.h-template
diff --git a/mojo/public/bindings/generators/cpp_templates/struct.h-template b/mojo/public/bindings/generators/cpp_templates/module.h-template
similarity index 69%
rename from mojo/public/bindings/generators/cpp_templates/struct.h-template
rename to mojo/public/bindings/generators/cpp_templates/module.h-template
index 40431fccae1fc396b8c8b284ae7fdbc133a33f7b..81e48324c15b0beb1ea2f84bc0b2bf63f73b20f2 100644
--- a/mojo/public/bindings/generators/cpp_templates/struct.h-template
+++ b/mojo/public/bindings/generators/cpp_templates/module.h-template
@@ -6,15 +6,19 @@
 #define $HEADER_GUARD
 
 #include "mojo/public/bindings/lib/bindings.h"
+#include "mojo/public/bindings/lib/message.h"
 
 namespace $NAMESPACE {
-$FORWARDS
 
 #pragma pack(push, 1)
 
-$DECLARATION
+$STRUCT_CLASS_DECLARARTIONS
 #pragma pack(pop)
 
+$INTERFACE_CLASS_DECLARATIONS
+$INTERFACE_PROXY_DECLARATIONS
+$INTERFACE_STUB_DECLARATIONS
+
 }  // namespace $NAMESPACE
 
 #endif  // $HEADER_GUARD