Fix up how the JSON Schema compiler decides whether to include or forward

tools/json_schema_compiler/h_generator.py

Index: tools/json_schema_compiler/h_generator.py
diff --git a/tools/json_schema_compiler/h_generator.py b/tools/json_schema_compiler/h_generator.py
index 0bc44b791620f00ac39919cbe1f866d91c4df1d9..43d14f8f7724c75436fd9ec3b4ca031111bb93a6 100644
--- a/tools/json_schema_compiler/h_generator.py
+++ b/tools/json_schema_compiler/h_generator.py
@@ -40,6 +40,7 @@ class HGenerator(object):
       .Append('#include "base/memory/linked_ptr.h"')
       .Append('#include "base/memory/scoped_ptr.h"')
       .Append('#include "base/values.h"')
+      .Cblock(self._type_helper.GenerateIncludes())
       .Append()
     )
 
@@ -162,7 +163,7 @@ class HGenerator(object):
                         a typedef. This may not always be desired. If false,
                         primitive types are ignored.
     """
-    classname = cpp_util.Classname(schema_util.StripSchemaNamespace(type_.name))
+    classname = cpp_util.Classname(schema_util.StripNamespace(type_.name))
     c = Code()
 
     if type_.functions: